From 8da32105732949b4b0273c718d118bcfae70a1c9 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 11 Dec 2006 15:47:35 +0000
Subject: Merged 0.0 changes from revision 2825 to 2898 to trunk.

---
 src/gui/viewport.cpp | 392 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 392 insertions(+)
 create mode 100644 src/gui/viewport.cpp

(limited to 'src/gui/viewport.cpp')

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
new file mode 100644
index 00000000..d0525a2f
--- /dev/null
+++ b/src/gui/viewport.cpp
@@ -0,0 +1,392 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "viewport.h"
+
+#include <guichan/sdl/sdlinput.hpp>
+
+#include "gui.h"
+#include "popupmenu.h"
+
+#include "../beingmanager.h"
+#include "../configuration.h"
+#include "../flooritemmanager.h"
+#include "../graphics.h"
+#include "../localplayer.h"
+#include "../map.h"
+#include "../npc.h"
+
+#include "../resources/monsterdb.h"
+
+#include "../utils/tostring.h"
+
+Viewport::Viewport():
+    mMap(0),
+    mViewX(0.0f),
+    mViewY(0.0f),
+    mCameraX(0),
+    mCameraY(0),
+    mShowDebugPath(false),
+    mPopupActive(false)
+{
+    setOpaque(false);
+    addMouseListener(this);
+
+    mScrollLaziness = (int) config.getValue("ScrollLaziness", 32);
+    mScrollRadius = (int) config.getValue("ScrollRadius", 32);
+
+    config.addListener("ScrollLaziness", this);
+    config.addListener("ScrollRadius", this);
+
+    mPopupMenu = new PopupMenu();
+}
+
+Viewport::~Viewport()
+{
+    delete mPopupMenu;
+}
+
+void
+Viewport::setMap(Map *map)
+{
+    mMap = map;
+}
+
+void
+Viewport::draw(gcn::Graphics *gcnGraphics)
+{
+    static int lastTick = tick_time;
+
+    if (!mMap || !player_node)
+        return;
+
+    Graphics *graphics = static_cast<Graphics*>(gcnGraphics);
+
+    // Avoid freaking out when tick_time overflows
+    if (tick_time < lastTick)
+    {
+        lastTick = tick_time;
+    }
+
+    // Calculate viewpoint
+    int midTileX = graphics->getWidth() / 2;
+    int midTileY = graphics->getHeight() / 2;
+
+    int player_x = player_node->mX - midTileX + player_node->getXOffset();
+    int player_y = player_node->mY - midTileY + player_node->getYOffset();
+
+    if (mScrollLaziness < 1)
+        mScrollLaziness = 1; // Avoids division by zero
+
+    // Apply lazy scrolling
+    while (lastTick < tick_time)
+    {
+        if (player_x > mViewX + mScrollRadius)
+        {
+            mViewX += (player_x - mViewX - mScrollRadius) / mScrollLaziness;
+        }
+        if (player_x < mViewX - mScrollRadius)
+        {
+            mViewX += (player_x - mViewX + mScrollRadius) / mScrollLaziness;
+        }
+        if (player_y > mViewY + mScrollRadius)
+        {
+            mViewY += (player_y - mViewY - mScrollRadius) / mScrollLaziness;
+        }
+        if (player_y < mViewY - mScrollRadius)
+        {
+            mViewY += (player_y - mViewY + mScrollRadius) / mScrollLaziness;
+        }
+        lastTick++;
+    }
+
+    // Auto center when player is off screen
+    if (        player_x - mViewX > graphics->getWidth() / 2
+            ||  mViewX - player_x > graphics->getWidth() / 2
+            ||  mViewY - player_y > graphics->getHeight() / 2
+            ||  player_y - mViewY > graphics->getHeight() / 2
+        )
+    {
+        mViewX = player_x;
+        mViewY = player_y;
+    };
+
+    if (mMap) {
+        if (mViewX < 0) {
+            mViewX = 0;
+        }
+        if (mViewY < 0) {
+            mViewY = 0;
+        }
+        if (mViewX > mMap->getWidth() * 32 - midTileX) {
+            mViewX = mMap->getWidth() * 32 - midTileX;
+        }
+        if (mViewY > mMap->getHeight() * 32 - midTileY) {
+            mViewY = mMap->getHeight() * 32 - midTileY;
+        }
+    }
+
+    mCameraX = (int) mViewX;
+    mCameraY = (int) mViewY;
+
+    // Draw tiles and sprites
+    if (mMap)
+    {
+        mMap->draw(graphics, mCameraX, mCameraY, 0);
+        mMap->draw(graphics, mCameraX, mCameraY, 1);
+        mMap->draw(graphics, mCameraX, mCameraY, 2);
+        mMap->drawOverlay(graphics, mViewX, mViewY,
+                (int) config.getValue("OverlayDetail", 2));
+    }
+
+    // Find a path from the player to the mouse, and draw it. This is for debug
+    // purposes.
+    if (mShowDebugPath && mMap)
+    {
+        // Get the current mouse position
+        int mouseX, mouseY;
+        SDL_GetMouseState(&mouseX, &mouseY);
+
+        int mouseTileX = (mouseX + mCameraX) / 32;
+        int mouseTileY = (mouseY + mCameraY) / 32;
+
+        Path debugPath = mMap->findPath(
+                player_node->mX / 32, player_node->mY / 32,
+                mouseTileX, mouseTileY);
+
+        graphics->setColor(gcn::Color(255, 0, 0));
+        for (PathIterator i = debugPath.begin(); i != debugPath.end(); i++)
+        {
+            int squareX = i->x * 32 - mCameraX + 12;
+            int squareY = i->y * 32 - mCameraY + 12;
+
+            graphics->fillRectangle(gcn::Rectangle(squareX, squareY, 8, 8));
+            graphics->drawText(
+                    toString(mMap->getMetaTile(i->x, i->y)->Gcost),
+                    squareX + 4, squareY + 12, gcn::Graphics::CENTER);
+        }
+    }
+
+    // Draw player nickname, speech, and emotion sprite as needed
+    Beings &beings = beingManager->getAll();
+    for (BeingIterator i = beings.begin(); i != beings.end(); i++)
+    {
+        (*i)->drawSpeech(graphics, -mCameraX, -mCameraY);
+        (*i)->drawName(graphics, -mCameraX, -mCameraY);
+        (*i)->drawEmotion(graphics, -mCameraX, -mCameraY);
+    }
+
+    // Draw target marker if needed
+    Being *target;
+    if ((target = player_node->getTarget()))
+    {
+        graphics->setFont(speechFont);
+        graphics->setColor(gcn::Color(255, 32, 32));
+        int dy = (target->getType() == Being::PLAYER) ? 80 : 42;
+
+        std::string mobName = "";
+
+        if (target->mJob >= 1002)
+        {
+            int mobId = target->mJob - 1002;
+            mobName = MonsterDB::get(mobId).getName();
+
+            graphics->drawText(mobName,
+                    target->getPixelX() - mCameraX + 15,
+                    target->getPixelY() - mCameraY - dy,
+                    gcn::Graphics::CENTER);
+        }
+    }
+
+    // Draw contained widgets
+    WindowContainer::draw(gcnGraphics);
+}
+
+void
+Viewport::logic()
+{
+    WindowContainer::logic();
+
+    if (!mMap || !player_node)
+        return;
+
+    int mouseX, mouseY;
+    Uint8 button = SDL_GetMouseState(&mouseX, &mouseY);
+
+    if (mPlayerFollowMouse && button & SDL_BUTTON(1) &&
+            mWalkTime != player_node->mWalkTime)
+    {
+        player_node->setDestination(mouseX + mCameraX,
+                                    mouseY + mCameraY);
+        mWalkTime = player_node->mWalkTime;
+    }
+}
+
+void
+Viewport::mousePress(int mx, int my, int button)
+{
+    // Check if we are alive and kickin'
+    if (!mMap || !player_node || player_node->mAction == Being::DEAD)
+        return;
+
+    // Check if we are busy
+    if (current_npc)
+        return;
+
+    mPlayerFollowMouse = false;
+
+    int tilex = (mx + mCameraX) / 32;
+    int tiley = (my + mCameraY) / 32;
+
+    // Right click might open a popup
+    if (button == gcn::MouseInput::RIGHT)
+    {
+        Being *being;
+        FloorItem *floorItem;
+
+        if ((being = beingManager->findBeing(tilex, tiley)) &&
+                being->getType() != Being::LOCALPLAYER)
+        {
+            showPopup(mx, my, being);
+            return;
+        }
+        else if((floorItem = floorItemManager->findByCoordinates(tilex, tiley)))
+        {
+            showPopup(mx, my, floorItem);
+            return;
+        }
+    }
+
+    // If a popup is active, just remove it
+    if (mPopupActive)
+    {
+        mPopupMenu->setVisible(false);
+        mPopupActive = false;
+        return;
+    }
+
+    // Left click can cause different actions
+    if (button == gcn::MouseInput::LEFT)
+    {
+        Being *being;
+        FloorItem *item;
+
+        // Interact with some being
+        if ((being = beingManager->findBeing(tilex, tiley)))
+        {
+            switch (being->getType())
+            {
+                case Being::NPC:
+                    dynamic_cast<NPC*>(being)->talk();
+                    break;
+
+                case Being::MONSTER:
+                case Being::PLAYER:
+                    if (being->mAction == Being::DEAD)
+                        break;
+
+                    player_node->attack(being, true);
+                    break;
+
+                default:
+                    break;
+            }
+        }
+        // Pick up some item
+        else if ((item = floorItemManager->findByCoordinates(tilex, tiley)))
+        {
+                player_node->pickUp(item);
+        }
+        // Just walk around
+        else if (mMap->getWalk(tilex, tiley))
+        {
+            // XXX XXX XXX REALLY UGLY!
+            Uint8 *keys = SDL_GetKeyState(NULL);
+            if (!(keys[SDLK_LSHIFT] || keys[SDLK_RSHIFT]))
+            {
+                player_node->setDestination(mx + mCameraX, my + mCameraY);
+                player_node->stopAttack();
+            }
+            mPlayerFollowMouse = true;
+        }
+    }
+
+    if (button == gcn::MouseInput::MIDDLE)
+    {
+        // Find the being nearest to the clicked position
+        Being *target = beingManager->findNearestLivingBeing(
+                tilex, tiley,
+                20, Being::MONSTER);
+
+        if (target)
+        {
+            player_node->setTarget(target);
+        }
+    }
+}
+
+void
+Viewport::mouseMotion(int mx, int my)
+{
+    if (!mMap || !player_node)
+        return;
+
+    if (mPlayerFollowMouse && mWalkTime == player_node->mWalkTime)
+    {
+        player_node->setDestination(mx + mCameraX, my + mCameraY);
+    }
+}
+
+void
+Viewport::mouseRelease(int mx, int my, int button)
+{
+    mPlayerFollowMouse = false;
+}
+
+void
+Viewport::showPopup(int x, int y, Item *item)
+{
+    mPopupMenu->showPopup(x, y, item);
+    mPopupActive = true;
+}
+
+void
+Viewport::showPopup(int x, int y, FloorItem *floorItem)
+{
+    mPopupMenu->showPopup(x, y, floorItem);
+    mPopupActive = true;
+}
+
+void
+Viewport::showPopup(int x, int y, Being *being)
+{
+    mPopupMenu->showPopup(x, y, being);
+    mPopupActive = true;
+}
+
+void
+Viewport::optionChanged(const std::string &name)
+{
+    mScrollLaziness = (int) config.getValue("ScrollLaziness", 32);
+    mScrollRadius = (int) config.getValue("ScrollRadius", 32);
+}
-- 
cgit v1.2.3-70-g09d2


From b2ef30efb59c8aa4df3bbaab376d46c583a40d98 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Wed, 27 Dec 2006 20:39:21 +0000
Subject: Client-sided implementation of attacks

---
 ChangeLog                     | 13 +++++++++-
 src/game.cpp                  | 43 +++++++++------------------------
 src/gui/popupmenu.cpp         |  8 -------
 src/gui/viewport.cpp          | 23 +-----------------
 src/localplayer.cpp           | 55 +++++++------------------------------------
 src/localplayer.h             |  3 +--
 src/net/beinghandler.cpp      | 17 +++++++++----
 src/net/beinghandler.h        |  1 +
 src/net/connection.cpp        |  4 ++--
 src/net/connection.h          |  3 ++-
 src/net/gameserver/player.cpp |  7 ++++++
 src/net/gameserver/player.h   |  1 +
 src/net/playerhandler.cpp     |  1 -
 src/net/protocol.h            |  2 ++
 14 files changed, 61 insertions(+), 120 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index c67d6cd6..6174fbe1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-12-06  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/game.cpp, src/gui/popupmenu.cpp, src/gui/viewport.cpp,
+	src/localplayer.cpp, src/localplayer.h, src/net/beinghandler.cpp,
+	src/net/beinghandler.h, src/net/connection.cpp, src/net/connection.h,
+	src/net/gameserver/player.cpp, src/net/gameserver/player.h,
+	src/net/playerhandler.cpp, src/net/protocol.h:
+	Attacks are now targetless one-time events. The server is informed when the
+	client performs an attack and attack messages from the server are received
+	and displayed.
+
 2006-12-09  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
 	* data/graphics/sprites/npcs.png: Added pirate NPC.
@@ -1672,7 +1683,7 @@
 	passing a NULL pointer as image argument.
 	* data/graphics/sprites/player_male_base.xml: Animation file now has
 	the syntax described on the wiki.
-	
+
 2006-06-27  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
 	* data/graphics/sprites/Makefile.am,
diff --git a/src/game.cpp b/src/game.cpp
index 15298ec6..21b6008e 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -509,6 +509,17 @@ void Game::handleInput()
                     }
                     break;
 
+                // attacking
+                // TODO: Reimplement attacking with joystick buttons
+                //       (old code allowed permanent attacking and not 1 attack
+                //       with each button push)
+                //       I would like to do this but i don't own a joystick.
+                case SDLK_LCTRL:
+                case SDLK_RCTRL:
+                    player_node->attack();
+                    used = true;
+                    break;
+
                     // Quitting confirmation dialog
                 case SDLK_ESCAPE:
                     if (!exitConfirm) {
@@ -651,38 +662,6 @@ void Game::handleInput()
 
         player_node->walk(direction);
 
-        // Attacking monsters
-        if (keys[SDLK_LCTRL] || keys[SDLK_RCTRL] ||
-                joystick && joystick->buttonPressed(0))
-        {
-            Being *target = NULL;
-            bool newTarget = keys[SDLK_LSHIFT] || keys[SDLK_RSHIFT];
-
-            // A set target has highest priority
-            if (newTarget || !player_node->getTarget())
-            {
-                Uint16 targetX = x, targetY = y;
-
-                if (player_node->getDirection() & Being::UP)
-                    targetY--;
-                if (player_node->getDirection() & Being::DOWN)
-                    targetY++;
-                if (player_node->getDirection() & Being::LEFT)
-                    targetX--;
-                if (player_node->getDirection() & Being::RIGHT)
-                    targetX++;
-
-                // Attack priority is: Monster, Player, auto target
-                target = beingManager->findBeing(
-                        targetX, targetY, Being::MONSTER);
-                if (!target)
-                    target = beingManager->findBeing(
-                            targetX, targetY, Being::PLAYER);
-            }
-
-            player_node->attack(target, newTarget);
-        }
-
         // Target the nearest monster if 'a' pressed
         if (keys[SDLK_a])
         {
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index c2959e1d..c7c77ef4 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -136,14 +136,6 @@ void PopupMenu::handleLink(const std::string& link)
         tradePartnerName = mBeing->getName();
     }
 
-    // Attack action
-    else if (link == "attack" &&
-             mBeing != NULL &&
-             mBeing->getType() == Being::PLAYER)
-    {
-        player_node->attack(mBeing, true);
-    }
-
     /*
     // Follow Player action
     else if (link == "follow")
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index d0525a2f..f26d8d70 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -291,29 +291,9 @@ Viewport::mousePress(int mx, int my, int button)
         Being *being;
         FloorItem *item;
 
-        // Interact with some being
-        if ((being = beingManager->findBeing(tilex, tiley)))
-        {
-            switch (being->getType())
-            {
-                case Being::NPC:
-                    dynamic_cast<NPC*>(being)->talk();
-                    break;
-
-                case Being::MONSTER:
-                case Being::PLAYER:
-                    if (being->mAction == Being::DEAD)
-                        break;
 
-                    player_node->attack(being, true);
-                    break;
-
-                default:
-                    break;
-            }
-        }
         // Pick up some item
-        else if ((item = floorItemManager->findByCoordinates(tilex, tiley)))
+        if ((item = floorItemManager->findByCoordinates(tilex, tiley)))
         {
                 player_node->pickUp(item);
         }
@@ -325,7 +305,6 @@ Viewport::mousePress(int mx, int my, int button)
             if (!(keys[SDLK_LSHIFT] || keys[SDLK_RSHIFT]))
             {
                 player_node->setDestination(mx + mCameraX, my + mCameraY);
-                player_node->stopAttack();
             }
             mPlayerFollowMouse = true;
         }
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index c887dd1c..6918fa60 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -51,11 +51,6 @@ LocalPlayer::~LocalPlayer()
 
 void LocalPlayer::logic()
 {
-    if (mAction == ATTACK && get_elapsed_time(mWalkTime) >= mAttackSpeed)
-    {
-        attack();
-    }
-
     // Actions are allowed once per second
     if (get_elapsed_time(mLastAction) >= 1000) {
         mLastAction = -1;
@@ -166,7 +161,6 @@ void LocalPlayer::pickUp(FloorItem *item)
     } else {
         setDestination(item->getX() * 32 + 16, item->getY() * 32 + 16);
         mPickUpTarget = item;
-        stopAttack();
     }
 }
 
@@ -352,59 +346,26 @@ bool LocalPlayer::tradeRequestOk() const
     return !mTrading;
 }
 
-void LocalPlayer::attack(Being *target, bool keep)
+void LocalPlayer::attack()
 {
-    // Can only attack when standing still
-    if (mAction != STAND)
+    if (mLastAction != -1)
         return;
 
-    if (keep && target)
-        mTarget = target;
-    else if (mTarget)
-        target = mTarget;
-
-    if (!target)
+    // Can only attack when standing still
+    if (mAction != STAND && mAction != ATTACK)
         return;
 
-    int dist_x = target->mX - mX;
-    int dist_y = target->mY - mY;
-
-    if (abs(dist_y) >= abs(dist_x))
-    {
-        if (dist_y > 0)
-            setDirection(DOWN);
-        else
-            setDirection(UP);
-    }
-    else
-    {
-        if (dist_x > 0)
-            setDirection(RIGHT);
-        else
-            setDirection(LEFT);
-    }
-
-    // Implement charging attacks here
-    mLastAttackTime = 0;
+    mLastAction = tick_time;
+    mWalkTime = tick_time;
 
     setAction(ATTACK);
-    mWalkTime = tick_time;
+
     if (getWeapon() == 2)
         sound.playSfx("sfx/bow_shoot_1.ogg");
     else
         sound.playSfx("sfx/fist-swish.ogg");
 
-    // XXX Convert for new server
-    /*
-    MessageOut outMsg(0x0089);
-    outMsg.writeLong(target->getId());
-    outMsg.writeByte(0);
-    */
-}
-
-void LocalPlayer::stopAttack()
-{
-    mTarget = NULL;
+    Net::GameServer::Player::attack();
 }
 
 Being* LocalPlayer::getTarget() const
diff --git a/src/localplayer.h b/src/localplayer.h
index f632b1b9..59b59812 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -103,8 +103,7 @@ class LocalPlayer : public Player
          */
         void setTrading(bool trading) { mTrading = trading; }
 
-        void attack(Being *target=NULL, bool keep=false);
-        void stopAttack();
+        void attack();
         Being* getTarget() const;
 
         /**
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 6d8ff6c6..c6db8e33 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -53,6 +53,7 @@ BeingHandler::BeingHandler()
         //SMSG_PLAYER_UPDATE_2,
         //SMSG_PLAYER_MOVE,
         //0x0119,
+        GPMSG_BEING_ATTACK,
         GPMSG_BEING_ENTER,
         GPMSG_BEING_LEAVE,
         GPMSG_BEINGS_MOVE,
@@ -85,6 +86,9 @@ void BeingHandler::handleMessage(MessageIn &msg)
         case GPMSG_BEINGS_MOVE:
             handleBeingsMoveMessage(msg);
             break;
+        case GPMSG_BEING_ATTACK:
+            handleBeingAttackMessage(msg);
+            break;
 
         /*
         case SMSG_BEING_VISIBLE:
@@ -432,10 +436,7 @@ void BeingHandler::handleBeingLeaveMessage(MessageIn &msg)
 {
     Being *being = beingManager->findBeing(msg.readShort());
     if (!being) return;
-    if (being == player_node->getTarget())
-    {
-        player_node->stopAttack();
-    }
+
     beingManager->destroyBeing(being);
 }
 
@@ -489,3 +490,11 @@ void BeingHandler::handleBeingsMoveMessage(MessageIn &msg)
         }
     }
 }
+
+void BeingHandler::handleBeingAttackMessage(MessageIn &msg)
+{
+    Being *being = beingManager->findBeing(msg.readShort());
+    if (!being) return;
+
+    being->setAction(Being::ATTACK);
+}
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index 59539ffe..ca6ad1b6 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -34,6 +34,7 @@ class BeingHandler : public MessageHandler
         void handleMessage(MessageIn &msg);
 
     private:
+        void handleBeingAttackMessage(MessageIn &msg);
         void handleBeingEnterMessage(MessageIn &msg);
         void handleBeingLeaveMessage(MessageIn &msg);
         void handleBeingsMoveMessage(MessageIn &msg);
diff --git a/src/net/connection.cpp b/src/net/connection.cpp
index a17bc727..4ce05d4a 100644
--- a/src/net/connection.cpp
+++ b/src/net/connection.cpp
@@ -48,7 +48,7 @@ bool Net::Connection::connect(const std::string &address, short port)
     if (address.empty())
     {
         logger->log("Net::Connection::connect() got empty address!");
-        mState = ERROR;
+        mState = NET_ERROR;
         return false;
     }
 
@@ -63,7 +63,7 @@ bool Net::Connection::connect(const std::string &address, short port)
     if (!mConnection)
     {
         logger->log("Unable to initiate connection to the server.");
-        mState = ERROR;
+        mState = NET_ERROR;
         return false;
     }
 
diff --git a/src/net/connection.h b/src/net/connection.h
index 179367c6..d8ea3124 100644
--- a/src/net/connection.h
+++ b/src/net/connection.h
@@ -36,7 +36,8 @@ namespace Net
     {
         public:
             enum State {
-                OK, ERROR
+                OK,
+                NET_ERROR
             };
 
             ~Connection();
diff --git a/src/net/gameserver/player.cpp b/src/net/gameserver/player.cpp
index 1f27276a..46cee230 100644
--- a/src/net/gameserver/player.cpp
+++ b/src/net/gameserver/player.cpp
@@ -66,3 +66,10 @@ void Net::GameServer::Player::equip(int itemId, char slot)
 
     Net::GameServer::connection->send(msg);
 }
+
+void Net::GameServer::Player::attack()
+{
+    MessageOut msg(PGMSG_ATTACK);
+
+    Net::GameServer::connection->send(msg);
+}
diff --git a/src/net/gameserver/player.h b/src/net/gameserver/player.h
index 34d5bb45..3fb21516 100644
--- a/src/net/gameserver/player.h
+++ b/src/net/gameserver/player.h
@@ -39,6 +39,7 @@ namespace Net
 //            void pickUp(...);
             void useItem(int itemId);
             void equip(int itemId, char slot);
+            void attack();
         }
     }
 }
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 37291c0a..79875d1c 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -309,7 +309,6 @@ PlayerHandler::handleMapChangeMessage(MessageIn &msg)
     current_npc = 0;
 
     player_node->setAction(Being::STAND);
-    player_node->stopAttack();
 
     player_node->mX = x;
     player_node->mY = y;
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 07b5c926..081a70fc 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -159,6 +159,8 @@ enum {
     GPMSG_BEING_LEAVE              = 0x0201, // W being id
     PGMSG_WALK                     = 0x0260, // W*2 destination
     GPMSG_BEINGS_MOVE              = 0x0280, // { W being id, B flags [, C position] [, W*2 destination] }*
+    PGMSG_ATTACK                   = 0x0290, // -
+    GPMSG_BEING_ATTACK             = 0x0291, // W being id
     PGMSG_SAY                      = 0x02A0, // S text
     GPMSG_SAY                      = 0x02A1, // W being id, S text
     PGMSG_USE_ITEM                 = 0x0300, // L item id
-- 
cgit v1.2.3-70-g09d2


From 768cf33e1b66994379ac757aae0589bee83a2e7f Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@gmail.com>
Date: Sun, 31 Dec 2006 17:42:24 +0000
Subject: Enumerations do not need out-of-class definitions.

---
 ChangeLog            | 6 ++++++
 src/being.cpp        | 5 -----
 src/being.h          | 5 +----
 src/gui/viewport.cpp | 2 --
 src/joystick.h       | 7 ++-----
 5 files changed, 9 insertions(+), 16 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index 7c6c96b5..77cad7fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-31  Guillaume Melquiond <guillaume.melquiond@gmail.com>
+
+	* src/being.h, src/being.cpp, src/joystick.h: Scrapped static const
+	integral members and replaced them with enumerations.
+	* src/gui/viewport.cpp: Removed unused variable.
+
 2006-12-31  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/being.cpp: Added some variable definitions since they were
diff --git a/src/being.cpp b/src/being.cpp
index abf64c18..1018b8e1 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -47,11 +47,6 @@ PATH_NODE::PATH_NODE(Uint16 iX, Uint16 iY):
 {
 }
 
-const char Being::DOWN;
-const char Being::LEFT;
-const char Being::UP;
-const char Being::RIGHT;
-
 Being::Being(Uint16 id, Uint16 job, Map *map):
     mJob(job),
     mX(0), mY(0),
diff --git a/src/being.h b/src/being.h
index 8bb382ee..6eca252c 100644
--- a/src/being.h
+++ b/src/being.h
@@ -91,10 +91,7 @@ class Being : public Sprite
         /**
          * Directions, to be used as bitmask values
          */
-        static const char DOWN = 1;
-        static const char LEFT = 2;
-        static const char UP = 4;
-        static const char RIGHT = 8;
+        enum { DOWN = 1, LEFT = 2, UP = 4, RIGHT = 8 };
 
         std::string mName;      /**< Name of character */
         Uint16 mJob;            /**< Job (player job, npc, monster, ) */
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index f26d8d70..3346c07a 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -288,10 +288,8 @@ Viewport::mousePress(int mx, int my, int button)
     // Left click can cause different actions
     if (button == gcn::MouseInput::LEFT)
     {
-        Being *being;
         FloorItem *item;
 
-
         // Pick up some item
         if ((item = floorItemManager->findByCoordinates(tilex, tiley)))
         {
diff --git a/src/joystick.h b/src/joystick.h
index f0759add..321e3e7d 100644
--- a/src/joystick.h
+++ b/src/joystick.h
@@ -32,15 +32,12 @@ class Joystick
         /**
          * Number of buttons we can handle.
          */
-        static const unsigned char MAX_BUTTONS = 6;
+        enum { MAX_BUTTONS = 6 };
 
         /**
          * Directions, to be used as bitmask values.
          */
-        static const char UP = 1;
-        static const char DOWN = 2;
-        static const char LEFT = 4;
-        static const char RIGHT = 8;
+        enum { UP = 1, DOWN = 2, LEFT = 4, RIGHT = 8 };
 
         /**
          * Initializes the joystick subsystem.
-- 
cgit v1.2.3-70-g09d2


From 4eec29ac0f6a9b05562ac0fbe3d4e5d7e82deeac Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 4 Jan 2007 02:20:38 +0000
Subject: Merged 0.0 changes from revision 2898 to 2988 to trunk.

---
 ChangeLog                              | 181 +++++++++++++++++++++++++++++++++
 INSTALL                                |   2 +-
 NEWS                                   |   8 +-
 README                                 |   2 +-
 configure.ac                           |   3 -
 data/CMakeLists.txt                    |   9 --
 data/Makefile.am                       |   9 +-
 data/graphics/CMakeLists.txt           |   1 -
 data/graphics/Makefile.am              |   2 +-
 data/graphics/images/CMakeLists.txt    |  14 +--
 data/graphics/images/Makefile.am       |  14 +--
 data/help/header.txt                   |   2 +-
 docs/INSTALL/ubuntu.txt                |  43 ++++++++
 docs/INSTALL/win32.txt                 |   5 +-
 src/CMakeLists.txt                     |  12 +--
 src/Makefile.am                        |  12 +--
 src/action.cpp                         |  66 ------------
 src/action.h                           |  61 -----------
 src/animatedsprite.cpp                 |   6 +-
 src/animatedsprite.h                   |   9 +-
 src/animation.cpp                      |  55 ----------
 src/animation.h                        | 101 ------------------
 src/base64.cpp                         | 149 ---------------------------
 src/base64.h                           |  37 -------
 src/being.cpp                          |  33 +++---
 src/being.h                            |   1 -
 src/engine.cpp                         |  32 +-----
 src/engine.h                           |   9 +-
 src/game.cpp                           |   4 +-
 src/gui/buy.cpp                        |  57 +++++------
 src/gui/chargedialog.cpp               |   1 +
 src/gui/listbox.cpp                    |   7 +-
 src/gui/listbox.h                      |   4 +-
 src/gui/sell.cpp                       |   3 +-
 src/gui/shop.cpp                       |   2 +-
 src/gui/shoplistbox.cpp                | 142 ++++++++++----------------
 src/gui/shoplistbox.h                  |  20 +---
 src/gui/updatewindow.cpp               | 175 +++++++++++++++++++------------
 src/gui/updatewindow.h                 |   9 +-
 src/gui/viewport.cpp                   |   4 +-
 src/guichanfwd.h                       |   5 +-
 src/inventory.h                        |   7 ++
 src/localplayer.cpp                    |  19 +++-
 src/localplayer.h                      |  17 +++-
 src/main.cpp                           |  20 ++--
 src/main.h                             |   3 +-
 src/net/playerhandler.cpp              |  16 +++
 src/npc.cpp                            |   1 -
 src/resources/action.cpp               |  67 ++++++++++++
 src/resources/action.h                 |  61 +++++++++++
 src/resources/animation.cpp            |  53 ++++++++++
 src/resources/animation.h              |  99 ++++++++++++++++++
 src/resources/equipmentdb.cpp          |   3 +
 src/resources/image.cpp                |   6 +-
 src/resources/itemdb.cpp               |   8 ++
 src/resources/itemdb.h                 |   6 +-
 src/resources/mapreader.cpp            |   2 +-
 src/resources/monsterdb.cpp            |   8 ++
 src/resources/openglsdlimageloader.cpp |   3 +-
 src/resources/openglsdlimageloader.h   |   3 +-
 src/resources/spritedef.cpp            |  37 ++++---
 src/resources/spritedef.h              |   3 -
 src/resources/spriteset.cpp            |   2 +-
 src/tmw.rc                             |  41 +++-----
 src/utils/base64.cpp                   | 149 +++++++++++++++++++++++++++
 src/utils/base64.h                     |  37 +++++++
 src/utils/wingettimeofday.h            |   8 +-
 src/winver.h                           |   6 ++
 tmw.cbp                                |  72 ++++++-------
 69 files changed, 1139 insertions(+), 929 deletions(-)
 create mode 100644 docs/INSTALL/ubuntu.txt
 delete mode 100644 src/action.cpp
 delete mode 100644 src/action.h
 delete mode 100644 src/animation.cpp
 delete mode 100644 src/animation.h
 delete mode 100644 src/base64.cpp
 delete mode 100644 src/base64.h
 create mode 100644 src/resources/action.cpp
 create mode 100644 src/resources/action.h
 create mode 100644 src/resources/animation.cpp
 create mode 100644 src/resources/animation.h
 create mode 100644 src/utils/base64.cpp
 create mode 100644 src/utils/base64.h
 create mode 100644 src/winver.h

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index d2cc233c..d75d457a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,187 @@
 	performs an attack and attack messages from the server are received
 	and displayed.
 
+2006-12-25  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* data/graphics/tiles/christmastree.png, data/maps/new_11-1.tmx.gz:
+	Added Christmas tree by Pauan.
+	* data/graphics/sprites/head-christmastree.xml: Fixed name of image.
+	* src/resources/spriteset.cpp: Fixed index check to prevent crashing.
+	* data/graphics/sprites/head-christmastreehat.png,
+	data/graphics/sprites/head-rangerhat.png,
+	data/graphics/sprites/head-christmastree.xml,
+	data/graphics/sprites/head-antlerhat.xml,
+	data/graphics/sprites/head-santabeardhat.xml,
+	data/graphics/sprites/head-santabeardhat.png,
+	data/graphics/sprites/head-rangerhat.xml: Updates to Pauan's recent
+	sprites by Pauan.
+	* data/items.xml: Fixes to descriptions and weights by Pauan.
+
+2006-12-24  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/shoplistbox.cpp: Don't try to draw an icon when it is not
+	defined or failed to load properly.
+	* src/resources/image.cpp: Major rendering performance increase in
+	software mode, by not using RLE compression on loaded images while
+	most of the time, we're only drawing a small subimage of them.
+	* README, data/help/header.txt, NEWS: Filled in release dates.
+
+2006-12-23  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* configure.ac, data/graphics/items/Makefile.am,
+	data/graphics/items/CMakeLists.txt, data/graphics/images/Makefile.am,
+	data/graphics/images/CMakeLists.txt,
+	data/graphics/sprites/Makefile.am,
+	data/graphics/sprites/CMakeLists.txt, data/graphics/Makefile.am,
+	data/graphics/CMakeLists.txt, data/maps/Makefile.am,
+	data/maps/CMakeLists.txt, data/sfx/Makefile.am,
+	data/sfx/CMakeLists.txt, data/Makefile.am, data/CMakeLists.txt:
+	Removed database files, minimaps, items, monster sprites, maps and
+	sounds from the release. They will be released dynamically only.
+	* data/graphics/tiles/snow_x3.png: Added bottom of Christmas tree by
+	pauan.
+	* src/main.cpp, src/resources/itemdb.h, src/resources/monsterdb.cpp,
+	src/resources/itemdb.cpp, src/resources/equipmentdb.cpp: Load the
+	databases at the start of the LOGIN state, after the updates are
+	loaded.
+
+2006-12-22  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* data/graphics/items/armor-head-rangerhat.png,
+	data/graphics/items/generic-redstocking.png,
+	data/graphics/items/armor-head-christmastree.png,
+	data/graphics/items/armor-head-antlerhat.png,
+	data/graphics/items/armor-head-santabeardhat.png,
+	data/graphics/sprites/head-christmastreehat.png,
+	data/graphics/sprites/head-rangerhat.png,
+	data/graphics/sprites/head-christmastree.xml,
+	data/graphics/sprites/head-antlerhat.xml,
+	data/graphics/sprites/head-santabeardhat.xml,
+	data/graphics/sprites/head-antlerhat.png,
+	data/graphics/sprites/head-santabeardhat.png,
+	data/graphics/sprites/head-rangerhat.xml, data/items.xml,
+	data/equipment.xml, data/monsters.xml: Added new Christmas themed
+	headwear by Pauan.
+	* data/graphics/items/Makefile.am, data/graphics/items/CMakeLists.txt,
+	data/graphics/sprites/Makefile.am,
+	data/graphics/sprites/CMakeLists.txt, data/Makefile.am,
+	data/CMakeLists.txt: Updated Makefiles.
+
+2006-12-21  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* configure.ac, CMakeLists.txt, README, data/help/header.txt: Updated
+	version to 0.0.22.
+
+2006-12-18  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/items/armor-chest-vnecksweater.png: New version of
+	the inventory icon for the V-neck sweater by Saphy.
+
+2006-12-17  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/sell.cpp, src/gui/shoplistbox.h, src/gui/listbox.h,
+	src/gui/shop.cpp, src/gui/buy.cpp, src/gui/shoplistbox.cpp,
+	src/gui/listbox.cpp: Subclassed ShopListBox from ListBox to get rid of
+	some duplicated code, and fixed a problem with scrolling to the
+	current selection. Also aligned the text a bit better and put the
+	price in parenthesis.
+
+2006-12-16  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/connection.cpp, src/gui/chargedialog.cpp: Fixed dialog
+	visibility.
+	* src/localplayer.cpp, src/game.cpp, src/localplayer.h: Fixed issues
+	with walking one tile too many and changing direction towards an
+	obstacle.
+
+2006-12-15  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/tiles/desert1.png: Removed some unused legacy tiles and 
+	added variant tiles for the cliffs.
+
+2006-12-14  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/game.cpp, src/engine.h, src/engine.cpp: Removed the rather
+	useless remaining draw function from the engine class.
+	* src/being.cpp, src/being.h: Fixed an issue with fading out damage
+	texts (they were sometimes fully opaque at the end of fading out).
+
+2006-12-12  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* The Mana World.dev, tmw.cbp: Updated project files.
+	* src/gui/updatewindow.cpp, src/gui/updatewindow.h, src/main.cpp:
+	Added Adler32 checksum for updates.
+	* src/net/playerhandler.cpp: Fixed crash when selecting an item after
+	death.
+	* data/items.xml: Fixed defense values for sweaters.
+	* src/net/playerhandler.cpp: Hide all NPC dialogs after death.
+
+2006-12-12  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/animatedsprite.h, src/CMakeLists.txt, src/animatedsprite.cpp,
+	src/resources/action.h, src/resources/animation.h,
+	src/resources/spritedef.cpp, src/resources/action.cpp,
+	src/resources/animation.cpp, src/resources/spritedef.h: Moved
+	Action, Animation and Frame (renamed from AnimationPhase) classes into
+	the resources directory, since they are part of the SpriteDef class.
+	* src/CMakeLists.txt, src/utils/base64.cpp, src/utils/base64.h,
+	src/Makefile.am, src/resources/mapreader.cpp: Moved base64 module into
+	utils directory.
+	* src/engine.cpp, src/npc.cpp: Cleaned up some unused stuff.
+
+2006-12-12  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/sfx/bat-dying1.ogg, data/sfx/bat-hit1.ogg,
+	data/sfx/bow_shoot_1.ogg, data/sfx/fire-goblin-hit1.ogg
+	data/sfx/fire-goblin-hit2.ogg, data/sfx/fire-goblin-miss1.ogg,
+	data/sfx/fist-swish.ogg, data/sfx/flower-hit1.ogg,
+	data/sfx/flower-hit2.ogg, data/sfx/flower-miss1.ogg,
+	data/sfx/fluffy-hit1.ogg, data/sfx/fluffy-hit2.ogg,
+	data/sfx/fluffy-hit3.ogg, data/sfx/fluffy-hurt1.ogg,
+	data/sfx/fluffy-miss1.ogg, data/sfx/knife-hit1.ogg,
+	data/sfx/knife-miss1.ogg, data/sfx/levelup.ogg
+	data/sfx/scorpion-hit1.ogg, data/sfx/scorpion-hit2.ogg
+	data/sfx/scorpion-hit3.ogg, data/sfx/scorpion-hit4.ogg
+	data/sfx/scorpion-miss1.ogg, data/sfx/short-sword-hit1.ogg
+	data/sfx/short-sword-miss1.ogg, data/sfx/shroom-hit1.ogg
+	data/sfx/slime-hit1.ogg:
+	Normalized versions of sound effects by Cosmostrator.
+
+2006-12-11  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/updatewindow.cpp: Fixed visibility of the update window.
+
+2006-12-11  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/equipment.xml, data/items.xml,
+	data/graphics/sprites/chest-tnecksweater-male.png,
+	data/graphics/sprites/chest-tnecksweater-female.png,
+	data/graphics/sprites/chest-vnecksweater-male.png,
+	data/graphics/sprites/chest-vnecksweater-female.png,
+	data/graphics/sprites/chest-tnecksweater-male.xml,
+	data/graphics/sprites/chest-tnecksweater-female.xml,
+	data/graphics/sprites/chest-vnecksweater-male.xml,
+	data/graphics/sprites/chest-vnecksweater-female.xml,
+	data/graphics/sprites/Makefile.AM,
+	data/graphics/sprites/CMakeLists.txt,
+	data/graphics/items/armor-chest-vnecksweater.png,
+	data/graphics/items/armor-chest-tnecksweater.png,
+	data/graphics/items/armor-chest-woolsweater.png,
+	data/graphics/items/Makefile.AM, data/graphics/items/CMakeLists.txt:
+	Added new sweaters by Saphy. Info for server admins: Item IDs are 564
+	for turtleneck (should already be in there) and 624 for v-neck. The
+	visible sprite IDs are 19 for turtleneck and 20 for v-neck.
+
+2006-12-11  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* src/main.h, src/tmw.rc, src/winver.h, The Mana World.dev, tmw.cbp:
+	Fixed windows binary version.
+
+2006-12-10  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* docs/INSTALL/win32.txt: Added more detailed instructions for Dev-C++
+	users.
+
 2006-12-09  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
 	* data/graphics/sprites/npcs.png: Added pirate NPC.
diff --git a/INSTALL b/INSTALL
index a4f269e1..5b3eb3f2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -39,7 +39,7 @@ you to figure this out.
 ==========================================
 
 1) Go to the directory you have extracted the source to.
-2) If you checked out from CVS, run "./autogen.sh" to generate configure.
+2) If you checked out from SVN, run "./autogen.sh" to generate configure.
 3) Run "./configure"
 4) Run "make"
 5) Run "make install" as root
diff --git a/NEWS b/NEWS
index f3b586f8..9edd05b6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,17 @@
-0.0.22 (...)
+0.0.22 (24 December 2006)
 - Added support for female-specific equipment graphics
 - Added support for monster sounds
+- Added item icons to buy/sell dialogs
+- Enhanced character select dialog to show equipment
 - Changed to new update host (http://updates.themanaworld.org)
 - Worked around a Guichan exception thrown for mice with many buttons
 - Changed mouse walk to keep following mouse while button is held down
-- Extended font support for å and Å.
+- Extended font support for å and Å
+- Disabled RLE compression on all surfaces in software mode
 - Fixed joystick setting not to show disabled when it's actually enabled
 - Fixed money field to no longer hide below the bottom of the window
 - Fixed pathfinding to allow walking through beings when they block your path
+- Fixed an issue with NPC dialogs staying open after player respawn
 
 0.0.21.1 (30 October 2006)
 - Reload wallpaper after loading updates
diff --git a/README b/README
index 54a6dcaf..342524ec 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA WORLD
 ==============
 
- Version: 0.0.21.1    Date: 30/10/2006
+ Version: 0.0.22    Date: 24/12/2006
 
 
  Development team:
diff --git a/configure.ac b/configure.ac
index d32aee08..ca31930e 100755
--- a/configure.ac
+++ b/configure.ac
@@ -113,13 +113,10 @@ data/graphics/Makefile
 data/graphics/gui/Makefile
 data/graphics/images/Makefile
 data/graphics/images/ambient/Makefile
-data/graphics/items/Makefile
 data/graphics/sprites/Makefile
 data/graphics/tiles/Makefile
 data/help/Makefile
 data/icons/Makefile
-data/maps/Makefile
-data/sfx/Makefile
 docs/Makefile
 ])
 
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index e60bfe30..3c482b49 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -3,12 +3,3 @@ SET(DATA_DIR ${PKG_DATADIR}/data)
 ADD_SUBDIRECTORY(graphics)
 ADD_SUBDIRECTORY(help)
 ADD_SUBDIRECTORY(icons)
-ADD_SUBDIRECTORY(maps)
-ADD_SUBDIRECTORY(sfx)
-
-SET(FILES
-	equipment.xml
-    items.xml
-    )
-
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR})
\ No newline at end of file
diff --git a/data/Makefile.am b/data/Makefile.am
index ed080d08..5a28f7c1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,11 +1,4 @@
 
-SUBDIRS = graphics help icons maps sfx
+SUBDIRS = graphics help icons
 
 tmwdatadir = $(pkgdatadir)/data
-
-tmwdata_DATA =			\
-	equipment.xml	\
-	items.xml
-
-EXTRA_DIST =			\
-	$(tmwdata_DATA)
\ No newline at end of file
diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt
index c569e04f..0fa9a7be 100644
--- a/data/graphics/CMakeLists.txt
+++ b/data/graphics/CMakeLists.txt
@@ -1,5 +1,4 @@
 ADD_SUBDIRECTORY(gui)
 ADD_SUBDIRECTORY(images)
-ADD_SUBDIRECTORY(items)
 ADD_SUBDIRECTORY(sprites)
 ADD_SUBDIRECTORY(tiles)
diff --git a/data/graphics/Makefile.am b/data/graphics/Makefile.am
index 19e95869..43354894 100644
--- a/data/graphics/Makefile.am
+++ b/data/graphics/Makefile.am
@@ -1,2 +1,2 @@
 
-SUBDIRS = gui images items sprites tiles
+SUBDIRS = gui images sprites tiles
diff --git a/data/graphics/images/CMakeLists.txt b/data/graphics/images/CMakeLists.txt
index f02cd2ea..a8b6ddbd 100644
--- a/data/graphics/images/CMakeLists.txt
+++ b/data/graphics/images/CMakeLists.txt
@@ -1,18 +1,8 @@
 ADD_SUBDIRECTORY(ambient)
 
 SET(FILES
-	error.png
+    error.png
     login_wallpaper.png
-    minimap_new_1-1.png
-    minimap_new_14-1.png
-    minimap_new_15-1.png
-    minimap_new_16-1.png
-    minimap_new_2-1.png
-    minimap_new_3-1.png
-    minimap_new_5-1.png
-    minimap_new_7-1.png
-    minimap_new_9-1.png
-    minimap_new_17-1.png
     )
 
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/images)
\ No newline at end of file
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/images)
diff --git a/data/graphics/images/Makefile.am b/data/graphics/images/Makefile.am
index 00d9ed7e..be8593f6 100644
--- a/data/graphics/images/Makefile.am
+++ b/data/graphics/images/Makefile.am
@@ -4,17 +4,7 @@ imagesdir = $(pkgdatadir)/data/graphics/images
 
 images_DATA =				\
 	error.png				\
-	login_wallpaper.png		\
-	minimap_new_1-1.png		\
-	minimap_new_2-1.png		\
-	minimap_new_3-1.png		\
-	minimap_new_5-1.png		\
-	minimap_new_7-1.png		\
-	minimap_new_9-1.png		\
-	minimap_new_14-1.png	\
-	minimap_new_15-1.png	\
-	minimap_new_16-1.png	\
-	minimap_new_17-1.png
+	login_wallpaper.png
 
 EXTRA_DIST =				\
-	$(images_DATA)
\ No newline at end of file
+	$(images_DATA)
diff --git a/data/help/header.txt b/data/help/header.txt
index b292388a..4f4c9615 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -2,7 +2,7 @@
 ##1               T  H  E      M  A  N  A      W  O  R  L  D
 ##1               ==========================================
  
-           ##2Version:##6 0.0.21.1                  ##2Date:##30 October 2006
+           ##2Version:##6 0.0.22                  ##2Date:##324 December 2006
  
 ##2                    Website: http://themanaworld.org
  
diff --git a/docs/INSTALL/ubuntu.txt b/docs/INSTALL/ubuntu.txt
new file mode 100644
index 00000000..cf830ccc
--- /dev/null
+++ b/docs/INSTALL/ubuntu.txt
@@ -0,0 +1,43 @@
+How to build a .deb for TMW on Ubuntu
+=====================================
+
+This documentation is for those who are interested in building the .deb files
+of The Mana World. Most people do not need to do this, but can instead use the
+repository. You can find information about how to use the repository on our
+downloads page.
+
+
+1. Installing the dependencies
+==============================
+
+First of all you need a working compiler and package building environment. If
+you don't have this yet, install the following packages:
+
+   apt-get install gcc g++ dh-make fakeroot dpkg-dev build-essentials
+
+In order to compile The Mana World, you'll need the developer packages for
+SDL, SDL_mixer, SDL_image, SDL_net, libxml2, libphysfs and libguichan0.
+
+   apt-get install libsdl1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev ...
+
+(todo: add missing entries)
+(todo: include information about installing Guichan development package)
+
+
+2. Creating the .debs using DebHelper Tools
+===========================================
+
+Either download the source release of TMW that you want to build a package for,
+or check out the appropriate version from Subversion, for example by using the
+tag.
+
+Make sure the files in the debian directory are up to date. You can do this by
+checking out the appropriate directory from Subversion (will be either
+tmw/branches/0.0/debian or tmw/trunk/debian for the latest release).
+
+Now we can build the packages using the following command.
+
+   fakeroot dpkg-buildpackage
+
+The packages will be created in the parent folder.
+
diff --git a/docs/INSTALL/win32.txt b/docs/INSTALL/win32.txt
index ab2a429f..f438a7e7 100644
--- a/docs/INSTALL/win32.txt
+++ b/docs/INSTALL/win32.txt
@@ -45,7 +45,7 @@ the old stable version, so don't do that. Get Dev-C++ here:
 
   http://www.bloodshed.net/
  
-After you fetched it simply run and install.
+After you have fetched it, simply run and install as prompted.
 
 
 3. Installing the required libraries
@@ -63,6 +63,9 @@ to remove anything the devpak might overlap before installing, for example the
 previous devpak.) Remember to copy the required dlls from your dll folder in
 the Dev-Cpp root directory, to the folder where you have your copy of The Mana
 World. You also have to add the SDL include folder in your C++ include paths.
+If you're using Dev-C++, this means: Tools -> Compiler options ->
+-> Directories -> C++ includes -> Browse... (browse to MinGW/include/SDL) ->
+-> Add -> Ok.
 If you can't get the package or you are experiencing problems with it, just
 send me an email at elvenprogrammer@gmail.com or continue reading. (Coming to
 bug us on the IRC channel is a valid alternative too.)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e0b93382..55109ec4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -214,10 +214,14 @@ SET(SRCS
     net/gameserver/internal.h
     net/gameserver/player.cpp
     net/gameserver/player.h
+    resources/action.cpp
+    resources/action.h
     resources/ambientoverlay.cpp
     resources/ambientoverlay.h
     resources/buddylist.cpp
     resources/buddylist.h
+    resources/animation.cpp
+    resources/animation.h
     resources/equipmentdb.cpp
     resources/equipmentdb.h
     resources/equipmentinfo.h
@@ -251,18 +255,14 @@ SET(SRCS
     resources/spritedef.h
     resources/spritedef.cpp
     resources/spriteset.h
+    utils/base64.cpp
+    utils/base64.h
     utils/dtor.h
     utils/tostring.h
     utils/xml.cpp
     utils/xml.h
-    action.cpp
-    action.h
     animatedsprite.cpp
     animatedsprite.h
-    animation.cpp
-    animation.h
-    base64.cpp
-    base64.h
     being.cpp
     being.h
     beingmanager.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 1628df18..777cc30e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -179,8 +179,12 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      net/gameserver/internal.h \
 	      net/gameserver/player.cpp \
 	      net/gameserver/player.h \
+	      resources/action.cpp \
+	      resources/action.h \
 	      resources/ambientoverlay.cpp \
 	      resources/ambientoverlay.h \
+	      resources/animation.cpp \
+	      resources/animation.h \
 	      resources/equipmentdb.cpp \
 	      resources/equipmentdb.h \
 	      resources/equipmentinfo.h \
@@ -216,18 +220,14 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      resources/spriteset.cpp \
 	      resources/buddylist.h \
 	      resources/buddylist.cpp \
+	      utils/base64.cpp \
+	      utils/base64.h \
 	      utils/dtor.h \
 	      utils/tostring.h \
 	      utils/xml.cpp \
 	      utils/xml.h \
-	      action.cpp \
-	      action.h \
 	      animatedsprite.cpp \
 	      animatedsprite.h \
-	      animation.cpp \
-	      animation.h \
-	      base64.cpp \
-	      base64.h \
 	      being.cpp \
 	      being.h \
 	      beingmanager.cpp \
diff --git a/src/action.cpp b/src/action.cpp
deleted file mode 100644
index 148ea105..00000000
--- a/src/action.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#include "action.h"
-
-#include <algorithm>
-
-#include "animation.h"
-#include "utils/dtor.h"
-
-
-Action::Action()
-{
-}
-
-Action::~Action()
-{
-    std::for_each(mAnimations.begin(), mAnimations.end(),
-                  make_dtor(mAnimations));
-}
-
-Animation*
-Action::getAnimation(int direction) const
-{
-    Animations::const_iterator i = mAnimations.find(direction);
-
-    // When the direction isn't defined, try the default
-    if (i == mAnimations.end())
-    {
-        i = mAnimations.find(0);
-    }
-
-    return (i == mAnimations.end()) ? NULL : i->second;
-}
-
-void
-Action::setAnimation(int direction, Animation *animation)
-{
-    // Set first direction as default direction
-    if (mAnimations.empty())
-    {
-        mAnimations[0] = animation;
-    }
-
-    mAnimations[direction] = animation;
-}
diff --git a/src/action.h b/src/action.h
deleted file mode 100644
index 8d5e8d11..00000000
--- a/src/action.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#ifndef _TMW_ACTION_H
-#define _TMW_ACTION_H
-
-#include <map>
-
-#include <libxml/tree.h>
-
-class Animation;
-
-/**
- * An action consists of several animations, one for each direction.
- */
-class Action
-{
-    public:
-        /**
-         * Constructor.
-         */
-        Action();
-
-        /**
-         * Destructor.
-         */
-        ~Action();
-
-        void
-        setAnimation(int direction, Animation *animation);
-
-        Animation*
-        getAnimation(int direction) const;
-
-    protected:
-        typedef std::map<int, Animation*> Animations;
-        typedef Animations::iterator AnimationIterator;
-        Animations mAnimations;
-};
-
-#endif
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 46369c80..3d1979a9 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -23,14 +23,14 @@
 
 #include "animatedsprite.h"
 
-#include "animation.h"
-#include "action.h"
 #include "graphics.h"
 #include "log.h"
 
+#include "resources/action.h"
+#include "resources/animation.h"
+#include "resources/image.h"
 #include "resources/resourcemanager.h"
 #include "resources/spriteset.h"
-#include "resources/image.h"
 
 #include "utils/xml.h"
 
diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index 4e485f14..2257c0f0 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -29,8 +29,9 @@
 #include <map>
 #include <string>
 
+class Animation;
 class Graphics;
-struct AnimationPhase;
+struct Frame;
 
 /**
  * Animates a sprite by adding playback state.
@@ -72,13 +73,13 @@ class AnimatedSprite
 
         /**
          * Inform the animation of the passed time so that it can output the
-         * correct animation phase.
+         * correct animation frame.
          */
         void
         update(int time);
 
         /**
-         * Draw the current animation phase at the coordinates given in screen
+         * Draw the current animation frame at the coordinates given in screen
          * pixels.
          */
         bool
@@ -103,7 +104,7 @@ class AnimatedSprite
         SpriteDef *mSprite;            /**< The sprite definition. */
         Action *mAction;               /**< The currently active action. */
         Animation *mAnimation;         /**< The currently active animation. */
-        AnimationPhase *mFrame;        /**< The currently active frame. */
+        Frame *mFrame;                 /**< The currently active frame. */
         std::string mAnimationFile;
 };
 
diff --git a/src/animation.cpp b/src/animation.cpp
deleted file mode 100644
index 67fdae11..00000000
--- a/src/animation.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#include "animation.h"
-
-#include <algorithm>
-
-#include "utils/dtor.h"
-
-Animation::Animation():
-    mDuration(0)
-{
-}
-
-void
-Animation::addPhase(Image *image, unsigned int delay, int offsetX, int offsetY)
-{
-    // Add new phase to animation list
-    AnimationPhase newPhase = { image, delay, offsetX, offsetY };
-
-    mAnimationPhases.push_back(newPhase);
-    mDuration += delay;
-}
-
-void
-Animation::addTerminator()
-{
-    addPhase(NULL, 0, 0, 0);
-}
-
-bool
-Animation::isTerminator(const AnimationPhase candidate)
-{
-    return (candidate.image == NULL);
-}
diff --git a/src/animation.h b/src/animation.h
deleted file mode 100644
index 85e950d7..00000000
--- a/src/animation.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#ifndef _TMW_ANIMATION_H
-#define _TMW_ANIMATION_H
-
-#include <vector>
-
-#include <libxml/tree.h>
-
-class Image;
-class Spriteset;
-
-/**
- * A single frame in an animation, with a delay and an offset.
- *
- * TODO: Rename this struct to Frame
- */
-struct AnimationPhase
-{
-    Image *image;
-    unsigned int delay;
-    int offsetX;
-    int offsetY;
-};
-
-/**
- * An animation consists of several frames, each with their own delay and
- * offset.
- */
-class Animation
-{
-    public:
-        /**
-         * Constructor.
-         */
-        Animation();
-
-        /**
-         * Appends a new animation at the end of the sequence
-         */
-        void
-        addPhase(Image *image, unsigned int delay, int offsetX, int offsetY);
-
-        /**
-         * Appends an animation terminator that states that the animation
-         * should not loop.
-         */
-        void
-        addTerminator();
-
-        /**
-         * Returns the frame at the specified index.
-         */
-        AnimationPhase*
-        getFrame(int index) { return &(mAnimationPhases[index]); }
-
-        /**
-         * Returns the length of this animation in frames.
-         */
-        unsigned int
-        getLength() const { return mAnimationPhases.size(); }
-
-        /**
-         * Returns the duration of this animation.
-         */
-        int
-        getDuration() const { return mDuration; }
-
-        /**
-         * Determines whether the given animation frame is a terminator.
-         */
-        static bool
-        isTerminator(const AnimationPhase phase);
-
-    protected:
-        std::vector<AnimationPhase> mAnimationPhases;
-        int mDuration;
-};
-
-#endif
diff --git a/src/base64.cpp b/src/base64.cpp
deleted file mode 100644
index 9a8f6356..00000000
--- a/src/base64.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP HTML Embedded Scripting Language Version 3.0                     |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2000 PHP Development Team (See Credits file)      |
-   +----------------------------------------------------------------------+
-   | This program is free software; you can redistribute it and/or modify |
-   | it under the terms of one of the following licenses:                 |
-   |                                                                      |
-   |  A) the GNU General Public License as published by the Free Software |
-   |     Foundation; either version 2 of the License, or (at your option) |
-   |     any later version.                                               |
-   |                                                                      |
-   |  B) the PHP License as published by the PHP Development Team and     |
-   |     included in the distribution in the file: LICENSE                |
-   |                                                                      |
-   | This program is distributed in the hope that it will be useful,      |
-   | but WITHOUT ANY WARRANTY; without even the implied warranty of       |
-   | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        |
-   | GNU General Public License for more details.                         |
-   |                                                                      |
-   | You should have received a copy of both licenses referred to here.   |
-   | If you did not, or have any questions about PHP licensing, please    |
-   | contact core@php.net.                                                |
-   +----------------------------------------------------------------------+
-   | Author: Jim Winstead (jimw@php.net)                                  |
-   +----------------------------------------------------------------------+
-   */
-/* $Id$ */
-
-#include <string.h>
-#include <stdlib.h>
-
-#include "base64.h"
-
-static char base64_table[] =
-{
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
-    'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-    'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
-    'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/', '\0'
-};
-static char base64_pad = '=';
-
-unsigned char *php3_base64_encode(const unsigned char *string, int length, int *ret_length) {
-    const unsigned char *current = string;
-    int i = 0;
-    unsigned char *result = (unsigned char *)malloc(((length + 3 - length % 3) * 4 / 3 + 1) * sizeof(char));
-
-    while (length > 2) { /* keep going until we have less than 24 bits */
-        result[i++] = base64_table[current[0] >> 2];
-        result[i++] = base64_table[((current[0] & 0x03) << 4) + (current[1] >> 4)];
-        result[i++] = base64_table[((current[1] & 0x0f) << 2) + (current[2] >> 6)];
-        result[i++] = base64_table[current[2] & 0x3f];
-
-        current += 3;
-        length -= 3; /* we just handle 3 octets of data */
-    }
-
-    /* now deal with the tail end of things */
-    if (length != 0) {
-        result[i++] = base64_table[current[0] >> 2];
-        if (length > 1) {
-            result[i++] = base64_table[((current[0] & 0x03) << 4) + (current[1] >> 4)];
-            result[i++] = base64_table[(current[1] & 0x0f) << 2];
-            result[i++] = base64_pad;
-        }
-        else {
-            result[i++] = base64_table[(current[0] & 0x03) << 4];
-            result[i++] = base64_pad;
-            result[i++] = base64_pad;
-        }
-    }
-    if(ret_length) {
-        *ret_length = i;
-    }
-    result[i] = '\0';
-    return result;
-}
-
-/* as above, but backwards. :) */
-unsigned char *php3_base64_decode(const unsigned char *string, int length, int *ret_length) {
-    const unsigned char *current = string;
-    int ch, i = 0, j = 0, k;
-    char *chp;
-
-    unsigned char *result = (unsigned char *)malloc(length + 1);
-
-    if (result == NULL) {
-        return NULL;
-    }
-
-    /* run through the whole string, converting as we go */
-    while ((ch = *current++) != '\0') {
-        if (ch == base64_pad) break;
-
-        /* When Base64 gets POSTed, all pluses are interpreted as spaces.
-           This line changes them back.  It's not exactly the Base64 spec,
-           but it is completely compatible with it (the spec says that
-           spaces are invalid).  This will also save many people considerable
-           headache.  - Turadg Aleahmad <turadg@wise.berkeley.edu>
-           */
-
-        if (ch == ' ') ch = '+';
-
-        chp = strchr(base64_table, ch);
-        if (chp == NULL) continue;
-        ch = chp - base64_table;
-
-        switch(i % 4) {
-            case 0:
-                result[j] = ch << 2;
-                break;
-            case 1:
-                result[j++] |= ch >> 4;
-                result[j] = (ch & 0x0f) << 4;
-                break;
-            case 2:
-                result[j++] |= ch >>2;
-                result[j] = (ch & 0x03) << 6;
-                break;
-            case 3:
-                result[j++] |= ch;
-                break;
-        }
-        i++;
-    }
-
-    k = j;
-    /* mop things up if we ended on a boundary */
-    if (ch == base64_pad) {
-        switch(i % 4) {
-            case 0:
-            case 1:
-                free(result);
-                return NULL;
-            case 2:
-                k++;
-            case 3:
-                result[k++] = 0;
-        }
-    }
-    if(ret_length) {
-        *ret_length = j;
-    }
-    result[k] = '\0';
-    return result;
-}
diff --git a/src/base64.h b/src/base64.h
deleted file mode 100644
index ff20ac53..00000000
--- a/src/base64.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP HTML Embedded Scripting Language Version 3.0                     |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997,1998 PHP Development Team (See Credits file)      |
-   +----------------------------------------------------------------------+
-   | This program is free software; you can redistribute it and/or modify |
-   | it under the terms of one of the following licenses:                 |
-   |                                                                      |
-   |  A) the GNU General Public License as published by the Free Software |
-   |     Foundation; either version 2 of the License, or (at your option) |
-   |     any later version.                                               |
-   |                                                                      |
-   |  B) the PHP License as published by the PHP Development Team and     |
-   |     included in the distribution in the file: LICENSE                |
-   |                                                                      |
-   | This program is distributed in the hope that it will be useful,      |
-   | but WITHOUT ANY WARRANTY; without even the implied warranty of       |
-   | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        |
-   | GNU General Public License for more details.                         |
-   |                                                                      |
-   | You should have received a copy of both licenses referred to here.   |
-   | If you did not, or have any questions about PHP licensing, please    |
-   | contact core@php.net.                                                |
-   +----------------------------------------------------------------------+
-   | Author: Jim Winstead (jimw@php.net)                                  |
-   +----------------------------------------------------------------------+
- */
-/* $Id$ */
-
-#ifndef _TMW_BASE64_H
-#define _TMW_BASE64_H
-
-extern unsigned char *php3_base64_encode(const unsigned char *, int, int *);
-extern unsigned char *php3_base64_decode(const unsigned char *, int, int *);
-
-#endif /* _TMW_BASE64_H */
diff --git a/src/being.cpp b/src/being.cpp
index 68c670fd..ac003d1c 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -65,7 +65,6 @@ Being::Being(Uint16 id, Uint16 job, Map *map):
     mHairStyle(0), mHairColor(0),
     mSpeechTime(0),
     mDamageTime(0),
-    mShowSpeech(false), mShowDamage(false),
     mPx(0), mPy(0),
     mSprites(VECTOREND_SPRITE, NULL),
     mEquipmentSpriteIDs(VECTOREND_SPRITE, 0)
@@ -272,16 +271,14 @@ void
 Being::setSpeech(const std::string &text, Uint32 time)
 {
     mSpeech = text;
-    mSpeechTime = tick_time;
-    mShowSpeech = true;
+    mSpeechTime = 500;
 }
 
 void
 Being::setDamage(Sint16 amount, Uint32 time)
 {
     mDamage = amount ? toString(amount) : "miss";
-    mDamageTime = tick_time;
-    mShowDamage = true;
+    mDamageTime = 300;
 }
 
 void
@@ -443,17 +440,13 @@ Being::logic()
         nextStep();
     }
 
-    // Determine whether speech should still be displayed
-    if (get_elapsed_time(mSpeechTime) > 5000)
-    {
-        mShowSpeech = false;
-    }
+    // Reduce the time that speech is still displayed
+    if (mSpeechTime > 0)
+        mSpeechTime--;
 
-    // Determine whether damage should still be displayed
-    if (get_elapsed_time(mDamageTime) > 3000)
-    {
-        mShowDamage = false;
-    }
+    // Reduce the time that damage is still displayed
+    if (mDamageTime > 0)
+        mDamageTime--;
 
     // Update pixel coordinates
     mPx = mX - 16 + getXOffset();
@@ -511,7 +504,7 @@ Being::drawSpeech(Graphics *graphics, Sint32 offsetX, Sint32 offsetY)
     int py = mPy + offsetY;
 
     // Draw speech above this being
-    if (mShowSpeech)
+    if (mSpeechTime > 0)
     {
         graphics->setFont(speechFont);
         graphics->setColor(gcn::Color(255, 255, 255));
@@ -519,7 +512,7 @@ Being::drawSpeech(Graphics *graphics, Sint32 offsetX, Sint32 offsetY)
     }
 
     // Draw damage above this being
-    if (mShowDamage && get_elapsed_time(mDamageTime) > 250)
+    if (mDamageTime > 0 && mDamageTime < 275)
     {
         // Selecting the right color
         if (mDamage == "miss")
@@ -536,13 +529,13 @@ Being::drawSpeech(Graphics *graphics, Sint32 offsetX, Sint32 offsetY)
         }
 
         int textY = (getType() == MONSTER) ? 32 : 70;
-        int ft = get_elapsed_time(mDamageTime) - 1500;
-        float a = (ft > 0) ? 1.0 - ft / 1500.0 : 1.0;
+        int ft = 150 - mDamageTime;
+        float a = (ft > 0) ? 1.0 - ft / 150.0 : 1.0;
 
         graphics->setColor(gcn::Color(255, 255, 255, (int)(255 * a)));
         graphics->drawText(mDamage,
                            px + 16,
-                           py - textY - get_elapsed_time(mDamageTime) / 100,
+                           py - textY - (300 - mDamageTime) / 10,
                            gcn::Graphics::CENTER);
 
         // Reset alpha value
diff --git a/src/being.h b/src/being.h
index f9287b65..bfd01568 100644
--- a/src/being.h
+++ b/src/being.h
@@ -368,7 +368,6 @@ class Being : public Sprite
         Uint16 mHairStyle, mHairColor;
         Uint32 mSpeechTime;
         Uint32 mDamageTime;
-        bool mShowSpeech, mShowDamage;
         Sint32 mPx, mPy;                /**< Pixel coordinates */
 
         std::vector<AnimatedSprite*> mSprites;
diff --git a/src/engine.cpp b/src/engine.cpp
index 30f0097e..d2ce6d6f 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -54,42 +54,19 @@ extern Minimap *minimap;
 char itemCurrenyQ[10] = "0";
 
 Spriteset *emotionset;
-Spriteset *npcset;
-std::vector<Spriteset *> weaponset;
 
 Engine::Engine():
     mCurrentMap(NULL)
 {
-    // Load the sprite sets
+    // Load the emotion set
     ResourceManager *resman = ResourceManager::getInstance();
-
-    npcset = resman->getSpriteset("graphics/sprites/npcs.png", 50, 80);
-    emotionset = resman->getSpriteset("graphics/sprites/emotions.png",
-            30, 32);
-    for (int i = 0; i < 2; i++)
-    {
-        Spriteset *tmp = ResourceManager::getInstance()->getSpriteset(
-                "graphics/sprites/weapon" + toString(i) + ".png", 64, 64);
-        if (!tmp) {
-            logger->error("Unable to load weaponset");
-        } else {
-            weaponset.push_back(tmp);
-        }
-    }
-
-    if (!npcset) logger->error("Unable to load NPC spriteset!");
+    emotionset = resman->getSpriteset("graphics/sprites/emotions.png", 30, 32);
     if (!emotionset) logger->error("Unable to load emotions spriteset!");
 }
 
 Engine::~Engine()
 {
-    // Delete sprite sets
-    npcset->decRef();
     emotionset->decRef();
-
-    std::for_each(weaponset.begin(), weaponset.end(),
-            std::mem_fun(&Spriteset::decRef));
-    weaponset.clear();
 }
 
 void Engine::changeMap(const std::string &mapPath)
@@ -142,8 +119,3 @@ void Engine::logic()
     beingManager->logic();
     gui->logic();
 }
-
-void Engine::draw(Graphics *graphics)
-{
-    gui->draw();
-}
diff --git a/src/engine.h b/src/engine.h
index 62e82a49..b16b7c13 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -26,11 +26,11 @@
 
 #include <iosfwd>
 
-class Graphics;
 class Map;
 
 /**
- * Game engine that does the main drawing.
+ * Game engine. Actually hardly does anything anymore except keeping track of
+ * the current map and loading the emotes.
  */
 class Engine
 {
@@ -60,11 +60,6 @@ class Engine
          */
         void logic();
 
-        /**
-         * Draws everything on the screen.
-         */
-        void draw(Graphics *graphics);
-
     private:
         Map *mCurrentMap;
 };
diff --git a/src/game.cpp b/src/game.cpp
index f708fabf..2af13146 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -360,7 +360,7 @@ void Game::logic()
                     get_elapsed_time(mDrawTime / 10) > mMinFrameTime)
             {
                 frame++;
-                engine->draw(graphics);
+                gui->draw();
                 graphics->updateScreen();
                 mDrawTime += mMinFrameTime;
 
@@ -662,7 +662,7 @@ void Game::handleInput()
             direction |= Being::RIGHT;
         }
 
-        player_node->walk(direction);
+        player_node->setWalkingDir(direction);
 
         // Target the nearest monster if 'a' pressed
         if (keys[SDLK_a])
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 9fcf752b..102dd49e 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -85,7 +85,6 @@ BuyDialog::BuyDialog():
     mShopItemList->setEventId("item");
     mSlider->setEventId("slider");
 
-    mShopItemList->addActionListener(this);
     mShopItemList->addSelectionListener(this);
     mSlider->addActionListener(this);
 
@@ -112,7 +111,7 @@ void BuyDialog::setMoney(int amount)
 {
     mMoney = amount;
     mShopItemList->setPlayersMoney(amount);
-    mMoneyLabel->setCaption("Price : 0 GP / " + toString(mMoney)  + " GP");
+    mMoneyLabel->setCaption("Price: 0 GP / " + toString(mMoney)  + " GP");
     mMoneyLabel->adjustSize();
 }
 
@@ -129,7 +128,7 @@ void BuyDialog::reset()
     mDecreaseButton->setEnabled(false);
     mQuantityLabel->setCaption("0");
     mQuantityLabel->adjustSize();
-    mMoneyLabel->setCaption("Price : 0 GP / " + toString(mMoney) + " GP");
+    mMoneyLabel->setCaption("Price: 0 GP / " + toString(mMoney) + " GP");
     mMoneyLabel->adjustSize();
     mItemDescLabel->setCaption("");
     mItemEffectLabel->setCaption("");
@@ -145,31 +144,7 @@ void BuyDialog::action(const std::string &eventId, gcn::Widget *widget)
 {
     int selectedItem = mShopItemList->getSelected();
 
-    if (eventId == "item")
-    {
-        // Reset amount of items and update labels
-        mAmountItems = 0;
-        mSlider->setValue(0);
-        mQuantityLabel->setCaption("0");
-        mQuantityLabel->adjustSize();
-        mMoneyLabel->setCaption("Price : 0 GP / " + toString(mMoney) + " GP");
-        mMoneyLabel->adjustSize();
-
-        // Disable buttons for buying and decreasing
-        mBuyButton->setEnabled(false);
-        mDecreaseButton->setEnabled(false);
-
-        // If no item was selected, none can be bought, otherwise
-        // calculate how many the player can afford
-        mMaxItems = (mShopItemList->getSelected() == -1) ? 0 :
-            mMoney / mShopItems->at(selectedItem).price;
-
-        // When at least one item can be bought, enable the slider and the
-        // increase button
-        mIncreaseButton->setEnabled(mMaxItems > 0);
-        mSlider->setEnabled(mMaxItems > 0);
-    }
-    else if (eventId == "quit")
+    if (eventId == "quit")
     {
         setVisible(false);
         current_npc = 0;
@@ -253,7 +228,7 @@ void BuyDialog::action(const std::string &eventId, gcn::Widget *widget)
         mQuantityLabel->adjustSize();
 
         int price = mAmountItems * mShopItems->at(selectedItem).price;
-        mMoneyLabel->setCaption("Price : " + toString(price)  + " GP / "
+        mMoneyLabel->setCaption("Price: " + toString(price)  + " GP / "
                                 + toString(mMoney) + " GP" );
         mMoneyLabel->adjustSize();
     }
@@ -261,19 +236,39 @@ void BuyDialog::action(const std::string &eventId, gcn::Widget *widget)
 
 void BuyDialog::selectionChanged(const SelectionEvent &event)
 {
+    // Reset amount of items and update labels
+    mAmountItems = 0;
+    mSlider->setValue(0);
+    mQuantityLabel->setCaption("0");
+    mQuantityLabel->adjustSize();
+    mMoneyLabel->setCaption("Price: 0 GP / " + toString(mMoney) + " GP");
+    mMoneyLabel->adjustSize();
+
+    // Disable buttons for buying and decreasing
+    mBuyButton->setEnabled(false);
+    mDecreaseButton->setEnabled(false);
+
     int selectedItem = mShopItemList->getSelected();
 
     if (selectedItem > -1)
     {
-        const ItemInfo &info =
-            ItemDB::get(mShopItems->at(selectedItem).id);
+        const ItemInfo &info = ItemDB::get(mShopItems->at(selectedItem).id);
 
         mItemDescLabel->setCaption("Description: " + info.getDescription());
         mItemEffectLabel->setCaption("Effect: " + info.getEffect());
+
+        // Calculate how many the player can afford
+        mMaxItems = mMoney / mShopItems->at(selectedItem).price;
     }
     else
     {
         mItemDescLabel->setCaption("Description:");
         mItemEffectLabel->setCaption("Effect:");
+        mMaxItems = 0;
     }
+
+    // When at least one item can be bought, enable the slider and the
+    // increase button
+    mIncreaseButton->setEnabled(mMaxItems > 0);
+    mSlider->setEnabled(mMaxItems > 0);
 }
diff --git a/src/gui/chargedialog.cpp b/src/gui/chargedialog.cpp
index 349ca223..862378ae 100644
--- a/src/gui/chargedialog.cpp
+++ b/src/gui/chargedialog.cpp
@@ -37,6 +37,7 @@ ChargeDialog::ChargeDialog():
     mProgBar = new ProgressBar(0.0f, 140, 25, 128, 128, 128);
     mProgBar->setPosition(20, 40);
     add(mProgBar);
+    setVisible(true);
 }
 
 // update the dialog
diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp
index 14626d06..d4a2c6cb 100644
--- a/src/gui/listbox.cpp
+++ b/src/gui/listbox.cpp
@@ -38,9 +38,8 @@ ListBox::ListBox(gcn::ListModel *listModel):
 
 void ListBox::draw(gcn::Graphics *graphics)
 {
-    if (mListModel == NULL) {
+    if (!mListModel)
         return;
-    }
 
     graphics->setColor(gcn::Color(110, 160, 255));
     graphics->setFont(getFont());
@@ -54,7 +53,9 @@ void ListBox::draw(gcn::Graphics *graphics)
     }
 
     // Draw the list elements
-    for (int i = 0, y = 0; i < mListModel->getNumberOfElements(); ++i, y += fontHeight)
+    for (int i = 0, y = 0;
+         i < mListModel->getNumberOfElements();
+         ++i, y += fontHeight)
     {
         graphics->drawText(mListModel->getElementAt(i), 1, y);
     }
diff --git a/src/gui/listbox.h b/src/gui/listbox.h
index c1932f54..deca07cf 100644
--- a/src/gui/listbox.h
+++ b/src/gui/listbox.h
@@ -73,9 +73,9 @@ class ListBox : public gcn::ListBox
         /**
          * Sets the index of the selected element.
          */
-        void setSelected(int selected);
+        virtual void setSelected(int selected);
 
-    private:
+    protected:
         /**
          * Sends out selection events to the list of selection listeners.
          */
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 499bbd05..b0957f9e 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -142,7 +142,8 @@ void SellDialog::addItem(Item *item, int price)
 
     ITEM_SHOP item_shop;
 
-    item_shop.name = item->getInfo().getName() + " " + toString(price) + " GP";
+    item_shop.name = item->getInfo().getName()
+        + " (" + toString(price) + " GP)";
     item_shop.price = price;
     item_shop.index = item->getInvIndex();
     item_shop.id = item->getId();
diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp
index 2d33e8a8..3d972bc2 100644
--- a/src/gui/shop.cpp
+++ b/src/gui/shop.cpp
@@ -45,7 +45,7 @@ void ShopItems::addItem(short id, int price)
     ITEM_SHOP item_shop;
 
     item_shop.name = ItemDB::get(id).getName()
-                     + " " + toString(price) + " GP";
+                     + " (" + toString(price) + " GP)";
     item_shop.price = price;
     item_shop.id = id;
     item_shop.image = ItemDB::get(id).getImage();
diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp
index 61abff35..4821067c 100644
--- a/src/gui/shoplistbox.cpp
+++ b/src/gui/shoplistbox.cpp
@@ -34,11 +34,10 @@
 
 #include "../graphics.h"
 
-const int ITEM_SPRITE_HEIGHT = 32;
+const int ITEM_ICON_SIZE = 32;
 
 ShopListBox::ShopListBox(gcn::ListModel *listModel):
-    gcn::ListBox(listModel),
-    mMousePressed(false),
+    ListBox(listModel),
     mPlayerMoney(0)
 {
     mRowHeight = getFont()->getHeight();
@@ -46,105 +45,101 @@ ShopListBox::ShopListBox(gcn::ListModel *listModel):
 }
 
 ShopListBox::ShopListBox(gcn::ListModel *listModel, ShopItems *shopListModel):
-    gcn::ListBox(listModel),
-    mMousePressed(false),
+    ListBox(listModel),
     mPlayerMoney(0),
     mShopItems(shopListModel)
 {
-    mRowHeight = (getFont()->getHeight() > ITEM_SPRITE_HEIGHT ?
-        getFont()->getHeight() : ITEM_SPRITE_HEIGHT);
+    mRowHeight = std::max(getFont()->getHeight(), ITEM_ICON_SIZE);
     mPriceCheck = true;
 }
 
-
 void ShopListBox::setPlayersMoney(int money)
 {
     mPlayerMoney = money;
 }
 
-void ShopListBox::draw(gcn::Graphics *graphics)
+void ShopListBox::draw(gcn::Graphics *gcnGraphics)
 {
-    if (mListModel == NULL) {
+    if (!mListModel)
         return;
-    }
+
+    Graphics *graphics = static_cast<Graphics*>(gcnGraphics);
 
     graphics->setFont(getFont());
 
     // Draw the list elements
-    for (int i = 0, y = 0; i < mListModel->getNumberOfElements(); ++i, y += mRowHeight)
+    for (int i = 0, y = 0;
+         i < mListModel->getNumberOfElements();
+         ++i, y += mRowHeight)
     {
-        graphics->setColor(gcn::Color(0xffffff));
-        if (mShopItems != NULL)
+        gcn::Color backgroundColor = gcn::Color(0xffffff);
+
+        if (i == mSelected)
         {
-            if(mPlayerMoney < mShopItems->at(i).price && mPriceCheck)
-            {
-                graphics->setColor(gcn::Color(0x919191));
-            }
+            backgroundColor = gcn::Color(110, 160, 255);
         }
+        else if (mShopItems &&
+                mPlayerMoney < mShopItems->at(i).price && mPriceCheck)
+        {
+            backgroundColor = gcn::Color(0x919191);
+        }
+
+        graphics->setColor(backgroundColor);
         graphics->fillRectangle(gcn::Rectangle(0, y, getWidth(), mRowHeight));
-        if (mShopItems)
-            dynamic_cast<Graphics*>(graphics)->drawImage(mShopItems->at(i).image, 1, y);
-        graphics->drawText(mListModel->getElementAt(i), ITEM_SPRITE_HEIGHT, y);
-    }
 
-    // Draw rectangle below the selected list element and the list element
-    // not shown.
-    if (mSelected >= 0) {
-        graphics->setColor(gcn::Color(110, 160, 255));
-        graphics->fillRectangle(gcn::Rectangle(0, mRowHeight * mSelected,
-                                               getWidth(), mRowHeight));
         if (mShopItems)
-            dynamic_cast<Graphics*>(graphics)->drawImage(
-            mShopItems->at(mSelected).image, 1, mRowHeight * mSelected);
-        graphics->drawText(mListModel->getElementAt(mSelected),
-            ITEM_SPRITE_HEIGHT, mRowHeight * mSelected);
+        {
+            Image *icon = mShopItems->at(i).image;
+            if (icon)
+            {
+                graphics->drawImage(icon, 1, y);
+            }
+        }
+        graphics->drawText(mListModel->getElementAt(i), ITEM_ICON_SIZE + 5,
+                y + (ITEM_ICON_SIZE - getFont()->getHeight()) / 2);
     }
 }
 
 void ShopListBox::setSelected(int selected)
 {
-    gcn::ListBox::setSelected(selected);
-    if (mListModel != NULL)
+    if (!mListModel)
     {
-        gcn::BasicContainer *par = getParent();
-        if (par == NULL)
-        {
-            return;
-        }
-
-        gcn::Rectangle scroll;
+        mSelected = -1;
+    }
+    else
+    {
+        // Update mSelected with bounds checking
+        mSelected = std::min(mListModel->getNumberOfElements() - 1,
+                             std::max(-1, selected));
 
-        if (mSelected < 0)
+        gcn::BasicContainer *parent = getParent();
+        if (parent)
         {
-            scroll.y = 0;
+            gcn::Rectangle scroll;
+            scroll.y = (mSelected < 0) ? 0 : mRowHeight * mSelected;
+            scroll.height = mRowHeight;
+            parent->showWidgetPart(this, scroll);
         }
-        else
-        {
-            scroll.y = mRowHeight * mSelected;
-        }
-
-        scroll.height = mRowHeight;
-        par->showWidgetPart(this, scroll);
     }
+
     fireSelectionChangedEvent();
 }
 
 void ShopListBox::mousePress(int x, int y, int button)
 {
-
-    bool enoughMoney = false;
     if (button == gcn::MouseInput::LEFT && hasMouse())
     {
-        if (mShopItems)
+        bool enoughMoney = false;
+
+        if (mShopItems && mPriceCheck)
         {
-            if(mPlayerMoney >= mShopItems->at(y / mRowHeight).price)
+            if (mPlayerMoney >= mShopItems->at(y / mRowHeight).price)
                 enoughMoney = true;
         }
         else // Old Behaviour
+        {
             enoughMoney = true;
-
-    if (!mPriceCheck)
-        enoughMoney = true;
+        }
 
         if (enoughMoney)
         {
@@ -155,40 +150,9 @@ void ShopListBox::mousePress(int x, int y, int button)
     }
 }
 
-void ShopListBox::mouseRelease(int x, int y, int button)
-{
-    gcn::ListBox::mouseRelease(x, y, button);
-
-    mMousePressed = false;
-}
-
-void ShopListBox::mouseMotion(int x, int y)
-{
-    gcn::ListBox::mouseMotion(x, y);
-
-    // Pretend mouse is pressed continuously while dragged. Causes list
-    // selection to be updated as is default in many GUIs.
-    if (mMousePressed)
-    {
-        mousePress(x, y, gcn::MouseInput::LEFT);
-    }
-}
-
-void ShopListBox::fireSelectionChangedEvent()
-{
-    SelectionEvent event(this);
-    SelectionListeners::iterator i_end = mListeners.end();
-    SelectionListeners::iterator i;
-
-    for (i = mListeners.begin(); i != i_end; ++i)
-    {
-        (*i)->selectionChanged(event);
-    }
-}
-
 void ShopListBox::adjustSize()
 {
-    if (mListModel != NULL)
+    if (mListModel)
     {
         setHeight(mRowHeight * mListModel->getNumberOfElements());
     }
diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h
index 2dff8977..476564b2 100644
--- a/src/gui/shoplistbox.h
+++ b/src/gui/shoplistbox.h
@@ -21,10 +21,10 @@
  *  $Id: listbox.h 2655 2006-09-03 21:25:02Z b_lindeijer $
  */
 
-#ifndef _TMW_LISTBOX_H
-#define _TMW_LISTBOX_H
+#ifndef _TMW_SHOPLISTBOX_H
+#define _TMW_SHOPLISTBOX_H
 
-#include <guichan/widgets/listbox.hpp>
+#include "listbox.h"
 #include "shop.h"
 
 class SelectionListener;
@@ -36,7 +36,7 @@ class SelectionListener;
  *
  * \ingroup GUI
  */
-class ShopListBox : public gcn::ListBox
+class ShopListBox : public ListBox
 {
     public:
         /**
@@ -55,8 +55,6 @@ class ShopListBox : public gcn::ListBox
         void draw(gcn::Graphics *graphics);
 
         void mousePress(int x, int y, int button);
-        void mouseRelease(int x, int y, int button);
-        void mouseMotion(int x, int y);
 
         /**
          * Adds a listener to the list that's notified each time a change to
@@ -98,15 +96,6 @@ class ShopListBox : public gcn::ListBox
         void setPriceCheck(bool check);
 
     private:
-        /**
-         * Sends out selection events to the list of selection listeners.
-         */
-        void fireSelectionChangedEvent();
-
-        bool mMousePressed;    /**< Keeps track of mouse pressed status. */
-
-        std::list<SelectionListener*> mListeners;
-
         int mPlayerMoney;
 
         /**
@@ -118,7 +107,6 @@ class ShopListBox : public gcn::ListBox
         int mRowHeight; /**< Row Height */
 
         bool mPriceCheck;
-
 };
 
 #endif
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 73343483..73e4489e 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -26,6 +26,7 @@
 #include <iostream>
 #include <SDL.h>
 #include <SDL_thread.h>
+#include <zlib.h>
 
 #include <curl/curl.h>
 
@@ -48,9 +49,9 @@ UpdaterWindow::UpdaterWindow():
     Window("Updating..."),
     mThread(NULL), mMutex(NULL), mDownloadStatus(UPDATE_NEWS),
     mUpdateHost(""), mCurrentFile("news.txt"), mBasePath(""),
-    mStoreInMemory(true), mDownloadComplete(true), mUserCancel(false), 
-    mDownloadedBytes(0), mMemoryBuffer(NULL), 
-    mCurlError(new char[CURL_ERROR_SIZE]), mFileIndex(0)
+    mStoreInMemory(true), mDownloadComplete(true), mUserCancel(false),
+    mDownloadedBytes(0), mMemoryBuffer(NULL),
+    mCurlError(new char[CURL_ERROR_SIZE]), mLineIndex(0)
 {
     mCurlError[0] = 0;
 
@@ -83,8 +84,9 @@ UpdaterWindow::UpdaterWindow():
     add(mCancelButton);
     add(mPlayButton);
 
-    mCancelButton->requestFocus();
     setLocationRelativeTo(getParent());
+    setVisible(true);
+    mCancelButton->requestFocus();
 
     mUpdateHost =
         config.getValue("updatehost", "http://updates.themanaworld.org");
@@ -179,7 +181,6 @@ void UpdaterWindow::loadNews()
     mMemoryBuffer = NULL;
 
     mScrollArea->setVerticalScrollAmount(0);
-    setVisible(true);
 }
 
 int UpdaterWindow::updateProgress(void *ptr,
@@ -227,78 +228,116 @@ size_t UpdaterWindow::memoryWrite(void *ptr,
 
 int UpdaterWindow::downloadThread(void *ptr)
 {
+    int attempts = 0;
+    UpdaterWindow *uw = reinterpret_cast<UpdaterWindow *>(ptr);
     CURL *curl;
     CURLcode res;
-    FILE *outfile = NULL;
-    UpdaterWindow *uw = reinterpret_cast<UpdaterWindow *>(ptr);
     std::string outFilename;
     std::string url(uw->mUpdateHost + "/" + uw->mCurrentFile);
-    uw->setLabel(uw->mCurrentFile + " (0%)");
 
-    curl = curl_easy_init();
+    while (attempts < 3 && !uw->mDownloadComplete) {
+        FILE *outfile = NULL;
+        uw->setLabel(uw->mCurrentFile + " (0%)");
 
-    if (curl)
-    {
-        logger->log("Downloading: %s", url.c_str());
+        curl = curl_easy_init();
 
-        if (uw->mStoreInMemory)
+        if (curl)
         {
-            uw->mDownloadedBytes = 0;
-            curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
-            curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,
-                                   UpdaterWindow::memoryWrite);
-            curl_easy_setopt(curl, CURLOPT_WRITEDATA, ptr);
-        }
-        else
-        {
-            // Download in the proper folder : ./updates under win,
-            // /home/user/.tmw/updates for unices
-            outFilename =  uw->mBasePath + "/updates/download.temp";
-            outfile = fopen(outFilename.c_str(), "wb");
-            curl_easy_setopt(curl, CURLOPT_WRITEDATA, outfile);
-        }
+            logger->log("Downloading: %s", url.c_str());
 
-        curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, uw->mCurlError);
-        curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
-        curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
-        curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION,
-                               UpdaterWindow::updateProgress);
-        curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, ptr);
-        curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
-        curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 15);
+            if (uw->mStoreInMemory)
+            {
+                uw->mDownloadedBytes = 0;
+                curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
+                curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,
+                                       UpdaterWindow::memoryWrite);
+                curl_easy_setopt(curl, CURLOPT_WRITEDATA, ptr);
+            }
+            else
+            {
+                // Download in the proper folder : ./updates under win,
+                // /home/user/.tmw/updates for unices
+                outFilename =  uw->mBasePath + "/updates/download.temp";
+                outfile = fopen(outFilename.c_str(), "w+b");
+                curl_easy_setopt(curl, CURLOPT_WRITEDATA, outfile);
+            }
 
-        if ((res = curl_easy_perform(curl)) != 0)
-        {
-            uw->mDownloadStatus = UPDATE_ERROR;
-            switch (res)
+            curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, uw->mCurlError);
+            curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+            curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
+            curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION,
+                                   UpdaterWindow::updateProgress);
+            curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, ptr);
+            curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
+            curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 15);
+
+            if ((res = curl_easy_perform(curl)) != 0)
             {
-            case CURLE_COULDNT_CONNECT: // give more debug info on that error
-                std::cerr << "curl error " << res << " : " << uw->mCurlError << " " << url.c_str()
-                << std::endl;
-                break;
-
-            default:
-                std::cerr << "curl error " << res << " : " << uw->mCurlError << " host: " << url.c_str()
-                << std::endl;
+                uw->mDownloadStatus = UPDATE_ERROR;
+                switch (res)
+                {
+                case CURLE_COULDNT_CONNECT: // give more debug info on that error
+                    std::cerr << "curl error " << res << " : " << uw->mCurlError << " " << url.c_str()
+                    << std::endl;
+                    break;
+
+                default:
+                    std::cerr << "curl error " << res << " : " << uw->mCurlError << " host: " << url.c_str()
+                    << std::endl;
+                }
             }
-        }
 
-        curl_easy_cleanup(curl);
-        uw->mDownloadComplete = true;
+            curl_easy_cleanup(curl);
 
-        if (!uw->mStoreInMemory)
-        {
-            fclose(outfile);
+            uw->mDownloadComplete = true;
 
-            // Give the file the proper name
-            std::string newName(uw->mBasePath + "/updates/" +
-                                uw->mCurrentFile.c_str());
+            if (!uw->mStoreInMemory)
+            {
+                long fileSize;
+                char *buffer;
+                // Obtain file size.
+                fseek(outfile, 0, SEEK_END);
+                fileSize = ftell(outfile);
+                rewind(outfile);
+                buffer = (char*)malloc(fileSize);
+                fread(buffer, 1, fileSize, outfile);
+                fclose(outfile);
+
+                // Give the file the proper name
+                std::string newName(uw->mBasePath + "/updates/" +
+                                    uw->mCurrentFile.c_str());
+
+                // Any existing file with this name is deleted first, otherwise the
+                // rename will fail on Windows.
+                ::remove(newName.c_str());
+                ::rename(outFilename.c_str(), newName.c_str());
+
+                // Don't check resources2.txt checksum
+                if (uw->mDownloadStatus == UPDATE_RESOURCES)
+                {
+                    // Calculate Adler-32 checksum
+                    unsigned long adler = adler32(0L, Z_NULL, 0);
+                    adler = adler32(adler, (Bytef *)buffer, fileSize);
+                    free(buffer);
+
+                    if (uw->mCurrentChecksum != adler) {
+                        uw->mDownloadComplete = false;
+                        // Remove the corrupted file
+                        ::remove(newName.c_str());
+                        logger->log(
+                            "Checksum for file %s failed: (%lx/%lx)",
+                            uw->mCurrentFile.c_str(),
+                            adler, uw->mCurrentChecksum);
+                    }
+                }
 
-            // Any existing file with this name is deleted first, otherwise the
-            // rename will fail on Windows.
-            ::remove(newName.c_str());
-            ::rename(outFilename.c_str(), newName.c_str());
+            }
         }
+        attempts++;
+    }
+
+    if (!uw->mDownloadComplete) {
+        uw->mDownloadStatus = UPDATE_ERROR;
     }
 
     return 0;
@@ -351,7 +390,7 @@ void UpdaterWindow::logic()
                 // Parse current memory buffer as news and dispose of the data
                 loadNews();
 
-                mCurrentFile = "resources.txt";
+                mCurrentFile = "resources2.txt";
                 mStoreInMemory = false;
                 download();
                 mDownloadStatus = UPDATE_LIST;
@@ -361,7 +400,7 @@ void UpdaterWindow::logic()
             if (mDownloadComplete)
             {
                 ResourceManager *resman = ResourceManager::getInstance();
-                mFiles = resman->loadTextFile("updates/resources.txt");
+                mLines = resman->loadTextFile("updates/resources2.txt");
                 mStoreInMemory = false;
                 mDownloadStatus = UPDATE_RESOURCES;
             }
@@ -375,9 +414,15 @@ void UpdaterWindow::logic()
                     mThread = NULL;
                 }
 
-                if (mFileIndex < mFiles.size())
+                if (mLineIndex < mLines.size())
                 {
-                    mCurrentFile = mFiles[mFileIndex];
+                    std::stringstream line(mLines[mLineIndex]);
+                    line >> mCurrentFile;
+                    std::string checksum;
+                    line >> checksum;
+                    std::stringstream ss(checksum);
+                    ss >> std::hex >> mCurrentChecksum;
+
                     std::ifstream temp(
                             (mBasePath + "/updates/" + mCurrentFile).c_str());
                     if (!temp.is_open())
@@ -389,7 +434,7 @@ void UpdaterWindow::logic()
                     {
                         logger->log("%s already here", mCurrentFile.c_str());
                     }
-                    mFileIndex++;
+                    mLineIndex++;
                 }
                 else
                 {
diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index 16442656..0d1493ee 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.h
@@ -140,6 +140,11 @@ class UpdaterWindow : public Window, public gcn::ActionListener
      */
     std::string mCurrentFile;
 
+    /**
+     * The Adler32 checksum of the file currently downloading.
+     */
+    unsigned long mCurrentChecksum;
+
     /**
      * Absolute path to locally save downloaded files.
      */
@@ -179,12 +184,12 @@ class UpdaterWindow : public Window, public gcn::ActionListener
     /**
      * List of files to download
      */
-    std::vector<std::string> mFiles;
+    std::vector<std::string> mLines;
 
     /**
      * Index of the file to be downloaded
      */
-    unsigned int mFileIndex;
+    unsigned int mLineIndex;
 
     gcn::Label *mLabel;           /**< Progress bar caption. */
     Button *mCancelButton;        /**< Button to stop the update process. */
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 3346c07a..75a16865 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -197,8 +197,8 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     }
 
     // Draw target marker if needed
-    Being *target;
-    if ((target = player_node->getTarget()))
+    Being *target = player_node->getTarget();
+    if (target)
     {
         graphics->setFont(speechFont);
         graphics->setColor(gcn::Color(255, 32, 32));
diff --git a/src/guichanfwd.h b/src/guichanfwd.h
index 5eabc783..812f3f7a 100644
--- a/src/guichanfwd.h
+++ b/src/guichanfwd.h
@@ -27,6 +27,7 @@
 namespace gcn {
     class ActionListener;
     class AllegroGraphics;
+    class AllegroImage;
     class AllegroImageLoader;
     class AllegroInput;
     class BasicContainer;
@@ -56,11 +57,13 @@ namespace gcn {
     class MouseInput;
     class MouseListener;
     class OpenGLGraphics;
-    class OpenGLImageLoader;
+    class OpenGLImage;
+    class OpenGLSDLImageLoader;
     class RadioButton;
     class Rectangle;
     class ScrollArea;
     class SDLGraphics;
+    class SDLImage;
     class SDLImageLoader;
     class SDLInput;
     class Slider;
diff --git a/src/inventory.h b/src/inventory.h
index 40bcafbb..32ae393e 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -31,7 +31,14 @@ class Item;
 class Inventory
 {
     public:
+        /**
+         * Constructor.
+         */
         Inventory();
+
+        /**
+         * Destructor.
+         */
         ~Inventory();
 
         /**
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index ba7b6117..8076c538 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -166,11 +166,6 @@ void LocalPlayer::pickUp(FloorItem *item)
 
 void LocalPlayer::walk(unsigned char dir)
 {
-    if (mWalkingDir != dir)
-    {
-        mWalkingDir = dir;
-    }
-
     if (!mMap || !dir)
         return;
 
@@ -237,6 +232,20 @@ void LocalPlayer::setDestination(Uint16 x, Uint16 y)
     Being::setDestination(x, y);
 }
 
+void LocalPlayer::setWalkingDir(int dir)
+{
+    if (mWalkingDir != dir)
+    {
+        mWalkingDir = dir;
+    }
+
+    // If we're not already walking, start walking.
+    if (mAction != WALK && dir)
+    {
+        walk(dir);
+    }
+}
+
 void LocalPlayer::raiseAttribute(Attribute attr)
 {
     // XXX Convert for new server
diff --git a/src/localplayer.h b/src/localplayer.h
index 59b59812..765b7cca 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -42,9 +42,15 @@ class LocalPlayer : public Player
             STR = 0, AGI, VIT, INT, DEX, LUK
         };
 
+        /**
+         * Constructor.
+         */
         LocalPlayer();
 
-        virtual ~LocalPlayer();
+        /**
+         * Destructor.
+         */
+        ~LocalPlayer();
 
         virtual void logic();
 
@@ -111,13 +117,16 @@ class LocalPlayer : public Player
          */
         void setTarget(Being* target) { mTarget = target; }
 
-        void walk(unsigned char dir);
-
         /**
          * Sets a new destination for this being to walk to.
          */
         void setDestination(Uint16 x, Uint16 y);
 
+        /**
+         * Sets a new direction to keep walking in.
+         */
+        void setWalkingDir(int dir);
+
         void raiseAttribute(Attribute attr);
         void raiseSkill(Uint16 skillId);
 
@@ -151,6 +160,8 @@ class LocalPlayer : public Player
         std::auto_ptr<Inventory> mInventory;
 
     protected:
+        void walk(unsigned char dir);
+
         Being *mTarget;
         FloorItem *mPickUpTarget;
 
diff --git a/src/main.cpp b/src/main.cpp
index 90368b7d..8163cde3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -309,11 +309,6 @@ void init_engine()
         errorMessage = err;
         logger->log("Warning: %s", err);
     }
-
-    // Load XML databases
-    EquipmentDB::load();
-    ItemDB::load();
-    MonsterDB::load();
 }
 
 /** Clear the engine */
@@ -411,19 +406,22 @@ void parseOptions(int argc, char *argv[], Options &options)
 }
 
 /**
- * Reads the file "updates/resources.txt" and attempts to load each update
+ * Reads the file "updates/resources2.txt" and attempts to load each update
  * mentioned in it.
  */
 void loadUpdates()
 {
-    const std::string updatesFile = "updates/resources.txt";
+    const std::string updatesFile = "updates/resources2.txt";
     ResourceManager *resman = ResourceManager::getInstance();
     std::vector<std::string> lines = resman->loadTextFile(updatesFile);
     std::string homeDir = config.getValue("homeDir", "");
 
     for (unsigned int i = 0; i < lines.size(); ++i)
     {
-        resman->addToSearchPath(homeDir + "/updates/" + lines[i], false);
+        std::stringstream line(lines[i]);
+        std::string filename;
+        line >> filename;
+        resman->addToSearchPath(homeDir + "/updates/" + filename, false);
     }
 }
 
@@ -687,6 +685,12 @@ int main(int argc, char *argv[])
 
                 case STATE_LOGIN:
                     logger->log("State: LOGIN");
+
+                    // Load XML databases
+                    EquipmentDB::load();
+                    ItemDB::load();
+                    MonsterDB::load();
+
                     currentDialog = new LoginDialog(&loginData);
                     // TODO: Restore autologin
                     //if (!loginData.password.empty()) {
diff --git a/src/main.h b/src/main.h
index b68a4e4d..14f52e4d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -29,8 +29,7 @@
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #elif defined WIN32
-#include "../The_Mana_World_private.h"
-#define PACKAGE_VERSION PRODUCT_VERSION
+#include "winver.h"
 #endif
 
 #ifndef TMW_DATADIR
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 988a9a68..f16037cf 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -31,14 +31,24 @@
 #include "../log.h"
 #include "../npc.h"
 
+#include "../gui/buy.h"
 #include "../gui/chat.h"
+#include "../gui/npclistdialog.h"
+#include "../gui/npc_text.h"
 #include "../gui/ok_dialog.h"
+#include "../gui/sell.h"
 #include "../gui/skill.h"
 
 // TODO Move somewhere else
 OkDialog *weightNotice = NULL;
 OkDialog *deathNotice = NULL;
 
+extern NpcListDialog *npcListDialog;
+extern NpcTextDialog *npcTextDialog;
+extern BuyDialog *buyDialog;
+extern SellDialog *sellDialog;
+extern Window *buySellDialog;
+
 /**
  * Listener used for handling the overweigth message.
  */
@@ -64,6 +74,12 @@ namespace {
         {
             player_node->revive();
             deathNotice = NULL;
+            npcListDialog->setVisible(false);
+            npcTextDialog->setVisible(false);
+            buyDialog->setVisible(false);
+            sellDialog->setVisible(false);
+            buySellDialog->setVisible(false);
+            current_npc = 0;
         }
     } deathListener;
 }
diff --git a/src/npc.cpp b/src/npc.cpp
index 3c142889..ccd085b6 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -29,7 +29,6 @@
 #include "gui/gui.h"
 
 class Spriteset;
-extern Spriteset *npcset;
 
 NPC *current_npc = 0;
 
diff --git a/src/resources/action.cpp b/src/resources/action.cpp
new file mode 100644
index 00000000..247455db
--- /dev/null
+++ b/src/resources/action.cpp
@@ -0,0 +1,67 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "action.h"
+
+#include <algorithm>
+
+#include "animation.h"
+
+#include "../utils/dtor.h"
+
+
+Action::Action()
+{
+}
+
+Action::~Action()
+{
+    std::for_each(mAnimations.begin(), mAnimations.end(),
+                  make_dtor(mAnimations));
+}
+
+Animation*
+Action::getAnimation(int direction) const
+{
+    Animations::const_iterator i = mAnimations.find(direction);
+
+    // When the direction isn't defined, try the default
+    if (i == mAnimations.end())
+    {
+        i = mAnimations.find(0);
+    }
+
+    return (i == mAnimations.end()) ? NULL : i->second;
+}
+
+void
+Action::setAnimation(int direction, Animation *animation)
+{
+    // Set first direction as default direction
+    if (mAnimations.empty())
+    {
+        mAnimations[0] = animation;
+    }
+
+    mAnimations[direction] = animation;
+}
diff --git a/src/resources/action.h b/src/resources/action.h
new file mode 100644
index 00000000..8d5e8d11
--- /dev/null
+++ b/src/resources/action.h
@@ -0,0 +1,61 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_ACTION_H
+#define _TMW_ACTION_H
+
+#include <map>
+
+#include <libxml/tree.h>
+
+class Animation;
+
+/**
+ * An action consists of several animations, one for each direction.
+ */
+class Action
+{
+    public:
+        /**
+         * Constructor.
+         */
+        Action();
+
+        /**
+         * Destructor.
+         */
+        ~Action();
+
+        void
+        setAnimation(int direction, Animation *animation);
+
+        Animation*
+        getAnimation(int direction) const;
+
+    protected:
+        typedef std::map<int, Animation*> Animations;
+        typedef Animations::iterator AnimationIterator;
+        Animations mAnimations;
+};
+
+#endif
diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp
new file mode 100644
index 00000000..de96525c
--- /dev/null
+++ b/src/resources/animation.cpp
@@ -0,0 +1,53 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "animation.h"
+
+#include <algorithm>
+
+#include "../utils/dtor.h"
+
+Animation::Animation():
+    mDuration(0)
+{
+}
+
+void
+Animation::addFrame(Image *image, unsigned int delay, int offsetX, int offsetY)
+{
+    Frame frame = { image, delay, offsetX, offsetY };
+    mFrames.push_back(frame);
+    mDuration += delay;
+}
+
+void
+Animation::addTerminator()
+{
+    addFrame(NULL, 0, 0, 0);
+}
+
+bool
+Animation::isTerminator(const Frame &candidate)
+{
+    return (candidate.image == NULL);
+}
diff --git a/src/resources/animation.h b/src/resources/animation.h
new file mode 100644
index 00000000..54142bcb
--- /dev/null
+++ b/src/resources/animation.h
@@ -0,0 +1,99 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_ANIMATION_H
+#define _TMW_ANIMATION_H
+
+#include <vector>
+
+#include <libxml/tree.h>
+
+class Image;
+class Spriteset;
+
+/**
+ * A single frame in an animation, with a delay and an offset.
+ */
+struct Frame
+{
+    Image *image;
+    unsigned int delay;
+    int offsetX;
+    int offsetY;
+};
+
+/**
+ * An animation consists of several frames, each with their own delay and
+ * offset.
+ */
+class Animation
+{
+    public:
+        /**
+         * Constructor.
+         */
+        Animation();
+
+        /**
+         * Appends a new animation at the end of the sequence
+         */
+        void
+        addFrame(Image *image, unsigned int delay, int offsetX, int offsetY);
+
+        /**
+         * Appends an animation terminator that states that the animation
+         * should not loop.
+         */
+        void
+        addTerminator();
+
+        /**
+         * Returns the frame at the specified index.
+         */
+        Frame*
+        getFrame(int index) { return &(mFrames[index]); }
+
+        /**
+         * Returns the length of this animation in frames.
+         */
+        unsigned int
+        getLength() const { return mFrames.size(); }
+
+        /**
+         * Returns the duration of this animation.
+         */
+        int
+        getDuration() const { return mDuration; }
+
+        /**
+         * Determines whether the given animation frame is a terminator.
+         */
+        static bool
+        isTerminator(const Frame &phase);
+
+    protected:
+        std::vector<Frame> mFrames;
+        int mDuration;
+};
+
+#endif
diff --git a/src/resources/equipmentdb.cpp b/src/resources/equipmentdb.cpp
index 78ae3b6a..52a9fbd3 100644
--- a/src/resources/equipmentdb.cpp
+++ b/src/resources/equipmentdb.cpp
@@ -40,6 +40,9 @@ namespace
 void
 EquipmentDB::load()
 {
+    if (mLoaded)
+        return;
+
     logger->log("Initializing equipment database...");
     mUnknown.setSprite("error.xml", 0);
     mUnknown.setSprite("error.xml", 1);
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 48818f6f..9398e06b 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -153,10 +153,10 @@ Image* Image::load(void *buffer, unsigned int bufferSize,
     SDL_FreeSurface(image);
 
     if (hasPink && !hasAlpha) {
-        SDL_SetColorKey(tmpImage, SDL_SRCCOLORKEY | SDL_RLEACCEL,
+        SDL_SetColorKey(tmpImage, SDL_SRCCOLORKEY,
                 SDL_MapRGB(tmpImage->format, 255, 0, 255));
     } else if (hasAlpha) {
-        SDL_SetAlpha(tmpImage, SDL_SRCALPHA | SDL_RLEACCEL, SDL_ALPHA_OPAQUE);
+        SDL_SetAlpha(tmpImage, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
     }
 
 #ifdef USE_OPENGL
@@ -305,7 +305,7 @@ void Image::setAlpha(float a)
 
     if (mImage) {
         // Set the alpha value this image is drawn at
-        SDL_SetAlpha(mImage, SDL_SRCALPHA | SDL_RLEACCEL, (int)(255 * mAlpha));
+        SDL_SetAlpha(mImage, SDL_SRCALPHA, (int) (255 * mAlpha));
     }
 }
 
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index b91e34cc..f914af47 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -37,11 +37,15 @@ namespace
 {
     ItemDB::ItemInfos mItemInfos;
     ItemInfo mUnknown;
+    bool mLoaded = false;
 }
 
 
 void ItemDB::load()
 {
+    if (mLoaded)
+        return;
+
     logger->log("Initializing item database...");
     mUnknown.setName("Unknown item");
 
@@ -150,6 +154,8 @@ void ItemDB::load()
     }
 
     xmlFreeDoc(doc);
+
+    mLoaded = true;
 }
 
 void ItemDB::unload()
@@ -159,6 +165,8 @@ void ItemDB::unload()
         delete i->second;
     }
     mItemInfos.clear();
+
+    mLoaded = false;
 }
 
 const ItemInfo&
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 5922984a..c080194b 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -29,17 +29,17 @@
 #include <map>
 
 /**
- * The namespace that holds the item information
+ * The namespace that holds the item information.
  */
 namespace ItemDB
 {
     /**
-     * Loads the item data from Items.xml
+     * Loads the item data from <code>items.xml</code>.
      */
     void load();
 
     /**
-     * Frees item data
+     * Frees item data.
      */
     void unload();
 
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 4569ced7..15a88b4d 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -30,11 +30,11 @@
 #include "resourcemanager.h"
 #include "image.h"
 
-#include "../base64.h"
 #include "../log.h"
 #include "../map.h"
 #include "../tileset.h"
 
+#include "../utils/base64.h"
 #include "../utils/tostring.h"
 #include "../utils/xml.h"
 
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index fb03f6c1..e4406f9c 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -34,11 +34,15 @@ namespace
 {
     MonsterDB::MonsterInfos mMonsterInfos;
     MonsterInfo mUnknown;
+    bool mLoaded = false;
 }
 
 void
 MonsterDB::load()
 {
+    if (mLoaded)
+        return;
+
     mUnknown.setSprite("error.xml");
     mUnknown.setName("unnamed");
 
@@ -123,6 +127,8 @@ MonsterDB::load()
         }
         mMonsterInfos[XML::getProperty(monsterNode, "id", 0)] = currentInfo;
     }
+
+    mLoaded = true;
 }
 
 void
@@ -131,6 +137,8 @@ MonsterDB::unload()
     for_each (  mMonsterInfos.begin(), mMonsterInfos.end(),
                 make_dtor(mMonsterInfos));
     mMonsterInfos.clear();
+
+    mLoaded = false;
 }
 
 
diff --git a/src/resources/openglsdlimageloader.cpp b/src/resources/openglsdlimageloader.cpp
index b3e1601e..68de1e19 100644
--- a/src/resources/openglsdlimageloader.cpp
+++ b/src/resources/openglsdlimageloader.cpp
@@ -31,7 +31,8 @@
 
 #ifdef USE_OPENGL
 
-SDL_Surface* OpenGLSDLImageLoader::loadSDLSurface(const std::string& filename)
+SDL_Surface*
+OpenGLSDLImageLoader::loadSDLSurface(const std::string &filename)
 {
     ResourceManager *resman = ResourceManager::getInstance();
     return resman->loadSDLSurface(filename);
diff --git a/src/resources/openglsdlimageloader.h b/src/resources/openglsdlimageloader.h
index 29be294c..b79dde15 100644
--- a/src/resources/openglsdlimageloader.h
+++ b/src/resources/openglsdlimageloader.h
@@ -31,7 +31,8 @@
 class OpenGLSDLImageLoader : public gcn::OpenGLSDLImageLoader
 {
     protected:
-        SDL_Surface* loadSDLSurface(const std::string& filename);
+        SDL_Surface*
+        loadSDLSurface(const std::string &filename);
 };
 
 #endif
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index bd273b3b..feb6f8f8 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -23,11 +23,10 @@
 
 #include "spritedef.h"
 
-#include "../animation.h"
-#include "../action.h"
-#include "../graphics.h"
 #include "../log.h"
 
+#include "animation.h"
+#include "action.h"
 #include "resourcemanager.h"
 #include "spriteset.h"
 #include "image.h"
@@ -208,20 +207,20 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
     Animation *animation = new Animation();
     action->setAnimation(directionType, animation);
 
-    // Get animation phases
-    for (xmlNodePtr phaseNode = animationNode->xmlChildrenNode;
-            phaseNode != NULL;
-            phaseNode = phaseNode->next)
+    // Get animation frames
+    for (xmlNodePtr frameNode = animationNode->xmlChildrenNode;
+            frameNode != NULL;
+            frameNode = frameNode->next)
     {
-        int delay = XML::getProperty(phaseNode, "delay", 0);
-        int offsetX = XML::getProperty(phaseNode, "offsetX", 0);
-        int offsetY = XML::getProperty(phaseNode, "offsetY", 0);
+        int delay = XML::getProperty(frameNode, "delay", 0);
+        int offsetX = XML::getProperty(frameNode, "offsetX", 0);
+        int offsetY = XML::getProperty(frameNode, "offsetY", 0);
         offsetY -= imageset->getHeight() - 32;
         offsetX -= imageset->getWidth() / 2 - 16;
 
-        if (xmlStrEqual(phaseNode->name, BAD_CAST "frame"))
+        if (xmlStrEqual(frameNode->name, BAD_CAST "frame"))
         {
-            int index = XML::getProperty(phaseNode, "index", -1);
+            int index = XML::getProperty(frameNode, "index", -1);
 
             if (index < 0)
             {
@@ -237,12 +236,12 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
                 continue;
             }
 
-            animation->addPhase(img, delay, offsetX, offsetY);
+            animation->addFrame(img, delay, offsetX, offsetY);
         }
-        else if (xmlStrEqual(phaseNode->name, BAD_CAST "sequence"))
+        else if (xmlStrEqual(frameNode->name, BAD_CAST "sequence"))
         {
-            int start = XML::getProperty(phaseNode, "start", -1);
-            int end = XML::getProperty(phaseNode, "end", -1);
+            int start = XML::getProperty(frameNode, "start", -1);
+            int end = XML::getProperty(frameNode, "end", -1);
 
             if (start < 0 || end < 0)
             {
@@ -261,15 +260,15 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
                     continue;
                 }
 
-                animation->addPhase(img, delay, offsetX, offsetY);
+                animation->addFrame(img, delay, offsetX, offsetY);
                 start++;
             }
         }
-        else if (xmlStrEqual(phaseNode->name, BAD_CAST "end"))
+        else if (xmlStrEqual(frameNode->name, BAD_CAST "end"))
         {
             animation->addTerminator();
         }
-    } // for phaseNode
+    } // for frameNode
 }
 
 void
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 64414259..057129ad 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -32,10 +32,7 @@
 #include <libxml/tree.h>
 
 class Action;
-class Graphics;
 class Spriteset;
-struct AnimationPhase;
-class Animation;
 
 enum SpriteAction
 {
diff --git a/src/resources/spriteset.cpp b/src/resources/spriteset.cpp
index 9b09f1e5..96bcef0c 100644
--- a/src/resources/spriteset.cpp
+++ b/src/resources/spriteset.cpp
@@ -53,7 +53,7 @@ Spriteset::~Spriteset()
 Image*
 Spriteset::get(size_type i)
 {
-    if (i > mSpriteset.size())
+    if (i >= mSpriteset.size())
     {
         logger->log("Warning: Sprite #%i does not exist in this spriteset", i);
         return NULL;
diff --git a/src/tmw.rc b/src/tmw.rc
index 5a3b1649..ee5f99cd 100644
--- a/src/tmw.rc
+++ b/src/tmw.rc
@@ -1,34 +1,23 @@
 #include <windows.h> // include for version info constants
 
+#include "winver.h"
 
 A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw-icon.ico"
 
-//
-// TO CHANGE VERSION INFORMATION, EDIT PROJECT OPTIONS...
-//
 1 VERSIONINFO
-FILEVERSION 0,1,0,0
-PRODUCTVERSION 0,1,0,0
-FILETYPE VFT_APP
-{
-  BLOCK "StringFileInfo"
-	 {
-		 BLOCK "040904E4"
-		 {
-			 VALUE "CompanyName", "The Mana World Development Team"
-			 VALUE "FileVersion", "0.1.0"
-			 VALUE "FileDescription", "The Mana World"
-			 VALUE "InternalName", "tmw.exe"
-			 VALUE "LegalCopyright", "2004-2006 (C)"
-			 VALUE "LegalTrademarks", ""
-			 VALUE "OriginalFilename", "tmw.exe"
-			 VALUE "ProductName", "The Mana World MMORPG"
-			 VALUE "ProductVersion", "0.1.0"
-		 }
-	 }
-  BLOCK "VarFileInfo"
-	 {
-		 VALUE "Translation", 0x0409, 1252
-	 }
+FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
+PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
+FILETYPE VFT_APP {
+    BLOCK "StringFileInfo" {
+        BLOCK "040904E4" {
+            VALUE "CompanyName", "The Mana World Development Team"
+            VALUE "FileVersion", PACKAGE_VERSION
+            VALUE "FileDescription", "The Mana World"
+            VALUE "LegalCopyright", "2004-2006 (C)"
+            VALUE "OriginalFilename", "tmw.exe"
+            VALUE "ProductName", "The Mana World MMORPG"
+            VALUE "ProductVersion", PACKAGE_VERSION
+        }
+    }
 }
 
diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp
new file mode 100644
index 00000000..9a8f6356
--- /dev/null
+++ b/src/utils/base64.cpp
@@ -0,0 +1,149 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP HTML Embedded Scripting Language Version 3.0                     |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2000 PHP Development Team (See Credits file)      |
+   +----------------------------------------------------------------------+
+   | This program is free software; you can redistribute it and/or modify |
+   | it under the terms of one of the following licenses:                 |
+   |                                                                      |
+   |  A) the GNU General Public License as published by the Free Software |
+   |     Foundation; either version 2 of the License, or (at your option) |
+   |     any later version.                                               |
+   |                                                                      |
+   |  B) the PHP License as published by the PHP Development Team and     |
+   |     included in the distribution in the file: LICENSE                |
+   |                                                                      |
+   | This program is distributed in the hope that it will be useful,      |
+   | but WITHOUT ANY WARRANTY; without even the implied warranty of       |
+   | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        |
+   | GNU General Public License for more details.                         |
+   |                                                                      |
+   | You should have received a copy of both licenses referred to here.   |
+   | If you did not, or have any questions about PHP licensing, please    |
+   | contact core@php.net.                                                |
+   +----------------------------------------------------------------------+
+   | Author: Jim Winstead (jimw@php.net)                                  |
+   +----------------------------------------------------------------------+
+   */
+/* $Id$ */
+
+#include <string.h>
+#include <stdlib.h>
+
+#include "base64.h"
+
+static char base64_table[] =
+{
+    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+    'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+    'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+    'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/', '\0'
+};
+static char base64_pad = '=';
+
+unsigned char *php3_base64_encode(const unsigned char *string, int length, int *ret_length) {
+    const unsigned char *current = string;
+    int i = 0;
+    unsigned char *result = (unsigned char *)malloc(((length + 3 - length % 3) * 4 / 3 + 1) * sizeof(char));
+
+    while (length > 2) { /* keep going until we have less than 24 bits */
+        result[i++] = base64_table[current[0] >> 2];
+        result[i++] = base64_table[((current[0] & 0x03) << 4) + (current[1] >> 4)];
+        result[i++] = base64_table[((current[1] & 0x0f) << 2) + (current[2] >> 6)];
+        result[i++] = base64_table[current[2] & 0x3f];
+
+        current += 3;
+        length -= 3; /* we just handle 3 octets of data */
+    }
+
+    /* now deal with the tail end of things */
+    if (length != 0) {
+        result[i++] = base64_table[current[0] >> 2];
+        if (length > 1) {
+            result[i++] = base64_table[((current[0] & 0x03) << 4) + (current[1] >> 4)];
+            result[i++] = base64_table[(current[1] & 0x0f) << 2];
+            result[i++] = base64_pad;
+        }
+        else {
+            result[i++] = base64_table[(current[0] & 0x03) << 4];
+            result[i++] = base64_pad;
+            result[i++] = base64_pad;
+        }
+    }
+    if(ret_length) {
+        *ret_length = i;
+    }
+    result[i] = '\0';
+    return result;
+}
+
+/* as above, but backwards. :) */
+unsigned char *php3_base64_decode(const unsigned char *string, int length, int *ret_length) {
+    const unsigned char *current = string;
+    int ch, i = 0, j = 0, k;
+    char *chp;
+
+    unsigned char *result = (unsigned char *)malloc(length + 1);
+
+    if (result == NULL) {
+        return NULL;
+    }
+
+    /* run through the whole string, converting as we go */
+    while ((ch = *current++) != '\0') {
+        if (ch == base64_pad) break;
+
+        /* When Base64 gets POSTed, all pluses are interpreted as spaces.
+           This line changes them back.  It's not exactly the Base64 spec,
+           but it is completely compatible with it (the spec says that
+           spaces are invalid).  This will also save many people considerable
+           headache.  - Turadg Aleahmad <turadg@wise.berkeley.edu>
+           */
+
+        if (ch == ' ') ch = '+';
+
+        chp = strchr(base64_table, ch);
+        if (chp == NULL) continue;
+        ch = chp - base64_table;
+
+        switch(i % 4) {
+            case 0:
+                result[j] = ch << 2;
+                break;
+            case 1:
+                result[j++] |= ch >> 4;
+                result[j] = (ch & 0x0f) << 4;
+                break;
+            case 2:
+                result[j++] |= ch >>2;
+                result[j] = (ch & 0x03) << 6;
+                break;
+            case 3:
+                result[j++] |= ch;
+                break;
+        }
+        i++;
+    }
+
+    k = j;
+    /* mop things up if we ended on a boundary */
+    if (ch == base64_pad) {
+        switch(i % 4) {
+            case 0:
+            case 1:
+                free(result);
+                return NULL;
+            case 2:
+                k++;
+            case 3:
+                result[k++] = 0;
+        }
+    }
+    if(ret_length) {
+        *ret_length = j;
+    }
+    result[k] = '\0';
+    return result;
+}
diff --git a/src/utils/base64.h b/src/utils/base64.h
new file mode 100644
index 00000000..ff20ac53
--- /dev/null
+++ b/src/utils/base64.h
@@ -0,0 +1,37 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP HTML Embedded Scripting Language Version 3.0                     |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997,1998 PHP Development Team (See Credits file)      |
+   +----------------------------------------------------------------------+
+   | This program is free software; you can redistribute it and/or modify |
+   | it under the terms of one of the following licenses:                 |
+   |                                                                      |
+   |  A) the GNU General Public License as published by the Free Software |
+   |     Foundation; either version 2 of the License, or (at your option) |
+   |     any later version.                                               |
+   |                                                                      |
+   |  B) the PHP License as published by the PHP Development Team and     |
+   |     included in the distribution in the file: LICENSE                |
+   |                                                                      |
+   | This program is distributed in the hope that it will be useful,      |
+   | but WITHOUT ANY WARRANTY; without even the implied warranty of       |
+   | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        |
+   | GNU General Public License for more details.                         |
+   |                                                                      |
+   | You should have received a copy of both licenses referred to here.   |
+   | If you did not, or have any questions about PHP licensing, please    |
+   | contact core@php.net.                                                |
+   +----------------------------------------------------------------------+
+   | Author: Jim Winstead (jimw@php.net)                                  |
+   +----------------------------------------------------------------------+
+ */
+/* $Id$ */
+
+#ifndef _TMW_BASE64_H
+#define _TMW_BASE64_H
+
+extern unsigned char *php3_base64_encode(const unsigned char *, int, int *);
+extern unsigned char *php3_base64_decode(const unsigned char *, int, int *);
+
+#endif /* _TMW_BASE64_H */
diff --git a/src/utils/wingettimeofday.h b/src/utils/wingettimeofday.h
index 0f8b767a..a5537f39 100644
--- a/src/utils/wingettimeofday.h
+++ b/src/utils/wingettimeofday.h
@@ -1,5 +1,5 @@
 /*
- *  The Mana World Server
+ *  The Mana World
  *  Copyright 2004 The Mana World Development Team
  *
  *  This file is part of The Mana World.
@@ -17,10 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
  */
 
-#ifndef _TMWSERV_WINGETTIMEOFDAY_H_
-#define _TMWSERV_WINGETTIMEOFDAY_H_
+#ifndef _TMW_WINGETTIMEOFDAY_H_
+#define _TMW_WINGETTIMEOFDAY_H_
 
 #ifdef WIN32
 
diff --git a/src/winver.h b/src/winver.h
new file mode 100644
index 00000000..58f11bea
--- /dev/null
+++ b/src/winver.h
@@ -0,0 +1,6 @@
+/* VERSION DEFINITIONS */
+#define VER_MAJOR 0
+#define VER_MINOR 1
+#define VER_RELEASE 0
+#define VER_BUILD 0
+#define PACKAGE_VERSION "0.1.0"
diff --git a/tmw.cbp b/tmw.cbp
index d36a8bd0..c81ffb3e 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -40,16 +40,6 @@
 				</Linker>
 			</Target>
 		</Build>
-		<Unit filename="src\action.cpp">
-			<Option compilerVar="CPP"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="src\action.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
 		<Unit filename="src\animatedsprite.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
@@ -60,26 +50,6 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\animation.cpp">
-			<Option compilerVar="CPP"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="src\animation.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="src\base64.cpp">
-			<Option compilerVar="CPP"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="src\base64.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
 		<Unit filename="src\being.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
@@ -172,12 +142,6 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\graphic\imagerect.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
 		<Unit filename="src\graphics.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
@@ -1210,6 +1174,16 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
+		<Unit filename="src\resources\action.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\resources\action.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
 		<Unit filename="src\resources\ambientoverlay.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
@@ -1220,6 +1194,16 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
+		<Unit filename="src\resources\animation.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\resources\animation.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
 		<Unit filename="src\resources\buddylist.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
@@ -1429,6 +1413,16 @@
 			<Option objectName="src\tmw.res"/>
 			<Option target="default"/>
 		</Unit>
+		<Unit filename="src\utils\base64.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\utils\base64.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
 		<Unit filename="src\utils\dtor.h">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
@@ -1451,5 +1445,11 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
+		<Unit filename="src\winver.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
 	</Project>
 </CodeBlocks_project_file>
-- 
cgit v1.2.3-70-g09d2


From d1395845cdc678db2a71326f2e6f20253ed14cac Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 14 Jan 2007 16:45:13 +0000
Subject: Merged 0.0 changes from revision 2988 to 3035 to trunk.

---
 ChangeLog                   |  86 ++++++++++++++++++++++--
 src/game.cpp                |  19 +++---
 src/gui/browserbox.cpp      |  15 +++--
 src/gui/browserbox.h        |  10 +--
 src/gui/buddywindow.cpp     |   8 +--
 src/gui/buddywindow.h       |   2 +-
 src/gui/button.cpp          |   9 +--
 src/gui/button.h            |   2 +-
 src/gui/buy.cpp             |  16 ++---
 src/gui/buy.h               |   2 +-
 src/gui/buysell.cpp         |   8 +--
 src/gui/buysell.h           |   2 +-
 src/gui/char_select.cpp     |  40 +++++------
 src/gui/char_select.h       |   4 +-
 src/gui/chat.cpp            |  15 +++--
 src/gui/chat.h              |  11 +--
 src/gui/chatinput.cpp       |   2 +-
 src/gui/chatinput.h         |   2 +-
 src/gui/confirm_dialog.cpp  |   7 +-
 src/gui/confirm_dialog.h    |   2 +-
 src/gui/connection.cpp      |   8 ++-
 src/gui/debugwindow.cpp     |  16 +++--
 src/gui/debugwindow.h       |   2 +-
 src/gui/gccontainer.cpp     |   6 +-
 src/gui/gccontainer.h       |   9 ++-
 src/gui/help.cpp            |   4 +-
 src/gui/help.h              |   2 +-
 src/gui/inttextbox.cpp      |   7 +-
 src/gui/inttextbox.h        |   3 +-
 src/gui/inventorywindow.cpp |  20 +++---
 src/gui/inventorywindow.h   |   6 +-
 src/gui/item_amount.cpp     |  20 +++---
 src/gui/item_amount.h       |   2 +-
 src/gui/itemcontainer.cpp   |  35 ++++++----
 src/gui/itemcontainer.h     |   2 +-
 src/gui/listbox.cpp         |  33 ++-------
 src/gui/listbox.h           |   6 +-
 src/gui/login.cpp           |  16 ++---
 src/gui/login.h             |   4 +-
 src/gui/menuwindow.cpp      |  14 ++--
 src/gui/newskill.cpp        |  24 +++----
 src/gui/newskill.h          |   2 +-
 src/gui/npc_text.cpp        |   4 +-
 src/gui/npc_text.h          |   2 +-
 src/gui/npclistdialog.cpp   |   8 +--
 src/gui/npclistdialog.h     |   2 +-
 src/gui/ok_dialog.cpp       |   6 +-
 src/gui/ok_dialog.h         |   2 +-
 src/gui/playerbox.cpp       |   1 -
 src/gui/register.cpp        |   6 +-
 src/gui/register.h          |   2 +-
 src/gui/sell.cpp            |  18 ++---
 src/gui/sell.h              |   2 +-
 src/gui/serverdialog.cpp    |  23 ++++---
 src/gui/serverdialog.h      |   5 +-
 src/gui/setup.cpp           |   8 +--
 src/gui/setup.h             |   2 +-
 src/gui/setup_audio.cpp     |  10 +--
 src/gui/setup_audio.h       |   2 +-
 src/gui/setup_joystick.cpp  |   5 +-
 src/gui/setup_joystick.h    |   2 +-
 src/gui/setup_video.cpp     |  49 +++++++-------
 src/gui/setup_video.h       |   5 +-
 src/gui/shoplistbox.cpp     |   6 +-
 src/gui/shoplistbox.h       |   2 +-
 src/gui/skill.cpp           |  10 +--
 src/gui/skill.h             |   2 +-
 src/gui/status.cpp          |   4 +-
 src/gui/status.h            |   2 +-
 src/gui/tabbedcontainer.cpp |   4 +-
 src/gui/tabbedcontainer.h   |   2 +-
 src/gui/trade.cpp           |  10 +--
 src/gui/trade.h             |   2 +-
 src/gui/updatewindow.cpp    |   6 +-
 src/gui/updatewindow.h      |   2 +-
 src/gui/viewport.cpp        |  28 ++++----
 src/gui/viewport.h          |  28 ++++++--
 src/gui/window.cpp          | 121 +++++++++++----------------------
 src/gui/window.h            |  19 +++---
 src/main.cpp                |  10 +--
 src/net/playerhandler.cpp   |   4 +-
 src/net/tradehandler.cpp    |   4 +-
 tools/Purger.java           | 159 --------------------------------------------
 83 files changed, 495 insertions(+), 597 deletions(-)
 delete mode 100644 tools/Purger.java

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index 0cbbb214..d091a061 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,53 @@
+2007-01-14  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/game.cpp, src/main.cpp, src/gui/trade.cpp, src/gui/sell.cpp,
+	src/gui/connection.cpp, src/gui/buddywindow.cpp, src/gui/browserbox.h,
+	src/gui/char_server.cpp, src/gui/window.cpp, src/gui/login.cpp,
+	src/gui/inttextbox.h, src/gui/viewport.cpp, src/gui/button.h,
+	src/gui/shoplistbox.h, src/gui/skill.h, src/gui/item_amount.h,
+	src/gui/setup_audio.h, src/gui/newskill.cpp, src/gui/listbox.h,
+	src/gui/register.h, src/gui/setup.cpp, src/gui/npclistdialog.h,
+	src/gui/updatewindow.cpp, src/gui/button.cpp, src/gui/char_select.cpp,
+	src/gui/login.h, src/gui/setup_audio.cpp, src/gui/item_amount.cpp,
+	src/gui/setup_joystick.h, src/gui/chat.h, src/gui/npc_text.cpp,
+	src/gui/setup_video.cpp, src/gui/ok_dialog.cpp,
+	src/gui/inventorywindow.h, src/gui/gccontainer.cpp,
+	src/gui/newskill.h, src/gui/buy.h, src/gui/setup.h,
+	src/gui/itemcontainer.h, src/gui/confirm_dialog.cpp,
+	src/gui/debugwindow.cpp, src/gui/chat.cpp, src/gui/setup_joystick.cpp,
+	src/gui/updatewindow.h, src/gui/char_select.h, src/gui/buysell.h,
+	src/gui/tabbedcontainer.cpp, src/gui/inventorywindow.cpp,
+	src/gui/help.cpp, src/gui/status.h, src/gui/npc_text.h,
+	src/gui/setup_video.h, src/gui/menuwindow.cpp, src/gui/browserbox.cpp,
+	src/gui/ok_dialog.h, src/gui/buy.cpp, src/gui/itemcontainer.cpp,
+	src/gui/gccontainer.h, src/gui/buddywindow.h, src/gui/sell.h,
+	src/gui/trade.h, src/gui/inttextbox.cpp, src/gui/char_server.h,
+	src/gui/window.h, src/gui/shoplistbox.cpp, src/gui/skill.cpp,
+	src/gui/buysell.cpp, src/gui/confirm_dialog.h, src/gui/debugwindow.h,
+	src/gui/status.cpp, src/gui/listbox.cpp, src/gui/register.cpp,
+	src/gui/viewport.h, src/gui/tabbedcontainer.h,
+	src/gui/npclistdialog.cpp, src/gui/help.h, src/gui/chatinput.h,
+	src/gui/chatinput.cpp, src/net/tradehandler.cpp,
+	src/net/playerhandler.cpp: Upgraded to Guichan 0.6.0 (merge from
+	guichan-0.6.0 branch).
+
+2007-01-13  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* data/graphics/sprites/Makefile.am,
+	data/graphics/sprites/CMakeLists.txt: Updated with regard to renaming
+	of cotton equipment.
+
+2006-01-13  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* src/gui/debugwindow.cpp, src/gui/viewport.h: Fixed mouse coordinates
+	display in debug window.
+
+2007-01-12  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/viewport.cpp: Fixed initialization of mPlayerFollowMouse,
+	the lack of which sometimes caused the player to start walking when
+	clicking on the GUI.
+
 2007-01-11  Björn Steinbrink  <B.Steinbrink@gmx.de>
 
 	* data/graphics/images/ambient/CMakeLists.txt,
@@ -7,23 +57,43 @@
 2007-01-11  Rogier Polak  <rogier.l.a.polak@gmail.com>
 
 	* src/gui/char_select.cpp, src/net/accountserver/account.h,
-	src/net/accountserver/account.cpp, src/player.cpp: Fixedd issues
+	src/net/accountserver/account.cpp, src/player.cpp: Fixed issues
 	with out of range hair style and color, as well as their ordering.
 	* data/graphics/gui/Makefile.am,
 	data/graphics/images/ambient/Makefile.am,
 	data/graphics/sprites/Makefile.am: Some corrections to installed
 	files.
 
+2007-01-09  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/icecave.png: Added new tiles and fixes by Nickman and
+	made some other cosmetical corrections.
+
 2007-01-07  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
+	* data/graphics/sprites/monster-mountsnake.xml,
+	data/graphics/sprites/monster-mountsnake.png, data/monsters.xml: Added
+	brown snake by Pauan.
 	* src/gui/status.h, src/gui/status.cpp, src/localplayer.h:
 	Synchronized player attributes with Attributes page on the wiki.
 	Removed job xp bar.
 
+2007-01-07  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/chest-cottonshirt-male.png,
+	data/graphics/chest-cottonshirt-male.xml,
+	data/graphics/chest-cottonshirt-female.png,
+	data/graphics/chest-cottonshirt-female.xml,
+	data/graphics/item001.png, data/equipment.xml: Added female
+	cottonshirt sprites.
+	* data/equipment.xml: Fixed some wrong armor values.
+
 2007-01-05  Björn Steinbrink  <B.Steinbrink@gmx.de>
 
 	* src/CMakeLists.txt, data/graphics/sprites/CMakeLists.txt: Fixed
 	installation when using CMake.
+	* src/CMakeLists.txt, data/graphics/images/ambient/Makefile.am,
+	data/graphics/sprites/CMakeLists.txt: Synchronized build files.
 
 2007-01-05  Guillaume Melquiond <guillaume.melquiond@gmail.com>
 
@@ -36,6 +106,10 @@
 
 	* src/map.cpp, src/map.h: Declared some methods const.
 
+2007-01-04  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* tools/Purger.java: Removed purger tool.
+
 2007-01-03  Guillaume Melquiond <guillaume.melquiond@gmail.com>
 
 	* src/resources/mapreader.cpp: Fixed memory leak on error.
@@ -285,11 +359,11 @@
 2006-12-09  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/sprite.h, src/gui/playerbox.h, src/gui/char_select.cpp,
-	src/gui/playerbox.cpp, src/gui/passwordfield.h,src/gui/char_select.h,
-	src/gui/textfield.h, src/main.cpp, src/being.cpp, src/player.h,
-	src/floor_item.h, src/being.h: Use new animation system in character
-	selection/creation. Shows equipment and allowed for some cleanup. Had
-	a bit of help from the patch by VictorSan.
+	src/gui/playerbox.cpp, src/gui/passwordfield.h, src/gui/char_select.h,
+	src/main.cpp, src/being.cpp, src/player.h, src/floor_item.h,
+	src/being.h: Use new animation system in character selection/creation.
+	Shows equipment and allowed for some cleanup. Had a bit of help from
+	the patch by VictorSan.
 
 2006-12-08  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
diff --git a/src/game.cpp b/src/game.cpp
index 2af13146..40d78248 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -124,9 +124,11 @@ const int MAX_TIME = 10000;
  * Listener used for exitting handling.
  */
 namespace {
-    struct ExitListener : public gcn::ActionListener {
-        void action(const std::string &eventId, gcn::Widget *widget) {
-            if (eventId == "yes") {
+    struct ExitListener : public gcn::ActionListener
+    {
+        void action(const gcn::ActionEvent &event)
+        {
+            if (event.getId() == "yes") {
                 done = true;
             }
             exitConfirm = NULL;
@@ -386,10 +388,6 @@ void Game::logic()
 
 void Game::handleInput()
 {
-    // Get the state of the keyboard keys
-    Uint8* keys;
-    keys = SDL_GetKeyState(NULL);
-
     if (joystick != NULL)
     {
         joystick->update();
@@ -455,7 +453,7 @@ void Game::handleInput()
                     // Close the config window, cancelling changes if opened
                     else if (setupWindow->isVisible())
                     {
-                        setupWindow->action("cancel", NULL);
+                        setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
                     }
                     // Else, open the chat edit box
                     else
@@ -633,7 +631,12 @@ void Game::handleInput()
         current_npc == 0 &&
         !chatWindow->isFocused())
     {
+        // Get the state of the keyboard keys
+        Uint8* keys;
+        keys = SDL_GetKeyState(NULL);
+
         Uint16 x = player_node->mX / 32, y = player_node->mY / 32;
+
         unsigned char direction = 0;
 
         // Translate pressed keys to movement and direction
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 2aec84a5..65fdde64 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -98,7 +98,7 @@ void BrowserBox::disableLinksAndUserColors()
     mUseLinksAndUserColors = false;
 }
 
-void BrowserBox::addRow(const std::string& row)
+void BrowserBox::addRow(const std::string &row)
 {
     std::string tmp = row;
     std::string newRow;
@@ -238,25 +238,28 @@ struct MouseOverLink
     int mX, mY;
 };
 
-void BrowserBox::mousePress(int mx, int my, int button)
+void
+BrowserBox::mousePressed(gcn::MouseEvent &event)
 {
     LinkIterator i = find_if(mLinks.begin(), mLinks.end(),
-            MouseOverLink(mx, my));
+            MouseOverLink(event.getX(), event.getY()));
 
     if (i != mLinks.end()) {
         mLinkHandler->handleLink(i->link);
     }
 }
 
-void BrowserBox::mouseMotion(int mx, int my)
+void
+BrowserBox::mouseMoved(gcn::MouseEvent &event)
 {
     LinkIterator i = find_if(mLinks.begin(), mLinks.end(),
-            MouseOverLink(mx, my));
+            MouseOverLink(event.getX(), event.getY()));
 
     mSelectedLink = (i != mLinks.end()) ? (i - mLinks.begin()) : -1;
 }
 
-void BrowserBox::draw(gcn::Graphics* graphics)
+void
+BrowserBox::draw(gcn::Graphics *graphics)
 {
     if (mOpaque)
     {
diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h
index a2c9dd9b..666a7754 100644
--- a/src/gui/browserbox.h
+++ b/src/gui/browserbox.h
@@ -61,7 +61,7 @@ class BrowserBox : public gcn::Widget, public gcn::MouseListener
         /**
          * Sets the handler for links.
          */
-        void setLinkHandler(LinkHandler* linkHandler);
+        void setLinkHandler(LinkHandler *linkHandler);
 
         /**
          * Sets the BrowserBox opacity.
@@ -81,7 +81,7 @@ class BrowserBox : public gcn::Widget, public gcn::MouseListener
         /**
          * Adds a text row to the browser.
          */
-        void addRow(const std::string& row);
+        void addRow(const std::string &row);
 
         /**
          * Remove all rows.
@@ -91,13 +91,13 @@ class BrowserBox : public gcn::Widget, public gcn::MouseListener
         /**
          * Handles mouse actions.
          */
-        void mousePress(int mx, int my, int button);
-        void mouseMotion(int mx, int my);
+        void mousePressed(gcn::MouseEvent &event);
+        void mouseMoved(gcn::MouseEvent &event);
 
         /**
          * Draws the browser box.
          */
-        void draw(gcn::Graphics* graphics);
+        void draw(gcn::Graphics *graphics);
 
         /**
          * BrowserBox modes.
diff --git a/src/gui/buddywindow.cpp b/src/gui/buddywindow.cpp
index 145f0ad2..0ed383ce 100644
--- a/src/gui/buddywindow.cpp
+++ b/src/gui/buddywindow.cpp
@@ -61,9 +61,9 @@ BuddyWindow::BuddyWindow():
     add(cancel);
 }
 
-void BuddyWindow::action(const std::string &eventId, gcn::Widget *widget)
+void BuddyWindow::action(const gcn::ActionEvent &event)
 {
-    if (eventId == "Talk") {
+    if (event.getId() == "Talk") {
         int selected = mListbox->getSelected();
         if ( selected > -1 )
         {
@@ -71,7 +71,7 @@ void BuddyWindow::action(const std::string &eventId, gcn::Widget *widget)
             chatWindow->setInputText(who +": ");
         }
     }
-    else if (eventId == "Remove") {
+    else if (event.getId() == "Remove") {
         int selected = mListbox->getSelected();
         if ( selected > -1 )
         {
@@ -79,7 +79,7 @@ void BuddyWindow::action(const std::string &eventId, gcn::Widget *widget)
             mBuddyList->removeBuddy(who);
         }
     }
-    else if (eventId == "Cancel") {
+    else if (event.getId() == "Cancel") {
         setVisible(false);
     }
 }
diff --git a/src/gui/buddywindow.h b/src/gui/buddywindow.h
index 8764d008..a3ca4de2 100644
--- a/src/gui/buddywindow.h
+++ b/src/gui/buddywindow.h
@@ -48,7 +48,7 @@ class BuddyWindow : public Window, public gcn::ActionListener
         /**
          * Performs action.
          */
-        void action(const std::string& eventId, gcn::Widget* widget);
+        void action(const gcn::ActionEvent &event);
 
     private:
         BuddyList *mBuddyList;
diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index 31f38593..0055c89a 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -37,7 +37,7 @@
 ImageRect Button::button[4];
 int Button::mInstances = 0;
 
-Button::Button(const std::string& caption, const std::string &eventId,
+Button::Button(const std::string& caption, const std::string &actionEventId,
         gcn::ActionListener *listener):
     gcn::Button(caption)
 {
@@ -73,7 +73,7 @@ Button::Button(const std::string& caption, const std::string &eventId,
     }
 
     mInstances++;
-    setEventId(eventId);
+    setActionEventId(actionEventId);
     if (listener) {
         addActionListener(listener);
     }
@@ -92,7 +92,8 @@ Button::~Button()
     }
 }
 
-void Button::draw(gcn::Graphics* graphics)
+void
+Button::draw(gcn::Graphics *graphics)
 {
     int mode;
 
@@ -102,7 +103,7 @@ void Button::draw(gcn::Graphics* graphics)
     else if (isPressed()) {
         mode = 2;
     }
-    else if (hasMouse()) {
+    else if (mHasMouse) {
         mode = 1;
     }
     else {
diff --git a/src/gui/button.h b/src/gui/button.h
index 36d8f7a1..1c2ec41b 100644
--- a/src/gui/button.h
+++ b/src/gui/button.h
@@ -40,7 +40,7 @@ class Button : public gcn::Button {
         /**
          * Constructor, sets the caption of the button to the given string.
          */
-        Button(const std::string& caption, const std::string &eventId,
+        Button(const std::string& caption, const std::string &actionEventId,
                 gcn::ActionListener *listener);
 
         /**
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 102dd49e..cb07da22 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -82,8 +82,8 @@ BuyDialog::BuyDialog():
     mItemEffectLabel->setDimension(gcn::Rectangle(5, 150, 240, 14));
     mItemDescLabel->setDimension(gcn::Rectangle(5, 169, 240, 14));
 
-    mShopItemList->setEventId("item");
-    mSlider->setEventId("slider");
+    mShopItemList->setActionEventId("item");
+    mSlider->setActionEventId("slider");
 
     mShopItemList->addSelectionListener(this);
     mSlider->addActionListener(this);
@@ -140,11 +140,11 @@ void BuyDialog::addItem(short id, int price)
     mShopItemList->adjustSize();
 }
 
-void BuyDialog::action(const std::string &eventId, gcn::Widget *widget)
+void BuyDialog::action(const gcn::ActionEvent &event)
 {
     int selectedItem = mShopItemList->getSelected();
 
-    if (eventId == "quit")
+    if (event.getId() == "quit")
     {
         setVisible(false);
         current_npc = 0;
@@ -158,12 +158,12 @@ void BuyDialog::action(const std::string &eventId, gcn::Widget *widget)
 
     bool updateButtonsAndLabels = false;
 
-    if (eventId == "slider")
+    if (event.getId() == "slider")
     {
         mAmountItems = (int)(mSlider->getValue() * mMaxItems);
         updateButtonsAndLabels = true;
     }
-    else if (eventId == "+")
+    else if (event.getId() == "+")
     {
         if (mAmountItems < mMaxItems) {
             mAmountItems++;
@@ -174,7 +174,7 @@ void BuyDialog::action(const std::string &eventId, gcn::Widget *widget)
         mSlider->setValue(double(mAmountItems)/double(mMaxItems));
         updateButtonsAndLabels = true;
     }
-    else if (eventId == "-")
+    else if (event.getId() == "-")
     {
         if (mAmountItems > 0) {
             mAmountItems--;
@@ -188,7 +188,7 @@ void BuyDialog::action(const std::string &eventId, gcn::Widget *widget)
     // TODO: Actually we'd have a bug elsewhere if this check for the number
     // of items to be bought ever fails, Bertram removed the assertions, is
     // there a better way to ensure this fails in an _obivous_ way in C++?
-    else if (eventId == "buy" && (mAmountItems > 0 &&
+    else if (event.getId() == "buy" && (mAmountItems > 0 &&
                 mAmountItems <= mMaxItems))
     {
         // XXX Convert for new server
diff --git a/src/gui/buy.h b/src/gui/buy.h
index b83b6f2f..13116b6e 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -73,7 +73,7 @@ class BuyDialog : public Window, public gcn::ActionListener, SelectionListener
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const std::string& eventId, gcn::Widget* widget);
+        void action(const gcn::ActionEvent &event);
 
         /**
          * Returns the number of items in the shop inventory.
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index 4bbbb2ff..ae5c7358 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -52,13 +52,13 @@ BuySellDialog::BuySellDialog():
     requestFocus();
 }
 
-void BuySellDialog::action(const std::string &eventId, gcn::Widget *widget)
+void BuySellDialog::action(const gcn::ActionEvent &event)
 {
-    if (eventId == "Buy") {
+    if (event.getId() == "Buy") {
         current_npc->buy();
-    } else if (eventId == "Sell") {
+    } else if (event.getId() == "Sell") {
         current_npc->sell();
-    } else if (eventId == "Cancel") {
+    } else if (event.getId() == "Cancel") {
         current_npc = 0;
     }
     setVisible(false);
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index 7a90a869..97caf34b 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -47,7 +47,7 @@ class BuySellDialog : public Window, public gcn::ActionListener
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const std::string& eventId, gcn::Widget* widget);
+        void action(const gcn::ActionEvent &event);
 };
 
 #endif
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index ec4dad2e..4c4b99e5 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -48,7 +48,7 @@ class CharDeleteConfirm : public ConfirmDialog
 {
     public:
         CharDeleteConfirm(CharSelectDialog *master);
-        void action(const std::string &eventId, gcn::Widget *widget);
+        void action(const gcn::ActionEvent &event);
     private:
         CharSelectDialog *master;
 };
@@ -60,13 +60,13 @@ CharDeleteConfirm::CharDeleteConfirm(CharSelectDialog *m):
 {
 }
 
-void CharDeleteConfirm::action(const std::string &eventId, gcn::Widget *widget)
+void CharDeleteConfirm::action(const gcn::ActionEvent &event)
 {
-    //ConfirmDialog::action(eventId);
-    if (eventId == "yes") {
+    //ConfirmDialog::action(event);
+    if (event.getId() == "yes") {
         master->attemptCharDelete();
     }
-    ConfirmDialog::action(eventId, widget);
+    ConfirmDialog::action(event);
 }
 
 CharSelectDialog::CharSelectDialog(LockedArray<LocalPlayer*> *charInfo):
@@ -122,9 +122,9 @@ CharSelectDialog::CharSelectDialog(LockedArray<LocalPlayer*> *charInfo):
     updatePlayerInfo();
 }
 
-void CharSelectDialog::action(const std::string &eventId, gcn::Widget *widget)
+void CharSelectDialog::action(const gcn::ActionEvent &event)
 {
-    if (eventId == "ok" && n_character > 0)
+    if (event.getId() == "ok" && n_character > 0)
     {
         // Start game
         mNewCharButton->setEnabled(false);
@@ -136,11 +136,11 @@ void CharSelectDialog::action(const std::string &eventId, gcn::Widget *widget)
         Net::AccountServer::Account::selectCharacter(mCharInfo->getPos());
         mCharInfo->lock();
     }
-    else if (eventId == "cancel")
+    else if (event.getId() == "cancel")
     {
         state = STATE_EXIT;
     }
-    else if (eventId == "new")
+    else if (event.getId() == "new")
     {
         if (n_character < MAX_SLOT + 1)
         {
@@ -150,7 +150,7 @@ void CharSelectDialog::action(const std::string &eventId, gcn::Widget *widget)
             mCharInfo->unlock();
         }
     }
-    else if (eventId == "delete")
+    else if (event.getId() == "delete")
     {
         // Delete character
         if (mCharInfo->getEntry())
@@ -158,11 +158,11 @@ void CharSelectDialog::action(const std::string &eventId, gcn::Widget *widget)
             new CharDeleteConfirm(this);
         }
     }
-    else if (eventId == "previous")
+    else if (event.getId() == "previous")
     {
         mCharInfo->prev();
     }
-    else if (eventId == "next")
+    else if (event.getId() == "next")
     {
         mCharInfo->next();
     }
@@ -253,7 +253,7 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot):
     mCancelButton = new Button("Cancel", "cancel", this);
     mPlayerBox = new PlayerBox(mPlayer);
 
-    mNameField->setEventId("create");
+    mNameField->setActionEventId("create");
 
     int w = 200;
     int h = 150;
@@ -298,9 +298,9 @@ CharCreateDialog::~CharCreateDialog()
     delete mPlayer;
 }
 
-void CharCreateDialog::action(const std::string &eventId, gcn::Widget *widget)
+void CharCreateDialog::action(const gcn::ActionEvent &event)
 {
-    if (eventId == "create") {
+    if (event.getId() == "create") {
         if (getName().length() >= 4) {
             // Attempt to create the character
             mCreateButton->setEnabled(false);
@@ -322,20 +322,20 @@ void CharCreateDialog::action(const std::string &eventId, gcn::Widget *widget)
                     "Your name needs to be at least 4 characters.", this);
         }
     }
-    else if (eventId == "cancel") {
+    else if (event.getId() == "cancel") {
         scheduleDelete();
     }
-    else if (eventId == "nextcolor") {
+    else if (event.getId() == "nextcolor") {
         mPlayer->setHairColor((mPlayer->getHairColor() + 1) % NR_HAIR_COLORS);
     }
-    else if (eventId == "prevcolor") {
+    else if (event.getId() == "prevcolor") {
         int prevColor = mPlayer->getHairColor() + NR_HAIR_COLORS - 1;
         mPlayer->setHairColor(prevColor % NR_HAIR_COLORS);
     }
-    else if (eventId == "nextstyle") {
+    else if (event.getId() == "nextstyle") {
         mPlayer->setHairStyle((mPlayer->getHairStyle() + 1) % NR_HAIR_STYLES);
     }
-    else if (eventId == "prevstyle") {
+    else if (event.getId() == "prevstyle") {
         int prevStyle = mPlayer->getHairStyle() + NR_HAIR_STYLES - 1;
         mPlayer->setHairStyle(prevStyle % NR_HAIR_STYLES);
     }
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index 9d2d77da..d6dee8b5 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -49,7 +49,7 @@ class CharSelectDialog : public Window, public gcn::ActionListener
          */
         CharSelectDialog(LockedArray<LocalPlayer*> *charInfo);
 
-        void action(const std::string &eventId, gcn::Widget *widget);
+        void action(const gcn::ActionEvent &event);
 
         void updatePlayerInfo();
 
@@ -109,7 +109,7 @@ class CharCreateDialog : public Window, public gcn::ActionListener
          */
         ~CharCreateDialog();
 
-        void action(const std::string &eventId, gcn::Widget *widget);
+        void action(const gcn::ActionEvent &event);
 
         std::string getName();
 
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 3dc252ab..d992c6dd 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -53,7 +53,7 @@ ChatWindow::ChatWindow():
     loadWindowState();
 
     mChatInput = new ChatInput();
-    mChatInput->setEventId("chatinput");
+    mChatInput->setActionEventId("chatinput");
     mChatInput->addActionListener(this);
 
     mTextOutput = new BrowserBox(BrowserBox::AUTO_WRAP);
@@ -180,9 +180,9 @@ ChatWindow::chatLog(CHATSKILL act)
 }
 
 void
-ChatWindow::action(const std::string &eventId, gcn::Widget *widget)
+ChatWindow::action(const gcn::ActionEvent &event)
 {
-    if (eventId == "chatinput")
+    if (event.getId() == "chatinput")
     {
         std::string message = mChatInput->getText();
 
@@ -360,9 +360,10 @@ ChatWindow::const_msg(CHATSKILL act)
 }
 
 void
-ChatWindow::keyPress(const gcn::Key &key)
+ChatWindow::keyPressed(gcn::KeyEvent &event)
 {
-    if (key.getValue() == key.DOWN && mCurHist != mHistory.end())
+    if (event.getKey().getValue() == gcn::Key::DOWN &&
+            mCurHist != mHistory.end())
     {
         // Move forward through the history
         HistoryIterator prevHist = mCurHist++;
@@ -374,8 +375,8 @@ ChatWindow::keyPress(const gcn::Key &key)
             mCurHist = prevHist;
         }
     }
-    else if (key.getValue() == key.UP && mCurHist != mHistory.begin() &&
-            mHistory.size() > 0)
+    else if (event.getKey().getValue() == gcn::Key::UP &&
+            mCurHist != mHistory.begin() && mHistory.size() > 0)
     {
         // Move backward through the history
         mCurHist--;
diff --git a/src/gui/chat.h b/src/gui/chat.h
index a0a3d1ec..963e5e98 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -138,7 +138,7 @@ class ChatWindow : public Window, public gcn::ActionListener,
         /**
          * Performs action.
          */
-        void action(const std::string& actionId, gcn::Widget* widget);
+        void action(const gcn::ActionEvent &event);
 
         /**
          * Request focus for typing chat message.
@@ -178,13 +178,16 @@ class ChatWindow : public Window, public gcn::ActionListener,
         chatSend(const std::string &nick, std::string msg);
 
         /** Called when key is pressed */
-        void keyPress(const gcn::Key& key);
+        void
+        keyPressed(gcn::KeyEvent &event);
 
         /** Called to set current text */
-        void setInputText(std::string input_str);
+        void
+        setInputText(std::string input_str);
 
         /** Override to reset mTmpVisible */
-        void setVisible(bool visible);
+        void
+        setVisible(bool visible);
 
     private:
         bool mTmpVisible;
diff --git a/src/gui/chatinput.cpp b/src/gui/chatinput.cpp
index 52e91f3a..2aa5a159 100644
--- a/src/gui/chatinput.cpp
+++ b/src/gui/chatinput.cpp
@@ -28,7 +28,7 @@ ChatInput::ChatInput()
     setVisible(false);
 }
 
-void ChatInput::lostFocus()
+void ChatInput::focusLost()
 {
     setVisible(false);
 }
diff --git a/src/gui/chatinput.h b/src/gui/chatinput.h
index 9f543e24..59d0daf3 100644
--- a/src/gui/chatinput.h
+++ b/src/gui/chatinput.h
@@ -41,7 +41,7 @@ class ChatInput : public TextField
          * Called if the chat input loses focus. It will set itself to
          * invisible as result.
          */
-        void lostFocus();
+        void focusLost();
 };
 
 #endif
diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp
index 5a70544f..0ff8be17 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirm_dialog.cpp
@@ -65,17 +65,18 @@ ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg,
     yesButton->requestFocus();
 }
 
-void ConfirmDialog::action(const std::string &eventId, gcn::Widget *widget)
+void ConfirmDialog::action(const gcn::ActionEvent &event)
 {
     // Proxy button events to our listeners
     ActionListenerIterator i;
     for (i = mActionListeners.begin(); i != mActionListeners.end(); ++i)
     {
-        (*i)->action(eventId, widget);
+        (*i)->action(event);
     }
 
     // Can we receive anything else anyway?
-    if (eventId == "yes" || eventId == "no") {
+    if (event.getId() == "yes" || event.getId() == "no")
+    {
         scheduleDelete();
     }
 }
diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h
index 771ecc36..8728f83f 100644
--- a/src/gui/confirm_dialog.h
+++ b/src/gui/confirm_dialog.h
@@ -47,7 +47,7 @@ class ConfirmDialog : public Window, public gcn::ActionListener {
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const std::string &eventId, gcn::Widget *widget);
+        void action(const gcn::ActionEvent &event);
 };
 
 #endif
diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index 7e977f1f..3627689a 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.cpp
@@ -38,7 +38,7 @@ namespace {
         ConnectionActionListener(unsigned char previousState):
             mPreviousState(previousState) {};
 
-        void action(const std::string &eventId, gcn::Widget *widget) {
+        void action(const gcn::ActionEvent &event) {
             state = mPreviousState;
         }
 
@@ -51,9 +51,11 @@ ConnectionDialog::ConnectionDialog(unsigned char previousState):
 {
     setContentSize(200, 100);
 
-    ConnectionActionListener *connectionListener = new ConnectionActionListener(previousState);
+    ConnectionActionListener *connectionListener =
+        new ConnectionActionListener(previousState);
 
-    Button *cancelButton = new Button("Cancel", "cancelButton", connectionListener);
+    Button *cancelButton = new Button("Cancel", "cancelButton",
+                                      connectionListener);
     mProgressBar = new ProgressBar(0.0, 200 - 10, 20, 128, 128, 128);
     gcn::Label *label = new gcn::Label("Connecting...");
 
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index f8a4154e..563f380f 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -28,6 +28,8 @@
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
+#include "gui.h"
+#include "viewport.h"
 
 #include "../game.h"
 #include "../engine.h"
@@ -72,15 +74,15 @@ DebugWindow::logic()
     // Get the current mouse position
     int mouseX, mouseY;
     SDL_GetMouseState(&mouseX, &mouseY);
-    //int mouseTileX = mouseX / 32 + camera_x;
-    //int mouseTileY = mouseY / 32 + camera_y;
+    int mouseTileX = mouseX / 32 + viewport->getCameraX();
+    int mouseTileY = mouseY / 32 + viewport->getCameraY();
 
     mFPSLabel->setCaption("[" + toString(fps) + " FPS");
     mFPSLabel->adjustSize();
 
-    //mTileMouseLabel->setCaption("[Mouse: " +
-    //        toString(mouseTileX) + ", " + toString(mouseTileY) + "]");
-    //mTileMouseLabel->adjustSize();
+    mTileMouseLabel->setCaption("[Mouse: " +
+            toString(mouseTileX) + ", " + toString(mouseTileY) + "]");
+    mTileMouseLabel->adjustSize();
 
     Map *currentMap = engine->getCurrentMap();
     if (currentMap != NULL)
@@ -98,9 +100,9 @@ DebugWindow::logic()
 }
 
 void
-DebugWindow::action(const std::string &eventId, gcn::Widget *widget)
+DebugWindow::action(const gcn::ActionEvent &event)
 {
-    if (eventId == "close")
+    if (event.getId() == "close")
     {
         setVisible(false);
     }
diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h
index 61ef44e6..4fd33d83 100644
--- a/src/gui/debugwindow.h
+++ b/src/gui/debugwindow.h
@@ -53,7 +53,7 @@ class DebugWindow : public Window, public gcn::ActionListener
         /**
          * Performs action.
          */
-        void action(const std::string& eventId, gcn::Widget* widget);
+        void action(const gcn::ActionEvent &event);
 
     private:
         gcn::Label *mMusicFileLabel, *mMapFileLabel;
diff --git a/src/gui/gccontainer.cpp b/src/gui/gccontainer.cpp
index 3b574622..c22ddfc9 100644
--- a/src/gui/gccontainer.cpp
+++ b/src/gui/gccontainer.cpp
@@ -55,8 +55,8 @@ void GCContainer::add(gcn::Widget *w, int x, int y, bool delChild)
     Container::add(w, x, y);
 }
 
-void GCContainer::_announceDeath(gcn::Widget *w)
+void GCContainer::death(const gcn::Event &event)
 {
-    mDeathList.remove(w);
-    Container::_announceDeath(w);
+    mDeathList.remove(event.getSource());
+    Container::death(event);
 }
diff --git a/src/gui/gccontainer.h b/src/gui/gccontainer.h
index 46ebfefa..e27eaa96 100644
--- a/src/gui/gccontainer.h
+++ b/src/gui/gccontainer.h
@@ -32,9 +32,12 @@ class GCContainer : public gcn::Container
 {
     public:
         virtual ~GCContainer();
-        virtual void add(gcn::Widget *w, bool delChild=true);
-        virtual void add(gcn::Widget *w, int x, int y, bool delChild=true);
-        virtual void _announceDeath(gcn::Widget *w);
+
+        virtual void add(gcn::Widget *w, bool delChild = true);
+
+        virtual void add(gcn::Widget *w, int x, int y, bool delChild = true);
+
+        virtual void death(const gcn::Event &event);
 
     protected:
         typedef std::list<gcn::Widget*> Widgets;
diff --git a/src/gui/help.cpp b/src/gui/help.cpp
index e7429b29..0b010253 100644
--- a/src/gui/help.cpp
+++ b/src/gui/help.cpp
@@ -54,9 +54,9 @@ HelpWindow::HelpWindow():
     setLocationRelativeTo(getParent());
 }
 
-void HelpWindow::action(const std::string &eventId, gcn::Widget *widget)
+void HelpWindow::action(const gcn::ActionEvent &event)
 {
-    if (eventId == "close")
+    if (event.getId() == "close")
     {
         setVisible(false);
     }
diff --git a/src/gui/help.h b/src/gui/help.h
index 539ab31b..3c3715a0 100644
--- a/src/gui/help.h
+++ b/src/gui/help.h
@@ -48,7 +48,7 @@ class HelpWindow : public Window, public LinkHandler,
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const std::string& eventId, gcn::Widget* widget);
+        void action(const gcn::ActionEvent &event);
 
         /**
          * Handles link action.
diff --git a/src/gui/inttextbox.cpp b/src/gui/inttextbox.cpp
index 92f21e5f..2a09f255 100644
--- a/src/gui/inttextbox.cpp
+++ b/src/gui/inttextbox.cpp
@@ -32,12 +32,15 @@ IntTextBox::IntTextBox(int i):
 {
 }
 
-void IntTextBox::keyPress(const gcn::Key &key)
+void
+IntTextBox::keyPressed(gcn::KeyEvent &event)
 {
+    const gcn::Key &key = event.getKey();
+
     if (key.isNumber() || key.getValue() == gcn::Key::BACKSPACE
         || key.getValue() == gcn::Key::DELETE)
     {
-        gcn::TextBox::keyPress(key);
+        gcn::TextBox::keyPressed(event);
     }
 
     std::stringstream s(gcn::TextBox::getText());
diff --git a/src/gui/inttextbox.h b/src/gui/inttextbox.h
index b199cb2f..b5d339ac 100644
--- a/src/gui/inttextbox.h
+++ b/src/gui/inttextbox.h
@@ -55,7 +55,8 @@ class IntTextBox : public TextBox
         /**
          * Responds to key presses.
          */
-        void keyPress(const gcn::Key &key);
+        void
+        keyPressed(gcn::KeyEvent &event);
 
     private:
         int mMin;            /**< Minimum value */
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 7f9ba3b9..e533c16c 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -99,7 +99,7 @@ void InventoryWindow::logic()
     mWeightLabel->adjustSize();
 }
 
-void InventoryWindow::action(const std::string &eventId, gcn::Widget *widget)
+void InventoryWindow::action(const gcn::ActionEvent &event)
 {
     Item *item = mItems->getItem();
 
@@ -107,7 +107,7 @@ void InventoryWindow::action(const std::string &eventId, gcn::Widget *widget)
         return;
     }
 
-    if (eventId == "use") {
+    if (event.getId() == "use") {
         if (item->isEquipment()) {
             if (item->isEquipped()) {
                 player_node->unequipItem(item);
@@ -120,7 +120,7 @@ void InventoryWindow::action(const std::string &eventId, gcn::Widget *widget)
             player_node->useItem(item);
         }
     }
-    else if (eventId == "drop")
+    else if (event.getId() == "drop")
     {
         // Choose amount of items to drop
         new ItemAmountWindow(AMOUNT_ITEM_DROP, this, item);
@@ -155,11 +155,11 @@ void InventoryWindow::selectionChanged(const SelectionEvent &event)
     }
 }
 
-void InventoryWindow::mouseClick(int x, int y, int button, int count)
+void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
 {
-    Window::mouseClick(x, y, button, count);
+    Window::mouseClicked(event);
 
-    if (button == gcn::MouseInput::RIGHT)
+    if (event.getButton() == gcn::MouseEvent::RIGHT)
     {
         Item *item = mItems->getItem();
 
@@ -168,16 +168,16 @@ void InventoryWindow::mouseClick(int x, int y, int button, int count)
         /* Convert relative to the window coordinates to
          * absolute screen coordinates.
          */
-        int mx = x + getX();
-        int my = y + getY();
+        int mx = event.getX() + getX();
+        int my = event.getY() + getY();
         viewport->showPopup(mx, my, item);
     }
 }
 
-void InventoryWindow::mouseMotion(int mx, int my)
+void InventoryWindow::mouseDragged(gcn::MouseEvent &event)
 {
     int tmpWidth = getWidth(), tmpHeight = getHeight();
-    Window::mouseMotion(mx, my);
+    Window::mouseDragged(event);
     if (getWidth() != tmpWidth || getHeight() != tmpHeight) {
         updateWidgets();
     }
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index d46e91e7..5ee89fef 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -55,11 +55,11 @@ class InventoryWindow : public Window, gcn::ActionListener, SelectionListener
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const std::string &eventId, gcn::Widget *widget);
+        void action(const gcn::ActionEvent &event);
 
-        void mouseClick(int x, int y, int button, int count);
+        void mouseClicked(gcn::MouseEvent &event);
 
-        void mouseMotion(int mx, int my);
+        void mouseDragged(gcn::MouseEvent &event);
 
         Item* getItem();
 
diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp
index 5ebc0213..f72462f9 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.cpp
@@ -49,7 +49,7 @@ ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
     mItemAmountSlide->setDimension(gcn::Rectangle(5, 120, 180, 10));
 
     // Set button events Id
-    mItemAmountSlide->setEventId("Slide");
+    mItemAmountSlide->setActionEventId("Slide");
 
     // Set position
     mItemAmountTextBox->setPosition(35, 10);
@@ -75,11 +75,11 @@ ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
     switch (usage) {
         case AMOUNT_TRADE_ADD:
             setCaption("Select amount of items to trade.");
-            okButton->setEventId("AddTrade");
+            okButton->setActionEventId("AddTrade");
             break;
         case AMOUNT_ITEM_DROP:
             setCaption("Select amount of items to drop.");
-            okButton->setEventId("Drop");
+            okButton->setActionEventId("Drop");
             break;
         default:
             break;
@@ -95,33 +95,33 @@ void ItemAmountWindow::resetAmount()
     mItemAmountTextBox->setInt(1);
 }
 
-void ItemAmountWindow::action(const std::string &eventId, gcn::Widget *widget)
+void ItemAmountWindow::action(const gcn::ActionEvent &event)
 {
     int amount = mItemAmountTextBox->getInt();
 
-    if (eventId == "Cancel")
+    if (event.getId() == "Cancel")
     {
         scheduleDelete();
     }
-    else if (eventId == "Drop")
+    else if (event.getId() == "Drop")
     {
         player_node->dropItem(mItem, mItemAmountTextBox->getInt());
         scheduleDelete();
     }
-    else if (eventId == "AddTrade")
+    else if (event.getId() == "AddTrade")
     {
         tradeWindow->tradeItem(mItem, mItemAmountTextBox->getInt());
         scheduleDelete();
     }
-    else if (eventId == "Plus")
+    else if (event.getId() == "Plus")
     {
         amount++;
     }
-    else if (eventId == "Minus")
+    else if (event.getId() == "Minus")
     {
         amount--;
     }
-    else if (eventId == "Slide")
+    else if (event.getId() == "Slide")
     {
         amount = static_cast<int>(mItemAmountSlide->getValue());
     }
diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h
index a2a17575..01319012 100644
--- a/src/gui/item_amount.h
+++ b/src/gui/item_amount.h
@@ -54,7 +54,7 @@ class ItemAmountWindow : public Window, public gcn::ActionListener
         /**
          * Called when receiving actions from widget.
          */
-        void action(const std::string& eventId, gcn::Widget* widget);
+        void action(const gcn::ActionEvent &event);
 
         /**
          * Sets default amount value.
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 2c84b19b..308311b7 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -58,7 +58,8 @@ ItemContainer::~ItemContainer()
     mSelImg->decRef();
 }
 
-void ItemContainer::logic()
+void
+ItemContainer::logic()
 {
     gcn::Widget::logic();
 
@@ -70,7 +71,8 @@ void ItemContainer::logic()
     }
 }
 
-void ItemContainer::draw(gcn::Graphics* graphics)
+void
+ItemContainer::draw(gcn::Graphics *graphics)
 {
     int gridWidth = 36; //(item icon width + 4)
     int gridHeight = 42; //(item icon height + 10)
@@ -124,7 +126,8 @@ void ItemContainer::draw(gcn::Graphics* graphics)
     }
 }
 
-void ItemContainer::setWidth(int width)
+void
+ItemContainer::setWidth(int width)
 {
     gcn::Widget::setWidth(width);
 
@@ -140,17 +143,20 @@ void ItemContainer::setWidth(int width)
     setHeight((mMaxItems + columns - 1) / columns * gridHeight);
 }
 
-Item* ItemContainer::getItem()
+Item*
+ItemContainer::getItem()
 {
     return mSelectedItem;
 }
 
-void ItemContainer::selectNone()
+void
+ItemContainer::selectNone()
 {
     setSelectedItem(NULL);
 }
 
-void ItemContainer::setSelectedItem(Item *item)
+void
+ItemContainer::setSelectedItem(Item *item)
 {
     if (mSelectedItem != item)
     {
@@ -159,7 +165,8 @@ void ItemContainer::setSelectedItem(Item *item)
     }
 }
 
-void ItemContainer::fireSelectionChangedEvent()
+void
+ItemContainer::fireSelectionChangedEvent()
 {
     SelectionEvent event(this);
     SelectionListeners::iterator i_end = mListeners.end();
@@ -171,14 +178,18 @@ void ItemContainer::fireSelectionChangedEvent()
     }
 }
 
-void ItemContainer::mousePress(int mx, int my, int button)
+void
+ItemContainer::mousePressed(gcn::MouseEvent &event)
 {
-    int gridWidth = 36; //(item icon width + 4)
-    int gridHeight = 42; //(item icon height + 10)
-    int columns = getWidth() / gridWidth;
+    int button = event.getButton();
 
-    if (button == gcn::MouseInput::LEFT || gcn::MouseInput::RIGHT)
+    if (button == gcn::MouseEvent::LEFT || button == gcn::MouseEvent::RIGHT)
     {
+        int gridWidth = 36; //(item icon width + 4)
+        int gridHeight = 42; //(item icon height + 10)
+        int columns = getWidth() / gridWidth;
+        int mx = event.getX();
+        int my = event.getY();
         int index = mx / gridWidth + ((my / gridHeight) * columns);
 
         if (index > INVENTORY_SIZE) {
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index a2d5f0f7..8c548fcd 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -71,7 +71,7 @@ class ItemContainer : public gcn::Widget, public gcn::MouseListener
         /**
          * Handles mouse click.
          */
-        void mousePress(int mx, int my, int button);
+        void mousePressed(gcn::MouseEvent &event);
 
         /**
          * Returns the selected item.
diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp
index d4a2c6cb..a7f6df8d 100644
--- a/src/gui/listbox.cpp
+++ b/src/gui/listbox.cpp
@@ -31,8 +31,7 @@
 #include <guichan/mouseinput.hpp>
 
 ListBox::ListBox(gcn::ListModel *listModel):
-    gcn::ListBox(listModel),
-    mMousePressed(false)
+    gcn::ListBox(listModel)
 {
 }
 
@@ -61,39 +60,19 @@ void ListBox::draw(gcn::Graphics *graphics)
     }
 }
 
-void ListBox::setSelected(int selected)
+void
+ListBox::setSelected(int selected)
 {
     gcn::ListBox::setSelected(selected);
     fireSelectionChangedEvent();
 }
 
-void ListBox::mousePress(int x, int y, int button)
+void
+ListBox::mouseDragged(gcn::MouseEvent &event)
 {
-    gcn::ListBox::mousePress(x, y, button);
-
-    if (button == gcn::MouseInput::LEFT && hasMouse())
-    {
-        mMousePressed = true;
-    }
-}
-
-void ListBox::mouseRelease(int x, int y, int button)
-{
-    gcn::ListBox::mouseRelease(x, y, button);
-
-    mMousePressed = false;
-}
-
-void ListBox::mouseMotion(int x, int y)
-{
-    gcn::ListBox::mouseMotion(x, y);
-
     // Pretend mouse is pressed continuously while dragged. Causes list
     // selection to be updated as is default in many GUIs.
-    if (mMousePressed)
-    {
-        mousePress(x, y, gcn::MouseInput::LEFT);
-    }
+    mousePressed(event);
 }
 
 void ListBox::fireSelectionChangedEvent()
diff --git a/src/gui/listbox.h b/src/gui/listbox.h
index deca07cf..1d480eb1 100644
--- a/src/gui/listbox.h
+++ b/src/gui/listbox.h
@@ -48,9 +48,7 @@ class ListBox : public gcn::ListBox
          */
         void draw(gcn::Graphics *graphics);
 
-        void mousePress(int x, int y, int button);
-        void mouseRelease(int x, int y, int button);
-        void mouseMotion(int x, int y);
+        void mouseDragged(gcn::MouseEvent &event);
 
         /**
          * Adds a listener to the list that's notified each time a change to
@@ -81,8 +79,6 @@ class ListBox : public gcn::ListBox
          */
         void fireSelectionChangedEvent();
 
-        bool mMousePressed;    /**< Keeps track of mouse pressed status. */
-
         std::list<SelectionListener*> mListeners;
 };
 
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index b8d4df2b..664074aa 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -43,9 +43,9 @@ WrongDataNoticeListener::setTarget(gcn::TextField *textField)
 }
 
 void
-WrongDataNoticeListener::action(const std::string &eventId, gcn::Widget *widget)
+WrongDataNoticeListener::action(const gcn::ActionEvent &event)
 {
-    if (eventId == "ok")
+    if (event.getId() == "ok")
     {
         // Reset the field
         mTarget->setText("");
@@ -85,8 +85,8 @@ LoginDialog::LoginDialog(LoginData *loginData):
             mKeepCheck->getX() + mKeepCheck->getWidth() + 10,
             91 - mRegisterButton->getHeight() - 5);
 
-    mUserField->setEventId("ok");
-    mPassField->setEventId("ok");
+    mUserField->setActionEventId("ok");
+    mPassField->setActionEventId("ok");
 
     mUserField->addActionListener(this);
     mPassField->addActionListener(this);
@@ -119,9 +119,9 @@ LoginDialog::~LoginDialog()
 }
 
 void
-LoginDialog::action(const std::string &eventId, gcn::Widget *widget)
+LoginDialog::action(const gcn::ActionEvent &event)
 {
-    if (eventId == "ok")
+    if (event.getId() == "ok")
     {
         // Check login
         if (mUserField->getText().empty())
@@ -142,11 +142,11 @@ LoginDialog::action(const std::string &eventId, gcn::Widget *widget)
             state = STATE_LOGIN_ATTEMPT;
         }
     }
-    else if (eventId == "cancel")
+    else if (event.getId() == "cancel")
     {
         state = STATE_EXIT;
     }
-    else if (eventId == "register")
+    else if (event.getId() == "register")
     {
         state = STATE_REGISTER;
     }
diff --git a/src/gui/login.h b/src/gui/login.h
index 6d510da7..05c0da31 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -38,7 +38,7 @@ class LoginData;
 class WrongDataNoticeListener : public gcn::ActionListener {
     public:
         void setTarget(gcn::TextField *textField);
-        void action(const std::string& eventId, gcn::Widget* widget);
+        void action(const gcn::ActionEvent &event);
     private:
         gcn::TextField *mTarget;
 };
@@ -65,7 +65,7 @@ class LoginDialog : public Window, public gcn::ActionListener {
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const std::string& eventId, gcn::Widget* widget);
+        void action(const gcn::ActionEvent &event);
 
     private:
         gcn::TextField *mUserField;
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index a1b342f0..ba4c8e94 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -39,7 +39,7 @@ namespace {
         /**
          * Called when receiving actions from widget.
          */
-        void action(const std::string &eventId, gcn::Widget *widget);
+        void action(const gcn::ActionEvent &event);
     } listener;
 }
 
@@ -75,26 +75,26 @@ void MenuWindow::draw(gcn::Graphics *graphics)
 }
 
 
-void MenuWindowListener::action(const std::string &eventId, gcn::Widget *widget)
+void MenuWindowListener::action(const gcn::ActionEvent &event)
 {
     Window *window = NULL;
-    if (eventId == "Status")
+    if (event.getId() == "Status")
     {
         window = statusWindow;
     }
-    else if (eventId == "Equipment")
+    else if (event.getId() == "Equipment")
     {
         window = equipmentWindow;
     }
-    else if (eventId == "Inventory")
+    else if (event.getId() == "Inventory")
     {
         window = inventoryWindow;
     }
-    else if (eventId == "Skills")
+    else if (event.getId() == "Skills")
     {
         window = skillDialog;
     }
-    else if (eventId == "Setup")
+    else if (event.getId() == "Setup")
     {
         window = setupWindow;
     }
diff --git a/src/gui/newskill.cpp b/src/gui/newskill.cpp
index 7f5de543..6783a546 100644
--- a/src/gui/newskill.cpp
+++ b/src/gui/newskill.cpp
@@ -121,46 +121,46 @@ NewSkillDialog::NewSkillDialog():
     setLocationRelativeTo(getParent());
 }
 
-void NewSkillDialog::action(const std::string &eventId, gcn::Widget *widget)
+void NewSkillDialog::action(const gcn::ActionEvent &event)
 {
-     int osp = startPoint;
-    if (eventId == "close")
+    int osp = startPoint;
+    if (event.getId() == "close")
     {
         setVisible(false);
     }
-    else if (eventId == "g1") // weapons group 0-9
+    else if (event.getId() == "g1") // weapons group 0-9
     {
         startPoint =0;
     }
-    else if (eventId == "g2") // magic group 10-19
+    else if (event.getId() == "g2") // magic group 10-19
     {
         startPoint =10;
     }
-    else if (eventId == "g3") // craft group 20-29
+    else if (event.getId() == "g3") // craft group 20-29
     {
         startPoint =20;
     }
-    else if (eventId == "g4") // general group 30-39
+    else if (event.getId() == "g4") // general group 30-39
     {
         startPoint =30;
     }
-    else if (eventId == "g5") // combat group 40-49
+    else if (event.getId() == "g5") // combat group 40-49
     {
         startPoint =40;
     }
-    else if (eventId == "g6") // e. resist group 50-59
+    else if (event.getId() == "g6") // e. resist group 50-59
     {
         startPoint =50;
     }
-    else if (eventId == "g7") // s resist group 60-69
+    else if (event.getId() == "g7") // s resist group 60-69
     {
         startPoint =60;
     }
-    else if (eventId == "g8") // hunting group 70-79
+    else if (event.getId() == "g8") // hunting group 70-79
     {
         startPoint =70;
     }
-    else if (eventId == "g9") // stats group 80-89
+    else if (event.getId() == "g9") // stats group 80-89
     {
         startPoint =80;
     }
diff --git a/src/gui/newskill.h b/src/gui/newskill.h
index 224574bd..6e12169f 100644
--- a/src/gui/newskill.h
+++ b/src/gui/newskill.h
@@ -55,7 +55,7 @@ class NewSkillDialog : public Window, public gcn::ActionListener
         NewSkillDialog();
 
         // action listener
-        void action(const std::string& eventId, gcn::Widget* widget);
+        void action(const gcn::ActionEvent &event);
 
     private:
         void resetNSD(); // updates the values in the dialog box
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 5b7ca439..2dd223bd 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -67,9 +67,9 @@ NpcTextDialog::addText(const std::string &text)
 }
 
 void
-NpcTextDialog::action(const std::string &eventId, gcn::Widget *widget)
+NpcTextDialog::action(const gcn::ActionEvent &event)
 {
-    if (eventId == "ok")
+    if (event.getId() == "ok")
     {
         setText("");
         setVisible(false);
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 3ce1215d..869661c4 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -49,7 +49,7 @@ class NpcTextDialog : public Window, public gcn::ActionListener
          * Called when receiving actions from the widgets.
          */
         void
-        action(const std::string& eventId, gcn::Widget* widget);
+        action(const gcn::ActionEvent &event);
 
         /**
          * Sets the text shows in the dialog.
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index d1c3ddcb..1bcdc8ff 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -50,7 +50,7 @@ NpcListDialog::NpcListDialog():
             cancelButton->getX() - 5 - okButton->getWidth(),
             cancelButton->getY());
 
-    mItemList->setEventId("item");
+    mItemList->setActionEventId("item");
 
     mItemList->addActionListener(this);
 
@@ -91,11 +91,11 @@ NpcListDialog::reset()
 }
 
 void
-NpcListDialog::action(const std::string &eventId, gcn::Widget *widget)
+NpcListDialog::action(const gcn::ActionEvent &event)
 {
     int choice = 0;
 
-    if (eventId == "ok")
+    if (event.getId() == "ok")
     {
         // Send the selected index back to the server
         int selectedIndex = mItemList->getSelected();
@@ -104,7 +104,7 @@ NpcListDialog::action(const std::string &eventId, gcn::Widget *widget)
             choice = selectedIndex + 1;
         }
     }
-    else if (eventId == "cancel")
+    else if (event.getId() == "cancel")
     {
         choice = 0xff; // 0xff means cancel
     }
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index 03b76681..c09b0a8c 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -54,7 +54,7 @@ class NpcListDialog : public Window, public gcn::ActionListener,
          * Called when receiving actions from the widgets.
          */
         void
-        action(const std::string& eventId, gcn::Widget* widget);
+        action(const gcn::ActionEvent &event);
 
         /**
          * Returns the number of items in the choices list.
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index 4f9623d7..ca9d2a7b 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -55,17 +55,17 @@ OkDialog::OkDialog(const std::string &title, const std::string &msg,
     okButton->requestFocus();
 }
 
-void OkDialog::action(const std::string &eventId, gcn::Widget *widget)
+void OkDialog::action(const gcn::ActionEvent &event)
 {
     // Proxy button events to our listeners
     ActionListenerIterator i;
     for (i = mActionListeners.begin(); i != mActionListeners.end(); ++i)
     {
-        (*i)->action(eventId, widget);
+        (*i)->action(event);
     }
 
     // Can we receive anything else anyway?
-    if (eventId == "ok") {
+    if (event.getId() == "ok") {
         scheduleDelete();
     }
 }
diff --git a/src/gui/ok_dialog.h b/src/gui/ok_dialog.h
index 8ae08955..a7b24a90 100644
--- a/src/gui/ok_dialog.h
+++ b/src/gui/ok_dialog.h
@@ -46,7 +46,7 @@ class OkDialog : public Window, public gcn::ActionListener {
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const std::string &eventId, gcn::Widget *widget);
+        void action(const gcn::ActionEvent &event);
 };
 
 #endif
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index 5fbe79b7..fad156f1 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -28,7 +28,6 @@
 
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
-#include "../resources/spriteset.h"
 
 #include "../utils/dtor.h"
 
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 70cd6dc4..4539e48e 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -108,13 +108,13 @@ RegisterDialog::~RegisterDialog()
 }
 
 void
-RegisterDialog::action(const std::string &eventId, gcn::Widget *widget)
+RegisterDialog::action(const gcn::ActionEvent &event)
 {
-    if (eventId == "cancel")
+    if (event.getId() == "cancel")
     {
         state = STATE_LOGIN;
     }
-    else if (eventId == "register")
+    else if (event.getId() == "register")
     {
         const std::string user = mUserField->getText();
         logger->log("RegisterDialog::register Username is %s", user.c_str());
diff --git a/src/gui/register.h b/src/gui/register.h
index 4c98788f..4ffe451f 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -56,7 +56,7 @@ class RegisterDialog : public Window, public gcn::ActionListener {
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const std::string& eventId, gcn::Widget* widget);
+        void action(const gcn::ActionEvent &event);
 
         // Made them public to have the possibility to request focus
         // from external functions.
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index b0957f9e..c9878c84 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -87,8 +87,8 @@ SellDialog::SellDialog():
 
     quitButton->setPosition(208, 186);
 
-    mShopItemList->setEventId("item");
-    mSlider->setEventId("mSlider");
+    mShopItemList->setActionEventId("item");
+    mSlider->setActionEventId("mSlider");
 
     mShopItemList->setPriceCheck(false);
 
@@ -154,11 +154,11 @@ void SellDialog::addItem(Item *item, int price)
     mShopItemList->adjustSize();
 }
 
-void SellDialog::action(const std::string &eventId, gcn::Widget *widget)
+void SellDialog::action(const gcn::ActionEvent &event)
 {
     int selectedItem = mShopItemList->getSelected();
 
-    if (eventId == "item")
+    if (event.getId() == "item")
     {
         mAmountItems = 0;
         mSlider->setValue(0);
@@ -182,7 +182,7 @@ void SellDialog::action(const std::string &eventId, gcn::Widget *widget)
         }
         mQuantityLabel->adjustSize();
     }
-    else if (eventId == "quit")
+    else if (event.getId() == "quit")
     {
         setVisible(false);
         current_npc = 0;
@@ -195,13 +195,13 @@ void SellDialog::action(const std::string &eventId, gcn::Widget *widget)
 
     bool updateButtonsAndLabels = false;
 
-    if (eventId == "mSlider")
+    if (event.getId() == "mSlider")
     {
         mAmountItems = (int)(mSlider->getValue() * mMaxItems);
 
         updateButtonsAndLabels = true;
     }
-    else if (eventId == "+")
+    else if (event.getId() == "+")
     {
         assert(mAmountItems < mMaxItems);
         mAmountItems++;
@@ -209,7 +209,7 @@ void SellDialog::action(const std::string &eventId, gcn::Widget *widget)
 
         updateButtonsAndLabels = true;
     }
-    else if (eventId == "-")
+    else if (event.getId() == "-")
     {
         assert(mAmountItems > 0);
         mAmountItems--;
@@ -218,7 +218,7 @@ void SellDialog::action(const std::string &eventId, gcn::Widget *widget)
 
         updateButtonsAndLabels = true;
     }
-    else if (eventId == "sell")
+    else if (event.getId() == "sell")
     {
         // Attempt sell
         assert(mAmountItems > 0 && mAmountItems <= mMaxItems);
diff --git a/src/gui/sell.h b/src/gui/sell.h
index ba324576..68bd7b8b 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -68,7 +68,7 @@ class SellDialog : public Window, gcn::ActionListener, SelectionListener
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const std::string& eventId, gcn::Widget* widget);
+        void action(const gcn::ActionEvent &event);
 
         /**
          * Updates labels according to selected item.
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index bd17bff7..bf29f0d3 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -44,9 +44,9 @@
 const short MAX_SERVERLIST = 5;
 
 void
-DropDownListener::action(const std::string &eventId, gcn::Widget *widget)
+DropDownListener::action(const gcn::ActionEvent &event)
 {
-    if (eventId == "ok")
+    if (event.getId() == "ok")
     {
         // Reset the text fields and give back the server dialog.
         mServerNameField->setText("");
@@ -56,13 +56,14 @@ DropDownListener::action(const std::string &eventId, gcn::Widget *widget)
 
         mServerNameField->requestFocus();
     }
-    else if (eventId == "changeSelection")
+    else if (event.getId() == "changeSelection")
     {
         // Change the textField Values according to new selection
         if (currentSelectedIndex != mServersListBox->getSelected())
         {
             Server myServer;
-            myServer = mServersListModel->getServer(mServersListBox->getSelected());
+            myServer = mServersListModel->getServer(
+                    mServersListBox->getSelected());
             mServerNameField->setText(myServer.serverName);
             mServerPortField->setText(toString(myServer.port));
             currentSelectedIndex = mServersListBox->getSelected();
@@ -131,7 +132,7 @@ ServerDialog::ServerDialog(LoginData *loginData):
         mMostUsedServersScrollArea, mMostUsedServersListBox);
 
     mDropDownListener = new DropDownListener(mServerNameField, mPortField,
-                                mMostUsedServersListModel, mMostUsedServersListBox);
+            mMostUsedServersListModel, mMostUsedServersListBox);
 
     mOkButton = new Button("OK", "ok", this);
     mCancelButton = new Button("Cancel", "cancel", this);
@@ -157,9 +158,9 @@ ServerDialog::ServerDialog(LoginData *loginData):
             mCancelButton->getX() - mOkButton->getWidth() - 5,
             100 - mOkButton->getHeight() - 5);
 
-    mServerNameField->setEventId("ok");
-    mPortField->setEventId("ok");
-    mMostUsedServersDropDown->setEventId("changeSelection");
+    mServerNameField->setActionEventId("ok");
+    mPortField->setActionEventId("ok");
+    mMostUsedServersDropDown->setActionEventId("changeSelection");
 
     mServerNameField->addActionListener(this);
     mPortField->addActionListener(this);
@@ -193,9 +194,9 @@ ServerDialog::~ServerDialog()
 }
 
 void
-ServerDialog::action(const std::string &eventId, gcn::Widget *widget)
+ServerDialog::action(const gcn::ActionEvent &event)
 {
-    if (eventId == "ok")
+    if (event.getId() == "ok")
     {
         // Check login
         if (mServerNameField->getText().empty() || mPortField->getText().empty())
@@ -240,7 +241,7 @@ ServerDialog::action(const std::string &eventId, gcn::Widget *widget)
             state = STATE_CONNECT_ACCOUNT;
         }
     }
-    else if (eventId == "cancel")
+    else if (event.getId() == "cancel")
     {
         state = STATE_EXIT;
     }
diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h
index d907f340..2bb0609f 100644
--- a/src/gui/serverdialog.h
+++ b/src/gui/serverdialog.h
@@ -98,8 +98,7 @@ class DropDownListener : public gcn::ActionListener
             mServerPortField(serverPortField),
             mServersListModel(serversListModel),
             mServersListBox(serversListBox) {};
-        void action(const std::string& eventId,
-                    gcn::Widget* widget);
+        void action(const gcn::ActionEvent &event);
     private:
         short currentSelectedIndex;
         gcn::TextField *mServerNameField;
@@ -132,7 +131,7 @@ class ServerDialog : public Window, public gcn::ActionListener
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const std::string &eventId, gcn::Widget *widget);
+        void action(const gcn::ActionEvent &event);
 
     private:
         gcn::TextField *mServerNameField;
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 78b10498..3add3a18 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -85,19 +85,19 @@ Setup::~Setup()
     for_each(mTabs.begin(), mTabs.end(), make_dtor(mTabs));
 }
 
-void Setup::action(const std::string& event, gcn::Widget *widget)
+void Setup::action(const gcn::ActionEvent &event)
 {
-    if (event == "Apply")
+    if (event.getId() == "Apply")
     {
         setVisible(false);
         for_each(mTabs.begin(), mTabs.end(), std::mem_fun(&SetupTab::apply));
     }
-    else if (event == "Cancel")
+    else if (event.getId() == "Cancel")
     {
         setVisible(false);
         for_each(mTabs.begin(), mTabs.end(), std::mem_fun(&SetupTab::cancel));
     }
-    else if (event == "Reset Windows")
+    else if (event.getId() == "Reset Windows")
     {
         statusWindow->resetToDefaultSize();
         minimap->resetToDefaultSize();
diff --git a/src/gui/setup.h b/src/gui/setup.h
index 6601ce3d..77173367 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -54,7 +54,7 @@ class Setup : public Window, public gcn::ActionListener
          * Event handling method.
          */
         void
-        action(const std::string& eventId, gcn::Widget* widget);
+        action(const gcn::ActionEvent &event);
 
     private:
         std::list<SetupTab*> mTabs;
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index db88ff64..e5aadf80 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -46,8 +46,8 @@ Setup_Audio::Setup_Audio():
     gcn::Label *sfxLabel = new gcn::Label("Sfx volume");
     gcn::Label *musicLabel = new gcn::Label("Music volume");
 
-    mSfxSlider->setEventId("sfx");
-    mMusicSlider->setEventId("music");
+    mSfxSlider->setActionEventId("sfx");
+    mMusicSlider->setActionEventId("music");
 
     mSfxSlider->addActionListener(this);
     mMusicSlider->addActionListener(this);
@@ -108,14 +108,14 @@ void Setup_Audio::cancel()
     config.setValue("musicVolume", mMusicVolume);
 }
 
-void Setup_Audio::action(const std::string& event, gcn::Widget *widget)
+void Setup_Audio::action(const gcn::ActionEvent &event)
 {
-    if (event == "sfx")
+    if (event.getId() == "sfx")
     {
         config.setValue("sfxVolume", (int)mSfxSlider->getValue());
         sound.setSfxVolume((int)mSfxSlider->getValue());
     }
-    else if (event == "music")
+    else if (event.getId() == "music")
     {
         config.setValue("musicVolume", (int)mMusicSlider->getValue());
         sound.setMusicVolume((int)mMusicSlider->getValue());
diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h
index f09f62da..6e722f74 100644
--- a/src/gui/setup_audio.h
+++ b/src/gui/setup_audio.h
@@ -38,7 +38,7 @@ class Setup_Audio : public SetupTab, public gcn::ActionListener
         void apply();
         void cancel();
 
-        void action(const std::string& eventId, gcn::Widget* widget);
+        void action(const gcn::ActionEvent &event);
 
     private:
         int mMusicVolume, mSfxVolume;
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 685d88cf..56f411d7 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -45,7 +45,6 @@ Setup_Joystick::Setup_Joystick():
     mOriginalJoystickEnabled = (int)config.getValue("joystickEnabled", 0) != 0;
     mJoystickEnabled->setMarked(mOriginalJoystickEnabled);
 
-    mJoystickEnabled->setEventId("joystickEnabled");
     mJoystickEnabled->addActionListener(this);
 
     add(mCalibrateLabel);
@@ -53,13 +52,13 @@ Setup_Joystick::Setup_Joystick():
     add(mJoystickEnabled);
 }
 
-void Setup_Joystick::action(const std::string &event, gcn::Widget *widget)
+void Setup_Joystick::action(const gcn::ActionEvent &event)
 {
     if (!joystick) {
         return;
     }
 
-    if (event == "joystickEnabled")
+    if (event.getSource() == mJoystickEnabled)
     {
         joystick->setEnabled(mJoystickEnabled->isMarked());
     }
diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h
index 4cc2b3d9..6d3ad129 100644
--- a/src/gui/setup_joystick.h
+++ b/src/gui/setup_joystick.h
@@ -38,7 +38,7 @@ class Setup_Joystick : public SetupTab, public gcn::ActionListener
         void apply();
         void cancel();
 
-        void action(const std::string& eventId, gcn::Widget* widget);
+        void action(const gcn::ActionEvent &event);
 
     private:
         gcn::Label *mCalibrateLabel;
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 7a4aae03..8930af3e 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -158,16 +158,16 @@ Setup_Video::Setup_Video():
     mFpsSlider->setEnabled(mFps > 0);
     mFpsCheckBox->setMarked(mFps > 0);
 
-    mCustomCursorCheckBox->setEventId("customcursor");
-    mAlphaSlider->setEventId("guialpha");
-    mFpsCheckBox->setEventId("fpslimitcheckbox");
-    mFpsSlider->setEventId("fpslimitslider");
-    mScrollRadiusSlider->setEventId("scrollradiusslider");
-    mScrollRadiusField->setEventId("scrollradiusfield");
-    mScrollLazinessSlider->setEventId("scrolllazinessslider");
-    mScrollLazinessField->setEventId("scrolllazinessfield");
-    mOverlayDetailSlider->setEventId("overlaydetailslider");
-    mOverlayDetailField->setEventId("overlaydetailfield");
+    mCustomCursorCheckBox->setActionEventId("customcursor");
+    mAlphaSlider->setActionEventId("guialpha");
+    mFpsCheckBox->setActionEventId("fpslimitcheckbox");
+    mFpsSlider->setActionEventId("fpslimitslider");
+    mScrollRadiusSlider->setActionEventId("scrollradiusslider");
+    mScrollRadiusField->setActionEventId("scrollradiusfield");
+    mScrollLazinessSlider->setActionEventId("scrolllazinessslider");
+    mScrollLazinessField->setActionEventId("scrolllazinessfield");
+    mOverlayDetailSlider->setActionEventId("overlaydetailslider");
+    mOverlayDetailField->setActionEventId("overlaydetailfield");
 
     mCustomCursorCheckBox->addActionListener(this);
     mAlphaSlider->addActionListener(this);
@@ -331,37 +331,37 @@ void Setup_Video::cancel()
     config.setValue("opengl", mOpenGLEnabled ? 1 : 0);
 }
 
-void Setup_Video::action(const std::string &event, gcn::Widget *widget)
+void Setup_Video::action(const gcn::ActionEvent &event)
 {
-    if (event == "guialpha")
+    if (event.getId() == "guialpha")
     {
         config.setValue("guialpha", mAlphaSlider->getValue());
     }
-    else if (event == "customcursor")
+    else if (event.getId() == "customcursor")
     {
         config.setValue("customcursor",
                 mCustomCursorCheckBox->isMarked() ? 1 : 0);
     }
-    else if (event == "fpslimitslider")
+    else if (event.getId() == "fpslimitslider")
     {
-        mFps = (int)mFpsSlider->getValue();
+        mFps = (int) mFpsSlider->getValue();
         mFpsField->setText(toString(mFps));
     }
-    else if (event == "scrollradiusslider")
+    else if (event.getId() == "scrollradiusslider")
     {
-        int val = (int)mScrollRadiusSlider->getValue();
+        int val = (int) mScrollRadiusSlider->getValue();
         mScrollRadiusField->setText(toString(val));
         config.setValue("ScrollRadius", val);
     }
-    else if (event == "scrolllazinessslider")
+    else if (event.getId() == "scrolllazinessslider")
     {
-        int val = (int)mScrollLazinessSlider->getValue();
+        int val = (int) mScrollLazinessSlider->getValue();
         mScrollLazinessField->setText(toString(val));
         config.setValue("ScrollLaziness", val);
     }
-    else if (event == "overlaydetailslider")
+    else if (event.getId() == "overlaydetailslider")
     {
-        int val = (int)mOverlayDetailSlider->getValue();
+        int val = (int) mOverlayDetailSlider->getValue();
         switch (val)
         {
             case 0:
@@ -376,11 +376,11 @@ void Setup_Video::action(const std::string &event, gcn::Widget *widget)
         }
         config.setValue("OverlayDetail", val);
     }
-    else if (event == "fpslimitcheckbox")
+    else if (event.getId() == "fpslimitcheckbox")
     {
         if (mFpsCheckBox->isMarked())
         {
-            mFps = (int)mFpsSlider->getValue();
+            mFps = (int) mFpsSlider->getValue();
         }
         else
         {
@@ -393,7 +393,8 @@ void Setup_Video::action(const std::string &event, gcn::Widget *widget)
     }
 }
 
-void Setup_Video::keyPress(const gcn::Key &key)
+void
+Setup_Video::keyPressed(gcn::KeyEvent &event)
 {
     std::stringstream tempFps(mFpsField->getText());
 
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index 482d1c65..095fdbd6 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -41,10 +41,11 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
         void apply();
         void cancel();
 
-        void action(const std::string &eventId, gcn::Widget *widget);
+        void action(const gcn::ActionEvent &event);
 
         /** Called when key is pressed */
-        void keyPress(const gcn::Key& key);
+        void
+        keyPressed(gcn::KeyEvent &event);
 
     private:
         bool mFullScreenEnabled;
diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp
index 4821067c..8cf0b639 100644
--- a/src/gui/shoplistbox.cpp
+++ b/src/gui/shoplistbox.cpp
@@ -125,11 +125,12 @@ void ShopListBox::setSelected(int selected)
     fireSelectionChangedEvent();
 }
 
-void ShopListBox::mousePress(int x, int y, int button)
+void ShopListBox::mousePressed(gcn::MouseEvent &event)
 {
-    if (button == gcn::MouseInput::LEFT && hasMouse())
+    if (event.getButton() == gcn::MouseEvent::LEFT)
     {
         bool enoughMoney = false;
+        int y = event.getY();
 
         if (mShopItems && mPriceCheck)
         {
@@ -145,7 +146,6 @@ void ShopListBox::mousePress(int x, int y, int button)
         {
             setSelected(y / mRowHeight);
             generateAction();
-            mMousePressed = true;
         }
     }
 }
diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h
index 476564b2..1cfb183b 100644
--- a/src/gui/shoplistbox.h
+++ b/src/gui/shoplistbox.h
@@ -54,7 +54,7 @@ class ShopListBox : public ListBox
          */
         void draw(gcn::Graphics *graphics);
 
-        void mousePress(int x, int y, int button);
+        void mousePressed(gcn::MouseEvent &event);
 
         /**
          * Adds a listener to the list that's notified each time a change to
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 4f552fd7..1b00a732 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -74,7 +74,7 @@ SkillDialog::SkillDialog():
     mUseButton->setEnabled(false);
     mCloseButton = new Button("Close", "close", this);
 
-    mSkillListBox->setEventId("skill");
+    mSkillListBox->setActionEventId("skill");
 
     skillScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     skillScrollArea->setDimension(gcn::Rectangle(5, 5, 230, 180));
@@ -103,9 +103,9 @@ SkillDialog::~SkillDialog()
     cleanList();
 }
 
-void SkillDialog::action(const std::string &eventId, gcn::Widget *widget)
+void SkillDialog::action(const gcn::ActionEvent &event)
 {
-    if (eventId == "inc")
+    if (event.getId() == "inc")
     {
         // Increment skill
         int selectedSkill = mSkillListBox->getSelected();
@@ -114,13 +114,13 @@ void SkillDialog::action(const std::string &eventId, gcn::Widget *widget)
             player_node->raiseSkill(mSkillList[selectedSkill]->id);
         }
     }
-    else if (eventId == "skill")
+    else if (event.getId() == "skill")
     {
         mIncButton->setEnabled(
                 mSkillListBox->getSelected() > -1 &&
                 player_node->mSkillPoint > 0);
     }
-    else if (eventId == "close")
+    else if (event.getId() == "close")
     {
         setVisible(false);
     }
diff --git a/src/gui/skill.h b/src/gui/skill.h
index 5555fec4..ed1257b0 100644
--- a/src/gui/skill.h
+++ b/src/gui/skill.h
@@ -57,7 +57,7 @@ class SkillDialog : public Window, public gcn::ActionListener,
          */
         ~SkillDialog();
 
-        void action(const std::string& eventId, gcn::Widget* widget);
+        void action(const gcn::ActionEvent &event);
 
         void update();
 
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index bba9f045..9c60752d 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -338,8 +338,10 @@ void StatusWindow::draw(gcn::Graphics *g)
     Window::draw(g);
 }
 
-void StatusWindow::action(const std::string &eventId, gcn::Widget *widget)
+void StatusWindow::action(const gcn::ActionEvent &event)
 {
+    const std::string &eventId = event.getId();
+
     // Stats Part
     if (eventId.length() == 3)
     {
diff --git a/src/gui/status.h b/src/gui/status.h
index 43dfe8c2..37f8a648 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -51,7 +51,7 @@ class StatusWindow : public Window, public gcn::ActionListener {
          /**
          * Called when receiving actions from widget.
          */
-        void action(const std::string& eventId, gcn::Widget* widget);
+        void action(const gcn::ActionEvent &event);
 
         /**
          * Draw this window
diff --git a/src/gui/tabbedcontainer.cpp b/src/gui/tabbedcontainer.cpp
index e3d2527b..75f9f3cf 100644
--- a/src/gui/tabbedcontainer.cpp
+++ b/src/gui/tabbedcontainer.cpp
@@ -78,9 +78,9 @@ void TabbedContainer::logic()
     Container::logic();
 }
 
-void TabbedContainer::action(const std::string &event, gcn::Widget *widget)
+void TabbedContainer::action(const gcn::ActionEvent &event)
 {
-    std::stringstream ss(event);
+    std::stringstream ss(event.getId());
     int tabNo;
     ss >> tabNo;
 
diff --git a/src/gui/tabbedcontainer.h b/src/gui/tabbedcontainer.h
index 453d8374..2dc017ae 100644
--- a/src/gui/tabbedcontainer.h
+++ b/src/gui/tabbedcontainer.h
@@ -43,7 +43,7 @@ class TabbedContainer : public gcn::Container, public gcn::ActionListener
 
         void logic();
 
-        void action(const std::string &event, gcn::Widget *widget);
+        void action(const gcn::ActionEvent &event);
 
         void setOpaque(bool opaque);
 
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 82262563..14b1afa6 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -256,11 +256,11 @@ void TradeWindow::selectionChanged(const SelectionEvent &event)
     }
 }
 
-void TradeWindow::action(const std::string &eventId, gcn::Widget *widget)
+void TradeWindow::action(const gcn::ActionEvent &event)
 {
     Item *item = inventoryWindow->getItem();
 
-    if (eventId == "add")
+    if (event.getId() == "add")
     {
         if (!item)
         {
@@ -286,14 +286,14 @@ void TradeWindow::action(const std::string &eventId, gcn::Widget *widget)
             new ItemAmountWindow(AMOUNT_TRADE_ADD, this, item);
         }
     }
-    else if (eventId == "cancel")
+    else if (event.getId() == "cancel")
     {
         // XXX Convert for new server
         /*
         MessageOut outMsg(CMSG_TRADE_CANCEL_REQUEST);
         */
     }
-    else if (eventId == "ok")
+    else if (event.getId() == "ok")
     {
         std::stringstream tempMoney(mMoneyField->getText());
         int tempInt;
@@ -317,7 +317,7 @@ void TradeWindow::action(const std::string &eventId, gcn::Widget *widget)
         MessageOut outMsg(CMSG_TRADE_ADD_COMPLETE);
         */
     }
-    else if (eventId == "trade")
+    else if (event.getId() == "trade")
     {
         // XXX Convert for new server
         /*
diff --git a/src/gui/trade.h b/src/gui/trade.h
index ebd05a52..1c64c255 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -111,7 +111,7 @@ class TradeWindow : public Window, gcn::ActionListener, SelectionListener
         /**
          * Called when receiving actions from the widgets.
          */
-        void action(const std::string &eventId, gcn::Widget *widget);
+        void action(const gcn::ActionEvent &event);
 
     private:
         typedef std::auto_ptr<Inventory> InventoryPtr;
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 73e4489e..d41dfe13 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -132,9 +132,9 @@ void UpdaterWindow::enable()
     mPlayButton->requestFocus();
 }
 
-void UpdaterWindow::action(const std::string &eventId, gcn::Widget *widget)
+void UpdaterWindow::action(const gcn::ActionEvent &event)
 {
-    if (eventId == "cancel")
+    if (event.getId() == "cancel")
     {
         // Register the user cancel
         mUserCancel=true;
@@ -148,7 +148,7 @@ void UpdaterWindow::action(const std::string &eventId, gcn::Widget *widget)
             mDownloadStatus = UPDATE_ERROR;
         }
     }
-    else if (eventId == "play")
+    else if (event.getId() == "play")
     {
         state = STATE_LOGIN;
     }
diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index 0d1493ee..8c54be27 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.h
@@ -79,7 +79,7 @@ class UpdaterWindow : public Window, public gcn::ActionListener
      */
     void loadNews();
 
-    void action(const std::string& eventId, gcn::Widget* widget);
+    void action(const gcn::ActionEvent &event);
 
     void logic();
 
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 75a16865..671ababa 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -47,6 +47,7 @@ Viewport::Viewport():
     mCameraX(0),
     mCameraY(0),
     mShowDebugPath(false),
+    mPlayerFollowMouse(false),
     mPopupActive(false)
 {
     setOpaque(false);
@@ -243,7 +244,7 @@ Viewport::logic()
 }
 
 void
-Viewport::mousePress(int mx, int my, int button)
+Viewport::mousePressed(gcn::MouseEvent &event)
 {
     // Check if we are alive and kickin'
     if (!mMap || !player_node || player_node->mAction == Being::DEAD)
@@ -255,11 +256,11 @@ Viewport::mousePress(int mx, int my, int button)
 
     mPlayerFollowMouse = false;
 
-    int tilex = (mx + mCameraX) / 32;
-    int tiley = (my + mCameraY) / 32;
+    int tilex = (event.getX() + mCameraX) / 32;
+    int tiley = (event.getY() + mCameraY) / 32;
 
     // Right click might open a popup
-    if (button == gcn::MouseInput::RIGHT)
+    if (event.getButton() == gcn::MouseEvent::RIGHT)
     {
         Being *being;
         FloorItem *floorItem;
@@ -267,12 +268,12 @@ Viewport::mousePress(int mx, int my, int button)
         if ((being = beingManager->findBeing(tilex, tiley)) &&
                 being->getType() != Being::LOCALPLAYER)
         {
-            showPopup(mx, my, being);
+            showPopup(event.getX(), event.getY(), being);
             return;
         }
         else if((floorItem = floorItemManager->findByCoordinates(tilex, tiley)))
         {
-            showPopup(mx, my, floorItem);
+            showPopup(event.getX(), event.getY(), floorItem);
             return;
         }
     }
@@ -286,7 +287,7 @@ Viewport::mousePress(int mx, int my, int button)
     }
 
     // Left click can cause different actions
-    if (button == gcn::MouseInput::LEFT)
+    if (event.getButton() == gcn::MouseEvent::LEFT)
     {
         FloorItem *item;
 
@@ -302,13 +303,13 @@ Viewport::mousePress(int mx, int my, int button)
             Uint8 *keys = SDL_GetKeyState(NULL);
             if (!(keys[SDLK_LSHIFT] || keys[SDLK_RSHIFT]))
             {
-                player_node->setDestination(mx + mCameraX, my + mCameraY);
+                player_node->setDestination(event.getX() + mCameraX,
+                                            event.getY() + mCameraY);
             }
             mPlayerFollowMouse = true;
         }
     }
-
-    if (button == gcn::MouseInput::MIDDLE)
+    else if (event.getButton() == gcn::MouseEvent::MIDDLE)
     {
         // Find the being nearest to the clicked position
         Being *target = beingManager->findNearestLivingBeing(
@@ -323,19 +324,20 @@ Viewport::mousePress(int mx, int my, int button)
 }
 
 void
-Viewport::mouseMotion(int mx, int my)
+Viewport::mouseMoved(gcn::MouseEvent &event)
 {
     if (!mMap || !player_node)
         return;
 
     if (mPlayerFollowMouse && mWalkTime == player_node->mWalkTime)
     {
-        player_node->setDestination(mx + mCameraX, my + mCameraY);
+        player_node->setDestination(event.getX() + mCameraX,
+                                    event.getY() + mCameraY);
     }
 }
 
 void
-Viewport::mouseRelease(int mx, int my, int button)
+Viewport::mouseReleased(gcn::MouseEvent &event)
 {
     mPlayerFollowMouse = false;
 }
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index df78b1da..80475fbf 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -79,31 +79,33 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         /**
          * Toggles whether the path debug graphics are shown
          */
-        void toggleDebugPath() { mShowDebugPath = !mShowDebugPath; }
+        void
+        toggleDebugPath() { mShowDebugPath = !mShowDebugPath; }
 
         /**
          * Handles mouse press on map.
          */
         void
-        mousePress(int mx, int my, int button);
+        mousePressed(gcn::MouseEvent &event);
 
         /**
          * Handles mouse move on map
          */
         void
-        mouseMotion(int mx, int my);
+        mouseMoved(gcn::MouseEvent &event);
 
         /**
          * Handles mouse button release on map.
          */
         void
-        mouseRelease(int mx, int my, int button);
+        mouseReleased(gcn::MouseEvent &event);
 
         /**
          * Shows a popup for an item.
          * TODO Find some way to get rid of Item here
          */
-        void showPopup(int x, int y, Item *item);
+        void
+        showPopup(int x, int y, Item *item);
 
         /**
          * A relevant config option changed.
@@ -111,6 +113,18 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         void
         optionChanged(const std::string &name);
 
+        /**
+         * Returns camera x offset in tiles.
+         */
+        int
+        getCameraX() { return mCameraX; }
+
+        /**
+         * Returns camera y offset in tiles.
+         */
+        int
+        getCameraY() { return mCameraY; }
+
     private:
         /**
          * Shows a popup for a floor item.
@@ -131,8 +145,8 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         int mScrollLaziness;
         float mViewX;              /**< Current viewpoint in pixels. */
         float mViewY;              /**< Current viewpoint in pixels. */
-        int mCameraX;
-        int mCameraY;
+        int mCameraX;              /**< Current viewpoint in tiles. */
+        int mCameraY;              /**< Current viewpoint in tiles. */
         bool mShowDebugPath;       /**< Show a path from player to pointer. */
 
         bool mPlayerFollowMouse;
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 1960d6ca..bb60c6ff 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -197,6 +197,12 @@ void Window::setContentHeight(int height)
     resizeToContent();
 }
 
+void Window::setContentSize(int width, int height)
+{
+    setContentWidth(width);
+    setContentHeight(height);
+}
+
 void Window::setLocationRelativeTo(gcn::Widget *widget)
 {
     int wx, wy;
@@ -209,12 +215,6 @@ void Window::setLocationRelativeTo(gcn::Widget *widget)
                 getY() + (wy + (widget->getHeight() - getHeight()) / 2 - y));
 }
 
-void Window::setContentSize(int width, int height)
-{
-    setContentWidth(width);
-    setContentHeight(height);
-}
-
 void Window::setMinWidth(unsigned int width)
 {
     mMinWinWidth = width;
@@ -282,86 +282,60 @@ void Window::add(gcn::Widget *w, int x, int y, bool delChild)
     mChrome->add(w, x, y, delChild);
 }
 
-void Window::mousePress(int x, int y, int button)
+void Window::mousePressed(gcn::MouseEvent &event)
 {
     // Let Guichan move window to top and figure out title bar drag
-    gcn::Window::mousePress(x, y, button);
+    gcn::Window::mousePressed(event);
 
-    // If the mouse is not inside the content, the press must have been on the
-    // border, and is a candidate for a resize.
-    if (isResizable() && button == 1 &&
+    int x = event.getX();
+    int y = event.getY();
+
+    // Activate resizing if the left mouse button was pressed on the grip
+    mMouseResize =
+        isResizable() &&
+        event.getButton() == gcn::MouseEvent::LEFT &&
         getGripDimension().isPointInRect(x, y) &&
-        !getChildrenArea().isPointInRect(x, y) &&
-        hasMouse() &&
-        !(mMouseDrag && y > (int)getPadding()))
-    {
-        mMouseResize = true;
-        mMouseXOffset = x;
-        mMouseYOffset = y;
-    }
+        !getChildrenArea().isPointInRect(x, y);
 }
 
-void Window::mouseMotion(int x, int y)
+void Window::mouseDragged(gcn::MouseEvent &event)
 {
-    if (mMouseDrag || mMouseResize)
+    // Let Guichan handle title bar drag
+    gcn::Window::mouseDragged(event);
+
+    // Keep guichan window inside screen
+    int newX = std::max(0, getX());
+    int newY = std::max(0, getY());
+    newX = std::min(windowContainer->getWidth() - getWidth(), newX);
+    newY = std::min(windowContainer->getHeight() - getHeight(), newY);
+    setPosition(newX, newY);
+
+    if (mMouseResize && !mIsMoving)
     {
-        int dx = x - mMouseXOffset;
-        int dy = y - mMouseYOffset;
         gcn::Rectangle newDim = getDimension();
 
-        // Change the dimension according to dragging and moving
-        if (mMouseResize && isResizable())
-        {
-            // We're dragging bottom right
-            newDim.height += dy;
-            newDim.width += dx;
-        }
-        else if (mMouseDrag && isMovable())
-        {
-            newDim.x += dx;
-            newDim.y += dy;
-        }
+        // We're dragging bottom right
+        newDim.width += event.getX() - mDragOffsetX;
+        newDim.height += event.getY() - mDragOffsetY;
 
-        // Keep guichan window inside screen
+        // Keep guichan window inside screen (supports resizing any side)
         if (newDim.x < 0)
         {
-            if (mMouseResize)
-            {
-                newDim.width += newDim.x;
-            }
-
+            newDim.width += newDim.x;
             newDim.x = 0;
         }
         if (newDim.y < 0)
         {
-            if (mMouseResize)
-            {
-                newDim.height += newDim.y;
-            }
-
+            newDim.height += newDim.y;
             newDim.y = 0;
         }
         if (newDim.x + newDim.width > windowContainer->getWidth())
         {
-            if (mMouseResize)
-            {
-                newDim.width = windowContainer->getWidth() - newDim.x;
-            }
-            else
-            {
-                newDim.x = windowContainer->getWidth() - newDim.width;
-            }
+            newDim.width = windowContainer->getWidth() - newDim.x;
         }
         if (newDim.y + newDim.height > windowContainer->getHeight())
         {
-            if (mMouseResize)
-            {
-                newDim.height = windowContainer->getHeight() - newDim.y;
-            }
-            else
-            {
-                newDim.y = windowContainer->getHeight() - newDim.height;
-            }
+            newDim.height = windowContainer->getHeight() - newDim.y;
         }
 
         // Keep the window at least its minimum size
@@ -383,18 +357,9 @@ void Window::mouseMotion(int x, int y)
             newDim.height = mMaxWinHeight;
         }
 
-        // Snap window to edges
-        //if (x < snapSize) x = 0;
-        //if (y < snapSize) y = 0;
-        //if (x + winWidth + snapSize > screen->w) x = screen->w - winWidth;
-        //if (y + winHeight + snapSize > screen->h) y = screen->h - winHeight;
-
         // Update mouse offset when dragging bottom or right border
-        if (mMouseResize)
-        {
-            mMouseYOffset += newDim.height - getHeight();
-            mMouseXOffset += newDim.width - getWidth();
-        }
+        mDragOffsetX += newDim.width - getWidth();
+        mDragOffsetY += newDim.height - getHeight();
 
         // Set the new window and content dimensions
         setDimension(newDim);
@@ -403,16 +368,6 @@ void Window::mouseMotion(int x, int y)
     }
 }
 
-void
-Window::mouseRelease(int x, int y, int button)
-{
-    if (button == 1)
-    {
-        mMouseResize = false;
-        mMouseDrag = false;
-    }
-}
-
 gcn::Rectangle
 Window::getGripDimension()
 {
diff --git a/src/gui/window.h b/src/gui/window.h
index 158035c0..9ac02287 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -77,12 +77,12 @@ class Window : public gcn::Window
         /**
          * Adds a widget to the window.
          */
-        void add(gcn::Widget *wi, bool delChild=true);
+        void add(gcn::Widget *wi, bool delChild = true);
 
         /**
          * Adds a widget to the window and also specifices its position.
          */
-        void add(gcn::Widget *w, int x, int y, bool delChild=true);
+        void add(gcn::Widget *w, int x, int y, bool delChild = true);
 
         /**
          * Sets the width of the window contents.
@@ -95,14 +95,14 @@ class Window : public gcn::Window
         void setContentHeight(int height);
 
         /**
-         * Sets the location relative to the given widget.
+         * Sets the size of this window.
          */
-        void setLocationRelativeTo(gcn::Widget* widget);
+        void setContentSize(int width, int height);
 
         /**
-         * Sets the size of this window.
+         * Sets the location relative to the given widget.
          */
-        void setContentSize(int width, int height);
+        void setLocationRelativeTo(gcn::Widget *widget);
 
         /**
          * Sets whether of not the window can be resized.
@@ -146,7 +146,7 @@ class Window : public gcn::Window
          */
         bool isSticky();
 
-        /** 
+        /**
          * Overloads window setVisible by guichan to allow sticky window
          * Handling
          */
@@ -171,9 +171,8 @@ class Window : public gcn::Window
          * Window dragging and resizing mouse related. These methods also makes
          * sure the window is not dragged/resized outside of the screen.
          */
-        void mousePress(int x, int y, int button);
-        void mouseMotion(int mx, int my);
-        void mouseRelease(int x, int y, int button);
+        void mousePressed(gcn::MouseEvent &event);
+        void mouseDragged(gcn::MouseEvent &event);
 
         /**
          * Gets the position of the resize grip.
diff --git a/src/main.cpp b/src/main.cpp
index b9eeaeb5..3a448494 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -110,7 +110,8 @@ Net::Connection *chatServerConnection = 0;
 namespace {
     struct ErrorListener : public gcn::ActionListener
     {
-        void action(const std::string &eventId, gcn::Widget *widget) {
+        void action(const gcn::ActionEvent &event)
+        {
             state = STATE_CHOOSE_SERVER;
         }
     } errorListener;
@@ -713,15 +714,16 @@ int main(int argc, char *argv[])
                     logger->log("State: CHAR_SELECT");
                     currentDialog = new CharSelectDialog(&charInfo);
 
-                    if (((CharSelectDialog*)currentDialog)->
+                    if (((CharSelectDialog*) currentDialog)->
                             selectByName(options.playername))
                         options.chooseDefault = true;
                     else
-                        ((CharSelectDialog*)currentDialog)->selectByName(
+                        ((CharSelectDialog*) currentDialog)->selectByName(
                             config.getValue("lastCharacter", ""));
 
                     if (options.chooseDefault)
-                        ((CharSelectDialog*)currentDialog)->action("ok", NULL);
+                        ((CharSelectDialog*) currentDialog)->action(
+                            gcn::ActionEvent(NULL, "ok"));
                     break;
 
                 case STATE_ERROR:
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index f16037cf..327edea3 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -56,7 +56,7 @@ extern Window *buySellDialog;
 namespace {
     struct WeightListener : public gcn::ActionListener
     {
-        void action(const std::string &eventId, gcn::Widget *widget)
+        void action(const gcn::ActionEvent &event)
         {
             weightNotice = NULL;
         }
@@ -70,7 +70,7 @@ namespace {
 namespace {
     struct DeathListener : public gcn::ActionListener
     {
-        void action(const std::string &eventId, gcn::Widget *widget)
+        void action(const gcn::ActionEvent &event)
         {
             player_node->revive();
             deathNotice = NULL;
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index 2ebc160f..b3e80675 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -41,9 +41,9 @@ std::string tradePartnerName;
 namespace {
     struct RequestTradeListener : public gcn::ActionListener
     {
-        void action(const std::string &eventId, gcn::Widget *widget)
+        void action(const gcn::ActionEvent &event)
         {
-            player_node->tradeReply(eventId == "yes");
+            player_node->tradeReply(event.getId() == "yes");
         };
     } listener;
 }
diff --git a/tools/Purger.java b/tools/Purger.java
deleted file mode 100644
index 1751c8de..00000000
--- a/tools/Purger.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Purger (c) 2006 Eugenio Favalli
- * License: GPL, v2 or later
- */
- 
-import java.io.*; 
-import java.text.*;
-import java.util.*;
-
- public class Purger {
-
-	public static void main(String[] args) {
-		if (args.length != 2) {
-			System.out.println(
-				"Usage: java Purger <folder> <date>\n" +
-				" - folder: is the path to account.txt and athena.txt files.\n" +
-				" - date: accounts created before this date will be purged (dd/mm/yy).");
-			return;
-		}
-		
-		int accounts = 0;
-		int characters = 0;
-		int deletedCharacters = 0;
-		Vector activeAccounts = new Vector();
-		
-		File oldAccount = new File(args[0] + "account.txt");
-		File oldAthena = new File(args[0] + "athena.txt");
-		File newAccount = new File(args[0] + "account.txt.new");
-		File newAthena = new File(args[0] + "athena.txt.new");
-		
-		DateFormat dateFormat = new SimpleDateFormat("dd/MM/yy");
-		Date purgeDate;
-		try {
-			purgeDate = dateFormat.parse(args[1]);
-		}
-		catch (ParseException e) {
-     			System.out.println("ERROR: Wrong date format.");
-			return;
-		}
-		
-		String line;
-		try {
-			FileInputStream fin =  new FileInputStream(oldAccount);
-			BufferedReader input = new BufferedReader(
-					new InputStreamReader(fin));
-			FileOutputStream fout = new FileOutputStream(newAccount);
-            PrintStream output = new PrintStream(fout);
-			
-			while ((line = input.readLine()) != null) {
-				boolean copy = false;
-				String[] fields = line.split("\t");
-				// Check if we're reading a comment or the last line
-				if (line.substring(0, 2).equals("//") || fields[1].charAt(0) == '%') {
-					copy = true;
-				}
-				else {
-					// Server accounts should not be purged
-					if (!fields[4].equals("S")) {
-						accounts++;
-						dateFormat = new SimpleDateFormat("yyyy-MM-dd");						
-						try {
-							Date date = dateFormat.parse(fields[3]);
-							if (date.after(purgeDate)) {
-								activeAccounts.add(fields[0]);
-								copy = true;
-							}
-						}
-						catch (ParseException e) {
-							System.out.println(
-								"ERROR: Wrong date format in account.txt. ("
-								+ accounts + ": " + line + ")");
-							//return;
-						}
-						catch (Exception e) {
-							e.printStackTrace();
-							return;
-						}
-					}
-					else {
-						copy = true;
-					}					
-				}
-				if (copy) {
-					try {
-						output.println(line);
-					}
-					catch (Exception e) {
-						System.err.println("ERROR: Unable to write file.");
-					}
-				}
-			}
-		}
-		catch (FileNotFoundException e ) {
-			System.out.println(
-				"ERROR: file " + oldAccount.getAbsolutePath() + " not found.");
-			return;
-		}
-		catch (Exception e) {
-			System.out.println("ERROR: unable to process account.txt");
-			e.printStackTrace();
-			return;
-		}
-		
-		input.close();
-		output.close();
-		
-		try {
-			FileInputStream fin =  new FileInputStream(oldAthena);
-			BufferedReader input = new BufferedReader(
-					new InputStreamReader(fin));
-			FileOutputStream fout = new FileOutputStream(newAthena);
-            PrintStream output = new PrintStream(fout);
-			
-			while ((line = input.readLine()) != null) {
-				boolean copy = false;
-				String[] fields = line.split("\t");
-				// Check if we're reading a comment or the last line
-				if (line.substring(0, 2).equals("//")
-						|| fields[1].charAt(0) == '%') {
-					copy = true;
-				}
-				else {
-					characters++;
-					String id = fields[1].substring(0, fields[1].indexOf(','));
-					if (activeAccounts.contains(id)) {
-						copy = true;
-					}
-					else {
-						deletedCharacters++;
-					}
-				}
-				if (copy) {
-					output.println(line);
-				}
-			}
-		}
-		catch (FileNotFoundException e ) {
-			System.out.println(
-				"ERROR: file " + oldAthena.getAbsolutePath() + " not found.");
-			return;
-		}
-		catch (Exception e) {
-			System.out.println("ERROR: unable to process athena.txt");
-			e.printStackTrace();
-			return;
-		}
-		
-		input.close();
-		output.close();
-		
-		System.out.println(
-			"Removed " + (accounts - activeAccounts.size()) + "/" +
-			accounts + " accounts.");
-		System.out.println(
-			"Removed " + deletedCharacters + "/"
-			+ characters + " characters.");
-	}
-	
-}
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 05bdb92c267e3f041788f2aa41a73c9953249e7c Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 23 Jan 2007 21:05:05 +0000
Subject: Merged 0.0 changes from revision 3035 to 3065 to trunk.

---
 ChangeLog                | 36 ++++++++++++++++++++++++++++++++++--
 INSTALL                  |  2 +-
 NEWS                     |  8 ++++++++
 README                   |  2 +-
 data/help/header.txt     |  2 +-
 docs/INSTALL/win32.txt   |  2 +-
 docs/win32-release.txt   |  2 +-
 src/gui/menuwindow.cpp   |  3 ++-
 src/gui/shoplistbox.cpp  |  2 +-
 src/gui/updatewindow.cpp | 16 +++++++++++-----
 src/gui/viewport.cpp     |  2 +-
 src/gui/viewport.h       |  2 +-
 src/main.cpp             |  4 +---
 tmw.cbp                  | 31 +------------------------------
 14 files changed, 65 insertions(+), 49 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index d091a061..44caf16c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,34 @@
-2007-01-14  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+2007-01-23  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/shoplistbox.cpp, docs/INSTALL/win32.txt, INSTALL, NEWS:
+	Upgraded to Guichan 0.6.1.
+
+2007-01-22  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/updatewindow.cpp: Identify ourselves when requesting files
+	from the update server.
+
+2007-01-17  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* docs/win32-release.txt, src/gui/register.cpp, src/main.cpp: Changed
+	default server.
+
+2007-01-15  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/viewport.cpp, src/gui/viewport.h: Fixed issue where the
+	player stops walking.
+	* docs/INSTALL/win32.txt, INSTALL: Updated to mention Guichan 0.6.0.
+
+2007-01-15  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* data/help/header.txt, NEWS, README: Updated release date.
+
+2007-01-14  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* src/gui/updatewindow.cpp, src/main.cpp, tmw.cbp: Fixed windows
+	headers issues.
+
+2007-01-14  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/game.cpp, src/main.cpp, src/gui/trade.cpp, src/gui/sell.cpp,
 	src/gui/connection.cpp, src/gui/buddywindow.cpp, src/gui/browserbox.h,
@@ -30,6 +60,8 @@
 	src/gui/chatinput.cpp, src/net/tradehandler.cpp,
 	src/net/playerhandler.cpp: Upgraded to Guichan 0.6.0 (merge from
 	guichan-0.6.0 branch).
+	* src/winver.h, configure.ac, data/help/header.txt, NEWS, README,
+	CMakeLists.txt: Updated version to 0.0.22.1.
 
 2007-01-13  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
@@ -37,7 +69,7 @@
 	data/graphics/sprites/CMakeLists.txt: Updated with regard to renaming
 	of cotton equipment.
 
-2006-01-13  Eugenio Favalli  <elvenprogrammer@gmail.com>
+2007-01-13  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
 	* src/gui/debugwindow.cpp, src/gui/viewport.h: Fixed mouse coordinates
 	display in debug window.
diff --git a/INSTALL b/INSTALL
index 5b3eb3f2..f7e8688e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -20,7 +20,7 @@ and some libraries. The required libraries are:
 * SDL_mixer         http://www.libsdl.org/projects/SDL_mixer/
 * SDL_image         http://www.libsdl.org/projects/SDL_image/
 * SDL_net           http://www.libsdl.org/projects/SDL_net/
-* Guichan 0.5.0     http://guichan.sourceforge.net/
+* Guichan 0.6.1     http://guichan.sourceforge.net/
 * libxml2           http://www.xmlsoft.org/
 * physfs 1.0.x      http://icculus.org/physfs/
 * zlib 1.2.x        http://www.gzip.org/zlib/
diff --git a/NEWS b/NEWS
index 9edd05b6..47421aef 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+0.0.22.2 (...)
+- Updated to work with Guichan 0.6.1 (older versions no longer supported)
+
+0.0.22.1 (15 January 2007)
+- Updated to work with Guichan 0.6.0 (older versions no longer supported)
+- Fixed mouse coordinates in debug window
+- Fixed clicking on GUI to cause the player to start walking sometimes
+
 0.0.22 (24 December 2006)
 - Added support for female-specific equipment graphics
 - Added support for monster sounds
diff --git a/README b/README
index 342524ec..bf128182 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA WORLD
 ==============
 
- Version: 0.0.22    Date: 24/12/2006
+ Version: 0.0.22.1    Date: 15/01/2007
 
 
  Development team:
diff --git a/data/help/header.txt b/data/help/header.txt
index 4f4c9615..aef87a45 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -2,7 +2,7 @@
 ##1               T  H  E      M  A  N  A      W  O  R  L  D
 ##1               ==========================================
  
-           ##2Version:##6 0.0.22                  ##2Date:##324 December 2006
+           ##2Version:##6 0.0.22.1                ##2Date:##315 January 2007
  
 ##2                    Website: http://themanaworld.org
  
diff --git a/docs/INSTALL/win32.txt b/docs/INSTALL/win32.txt
index f438a7e7..7f6ee42a 100644
--- a/docs/INSTALL/win32.txt
+++ b/docs/INSTALL/win32.txt
@@ -28,7 +28,7 @@ Besides a C++ compiler, TMW depends on the following libraries:
 1) SDL
 2) SDL_mixer
 3) SDL_image
-4) Guichan 0.4.0
+4) Guichan 0.6.1
 5) libiconv
 5) libxml2
 6) PhysFS
diff --git a/docs/win32-release.txt b/docs/win32-release.txt
index c0c6d0e6..a8696897 100644
--- a/docs/win32-release.txt
+++ b/docs/win32-release.txt
@@ -19,7 +19,7 @@ Every Win32 releaser should follow this checklist when creating a new package.
       <configuration>
         <option name="chatlog" value="chatlog.txt"/>
         <option name="guialpha" value="0.8"/>
-        <option name="host" value="animesites.de"/>
+        <option name="host" value="server.themanaworld.org"/>
         <option name="hwaccel" value="0"/>
         <option name="port" value="6901"/>
         <option name="remember" value="0"/>
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index ba4c8e94..a5b5c99e 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -58,7 +58,8 @@ MenuWindow::MenuWindow():
     };
     int x = 0, y = 3, h = 0;
 
-    for (const char **curBtn = buttonNames; *curBtn; curBtn++) {
+    for (const char **curBtn = buttonNames; *curBtn; curBtn++)
+    {
         gcn::Button *btn = new Button(*curBtn, *curBtn, &listener);
         btn->setPosition(x, y);
         add(btn);
diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp
index 8cf0b639..946f518b 100644
--- a/src/gui/shoplistbox.cpp
+++ b/src/gui/shoplistbox.cpp
@@ -112,7 +112,7 @@ void ShopListBox::setSelected(int selected)
         mSelected = std::min(mListModel->getNumberOfElements() - 1,
                              std::max(-1, selected));
 
-        gcn::BasicContainer *parent = getParent();
+        gcn::Widget *parent = getParent();
         if (parent)
         {
             gcn::Rectangle scroll;
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index d41dfe13..fe78a27b 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -28,8 +28,6 @@
 #include <SDL_thread.h>
 #include <zlib.h>
 
-#include <curl/curl.h>
-
 #include <guichan/widgets/label.hpp>
 
 #include "browserbox.h"
@@ -37,6 +35,9 @@
 #include "progressbar.h"
 #include "scrollarea.h"
 
+// Curl should be included after Guichan to avoid Windows redefinitions
+#include <curl/curl.h>
+
 #include "../configuration.h"
 #include "../log.h"
 #include "../main.h"
@@ -137,7 +138,7 @@ void UpdaterWindow::action(const gcn::ActionEvent &event)
     if (event.getId() == "cancel")
     {
         // Register the user cancel
-        mUserCancel=true;
+        mUserCancel = true;
         // Skip the updating process
         if (mDownloadStatus == UPDATE_COMPLETE)
         {
@@ -262,6 +263,11 @@ int UpdaterWindow::downloadThread(void *ptr)
                 curl_easy_setopt(curl, CURLOPT_WRITEDATA, outfile);
             }
 
+#ifdef PACKAGE_VERSION
+            curl_easy_setopt(curl, CURLOPT_USERAGENT, "TMW/" PACKAGE_VERSION);
+#else
+            curl_easy_setopt(curl, CURLOPT_USERAGENT, "TMW");
+#endif
             curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, uw->mCurlError);
             curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
             curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
@@ -365,13 +371,13 @@ void UpdaterWindow::logic()
         case UPDATE_ERROR:
             if (mThread)
             {
-                if(mUserCancel){
+                if (mUserCancel) {
                     // Kill the thread, because user has canceled
                     SDL_KillThread(mThread);
                     // Set the flag to false again
                     mUserCancel = false;
                 }
-                else{
+                else {
                     SDL_WaitThread(mThread, NULL);
                 }
                 mThread = NULL;
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 671ababa..5f316aea 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -324,7 +324,7 @@ Viewport::mousePressed(gcn::MouseEvent &event)
 }
 
 void
-Viewport::mouseMoved(gcn::MouseEvent &event)
+Viewport::mouseDragged(gcn::MouseEvent &event)
 {
     if (!mMap || !player_node)
         return;
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 80475fbf..f1cadd98 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -92,7 +92,7 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
          * Handles mouse move on map
          */
         void
-        mouseMoved(gcn::MouseEvent &event);
+        mouseDragged(gcn::MouseEvent &event);
 
         /**
          * Handles mouse button release on map.
diff --git a/src/main.cpp b/src/main.cpp
index 3a448494..dc186c84 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -39,8 +39,6 @@
 #if (defined __USE_UNIX98 || defined __FreeBSD__)
 #include <cerrno>
 #include <sys/stat.h>
-#elif defined WIN32
-#define NOGDI
 #endif
 
 #include "configuration.h"
@@ -174,7 +172,7 @@ void initConfiguration(const Options &options)
 {
     // Fill configuration with defaults
     logger->log("Initializing configuration...");
-    config.setValue("host", "animesites.de");
+    config.setValue("host", "server.themanaworld.org");
     config.setValue("port", 9601);
     config.setValue("hwaccel", 0);
 #if (defined __APPLE__ || defined WIN32) && defined USE_OPENGL
diff --git a/tmw.cbp b/tmw.cbp
index c81ffb3e..ac9aebb5 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -19,6 +19,7 @@
 				<Compiler>
 					<Add option="-Wall"/>
 					<Add option="-DUSE_OPENGL"/>
+					<Add option="-DNOGDI"/>
 				</Compiler>
 				<Linker>
 					<Add library="enet"/>
@@ -172,16 +173,6 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\gui\buddywindow.cpp">
-			<Option compilerVar="CPP"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="src\gui\buddywindow.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
 		<Unit filename="src\gui\button.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
@@ -222,16 +213,6 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\gui\chargedialog.cpp">
-			<Option compilerVar="CPP"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="src\gui\chargedialog.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
 		<Unit filename="src\gui\chat.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
@@ -448,16 +429,6 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\gui\newskill.cpp">
-			<Option compilerVar="CPP"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="src\gui\newskill.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
 		<Unit filename="src\gui\npc_text.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
-- 
cgit v1.2.3-70-g09d2


From fc63e88f869919a8b035a5c41db8d05626526bde Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 11 Mar 2007 19:59:55 +0000
Subject: Merged 0.0 changes from revision 3065 to 3177 to trunk.

---
 ChangeLog                                | 150 ++++++++++++++++++++++++++++++-
 INSTALL                                  |   2 +-
 NEWS                                     |   6 +-
 README                                   |   2 +-
 configure.ac                             |   9 +-
 data/graphics/CMakeLists.txt             |   1 -
 data/graphics/Makefile.am                |   2 +-
 data/graphics/gui/mouse.png              | Bin 449 -> 984 bytes
 data/graphics/gui/target-cursor-blue.png | Bin 0 -> 8353 bytes
 data/graphics/gui/target-cursor-red.png  | Bin 0 -> 8361 bytes
 data/help/header.txt                     |   2 +-
 src/being.cpp                            |  35 ++++++--
 src/being.h                              |  24 +++--
 src/engine.cpp                           |  11 ---
 src/engine.h                             |   7 +-
 src/gui/menuwindow.cpp                   |  25 ++++--
 src/gui/register.cpp                     |   1 +
 src/gui/updatewindow.cpp                 | 131 ++++++++++++++++-----------
 src/gui/updatewindow.h                   |  64 ++++---------
 src/gui/viewport.cpp                     |  14 +--
 src/localplayer.h                        |  11 +++
 src/log.cpp                              |  17 ++--
 src/logindata.h                          |   1 +
 src/main.cpp                             |  56 +++++++++---
 src/main.h                               |   1 +
 src/map.cpp                              |   4 +-
 src/monster.cpp                          |  22 ++++-
 src/monster.h                            |  15 ++++
 src/net/beinghandler.cpp                 |  33 ++++---
 src/resources/resourcemanager.cpp        |  27 ++++++
 src/resources/resourcemanager.h          |   8 ++
 31 files changed, 490 insertions(+), 191 deletions(-)
 create mode 100644 data/graphics/gui/target-cursor-blue.png
 create mode 100644 data/graphics/gui/target-cursor-red.png

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index b90c35ad..4357e837 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,20 @@
-2007-03-03  Rogier Polak     <rogier.l.a.polak@gmail.com>
+2007-03-11  Philipp Sehmisch  <tmw@crushnet.org>
 
-        * src/main.cpp: Fixed a minor annoyance regarding
-        auto-character-select and switch_character.
+	* src/map.cpp, src/gui/viewport.cpp: Fixed a bug that made the engine
+	not draw the last row and column of the map.
+
+2007-03-09  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* data/graphics/gui/target-cursor-blue.png,
+	data/graphics/gui/target-cursor-red.png: Added targeting cursors by Pauan.
+	* data/graphics/sprites/chest-cotton-male.png,
+	data/graphics/sprites/chest-cotton-female.png: Replaced cotton shirt with
+	improved version by Pauan.
+
+2007-03-03  Rogier Polak  <rogier.l.a.polak@gmail.com>
+
+	* src/main.cpp: Fixed a minor annoyance regarding
+	auto-character-select and switch_character.
 
 2007-03-03  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
@@ -28,6 +41,17 @@
 	channels by Trapdoor.
 	* src/graphics.h: MSVC Compilation fix by Trapdoor.
 
+2007-02-26  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* configure.ac: Made OpenGL enabled by default.
+
+2007-02-26  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/sfx/maggot-dying1.ogg, data/sfx/maggot-hit1.ogg,
+	data/sfx/maggot-hit2.ogg, data/sfx/maggot-miss1.ogg,
+	data/sfx/pinkie-hit1.ogg, data/sfx/pinkie-miss1.ogg,
+	data/monsters.xml: New sound effects by Cosmostrator.
+
 2007-02-25  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/CMakeLists.txt: Updated CMake file.
@@ -54,8 +78,126 @@
 	size and data type.
 	* src/logindata.h: Added a clear function.
 
+2007-02-21  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/gui/char-server.cpp, src/gui/updatewindow.cpp, src/gui/main.cpp,
+	src/gui/main.h: Added a new state "LOADDATA_STATE" that loads the XML
+	databases.
+	* src/resourcemanager.cpp, src/resourcemanager.h, src/main.cpp,
+	customdata/: Added a customdata dir that allows to add custom user
+	data easily. Just create a zip file with the same structure like the
+	update archives and drop it in the customdata folder and the files in
+	it override the default data and the updates.
+
+2007-02-20  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/log.cpp: Applied patch by trapdoor to fix the usage of a
+	deprecated function on MacOS X 10.4 and later.
+	* src/being.cpp, src/monster.cpp, src/net/beinghandler.cpp,
+	src/localplayer.h, src/being.h, src/monster.h: Now different sounds
+	can play when a monster misses the player.
+	* src/main.cpp: Applied patch by trapdoor which makes TMW use a more
+	standard location for the data on MacOS X.
+
+2007-02-17  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* data/help/header.txt, NEWS, README: Updated release date.
+	* data/graphics/sprites/Makefile.am,
+	data/graphics/sprites/CMakeLists.txt, data/graphics/CMakeLists.txt:
+	Excluded sprites directory from installed files.
+
+2007-02-16  Rogier Polak  <rogier.l.a.polak@gmail.com>
+
+	* src/gui/updatewindow.cpp: Fixed the update bug (hopefully), by
+	modifying the usage of the synchronisation between threads. Added a
+	check for existence of the updated file.
+
+2007-02-15  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/winver.h, README, configure.ac, data/help/header.txt, NEWS,
+	CMakeLists.txt: Changed version to 0.0.22.2.
+
+2007-02-13  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/gui/register.cpp, src/logindata.h, src/main.cpp: Fixed the _M/_F
+	username bug.
+
+2007-02-11  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/maps/new_1-9.tmx.gz, data/maps/new_1-14.tmx.gz,
+	data/maps/new_1-16.tmx.gz: Restored the cloud shadow overlays in the
+	woodland that got lost somehow during the halloween and christmas chaos.
+
+2007-02-11  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* data/graphics/sprites/chest_cotton_female.png: Removed this strange
+	duplicate.
+	* data/graphics/sprites/Makefile.am,
+	data/graphics/sprites/CMakeLists.txt: Some updates.
+
+2007-02-10  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/gui/viewport.cpp: Fixed the bug in the scrolling limitation that made
+	it possible to scroll outside of the map in the south and east.
+
+2007-02-04  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/menuwindow.cpp: Fixed a small glitch when dragging the menu
+	window.
+
+2007-02-03  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/sprites/player-female-base.png: Made the standing and
+	walking of the female characters more feminine.
+	* data/equipment.xml, data/graphics/sprites/leg-cotton-male.png,
+	data/graphics/sprites/leg-cotton-male.xml,
+	data/graphics/sprites/leg-cotton-female.png,
+	data/graphics/sprites/leg-cotton-female.xml,
+	data/graphics/sprites/leg-jeans-male.png,
+	data/graphics/sprites/leg-jeans-male.xml,
+	data/graphics/sprites/leg-jeans-female.png,
+	data/graphics/sprites/leg-jeans-female.xml: Added different sprites
+	for male and female pants.
+
+2007-02-02  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/engine.h, src/engine.cpp, src/being.h, src/being.cpp: Moved
+	responsibility of loading emoticons to the Being class.
+
+2007-02-01  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* src/gui/updatewindow.cpp: File handle should be closed before
+	attempting to remove/rename files.
+	* src/gui/button.h: Fixed buttons loosing focus.
+
+2007-02-01  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/updatewindow.cpp, src/gui/updatewindow.h: A bit of cleanup
+	and defined a helper function for calculating the alder32 checksum of
+	a file. Probably not fixing any bug though.
+
+2007-02-01  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/equipment.xml, data/items.xml,
+	data/graphics/items/armor-chest-chainmail.png,
+	data/graphics/sprites/chest-chainmail-female.png,
+	data/graphics/sprites/chest-chainmail-female.xml,
+	data/graphics/sprites/chest-chainmail-male.png,
+	data/graphics/sprites/chest-chainmail-male.xml: Added chainmail by
+	"The Judge". The proposed values are: Item ID: 625, Sprite ID: 25,
+	Defence: 12, Weight: 120.
+	* data/graphics/sprites/chest-cotton-female.png: Huh? Shouldn't this
+	be on svn for ages?
+
+2007-01-30  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* tmw.cbp: Updated Code::blocks project.
+
 2007-01-30  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
+	* src/CMakeLists.txt, src/Makefile.am, src/net/packet.h,
+	src/net/packet.cpp, src/net/messageout.cpp: Removed unused Packet
+	class.
 	* src/properties.h, src/being.cpp, src/beingmanager.h, src/sound.h,
 	src/gui/window.h, src/sound.cpp, src/main.h, src/being.h,
 	src/resources/soundeffect.h, src/resources/image.h,
@@ -69,6 +211,8 @@
 	src/net/messageout.h, src/utils/xml.h, src/main.h,
 	src/resources/monsterdb.h, src/resources/itemdb.h,
 	src/resources/equipmentdb.h: Some work on documentation.
+	* data/maps/new_8-1.tmx.gz, data/maps/new_11-1.tmx.gz: Map fixes by
+	Pauan.
 
 2007-01-23  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
diff --git a/INSTALL b/INSTALL
index 0f5d53f0..fb168106 100644
--- a/INSTALL
+++ b/INSTALL
@@ -19,7 +19,7 @@ and some libraries. The required libraries are:
 * SDL               http://www.libsdl.org/
 * SDL_mixer         http://www.libsdl.org/projects/SDL_mixer/
 * SDL_image         http://www.libsdl.org/projects/SDL_image/
-* SDL_net           http://www.libsdl.org/projects/SDL_net/
+* ENet 1.0          http://enet.bespin.org/
 * Guichan 0.6.x     http://guichan.sourceforge.net/
 * libxml2           http://www.xmlsoft.org/
 * physfs 1.0.x      http://icculus.org/physfs/
diff --git a/NEWS b/NEWS
index adeca670..5281cf78 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
-0.0.22.2 (...)
+0.0.22.2 (17 February 2007)
 - Updated to work with Guichan 0.6.1
+- Changed to new default server (server.themanaworld.org)
+- Changed custom mouse cursor
+- Fixed the issue where _M or _F is appended to the username
+- Fixed problem with Cancel button in update dialog
 
 0.0.22.1 (15 January 2007)
 - Updated to work with Guichan 0.6.0 (older versions no longer supported)
diff --git a/README b/README
index bf128182..2d6f07b1 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA WORLD
 ==============
 
- Version: 0.0.22.1    Date: 15/01/2007
+ Version: 0.0.22.2    Date: 17/02/2007
 
 
  Development team:
diff --git a/configure.ac b/configure.ac
index ca31930e..21d9ef56 100755
--- a/configure.ac
+++ b/configure.ac
@@ -94,15 +94,15 @@ AC_HEADER_STDC
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h unistd.h])
 
 # Option to enable OpenGL
-AC_ARG_WITH(opengl, AS_HELP_STRING([--with-opengl],[use OpenGL (default is no)]))
-if test "x$with_opengl" == "xyes"; then
+AC_ARG_WITH(opengl,[  --without-opengl        don't use OpenGL ] )
+if test "x$with_opengl" == "xno"; then
+    with_opengl=no
+else
     AC_CHECK_LIB([GL], [glBegin], ,
     AC_MSG_ERROR([ *** Unable to find OpenGL library]))
     AC_CHECK_LIB([guichan_opengl], [gcnOpenGL], ,
     AC_MSG_ERROR([ *** Unable to find Guichan OpenGL library (guichan.sf.net)]))
     AC_DEFINE(USE_OPENGL, 1, [Defines if tmw should use an OpenGL display])
-else
-    with_opengl=no
 fi
 
 AC_CONFIG_FILES([
@@ -113,7 +113,6 @@ data/graphics/Makefile
 data/graphics/gui/Makefile
 data/graphics/images/Makefile
 data/graphics/images/ambient/Makefile
-data/graphics/sprites/Makefile
 data/graphics/tiles/Makefile
 data/help/Makefile
 data/icons/Makefile
diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt
index 0fa9a7be..9a916db3 100644
--- a/data/graphics/CMakeLists.txt
+++ b/data/graphics/CMakeLists.txt
@@ -1,4 +1,3 @@
 ADD_SUBDIRECTORY(gui)
 ADD_SUBDIRECTORY(images)
-ADD_SUBDIRECTORY(sprites)
 ADD_SUBDIRECTORY(tiles)
diff --git a/data/graphics/Makefile.am b/data/graphics/Makefile.am
index 43354894..8cda8fa3 100644
--- a/data/graphics/Makefile.am
+++ b/data/graphics/Makefile.am
@@ -1,2 +1,2 @@
 
-SUBDIRS = gui images sprites tiles
+SUBDIRS = gui images tiles
diff --git a/data/graphics/gui/mouse.png b/data/graphics/gui/mouse.png
index e6a84021..9276fc7c 100644
Binary files a/data/graphics/gui/mouse.png and b/data/graphics/gui/mouse.png differ
diff --git a/data/graphics/gui/target-cursor-blue.png b/data/graphics/gui/target-cursor-blue.png
new file mode 100644
index 00000000..3e81c75d
Binary files /dev/null and b/data/graphics/gui/target-cursor-blue.png differ
diff --git a/data/graphics/gui/target-cursor-red.png b/data/graphics/gui/target-cursor-red.png
new file mode 100644
index 00000000..09195f44
Binary files /dev/null and b/data/graphics/gui/target-cursor-red.png differ
diff --git a/data/help/header.txt b/data/help/header.txt
index aef87a45..7311c111 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -2,7 +2,7 @@
 ##1               T  H  E      M  A  N  A      W  O  R  L  D
 ##1               ==========================================
  
-           ##2Version:##6 0.0.22.1                ##2Date:##315 January 2007
+           ##2Version:##6 0.0.22.2                ##2Date:##317 February 2007
  
 ##2                    Website: http://themanaworld.org
  
diff --git a/src/being.cpp b/src/being.cpp
index 33ee7e7a..e4a1e9fc 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -33,6 +33,7 @@
 #include "log.h"
 #include "map.h"
 
+#include "resources/resourcemanager.h"
 #include "resources/spriteset.h"
 
 #include "gui/gui.h"
@@ -40,12 +41,8 @@
 #include "utils/dtor.h"
 #include "utils/tostring.h"
 
-extern Spriteset *emotionset;
-
-PATH_NODE::PATH_NODE(unsigned short x, unsigned short y):
-    x(x), y(y)
-{
-}
+int Being::instances = 0;
+Spriteset *Being::emotionset = NULL;
 
 Being::Being(Uint16 id, Uint16 job, Map *map):
     mJob(job),
@@ -70,6 +67,16 @@ Being::Being(Uint16 id, Uint16 job, Map *map):
     mEquipmentSpriteIDs(VECTOREND_SPRITE, 0)
 {
     setMap(map);
+
+    if (instances == 0)
+    {
+        // Load the emotion set
+        ResourceManager *rm = ResourceManager::getInstance();
+        emotionset = rm->getSpriteset("graphics/sprites/emotions.png", 30, 32);
+        if (!emotionset) logger->error("Unable to load emotions spriteset!");
+    }
+
+    instances++;
 }
 
 Being::~Being()
@@ -77,6 +84,14 @@ Being::~Being()
     std::for_each(mSprites.begin(), mSprites.end(), make_dtor(mSprites));
     clearPath();
     setMap(NULL);
+
+    instances--;
+
+    if (instances == 0)
+    {
+        emotionset->decRef();
+        emotionset = NULL;
+    }
 }
 
 void Being::adjustCourse(Uint16 srcX, Uint16 srcY, Uint16 dstX, Uint16 dstY)
@@ -275,12 +290,18 @@ Being::setSpeech(const std::string &text, Uint32 time)
 }
 
 void
-Being::setDamage(Sint16 amount, Uint32 time)
+Being::takeDamage(int amount)
 {
     mDamage = amount ? toString(amount) : "miss";
     mDamageTime = 300;
 }
 
+void
+Being::handleAttack()
+{
+    setAction(Being::ATTACK);
+}
+
 void
 Being::setMap(Map *map)
 {
diff --git a/src/being.h b/src/being.h
index 3c6b14c6..c3cba247 100644
--- a/src/being.h
+++ b/src/being.h
@@ -43,12 +43,17 @@ class Map;
 class Graphics;
 class Spriteset;
 
+/**
+ * A position along a being's path.
+ */
 struct PATH_NODE
 {
     /**
      * Constructor.
      */
-    PATH_NODE(unsigned short x, unsigned short y);
+    PATH_NODE(unsigned short x, unsigned short y):
+        x(x), y(y)
+    { }
 
     unsigned short x;
     unsigned short y;
@@ -148,13 +153,19 @@ class Being : public Sprite
         void setSpeech(const std::string &text, Uint32 time);
 
         /**
-         * Puts a damage bubble above this being for the specified amount
-         * of time.
+         * Puts a damage bubble above this being for the specified amount of
+         * time.
          *
          * @param amount The amount of damage.
-         * @param time The amount of time the text should stay in milliseconds.
          */
-        void setDamage(Sint16 amount, Uint32 time);
+        virtual void
+        takeDamage(int amount);
+
+        /**
+         * Handles an attack of another being by this being.
+         */
+        virtual void
+        handleAttack();
 
         /**
          * Returns the name of the being.
@@ -384,6 +395,9 @@ class Being : public Sprite
 
         Sint16 mStepX, mStepY;
         Uint16 mStepTime;
+
+        static int instances;           /**< Number of Being instances */
+        static Spriteset *emotionset;   /**< Emoticons used by beings */
 };
 
 #endif
diff --git a/src/engine.cpp b/src/engine.cpp
index d2ce6d6f..a3097d49 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -53,20 +53,9 @@ extern Minimap *minimap;
 
 char itemCurrenyQ[10] = "0";
 
-Spriteset *emotionset;
-
 Engine::Engine():
     mCurrentMap(NULL)
 {
-    // Load the emotion set
-    ResourceManager *resman = ResourceManager::getInstance();
-    emotionset = resman->getSpriteset("graphics/sprites/emotions.png", 30, 32);
-    if (!emotionset) logger->error("Unable to load emotions spriteset!");
-}
-
-Engine::~Engine()
-{
-    emotionset->decRef();
 }
 
 void Engine::changeMap(const std::string &mapPath)
diff --git a/src/engine.h b/src/engine.h
index b16b7c13..161a1e63 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -30,7 +30,7 @@ class Map;
 
 /**
  * Game engine. Actually hardly does anything anymore except keeping track of
- * the current map and loading the emotes.
+ * the current map.
  */
 class Engine
 {
@@ -40,11 +40,6 @@ class Engine
          */
         Engine();
 
-        /**
-         * Destructor.
-         */
-        ~Engine();
-
         /**
          * Returns the currently active map.
          */
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index a5b5c99e..943cc6f0 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -30,8 +30,11 @@
 #include "button.h"
 #include "windowcontainer.h"
 
-extern Window *setupWindow, *inventoryWindow, *equipmentWindow,
-       *skillDialog, *statusWindow;
+extern Window *setupWindow;
+extern Window *inventoryWindow;
+extern Window *equipmentWindow;
+extern Window *skillDialog;
+extern Window *statusWindow;
 
 namespace {
     struct MenuWindowListener : public gcn::ActionListener
@@ -52,9 +55,14 @@ MenuWindow::MenuWindow():
     setTitleBarHeight(0);
 
     // Buttons
-    // ------------
-    const char *buttonNames[] = {
-        "Status", "Equipment", "Inventory", "Skills", "Setup", 0
+    const char *buttonNames[] =
+    {
+        "Status",
+        "Equipment",
+        "Inventory",
+        "Skills",
+        "Setup",
+        0
     };
     int x = 0, y = 3, h = 0;
 
@@ -67,7 +75,11 @@ MenuWindow::MenuWindow():
         h = btn->getHeight();
     }
 
-    setDefaultSize((windowContainer->getWidth() - x - 2), 0, x, (y + h));
+    setContentSize(x - 3, h);
+    setDefaultSize(windowContainer->getWidth() - getWidth() - 1,
+                   0,
+                   x - 3,
+                   y + h);
 }
 
 void MenuWindow::draw(gcn::Graphics *graphics)
@@ -79,6 +91,7 @@ void MenuWindow::draw(gcn::Graphics *graphics)
 void MenuWindowListener::action(const gcn::ActionEvent &event)
 {
     Window *window = NULL;
+
     if (event.getId() == "Status")
     {
         window = statusWindow;
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 4539e48e..be15747d 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -195,6 +195,7 @@ RegisterDialog::action(const gcn::ActionEvent &event)
             mLoginData->username = mUserField->getText();
             mLoginData->password = mPasswordField->getText();
             mLoginData->email = mEmailField->getText();
+            mLoginData->registerLogin = true;
 
             state = STATE_REGISTER_ATTEMPT;
         }
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index fe78a27b..d8130cd3 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -46,13 +46,41 @@
 
 #include "../resources/resourcemanager.h"
 
+/**
+ * Calculates the Alder-32 checksum for the given file.
+ */
+unsigned long fadler32(FILE *file)
+{
+    // Obtain file size
+    fseek(file, 0, SEEK_END);
+    long fileSize = ftell(file);
+    rewind(file);
+
+    // Calculate Adler-32 checksum
+    char *buffer = (char*) malloc(fileSize);
+    fread(buffer, 1, fileSize, file);
+    unsigned long adler = adler32(0L, Z_NULL, 0);
+    adler = adler32(adler, (Bytef*) buffer, fileSize);
+    free(buffer);
+
+    return adler;
+}
+
 UpdaterWindow::UpdaterWindow():
     Window("Updating..."),
-    mThread(NULL), mMutex(NULL), mDownloadStatus(UPDATE_NEWS),
-    mUpdateHost(""), mCurrentFile("news.txt"), mBasePath(""),
-    mStoreInMemory(true), mDownloadComplete(true), mUserCancel(false),
-    mDownloadedBytes(0), mMemoryBuffer(NULL),
-    mCurlError(new char[CURL_ERROR_SIZE]), mLineIndex(0)
+    mThread(NULL),
+    mDownloadStatus(UPDATE_NEWS),
+    mUpdateHost(""),
+    mCurrentFile("news.txt"),
+    mCurrentChecksum(0),
+    mBasePath(""),
+    mStoreInMemory(true),
+    mDownloadComplete(true),
+    mUserCancel(false),
+    mDownloadedBytes(0),
+    mMemoryBuffer(NULL),
+    mCurlError(new char[CURL_ERROR_SIZE]),
+    mLineIndex(0)
 {
     mCurlError[0] = 0;
 
@@ -151,7 +179,7 @@ void UpdaterWindow::action(const gcn::ActionEvent &event)
     }
     else if (event.getId() == "play")
     {
-        state = STATE_LOGIN;
+        state = STATE_LOADDATA;
     }
 }
 
@@ -206,22 +234,17 @@ int UpdaterWindow::updateProgress(void *ptr,
     return 0;
 }
 
-size_t UpdaterWindow::memoryWrite(void *ptr,
-                                  size_t size, size_t nmemb, FILE *stream)
+size_t
+UpdaterWindow::memoryWrite(void *ptr, size_t size, size_t nmemb, FILE *stream)
 {
     UpdaterWindow *uw = reinterpret_cast<UpdaterWindow *>(stream);
     size_t totalMem = size * nmemb;
-    uw->mMemoryBuffer = (char*)realloc(uw->mMemoryBuffer,
-                                       uw->mDownloadedBytes + totalMem + 1);
+    uw->mMemoryBuffer = (char*) realloc(uw->mMemoryBuffer,
+                                        uw->mDownloadedBytes + totalMem);
     if (uw->mMemoryBuffer)
     {
         memcpy(&(uw->mMemoryBuffer[uw->mDownloadedBytes]), ptr, totalMem);
         uw->mDownloadedBytes += totalMem;
-
-        // Make sure the memory buffer is NULL terminated, because this
-        // function is used to download text files that are later parsed as a
-        // string.
-        uw->mMemoryBuffer[uw->mDownloadedBytes] = 0;
     }
 
     return totalMem;
@@ -236,8 +259,10 @@ int UpdaterWindow::downloadThread(void *ptr)
     std::string outFilename;
     std::string url(uw->mUpdateHost + "/" + uw->mCurrentFile);
 
-    while (attempts < 3 && !uw->mDownloadComplete) {
+    while (attempts < 3 && !uw->mDownloadComplete)
+    {
         FILE *outfile = NULL;
+        FILE *newfile = NULL;
         uw->setLabel(uw->mCurrentFile + " (0%)");
 
         curl = curl_easy_init();
@@ -282,61 +307,67 @@ int UpdaterWindow::downloadThread(void *ptr)
                 uw->mDownloadStatus = UPDATE_ERROR;
                 switch (res)
                 {
-                case CURLE_COULDNT_CONNECT: // give more debug info on that error
-                    std::cerr << "curl error " << res << " : " << uw->mCurlError << " " << url.c_str()
-                    << std::endl;
+                case CURLE_COULDNT_CONNECT:
+                    // give more debug info on that error
+                    std::cerr << "curl error " << res << ": "
+                              << uw->mCurlError << " " << url.c_str()
+                              << std::endl;
                     break;
 
                 default:
-                    std::cerr << "curl error " << res << " : " << uw->mCurlError << " host: " << url.c_str()
-                    << std::endl;
+                    std::cerr << "curl error " << res << ": "
+                              << uw->mCurlError << " host: " << url.c_str()
+                              << std::endl;
                 }
             }
 
             curl_easy_cleanup(curl);
 
-            uw->mDownloadComplete = true;
-
             if (!uw->mStoreInMemory)
             {
-                long fileSize;
-                char *buffer;
-                // Obtain file size.
-                fseek(outfile, 0, SEEK_END);
-                fileSize = ftell(outfile);
-                rewind(outfile);
-                buffer = (char*)malloc(fileSize);
-                fread(buffer, 1, fileSize, outfile);
-                fclose(outfile);
-
-                // Give the file the proper name
-                std::string newName(uw->mBasePath + "/updates/" +
-                                    uw->mCurrentFile.c_str());
-
-                // Any existing file with this name is deleted first, otherwise the
-                // rename will fail on Windows.
-                ::remove(newName.c_str());
-                ::rename(outFilename.c_str(), newName.c_str());
-
                 // Don't check resources2.txt checksum
                 if (uw->mDownloadStatus == UPDATE_RESOURCES)
                 {
-                    // Calculate Adler-32 checksum
-                    unsigned long adler = adler32(0L, Z_NULL, 0);
-                    adler = adler32(adler, (Bytef *)buffer, fileSize);
-                    free(buffer);
+                    unsigned long adler = fadler32(outfile);
+
+                    if (uw->mCurrentChecksum != adler)
+                    {
+                        fclose(outfile);
 
-                    if (uw->mCurrentChecksum != adler) {
-                        uw->mDownloadComplete = false;
                         // Remove the corrupted file
-                        ::remove(newName.c_str());
+                        ::remove(outFilename.c_str());
                         logger->log(
                             "Checksum for file %s failed: (%lx/%lx)",
                             uw->mCurrentFile.c_str(),
                             adler, uw->mCurrentChecksum);
+                        attempts++;
+                        continue; // Bail out here to avoid the renaming
                     }
                 }
+                fclose(outfile);
+
+                // Give the file the proper name
+                std::string newName(uw->mBasePath + "/updates/" +
+                                    uw->mCurrentFile.c_str());
 
+                // Any existing file with this name is deleted first, otherwise
+                // the rename will fail on Windows.
+                ::remove(newName.c_str());
+                ::rename(outFilename.c_str(), newName.c_str());
+
+                // Check if we can open it and no errors were encountered
+                // during renaming
+                newfile = fopen(newName.c_str(), "rb");
+                if (newfile)
+                {
+                    fclose(newfile);
+                    uw->mDownloadComplete = true;
+                }
+            }
+            else
+            {
+                // It's stored in memory, we're done
+                uw->mDownloadComplete = true;
             }
         }
         attempts++;
@@ -398,8 +429,8 @@ void UpdaterWindow::logic()
 
                 mCurrentFile = "resources2.txt";
                 mStoreInMemory = false;
-                download();
                 mDownloadStatus = UPDATE_LIST;
+                download(); // download() changes mDownloadComplete to false
             }
             break;
         case UPDATE_LIST:
diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index 8c54be27..b5f6a6df 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.h
@@ -89,7 +89,7 @@ class UpdaterWindow : public Window, public gcn::ActionListener
     void download();
 
     /**
-     * The tread function that download the files.
+     * The thread function that download the files.
      */
     static int downloadThread(void *ptr);
 
@@ -115,80 +115,46 @@ class UpdaterWindow : public Window, public gcn::ActionListener
         UPDATE_RESOURCES
     };
 
-    /**
-     * A thread that use libcurl to download updates.
-     */
+    /** A thread that use libcurl to download updates. */
     SDL_Thread *mThread;
 
-    /**
-     * A mutex to protect shared data between the threads.
-     */
-    SDL_mutex *mMutex;
-
-    /**
-     * Status of the current download.
-     */
+    /** Status of the current download. */
     DownloadStatus mDownloadStatus;
 
-    /**
-     * Host where we get the updated files.
-     */
+    /** Host where we get the updated files. */
     std::string mUpdateHost;
 
-    /**
-     * The file currently downloading.
-     */
+    /** The file currently downloading. */
     std::string mCurrentFile;
 
-    /**
-     * The Adler32 checksum of the file currently downloading.
-     */
+    /** The Adler32 checksum of the file currently downloading. */
     unsigned long mCurrentChecksum;
 
-    /**
-     * Absolute path to locally save downloaded files.
-     */
+    /** Absolute path to locally save downloaded files. */
     std::string mBasePath;
 
-    /**
-     * A flag to know if we must write the downloaded file to a memory buffer
-     * instead of a regular file.
-     */
+    /** A flag to indicate whether to use a memory buffer or a regular file. */
     bool mStoreInMemory;
 
-    /**
-     * Flag that show if current download is complete.
-     */
+    /** Flag that show if current download is complete. */
     bool mDownloadComplete;
 
-    /**
-     * Flag that show if the user has canceled the update
-     */
+    /** Flag that show if the user has canceled the update. */
     bool mUserCancel;
 
-    /**
-     * Byte count currently downloaded in mMemoryBuffer.
-     */
+    /** Byte count currently downloaded in mMemoryBuffer. */
     int mDownloadedBytes;
 
-    /**
-     * Buffer where to put downloaded file which are not stored in file system.
-     */
+    /** Buffer for files downloaded to memory. */
     char *mMemoryBuffer;
 
-    /**
-     * Buffer to handler human readable error provided by curl.
-     */
+    /** Buffer to handler human readable error provided by curl. */
     char *mCurlError;
 
-    /**
-     * List of files to download
-     */
+    /** List of files to download. */
     std::vector<std::string> mLines;
 
-    /**
-     * Index of the file to be downloaded
-     */
+    /** Index of the file to be downloaded. */
     unsigned int mLineIndex;
 
     gcn::Label *mLabel;           /**< Progress bar caption. */
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 5f316aea..bc635cce 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -132,18 +132,22 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
         mViewY = player_y;
     };
 
-    if (mMap) {
+    // Don't move camera so that the end of the map is on screen
+    int viewXmax = mMap->getWidth() * 32 - graphics->getWidth();
+    int viewYmax = mMap->getHeight() * 32 - graphics->getHeight();
+    if (mMap)
+    {
         if (mViewX < 0) {
             mViewX = 0;
         }
         if (mViewY < 0) {
             mViewY = 0;
         }
-        if (mViewX > mMap->getWidth() * 32 - midTileX) {
-            mViewX = mMap->getWidth() * 32 - midTileX;
+        if (mViewX > viewXmax) {
+            mViewX = viewXmax;
         }
-        if (mViewY > mMap->getHeight() * 32 - midTileY) {
-            mViewY = mMap->getHeight() * 32 - midTileY;
+        if (mViewY > viewYmax) {
+            mViewY = viewYmax;
         }
     }
 
diff --git a/src/localplayer.h b/src/localplayer.h
index 980b1aff..9ce67d13 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -35,6 +35,9 @@ class FloorItem;
 class Inventory;
 class Item;
 
+/**
+ * The local player character.
+ */
 class LocalPlayer : public Player
 {
     public:
@@ -110,8 +113,16 @@ class LocalPlayer : public Player
         void setTrading(bool trading) { mTrading = trading; }
 
         void attack();
+
         Being* getTarget() const;
 
+        /**
+         * Overridden to do nothing. The attacks of the local player are
+         * displayed as soon as the player attacks, not when the server says
+         * the player does.
+         */
+        virtual void handleAttack() {}
+
         /**
          * Sets the target being of the player.
          */
diff --git a/src/log.cpp b/src/log.cpp
index 3a3c91b8..224736bd 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -20,11 +20,13 @@
  */
 
 #include "log.h"
+
 #ifdef WIN32
-    #include "utils/wingettimeofday.h"
+#include "utils/wingettimeofday.h"
 #else
-    #include <sys/time.h>
+#include <sys/time.h>
 #endif
+
 #ifdef __APPLE__
 #include <Carbon/Carbon.h>
 #endif
@@ -110,9 +112,14 @@ void Logger::error(const std::string &error_text)
     MessageBox(NULL, error_text.c_str(), "Error", MB_ICONERROR | MB_OK);
 #elif defined __APPLE__
     Str255 msg;
-    c2pstrcpy(msg, error_text.c_str());
-    StandardAlert(kAlertStopAlert, "\pError",
-                  (ConstStr255Param)msg, NULL, NULL);
+    CFStringRef error;
+    error = CFStringCreateWithCString(NULL,
+                                      error_text.c_str(),
+                                      kCFStringEncodingMacRoman);
+    CFStringGetPascalString(error, msg, 255, kCFStringEncodingMacRoman);
+    StandardAlert(kAlertStopAlert,
+                  "\pError",
+                  (ConstStr255Param) msg, NULL, NULL);
 #else
     std::cerr << "Error: " << error_text << std::endl;
 #endif
diff --git a/src/logindata.h b/src/logindata.h
index f9b520eb..0a01331c 100644
--- a/src/logindata.h
+++ b/src/logindata.h
@@ -37,6 +37,7 @@ struct LoginData
     int session_ID2;
 
     bool remember;
+    bool registerLogin;
 
     void clear()
     {
diff --git a/src/main.cpp b/src/main.cpp
index 1e7ae32d..aad6a68c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -36,10 +36,13 @@
 
 #include <libxml/parser.h>
 
-#if (defined __USE_UNIX98 || defined __FreeBSD__)
+#if (defined __USE_UNIX98 || defined __FreeBSD__ || defined __APPLE__)
 #include <cerrno>
 #include <sys/stat.h>
 #endif
+#if defined __APPLE__
+#include <CoreFoundation/CFBundle.h>
+#endif
 
 #include "configuration.h"
 #include "game.h"
@@ -150,7 +153,7 @@ struct Options
  */
 void initHomeDir()
 {
-#if !(defined __USE_UNIX98 || defined __FreeBSD__)
+#if !(defined __USE_UNIX98 || defined __FreeBSD__ || defined __APPLE__)
     homeDir = ".";
 #else
     homeDir = std::string(PHYSFS_getUserDir()) + "/.tmw";
@@ -160,7 +163,7 @@ void initHomeDir()
             (errno != EEXIST))
     {
         std::cout << homeDir
-                  << " can't be made, but it doesn't exist! Exitting."
+                  << " can't be made, but it doesn't exist! Exiting."
                   << std::endl;
         exit(1);
     }
@@ -259,7 +262,21 @@ void initEngine()
 
     // Add the main data directory to our PhysicsFS search path
     resman->addToSearchPath("data", true);
+#if defined __APPLE__
+    CFBundleRef mainBundle = CFBundleGetMainBundle();
+    CFURLRef resourcesURL = CFBundleCopyResourcesDirectoryURL(mainBundle);
+    char path[PATH_MAX];
+    if (!CFURLGetFileSystemRepresentation(resourcesURL, TRUE, (UInt8 *)path,
+                                          PATH_MAX))
+    {
+        fprintf(stderr, "Can't find Resources directory\n");
+    }
+    CFRelease(resourcesURL);
+    strncat(path, "/data", PATH_MAX - 1);
+    resman->addToSearchPath(path, true);
+#else
     resman->addToSearchPath(TMW_DATADIR "data", true);
+#endif
 
 #ifdef USE_OPENGL
     bool useOpenGL = (config.getValue("opengl", 0) == 1);
@@ -449,6 +466,12 @@ void accountLogin(LoginData *loginData)
     // Clear the password, avoids auto login when returning to login
     loginData->password = "";
 
+    //remove _M or _F from username after a login for registration purpose
+    if (loginData->registerLogin)
+    {
+        loginData->registerLogin = false;
+        loginData->username = loginData->username.substr(0, loginData->username.length() - 2);
+    }
     // TODO This is not the best place to save the config, but at least better
     // than the login gui window
     if (loginData->remember) {
@@ -657,6 +680,7 @@ int main(int argc, char *argv[])
     }
 
     loginData.remember = config.getValue("remember", 0);
+    loginData.registerLogin = false;
 
     Net::initialize();
     accountServerConnection = Net::getConnection();
@@ -717,7 +741,7 @@ int main(int argc, char *argv[])
                 accountServerConnection->isConnected())
         {
             if (options.skipUpdate) {
-                state = STATE_LOGIN;
+                state = STATE_LOADDATA;
             } else {
                 state = STATE_UPDATE;
             }
@@ -794,17 +818,11 @@ int main(int argc, char *argv[])
                     logger->log("State: UPDATE");
                     // TODO: Revive later
                     //currentDialog = new UpdaterWindow();
-                    state = STATE_LOGIN;
+                    state = STATE_LOADDATA;
                     break;
 
                 case STATE_LOGIN:
                     logger->log("State: LOGIN");
-
-                    // Load XML databases
-                    EquipmentDB::load();
-                    ItemDB::load();
-                    MonsterDB::load();
-
                     currentDialog = new LoginDialog(&loginData);
                     // TODO: Restore autologin
                     //if (!loginData.password.empty()) {
@@ -812,6 +830,22 @@ int main(int argc, char *argv[])
                     //}
                     break;
 
+                case STATE_LOADDATA:
+                    logger->log("State: LOADDATA");
+
+                    // Add customdata directory
+                    ResourceManager::getInstance()->searchAndAddArchives(
+                        "customdata/",
+                        "zip",
+                        false);
+
+                    // Load XML databases
+                    EquipmentDB::load();
+                    ItemDB::load();
+                    MonsterDB::load();
+                    state = STATE_LOGIN;
+                    break;
+
                 case STATE_LOGIN_ATTEMPT:
                     accountLogin(&loginData);
                     break;
diff --git a/src/main.h b/src/main.h
index 4dd93ae8..1e9f8c09 100644
--- a/src/main.h
+++ b/src/main.h
@@ -72,6 +72,7 @@ enum {
     STATE_CHOOSE_SERVER,
     STATE_CONNECT_ACCOUNT,
     STATE_UPDATE,
+    STATE_LOADDATA,
     STATE_LOGIN,
     STATE_LOGIN_ATTEMPT,
     STATE_REGISTER,
diff --git a/src/map.cpp b/src/map.cpp
index a88926d7..a6beb951 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -147,8 +147,8 @@ Map::draw(Graphics *graphics, int scrollX, int scrollY, int layer)
 
     if (startX < 0) startX = 0;
     if (startY < 0) startY = 0;
-    if (endX >= mWidth) endX = mWidth - 1;
-    if (endY >= mHeight) endY = mHeight - 1;
+    if (endX > mWidth) endX = mWidth;
+    if (endY > mHeight) endY = mHeight;
 
     for (int y = startY; y < endY; y++)
     {
diff --git a/src/monster.cpp b/src/monster.cpp
index dd4a321c..bea5b7a5 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -57,11 +57,10 @@ Monster::setAction(Action action)
             break;
         case DEAD:
             currentAction = ACTION_DEAD;
-            sound.playSfx(MonsterDB::get(mJob - 1002).getSound(EVENT_DIE));
+            sound.playSfx(getInfo().getSound(EVENT_DIE));
             break;
         case ATTACK:
             currentAction = ACTION_ATTACK;
-            sound.playSfx(MonsterDB::get(mJob - 1002).getSound(EVENT_HIT));
             mSprites[BASE_SPRITE]->reset();
             break;
         case STAND:
@@ -80,3 +79,22 @@ Monster::setAction(Action action)
         mAction = action;
     }
 }
+
+void
+Monster::handleAttack()
+{
+    Being::handleAttack();
+
+    const MonsterInfo &mi = getInfo();
+
+    // TODO: It's not possible to determine hit or miss here, so this stuff probably needs
+    // to be moved somewhere else. We may lose synchronization between attack animation and
+    // the sound, unless we adapt the protocol...
+    sound.playSfx(mi.getSound(EVENT_HIT));
+}
+
+const MonsterInfo&
+Monster::getInfo() const
+{
+    return MonsterDB::get(mJob - 1002);
+}
diff --git a/src/monster.h b/src/monster.h
index 3e9cdb05..18fa703e 100644
--- a/src/monster.h
+++ b/src/monster.h
@@ -26,6 +26,8 @@
 
 #include "being.h"
 
+class MonsterInfo;
+
 class Monster : public Being
 {
     public:
@@ -34,6 +36,19 @@ class Monster : public Being
         virtual void setAction(Action action);
 
         virtual Type getType() const;
+
+        /**
+         * Handles an attack of another being by this monster. Plays a hit or
+         * miss sound when appropriate.
+         */
+        virtual void handleAttack();
+
+    protected:
+        /**
+         * Returns the MonsterInfo, with static data about this monster.
+         */
+        const MonsterInfo&
+        getInfo() const;
 };
 
 #endif
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 32c78b39..53746671 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -215,29 +215,26 @@ void BeingHandler::handleMessage(MessageIn &msg)
             switch (type)
             {
                 case 0: // Damage
-                    if (dstBeing == NULL) break;
-
-                    dstBeing->setDamage(param1, SPEECH_TIME);
-
-                    if (srcBeing != NULL &&
-                            srcBeing != player_node)
-                    {
-                        srcBeing->setAction(Being::ATTACK);
-                        srcBeing->mFrame = 0;
-                        srcBeing->mWalkTime = tick_time;
+                    if (dstBeing) {
+                        dstBeing->takeDamage(param1);
+                    }
+                    if (srcBeing) {
+                        srcBeing->handleAttack(dstBeing, param1);
                     }
                     break;
 
                 case 2: // Sit
-                    if (srcBeing == NULL) break;
-                    srcBeing->mFrame = 0;
-                    srcBeing->setAction(Being::SIT);
+                    if (srcBeing) {
+                        srcBeing->mFrame = 0;
+                        srcBeing->setAction(Being::SIT);
+                    }
                     break;
 
                 case 3: // Stand up
-                    if (srcBeing == NULL) break;
-                    srcBeing->mFrame = 0;
-                    srcBeing->setAction(Being::STAND);
+                    if (srcBeing) {
+                        srcBeing->mFrame = 0;
+                        srcBeing->setAction(Being::STAND);
+                    }
                     break;
             }
             break;
@@ -525,7 +522,7 @@ void BeingHandler::handleBeingsDamageMessage(MessageIn &msg)
         int damage = msg.readShort();
         if (being)
         {
-            being->setDamage(damage, 0);
+            being->takeDamage(damage);
         }
     }
 }
@@ -535,5 +532,5 @@ void BeingHandler::handleBeingActionChangeMessage(MessageIn &msg)
     Being* being = beingManager->findBeing(msg.readShort());
     if (!being) return;
 
-    being->setAction((Being::Action)msg.readByte());
+    being->setAction((Being::Action) msg.readByte());
 }
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 45067302..2059a5c3 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -112,6 +112,33 @@ ResourceManager::addToSearchPath(const std::string &path, bool append)
     PHYSFS_addToSearchPath(path.c_str(), append ? 1 : 0);
 }
 
+void
+ResourceManager::searchAndAddArchives(const std::string &path,
+                                      const std::string &ext,
+                                      bool append)
+{
+    const char *dirSep = PHYSFS_getDirSeparator();
+    char **list = PHYSFS_enumerateFiles(path.c_str());
+
+    for (char **i = list; *i != NULL; i++)
+    {
+        size_t len = strlen(*i);
+
+        if (len > ext.length() && !ext.compare((*i)+(len - ext.length())))
+        {
+            std::string file, realPath, archive;
+
+            file = path + (*i);
+            realPath = std::string(PHYSFS_getRealDir(file.c_str()));
+            archive = realPath + dirSep + file;
+
+            addToSearchPath(archive, append);
+        }
+    }
+
+    PHYSFS_freeList(list);
+}
+
 bool
 ResourceManager::mkdir(const std::string &path)
 {
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index d458f96e..e176e337 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -82,6 +82,14 @@ class ResourceManager
         void
         addToSearchPath(const std::string &path, bool append);
 
+        /**
+        * Searches for zip files and adds them to the search path.
+        */
+        void
+        searchAndAddArchives(const std::string &path,
+                             const std::string &ext,
+                             bool append);
+
         /**
          * Creates a directory in the write path
          */
-- 
cgit v1.2.3-70-g09d2


From bfbb797e6c528e0650826e917d498c52362abbb0 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sat, 24 Mar 2007 16:24:43 +0000
Subject: Merged 0.0 changes from revision 3177 to 3234 to trunk.

---
 ChangeLog                          | 162 +++++++-
 data/graphics/gui/deepbox.png      | Bin 266 -> 270 bytes
 data/graphics/gui/mouse.png        | Bin 984 -> 1134 bytes
 data/graphics/gui/slider.png       | Bin 502 -> 571 bytes
 data/graphics/gui/thickborder.png  | Bin 480 -> 530 bytes
 data/graphics/gui/vscroll_blue.png | Bin 368 -> 395 bytes
 data/graphics/gui/vscroll_grey.png | Bin 342 -> 371 bytes
 data/graphics/gui/vscroll_red.png  | Bin 367 -> 394 bytes
 data/icons/CMakeLists.txt          |   6 +-
 data/icons/Makefile.am             |   7 +-
 data/icons/tmw-icon.ico            | Bin 2238 -> 0 bytes
 data/icons/tmw-icon.png            | Bin 1103 -> 0 bytes
 data/icons/tmw-icon.xpm            |  56 ---
 data/icons/tmw.ico                 | Bin 0 -> 22382 bytes
 data/icons/tmw.png                 | Bin 0 -> 18176 bytes
 data/icons/tmw.xpm                 | 784 +++++++++++++++++++++++++++++++++++++
 docs/Makefile.am                   |   2 +
 docs/tmw.6                         |  74 ++++
 src/CMakeLists.txt                 |   6 +-
 src/Makefile.am                    |   6 +-
 src/animatedsprite.cpp             |   1 -
 src/being.cpp                      |  14 +-
 src/being.h                        |   4 +-
 src/engine.cpp                     |   4 +-
 src/floor_item.cpp                 |   1 -
 src/gui/char_select.cpp            |  65 +--
 src/gui/char_select.h              |  12 +-
 src/gui/equipmentwindow.cpp        |   1 -
 src/gui/itemcontainer.cpp          |   8 +-
 src/gui/login.cpp                  |  87 ++--
 src/gui/login.h                    |  30 +-
 src/gui/register.cpp               |  89 +++--
 src/gui/register.h                 |  37 +-
 src/gui/unregisterdialog.cpp       |   2 +-
 src/gui/viewport.cpp               | 110 ++++--
 src/gui/viewport.h                 |  24 ++
 src/localplayer.cpp                |   1 +
 src/localplayer.h                  |  12 +
 src/logindata.h                    |   4 +-
 src/main.cpp                       | 101 +++--
 src/monster.h                      |   1 -
 src/net/charserverhandler.cpp      |  24 +-
 src/net/charserverhandler.h        |  13 +
 src/net/equipmenthandler.cpp       |   5 +
 src/net/loginhandler.cpp           |   2 +-
 src/net/protocol.h                 |   1 +
 src/npc.cpp                        |   2 -
 src/resources/animation.h          |   1 -
 src/resources/image.cpp            | 124 +++---
 src/resources/image.h              |   6 +
 src/resources/imageset.cpp         |  65 +++
 src/resources/imageset.h           |  66 ++++
 src/resources/monsterdb.h          |   2 +-
 src/resources/monsterinfo.h        | 157 ++++----
 src/resources/resourcemanager.cpp  |  22 +-
 src/resources/resourcemanager.h    |   8 +-
 src/resources/spritedef.cpp        |  34 +-
 src/resources/spritedef.h          |  10 +-
 src/resources/spriteset.cpp        |  65 ---
 src/resources/spriteset.h          |  69 ----
 src/simpleanimation.cpp            |  50 +++
 src/simpleanimation.h              |  65 +++
 src/tileset.h                      |   8 +-
 src/tmw.rc                         |   2 +-
 tmw.cbp                            |  22 +-
 65 files changed, 1922 insertions(+), 612 deletions(-)
 delete mode 100644 data/icons/tmw-icon.ico
 delete mode 100644 data/icons/tmw-icon.png
 delete mode 100644 data/icons/tmw-icon.xpm
 create mode 100644 data/icons/tmw.ico
 create mode 100644 data/icons/tmw.png
 create mode 100644 data/icons/tmw.xpm
 create mode 100644 docs/tmw.6
 create mode 100644 src/resources/imageset.cpp
 create mode 100644 src/resources/imageset.h
 delete mode 100644 src/resources/spriteset.cpp
 delete mode 100644 src/resources/spriteset.h
 create mode 100644 src/simpleanimation.cpp
 create mode 100644 src/simpleanimation.h

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index 95cf4044..d0f661a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,23 @@
-2007-03-23  Eugenio Favalli  <elvenprogrammer@gmail.com>
+2007-03-24  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/main.cpp: Changed the order of network message handling and
+	logic, in order to prevent an incoming character delete message from
+	deleting the player character that was about to be drawn.
+	* src/gui/char_select.cpp: Removed useless lock/unlock calls.
+	* src/logindata.h, src/main.cpp, src/gui/login.cpp: Go back to login
+	or register state on error, depending on what the user was doing.
+	* src/gui/register.cpp: Actually use the server that is filled in.
+	* src/net/loginhandler.cpp: Fixed error message.
+	* src/net/charserverhandler.cpp: Fixed crash since now logic is called
+	after non-selected characters are deleted, by properly setting deleted
+	instances to 0 and going back to initial selection.
+	* src/main.cpp, src/net/network.h, src/net/network.cpp: Make sure that
+	when a network error occurs, the error message is available and shown
+	to the user.
+	* src/gui/register.h, src/gui/register.cpp: Only enable Register
+	button when all necessary fields are filled in.
+
+2007-03-23  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
 	* tmw.cbp: Updated and fixed Code::Blocks project file.
 
@@ -6,19 +25,116 @@
 
 	* src/gui/char_select.cpp, src/gui/inventorywindow.cpp,
 	src/gui/ministatus.cpp, src/gui/ministatus.h, src/gui/skill.cpp,
-	src/gui/skill.h, src/gui/status.cpp, src/gui/status.h, src/localplayer.cpp
-	, src/localplayer.h, src/net/buysellhandler: Redesigned the localplayer
-	class to use getters and setters instead of direct access to the member
-	variables.
-	src/net/charserverhandler.cpp, src/net/playerhandler.cpp,
-	src/net/protocol.h: Implemented communication of attributes between server
-	and client.
+	src/gui/skill.h, src/gui/status.cpp, src/gui/status.h,
+	src/localplayer.cpp, src/localplayer.h, src/net/buysellhandler:
+	Redesigned the localplayer class to use getters and setters instead of
+	direct access to the member variables.
+	* src/net/charserverhandler.cpp, src/net/playerhandler.cpp,
+	src/net/protocol.h: Implemented communication of attributes between
+	server and client.
+
+2007-03-23  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/char_select.cpp, src/gui/char_select.h,
+	src/net/charserverhandler.h, src/net/charserverhandler.cpp: Clarified
+	the error message when character creation fails and made sure the
+	character creation dialog doesn't close when creation failed.
+
+2007-03-22  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/login.cpp, src/gui/login.h, src/gui/register.h,
+	src/gui/register.cpp: Only enable login button when a username,
+	password and server are filled in. Pass username, password and server
+	on to the register dialog. Go back to login dialog when canceling
+	registration. Fixed a crash caused by deleting an OkDialog twice (it
+	also deletes itself). Made the register dialog a bit wider. Register
+	dialog no longer clears username field when it is invalid.
+	* src/main.cpp, data/icons/CMakeLists.txt, data/icons/Makefile.am,
+	data/icons/tmw-32x32.png: Use a 32x32 non-alpha layered window icon.
+	* tmw.cbp: Updated project file.
+	* data/icons/CMakeLists.txt, data/icons/Makefile.am, src/main.cpp,
+	data/icons/tmw-32x32.png: Removed 32x32 non-alpha layered window icon
+	again, and instead used the icon in the executable on Windows.
+
+2007-03-21  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/main.cpp, src/gui/viewport.cpp, src/resources/image.h,
+	src/resources/image.cpp: Reduced amount of useless logging, calculate
+	nearest power of two in a function and only do the alpha check in
+	software mode.
+	* src/gui/login.cpp: Fixed small issue where default server didn't fit
+	in the server entry field properly.
+	* src/main.cpp: Display a progress bar and connecting status for each
+	server and display the version using a gcn::Label.
+	* src/gui/viewport.cpp, src/monster.h: Avoiding magic numbers where
+	possible (1002) and also display the target when other players are
+	targeted.
+	* src/floor_item.cpp, src/being.cpp, src/main.cpp, src/CMakeLists.txt,
+	src/gui/equipmentwindow.cpp, src/gui/viewport.cpp,
+	src/gui/itemcontainer.cpp, src/gui/viewport.h, src/engine.cpp,
+	src/animatedsprite.cpp, src/tileset.h, src/npc.cpp, src/Makefile.am,
+	src/being.h, src/resources/imageset.cpp, src/resources/animation.h,
+	src/resources/spritedef.cpp, src/resources/resourcemanager.h,
+	src/resources/spriteset.h, src/resources/imageset.h,
+	src/resources/resourcemanager.cpp, src/resources/spriteset.cpp,
+	src/resources/spritedef.h: Renamed Spriteset to ImageSet.
+
+2007-03-20  David Athay  <ko2fan@gmail.com>
+
+	* src/gui/viewport.cpp: Fixed target cursor animation, and changed
+	which layer it is drawn after.
+	* src/gui/viewport.cpp, src/gui/viewport.h: Split drawing the target
+	cursor and target name into functions.
 
 2007-03-20  Philipp Sehmisch  <tmw@crushnet.org>
 
+	* data/graphics/gui/mouse.png: Positioned the cursor image more
+	accurate.
 	* src/gui/char_select.cpp, src/gui/char_select.h,
-	src/net/charserverhandler.cpp, src/net/protocol.h: Implemented a GUI for
-	distributing the characters attributes at character creation.
+	src/net/charserverhandler.cpp, src/net/protocol.h: Implemented a GUI
+	for distributing the characters attributes at character creation.
+
+2007-03-19  David Athay <ko2fan@gmail.com>
+
+	* src/localplayer.cpp, src/gui/viewport.cpp, src/gui/viewport.h,
+	src/net/equipmenthandler.cpp, src/localplayer.h,
+	src/net/protocol.h: Added target cursor.
+
+2007-03-18  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* docs/Makefile.am, docs/tmw.6: Added man page by Patrick Matthäi.
+	* src/resources/image.cpp: Restored alpha layer check, since it should
+	be more efficient in software mode when SDL knows an image doesn't use
+	the alpha layer.
+	* data/graphics/gui/thickborder.png,
+	data/graphics/gui/vscroll_grey.png, data/graphics/gui/slider.png,
+	data/graphics/gui/vscroll_blue.png, data/graphics/gui/vscroll_red.png,
+	data/graphics/gui/deepbox.png,
+	data/graphics/sprites/monster-slime-red.png,
+	data/graphics/sprites/monster-scorpion-black.png,
+	data/graphics/sprites/monster-scorpion.png,
+	data/graphics/sprites/monster-slime-rudolph.png,
+	data/graphics/sprites/monster-snake.png,
+	data/graphics/sprites/monster-slime-santa.png,
+	data/graphics/sprites/monster-maggot.png,
+	data/graphics/sprites/monster-spider.png,
+	data/graphics/sprites/monster-scorpion-red.png,
+	data/graphics/sprites/monster-slime-yellow.png,
+	data/graphics/sprites/monster-slime-green.png,
+	data/graphics/sprites/monster-maggot-giant.png: Replaced pink pixels
+	with transparent ones.
+
+2007-03-18  Rogier Polak  <rogier.l.a.polak@gmail.com>
+
+	* src/main.cpp: Added (-v) version to the arguments. (Applied a patch
+	by Patrick Matthäi).
+	* src/resources/image.cpp: Deleted the "pink code", which added
+	transparancy with SDL_SetColorKey.
+
+2007-03-18  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* icons/tmw.ico, icons/tmw.png, icons/tmw.xpm: Replaced icons with the
+	green globe that is also used on the website.
 
 2007-03-16  Philipp Sehmisch  <tmw@crushnet.org>
 
@@ -26,6 +142,25 @@
 	src/net/accountserver/account.hpp: Implemented 7 atribute system
 	in character creation.
 
+2007-03-14  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/main.cpp, src/tmw.rc, data/icons/tmw-icon.png,
+	data/icons/tmw-icon.xpm, data/icons/tmw.ico, data/icons/tmw-icon.ico,
+	data/icons/Makefile.am, data/icons/tmw.png, data/icons/tmw.xpm,
+	data/icons/CMakeLists.txt: Renamed icons to make things easier for
+	Debian packaging, and the "-icon" part was superfluous anyway.
+
+2007-03-12  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/simpleanimation.cpp, src/simpleanimation.h, src/CmakeLists.txt,
+	src/Makefile.am: Added a simple animation class that hosts a looping
+	animation without the action and direction stuff from AnimatedSprite.
+
+2007-03-12  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* data/graphics/items/armor-head-rangerhat.png: New version of ranger
+	hat icon by Pauan.
+
 2007-03-11  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/map.cpp, src/gui/viewport.cpp: Fixed a bug that made the engine
@@ -34,10 +169,11 @@
 2007-03-09  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* data/graphics/gui/target-cursor-blue.png,
-	data/graphics/gui/target-cursor-red.png: Added targeting cursors by Pauan.
+	data/graphics/gui/target-cursor-red.png: Added targeting cursors by
+	Pauan.
 	* data/graphics/sprites/chest-cotton-male.png,
-	data/graphics/sprites/chest-cotton-female.png: Replaced cotton shirt with
-	improved version by Pauan.
+	data/graphics/sprites/chest-cotton-female.png: Replaced cotton shirt
+	with improved version by Pauan.
 
 2007-03-03  Rogier Polak  <rogier.l.a.polak@gmail.com>
 
diff --git a/data/graphics/gui/deepbox.png b/data/graphics/gui/deepbox.png
index 814236ed..ed3231f3 100644
Binary files a/data/graphics/gui/deepbox.png and b/data/graphics/gui/deepbox.png differ
diff --git a/data/graphics/gui/mouse.png b/data/graphics/gui/mouse.png
index 9276fc7c..2eeb0e51 100644
Binary files a/data/graphics/gui/mouse.png and b/data/graphics/gui/mouse.png differ
diff --git a/data/graphics/gui/slider.png b/data/graphics/gui/slider.png
index 60ec2392..1f6e6b35 100644
Binary files a/data/graphics/gui/slider.png and b/data/graphics/gui/slider.png differ
diff --git a/data/graphics/gui/thickborder.png b/data/graphics/gui/thickborder.png
index 2bbd7a50..da72c92f 100644
Binary files a/data/graphics/gui/thickborder.png and b/data/graphics/gui/thickborder.png differ
diff --git a/data/graphics/gui/vscroll_blue.png b/data/graphics/gui/vscroll_blue.png
index aa236883..397501ce 100644
Binary files a/data/graphics/gui/vscroll_blue.png and b/data/graphics/gui/vscroll_blue.png differ
diff --git a/data/graphics/gui/vscroll_grey.png b/data/graphics/gui/vscroll_grey.png
index 6bb6bc3f..87ba8758 100644
Binary files a/data/graphics/gui/vscroll_grey.png and b/data/graphics/gui/vscroll_grey.png differ
diff --git a/data/graphics/gui/vscroll_red.png b/data/graphics/gui/vscroll_red.png
index aadf6925..d7ad4a90 100644
Binary files a/data/graphics/gui/vscroll_red.png and b/data/graphics/gui/vscroll_red.png differ
diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt
index 30d96d86..e50c7ab9 100644
--- a/data/icons/CMakeLists.txt
+++ b/data/icons/CMakeLists.txt
@@ -1,9 +1,7 @@
 SET(FILES
-    tmw-icon.ico
-    tmw-icon.png
-    tmw-icon.xpm
+    tmw.png
     )
 
 INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/icons)
 
-INSTALL(FILES "tmw-icon.png" DESTINATION share/pixmaps RENAME tmw.png)
+INSTALL(FILES "tmw.png" DESTINATION share/pixmaps)
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 26dcd623..375edef7 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,14 +1,11 @@
 
 iconsdir = $(pkgdatadir)/data/icons
 
-icons_DATA =		\
-	tmw-icon.ico	\
-	tmw-icon.png	\
-	tmw-icon.xpm
+icons_DATA = tmw.png
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
-	$(INSTALL) $(srcdir)/tmw-icon.png $(DESTDIR)$(datadir)/pixmaps/tmw.png
+	$(INSTALL) $(srcdir)/tmw.png $(DESTDIR)$(datadir)/pixmaps/tmw.png
 
 uninstall-local:
 	rm -f $(DESTDIR)$(datadir)/pixmaps/tmw.png
diff --git a/data/icons/tmw-icon.ico b/data/icons/tmw-icon.ico
deleted file mode 100644
index 5ba6e1b7..00000000
Binary files a/data/icons/tmw-icon.ico and /dev/null differ
diff --git a/data/icons/tmw-icon.png b/data/icons/tmw-icon.png
deleted file mode 100644
index 2598a620..00000000
Binary files a/data/icons/tmw-icon.png and /dev/null differ
diff --git a/data/icons/tmw-icon.xpm b/data/icons/tmw-icon.xpm
deleted file mode 100644
index a9e91161..00000000
--- a/data/icons/tmw-icon.xpm
+++ /dev/null
@@ -1,56 +0,0 @@
-/* XPM */
-static char *dummy[]={
-"32 32 21 1",
-". c None",
-"f c #003300",
-"s c #003333",
-"# c #003366",
-"d c #006600",
-"h c #009933",
-"c c #040404",
-"m c #0c0c0c",
-"a c #3366cc",
-"e c #339933",
-"g c #33cc33",
-"o c #66cc99",
-"r c #993300",
-"n c #996633",
-"b c #99ccff",
-"j c #c0c0c0",
-"k c #cc6666",
-"q c #cc9933",
-"i c #cc9999",
-"p c #cccc66",
-"l c #efd6c6",
-"................................",
-".........................#......",
-"........#................a......",
-".......#a..............#aba#....",
-"...#.......cccccccc......a......",
-"...a......ccdeddcfdcc....#......",
-".#ab#....ccccegdheefc...........",
-"...#...cccdheeeeehdddc..........",
-".......cheheegeeehddfcc.cc......",
-"........ccdhedeeehhdcc..cic.....",
-".......ccdhgeeeheeddfc.cijc.....",
-".......cfddhehhhddfccc.cikcc....",
-".......ccccfdhedfdffc..cjliccm..",
-"..........cccdfdfcccc.cciiknc...",
-".....cccc...cccccc...cceciiicc..",
-"....cgoggccccnpqrc..mcgogeckcec.",
-"....ccggogggccqpqccmccecciidogcm",
-"....cjncgggecpncnrcccnijijikdec.",
-".....ciikceccrqqcncrciiliikcnc..",
-"....ccccccrcpqpqnrnkdkiiiiiinc..",
-"..cccgogeccnqpccpqncdcseinikrc..",
-"..cgooogggecnqcnqcpneedddsknegc.",
-"..ccccggoooggcnegeceeegdedseogg.",
-"...ccrkggggggoogggoeggegeeddcec.",
-".....ccrcceggggeggggeggegeeckcc.",
-".....mcnilkcgepccceggecceeecic..",
-"......mcriikccinkcpeeencceciic..",
-"........cijiilikiikccciknccrkc..",
-".......cckiknccckiijiiknrc.cc...",
-"........cccncc.ccnkknrccc...c...",
-"..........ccc....ccccc..........",
-"...........m...................."};
diff --git a/data/icons/tmw.ico b/data/icons/tmw.ico
new file mode 100644
index 00000000..61d559a3
Binary files /dev/null and b/data/icons/tmw.ico differ
diff --git a/data/icons/tmw.png b/data/icons/tmw.png
new file mode 100644
index 00000000..93e6c9ae
Binary files /dev/null and b/data/icons/tmw.png differ
diff --git a/data/icons/tmw.xpm b/data/icons/tmw.xpm
new file mode 100644
index 00000000..06ec2865
--- /dev/null
+++ b/data/icons/tmw.xpm
@@ -0,0 +1,784 @@
+/* XPM */
+static char * tmw_xpm[] = {
+"32 32 749 2",
+"  	c None",
+". 	c #E4EB6D",
+"+ 	c #EFF271",
+"@ 	c #E7EF65",
+"# 	c #DDED61",
+"$ 	c #D6E955",
+"% 	c #DAED4D",
+"& 	c #F6F5A0",
+"* 	c #EFEF89",
+"= 	c #ECF084",
+"- 	c #EDF077",
+"; 	c #EAF075",
+"> 	c #E0E960",
+", 	c #D9E757",
+"' 	c #D4EA52",
+") 	c #CFE74D",
+"! 	c #BEE140",
+"~ 	c #C2E43E",
+"{ 	c #B6DF33",
+"] 	c #F8F7C2",
+"^ 	c #F9F7AB",
+"/ 	c #F2F099",
+"( 	c #EEEF80",
+"_ 	c #F3F077",
+": 	c #F8F8B1",
+"< 	c #E8EE6F",
+"[ 	c #E1EB69",
+"} 	c #DBEB5E",
+"| 	c #D5E852",
+"1 	c #CDE445",
+"2 	c #CEE843",
+"3 	c #B6DC34",
+"4 	c #A9DA2F",
+"5 	c #B3E02F",
+"6 	c #B6E630",
+"7 	c #F1F2E2",
+"8 	c #F9F9D4",
+"9 	c #F9F8C5",
+"0 	c #F8F8CE",
+"a 	c #F9F8D6",
+"b 	c #F9F7CB",
+"c 	c #F9F7B1",
+"d 	c #F9F7A7",
+"e 	c #E7EE73",
+"f 	c #E4EC69",
+"g 	c #DEEB60",
+"h 	c #D8E755",
+"i 	c #D5EB55",
+"j 	c #C2E33F",
+"k 	c #BEE33C",
+"l 	c #B5E339",
+"m 	c #A7DF2E",
+"n 	c #9BDA28",
+"o 	c #95DA24",
+"p 	c #8DD724",
+"q 	c #F9F9F5",
+"r 	c #F9F9EA",
+"s 	c #F9F9E1",
+"t 	c #F9F9F4",
+"u 	c #F9F7DF",
+"v 	c #F9F7D1",
+"w 	c #F9F7C9",
+"x 	c #F9F7B6",
+"y 	c #F9F7AE",
+"z 	c #D7E363",
+"A 	c #E1EC6B",
+"B 	c #DDEC60",
+"C 	c #D8EC61",
+"D 	c #CDE552",
+"E 	c #C6E543",
+"F 	c #BCE440",
+"G 	c #BEE73E",
+"H 	c #ABDF30",
+"I 	c #ACE230",
+"J 	c #8FD720",
+"K 	c #80D01C",
+"L 	c #80D51A",
+"M 	c #F9F9F7",
+"N 	c #F9F9EB",
+"O 	c #F9F9F9",
+"P 	c #F9F7E6",
+"Q 	c #F9F7D3",
+"R 	c #F9F7CE",
+"S 	c #F9F7BF",
+"T 	c #F9F8B9",
+"U 	c #E6EF8F",
+"V 	c #E1EB65",
+"W 	c #E0ED63",
+"X 	c #D1E452",
+"Y 	c #D3E84D",
+"Z 	c #C3E340",
+"` 	c #BBE13E",
+" .	c #B0DD35",
+"..	c #ABDD2E",
+"+.	c #A0DB2A",
+"@.	c #95D923",
+"#.	c #7ED31C",
+"$.	c #7ED31A",
+"%.	c #80DA18",
+"&.	c #F4F3EF",
+"*.	c #F9F9F6",
+"=.	c #F9F8F5",
+"-.	c #F9F7EE",
+";.	c #F9F7E2",
+">.	c #F9F7D5",
+",.	c #F9F6C2",
+"'.	c #F8F69C",
+").	c #D4E56D",
+"!.	c #E4ED73",
+"~.	c #DBEA60",
+"{.	c #DDE961",
+"].	c #C9E54E",
+"^.	c #BFE242",
+"/.	c #BEE33E",
+"(.	c #B1DE34",
+"_.	c #ABDE33",
+":.	c #95D826",
+"<.	c #8DD620",
+"[.	c #8DDB20",
+"}.	c #91DD1E",
+"|.	c #71D116",
+"1.	c #50B910",
+"2.	c #F9F8F7",
+"3.	c #F9F8F4",
+"4.	c #F9F7EB",
+"5.	c #F9F7E1",
+"6.	c #F9F5CF",
+"7.	c #F9F6C9",
+"8.	c #F9F6BF",
+"9.	c #D6E471",
+"0.	c #E9F075",
+"a.	c #E3EC6B",
+"b.	c #D9E96D",
+"c.	c #CEE558",
+"d.	c #CBE44E",
+"e.	c #BEDE3E",
+"f.	c #ACDA37",
+"g.	c #BCE639",
+"h.	c #AEE135",
+"i.	c #9EDB2A",
+"j.	c #8FD822",
+"k.	c #7CD31B",
+"l.	c #82DA1C",
+"m.	c #63CE13",
+"n.	c #61CE12",
+"o.	c #F9F9F8",
+"p.	c #F9F7F5",
+"q.	c #F9F4DD",
+"r.	c #F9F5D7",
+"s.	c #F9F5C9",
+"t.	c #F9F5B6",
+"u.	c #E3ED8D",
+"v.	c #DEE865",
+"w.	c #E3ED6D",
+"x.	c #DDEB5E",
+"y.	c #D3E755",
+"z.	c #CAE349",
+"A.	c #CFEB4D",
+"B.	c #C1E33B",
+"C.	c #BCE743",
+"D.	c #B0E02D",
+"E.	c #95DB28",
+"F.	c #95DB26",
+"G.	c #C6E627",
+"H.	c #E8F433",
+"I.	c #CAED26",
+"J.	c #60CD0F",
+"K.	c #58CD0E",
+"L.	c #F9F7EC",
+"M.	c #F9F7F1",
+"N.	c #F9F4E4",
+"O.	c #F9F3D7",
+"P.	c #F9F3CA",
+"Q.	c #F9F5CA",
+"R.	c #F9F5BB",
+"S.	c #F9F8B6",
+"T.	c #F6F89E",
+"U.	c #DFEB5C",
+"V.	c #CEE453",
+"W.	c #D0E753",
+"X.	c #CDE543",
+"Y.	c #C7E842",
+"Z.	c #C1E53C",
+"`.	c #A7DC30",
+" +	c #E6F453",
+".+	c #E2F448",
+"++	c #D8F03C",
+"@+	c #D1ED2E",
+"#+	c #D0F033",
+"$+	c #CAED2C",
+"%+	c #ACE51F",
+"&+	c #55CF0F",
+"*+	c #F5F6EF",
+"=+	c #F9F9F2",
+"-+	c #F9F9F1",
+";+	c #F9F8F0",
+">+	c #F9F7E7",
+",+	c #F9F5F0",
+"'+	c #F9F3E1",
+")+	c #F9F5DB",
+"!+	c #F9F6DB",
+"~+	c #F9F6BE",
+"{+	c #F8F59B",
+"]+	c #F9F5A2",
+"^+	c #F8F68D",
+"/+	c #F7F689",
+"(+	c #D7EC65",
+"_+	c #CEE84E",
+":+	c #BBE23F",
+"<+	c #B6E238",
+"[+	c #A2DC30",
+"}+	c #EBF553",
+"|+	c #E4F443",
+"1+	c #DCF340",
+"2+	c #D4F033",
+"3+	c #CEEF2D",
+"4+	c #C2E926",
+"5+	c #BEEB20",
+"6+	c #5CD50E",
+"7+	c #53CE0D",
+"8+	c #F9F7D9",
+"9+	c #F9F6F2",
+"0+	c #F9F5EB",
+"a+	c #F9F3DA",
+"b+	c #F9F6DF",
+"c+	c #F9F7D0",
+"d+	c #F9F7C2",
+"e+	c #F9F7BB",
+"f+	c #F8F68F",
+"g+	c #F7F58D",
+"h+	c #F6F58B",
+"i+	c #EEF68B",
+"j+	c #BFDF43",
+"k+	c #B5DE37",
+"l+	c #B5E234",
+"m+	c #A7DD30",
+"n+	c #E7F248",
+"o+	c #D6EF40",
+"p+	c #DBF239",
+"q+	c #D0ED2F",
+"r+	c #C3EB2A",
+"s+	c #BCEB26",
+"t+	c #B5E81E",
+"u+	c #52CE0F",
+"v+	c #4ECB0B",
+"w+	c #F9F9D9",
+"x+	c #F9F9D7",
+"y+	c #F9F8F8",
+"z+	c #F9F7E9",
+"A+	c #F9F6E9",
+"B+	c #F9F5E0",
+"C+	c #F8F2D6",
+"D+	c #F9F3CE",
+"E+	c #F9F7CA",
+"F+	c #F9F8B5",
+"G+	c #F6F691",
+"H+	c #F9F699",
+"I+	c #F5F68F",
+"J+	c #F3F579",
+"K+	c #E8F575",
+"L+	c #C7E646",
+"M+	c #B5DF37",
+"N+	c #B9E438",
+"O+	c #9CD928",
+"P+	c #D7F348",
+"Q+	c #DBEF3B",
+"R+	c #D1EF35",
+"S+	c #D7F230",
+"T+	c #C1EA25",
+"U+	c #B5E91F",
+"V+	c #63DC1E",
+"W+	c #48CA0C",
+"X+	c #F4F4DC",
+"Y+	c #F9F9C3",
+"Z+	c #F9F9C5",
+"`+	c #F9F9C7",
+" @	c #F9F9E8",
+".@	c #F9F6DD",
+"+@	c #F9F6D6",
+"@@	c #F9F3C1",
+"#@	c #F9F3BF",
+"$@	c #F9F5B8",
+"%@	c #F8F8A6",
+"&@	c #F6F68F",
+"*@	c #F4F791",
+"=@	c #ABD746",
+"-@	c #C5E449",
+";@	c #C1E448",
+">@	c #BBE23E",
+",@	c #BBE237",
+"'@	c #A9DC30",
+")@	c #99D927",
+"!@	c #D3E32C",
+"~@	c #E2F340",
+"{@	c #D3ED2D",
+"]@	c #CAED2B",
+"^@	c #CDF028",
+"/@	c #C5EB27",
+"(@	c #B0E51C",
+"_@	c #91DC13",
+":@	c #49CA08",
+"<@	c #25B305",
+"[@	c #F5F6BE",
+"}@	c #F5F5A9",
+"|@	c #F3F4B0",
+"1@	c #F6F6B0",
+"2@	c #F7F8B5",
+"3@	c #EDF097",
+"4@	c #F5F18F",
+"5@	c #F9F7B8",
+"6@	c #F9F4B0",
+"7@	c #F9F3AE",
+"8@	c #F9F3A4",
+"9@	c #F9F7A4",
+"0@	c #F7F7A0",
+"a@	c #F5F682",
+"b@	c #D3E75E",
+"c@	c #CAE646",
+"d@	c #CBE846",
+"e@	c #EDF05A",
+"f@	c #C6E432",
+"g@	c #A9E02E",
+"h@	c #99DA27",
+"i@	c #B9DB20",
+"j@	c #E1F33F",
+"k@	c #CEEB2E",
+"l@	c #C7EB27",
+"m@	c #BBEA26",
+"n@	c #B9E722",
+"o@	c #A6DF19",
+"p@	c #ABE815",
+"q@	c #48CB09",
+"r@	c #3ECA08",
+"s@	c #F8F7A7",
+"t@	c #F3F4A0",
+"u@	c #F4F59C",
+"v@	c #F0F49C",
+"w@	c #F2F5A4",
+"x@	c #F5F6A0",
+"y@	c #EFF28F",
+"z@	c #F9F8CD",
+"A@	c #F9F6A7",
+"B@	c #F9F3A0",
+"C@	c #F8F399",
+"D@	c #F8F493",
+"E@	c #F8F693",
+"F@	c #F7F58B",
+"G@	c #E8EF65",
+"H@	c #C7E445",
+"I@	c #C7DB30",
+"J@	c #E1ED48",
+"K@	c #E8F353",
+"L@	c #C3E227",
+"M@	c #D9EB2E",
+"N@	c #E7F549",
+"O@	c #D3EE3B",
+"P@	c #CBED2D",
+"Q@	c #CDEF27",
+"R@	c #BFEC23",
+"S@	c #B6E81E",
+"T@	c #A9E518",
+"U@	c #B1EB1B",
+"V@	c #35BE06",
+"W@	c #38C306",
+"X@	c #F9F9A7",
+"Y@	c #F2F38F",
+"Z@	c #F2F495",
+"`@	c #F3F38D",
+" #	c #F9F9E9",
+".#	c #F7F8C5",
+"+#	c #F8F7D1",
+"@#	c #F8F6A2",
+"##	c #F9F7A9",
+"$#	c #F8F59C",
+"%#	c #F8F291",
+"&#	c #F8F58F",
+"*#	c #F6F789",
+"=#	c #F2F477",
+"-#	c #F0F571",
+";#	c #EAEE52",
+">#	c #DCEA45",
+",#	c #EBEF43",
+"'#	c #E4F04D",
+")#	c #DEEF45",
+"!#	c #E1F246",
+"~#	c #E4F448",
+"{#	c #DBF039",
+"]#	c #D9F235",
+"^#	c #C9ED2B",
+"/#	c #CAEF2C",
+"(#	c #CEF22B",
+"_#	c #B6E91E",
+":#	c #B1EB21",
+"<#	c #A9E815",
+"[#	c #48CF09",
+"}#	c #40CD06",
+"|#	c #EDEF6B",
+"1#	c #EBF07C",
+"2#	c #E7EB71",
+"3#	c #E8E865",
+"4#	c #F8F79E",
+"5#	c #F8F7A4",
+"6#	c #F9F69E",
+"7#	c #F8F48F",
+"8#	c #F6F280",
+"9#	c #F6F482",
+"0#	c #F3F473",
+"a#	c #EFF169",
+"b#	c #EDF467",
+"c#	c #EAF35C",
+"d#	c #EAF258",
+"e#	c #E4F052",
+"f#	c #E4F046",
+"g#	c #E0F03F",
+"h#	c #D5EE3B",
+"i#	c #DFF23E",
+"j#	c #D7F137",
+"k#	c #CEED2E",
+"l#	c #C9EF28",
+"m#	c #CAF025",
+"n#	c #B9EA1E",
+"o#	c #B3E91D",
+"p#	c #B1EB1A",
+"q#	c #A6E817",
+"r#	c #39C506",
+"s#	c #35C505",
+"t#	c #B3BC3E",
+"u#	c #E9F07C",
+"v#	c #DEE867",
+"w#	c #F9F79E",
+"x#	c #F8F793",
+"y#	c #F8F78F",
+"z#	c #F7F684",
+"A#	c #F5F27E",
+"B#	c #F4F26D",
+"C#	c #F4F36F",
+"D#	c #EDF061",
+"E#	c #EEF363",
+"F#	c #EDF35C",
+"G#	c #EEF45C",
+"H#	c #EAF357",
+"I#	c #E8F34B",
+"J#	c #DCEE43",
+"K#	c #E1F03F",
+"L#	c #D6ED37",
+"M#	c #D5EE33",
+"N#	c #D5F134",
+"O#	c #D9F232",
+"P#	c #CEF22D",
+"Q#	c #C7F22A",
+"R#	c #9BDB18",
+"S#	c #A7E518",
+"T#	c #AEEB1B",
+"U#	c #95E514",
+"V#	c #37C306",
+"W#	c #3CC705",
+"X#	c #E0EC60",
+"Y#	c #D1E455",
+"Z#	c #F7F78F",
+"`#	c #F7F891",
+" $	c #F8F78B",
+".$	c #F5F782",
+"+$	c #F8F791",
+"@$	c #EFF06B",
+"#$	c #F3F36D",
+"$$	c #EFF36D",
+"%$	c #F1F56F",
+"&$	c #EDF260",
+"*$	c #EDF461",
+"=$	c #E7F150",
+"-$	c #E9F355",
+";$	c #E8F349",
+">$	c #E8F442",
+",$	c #DDF13E",
+"'$	c #DAF038",
+")$	c #CEEB26",
+"!$	c #D0EE2C",
+"~$	c #B9E82A",
+"{$	c #C1ED26",
+"]$	c #A0E41C",
+"^$	c #ABE71B",
+"/$	c #99E315",
+"($	c #99E415",
+"_$	c #33B306",
+":$	c #2BBB05",
+"<$	c #D9EB5E",
+"[$	c #CDE44E",
+"}$	c #F6F579",
+"|$	c #F4F577",
+"1$	c #F3F571",
+"2$	c #F4F57C",
+"3$	c #F3F363",
+"4$	c #F2F475",
+"5$	c #F0F567",
+"6$	c #A2D93F",
+"7$	c #C3E43F",
+"8$	c #B6D92E",
+"9$	c #A7CD1F",
+"0$	c #E4F042",
+"a$	c #E4F248",
+"b$	c #E5F348",
+"c$	c #D7EC39",
+"d$	c #DBF33C",
+"e$	c #DDF23E",
+"f$	c #D1EF2D",
+"g$	c #C1E825",
+"h$	c #BFEB26",
+"i$	c #AEE61B",
+"j$	c #A7E318",
+"k$	c #B0E818",
+"l$	c #9EE615",
+"m$	c #6DD30D",
+"n$	c #27A603",
+"o$	c #2CBE05",
+"p$	c #E2ED50",
+"q$	c #CBE348",
+"r$	c #F6F780",
+"s$	c #F5F577",
+"t$	c #F3F56F",
+"u$	c #EFF469",
+"v$	c #F3F471",
+"w$	c #F3F46F",
+"x$	c #EFF461",
+"y$	c #E7F053",
+"z$	c #C6E83F",
+"A$	c #A4D733",
+"B$	c #ABDD2F",
+"C$	c #B0DF2E",
+"D$	c #A7DD2B",
+"E$	c #E4F240",
+"F$	c #E8F555",
+"G$	c #DDF33C",
+"H$	c #E1F53E",
+"I$	c #D4F032",
+"J$	c #CEF02E",
+"K$	c #CAEF2D",
+"L$	c #C2EF28",
+"M$	c #B5E91B",
+"N$	c #93DD13",
+"O$	c #93E215",
+"P$	c #93E213",
+"Q$	c #80DB0D",
+"R$	c #45CA05",
+"S$	c #2FC204",
+"T$	c #CEE743",
+"U$	c #C1E23E",
+"V$	c #F0F365",
+"W$	c #F5F473",
+"X$	c #F2F269",
+"Y$	c #E9EF57",
+"Z$	c #EFF363",
+"`$	c #E8F052",
+" %	c #EBF358",
+".%	c #B8E439",
+"+%	c #BCE839",
+"@%	c #A4DC2A",
+"#%	c #ABE22D",
+"$%	c #95D822",
+"%%	c #E1F240",
+"&%	c #D6ED32",
+"*%	c #CFEC2C",
+"=%	c #D4F02F",
+"-%	c #CAEE2B",
+";%	c #C3EB27",
+">%	c #C6EE25",
+",%	c #C3EE21",
+"'%	c #B8ED21",
+")%	c #AEEA16",
+"!%	c #79D90F",
+"~%	c #2EB106",
+"{%	c #26B808",
+"]%	c #2CBF05",
+"^%	c #C9E73B",
+"/%	c #C5E63C",
+"(%	c #F0F56B",
+"_%	c #EEF258",
+":%	c #F0F265",
+"<%	c #EFF155",
+"[%	c #EDF358",
+"}%	c #EBF550",
+"|%	c #EBF54D",
+"1%	c #C9E83B",
+"2%	c #A4DB28",
+"3%	c #9EDC2B",
+"4%	c #8FD622",
+"5%	c #82D01E",
+"6%	c #7EC512",
+"7%	c #C9E827",
+"8%	c #D0EE2E",
+"9%	c #C7ED2C",
+"0%	c #C7EE27",
+"a%	c #C1EE2A",
+"b%	c #C2EF24",
+"c%	c #BEED22",
+"d%	c #A9E718",
+"e%	c #3EC307",
+"f%	c #39C306",
+"g%	c #38C606",
+"h%	c #23B603",
+"i%	c #ACDB2F",
+"j%	c #B0DF34",
+"k%	c #EDF35A",
+"l%	c #EDF553",
+"m%	c #E2F045",
+"n%	c #E6F350",
+"o%	c #E6F448",
+"p%	c #9CD01E",
+"q%	c #8BC916",
+"r%	c #B8DC1B",
+"s%	c #7CBC0F",
+"t%	c #95D618",
+"u%	c #7ED319",
+"v%	c #BFE118",
+"w%	c #C6ED2A",
+"x%	c #C1EA21",
+"y%	c #C1ED22",
+"z%	c #B8EA1D",
+"A%	c #B6EB1D",
+"B%	c #BCEF1F",
+"C%	c #53CA07",
+"D%	c #3FC708",
+"E%	c #2EBC05",
+"F%	c #2FBE04",
+"G%	c #2DBF04",
+"H%	c #A2CF1F",
+"I%	c #B1E12F",
+"J%	c #B5E32E",
+"K%	c #E8F243",
+"L%	c #D7EB45",
+"M%	c #E8F245",
+"N%	c #DDEF40",
+"O%	c #E2F342",
+"P%	c #DFF33E",
+"Q%	c #E4F542",
+"R%	c #DAF138",
+"S%	c #D8F230",
+"T%	c #CBEB28",
+"U%	c #D1F02E",
+"V%	c #C6EC24",
+"W%	c #CAEF25",
+"X%	c #BCEB21",
+"Y%	c #B6EB1E",
+"Z%	c #ABE91B",
+"`%	c #A2E616",
+" &	c #3CC508",
+".&	c #3EC906",
+"+&	c #37C305",
+"@&	c #27B903",
+"#&	c #209B02",
+"$&	c #A9DF27",
+"%&	c #A4DD27",
+"&&	c #91D623",
+"*&	c #E3F13C",
+"=&	c #E4F340",
+"-&	c #E4F33F",
+";&	c #E4F43E",
+">&	c #E2F439",
+",&	c #D6F033",
+"'&	c #D5F034",
+")&	c #CEEF2E",
+"!&	c #CBED26",
+"~&	c #CFEF27",
+"{&	c #D5F22E",
+"]&	c #B5E620",
+"^&	c #B9EA1F",
+"/&	c #84E620",
+"(&	c #3EB508",
+"_&	c #58CE0D",
+":&	c #39CA11",
+"<&	c #3EC607",
+"[&	c #3BCA08",
+"}&	c #28BB04",
+"|&	c #28BC03",
+"1&	c #8FD620",
+"2&	c #97D823",
+"3&	c #A6E22B",
+"4&	c #69CB1D",
+"5&	c #86D61F",
+"6&	c #E5F740",
+"7&	c #DCF338",
+"8&	c #CAEC2D",
+"9&	c #CDED2B",
+"0&	c #D1F02C",
+"a&	c #CDEE27",
+"b&	c #C1EB22",
+"c&	c #CFF228",
+"d&	c #BCE922",
+"e&	c #3CBB09",
+"f&	c #50CD0C",
+"g&	c #4BCD0B",
+"h&	c #3CC207",
+"i&	c #42CD09",
+"j&	c #2EBB04",
+"k&	c #28B905",
+"l&	c #28B903",
+"m&	c #61B113",
+"n&	c #7ED41A",
+"o&	c #89D71B",
+"p&	c #8DDB1A",
+"q&	c #7CD518",
+"r&	c #8FDA1B",
+"s&	c #71D314",
+"t&	c #7CDA18",
+"u&	c #BEF232",
+"v&	c #8BD715",
+"w&	c #63C207",
+"x&	c #55C108",
+"y&	c #5AD111",
+"z&	c #4BC90B",
+"A&	c #3EC108",
+"B&	c #46C908",
+"C&	c #40CB08",
+"D&	c #34C205",
+"E&	c #32C505",
+"F&	c #22A003",
+"G&	c #79D818",
+"H&	c #75D314",
+"I&	c #67D012",
+"J&	c #69D313",
+"K&	c #71D613",
+"L&	c #67D413",
+"M&	c #4BC20C",
+"N&	c #4DCB0E",
+"O&	c #5AD510",
+"P&	c #50CA0B",
+"Q&	c #4BC909",
+"R&	c #3CC708",
+"S&	c #42C906",
+"T&	c #35C206",
+"U&	c #33C306",
+"V&	c #30C504",
+"W&	c #49C30E",
+"X&	c #71D913",
+"Y&	c #84E318",
+"Z&	c #5ECF0E",
+"`&	c #58D00D",
+" *	c #5ED40D",
+".*	c #48C70A",
+"+*	c #57D40B",
+"@*	c #37BE06",
+"#*	c #39C707",
+"$*	c #37C505",
+"%*	c #34C705",
+"&*	c #49BE0B",
+"**	c #4BD00C",
+"=*	c #46C609",
+"-*	c #46D00A",
+";*	c #33BE06",
+">*	c #20A904",
+"                          . + @ # $ %                           ",
+"                    & * = - ; > , ' ) ! ~ {                     ",
+"                ] ^ / ( _ : < [ } | 1 2 3 4 5 6                 ",
+"            7 8 9 0 a b c d e f g h i j k l m n o p             ",
+"          q r s t u v w x y z A B C D E F G H I J K L           ",
+"        M M N O P u Q R S T U V W X Y Z `  ...+.@.#.$.%.        ",
+"      &.O *.O =.-.;.>.R ,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.      ",
+"      O O O 2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.      ",
+"    o.O *.p.p.3.-.q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.    ",
+"    O o.q L.p.M.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+    ",
+"  *+=+-+;+>+p.,+'+)+!+~+8.{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+  ",
+"  r N N 8+p.9+0+a+b+c+d+e+d f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+  ",
+"  w+x+w+y+z+A+B+C+D+E+S F+G+H+I+J+K+L+M+N+O+P+Q+R+S+$+T+U+V+W+  ",
+"X+Y+Z+`+ @.@+@6.@@#@$@^ %@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@",
+"[@}@|@1@2@3@4@5@6@7@8@9@0@a@b@) c@d@e@f@g@h@i@j@k@l@m@n@o@p@q@r@",
+"s@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@>@I@J@K@L@M@N@O@P@Q@R@S@T@U@V@W@",
+"X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_#:#<#[#}#",
+"|#1#2#3#4###5#'.6#7#8#9#0#a#b#c#d#e#f#g#h#i#j#k#l#m#n#o#p#q#r#s#",
+"t#u#v#w#s@x#y#z#a@A#B#C#D#E#F#G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#",
+"  X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$I#;$>$,$'$)$!$~${$]$^$/$($_$:$  ",
+"  <$[$}$|$*#1$2$3$4$5$6$7$8$9$0$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$  ",
+"  p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O$P$Q$R$S$  ",
+"    T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%>%,%'%)%!%~%{%]%    ",
+"    ^%/%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8%9%0%a%b%c%d%($e%f%g%h%    ",
+"      i%j%k%l%a$m%n%o%p%q%r%s%t%u%v%w%x%y%z%A%B%C%D%E%F%G%      ",
+"      H%I%J%K%L%M%N%O%P%Q%G$R%S%T%U%V%W%X%Y%Z%`% &.&+&@&#&      ",
+"        $&%&&&*&=&-&;&>&,&'&)&!&~&{&]&^&/&(&_&:&<&[&}&|&        ",
+"          1&2&3&4&5&6&7&8&9&0&a&b&c&d&e&f&g&h&i&j&k&l&          ",
+"            m&n&o&p&q&r&s&t&u&v&w&x&y&z&A&B&C&D&E&F&            ",
+"                G&H&I&J&K&L&M&N&O&P&Q&R&S&T&U&V&                ",
+"                    W&X&Y&Z&`& *.*+*@*#*$*%*                    ",
+"                          &***=*-*;*>*                          "};
diff --git a/docs/Makefile.am b/docs/Makefile.am
index e106768b..8b57d5bb 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,3 +1,5 @@
+man6_MANS = tmw.6
+
 EXTRA_DIST = packages.txt \
 	     FAQ.txt \
 	     HACKING.txt \
diff --git a/docs/tmw.6 b/docs/tmw.6
new file mode 100644
index 00000000..0dee82c7
--- /dev/null
+++ b/docs/tmw.6
@@ -0,0 +1,74 @@
+.TH "TMW" "6"
+.SH "NAME"
+tmw \- tmw is The Mana World: A fantasy online game
+.SH "SYNOPSIS"
+\fBtmw\fR
+.SH "DESCRIPTION"
+This manual page documents briefly the
+\fBtmw\fR ingame
+commands.
+\fBtmw\fR is a great online game based upon the Seiken Densetsu Serie.
+It has its own universe, and and its own character management system, which will
+give you the opportunity to play in a 2D heroic-fantasy world forever.
+.SH "BINARY PARAMETERS"
+This program follows the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-version
+Show version of the program.
+.TP
+.B \-u, \-\-skipupdate
+Skip the update process.
+.TP
+.B \-U, \-\-username
+Login with this username.
+.TP
+.B \-P, \-\-password
+Login with this password.
+.TP
+.B \-D, \-\-default
+Bypass the login process with default settings.
+.TP
+.B \-p, \-\-playername
+Login with this player.
+.TP
+.B \-C, \-\-configfile
+Configuration file to use
+.SH "COMMON KEYS"
+.TP
+.B Arrow Keys:
+Move your character around.
+.TP
+.B Left Ctrl:
+Make your character attack.
+.TP
+.B Key A:
+Target nearest monster.
+.TP
+.B Key G:
+Get items on the ground or in a chest.
+.TP
+.B Alt + 1...9:
+Shows an emoticon above your character.
+.TP
+.B Alt + I:
+Shows / Hide inventory window.
+.TP
+.B Alt + K:
+Shows / Hide skills window.
+.TP
+.B Alt + E:
+Shows / Hide equipment window.
+.TP
+.B Alt + C:
+Shows configuration window.
+.SH "AUTHOR"
+This manual page was written by Patrick Matth\[:a]i <patrick.matthaei@web.de>
+for The Mana World project.
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU General Public License, Version 2 any
+later version published by the Free Software Foundation.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4b5bad01..e28e235e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -268,10 +268,10 @@ SET(SRCS
     resources/sdlimageloader.h
     resources/soundeffect.cpp
     resources/soundeffect.h
-    resources/spriteset.cpp
     resources/spritedef.h
     resources/spritedef.cpp
-    resources/spriteset.h
+    resources/imageset.h
+    resources/imageset.cpp
     utils/base64.cpp
     utils/base64.h
     utils/dtor.h
@@ -330,6 +330,8 @@ SET(SRCS
     player.h
     properties.h
     serverinfo.h
+    simpleanimation.cpp
+    simpleanimation.h
     sound.cpp
     sound.h
     sprite.h
diff --git a/src/Makefile.am b/src/Makefile.am
index da1bc44d..f1f51b79 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -222,8 +222,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      resources/soundeffect.cpp \
 	      resources/spritedef.h \
 	      resources/spritedef.cpp \
-	      resources/spriteset.h \
-	      resources/spriteset.cpp \
+	      resources/imageset.h \
+	      resources/imageset.cpp \
 	      resources/buddylist.h \
 	      resources/buddylist.cpp \
 	      utils/base64.cpp \
@@ -284,6 +284,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      player.h \
 	      properties.h \
 	      serverinfo.h \
+	      simpleanimation.cpp \
+  	      simpleanimation.h \
 	      sound.cpp \
 	      sound.h \
 	      sprite.h \
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 3d1979a9..7260a512 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -30,7 +30,6 @@
 #include "resources/animation.h"
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
-#include "resources/spriteset.h"
 
 #include "utils/xml.h"
 
diff --git a/src/being.cpp b/src/being.cpp
index e4a1e9fc..682daddb 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -34,7 +34,7 @@
 #include "map.h"
 
 #include "resources/resourcemanager.h"
-#include "resources/spriteset.h"
+#include "resources/imageset.h"
 
 #include "gui/gui.h"
 
@@ -42,7 +42,7 @@
 #include "utils/tostring.h"
 
 int Being::instances = 0;
-Spriteset *Being::emotionset = NULL;
+ImageSet *Being::emotionSet = NULL;
 
 Being::Being(Uint16 id, Uint16 job, Map *map):
     mJob(job),
@@ -72,8 +72,8 @@ Being::Being(Uint16 id, Uint16 job, Map *map):
     {
         // Load the emotion set
         ResourceManager *rm = ResourceManager::getInstance();
-        emotionset = rm->getSpriteset("graphics/sprites/emotions.png", 30, 32);
-        if (!emotionset) logger->error("Unable to load emotions spriteset!");
+        emotionSet = rm->getImageSet("graphics/sprites/emotions.png", 30, 32);
+        if (!emotionSet) logger->error("Unable to load emotions!");
     }
 
     instances++;
@@ -89,8 +89,8 @@ Being::~Being()
 
     if (instances == 0)
     {
-        emotionset->decRef();
-        emotionset = NULL;
+        emotionSet->decRef();
+        emotionSet = NULL;
     }
 }
 
@@ -515,7 +515,7 @@ Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
     int px = mPx + offsetX + 3;
     int py = mPy + offsetY - 60;
 
-    graphics->drawImage(emotionset->get(mEmotion - 1), px, py);
+    graphics->drawImage(emotionSet->get(mEmotion - 1), px, py);
 }
 
 void
diff --git a/src/being.h b/src/being.h
index c3cba247..332f1b4a 100644
--- a/src/being.h
+++ b/src/being.h
@@ -41,7 +41,7 @@ class Equipment;
 class Item;
 class Map;
 class Graphics;
-class Spriteset;
+class ImageSet;
 
 /**
  * A position along a being's path.
@@ -397,7 +397,7 @@ class Being : public Sprite
         Uint16 mStepTime;
 
         static int instances;           /**< Number of Being instances */
-        static Spriteset *emotionset;   /**< Emoticons used by beings */
+        static ImageSet *emotionSet;    /**< Emoticons used by beings */
 };
 
 #endif
diff --git a/src/engine.cpp b/src/engine.cpp
index a3097d49..31bec9ff 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -44,7 +44,6 @@
 #include "resources/mapreader.h"
 #include "resources/monsterdb.h"
 #include "resources/resourcemanager.h"
-#include "resources/spriteset.h"
 
 #include "utils/dtor.h"
 #include "utils/tostring.h"
@@ -77,7 +76,8 @@ void Engine::changeMap(const std::string &mapPath)
 
     // Notify the minimap and beingManager about the map change
     Image *mapImage = NULL;
-    if (newMap->hasProperty("minimap")) {
+    if (newMap->hasProperty("minimap"))
+    {
         ResourceManager *resman = ResourceManager::getInstance();
         mapImage = resman->getImage(newMap->getProperty("minimap"));
     }
diff --git a/src/floor_item.cpp b/src/floor_item.cpp
index f33f7eb4..5d83e1dd 100644
--- a/src/floor_item.cpp
+++ b/src/floor_item.cpp
@@ -27,7 +27,6 @@
 
 #include "resources/itemdb.h"
 #include "resources/iteminfo.h"
-#include "resources/spriteset.h"
 
 
 FloorItem::FloorItem(unsigned int id,
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 09ce5b87..128a803e 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -42,9 +42,14 @@
 #include "../logindata.h"
 
 #include "../net/accountserver/account.h"
+#include "../net/charserverhandler.h"
+#include "../net/messageout.h"
 
 #include "../utils/tostring.h"
 
+// Defined in main.cpp, used here for setting the char create dialog
+extern CharServerHandler charServerHandler;
+
 /**
  * Listener for confirming character deletion.
  */
@@ -155,14 +160,14 @@ void CharSelectDialog::action(const gcn::ActionEvent &event)
     }
     else if (event.getId() == "new")
     {
-        //TODO: search the first free slot, and start CharCreateDialog
-        //      maybe add that search to the constructor
+        // TODO: Search the first free slot, and start CharCreateDialog
+        //       maybe add that search to the constructor.
         if (!(mCharInfo->getEntry()))
         {
             // Start new character dialog
-            mCharInfo->lock();
-            new CharCreateDialog(this, mCharInfo->getPos());
-            mCharInfo->unlock();
+            CharCreateDialog *charCreateDialog =
+                new CharCreateDialog(this, mCharInfo->getPos());
+            charServerHandler.setCharCreateDialog(charCreateDialog);
         }
     }
     else if (event.getId() == "delete")
@@ -344,14 +349,19 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot):
 
     setLocationRelativeTo(getParent());
     setVisible(true);
+    mNameField->requestFocus();
 }
 
 CharCreateDialog::~CharCreateDialog()
 {
     delete mPlayer;
+
+    // Make sure the char server handler knows that we're gone
+    charServerHandler.setCharCreateDialog(0);
 }
 
-void CharCreateDialog::action(const gcn::ActionEvent &event)
+void
+CharCreateDialog::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "create") {
         if (getName().length() >= 4) {
@@ -362,15 +372,14 @@ void CharCreateDialog::action(const gcn::ActionEvent &event)
                     mPlayer->getHairStyle(),
                     mPlayer->getHairColor(),
                     0,   // gender
-                    (int)mAttributeSlider[0]->getValue(),  // STR
-                    (int)mAttributeSlider[1]->getValue(),  // AGI
-                    (int)mAttributeSlider[2]->getValue(),  // DEX
-                    (int)mAttributeSlider[3]->getValue(),  // VIT
-                    (int)mAttributeSlider[4]->getValue(),  // INT
-                    (int)mAttributeSlider[5]->getValue(),  // WILL
-                    (int)mAttributeSlider[6]->getValue()   // CHAR
+                    (int) mAttributeSlider[0]->getValue(),  // STR
+                    (int) mAttributeSlider[1]->getValue(),  // AGI
+                    (int) mAttributeSlider[2]->getValue(),  // DEX
+                    (int) mAttributeSlider[3]->getValue(),  // VIT
+                    (int) mAttributeSlider[4]->getValue(),  // INT
+                    (int) mAttributeSlider[5]->getValue(),  // WILL
+                    (int) mAttributeSlider[6]->getValue()   // CHAR
             );
-            scheduleDelete();
         }
         else {
             new OkDialog("Error",
@@ -399,21 +408,23 @@ void CharCreateDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-std::string CharCreateDialog::getName()
+const std::string&
+CharCreateDialog::getName()
 {
     return mNameField->getText();
 }
 
 void CharCreateDialog::UpdateSliders()
 {
-    for (int i=0; i<=6; i++)
+    for (int i = 0; i < 7; i++)
     {
-        // update captions
-        mAttributeValue[i]->setCaption(toString((int)(mAttributeSlider[i]->getValue())));
+        // Update captions
+        mAttributeValue[i]->setCaption(
+                toString((int) (mAttributeSlider[i]->getValue())));
         mAttributeValue[i]->adjustSize();
     }
 
-    // update distributed points
+    // Update distributed points
     int pointsLeft = 70 - getDistributedPoints();
     if (pointsLeft == 0)
     {
@@ -425,24 +436,32 @@ void CharCreateDialog::UpdateSliders()
         mCreateButton->setEnabled(false);
         if (pointsLeft > 0)
         {
-            mAttributesLeft->setCaption(std::string("Please distribute " + toString(pointsLeft) + " points"));
+            mAttributesLeft->setCaption(std::string("Please distribute " +
+                                        toString(pointsLeft) + " points"));
         }
         else
         {
-            mAttributesLeft->setCaption(std::string("Please remove " + toString(-pointsLeft) + " points"));
+            mAttributesLeft->setCaption(std::string("Please remove " +
+                                        toString(-pointsLeft) + " points"));
         }
     }
 
     mAttributesLeft->adjustSize();
 }
 
+void
+CharCreateDialog::unlock()
+{
+    mCreateButton->setEnabled(true);
+}
+
 int CharCreateDialog::getDistributedPoints()
 {
     int points = 0;
 
-    for (int i=0; i<7; i++)
+    for (int i = 0; i < 7; i++)
     {
-        points += (int)mAttributeSlider[i]->getValue();
+        points += (int) mAttributeSlider[i]->getValue();
     }
     return points;
 }
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index 5066897e..9d9184ea 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -114,9 +114,17 @@ class CharCreateDialog : public Window, public gcn::ActionListener
          */
         ~CharCreateDialog();
 
-        void action(const gcn::ActionEvent &event);
+        void
+        action(const gcn::ActionEvent &event);
 
-        std::string getName();
+        const std::string&
+        getName();
+
+        /**
+         * Unlocks the dialog, enabling the create character button again.
+         */
+        void
+        unlock();
 
     private:
         int getDistributedPoints();
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index ec525c47..ec84491e 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -30,7 +30,6 @@
 
 #include "../resources/iteminfo.h"
 #include "../resources/resourcemanager.h"
-#include "../resources/spriteset.h"
 
 #include "../utils/tostring.h"
 
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 308311b7..a176f226 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -35,7 +35,6 @@
 #include "../resources/image.h"
 #include "../resources/iteminfo.h"
 #include "../resources/resourcemanager.h"
-#include "../resources/spriteset.h"
 
 #include "../utils/tostring.h"
 
@@ -65,7 +64,8 @@ ItemContainer::logic()
 
     int i = mInventory->getLastUsedSlot() + 1;
 
-    if (i != mMaxItems) {
+    if (i != mMaxItems)
+    {
         mMaxItems = i;
         setWidth(getWidth());
     }
@@ -192,9 +192,9 @@ ItemContainer::mousePressed(gcn::MouseEvent &event)
         int my = event.getY();
         int index = mx / gridWidth + ((my / gridHeight) * columns);
 
-        if (index > INVENTORY_SIZE) {
+        if (index > INVENTORY_SIZE)
             index = INVENTORY_SIZE - 1;
-        }
+
         setSelectedItem(mInventory->getItem(index));
     }
 }
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 9df3b489..15ec6314 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -36,24 +36,6 @@
 #include "passwordfield.h"
 #include "textfield.h"
 
-void
-WrongDataNoticeListener::setTarget(gcn::TextField *textField)
-{
-    mTarget = textField;
-}
-
-void
-WrongDataNoticeListener::action(const gcn::ActionEvent &event)
-{
-    if (event.getId() == "ok")
-    {
-        // Reset the field
-        mTarget->setText("");
-        mTarget->setCaretPosition(0);
-        mTarget->requestFocus();
-    }
-}
-
 LoginDialog::LoginDialog(LoginData *loginData):
     Window("Login"), mLoginData(loginData)
 {
@@ -66,28 +48,33 @@ LoginDialog::LoginDialog(LoginData *loginData):
     mCancelButton = new Button("Cancel", "cancel", this);
     mRegisterButton = new Button("Register", "register", this);
 
-    setContentSize(200, 91);
+    const int width = 220;
+    const int height = 100;
+
+    setContentSize(width, height);
 
     userLabel->setPosition(5, 5);
     passLabel->setPosition(5, 14 + userLabel->getHeight());
     mUserField->setPosition(65, 5);
     mPassField->setPosition(65, 14 + userLabel->getHeight());
-    mUserField->setWidth(130);
-    mPassField->setWidth(130);
+    mUserField->setWidth(width - 70);
+    mPassField->setWidth(width - 70);
     mKeepCheck->setPosition(4, 68);
     mCancelButton->setPosition(
-            200 - mCancelButton->getWidth() - 5,
-            91 - mCancelButton->getHeight() - 5);
+            width - mCancelButton->getWidth() - 5,
+            height - mCancelButton->getHeight() - 5);
     mOkButton->setPosition(
             mCancelButton->getX() - mOkButton->getWidth() - 5,
-            91 - mOkButton->getHeight() - 5);
+            height - mOkButton->getHeight() - 5);
     mRegisterButton->setPosition(
             mKeepCheck->getX() + mKeepCheck->getWidth() + 10,
-            91 - mRegisterButton->getHeight() - 5);
+            height - mRegisterButton->getHeight() - 5);
 
     mUserField->setActionEventId("ok");
     mPassField->setActionEventId("ok");
 
+    mUserField->addKeyListener(this);
+    mPassField->addKeyListener(this);
     mUserField->addActionListener(this);
     mPassField->addActionListener(this);
     mKeepCheck->addActionListener(this);
@@ -110,37 +97,27 @@ LoginDialog::LoginDialog(LoginData *loginData):
         mPassField->requestFocus();
     }
 
-    mWrongDataNoticeListener = new WrongDataNoticeListener();
+    mOkButton->setEnabled(canSubmit());
 }
 
 LoginDialog::~LoginDialog()
 {
-    delete mWrongDataNoticeListener;
 }
 
 void
 LoginDialog::action(const gcn::ActionEvent &event)
 {
-    if (event.getId() == "ok")
+    if (event.getId() == "ok" && canSubmit())
     {
-        // Check login
-        if (mUserField->getText().empty())
-        {
-            mWrongDataNoticeListener->setTarget(mPassField);
-            OkDialog *dlg = new OkDialog("Error", "Enter your username first");
-            dlg->addActionListener(mWrongDataNoticeListener);
-        }
-        else
-        {
-            mLoginData->username = mUserField->getText();
-            mLoginData->password = mPassField->getText();
-            mLoginData->remember = mKeepCheck->isMarked();
-
-            mOkButton->setEnabled(false);
-            mRegisterButton->setEnabled(false);
-
-            state = STATE_LOGIN_ATTEMPT;
-        }
+        mLoginData->username = mUserField->getText();
+        mLoginData->password = mPassField->getText();
+        mLoginData->remember = mKeepCheck->isMarked();
+        mLoginData->registerLogin = false;
+
+        mOkButton->setEnabled(false);
+        mRegisterButton->setEnabled(false);
+
+        state = STATE_LOGIN_ATTEMPT;
     }
     else if (event.getId() == "cancel")
     {
@@ -148,6 +125,24 @@ LoginDialog::action(const gcn::ActionEvent &event)
     }
     else if (event.getId() == "register")
     {
+        // Transfer these fields on to the register dialog
+        mLoginData->username = mUserField->getText();
+        mLoginData->password = mPassField->getText();
+
         state = STATE_REGISTER;
     }
 }
+
+void
+LoginDialog::keyPressed(gcn::KeyEvent &keyEvent)
+{
+    mOkButton->setEnabled(canSubmit());
+}
+
+bool
+LoginDialog::canSubmit()
+{
+    return !mUserField->getText().empty() &&
+           !mPassField->getText().empty() &&
+           state == STATE_LOGIN;
+}
diff --git a/src/gui/login.h b/src/gui/login.h
index 05c0da31..d8ae7eaf 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -26,29 +26,21 @@
 
 #include <iosfwd>
 #include <guichan/actionlistener.hpp>
+#include <guichan/keylistener.hpp>
 
 #include "window.h"
 #include "../guichanfwd.h"
 
 class LoginData;
 
-/**
- * Listener used for handling wrong data.
- */
-class WrongDataNoticeListener : public gcn::ActionListener {
-    public:
-        void setTarget(gcn::TextField *textField);
-        void action(const gcn::ActionEvent &event);
-    private:
-        gcn::TextField *mTarget;
-};
-
 /**
  * The login dialog.
  *
  * \ingroup Interface
  */
-class LoginDialog : public Window, public gcn::ActionListener {
+class LoginDialog : public Window, public gcn::ActionListener,
+                    public gcn::KeyListener
+{
     public:
         /**
          * Constructor
@@ -67,7 +59,19 @@ class LoginDialog : public Window, public gcn::ActionListener {
          */
         void action(const gcn::ActionEvent &event);
 
+        /**
+         * Called when a key is pressed in one of the text fields.
+         */
+        void keyPressed(gcn::KeyEvent &keyEvent);
+
     private:
+        /**
+         * Returns whether submit can be enabled. This is true in the login
+         * state, when all necessary fields have some text.
+         */
+        bool
+        canSubmit();
+
         gcn::TextField *mUserField;
         gcn::TextField *mPassField;
         gcn::CheckBox *mKeepCheck;
@@ -75,8 +79,6 @@ class LoginDialog : public Window, public gcn::ActionListener {
         gcn::Button *mCancelButton;
         gcn::Button *mRegisterButton;
 
-        WrongDataNoticeListener *mWrongDataNoticeListener;
-
         LoginData *mLoginData;
 };
 
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index be15747d..c8e01a6c 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -41,6 +41,21 @@
 #include "textfield.h"
 #include "ok_dialog.h"
 
+void
+WrongDataNoticeListener::setTarget(gcn::TextField *textField)
+{
+    mTarget = textField;
+}
+
+void
+WrongDataNoticeListener::action(const gcn::ActionEvent &event)
+{
+    if (event.getId() == "ok")
+    {
+        mTarget->requestFocus();
+    }
+}
+
 RegisterDialog::RegisterDialog(LoginData *loginData):
     Window("Register"),
     mWrongDataNoticeListener(new WrongDataNoticeListener()),
@@ -50,28 +65,28 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
     gcn::Label *passwordLabel = new gcn::Label("Password:");
     gcn::Label *confirmLabel = new gcn::Label("Confirm:");
     gcn::Label *emailLabel = new gcn::Label("Email:");
-    mUserField = new TextField("player");
-    mPasswordField = new PasswordField();
+    mUserField = new TextField(loginData->username);
+    mPasswordField = new PasswordField(loginData->password);
     mConfirmField = new PasswordField();
     mEmailField = new TextField();
     mRegisterButton = new Button("Register", "register", this);
     mCancelButton = new Button("Cancel", "cancel", this);
 
-    const int width = 200;
+    const int width = 220;
     const int height = 130;
     setContentSize(width, height);
 
     mUserField->setPosition(65, 5);
-    mUserField->setWidth(130);
+    mUserField->setWidth(width - 70);
     mPasswordField->setPosition(
             65, mUserField->getY() + mUserField->getHeight() + 7);
-    mPasswordField->setWidth(130);
+    mPasswordField->setWidth(mUserField->getWidth());
     mConfirmField->setPosition(
             65, mPasswordField->getY() + mPasswordField->getHeight() + 7);
-    mConfirmField->setWidth(130);
+    mConfirmField->setWidth(mUserField->getWidth());
     mEmailField->setPosition(
             65, mConfirmField->getY() + mConfirmField->getHeight() + 7);
-    mEmailField->setWidth(130);
+    mEmailField->setWidth(mUserField->getWidth());
 
     userLabel->setPosition(5, mUserField->getY() + 1);
     passwordLabel->setPosition(5, mPasswordField->getY() + 1);
@@ -79,11 +94,30 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
     emailLabel->setPosition(5, mEmailField->getY() + 1);
 
     mCancelButton->setPosition(
-            width - 5 - mCancelButton->getWidth(),
-            height - 5 - mCancelButton->getHeight());
+            width - mCancelButton->getWidth() - 5,
+            height - mCancelButton->getHeight() - 5);
     mRegisterButton->setPosition(
-            mCancelButton->getX() - 5 - mRegisterButton->getWidth(),
-            mCancelButton->getY());
+            mCancelButton->getX() - mRegisterButton->getWidth() - 5,
+            height - mRegisterButton->getHeight() - 5);
+
+    mUserField->addKeyListener(this);
+    mPasswordField->addKeyListener(this);
+    mConfirmField->addKeyListener(this);
+    mEmailField->addKeyListener(this);
+
+    /* TODO:
+     * This is a quick and dirty way to respond to the ENTER key, regardless of
+     * which text field is selected. There may be a better way now with the new
+     * input system of Guichan 0.6.0. See also the login dialog.
+     */
+    mUserField->setActionEventId("register");
+    mPasswordField->setActionEventId("register");
+    mConfirmField->setActionEventId("register");
+    mEmailField->setActionEventId("register");
+    mUserField->addActionListener(this);
+    mPasswordField->addActionListener(this);
+    mConfirmField->addActionListener(this);
+    mEmailField->addActionListener(this);
 
     add(userLabel);
     add(passwordLabel);
@@ -100,6 +134,8 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
     setVisible(true);
     mUserField->requestFocus();
     mUserField->setCaretPosition(mUserField->getText().length());
+
+    mRegisterButton->setEnabled(canSubmit());
 }
 
 RegisterDialog::~RegisterDialog()
@@ -114,7 +150,7 @@ RegisterDialog::action(const gcn::ActionEvent &event)
     {
         state = STATE_LOGIN;
     }
-    else if (event.getId() == "register")
+    else if (event.getId() == "register" && canSubmit())
     {
         const std::string user = mUserField->getText();
         logger->log("RegisterDialog::register Username is %s", user.c_str());
@@ -122,14 +158,7 @@ RegisterDialog::action(const gcn::ActionEvent &event)
         std::stringstream errorMsg;
         int error = 0;
 
-        // Check login
-        if (user.empty())
-        {
-            // No username
-            errorMsg << "Enter your username first.";
-            error = 1;
-        }
-        else if (user.length() < LEN_MIN_USERNAME)
+        if (user.length() < LEN_MIN_USERNAME)
         {
             // Name too short
             errorMsg << "The username needs to be at least "
@@ -178,9 +207,11 @@ RegisterDialog::action(const gcn::ActionEvent &event)
             }
             else if (error == 2)
             {
-                mWrongDataNoticeListener->setTarget(this->mPasswordField);
                 // Reset password confirmation
+                mPasswordField->setText("");
                 mConfirmField->setText("");
+
+                mWrongDataNoticeListener->setTarget(this->mPasswordField);
             }
 
             OkDialog *dlg = new OkDialog("Error", errorMsg.str());
@@ -191,7 +222,6 @@ RegisterDialog::action(const gcn::ActionEvent &event)
             // No errors detected, register the new user.
             mRegisterButton->setEnabled(false);
 
-            mLoginData->port = (short)config.getValue("port", 0);
             mLoginData->username = mUserField->getText();
             mLoginData->password = mPasswordField->getText();
             mLoginData->email = mEmailField->getText();
@@ -201,3 +231,18 @@ RegisterDialog::action(const gcn::ActionEvent &event)
         }
     }
 }
+
+void
+RegisterDialog::keyPressed(gcn::KeyEvent &keyEvent)
+{
+    mRegisterButton->setEnabled(canSubmit());
+}
+
+bool
+RegisterDialog::canSubmit()
+{
+    return !mUserField->getText().empty() &&
+           !mPasswordField->getText().empty() &&
+           !mConfirmField->getText().empty() &&
+           state == STATE_REGISTER;
+}
diff --git a/src/gui/register.h b/src/gui/register.h
index 4ffe451f..088e8f9b 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -26,23 +26,39 @@
 
 #include <iosfwd>
 #include <guichan/actionlistener.hpp>
+#include <guichan/keylistener.hpp>
 
 #include "window.h"
 #include "../guichanfwd.h"
 
 class LoginData;
 class OkDialog;
-class WrongDataNoticeListener;
 
 /**
- * The login dialog.
+ * Listener used while dealing with wrong data. It is used to direct the focus
+ * to the field which contained wrong data when the Ok button was pressed on
+ * the error notice.
+ */
+class WrongDataNoticeListener : public gcn::ActionListener {
+    public:
+        void setTarget(gcn::TextField *textField);
+        void action(const gcn::ActionEvent &event);
+    private:
+        gcn::TextField *mTarget;
+};
+
+/**
+ * The registration dialog.
  *
  * \ingroup Interface
  */
-class RegisterDialog : public Window, public gcn::ActionListener {
+class RegisterDialog : public Window, public gcn::ActionListener,
+                       public gcn::KeyListener
+{
     public:
         /**
-         * Constructor
+         * Constructor. Name, password and server fields will be initialized to
+         * the information already present in the LoginData instance.
          *
          * @see Window::Window
          */
@@ -58,10 +74,19 @@ class RegisterDialog : public Window, public gcn::ActionListener {
          */
         void action(const gcn::ActionEvent &event);
 
-        // Made them public to have the possibility to request focus
-        // from external functions.
+        /**
+         * Called when a key is pressed in one of the text fields.
+         */
+        void keyPressed(gcn::KeyEvent &keyEvent);
 
     private:
+        /**
+         * Returns whether submit can be enabled. This is true in the register
+         * state, when all necessary fields have some text.
+         */
+        bool
+        canSubmit();
+
         gcn::TextField *mUserField;
         gcn::TextField *mPasswordField;
         gcn::TextField *mConfirmField;
diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp
index 9a09389d..5558e8fc 100644
--- a/src/gui/unregisterdialog.cpp
+++ b/src/gui/unregisterdialog.cpp
@@ -34,7 +34,7 @@
 
 #include "button.h"
 #include "checkbox.h"
-#include "login.h"
+#include "register.h"
 #include "passwordfield.h"
 #include "textfield.h"
 #include "ok_dialog.h"
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index bc635cce..f3e9031c 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -28,15 +28,20 @@
 #include "gui.h"
 #include "popupmenu.h"
 
+#include "../simpleanimation.h"
 #include "../beingmanager.h"
 #include "../configuration.h"
 #include "../flooritemmanager.h"
 #include "../graphics.h"
 #include "../localplayer.h"
 #include "../map.h"
+#include "../monster.h"
 #include "../npc.h"
 
-#include "../resources/monsterdb.h"
+#include "../resources/animation.h"
+#include "../resources/monsterinfo.h"
+#include "../resources/resourcemanager.h"
+#include "../resources/imageset.h"
 
 #include "../utils/tostring.h"
 
@@ -60,11 +65,39 @@ Viewport::Viewport():
     config.addListener("ScrollRadius", this);
 
     mPopupMenu = new PopupMenu();
+
+    // Load target cursors
+    ResourceManager *resman = ResourceManager::getInstance();
+    mInRangeImages = resman->getImageSet(
+            "graphics/gui/target-cursor-blue.png", 44, 35);
+    mOutRangeImages = resman->getImageSet(
+            "graphics/gui/target-cursor-red.png", 44, 35);
+    Animation *animInRange = new Animation();
+    Animation *animOutRange = new Animation();
+
+    for (unsigned int i = 0; i < mInRangeImages->size(); ++i)
+    {
+        animInRange->addFrame(mInRangeImages->get(i), 75, 0, 0);
+    }
+
+    for (unsigned int j = 0; j < mOutRangeImages->size(); ++j)
+    {
+        animOutRange->addFrame(mOutRangeImages->get(j), 75, 0, 0);
+    }
+
+    mTargetCursorInRange = new SimpleAnimation(animInRange);
+    mTargetCursorOutRange = new SimpleAnimation(animOutRange);
 }
 
 Viewport::~Viewport()
 {
     delete mPopupMenu;
+
+    delete mTargetCursorInRange;
+    delete mTargetCursorOutRange;
+
+    mInRangeImages->decRef();
+    mOutRangeImages->decRef();
 }
 
 void
@@ -158,10 +191,12 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     if (mMap)
     {
         mMap->draw(graphics, mCameraX, mCameraY, 0);
+        drawTargetCursor(graphics);
         mMap->draw(graphics, mCameraX, mCameraY, 1);
         mMap->draw(graphics, mCameraX, mCameraY, 2);
         mMap->drawOverlay(graphics, mViewX, mViewY,
                 (int) config.getValue("OverlayDetail", 2));
+        drawTargetName(graphics);
     }
 
     // Find a path from the player to the mouse, and draw it. This is for debug
@@ -201,28 +236,6 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
         (*i)->drawEmotion(graphics, -mCameraX, -mCameraY);
     }
 
-    // Draw target marker if needed
-    Being *target = player_node->getTarget();
-    if (target)
-    {
-        graphics->setFont(speechFont);
-        graphics->setColor(gcn::Color(255, 32, 32));
-        int dy = (target->getType() == Being::PLAYER) ? 80 : 42;
-
-        std::string mobName = "";
-
-        if (target->mJob >= 1002)
-        {
-            int mobId = target->mJob - 1002;
-            mobName = MonsterDB::get(mobId).getName();
-
-            graphics->drawText(mobName,
-                    target->getPixelX() - mCameraX + 15,
-                    target->getPixelY() - mCameraY - dy,
-                    gcn::Graphics::CENTER);
-        }
-    }
-
     // Draw contained widgets
     WindowContainer::draw(gcnGraphics);
 }
@@ -245,6 +258,57 @@ Viewport::logic()
                                     mouseY + mCameraY);
         mWalkTime = player_node->mWalkTime;
     }
+
+    mTargetCursorInRange->update(10);
+    mTargetCursorOutRange->update(10);
+}
+
+void
+Viewport::drawTargetCursor(Graphics *graphics)
+{
+    // Draw target marker if needed
+    Being *target = player_node->getTarget();
+    if (target)
+    {
+        // Find whether target is in range
+        int rangeX = abs(target->mX - player_node->mX);
+        int rangeY = abs(target->mY - player_node->mY);
+        int attackRange = player_node->getAttackRange();
+
+        // Draw the target cursor, which one depends if the target is in range
+        if (rangeX > attackRange || rangeY > attackRange)
+        {
+            // Draw the out of range cursor
+            graphics->drawImage(mTargetCursorOutRange->getCurrentImage(),
+                                target->getPixelX() - mCameraX,
+                                target->getPixelY() - mCameraY);
+        }
+        else
+        {
+            // Draw the in range cursor
+            graphics->drawImage(mTargetCursorInRange->getCurrentImage(),
+                                target->getPixelX() - mCameraX,
+                                target->getPixelY() - mCameraY);
+        }
+    }
+}
+
+void
+Viewport::drawTargetName(Graphics *graphics)
+{
+    // Draw target marker if needed
+    Being *target = player_node->getTarget();
+    if (target && target->getType() == Being::MONSTER)
+    {
+        graphics->setFont(speechFont);
+        graphics->setColor(gcn::Color(255, 32, 32));
+
+        const MonsterInfo &mi = static_cast<Monster*>(target)->getInfo();
+        graphics->drawText(mi.getName(),
+                           target->getPixelX() - mCameraX + 15,
+                           target->getPixelY() - mCameraY - 42,
+                           gcn::Graphics::CENTER);
+    }
 }
 
 void
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index f1cadd98..84efeff3 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -33,8 +33,11 @@
 class Map;
 class Being;
 class FloorItem;
+class ImageSet;
 class Item;
 class PopupMenu;
+class Graphics;
+class SimpleAnimation;
 
 /**
  * The viewport on the map. Displays the current map and handles mouse input
@@ -138,6 +141,18 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
          */
         void showPopup(int x, int y, Being *being);
 
+        /**
+         * Draws range based target cursor
+         */
+        void
+        drawTargetCursor(Graphics *graphics);
+
+        /**
+         * Draws target name
+         */
+        void
+        drawTargetName(Graphics *graphics);
+
 
         Map *mMap;                 /**< The current map. */
 
@@ -149,6 +164,15 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         int mCameraY;              /**< Current viewpoint in tiles. */
         bool mShowDebugPath;       /**< Show a path from player to pointer. */
 
+        ImageSet *mInRangeImages;  /**< Images of in range target cursor. */
+        ImageSet *mOutRangeImages; /**< Images of out of range target cursor.*/
+
+        /** Animated in range target cursor. */
+        SimpleAnimation *mTargetCursorInRange;
+
+        /** Animated out of range target cursor. */
+        SimpleAnimation *mTargetCursorOutRange;
+
         bool mPlayerFollowMouse;
         int mWalkTime;
 
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 7f595ef1..97371677 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -38,6 +38,7 @@ LocalPlayer *player_node = NULL;
 
 LocalPlayer::LocalPlayer():
     Player(65535, 0, NULL),
+    mAttackRange(0),
     mInventory(new Inventory()),
     mAttributeBase(NB_BASE_ATTRIBUTES, 0),
     mAttributeEffective(NB_BASE_ATTRIBUTES, 0),
diff --git a/src/localplayer.h b/src/localplayer.h
index 299cf85a..fb7703dd 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -152,6 +152,16 @@ class LocalPlayer : public Player
         void dropItem(Item *item, int quantity);
         void pickUp(FloorItem *item);
 
+        /**
+         * Sets the attack range.
+         */
+        void setAttackRange(int range) { mAttackRange = range; }
+
+        /**
+         * Gets the attack range.
+         */
+        int getAttackRange() const { return mAttackRange; }
+
         /**
          * Sents a trade request to the given being.
          */
@@ -213,6 +223,8 @@ class LocalPlayer : public Player
         int getMaxHP() const
         { return mMaxHP; }
 
+        Uint16 mAttackRange;
+
         void setHP(int value)
         { mHP = value; }
 
diff --git a/src/logindata.h b/src/logindata.h
index 0a01331c..fbbbb573 100644
--- a/src/logindata.h
+++ b/src/logindata.h
@@ -36,8 +36,8 @@ struct LoginData
     int session_ID1;
     int session_ID2;
 
-    bool remember;
-    bool registerLogin;
+    bool remember;            /**< Whether to store the username and host. */
+    bool registerLogin;       /**< Whether an account is being registered. */
 
     void clear()
     {
diff --git a/src/main.cpp b/src/main.cpp
index aad6a68c..bbbf0fd1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -30,9 +30,13 @@
 #include <vector>
 #include <SDL_image.h>
 
-#include <guichan/actionlistener.hpp>
+#ifdef WIN32
+#include <SDL_syswm.h>
+#endif
 
+#include <guichan/actionlistener.hpp>
 #include <guichan/sdl/sdlinput.hpp>
+#include <guichan/widgets/label.hpp>
 
 #include <libxml/parser.h>
 
@@ -63,11 +67,11 @@
 #include "gui/login.h"
 #include "gui/quitdialog.h"
 #include "gui/ok_dialog.h"
+#include "gui/progressbar.h"
 #include "gui/register.h"
 #include "gui/updatewindow.h"
 #include "gui/textfield.h"
 
-
 #include "net/charserverhandler.h"
 #include "net/connection.h"
 #include "net/loginhandler.h"
@@ -86,7 +90,6 @@
 #include "resources/itemdb.h"
 #include "resources/monsterdb.h"
 #include "resources/resourcemanager.h"
-#include "resources/spriteset.h"
 
 #include "utils/dtor.h"
 #include "utils/tostring.h"
@@ -103,23 +106,13 @@ unsigned char screen_mode;
 Sound sound;
 Music *bgm;
 
-Configuration config;         /**< Xml file configuration reader */
+Configuration config;         /**< XML file configuration reader */
 Logger *logger;               /**< Log object */
 
 Net::Connection *accountServerConnection = 0;
 Net::Connection *gameServerConnection = 0;
 Net::Connection *chatServerConnection = 0;
 
-namespace {
-    struct ErrorListener : public gcn::ActionListener
-    {
-        void action(const gcn::ActionEvent &event)
-        {
-            state = STATE_CHOOSE_SERVER;
-        }
-    } errorListener;
-}
-
 /**
  * A structure holding the values of various options that can be passed from
  * the command line.
@@ -131,12 +124,14 @@ struct Options
      */
     Options():
         printHelp(false),
+        printVersion(false),
         skipUpdate(false),
         chooseDefault(false),
         serverPort(0)
     {};
 
     bool printHelp;
+    bool printVersion;
     bool skipUpdate;
     bool chooseDefault;
     std::string playername;
@@ -237,7 +232,16 @@ void initEngine()
     SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
 
     SDL_WM_SetCaption("The Mana World", NULL);
-    SDL_WM_SetIcon(IMG_Load(TMW_DATADIR "data/icons/tmw-icon.png"), NULL);
+#ifdef WIN32
+    static SDL_SysWMinfo pInfo;
+    SDL_GetWMInfo(&pInfo);
+    HICON icon = LoadIcon(GetModuleHandle(NULL), "A");
+    SetClassLong(pInfo.window, GCL_HICON, (LONG) icon);
+#else
+    SDL_Surface *icon = IMG_Load(TMW_DATADIR "data/icons/tmw.png");
+    SDL_SetAlpha(icon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
+    SDL_WM_SetIcon(icon, NULL);
+#endif
 
     ResourceManager *resman = ResourceManager::getInstance();
 
@@ -356,6 +360,7 @@ void printHelp()
         "tmw\n\n"
         "Options:\n"
         "  -h --help       : Display this help\n"
+        "  -v --version    : Display the version\n"
         "  -u --skipupdate : Skip the update process\n"
         "  -U --username   : Login with this username\n"
         "  -P --password   : Login with this password\n"
@@ -366,12 +371,23 @@ void printHelp()
         "  -C --configfile : Configuration file to use\n";
 }
 
+void printVersion()
+{
+#ifdef PACKAGE_VERSION
+    std::cout << "The Mana World version " << PACKAGE_VERSION << std::endl;
+#else
+    std::cout << "The Mana World version " <<
+             "(local build?, PACKAGE_VERSION is not defined)" << std::endl;
+#endif
+}
+
 void parseOptions(int argc, char *argv[], Options &options)
 {
-    const char *optstring = "huU:P:Dp:s:o:C:";
+    const char *optstring = "hvuU:P:Dp:s:o:C:";
 
     const struct option long_options[] = {
         { "help",       no_argument,       0, 'h' },
+        { "version",    no_argument,       0, 'v' },
         { "skipupdate", no_argument,       0, 'u' },
         { "username",   required_argument, 0, 'U' },
         { "password",   required_argument, 0, 'P' },
@@ -395,6 +411,9 @@ void parseOptions(int argc, char *argv[], Options &options)
             case 'h':
                 options.printHelp = true;
                 break;
+            case 'v':
+                options.printVersion = true;
+                break;
             case 'u':
                 options.skipUpdate = true;
                 break;
@@ -449,6 +468,16 @@ LoginHandler loginHandler;
 LogoutHandler logoutHandler;
 LockedArray<LocalPlayer*> charInfo(MAX_SLOT + 1);
 
+namespace {
+    struct ErrorListener : public gcn::ActionListener
+    {
+        void action(const gcn::ActionEvent &event)
+        {
+            state = STATE_CHOOSE_SERVER;
+        }
+    } errorListener;
+}
+
 // TODO Find some nice place for these functions
 void accountLogin(LoginData *loginData)
 {
@@ -466,15 +495,17 @@ void accountLogin(LoginData *loginData)
     // Clear the password, avoids auto login when returning to login
     loginData->password = "";
 
-    //remove _M or _F from username after a login for registration purpose
+    // Remove _M or _F from username after a login for registration purpose
     if (loginData->registerLogin)
     {
-        loginData->registerLogin = false;
-        loginData->username = loginData->username.substr(0, loginData->username.length() - 2);
+        loginData->username =
+            loginData->username.substr(0, loginData->username.length() - 2);
     }
+
     // TODO This is not the best place to save the config, but at least better
     // than the login gui window
-    if (loginData->remember) {
+    if (loginData->remember)
+    {
         config.setValue("host", loginData->hostname);
         config.setValue("username", loginData->username);
     }
@@ -557,7 +588,7 @@ void logoutThenExit()
     logoutHandler.reset();
     logoutHandler.setScenario(LOGOUT_EXIT);
 
-    //Can't logout if we were not logged in ...
+    // Can't logout if we were not logged in ...
     if (accountServerConnection->isConnected())
     {
         Net::AccountServer::logout();
@@ -616,10 +647,6 @@ void initXML()
 /** Main */
 int main(int argc, char *argv[])
 {
-#ifdef PACKAGE_VERSION
-    std::cout << "The Mana World v" << PACKAGE_VERSION << std::endl;
-#endif
-
     // Parse command line options
     Options options;
     parseOptions(argc, argv, options);
@@ -628,6 +655,11 @@ int main(int argc, char *argv[])
         printHelp();
         return 0;
     }
+    else if (options.printVersion)
+    {
+        printVersion();
+        return 0;
+    }
 
     // Initialize PhysicsFS
     PHYSFS_init(argv[0]);
@@ -647,10 +679,16 @@ int main(int argc, char *argv[])
     initConfiguration(options);
     initEngine();
 
+    Game *game = NULL;
     Window *currentDialog = NULL;
     QuitDialog* quitDialog = NULL;
     Image *login_wallpaper = NULL;
-    Game *game = NULL;
+
+    gcn::Container *top = static_cast<gcn::Container*>(gui->getTop());
+#ifdef PACKAGE_VERSION
+    gcn::Label *versionLabel = new gcn::Label(PACKAGE_VERSION);
+    top->add(versionLabel, 2, 2);
+#endif
 
     sound.playMusic(TMW_DATADIR "data/music/Magick - Real.ogg");
 
@@ -715,8 +753,8 @@ int main(int argc, char *argv[])
             guiInput->pushInput(event);
         }
 
-        gui->logic();
         Net::flush();
+        gui->logic();
 
         if (!login_wallpaper)
         {
@@ -729,10 +767,6 @@ int main(int argc, char *argv[])
         }
 
         graphics->drawImage(login_wallpaper, 0, 0);
-#ifdef PACKAGE_VERSION
-        graphics->setFont(gui->getFont());
-        graphics->drawText(PACKAGE_VERSION, 0, 0);
-#endif
         gui->draw();
         graphics->updateScreen();
 
@@ -759,7 +793,6 @@ int main(int argc, char *argv[])
                  accountServerConnection->isConnected())
         {
             reconnectAccount(token);
-
             state = STATE_WAIT;
         }
 
@@ -936,6 +969,10 @@ int main(int argc, char *argv[])
                     Net::ChatServer::connect(chatServerConnection, token);
                     sound.fadeOutMusic(1000);
 
+#ifdef PACKAGE_VERSION
+                    delete versionLabel;
+                    versionLabel = NULL;
+#endif
                     currentDialog = NULL;
 
                     logger->log("State: GAME");
diff --git a/src/monster.h b/src/monster.h
index 18fa703e..39bbf3d7 100644
--- a/src/monster.h
+++ b/src/monster.h
@@ -43,7 +43,6 @@ class Monster : public Being
          */
         virtual void handleAttack();
 
-    protected:
         /**
          * Returns the MonsterInfo, with static data about this monster.
          */
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 34fc188d..820aaea4 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -34,11 +34,13 @@
 #include "../main.h"
 
 #include "../gui/ok_dialog.h"
+#include "../gui/char_select.h"
 
 extern Net::Connection *gameServerConnection;
 extern Net::Connection *chatServerConnection;
 
-CharServerHandler::CharServerHandler()
+CharServerHandler::CharServerHandler():
+    mCharCreateDialog(0)
 {
     static const Uint16 _messages[] = {
         APMSG_CHAR_CREATE_RESPONSE,
@@ -99,6 +101,13 @@ CharServerHandler::handleMessage(MessageIn &msg)
             mCharInfo->unlock();
             mCharInfo->select(slot);
             mCharInfo->setEntry(tempPlayer);
+
+            // Close the character create dialog
+            if (mCharCreateDialog)
+            {
+                mCharCreateDialog->scheduleDelete();
+                mCharCreateDialog = 0;
+            }
             break;
 
         case APMSG_CHAR_SELECT_RESPONSE:
@@ -154,6 +163,9 @@ CharServerHandler::handleCharCreateResponse(MessageIn &msg)
         }
         new OkDialog("Error", message);
     }
+
+    if (mCharCreateDialog)
+        mCharCreateDialog->unlock();
 }
 
 void
@@ -177,15 +189,20 @@ CharServerHandler::handleCharSelectResponse(MessageIn &msg)
 
         // Keep the selected character and delete the others
         player_node = mCharInfo->getEntry();
+        int slot = mCharInfo->getPos();
         mCharInfo->unlock();
         mCharInfo->select(0);
 
         do {
             LocalPlayer *tmp = mCharInfo->getEntry();
             if (tmp != player_node)
+            {
                 delete tmp;
+                mCharInfo->setEntry(0);
+            }
             mCharInfo->next();
         } while (mCharInfo->getPos());
+        mCharInfo->select(slot);
 
         mCharInfo->clear(); //player_node will be deleted by ~Game
 
@@ -204,8 +221,11 @@ CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
     tempPlayer->setHairColor(msg.readByte());
     tempPlayer->setLevel(msg.readByte());
     tempPlayer->setMoney(msg.readLong());
-    for (int i = 0; i < 7; i++) {
+
+    for (int i = 0; i < 7; i++)
+    {
         tempPlayer->setAttributeBase(i, msg.readByte());
     }
+
     return tempPlayer;
 }
diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h
index 342641d7..4a4fe0c3 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.h
@@ -28,9 +28,13 @@
 
 #include "../lockedarray.h"
 
+class CharCreateDialog;
 class LocalPlayer;
 class LoginData;
 
+/**
+ * Deals with incoming messages related to character selection.
+ */
 class CharServerHandler : public MessageHandler
 {
     public:
@@ -45,6 +49,14 @@ class CharServerHandler : public MessageHandler
             mCharInfo = charInfo;
         }
 
+        /**
+         * Sets the character create dialog. The handler will clean up this
+         * dialog when a new character is succesfully created, and will unlock
+         * the dialog when a new character failed to be created.
+         */
+        void setCharCreateDialog(CharCreateDialog *window)
+        { mCharCreateDialog = window; }
+
     protected:
         void
         handleCharCreateResponse(MessageIn &msg);
@@ -53,6 +65,7 @@ class CharServerHandler : public MessageHandler
         handleCharSelectResponse(MessageIn &msg);
 
         LockedArray<LocalPlayer*> *mCharInfo;
+        CharCreateDialog *mCharCreateDialog;
 
         LocalPlayer*
         readPlayerData(MessageIn &msg, int &slot);
diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index 1c0fd4ca..c0072a45 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.cpp
@@ -43,6 +43,7 @@ EquipmentHandler::EquipmentHandler()
         0x01d7,
         SMSG_PLAYER_UNEQUIP,
         SMSG_PLAYER_ARROW_EQUIP,
+        SMSG_PLAYER_ATTACK_RANGE,
         0
     };
     handledMessages = _messages;
@@ -191,6 +192,10 @@ void EquipmentHandler::handleMessage(MessageIn &msg)
                     index, equipPoint, type, position);
             break;
 
+        case SMSG_PLAYER_ATTACK_RANGE:
+            player_node->setAttackRange(msg.readShort());
+            break;
+
         case SMSG_PLAYER_ARROW_EQUIP:
             itemId = msg.readShort();
 
diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp
index c68a620a..90f2dbd5 100644
--- a/src/net/loginhandler.cpp
+++ b/src/net/loginhandler.cpp
@@ -88,7 +88,7 @@ void LoginHandler::handleMessage(MessageIn &msg)
             {
                 switch (errMsg) {
                     case REGISTER_INVALID_VERSION:
-                    errorMessage = "Client has an insufficient version number to login.";
+                        errorMessage = "Client has an insufficient version number to login.";
                         break;
                     case ERRMSG_INVALID_ARGUMENT:
                         errorMessage = "Wrong username, password or email address";
diff --git a/src/net/protocol.h b/src/net/protocol.h
index a9ee0e5b..b5dc2996 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -44,6 +44,7 @@
 #define SMSG_PLAYER_EQUIPMENT        0x00a4
 #define SMSG_PLAYER_EQUIP            0x00aa
 #define SMSG_PLAYER_UNEQUIP          0x00ac
+#define SMSG_PLAYER_ATTACK_RANGE     0x013a
 #define SMSG_PLAYER_ARROW_EQUIP      0x013c
 #define SMSG_PLAYER_ARROW_MESSAGE    0x013b
 #define SMSG_PLAYER_SKILLS           0x010f
diff --git a/src/npc.cpp b/src/npc.cpp
index ccd085b6..2d291104 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -28,8 +28,6 @@
 
 #include "gui/gui.h"
 
-class Spriteset;
-
 NPC *current_npc = 0;
 
 NPC::NPC(Uint16 id, Uint16 job, Map *map):
diff --git a/src/resources/animation.h b/src/resources/animation.h
index 54142bcb..d0d11c69 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -29,7 +29,6 @@
 #include <libxml/tree.h>
 
 class Image;
-class Spriteset;
 
 /**
  * A single frame in an animation, with a delay and an offset.
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 58325213..a27783d4 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -80,7 +80,7 @@ Image* Image::load(void *buffer, unsigned int bufferSize,
         tmpImage = IMG_Load_RW(rw, 1);
     }
 
-    if (tmpImage == NULL) {
+    if (!tmpImage) {
         logger->log("Error, image load failed: %s", IMG_GetError());
         return NULL;
     }
@@ -99,87 +99,28 @@ Image* Image::load(void *buffer, unsigned int bufferSize,
     amask = 0xff000000;
 #endif
 
-    // Convert the image to a 32 bit software surface for processing
-    SDL_Surface *formatImage = SDL_CreateRGBSurface(SDL_SWSURFACE, 0, 0, 32,
-            rmask, gmask, bmask, amask);
-
-    if (formatImage == NULL) {
-        logger->log("Error, image load failed: not enough memory");
-        SDL_FreeSurface(tmpImage);
-        return NULL;
-    }
-
-    SDL_Surface *image = SDL_ConvertSurface(
-            tmpImage, formatImage->format, SDL_SWSURFACE);
-
-    SDL_FreeSurface(formatImage);
-
-    if (image == NULL) {
-        logger->log("Error, image load failed: not enough memory");
-        return NULL;
-    }
-
-    bool hasPink = false;
-    bool hasAlpha = false;
-    int i;
-    Uint32 pink = SDL_MapRGB(image->format, 255, 0, 255);
-
-    // Figure out whether the image has pink pixels
-    for (i = 0; i < image->w * image->h; ++i)
-    {
-        if (((Uint32*)image->pixels)[i] == pink)
-        {
-            hasPink = true;
-            break;
-        }
-    }
-
-    // Figure out whether the image uses its alpha layer
-    for (i = 0; i < image->w * image->h; ++i)
-    {
-        Uint8 r, g, b, a;
-        SDL_GetRGBA(
-                ((Uint32*)image->pixels)[i],
-                image->format,
-                &r, &g, &b, &a);
-
-        if (a != 255)
-        {
-            hasAlpha = true;
-            break;
-        }
-    }
-
-    SDL_FreeSurface(image);
-
-    if (hasPink && !hasAlpha) {
-        SDL_SetColorKey(tmpImage, SDL_SRCCOLORKEY,
-                SDL_MapRGB(tmpImage->format, 255, 0, 255));
-    } else if (hasAlpha) {
-        SDL_SetAlpha(tmpImage, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
-    }
-
 #ifdef USE_OPENGL
     if (mUseOpenGL)
     {
         int width = tmpImage->w;
         int height = tmpImage->h;
-        int realWidth = 1, realHeight = 1;
+        int realWidth = powerOfTwo(width);
+        int realHeight = powerOfTwo(height);
 
-        while (realWidth < width && realWidth < 1024) {
-            realWidth *= 2;
-        }
-
-        while (realHeight < height && realHeight < 1024) {
-            realHeight *= 2;
+        if (realWidth < width || realHeight < height)
+        {
+            logger->log("Warning: image too large, cropping to %dx%d texture!",
+                    tmpImage->w, tmpImage->h);
         }
 
+        // Make sure the alpha channel is not used, but copied to destination
         SDL_SetAlpha(tmpImage, 0, SDL_ALPHA_OPAQUE);
+
         SDL_Surface *oldImage = tmpImage;
-        tmpImage = SDL_CreateRGBSurface(SDL_SWSURFACE, realWidth, realHeight, 32,
-                rmask, gmask, bmask, amask);
+        tmpImage = SDL_CreateRGBSurface(SDL_SWSURFACE, realWidth, realHeight,
+            32, rmask, gmask, bmask, amask);
 
-        if (tmpImage == NULL) {
+        if (!tmpImage) {
             logger->log("Error, image convert failed: out of memory");
             return NULL;
         }
@@ -189,8 +130,6 @@ Image* Image::load(void *buffer, unsigned int bufferSize,
 
         GLuint texture;
         glGenTextures(1, &texture);
-        logger->log("Binding texture %d (%dx%d)",
-                texture, tmpImage->w, tmpImage->h);
         glBindTexture(GL_TEXTURE_2D, texture);
 
         if (SDL_MUSTLOCK(tmpImage)) {
@@ -246,8 +185,27 @@ Image* Image::load(void *buffer, unsigned int bufferSize,
     }
 #endif
 
-    // Set color key and alpha blending optins, and convert the surface to the
-    // current display format
+    bool hasAlpha = false;
+
+    // Figure out whether the image uses its alpha layer
+    for (int i = 0; i < tmpImage->w * tmpImage->h; ++i)
+    {
+        Uint8 r, g, b, a;
+        SDL_GetRGBA(
+                ((Uint32*) tmpImage->pixels)[i],
+                tmpImage->format,
+                &r, &g, &b, &a);
+
+        if (a != 255)
+        {
+            hasAlpha = true;
+            break;
+        }
+    }
+
+    SDL_Surface *image;
+
+    // Convert the surface to the current display format
     if (hasAlpha) {
         image = SDL_DisplayFormatAlpha(tmpImage);
     }
@@ -256,7 +214,7 @@ Image* Image::load(void *buffer, unsigned int bufferSize,
     }
     SDL_FreeSurface(tmpImage);
 
-    if (image == NULL) {
+    if (!image) {
         logger->log("Error: Image convert failed.");
         return NULL;
     }
@@ -315,10 +273,22 @@ float Image::getAlpha()
 }
 
 #ifdef USE_OPENGL
-void Image::setLoadAsOpenGL(bool useOpenGL)
+void
+Image::setLoadAsOpenGL(bool useOpenGL)
 {
     Image::mUseOpenGL = useOpenGL;
 }
+
+int
+Image::powerOfTwo(int input)
+{
+    int value = 1;
+    while (value < input && value < 1024)
+    {
+        value <<= 1;
+    }
+    return value;
+}
 #endif
 
 //============================================================================
diff --git a/src/resources/image.h b/src/resources/image.h
index 03bf0cbc..cad21dcd 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -126,6 +126,12 @@ class Image : public Resource
 #ifdef USE_OPENGL
         Image(const std::string &idPath, GLuint glimage, int width, int height,
                 int texWidth, int texHeight);
+
+        /**
+         * Returns the first power of two equal or bigger than the input.
+         */
+        static int
+        powerOfTwo(int input);
 #endif
         Image(const std::string &idPath, SDL_Surface *image);
 
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
new file mode 100644
index 00000000..677c024b
--- /dev/null
+++ b/src/resources/imageset.cpp
@@ -0,0 +1,65 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "imageset.h"
+
+#include "../log.h"
+
+#include "image.h"
+
+#include "../utils/dtor.h"
+
+ImageSet::ImageSet(const std::string& idPath,
+                     Image *img,
+                     int width, int height):
+    Resource(idPath)
+{
+    for (int y = 0; y + height <= img->getHeight(); y += height)
+    {
+        for (int x = 0; x + width <= img->getWidth(); x += width)
+        {
+            mImages.push_back(img->getSubImage(x, y, width, height));
+        }
+    }
+    mWidth = width;
+    mHeight = height;
+}
+
+ImageSet::~ImageSet()
+{
+    for_each(mImages.begin(), mImages.end(), make_dtor(mImages));
+}
+
+Image*
+ImageSet::get(size_type i)
+{
+    if (i >= mImages.size())
+    {
+        logger->log("Warning: Sprite #%i does not exist in this image set", i);
+        return NULL;
+    }
+    else
+    {
+        return mImages[i];
+    }
+}
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
new file mode 100644
index 00000000..3469a3bb
--- /dev/null
+++ b/src/resources/imageset.h
@@ -0,0 +1,66 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_IMAGESET_H
+#define _TMW_IMAGESET_H
+
+#include <vector>
+
+#include "resource.h"
+
+class Image;
+
+
+/**
+ * Stores a set of subimages originating from a single image.
+ */
+class ImageSet : public Resource
+{
+    public:
+        /*
+         * Cuts the passed image in a grid of sub images.
+         */
+        ImageSet(const std::string &idPath, Image *img, int w, int h);
+
+        /**
+         * Destructor.
+         */
+        ~ImageSet();
+
+        int getWidth() { return mWidth; };
+
+        int getHeight() { return mHeight; };
+
+        typedef std::vector<Image*>::size_type size_type;
+        Image* get(size_type i);
+
+        size_type size() { return mImages.size(); }
+
+    private:
+        std::vector<Image*> mImages;
+
+        int mHeight; /**< Height of the images in the image set. */
+        int mWidth;  /**< Width of the images in the image set. */
+};
+
+#endif
diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h
index 048638c2..46a33b06 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/monsterdb.h
@@ -39,7 +39,7 @@ namespace MonsterDB
     void
     unload();
 
-    const MonsterInfo& get (int id);
+    const MonsterInfo& get(int id);
 
     typedef std::map<int, MonsterInfo*> MonsterInfos;
     typedef MonsterInfos::iterator MonsterInfoIterator;
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index 413dafa0..05d4c014 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -1,74 +1,83 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: monsterinfo.h 2650 2006-09-03 15:00:47Z b_lindeijer $
- */
-
-#ifndef _TMW_MONSTERINFO_H_
-#define _TMW_MONSTERINFO_H_
-
-#include <map>
-#include <string>
-#include <vector>
-
-
-enum SoundEvent
-{
-    EVENT_HIT,
-    EVENT_MISS,
-    EVENT_HURT,
-    EVENT_DIE
-};
-
-
-class MonsterInfo
-{
-    public:
-        MonsterInfo();
-
-        ~MonsterInfo();
-
-        void
-        setName(std::string name) { mName = name; } ;
-
-        void
-        setSprite(std::string filename) { mSprite = filename; }
-
-        void
-        addSound (SoundEvent event, std::string filename);
-
-        const std::string&
-        getName () const { return mName; };
-
-        const std::string&
-        getSprite () const { return mSprite; };
-
-        std::string
-        getSound (SoundEvent event) const;
-
-    private:
-
-        std::string mName;
-        std::string mSprite;
-
-        std::map<SoundEvent, std::vector<std::string>* > mSounds;
-};
-
-#endif
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: monsterinfo.h 2650 2006-09-03 15:00:47Z b_lindeijer $
+ */
+
+#ifndef _TMW_MONSTERINFO_H_
+#define _TMW_MONSTERINFO_H_
+
+#include <map>
+#include <string>
+#include <vector>
+
+enum SoundEvent
+{
+    EVENT_HIT,
+    EVENT_MISS,
+    EVENT_HURT,
+    EVENT_DIE
+};
+
+/**
+ * Holds information about a certain type of monster. This includes the name
+ * of the monster, the sprite to display and the sounds the monster makes.
+ *
+ * @see MonsterDB
+ */
+class MonsterInfo
+{
+    public:
+        /**
+         * Constructor.
+         */
+        MonsterInfo();
+
+        /**
+         * Destructor.
+         */
+        ~MonsterInfo();
+
+        void
+        setName(std::string name) { mName = name; } ;
+
+        void
+        setSprite(std::string filename) { mSprite = filename; }
+
+        void
+        addSound (SoundEvent event, std::string filename);
+
+        const std::string&
+        getName () const { return mName; };
+
+        const std::string&
+        getSprite () const { return mSprite; };
+
+        std::string
+        getSound (SoundEvent event) const;
+
+    private:
+        std::string mName;
+        std::string mSprite;
+
+        std::map<SoundEvent, std::vector<std::string>* > mSounds;
+};
+
+#endif
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 2059a5c3..448e7f80 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -31,7 +31,7 @@
 #include "image.h"
 #include "music.h"
 #include "soundeffect.h"
-#include "spriteset.h"
+#include "imageset.h"
 #include "spritedef.h"
 
 #include "../log.h"
@@ -46,7 +46,7 @@ ResourceManager::ResourceManager()
 
 ResourceManager::~ResourceManager()
 {
-    // Release any remaining spritedefs first because they depend on spritesets
+    // Release any remaining spritedefs first because they depend on image sets
     ResourceIterator iter = mResources.begin();
     while (iter != mResources.end())
     {
@@ -63,11 +63,11 @@ ResourceManager::~ResourceManager()
         }
     }
 
-    // Release any remaining spritesets first because they depend on images
+    // Release any remaining image sets first because they depend on images
     iter = mResources.begin();
     while (iter != mResources.end())
     {
-        if (dynamic_cast<Spriteset*>(iter->second) != 0)
+        if (dynamic_cast<ImageSet*>(iter->second) != 0)
         {
             cleanUp(iter->second);
             ResourceIterator toErase = iter;
@@ -232,8 +232,8 @@ ResourceManager::getSoundEffect(const std::string &idPath)
     return dynamic_cast<SoundEffect*>(get(SOUND_EFFECT, idPath));
 }
 
-Spriteset*
-ResourceManager::getSpriteset(const std::string &imagePath, int w, int h)
+ImageSet*
+ResourceManager::getImageSet(const std::string &imagePath, int w, int h)
 {
     std::stringstream ss;
     ss << imagePath << "[" << w << "x" << h << "]";
@@ -243,7 +243,7 @@ ResourceManager::getSpriteset(const std::string &imagePath, int w, int h)
 
     if (resIter != mResources.end()) {
         resIter->second->incRef();
-        return dynamic_cast<Spriteset*>(resIter->second);
+        return dynamic_cast<ImageSet*>(resIter->second);
     }
 
     Image *img = getImage(imagePath);
@@ -252,13 +252,13 @@ ResourceManager::getSpriteset(const std::string &imagePath, int w, int h)
         return NULL;
     }
 
-    Spriteset *spriteset = new Spriteset(idPath, img, w, h);
-    spriteset->incRef();
-    mResources[idPath] = spriteset;
+    ImageSet *imageSet = new ImageSet(idPath, img, w, h);
+    imageSet->incRef();
+    mResources[idPath] = imageSet;
 
     img->decRef();
 
-    return spriteset;
+    return imageSet;
 }
 
 SpriteDef*
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index e176e337..db29e6d3 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -33,7 +33,7 @@ class Resource;
 class Image;
 class Music;
 class SoundEffect;
-class Spriteset;
+class ImageSet;
 class SpriteDef;
 
 /**
@@ -143,11 +143,11 @@ class ResourceManager
         getSoundEffect(const std::string &idPath);
 
         /**
-         * Creates a spriteset based on the image referenced by the given
+         * Creates a image set based on the image referenced by the given
          * path and the supplied sprite sizes
          */
-        Spriteset*
-        getSpriteset(const std::string &imagePath, int w, int h);
+        ImageSet*
+        getImageSet(const std::string &imagePath, int w, int h);
 
         /**
          * Creates a sprite definition based on a given path and the supplied
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index feb6f8f8..d29bd847 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -28,7 +28,7 @@
 #include "animation.h"
 #include "action.h"
 #include "resourcemanager.h"
-#include "spriteset.h"
+#include "imageset.h"
 #include "image.h"
 
 #include "../utils/xml.h"
@@ -135,30 +135,30 @@ SpriteDef::loadImageSet(xmlNodePtr node)
     std::string imageSrc = XML::getProperty(node, "src", "");
 
     ResourceManager *resman = ResourceManager::getInstance();
-    Spriteset *spriteset = resman->getSpriteset(imageSrc, width, height);
+    ImageSet *imageSet = resman->getImageSet(imageSrc, width, height);
 
-    if (!spriteset)
+    if (!imageSet)
     {
         logger->error("Couldn't load imageset!");
     }
 
-    mSpritesets[name] = spriteset;
+    mImageSets[name] = imageSet;
 }
 
 void
 SpriteDef::loadAction(xmlNodePtr node, int variant_offset)
 {
     const std::string actionName = XML::getProperty(node, "name", "");
-    const std::string imagesetName = XML::getProperty(node, "imageset", "");
+    const std::string imageSetName = XML::getProperty(node, "imageset", "");
 
-    SpritesetIterator si = mSpritesets.find(imagesetName);
-    if (si == mSpritesets.end())
+    ImageSetIterator si = mImageSets.find(imageSetName);
+    if (si == mImageSets.end())
     {
         logger->log("Warning: imageset \"%s\" not defined in %s",
-                imagesetName.c_str(), getIdPath().c_str());
+                imageSetName.c_str(), getIdPath().c_str());
         return;
     }
-    Spriteset *imageset = si->second;
+    ImageSet *imageSet = si->second;
 
     SpriteAction actionType = makeSpriteAction(actionName);
     if (actionType == ACTION_INVALID)
@@ -183,14 +183,14 @@ SpriteDef::loadAction(xmlNodePtr node, int variant_offset)
     {
         if (xmlStrEqual(animationNode->name, BAD_CAST "animation"))
         {
-            loadAnimation(animationNode, action, imageset, variant_offset);
+            loadAnimation(animationNode, action, imageSet, variant_offset);
         }
     }
 }
 
 void
 SpriteDef::loadAnimation(xmlNodePtr animationNode,
-                         Action *action, Spriteset *imageset,
+                         Action *action, ImageSet *imageSet,
                          int variant_offset)
 {
     std::string directionName =
@@ -215,8 +215,8 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
         int delay = XML::getProperty(frameNode, "delay", 0);
         int offsetX = XML::getProperty(frameNode, "offsetX", 0);
         int offsetY = XML::getProperty(frameNode, "offsetY", 0);
-        offsetY -= imageset->getHeight() - 32;
-        offsetX -= imageset->getWidth() / 2 - 16;
+        offsetY -= imageSet->getHeight() - 32;
+        offsetX -= imageSet->getWidth() / 2 - 16;
 
         if (xmlStrEqual(frameNode->name, BAD_CAST "frame"))
         {
@@ -228,7 +228,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
                 continue;
             }
 
-            Image *img = imageset->get(index + variant_offset);
+            Image *img = imageSet->get(index + variant_offset);
 
             if (!img)
             {
@@ -251,7 +251,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
 
             while (end >= start)
             {
-                Image *img = imageset->get(start + variant_offset);
+                Image *img = imageSet->get(start + variant_offset);
 
                 if (!img)
                 {
@@ -296,8 +296,8 @@ SpriteDef::substituteAction(SpriteAction complete, SpriteAction with)
 
 SpriteDef::~SpriteDef()
 {
-    for (SpritesetIterator i = mSpritesets.begin();
-            i != mSpritesets.end(); ++i)
+    for (ImageSetIterator i = mImageSets.begin();
+            i != mImageSets.end(); ++i)
     {
         i->second->decRef();
     }
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 057129ad..6d335b02 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -32,7 +32,7 @@
 #include <libxml/tree.h>
 
 class Action;
-class Spriteset;
+class ImageSet;
 
 enum SpriteAction
 {
@@ -111,7 +111,7 @@ class SpriteDef : public Resource
          */
         void
         loadAnimation(xmlNodePtr animationNode,
-                      Action *action, Spriteset *imageset,
+                      Action *action, ImageSet *imageSet,
                       int variant_offset);
 
         /**
@@ -140,12 +140,12 @@ class SpriteDef : public Resource
         makeSpriteDirection(const std::string &direction);
 
 
-        typedef std::map<std::string, Spriteset*> Spritesets;
-        typedef Spritesets::iterator SpritesetIterator;
+        typedef std::map<std::string, ImageSet*> ImageSets;
+        typedef ImageSets::iterator ImageSetIterator;
 
         typedef std::map<SpriteAction, Action*> Actions;
 
-        Spritesets mSpritesets;
+        ImageSets mImageSets;
         Actions mActions;
         Action *mAction;
         SpriteDirection mDirection;
diff --git a/src/resources/spriteset.cpp b/src/resources/spriteset.cpp
deleted file mode 100644
index 96bcef0c..00000000
--- a/src/resources/spriteset.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#include "spriteset.h"
-
-#include "../log.h"
-
-#include "image.h"
-
-#include "../utils/dtor.h"
-
-Spriteset::Spriteset(const std::string& idPath,
-                     Image *img,
-                     int width, int height):
-    Resource(idPath)
-{
-    for (int y = 0; y + height <= img->getHeight(); y += height)
-    {
-        for (int x = 0; x + width <= img->getWidth(); x += width)
-        {
-            mSpriteset.push_back(img->getSubImage(x, y, width, height));
-        }
-    }
-    mWidth = width;
-    mHeight = height;
-}
-
-Spriteset::~Spriteset()
-{
-    for_each(mSpriteset.begin(), mSpriteset.end(), make_dtor(mSpriteset));
-}
-
-Image*
-Spriteset::get(size_type i)
-{
-    if (i >= mSpriteset.size())
-    {
-        logger->log("Warning: Sprite #%i does not exist in this spriteset", i);
-        return NULL;
-    }
-    else
-    {
-        return mSpriteset[i];
-    }
-}
diff --git a/src/resources/spriteset.h b/src/resources/spriteset.h
deleted file mode 100644
index 7f6b42df..00000000
--- a/src/resources/spriteset.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#ifndef _TMW_SPRITESET_H
-#define _TMW_SPRITESET_H
-
-#include <vector>
-
-#include "resource.h"
-
-class Image;
-
-
-/**
- * Stores a set of subimages originating from a single image.
- *
- * TODO: Should probably be renamed to ImageSet or TileSet.
- */
-class Spriteset : public Resource
-{
-    public:
-        /*
-         * Cuts the passed image in a grid of sub images.
-         */
-        Spriteset(const std::string &idPath, Image *img, int w, int h);
-
-        /**
-         * Destructor.
-         */
-        ~Spriteset();
-
-        int getWidth() { return mWidth; };
-
-        int getHeight() { return mHeight; };
-
-        typedef std::vector<Image*>::size_type size_type;
-        Image* get(size_type i);
-
-        size_type size() { return mSpriteset.size(); }
-
-    private:
-        // Vector storing the whole spriteset.
-        std::vector<Image*> mSpriteset;
-        // Height and width of the images in the spriteset
-        int mHeight;
-        int mWidth;
-};
-
-#endif
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
new file mode 100644
index 00000000..5fc35bcd
--- /dev/null
+++ b/src/simpleanimation.cpp
@@ -0,0 +1,50 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "simpleanimation.h"
+
+
+void SimpleAnimation::update(unsigned int timePassed)
+{
+    mAnimationTime += timePassed;
+    while (mAnimationTime > mCurrentFrame->delay)
+    {
+        mAnimationTime -= mCurrentFrame->delay;
+        mAnimationPhase++;
+        if (mAnimationPhase >= mAnimation->getLength())
+        {
+            mAnimationPhase = 0;
+        }
+        mCurrentFrame = mAnimation->getFrame(mAnimationPhase);
+    }
+}
+
+Image *SimpleAnimation::getCurrentImage() const
+{
+    return mCurrentFrame->image;
+}
+
+SimpleAnimation::~SimpleAnimation()
+{
+    delete mAnimation;
+}
diff --git a/src/simpleanimation.h b/src/simpleanimation.h
new file mode 100644
index 00000000..a56c31da
--- /dev/null
+++ b/src/simpleanimation.h
@@ -0,0 +1,65 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_SIMPLEANIMAION_H
+#define _TMW_SIMPLEANIMAION_H
+
+#include "resources/animation.h"
+
+class Frame;
+
+/**
+ * This class is a leightweight alternative to the AnimatedSprite class.
+ * It hosts a looping animation without actions and directions.
+ */
+class SimpleAnimation
+{
+    public:
+        SimpleAnimation(Animation *animation):
+            mAnimation(animation),
+            mAnimationTime(0),
+            mAnimationPhase(0),
+            mCurrentFrame(mAnimation->getFrame(0))
+        {};
+
+        ~SimpleAnimation();
+
+        void update(unsigned int timePassed);
+
+        Image *getCurrentImage() const;
+
+    private:
+        /** The hosted animation. */
+        Animation *mAnimation;
+
+        /** Time in game ticks the current frame is shown. */
+        unsigned int mAnimationTime;
+
+        /** Index of current animation frame. */
+        unsigned int mAnimationPhase;
+
+        /** Current animation frame. */
+        Frame *mCurrentFrame;
+};
+
+#endif
diff --git a/src/tileset.h b/src/tileset.h
index 27bc28c3..7521a3e5 100644
--- a/src/tileset.h
+++ b/src/tileset.h
@@ -24,19 +24,19 @@
 #ifndef _TMW_TILESET_H_
 #define _TMW_TILESET_H_
 
-#include "resources/spriteset.h"
+#include "resources/imageset.h"
 
 /**
- * A tileset, which is basically just a spriteset but it stores a firstgid.
+ * A tileset, which is basically just an image set but it stores a firstgid.
  */
-class Tileset : public Spriteset
+class Tileset : public ImageSet
 {
     public:
         /**
          * Constructor.
          */
         Tileset(Image *img, int w, int h, int firstGid):
-            Spriteset("", img, w, h),
+            ImageSet("", img, w, h),
             mFirstGid(firstGid)
         {
         }
diff --git a/src/tmw.rc b/src/tmw.rc
index ee5f99cd..673b2387 100644
--- a/src/tmw.rc
+++ b/src/tmw.rc
@@ -2,7 +2,7 @@
 
 #include "winver.h"
 
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw-icon.ico"
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw.ico"
 
 1 VERSIONINFO
 FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
diff --git a/tmw.cbp b/tmw.cbp
index 96ef5a36..c66a5719 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -1262,6 +1262,16 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
+		<Unit filename="src\resources\imageset.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\resources\imageset.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
 		<Unit filename="src\resources\imagewriter.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
@@ -1392,17 +1402,17 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\resources\spriteset.cpp">
-			<Option compilerVar="CPP"/>
+		<Unit filename="src\serverinfo.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\resources\spriteset.h">
+		<Unit filename="src\simpleanimation.cpp">
 			<Option compilerVar="CPP"/>
-			<Option compile="0"/>
-			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\serverinfo.h">
+		<Unit filename="src\simpleanimation.h">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
 			<Option link="0"/>
-- 
cgit v1.2.3-70-g09d2


From a353543dd4da3c489a84f6f17125fdd0e1be2349 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 4 Jun 2007 21:48:47 +0000
Subject: Merged 0.0 changes from revision 3234 to 3317 to trunk.

---
 ChangeLog                                  | 465 ++++++++++++++++++++++++++++-
 NEWS                                       |  16 +
 README                                     |   3 +-
 data/graphics/gui/CMakeLists.txt           |   8 +-
 data/graphics/gui/Makefile.am              |   6 +
 data/graphics/gui/target-cursor-blue-l.png | Bin 0 -> 23803 bytes
 data/graphics/gui/target-cursor-blue-m.png | Bin 0 -> 18439 bytes
 data/graphics/gui/target-cursor-blue-s.png | Bin 0 -> 8353 bytes
 data/graphics/gui/target-cursor-blue.png   | Bin 8353 -> 0 bytes
 data/graphics/gui/target-cursor-red-l.png  | Bin 0 -> 25586 bytes
 data/graphics/gui/target-cursor-red-m.png  | Bin 0 -> 17950 bytes
 data/graphics/gui/target-cursor-red-s.png  | Bin 0 -> 8361 bytes
 data/graphics/gui/target-cursor-red.png    | Bin 8361 -> 0 bytes
 data/help/changes.txt                      | 147 ++++-----
 data/help/header.txt                       |   2 +-
 docs/Makefile.am                           |   3 +-
 src/CMakeLists.txt                         |  14 +
 src/Makefile.am                            |  16 +-
 src/animatedsprite.cpp                     |  24 ++
 src/animatedsprite.h                       |  12 +
 src/animationparticle.cpp                  |  51 ++++
 src/animationparticle.h                    |  49 +++
 src/being.cpp                              | 122 +++++---
 src/being.h                                |  36 ++-
 src/engine.cpp                             |   7 +
 src/game.cpp                               |  24 +-
 src/graphics.cpp                           |   2 -
 src/gui/buy.cpp                            | 117 +++-----
 src/gui/buy.h                              |   6 +
 src/gui/chat.cpp                           |   4 +-
 src/gui/chat.h                             |   4 +-
 src/gui/debugwindow.cpp                    |  10 +
 src/gui/debugwindow.h                      |   1 +
 src/gui/inventorywindow.cpp                |   7 +-
 src/gui/sell.cpp                           | 159 +++++-----
 src/gui/sell.h                             |   6 +
 src/gui/updatewindow.cpp                   |   7 +-
 src/gui/viewport.cpp                       | 108 ++++---
 src/gui/viewport.h                         |  20 +-
 src/gui/widgets/resizegrip.cpp             |  65 ++++
 src/gui/widgets/resizegrip.h               |  61 ++++
 src/gui/window.cpp                         | 185 ++++++++----
 src/gui/window.h                           |  66 ++--
 src/imageparticle.cpp                      |  69 +++++
 src/imageparticle.h                        |  61 ++++
 src/main.cpp                               |  26 +-
 src/map.cpp                                |  23 ++
 src/map.h                                  |  25 +-
 src/monster.cpp                            |   6 +
 src/monster.h                              |   3 +
 src/net/beinghandler.cpp                   |  17 +-
 src/openglgraphics.cpp                     |  24 +-
 src/particle.cpp                           | 370 +++++++++++++++++++++++
 src/particle.h                             | 288 ++++++++++++++++++
 src/particleemitter.cpp                    | 327 ++++++++++++++++++++
 src/particleemitter.h                      | 120 ++++++++
 src/resources/animation.h                  |   2 +-
 src/resources/image.cpp                    |  25 +-
 src/resources/mapreader.cpp                |  24 ++
 src/resources/monsterdb.cpp                |  21 ++
 src/resources/monsterinfo.h                |  14 +-
 src/simpleanimation.cpp                    |  85 ++++++
 src/simpleanimation.h                      |  15 +-
 src/sprite.h                               |  16 +
 src/textparticle.cpp                       |  64 ++++
 src/textparticle.h                         |  53 ++++
 src/utils/fastsqrt.h                       |  24 ++
 src/utils/minmax.h                         |  47 +++
 src/utils/wingettimeofday.h                | 226 +++++++-------
 src/utils/xml.cpp                          |  23 ++
 src/utils/xml.h                            |  11 +
 71 files changed, 3240 insertions(+), 602 deletions(-)
 create mode 100644 data/graphics/gui/target-cursor-blue-l.png
 create mode 100644 data/graphics/gui/target-cursor-blue-m.png
 create mode 100644 data/graphics/gui/target-cursor-blue-s.png
 delete mode 100644 data/graphics/gui/target-cursor-blue.png
 create mode 100644 data/graphics/gui/target-cursor-red-l.png
 create mode 100644 data/graphics/gui/target-cursor-red-m.png
 create mode 100644 data/graphics/gui/target-cursor-red-s.png
 delete mode 100644 data/graphics/gui/target-cursor-red.png
 create mode 100644 src/animationparticle.cpp
 create mode 100644 src/animationparticle.h
 create mode 100644 src/gui/widgets/resizegrip.cpp
 create mode 100644 src/gui/widgets/resizegrip.h
 create mode 100644 src/imageparticle.cpp
 create mode 100644 src/imageparticle.h
 create mode 100644 src/particle.cpp
 create mode 100644 src/particle.h
 create mode 100644 src/particleemitter.cpp
 create mode 100644 src/particleemitter.h
 create mode 100644 src/textparticle.cpp
 create mode 100644 src/textparticle.h
 create mode 100644 src/utils/fastsqrt.h
 create mode 100644 src/utils/minmax.h

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index 61aef963..63aaa1eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,162 @@
+2007-06-03  David Athay  <ko2fan@gmail.com>
+
+	* src/main.cpp, src/game.cpp: Fixed screenshot taking on OSX.
+
+2007-06-03  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/CMakeLists.txt, src/Makefile.am, docs/Makefile.am: Added some
+	files to be included with the release.
+	* src/utils/fastsqrt.h: Fixed warning about strict-aliasing rules.
+	* src/Makefile.am: Don't die on warnings by default.
+	* src/resources/image.cpp: Fixed image loading in software mode to not
+	check for alpha layer when images aren't 32-bit.
+	* src/graphics.cpp, src/graphics.h, src/imageparticle.cpp: Removed
+	drawImageTransparent from Graphics class, should be set on image.
+	* src/imageparticle.h, src/particleemitter.h, src/particle.h,
+	src/particleemitter.cpp, src/particle.cpp, src/imageparticle.cpp: Have
+	ParticleEmitter load a possible particle image early on and don't
+	cause a crash when the image can't be found.
+
+2007-06-02  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/winver.h, README, NEWS, CMakeLists.txt, configure.ac,
+	data/help/changes.txt, data/help/header.txt: Updated version and
+	release date and summarized changes.
+	* src/gui/chat.h, src/gui/chat.cpp: Changed color of chat messages in
+	OpenGL mode from orange to black.
+	* src/gui/sell.cpp, src/gui/buy.h, src/gui/buy.cpp, src/gui/sell.h:
+	Some cleanup of buy/sell dialog code.
+
+2007-06-01  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* data/graphics/gui/CMakeLists.txt, data/graphics/gui/Makefile.am:
+	Added target cursors to installed files.
+
+2007-05-31  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/maps/new_16-1.tmx.gz: Fixed an inconsistency with the neighbor
+	map (no new walkmap required).
+
+2007-05-23  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/sell.cpp, src/gui/buy.cpp, src/being.cpp: A bunch of
+	lingering syntactical changes.
+	* src/gui/viewport.cpp: Added a missing include and fixed a bug with
+	cleaning up target cursor animations.
+
+2007-05-23  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/gui/viewport.cpp,
+	data/graphics/gui/target-cursor-blue-s.png,
+	data/graphics/gui/target-cursor-blue-m.png,
+	data/graphics/gui/target-cursor-blue-l.png,
+	data/graphics/gui/target-cursor-red-s.png,
+	data/graphics/gui/target-cursor-red-m.png,
+	data/graphics/gui/target-cursor-red-l.png: Replaced target cursor
+	graphics with higher quality ones by Pauan.
+	* src/particle.cpp: Made bouncing particles immune against death by
+	ground contact and removed a nonsensical debugging log message. Made
+	text splash effects fade out.
+	* src/textparticle.cpp: Implemented fading in and out for text
+	particles.
+	* src/being.cpp, src/particle.cpp, src/particle.h,
+	src/textparticle.cpp, src/textparticle.h: The color values of text
+	particles are now stored in 3 integers instead of a Guichan color
+	structure.
+
+2007-05-20  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* tmw.cbp: Updated Code::Blocks project file.
+
+2007-05-20  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/gui/buy.cpp, src/gui/sell.cpp: Unified some differences between
+	buy and sell dialog. Money label now shows money after transaction
+	instead of current money.
+	* src/gui/sell.cpp: Fixed the amount-not-reset-when-using-scrollwheel
+	bug.
+	* src/being.h, src/gui/viewport.cpp, src/gui/viewport.h: Added 3
+	different target cursor sizes.
+	* src/monster.h, src/monster.cpp, src/resources/monsterdb.cpp,
+	scr/resources/monsterinfo.h, data/monsters.xml: Target cursor size for
+	monster is read from the monsters.xml.
+	* data/graphics/gui/target-cursor-blue-s.png,
+	data/graphics/gui/target-cursor-blue-m.png,
+	data/graphics/gui/target-cursor-blue-l.png,
+	data/graphics/gui/target-cursor-red-s.png,
+	data/graphics/gui/target-cursor-red-m.png,
+	data/graphics/gui/target-cursor-red-l.png: Added temporary
+	placeholders for small and large target cursors until better versions
+	based on the original SVG are available.
+
+2007-05-08  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/sprites/monster-bat.png,
+	data/graphics/sprites/monster-bat.xml,
+	data/graphics/sprites/monster-flower.xml,
+	data/graphics/sprites/monster-fluffy.xml,
+	data/graphics/sprites/monster-fluffy.png,
+	data/graphics/sprites/monster-goblin-fire.xml,
+	data/graphics/sprites/monster-maggot-giant.xml,
+	data/graphics/sprites/monster-maggot.xml,
+	data/graphics/sprites/monster-mountsnake.xml,
+	data/graphics/sprites/monster-mushroom-red.xml,
+	data/graphics/sprites/monster-mushroom-spiky.xml,
+	data/graphics/sprites/monster-pinkie.xml,
+	data/graphics/sprites/monster-scorpion-black.xml,
+	data/graphics/sprites/monster-scorpion-red.png,
+	data/graphics/sprites/monster-scorpion-red.xml,
+	data/graphics/sprites/monster-skull-poison.xml,
+	data/graphics/sprites/monster-slime-green.xml,
+	data/graphics/sprites/monster-slime-red.xml,
+	data/graphics/sprites/monster-slime-rudolph.xml,
+	data/graphics/sprites/monster-slime-santa.png,
+	data/graphics/sprites/monster-slime-santa.xml,
+	data/graphics/sprites/monster-slime-yellow.xml,
+	data/graphics/sprites/monster-snake-cave.png,
+	data/graphics/sprites/monster-snake-cave.xml,
+	data/graphics/sprites/monster-snake.xml,
+	data/graphics/sprites/monster-spider.xml:
+	Adjusted offsets of monster sprites (thanks to Pauan for finding out
+	the correct offsets - I just subtracted 6 of all x offsets to take the
+	new position of the target circle in account) and committed some
+	modifications at some monster graphics by Pauan.
+
+2007-05-02  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/sprite.h, src/being.cpp, src/being.h, src/animatedsprite.cpp,
+	src/animatedsprite.h: Added methods to get the width and height of the
+	graphical representation of a sprite.
+	* src/gui/viewport.cpp: Fixed positioning of monster names and target
+	circles.
+
+2007-05-02  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp: Fixed a compiler warning.
+
+2007-05-02  Björn Steinbrink  <B.Steinbrink@gmx.de>
+
+	* src/Makefile.am: Add the new particle subclasses to the automake
+	configuration.
+	* src/imageparticle.h, src/textparticle.h, src/particle.h,
+	src/animationparticle.h, src/CMakeLists.txt, src/particleemitter.cpp,
+	src/animationparticle.cpp, src/particle.cpp, src/imageparticle.cpp,
+	src/textparticle.cpp, src/utils/xml.cpp, src/utils/xml.h: Split the
+	particle class into subclasses based on their appearance.
+
+2007-04-24  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp, src/particle.h: Some minor code cleanups, speed
+	optimizations and a bit of documentation.
+
+2007-04-23  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/particles/flame.particle.xml,
+	data/graphics/particles/blaze.png: Added two files I forgot with the
+	last commit.
+	* src/resources/mapreader.cpp, src/particle.cpp,
+	src/particleemitter.cpp: Using XML child node iteration macro.
+
 2007-04-22  Björn Steinbrink  <B.Steinbrink@gmx.de>
 
 	* CMake/Modules/FindENet.cmake: Fixed ENet status always being set to
@@ -10,11 +169,74 @@
 	* src/resources/itemdb.cpp: Made the parameter checks more terse and
 	manageable.
 
+2007-04-19  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/resources/mapreader.cpp: Emitter positions are now read from map
+	files.
+	* src/engine.cpp: Removed the player follow effect used for testing.
+	* data/maps/new_4-1.tmx.gz, data/maps/new_5-1.tmx.gz: Added flame
+	effect to all lamps on the cave maps
+	* data/maps/new_9-1.tmx.gz: Added waterfall effect to the upper right
+	corner of NW woodland map.
+
+2007-04-15  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/openglgraphics.cpp: Rely on default 0 value for z axis.
+	* src/CMakeLists.txt, src/gui/window.cpp, src/gui/widgets,
+	src/gui/widgets/resizegrip.cpp, src/gui/widgets/resizegrip.h,
+	src/gui/inventorywindow.cpp, src/gui/window.h, src/Makefile.am:
+	Reimplemented window resizing. It is now once again possible to resize
+	windows using their borders (except for the top one, since that's the
+	title bar for Guichan) and the resize grip in the bottom right is much
+	easier to grab.
+	* src/gui/window.cpp: Increased minimum window height and fixed a
+	problem with setting window content size which was introduced with the
+	new resize grip.
+
 2007-04-13  Björn Steinbrink  <B.Steinbrink@gmx.de>
 
 	* data/graphics/gui/CMakeLists.txt: Added target cursor graphics to
 	the set of files to be installed.
 
+2007-04-05  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* src/main.cpp:  Unified storage of configuration, updates and
+	screenshots in home directory.
+
+2007-04-03  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/items/generic-easteregg-blue.png,
+	data/graphics/items/generic-easteregg-green.png,
+	data/graphics/items/generic-easteregg-pink.png,
+	data/graphics/items/generic-easteregg-red.png,
+	data/graphics/items/generic-easteregg-teal.png,
+	data/graphics/items/generic-easteregg-yellow.png,
+	data/items.xml: Added six different easter egg item graphics for the
+	easter event. Item IDs are 1208 - 1213.
+	* data/graphics/sprites/npcs.png: Added bunny girl npc for the easter
+	event.
+
+2007-04-01  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/game.cpp: Screenshots are no longer saved directly in the users
+	home directory on UNIX systems but in the sub folder /.tmw/. A chatlog
+	message about the success of the screenshot saving does appear now.
+	Based on a patch by Patrick "the-me" Matthäi.
+
+2007-03-27  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/main.cpp: Icon loading doesn't necessarily succeed, so better
+	not crash when it doesn't.
+
+2007-03-25  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h: Improved programming style and documentation
+	and added some small tweaks.
+	* src/engine.cpp, src/map.cpp, src/map.h, src/resources/mapreader.cpp:
+	Prepared getting the emitter positions from the map file by storing
+	them in the Map class and setting them up from the MapReader.
+
 2007-03-24  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/main.cpp: Changed the order of network message handling and
@@ -49,6 +271,16 @@
 	src/net/charserverhandler.h, src/net/charserverhandler.cpp: Made sure
 	the character creation dialog doesn't close when creation failed.
 
+2007-03-22  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/simpleanimation.cpp, src/simpleanimation.h: Added new
+	constructor for simple animation that allows to build the animation
+	based on an xmlNodePtr pointing to an <animation> node.
+	* src/particle.cpp, src/particle.h: Added support for <image> and
+	<animation> childtags for effect root particles.
+	* data/graphics/particles/playerglow.particle.xml: New player follow
+	effect that demonstrates an animated root particle with an emitter.
+
 2007-03-22  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/gui/login.cpp, src/gui/login.h, src/gui/register.h,
@@ -84,6 +316,11 @@
 	src/resources/resourcemanager.cpp, src/resources/spriteset.cpp,
 	src/resources/spritedef.h: Renamed Spriteset to ImageSet.
 
+2007-03-20  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/gui/updatewindow.cpp: Cancel button is now disabled after
+	downloading is finished.
+
 2007-03-20  David Athay  <ko2fan@gmail.com>
 
 	* src/gui/viewport.cpp: Fixed target cursor animation, and changed
@@ -160,6 +397,8 @@
 	* src/simpleanimation.cpp, src/simpleanimation.h, src/CmakeLists.txt,
 	src/Makefile.am: Added a simple animation class that hosts a looping
 	animation without the action and direction stuff from AnimatedSprite.
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp: Used said
+	simple animation class for animated particles.
 
 2007-03-12  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
@@ -171,6 +410,14 @@
 	* src/map.cpp, src/gui/viewport.cpp: Fixed a bug that made the engine
 	not draw the last row and column of the map.
 
+2007-03-09  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp: Reimplemented physics mode that uses the default
+	square root function as fallback for systems where the fastInvSqrt
+	function doesn't work properly.
+	* src/particle.cpp, src/particle.h: Some performance optimizations
+	suggested by Rogier "Avaniel" Polak.
+
 2007-03-09  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* data/graphics/gui/target-cursor-blue.png,
@@ -221,6 +468,10 @@
 	data/sfx/pinkie-hit1.ogg, data/sfx/pinkie-miss1.ogg,
 	data/monsters.xml: New sound effects by Cosmostrator.
 
+2007-02-25 Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.h, src/particleemitter.h: Just some documentation work.
+
 2007-02-25  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/CMakeLists.txt: Updated CMake file.
@@ -247,6 +498,12 @@
 	size and data type.
 	* src/logindata.h: Added a clear function.
 
+2007-02-22  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h: Added new particle property "bounce" that makes
+	particles bounce off the ground and use it with the damage numbers.
+
 2007-02-21  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/gui/char-server.cpp, src/gui/updatewindow.cpp, src/gui/main.cpp,
@@ -286,6 +543,16 @@
 	* src/winver.h, README, configure.ac, data/help/header.txt, NEWS,
 	CMakeLists.txt: Changed version to 0.0.22.2.
 
+2007-02-15  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/engine.cpp: The name conflict problem with Guichan seems to be
+	solved with version 0.6.1.
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h: Added support for animated particles.
+	* data/graphics/particles/playerglow.particle.xml: Created a new
+	player follow particle that spawns a swarm of animated bats that
+	follow the player.
+
 2007-02-13  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/gui/register.cpp, src/logindata.h, src/main.cpp: Fixed the _M/_F
@@ -306,8 +573,36 @@
 
 2007-02-10  Philipp Sehmisch  <tmw@crushnet.org>
 
-	* src/gui/viewport.cpp: Fixed the bug in the scrolling limitation that made
-	it possible to scroll outside of the map in the south and east.
+	* src/gui/viewport.cpp: Fixed the bug in the scrolling limitation that
+	made it possible to scroll outside of the map in the south and east.
+
+2007-02-09  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp: Fixed a misspelled include and another
+	optimisation at the vector calculation.
+
+2007-02-08  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp, src/utils/fastsqrt.h: Added a faster function to
+	calculate square roots and using it for hypotenuse calculations.
+	Thanks to Rogier aka Avaniel for finding the function.
+
+2007-02-07  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp: Renamed
+	Particle::MAX_PARTICLES to Particle::maxCount and read the value from
+	config ("particleMaxCount")
+	* src/particle.cpp: Added fast physics mode that replaces the
+	trigonometric calculations made for calculating the acceleration by
+	much less cpu intense but also less accurate formulas. To enable it
+	set the config option "particleFastPhysics" to "1".
+	* src/particle.cpp: Added the config option "particleEmitterSkip" that
+	allows to reduces the output of the emitters by making them spawn
+	particles only every n-th game tick.
+	* src/graphics.cpp, src/graphics.h: Added a new method
+	"drawImageTransparent" to the graphic engine that blits an image with
+	an alpha factor.
+	* src/particle.cpp: Using new drawImageTransparent method.
 
 2007-02-04  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
@@ -357,6 +652,35 @@
 	Defence: 12, Weight: 120.
 	* data/graphics/sprites/chest-cotton-female.png: Huh? Shouldn't this
 	be on svn for ages?
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h: Implemented die-distance (particles are deleted
+	when they reached a certain proximity to their target)
+	* src/particle.cpp: Fixed a bug in the acceleration vector calculation.
+	* src/particle.cpp, src/particle.h: Fixed a problem with particles with
+	unlimited lifetime and fade-in.
+	* data/graphics/particles/playerglow.particle.xml: And again a new
+	player follow particle. This time it demonstrates die-distance and the
+	fixed acceleration vector calculation.
+	* src/engine.cpp, data/graphics/particles/snow.particle.xml,
+	data/graphics/particles/snowflake.png: I can't stand the begging
+	anymore. Now it snows in the snow area... and the forest... and the
+	desert... and under the earth... and indoors... Are you happy now,
+	Rotonen and Elven? ;-)
+	* src/particle.cpp: Removed some debug log messages.
+	* src/being.cpp: Avoided crash when attempting to control an invalid
+	particle.
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h: Cleaned the includes up.
+
+2007-01-31  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h: Changed some variable names.
+	* data/graphics/particles/waterfall.particle.xml,
+	data/graphics/particles/waterfall-a.png: New waterfall with Modanungs
+	waterfall particle.
+	* src/particle.cpp: forgot to remove a svn conflict marker and changed
+	the order of initialisations to fix some compiler warnings.
 
 2007-01-30  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
@@ -373,6 +697,54 @@
 	src/resources/mapreader.h, src/resources/music.h: Some trivial
 	documentation work. Fixes all Doxygen warnings.
 
+2007-01-30  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/net/beinghandler.cpp,
+	data/graphics/particles/skillup.particle.xml: Added different particle
+	effect for job levelup.
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h: Renamed "alphafade" to "fade-out", added new
+	property "fade-in".
+	* data/graphics/particles/playerglow.particle.xml: Added a new player
+	effect (a fire) demonstrating how to use fade-in and fade-out to fade
+	one color into another.
+
+2007-01-29  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h: Added a new particle property "alphafade" that
+	makes the particles fade into alpha before their lifetime ends.
+	* src/particle.cpp, src/particle.h: fixed an issue with particles that
+	have a lifetime of 0 and an issue with the momentum property.
+	* data/graphics/particles/waterfall.particle.xml,
+	data/graphics/particles/fog-medium-white-a.png,
+	data/graphics/particles/fog-medium-white-b.png,
+	data/graphics/particles/fog-medium-white-c.png: Added fog to the
+	waterfall effect demonstrating the new alphafade feature.
+
+2007-01-28  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/utils/xml.cpp, src/utils/xml.h, src/particleemitter.cpp: Most
+	values are now read as floating point values from the emitter files.
+	* data/graphics/particles/fountain.particle.xml,
+	data/graphics/particles/hit.particle.xml,
+	data/graphics/particles/playerglow.particle.xml: Changed some values
+	as floating point values. Made the player follow effect magenta to
+	improve the visibility of the hit effects.
+	* src/engine.cpp, data/graphics/particles/waterfall.particle.xml:
+	Removed the fountain and added a waterfall instead.
+	* src/particle.h: Corrected the drawing order of the particles in
+	relation to the other sprites.
+	* src/gui/debugwindow.cpp, src/gui/debugwindow.h: Added particle count
+	to debug window.
+	* src/particle.cpp: Allowed momentum without acceleration and
+	implement the acceleration properly.
+	* src/utils/minmax.h, src/particleemitter.cpp, src/particleemitter.h:
+	Added a structure to hold a pair of numeric minimum and maximum values
+	and used it to store all numeric emitter properties.
+	* src/utils/randbetween.h: Removed (the functionality is now in struct
+	MinMax)
+
 2007-01-28  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/gui/char_select.h, src/net/messagein.h,
@@ -383,6 +755,39 @@
 	* data/maps/new_8-1.tmx.gz, data/maps/new_11-1.tmx.gz: Map fixes by
 	Pauan.
 
+2007-01-27  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/shoplistbox.cpp: Fixed compilation against Guichan 0.6.1.
+	* src/utils/randbetween.h: Fixed integer overflow causing the
+	randBetween function not to work properly on Linux.
+
+2007-01-27  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/net/beinghandler.cpp: Fixed a compiler issue.
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h, src/engine.cpp: Emitter data is read from
+	external xml files. Reimplemented target-based particles with the
+	difference that they don't target beings or locations but other
+	particles (at the moment the host particle of the effect).
+	* src/being.cpp: Beings now move controlled particles to their center
+	instead of their upper left corner.
+	* data/graphics/particles/orb*: Added a bunch of new particles.
+	* data/graphics/particles/fountain.particle.xml: Reimplementation of
+	the fountain effect in XML.
+	* data/graphics/particles/playerglow.particle.xml: New effect that
+	spawns orbs that orbit around the origin.
+	* src/being.cpp, data/graphics/particles/hit.particle.xml: Added
+	particle effect on hit.
+	* src/net/beinghandler.cpp,
+	data/graphics/particles/levelup.particle.xml: Added particle effect on
+	levelup (own or other player).
+
+2007-01-24  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp: Initialized all variables of the particles in the
+	constructor.
+	* src/particleemitter.cpp, src/particleemitter.h: minor cleanups.
+
 2007-01-23  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/gui/shoplistbox.cpp, docs/INSTALL/win32.txt, INSTALL, NEWS:
@@ -393,6 +798,39 @@
 	* src/gui/updatewindow.cpp: Identify ourselves when requesting files
 	from the update server.
 
+2007-01-22  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/being.cpp, src/being.h, src/particle.cpp, src/particle.h
+	src/particleemitter.cpp, src/particleemitter.h, src/engine.cpp:
+	Particle effects are now created in child particles of the root
+	particle. Particle emitters have no longer a being they check every
+	frame. Instead beings have the ability to take control of particles.
+
+2007-01-19  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h: Implemented emitters that follow a being.
+	* src/engine.cpp: Added an emitter that follows the local player.
+	* src/particle.cpp: Fixed the crash on exit (reason was that the
+	mSpriteIterator wasn't initialized in every case)
+
+2007-01-18  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/properties.h, src/being.cpp, src/beingmanager.h, src/sound.h,
+	src/gui/window.h, src/sound.cpp, src/main.h, src/being.h,
+	src/resources/soundeffect.h, src/resources/image.h,
+	src/resources/mapreader.h, src/resources/music.h: Some trivial
+	documentation work. Fixes all Doxygen warnings.
+	* src/particle.h, src/particle.cpp, src/CMakeLists.txt,
+	src/Makefile.am: Fixed compilation issues on Linux.
+	* src/gui/char_select.h, src/net/messagein.h,
+	src/net/messagehandler.h, src/net/network.h, src/net/connection.h,
+	src/net/messageout.h, src/utils/xml.h, src/main.h,
+	src/resources/monsterdb.h, src/resources/itemdb.h,
+	src/resources/equipmentdb.h: Some work on documentation.
+	* data/maps/new_8-1.tmx.gz, data/maps/new_11-1.tmx.gz: Map fixes by
+	Pauan.
+
 2007-01-17  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
 	* docs/win32-release.txt, src/gui/register.cpp, src/main.cpp: Changed
@@ -408,6 +846,12 @@
 
 	* data/help/header.txt, NEWS, README: Updated release date.
 
+2007-01-15  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/game.cpp, src/particle.cpp, src/particle.h,
+	src/particleemitter.h: Made the particle count global and more
+	performant.
+
 2007-01-14  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
 	* src/gui/updatewindow.cpp, src/main.cpp, tmw.cbp: Fixed windows
@@ -448,6 +892,17 @@
 	* src/winver.h, configure.ac, data/help/header.txt, NEWS, README,
 	CMakeLists.txt: Updated version to 0.0.22.1.
 
+2007-01-14  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp, src/particle.h; src/particleemitter.cpp,
+	src/particleemitter.h, src/utils/randbetween.h:
+	Implemented particle engine.
+	* src/engine.cpp, src/game.cpp: added calls to the particle engine
+	* data/graphics/particles/*: added a bunch of particle graphics for
+	testing purpose.
+	* particleengine-todo.txt: Added particle engine todo list (please
+	omit when merging)
+
 2007-01-13  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* data/graphics/sprites/Makefile.am,
@@ -1298,7 +1753,7 @@
 2006-10-12  Yohann Ferreira  <bertram@cegetel.net>
 
 	* debian/rules, debian/tmw-data.install, debian/tmw-data.dirs,
-	debian/tmw-music.install, debian/changelog: Updating debian files for
+	debian/tmw-music.install, debian/changelog: Updating Debian files for
 	bug fixing.
 
 2006-10-12  Frode Lindeijer  <f.lindeijer@gmail.com>
@@ -1473,7 +1928,7 @@
 	* src/animation.h, src/animatedsprite.h,
 	data/graphics/sprites/weapon.xml: Some modifications at the animation
 	system. No more "undefined action foo" warnings in the tmw.log. Not
-	visible actions must now be declared explicitely.
+	visible actions must now be declared explicitly.
 	* data/graphics/images/ambient/sandstorm.png,
 	data/graphics/images/ambient/clouds.png: Improved quality of the overlay
 	graphics.
@@ -1892,7 +2347,7 @@
 	with more distinctive names. (no, i won't list all 114)
 	* src/itemmanager.cpp, data/items.xml: Replaced indices on the item
 	spriteset with filenames. added names and descriptions for all missing
-	items. Changed names and dascriptions of some items.
+	items. Changed names and descriptions of some items.
 	* src/engine.cpp: Removed global item spriteset.
 	* src/floor_item.cpp, src/floor_item.h, src/iteminfo.cpp,
 	src/iteminfo.h, src/equipmentwindow.cpp, src/equipmentwindow.h,
diff --git a/NEWS b/NEWS
index 5281cf78..9529ae1b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+0.0.23 (3 June 2007)
+- Added a particle engine along with some particle effects
+- Added a cursor to indicate targeted enemy
+- Added new program icon
+- Added a man page for UNIX like systems
+- Added the --version command line parameter
+- Improved MacOS X release
+- Screenshots are now saved in the .tmw directory on UNIX like systems
+- Magic pink is no longer used for transparency (fixes issues with that on Mac)
+- Fixed difficulties with resizing windows
+- Fixed misleading error message when connecting fails
+- Fixed wrong error message when account name already exists
+- Fixed crash when deleting a character
+- Fixed error message when creating a new character fails
+- Fixed updating problem when using scrollwheel to change shop selection
+
 0.0.22.2 (17 February 2007)
 - Updated to work with Guichan 0.6.1
 - Changed to new default server (server.themanaworld.org)
diff --git a/README b/README
index 2d6f07b1..39677e1e 100644
--- a/README
+++ b/README
@@ -1,8 +1,7 @@
 THE MANA WORLD
 ==============
 
- Version: 0.0.22.2    Date: 17/02/2007
-
+ Version: 0.1.0       Date: XX/XX/2007
 
  Development team:
   - See AUTHORS file for a list
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 1549b2b4..5a02d7f1 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -30,8 +30,12 @@ SET (FILES
     sansserif8.png
     selection.png
     slider.png
-    target-cursor-blue.png
-    target-cursor-red.png
+    target-cursor-blue-l.png
+    target-cursor-blue-m.png
+    target-cursor-blue-s.png
+    target-cursor-red-l.png
+    target-cursor-red-m.png
+    target-cursor-red-s.png
     thickborder.png
     vscroll_blue.png
     vscroll_down_default.png
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index c0e0655b..a37e1196 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -33,6 +33,12 @@ gui_DATA =				\
 	sansserif8.png			\
 	selection.png			\
 	slider.png			\
+	target-cursor-blue-l.png	\
+	target-cursor-blue-m.png	\
+	target-cursor-blue-s.png	\
+	target-cursor-red-l.png		\
+	target-cursor-red-m.png		\
+	target-cursor-red-s.png		\
 	thickborder.png			\
 	vscroll_blue.png		\
 	vscroll_down_default.png	\
diff --git a/data/graphics/gui/target-cursor-blue-l.png b/data/graphics/gui/target-cursor-blue-l.png
new file mode 100644
index 00000000..77cdf4b6
Binary files /dev/null and b/data/graphics/gui/target-cursor-blue-l.png differ
diff --git a/data/graphics/gui/target-cursor-blue-m.png b/data/graphics/gui/target-cursor-blue-m.png
new file mode 100644
index 00000000..c0107357
Binary files /dev/null and b/data/graphics/gui/target-cursor-blue-m.png differ
diff --git a/data/graphics/gui/target-cursor-blue-s.png b/data/graphics/gui/target-cursor-blue-s.png
new file mode 100644
index 00000000..3e81c75d
Binary files /dev/null and b/data/graphics/gui/target-cursor-blue-s.png differ
diff --git a/data/graphics/gui/target-cursor-blue.png b/data/graphics/gui/target-cursor-blue.png
deleted file mode 100644
index 3e81c75d..00000000
Binary files a/data/graphics/gui/target-cursor-blue.png and /dev/null differ
diff --git a/data/graphics/gui/target-cursor-red-l.png b/data/graphics/gui/target-cursor-red-l.png
new file mode 100644
index 00000000..76d2101b
Binary files /dev/null and b/data/graphics/gui/target-cursor-red-l.png differ
diff --git a/data/graphics/gui/target-cursor-red-m.png b/data/graphics/gui/target-cursor-red-m.png
new file mode 100644
index 00000000..e2ab79c2
Binary files /dev/null and b/data/graphics/gui/target-cursor-red-m.png differ
diff --git a/data/graphics/gui/target-cursor-red-s.png b/data/graphics/gui/target-cursor-red-s.png
new file mode 100644
index 00000000..09195f44
Binary files /dev/null and b/data/graphics/gui/target-cursor-red-s.png differ
diff --git a/data/graphics/gui/target-cursor-red.png b/data/graphics/gui/target-cursor-red.png
deleted file mode 100644
index 09195f44..00000000
Binary files a/data/graphics/gui/target-cursor-red.png and /dev/null differ
diff --git a/data/help/changes.txt b/data/help/changes.txt
index f8a3eb67..dd062e49 100644
--- a/data/help/changes.txt
+++ b/data/help/changes.txt
@@ -3,99 +3,56 @@
  
 ##3                         === RECENT CHANGES ===
  
- 0.0.21 (17 September 2006)
- - Added item pickup messages to the chat dialog
- - Added XP bar to ministatus in the top left
- - Added configurable smooth and lazy scrolling
- - Added option to turn off the joystick
- - Added --playername option for automatic character picking
- - Added --configfile option for specifying which configuration file to use
- - Added shortcut and middle mouse button for targetting nearest monster
- - Added support for map effect overlays
- - Fixed FPS limiter
- - Fixed updating system on Windows
- - Fixed player animations going out of sync on changing equipment or hairstyle
- - Fixed SDL_image configure check on some systems by first checking for libpng
- - Fixed big memory leak when using OpenGL
- - Updated to work with Guichan 0.5.0 (older versions no longer supported)
- 
- 0.0.20 (24 July 2006)
- - Added new hairstyle, and some fixes to the old ones
- - Added slider to set FPS limit
- - Added visible equipments
- - Added new maps and monsters
- - Added female characters
- - Implemented a new animation system
- - Updated the updating system
- - Reduced size of textures to stay within the limits of some OpenGL drivers
- - Fixed connection not being shut down completely in case of an error
- - Fixed min size of a window when resizing
- - Fixed some maps issues
- - Some fixes to monsters and player graphics
- - Minor bug fixes and lots of code cleanups
- 
- 0.0.19 (6 March 2006)
- 
- - Added --username, --password and --defaults command line options
- - Improved login sequence
- - Enabled 3 slots to create players
- - Improved setup window and added a joystick calibration tool
- - Some maps fixes
- - Reorganized and improved network code
- - Fixed some bugs
- - Made the player walk to items prior to picking them up
- - Added new playerset
- - Lots of cleanups and code re-roganization
- 
- 0.0.18.1 (30 December 2005)
- 
- - Fixed a drawing glitch with high tiles at the bottom of the screen
- - Fixed glitches caused by fading out the damage display
- 
- 0.0.18 (20 December 2005)
- 
- - Added new items, npcs, tilesets, maps and monsters
- - Non blocking connection at startup
- - Enabled monster emotions
- - Client version is now displayed during login
- - Fixed setup window behaviour
- - Fixed a Windows crash issue
- - Fixed ScrollArea and BrowserBox behaviour
- - Code cleanups
- 
- 0.0.17 (10 October 2005)
- 
- - Added remembering of window position and sizes
- - Added taking screenshot with Alt+P
- - Added notice about the player being overweight
- - Added time to chat messages
- - Added messagebox on error for MacOS X
- - Added new network layer based on SDL_net
- - Added proper error message for when the map server goes offline
- - Added more international characters to fixed and rpg fonts
- - Improved damage text font, shadow is now translucent
- - Improved GUI layout, new profile window
- - Improved support for building on FreeBSD and MacOS X
- - Improved tile engine to fix graphics glitches and make mapping easier
- - Rearranged keyboard shortcuts
- - Fixed items on map to be removed on map switch
- - Fixed OpenGL checkbox in the setup window to be usable
- - Cleaned up a lot of code
- 
- 0.0.16 (04 September 2005)
-
- - Added inn and casino
- - Improved status window
- - Improved OpenGL support
- - Removed lot of bugs
- - Code cleanups
- 
- 0.0.15 (31 July 2005)
-
- - Added dynamic updating of client data
- - Added much better font for chat and names
- - Added option not to use the custom mouse cursor
- - Added joystick support
- - Improved mouse attack by not walking while pressing shift
- - Fixed items being shown as equipped in inventory although they are not
+ 0.0.23 (3 June 2007)
+ - Added a particle engine along with some particle effects
+ - Added a cursor to indicate targeted enemy
+ - Added new program icon
+ - Added a man page for UNIX like systems
+ - Added the --version command line parameter
+ - Improved MacOS X release
+ - Screenshots are now saved in the .tmw directory on UNIX like systems
+ - Magic pink is no longer used for transparency (fixes issues with that on Mac)
+ - Fixed difficulties with resizing windows
+ - Fixed misleading error message when connecting fails
+ - Fixed wrong error message when account name already exists
+ - Fixed crash when deleting a character
+ - Fixed error message when creating a new character fails
+ - Fixed updating problem when using scrollwheel to change shop selection
+ 
+ 0.0.22.2 (17 February 2007)
+ - Updated to work with Guichan 0.6.1
+ - Changed to new default server (server.themanaworld.org)
+ - Changed custom mouse cursor
+ - Fixed the issue where _M or _F is appended to the username
+ - Fixed problem with Cancel button in update dialog
+ 
+ 0.0.22.1 (15 January 2007)
+ - Updated to work with Guichan 0.6.0 (older versions no longer supported)
+ - Fixed mouse coordinates in debug window
+ - Fixed clicking on GUI to cause the player to start walking sometimes
+ 
+ 0.0.22 (24 December 2006)
+ - Added support for female-specific equipment graphics
+ - Added support for monster sounds
+ - Added item icons to buy/sell dialogs
+ - Enhanced character select dialog to show equipment
+ - Changed to new update host (http://updates.themanaworld.org)
+ - Worked around a Guichan exception thrown for mice with many buttons
+ - Changed mouse walk to keep following mouse while button is held down
+ - Extended font support for å and Å
+ - Disabled RLE compression on all surfaces in software mode
+ - Fixed joystick setting not to show disabled when it's actually enabled
+ - Fixed money field to no longer hide below the bottom of the window
+ - Fixed pathfinding to allow walking through beings when they block your path
+ - Fixed an issue with NPC dialogs staying open after player respawn
+ 
+ 0.0.21.1 (30 October 2006)
+ - Reload wallpaper after loading updates
+ - Added support for gzip compressed map layer data
+ - Added support for building with CMake
+ - Added slider to setup dialog for configuring overlay effect
+ - Fixed excessive unnecessary reloading of sprites
+ - Fixed problem with OpenGL related redefinition
+ - Fixed problems with hiding windows using h
+ - Fixed trade window positioning
  
diff --git a/data/help/header.txt b/data/help/header.txt
index 7311c111..b10ed991 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -2,7 +2,7 @@
 ##1               T  H  E      M  A  N  A      W  O  R  L  D
 ##1               ==========================================
  
-           ##2Version:##6 0.0.22.2                ##2Date:##317 February 2007
+           ##2Version:##6 0.0.23                ##2Date:##33 June 2007
  
 ##2                    Website: http://themanaworld.org
  
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 8b57d5bb..1ee9a9a6 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,6 +1,7 @@
 man6_MANS = tmw.6
 
-EXTRA_DIST = packages.txt \
+EXTRA_DIST = $(man6_MANS) \
+	     packages.txt \
 	     FAQ.txt \
 	     HACKING.txt \
 	     SOURCE/tmwdox.sh \
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e28e235e..7a4da70d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,6 +47,8 @@ MARK_AS_ADVANCED(SDL_INCLUDE_DIR)
 MARK_AS_ADVANCED(SDL_LIBRARY)
 
 SET(SRCS
+    gui/widgets/resizegrip.cpp
+    gui/widgets/resizegrip.h
     gui/box.cpp
     gui/box.h
     gui/browserbox.cpp
@@ -275,11 +277,15 @@ SET(SRCS
     utils/base64.cpp
     utils/base64.h
     utils/dtor.h
+    utils/fastsqrt.h
+    utils/minmax.h
     utils/tostring.h
     utils/xml.cpp
     utils/xml.h
     animatedsprite.cpp
     animatedsprite.h
+    animationparticle.cpp
+    animationparticle.h
     being.cpp
     being.h
     beingmanager.cpp
@@ -304,6 +310,8 @@ SET(SRCS
     graphics.cpp
     graphics.h
     guichanfwd.h
+    imageparticle.cpp
+    imageparticle.h
     inventory.cpp
     inventory.h
     item.cpp
@@ -326,6 +334,10 @@ SET(SRCS
     npc.h
     openglgraphics.cpp
     openglgraphics.h
+    particle.cpp
+    particle.h
+    particleemitter.cpp
+    particleemitter.h
     player.cpp
     player.h
     properties.h
@@ -335,6 +347,8 @@ SET(SRCS
     sound.cpp
     sound.h
     sprite.h
+    textparticle.cpp
+    textparticle.h
     tileset.h
     )
 
diff --git a/src/Makefile.am b/src/Makefile.am
index f1f51b79..92c1b1b2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 bin_PROGRAMS = tmw
 tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/widgets/dropdown.h \
+	      gui/widgets/resizegrip.cpp \
+	      gui/widgets/resizegrip.h \
 	      gui/browserbox.cpp \
 	      gui/browserbox.h \
 	      gui/buddywindow.cpp \
@@ -229,11 +231,15 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      utils/base64.cpp \
 	      utils/base64.h \
 	      utils/dtor.h \
+	      utils/fastsqrt.h \
+	      utils/minmax.h \
 	      utils/tostring.h \
 	      utils/xml.cpp \
 	      utils/xml.h \
 	      animatedsprite.cpp \
 	      animatedsprite.h \
+	      animationparticle.cpp \
+	      animationparticle.h \
 	      being.cpp \
 	      being.h \
 	      beingmanager.cpp \
@@ -258,6 +264,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      graphics.cpp \
 	      graphics.h \
 	      guichanfwd.h \
+	      imageparticle.cpp \
+	      imageparticle.h \
 	      inventory.cpp \
 	      inventory.h \
 	      item.cpp \
@@ -280,15 +288,21 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      npc.h \
 	      openglgraphics.cpp\
 	      openglgraphics.h \
+	      particle.cpp \
+	      particle.h \
+	      particleemitter.cpp \
+	      particleemitter.h \
 	      player.cpp \
 	      player.h \
 	      properties.h \
 	      serverinfo.h \
 	      simpleanimation.cpp \
-  	      simpleanimation.h \
+	      simpleanimation.h \
 	      sound.cpp \
 	      sound.h \
 	      sprite.h \
+	      textparticle.cpp \
+	      textparticle.h \
 	      tileset.h
 
 # set the include path found by configure
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 7260a512..c1e89ff0 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -197,3 +197,27 @@ AnimatedSprite::setDirection(SpriteDirection direction)
         }
     }
 }
+
+int
+AnimatedSprite::getWidth() const
+{
+    if (mFrame)
+    {
+        return mFrame->image->getWidth();
+    }
+    else {
+        return 0;
+    }
+}
+
+int
+AnimatedSprite::getHeight() const
+{
+    if (mFrame)
+    {
+        return mFrame->image->getHeight();
+    }
+    else {
+        return 0;
+    }
+}
diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index 2257c0f0..42c0a743 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -85,6 +85,18 @@ class AnimatedSprite
         bool
         draw(Graphics* graphics, int posX, int posY) const;
 
+        /**
+         * gets the width in pixels of the image of the current frame
+         */
+        int
+        getWidth() const;
+
+        /**
+         * gets the height in pixels of the image of the current frame
+         */
+        int
+        getHeight() const;
+
         /**
          * Sets the direction.
          */
diff --git a/src/animationparticle.cpp b/src/animationparticle.cpp
new file mode 100644
index 00000000..30c33da7
--- /dev/null
+++ b/src/animationparticle.cpp
@@ -0,0 +1,51 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include "animationparticle.h"
+
+#include "graphics.h"
+#include "simpleanimation.h"
+
+AnimationParticle::AnimationParticle(Map *map, Animation *animation):
+    ImageParticle(map, 0),
+    mAnimation(new SimpleAnimation(animation))
+{
+}
+
+AnimationParticle::AnimationParticle(Map *map, xmlNodePtr animationNode):
+    ImageParticle(map, 0),
+    mAnimation(new SimpleAnimation(animationNode))
+{
+}
+
+AnimationParticle::~AnimationParticle()
+{
+    delete mAnimation;
+}
+
+bool AnimationParticle::update()
+{
+    mAnimation->update(10); // particle engine is updated every 10ms
+    mImage = mAnimation->getCurrentImage();
+
+    return Particle::update();
+}
diff --git a/src/animationparticle.h b/src/animationparticle.h
new file mode 100644
index 00000000..054b1b73
--- /dev/null
+++ b/src/animationparticle.h
@@ -0,0 +1,49 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#ifndef _ANIMATION_PARTICLE
+#define _ANIMATION_PARTICLE
+
+#include <libxml/tree.h>
+
+#include "imageparticle.h"
+
+class Animation;
+class Map;
+class SimpleAnimation;
+
+class AnimationParticle : public ImageParticle
+{
+    public:
+        AnimationParticle(Map *map, Animation *animation);
+
+        AnimationParticle(Map *map, xmlNodePtr animationNode);
+
+        ~AnimationParticle();
+
+        virtual bool update();
+
+    private:
+        SimpleAnimation *mAnimation; /**< Used animation for this particle */
+};
+
+#endif
diff --git a/src/being.cpp b/src/being.cpp
index 682daddb..7ba9ddb9 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -32,12 +32,16 @@
 #include "graphics.h"
 #include "log.h"
 #include "map.h"
+#include "particle.h"
 
 #include "resources/resourcemanager.h"
 #include "resources/imageset.h"
 
 #include "gui/gui.h"
 
+#include "resources/resourcemanager.h"
+#include "resources/imageset.h"
+
 #include "utils/dtor.h"
 #include "utils/tostring.h"
 
@@ -61,7 +65,6 @@ Being::Being(Uint16 id, Uint16 job, Map *map):
     mMap(NULL),
     mHairStyle(0), mHairColor(0),
     mSpeechTime(0),
-    mDamageTime(0),
     mPx(0), mPy(0),
     mSprites(VECTOREND_SPRITE, NULL),
     mEquipmentSpriteIDs(VECTOREND_SPRITE, 0)
@@ -85,6 +88,13 @@ Being::~Being()
     clearPath();
     setMap(NULL);
 
+    for (   std::list<Particle *>::iterator i = mChildParticleEffects.begin();
+            i != mChildParticleEffects.end();
+            i++)
+    {
+        (*i)->kill();
+    }
+
     instances--;
 
     if (instances == 0)
@@ -292,8 +302,32 @@ Being::setSpeech(const std::string &text, Uint32 time)
 void
 Being::takeDamage(int amount)
 {
-    mDamage = amount ? toString(amount) : "miss";
-    mDamageTime = 300;
+    gcn::Font* font;
+    std::string damage = amount ? toString(amount) : "miss";
+
+    // Selecting the right color
+    if (damage == "miss")
+    {
+        font = hitYellowFont;
+    }
+    else
+    {
+        // hit particle effect
+        controlParticle(particleEngine->addEffect("graphics/particles/hit.particle.xml", 0, 0));
+
+        if (getType() == MONSTER)
+        {
+            font = hitBlueFont;
+        }
+        else
+        {
+            font = hitRedFont;
+        }
+    }
+
+    // show damage number
+    particleEngine->addTextSplashEffect(damage, 255, 255, 255, font,
+                                        mPx + 16, mPy + 16);
 }
 
 void
@@ -318,6 +352,19 @@ Being::setMap(Map *map)
     {
         mSpriteIterator = mMap->addSprite(this);
     }
+
+    //clear particle effect list because child particles became invalid
+    mChildParticleEffects.clear();
+}
+
+void
+Being::controlParticle(Particle *particle)
+{
+    if (particle)
+    {
+        particle->disableAutoDelete();  //the effect may not die without the beings permission or we segvault
+        mChildParticleEffects.push_back(particle);
+    }
 }
 
 void
@@ -465,10 +512,6 @@ Being::logic()
     if (mSpeechTime > 0)
         mSpeechTime--;
 
-    // Reduce the time that damage is still displayed
-    if (mDamageTime > 0)
-        mDamageTime--;
-
     // Update pixel coordinates
     mPx = mX - 16 + getXOffset();
     mPy = mY - 16 + getYOffset();
@@ -489,6 +532,14 @@ Being::logic()
             mSprites[i]->update(tick_time * 10);
         }
     }
+
+    //Update particle effects
+    for (   std::list<Particle *>::iterator i = mChildParticleEffects.begin();
+        i != mChildParticleEffects.end();
+        i++)
+    {
+        (*i)->setPosition((float)mPx + 16.0f, (float)mPy + 32.0f);
+    }
 }
 
 void
@@ -531,37 +582,6 @@ Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
         graphics->setColor(gcn::Color(255, 255, 255));
         graphics->drawText(mSpeech, px + 18, py - 60, gcn::Graphics::CENTER);
     }
-
-    // Draw damage above this being
-    if (mDamageTime > 0 && mDamageTime < 275)
-    {
-        // Selecting the right color
-        if (mDamage == "miss")
-        {
-            graphics->setFont(hitYellowFont);
-        }
-        else if (getType() == MONSTER)
-        {
-            graphics->setFont(hitBlueFont);
-        }
-        else
-        {
-            graphics->setFont(hitRedFont);
-        }
-
-        int textY = (getType() == MONSTER) ? 32 : 70;
-        int ft = 150 - mDamageTime;
-        float a = (ft > 0) ? 1.0 - ft / 150.0 : 1.0;
-
-        graphics->setColor(gcn::Color(255, 255, 255, (int)(255 * a)));
-        graphics->drawText(mDamage,
-                           px + 16,
-                           py - textY - (300 - mDamageTime) / 10,
-                           gcn::Graphics::CENTER);
-
-        // Reset alpha value
-        graphics->setColor(gcn::Color(255, 255, 255));
-    }
 }
 
 Being::Type
@@ -632,3 +652,29 @@ int Being::getOffset(int step) const
 
     return offset;
 }
+
+
+int
+Being::getWidth() const
+{
+    if (mSprites[BASE_SPRITE])
+    {
+        return mSprites[BASE_SPRITE]->getWidth();
+    }
+    else {
+        return 0;
+    }
+}
+
+
+int
+Being::getHeight() const
+{
+    if (mSprites[BASE_SPRITE])
+    {
+        return mSprites[BASE_SPRITE]->getHeight();
+    }
+    else {
+        return 0;
+    }
+}
diff --git a/src/being.h b/src/being.h
index 332f1b4a..8820c30a 100644
--- a/src/being.h
+++ b/src/being.h
@@ -42,6 +42,7 @@ class Item;
 class Map;
 class Graphics;
 class ImageSet;
+class Particle;
 
 /**
  * A position along a being's path.
@@ -97,6 +98,13 @@ class Being : public Sprite
             VECTOREND_SPRITE
         };
 
+        enum TargetCursorSize {
+            TC_SMALL = 0,
+            TC_MEDIUM,
+            TC_LARGE,
+            NUM_TC
+        };
+
 
         /**
          * Directions, to be used as bitmask values
@@ -359,8 +367,33 @@ class Being : public Sprite
         int
         getYOffset() const { return getOffset(mStepY); }
 
+        /**
+         * Returns the horizontal size of the current base sprite of the being
+         */
+        virtual int
+        getWidth() const;
+
+        /**
+         * Returns the vertical size of the current base sprite of the being
+         */
+        virtual int
+        getHeight() const;
+
+        /**
+         * Returns the required size of a target cursor for this being
+         */
+        virtual Being::TargetCursorSize
+        getTargetCursorSize() const
+        { return TC_MEDIUM; }
+
         std::auto_ptr<Equipment> mEquipment;
 
+        /**
+         * Take control of a particle
+         */
+        void
+        controlParticle(Particle *particle);
+
     protected:
         /**
          * Sets the new path for this being.
@@ -380,14 +413,13 @@ class Being : public Sprite
 
         Path mPath;
         std::string mSpeech;
-        std::string mDamage;
         Uint16 mHairStyle, mHairColor;
         Uint32 mSpeechTime;
-        Uint32 mDamageTime;
         Sint32 mPx, mPy;                /**< Pixel coordinates */
 
         std::vector<AnimatedSprite*> mSprites;
         std::vector<int> mEquipmentSpriteIDs;
+        std::list<Particle *> mChildParticleEffects;
 
     private:
         int
diff --git a/src/engine.cpp b/src/engine.cpp
index 31bec9ff..3b5fb403 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -35,6 +35,7 @@
 #include "localplayer.h"
 #include "log.h"
 #include "map.h"
+#include "particle.h"
 #include "sound.h"
 
 #include "gui/gui.h"
@@ -63,6 +64,7 @@ void Engine::changeMap(const std::string &mapPath)
     floorItemManager->clear();
 
     beingManager->clear();
+    particleEngine->clear();
 
     // Store full map path in global var
     map_path = "maps/" + mapPath;
@@ -83,8 +85,12 @@ void Engine::changeMap(const std::string &mapPath)
     }
     minimap->setMapImage(mapImage);
     beingManager->setMap(newMap);
+    particleEngine->setMap(newMap);
     viewport->setMap(newMap);
 
+    // Initialize map-based particle effects
+    newMap->initializeParticleEffects(particleEngine);
+
     // Start playing new music file when necessary
     std::string oldMusic = "";
 
@@ -106,5 +112,6 @@ void Engine::changeMap(const std::string &mapPath)
 void Engine::logic()
 {
     beingManager->logic();
+    particleEngine->update();
     gui->logic();
 }
diff --git a/src/game.cpp b/src/game.cpp
index ba4e2b9d..1afc530b 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -41,6 +41,7 @@
 #include "localplayer.h"
 #include "log.h"
 #include "npc.h"
+#include "particle.h"
 
 #include "gui/buy.h"
 #include "gui/buysell.h"
@@ -121,6 +122,8 @@ BeingManager *beingManager = NULL;
 FloorItemManager *floorItemManager = NULL;
 ChannelManager *channelManager = NULL;
 
+Particle *particleEngine = NULL;
+
 const int MAX_TIME = 10000;
 
 /**
@@ -242,6 +245,9 @@ Game::Game():
     floorItemManager = new FloorItemManager();
     channelManager = new ChannelManager();
 
+    particleEngine = new Particle(NULL);
+    particleEngine->setupEngine();
+
     // Initialize timers
     tick_time = 0;
     mLogicCounterId =   SDL_AddTimer(10, nextTick, NULL);    //Logic counter
@@ -286,6 +292,7 @@ Game::~Game()
     delete floorItemManager;
     delete channelManager;
     delete joystick;
+    delete particleEngine;
 
     beingManager = NULL;
     floorItemManager = NULL;
@@ -308,7 +315,9 @@ bool saveScreenshot(SDL_Surface *screenshot)
         screenshotCount++;
         filename.str("");
 #if (defined __USE_UNIX98 || defined __FreeBSD__ || defined __APPLE__)
-        filename << PHYSFS_getUserDir() << "/";
+        filename << PHYSFS_getUserDir() << ".tmw/";
+#elif defined __APPLE__
+        filename << PHYSFS_getUserDir() << "Desktop/";
 #endif
         filename << "TMW_Screenshot_" << screenshotCount << ".png";
         testExists.open(filename.str().c_str(), std::ios::in);
@@ -316,7 +325,18 @@ bool saveScreenshot(SDL_Surface *screenshot)
         testExists.close();
     } while (!found);
 
-    return ImageWriter::writePNG(screenshot, filename.str());
+    if (ImageWriter::writePNG(screenshot, filename.str()))
+    {
+        std::stringstream chatlogentry;
+        chatlogentry << "Screenshot saved to " << filename.str().c_str();
+        chatWindow->chatLog(chatlogentry.str(), BY_SERVER);
+        return true;
+    }
+    else
+    {
+        chatWindow->chatLog("Saving screenshot failed!", BY_SERVER);
+        return false;
+    }
 }
 
 void Game::optionChanged(const std::string &name)
diff --git a/src/graphics.cpp b/src/graphics.cpp
index f007470a..1e31f903 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -136,8 +136,6 @@ bool Graphics::drawImage(Image *image, int srcX, int srcY, int dstX, int dstY,
     srcX += image->mBounds.x;
     srcY += image->mBounds.y;
 
-
-
     SDL_Rect dstRect;
     SDL_Rect srcRect;
     dstRect.x = dstX; dstRect.y = dstY;
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index cb07da22..2a8616f8 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -111,27 +111,21 @@ void BuyDialog::setMoney(int amount)
 {
     mMoney = amount;
     mShopItemList->setPlayersMoney(amount);
-    mMoneyLabel->setCaption("Price: 0 GP / " + toString(mMoney)  + " GP");
-    mMoneyLabel->adjustSize();
+
+    updateButtonsAndLabels();
 }
 
 void BuyDialog::reset()
 {
     mShopItems->clear();
+    mShopItemList->adjustSize();
     mMoney = 0;
     mSlider->setValue(0.0);
-    mAmountItems = 0;
 
     // Reset Previous Selected Items to prevent failing asserts
     mShopItemList->setSelected(-1);
-    mIncreaseButton->setEnabled(false);
-    mDecreaseButton->setEnabled(false);
-    mQuantityLabel->setCaption("0");
-    mQuantityLabel->adjustSize();
-    mMoneyLabel->setCaption("Price: 0 GP / " + toString(mMoney) + " GP");
-    mMoneyLabel->adjustSize();
-    mItemDescLabel->setCaption("");
-    mItemEffectLabel->setCaption("");
+
+    updateButtonsAndLabels();
 }
 
 void BuyDialog::addItem(short id, int price)
@@ -151,45 +145,36 @@ void BuyDialog::action(const gcn::ActionEvent &event)
     }
 
     // The following actions require a valid selection
-    if (selectedItem < 0 || selectedItem >= int(mShopItems->getNumberOfElements()))
+    if (selectedItem < 0 ||
+            selectedItem >= (int) mShopItems->getNumberOfElements())
     {
         return;
     }
 
-    bool updateButtonsAndLabels = false;
-
     if (event.getId() == "slider")
     {
         mAmountItems = (int)(mSlider->getValue() * mMaxItems);
-        updateButtonsAndLabels = true;
+        updateButtonsAndLabels();
     }
-    else if (event.getId() == "+")
+    else if (event.getId() == "+" && mAmountItems < mMaxItems)
     {
-        if (mAmountItems < mMaxItems) {
-            mAmountItems++;
-        } else {
-            mAmountItems = mMaxItems;
-        }
+        mAmountItems++;
 
-        mSlider->setValue(double(mAmountItems)/double(mMaxItems));
-        updateButtonsAndLabels = true;
+        mSlider->setValue((double) mAmountItems / (double) mMaxItems);
+        updateButtonsAndLabels();
     }
-    else if (event.getId() == "-")
+    else if (event.getId() == "-" && mAmountItems > 0)
     {
-        if (mAmountItems > 0) {
-            mAmountItems--;
-        } else {
-            mAmountItems = 0;
-        }
+        mAmountItems--;
 
-        mSlider->setValue(double(mAmountItems)/double(mMaxItems));
-        updateButtonsAndLabels = true;
+        mSlider->setValue((double) mAmountItems / (double) mMaxItems);
+        updateButtonsAndLabels();
     }
     // TODO: Actually we'd have a bug elsewhere if this check for the number
     // of items to be bought ever fails, Bertram removed the assertions, is
     // there a better way to ensure this fails in an _obivous_ way in C++?
-    else if (event.getId() == "buy" && (mAmountItems > 0 &&
-                mAmountItems <= mMaxItems))
+    else if (event.getId() == "buy" && mAmountItems > 0 &&
+                mAmountItems <= mMaxItems)
     {
         // XXX Convert for new server
         /*
@@ -199,38 +184,15 @@ void BuyDialog::action(const gcn::ActionEvent &event)
         outMsg.writeShort(mShopItems->at(selectedItem).id);
         */
 
-        // update money !
+        // Update money and adjust the max number of items that can be bought
         mMoney -= mAmountItems * mShopItems->at(selectedItem).price;
-        // Update number of items that can be bought at max
         mMaxItems -= mAmountItems;
 
-        if (!mMaxItems) {
-            mSlider->setEnabled(false);
-        }
-
         // Reset selection
         mAmountItems = 0;
-        mSlider->setValue(0);
-
-        updateButtonsAndLabels = true;
-    }
+        mSlider->setValue(0.0);
 
-    // If anything has changed, we have to update the buttons and labels
-    if (updateButtonsAndLabels)
-    {
-        // Update buttons
-        mIncreaseButton->setEnabled(mAmountItems < mMaxItems);
-        mDecreaseButton->setEnabled(mAmountItems > 0);
-        mBuyButton->setEnabled(mAmountItems > 0);
-
-        // Update labels
-        mQuantityLabel->setCaption(toString(mAmountItems));
-        mQuantityLabel->adjustSize();
-
-        int price = mAmountItems * mShopItems->at(selectedItem).price;
-        mMoneyLabel->setCaption("Price: " + toString(price)  + " GP / "
-                                + toString(mMoney) + " GP" );
-        mMoneyLabel->adjustSize();
+        updateButtonsAndLabels();
     }
 }
 
@@ -238,17 +200,16 @@ void BuyDialog::selectionChanged(const SelectionEvent &event)
 {
     // Reset amount of items and update labels
     mAmountItems = 0;
-    mSlider->setValue(0);
-    mQuantityLabel->setCaption("0");
-    mQuantityLabel->adjustSize();
-    mMoneyLabel->setCaption("Price: 0 GP / " + toString(mMoney) + " GP");
-    mMoneyLabel->adjustSize();
+    mSlider->setValue(0.0);
 
-    // Disable buttons for buying and decreasing
-    mBuyButton->setEnabled(false);
-    mDecreaseButton->setEnabled(false);
+    updateButtonsAndLabels();
+}
 
+void
+BuyDialog::updateButtonsAndLabels()
+{
     int selectedItem = mShopItemList->getSelected();
+    int price = 0;
 
     if (selectedItem > -1)
     {
@@ -259,16 +220,32 @@ void BuyDialog::selectionChanged(const SelectionEvent &event)
 
         // Calculate how many the player can afford
         mMaxItems = mMoney / mShopItems->at(selectedItem).price;
+        if (mAmountItems > mMaxItems)
+        {
+            mAmountItems = mMaxItems;
+        }
+
+        // Calculate price of pending purchase
+        price = mAmountItems * mShopItems->at(selectedItem).price;
     }
     else
     {
         mItemDescLabel->setCaption("Description:");
         mItemEffectLabel->setCaption("Effect:");
         mMaxItems = 0;
+        mAmountItems = 0;
     }
 
-    // When at least one item can be bought, enable the slider and the
-    // increase button
-    mIncreaseButton->setEnabled(mMaxItems > 0);
+    // Enable or disable buttons and slider
+    mIncreaseButton->setEnabled(mAmountItems < mMaxItems);
+    mDecreaseButton->setEnabled(mAmountItems > 0);
+    mBuyButton->setEnabled(mAmountItems > 0);
     mSlider->setEnabled(mMaxItems > 0);
+
+    // Update quantity and money labels
+    mQuantityLabel->setCaption(toString(mAmountItems));
+    mQuantityLabel->adjustSize();
+    mMoneyLabel->setCaption("Price: " + toString(price)  + " GP / "
+                             + toString(mMoney - price) + " GP" );
+    mMoneyLabel->adjustSize();
 }
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 13116b6e..7834a434 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -92,6 +92,12 @@ class BuyDialog : public Window, public gcn::ActionListener, SelectionListener
          */
         std::string getElementAt(int i);
 
+        /**
+         * Updates the state of buttons and labels.
+         */
+        void
+        updateButtonsAndLabels();
+
     private:
         gcn::Button *mBuyButton;
         gcn::Button *mQuitButton;
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index eb6b7612..48df9efe 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -160,7 +160,7 @@ ChatWindow::chatLog(std::string line, int own, std::string channelName)
             break;
         case BY_OTHER:
             tmp.nick += CAT_NORMAL;
-            lineColor = "##4"; // Equiv. to BrowserBox::ORANGE
+            lineColor = "##0"; // Equiv. to BrowserBox::BLACK
             break;
         case BY_SERVER:
             tmp.nick += std::string("Server: ");
@@ -195,7 +195,7 @@ ChatWindow::chatLog(std::string line, int own, std::string channelName)
     // We look if the Vertical Scroll Bar is set at the max before
     // adding a row, otherwise the max will always be a row higher
     // at comparison.
-    if (mScrollArea->getVerticalScrollAmount() == mScrollArea->getVerticalMaxScroll() )
+    if (mScrollArea->getVerticalScrollAmount() == mScrollArea->getVerticalMaxScroll())
     {
         mTextOutput->addRow(line);
         mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll());
diff --git a/src/gui/chat.h b/src/gui/chat.h
index c7e51ebf..6f9b91fe 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -168,13 +168,13 @@ class ChatWindow : public Window, public gcn::ActionListener,
 
         /*
          * Determines whether to send a command or an ordinary message, then
-         * contructs packets & sends them
+         * contructs packets & sends them.
          *
          * @param nick The character's name to display in front.
          * @param msg  The message text which is to be send.
          *
          * NOTE:
-         * the nickname is required by the server, if not specified
+         * The nickname is required by the server, if not specified
          * the message may not be sent unless a command was intended
          * which requires another packet to be constructed! you can
          * achieve this by putting a slash ("/") infront of the
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 563f380f..ebf7d974 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -33,6 +33,7 @@
 
 #include "../game.h"
 #include "../engine.h"
+#include "../particle.h"
 #include "../map.h"
 
 #include "../utils/tostring.h"
@@ -58,6 +59,9 @@ DebugWindow::DebugWindow():
     mTileMouseLabel = new gcn::Label("[Mouse: 0, 0]");
     mTileMouseLabel->setPosition(100, 0);
 
+    mParticleCountLabel = new gcn::Label("[Particle count: 0]");
+    mParticleCountLabel->setPosition(100, 60);
+
     Button *closeButton = new Button("Close", "close", this);
     closeButton->setPosition(5, 60);
 
@@ -65,6 +69,7 @@ DebugWindow::DebugWindow():
     add(mMusicFileLabel);
     add(mMapFileLabel);
     add(mTileMouseLabel);
+    add(mParticleCountLabel);
     add(closeButton);
 }
 
@@ -97,6 +102,11 @@ DebugWindow::logic()
         mMapFileLabel->setCaption(minimap);
         mMapFileLabel->adjustSize();
     }
+
+    mParticleCountLabel->setCaption("[Particle count: " +
+                                    toString(Particle::particleCount)
+                                    +"]");
+    mParticleCountLabel->adjustSize();
 }
 
 void
diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h
index 4fd33d83..d082b2ca 100644
--- a/src/gui/debugwindow.h
+++ b/src/gui/debugwindow.h
@@ -58,6 +58,7 @@ class DebugWindow : public Window, public gcn::ActionListener
     private:
         gcn::Label *mMusicFileLabel, *mMapFileLabel;
         gcn::Label *mTileMouseLabel, *mFPSLabel;
+        gcn::Label *mParticleCountLabel;
 };
 
 #endif
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 44d042a6..2018c75a 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -165,8 +165,8 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
 
         if (!item) return;
 
-        /* Convert relative to the window coordinates to
-         * absolute screen coordinates.
+        /* Convert relative to the window coordinates to absolute screen
+         * coordinates.
          */
         int mx = event.getX() + getX();
         int my = event.getY() + getY();
@@ -178,7 +178,8 @@ void InventoryWindow::mouseDragged(gcn::MouseEvent &event)
 {
     int tmpWidth = getWidth(), tmpHeight = getHeight();
     Window::mouseDragged(event);
-    if (getWidth() != tmpWidth || getHeight() != tmpHeight) {
+    if (getWidth() != tmpWidth || getHeight() != tmpHeight)
+    {
         updateWidgets();
     }
 }
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index c9878c84..478371b1 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -88,7 +88,7 @@ SellDialog::SellDialog():
     quitButton->setPosition(208, 186);
 
     mShopItemList->setActionEventId("item");
-    mSlider->setActionEventId("mSlider");
+    mSlider->setActionEventId("slider");
 
     mShopItemList->setPriceCheck(false);
 
@@ -119,20 +119,11 @@ void SellDialog::reset()
 {
     mShopItems->clear();
     mSlider->setValue(0.0);
-    mAmountItems = 0;
-
-    mQuantityLabel->setCaption("0");
-    mQuantityLabel->adjustSize();
-    mMoneyLabel->setCaption("Money: 0 GP / Total: "
-            + toString(mPlayerMoney) + " GP");
-    mMoneyLabel->adjustSize();
-    mItemDescLabel->setCaption("");
-    mItemEffectLabel->setCaption("");
 
-    // Reset Previous Selected Items to prevent failing asserts
+    // Reset previous selected item to prevent failing asserts
     mShopItemList->setSelected(-1);
-    mIncreaseButton->setEnabled(false);
-    mDecreaseButton->setEnabled(false);
+
+    updateButtonsAndLabels();
 }
 
 void SellDialog::addItem(Item *item, int price)
@@ -162,25 +153,7 @@ void SellDialog::action(const gcn::ActionEvent &event)
     {
         mAmountItems = 0;
         mSlider->setValue(0);
-        mDecreaseButton->setEnabled(false);
-        mSellButton->setEnabled(false);
-
-        mQuantityLabel->adjustSize();
-        mMoneyLabel->setCaption("Money: 0 GP / Total: "
-            + toString(mPlayerMoney) + " GP");
-        mMoneyLabel->adjustSize();
-
-        if (selectedItem > -1) {
-            mSlider->setEnabled(true);
-            mIncreaseButton->setEnabled(true);
-            mMaxItems = mShopItems->at(selectedItem).quantity;
-            mQuantityLabel->setCaption("0 / " + toString(mMaxItems));
-        } else {
-            mSlider->setEnabled(false);
-            mIncreaseButton->setEnabled(false);
-            mQuantityLabel->setCaption("0");
-        }
-        mQuantityLabel->adjustSize();
+        updateButtonsAndLabels();
     }
     else if (event.getId() == "quit")
     {
@@ -189,40 +162,35 @@ void SellDialog::action(const gcn::ActionEvent &event)
     }
 
     // The following actions require a valid item selection
-    if (selectedItem == -1 || selectedItem >= int(mShopItems->getNumberOfElements())) {
+    if (selectedItem == -1 ||
+            selectedItem >= (int) mShopItems->getNumberOfElements())
+    {
         return;
     }
 
-    bool updateButtonsAndLabels = false;
-
-    if (event.getId() == "mSlider")
+    if (event.getId() == "slider")
     {
-        mAmountItems = (int)(mSlider->getValue() * mMaxItems);
-
-        updateButtonsAndLabels = true;
+        mAmountItems = (int) (mSlider->getValue() * mMaxItems);
+        updateButtonsAndLabels();
     }
-    else if (event.getId() == "+")
+    else if (event.getId() == "+" && mAmountItems < mMaxItems)
     {
-        assert(mAmountItems < mMaxItems);
         mAmountItems++;
-        mSlider->setValue(double(mAmountItems)/double(mMaxItems));
 
-        updateButtonsAndLabels = true;
+        mSlider->setValue((double) mAmountItems /(double) mMaxItems);
+        updateButtonsAndLabels();
     }
-    else if (event.getId() == "-")
+    else if (event.getId() == "-" && mAmountItems > 0)
     {
-        assert(mAmountItems > 0);
         mAmountItems--;
 
-        mSlider->setValue(double(mAmountItems)/double(mMaxItems));
-
-        updateButtonsAndLabels = true;
+        mSlider->setValue((double) mAmountItems / (double) mMaxItems);
+        updateButtonsAndLabels();
     }
-    else if (event.getId() == "sell")
+    else if (event.getId() == "sell" && mAmountItems > 0
+            && mAmountItems <= mMaxItems)
     {
         // Attempt sell
-        assert(mAmountItems > 0 && mAmountItems <= mMaxItems);
-
         // XXX Convert for new server
         /*
         MessageOut outMsg(CMSG_NPC_SELL_REQUEST);
@@ -236,60 +204,77 @@ void SellDialog::action(const gcn::ActionEvent &event)
         mPlayerMoney += (mAmountItems * mShopItems->at(selectedItem).price);
         mAmountItems = 0;
         mSlider->setValue(0);
-        mSlider->setEnabled(mMaxItems != 0);
-
-        // All were sold
-        if (!mMaxItems) {
 
+        if (!mMaxItems)
+        {
+            // All were sold
             mShopItemList->setSelected(-1);
-            mShopItems->getShop()->erase(mShopItems->getShop()->begin() + selectedItem);
+            mShopItems->getShop()->erase(
+                    mShopItems->getShop()->begin() + selectedItem);
+        }
+        else
+        {
+            // Update only when there are items left, the entry doesn't exist
+            // otherwise and can't be updated
+            updateButtonsAndLabels();
         }
-
-        // Update only when there are items left, the entry doesn't exist
-        // otherwise and can't be updated
-        updateButtonsAndLabels = bool(mMaxItems);
-    }
-
-    // If anything changed, we need to update the buttons and labels
-    if (updateButtonsAndLabels)
-    {
-        // Update labels
-        mQuantityLabel->setCaption(toString(mAmountItems) + " / " + toString(mMaxItems));
-        mQuantityLabel->adjustSize();
-
-        int price = mAmountItems * mShopItems->at(selectedItem).price;
-        mMoneyLabel->setCaption("Money: " + toString(price) + " GP / Total: "
-            + toString(price + mPlayerMoney) + " GP");
-        mMoneyLabel->adjustSize();
-
-        // Update Buttons
-        mSellButton->setEnabled(mAmountItems > 0);
-        mDecreaseButton->setEnabled(mAmountItems > 0);
-        mIncreaseButton->setEnabled(mAmountItems < mMaxItems);
     }
 }
 
 void SellDialog::selectionChanged(const SelectionEvent &event)
+{
+    // Reset amount of items and update labels
+    mAmountItems = 0;
+    mSlider->setValue(0);
+
+    updateButtonsAndLabels();
+}
+
+void SellDialog::setMoney(int amount)
+{
+    mPlayerMoney = amount;
+    mShopItemList->setPlayersMoney(amount);
+}
+
+void
+SellDialog::updateButtonsAndLabels()
 {
     int selectedItem = mShopItemList->getSelected();
+    int income = 0;
 
     if (selectedItem > -1)
     {
-        const ItemInfo &info =
-            ItemDB::get(mShopItems->at(selectedItem).id);
+        mMaxItems = mShopItems->at(selectedItem).quantity;
+        if (mAmountItems > mMaxItems)
+        {
+            mAmountItems = mMaxItems;
+        }
 
+        income = mAmountItems * mShopItems->at(selectedItem).price;
+
+        const ItemInfo &info = ItemDB::get(mShopItems->at(selectedItem).id);
         mItemDescLabel->setCaption("Description: " + info.getDescription());
         mItemEffectLabel->setCaption("Effect: " + info.getEffect());
     }
     else
     {
-        mItemDescLabel->setCaption("Description");
-        mItemEffectLabel->setCaption("Effect");
+        mMaxItems = 0;
+        mAmountItems = 0;
+        mItemDescLabel->setCaption("Description:");
+        mItemEffectLabel->setCaption("Effect:");
     }
-}
 
-void SellDialog::setMoney(int amount)
-{
-    mPlayerMoney = amount;
-    mShopItemList->setPlayersMoney(amount);
+    // Update Buttons and slider
+    mSellButton->setEnabled(mAmountItems > 0);
+    mDecreaseButton->setEnabled(mAmountItems > 0);
+    mIncreaseButton->setEnabled(mAmountItems < mMaxItems);
+    mSlider->setEnabled(selectedItem > -1);
+
+    // Update the quantity and money labels
+    mQuantityLabel->setCaption(
+            toString(mAmountItems) + " / " + toString(mMaxItems));
+    mQuantityLabel->adjustSize();
+    mMoneyLabel->setCaption("Money: " + toString(income) + " GP / Total: "
+                            + toString(mPlayerMoney + income) + " GP");
+    mMoneyLabel->adjustSize();
 }
diff --git a/src/gui/sell.h b/src/gui/sell.h
index 68bd7b8b..b8385a6f 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -82,6 +82,12 @@ class SellDialog : public Window, gcn::ActionListener, SelectionListener
          */
         void setMoney(int amount);
 
+        /**
+         * Updates the state of buttons and labels.
+         */
+        void
+        updateButtonsAndLabels();
+
     private:
         gcn::Button *mSellButton;
         gcn::Button *mIncreaseButton;
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index d8130cd3..ed75e5b3 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -157,6 +157,7 @@ void UpdaterWindow::setLabel(const std::string &str)
 
 void UpdaterWindow::enable()
 {
+    mCancelButton->setEnabled(false);
     mPlayButton->setEnabled(true);
     mPlayButton->requestFocus();
 }
@@ -168,11 +169,7 @@ void UpdaterWindow::action(const gcn::ActionEvent &event)
         // Register the user cancel
         mUserCancel = true;
         // Skip the updating process
-        if (mDownloadStatus == UPDATE_COMPLETE)
-        {
-            state = STATE_EXIT;
-        }
-        else
+        if (mDownloadStatus != UPDATE_COMPLETE)
         {
             mDownloadStatus = UPDATE_ERROR;
         }
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index f3e9031c..2af1d960 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -41,10 +41,13 @@
 #include "../resources/animation.h"
 #include "../resources/monsterinfo.h"
 #include "../resources/resourcemanager.h"
+#include "../resources/image.h"
 #include "../resources/imageset.h"
 
 #include "../utils/tostring.h"
 
+#include <cassert>
+
 Viewport::Viewport():
     mMap(0),
     mViewX(0.0f),
@@ -67,37 +70,62 @@ Viewport::Viewport():
     mPopupMenu = new PopupMenu();
 
     // Load target cursors
+    loadTargetCursor("graphics/gui/target-cursor-blue-s.png", 44, 35,
+                     false, Being::TC_SMALL);
+    loadTargetCursor("graphics/gui/target-cursor-red-s.png", 44, 35,
+                     true, Being::TC_SMALL);
+    loadTargetCursor("graphics/gui/target-cursor-blue-m.png", 62, 44,
+                     false, Being::TC_MEDIUM);
+    loadTargetCursor("graphics/gui/target-cursor-red-m.png", 62, 44,
+                     true, Being::TC_MEDIUM);
+    loadTargetCursor("graphics/gui/target-cursor-blue-l.png", 82, 60,
+                     false, Being::TC_LARGE);
+    loadTargetCursor("graphics/gui/target-cursor-red-l.png", 82, 60,
+                     true, Being::TC_LARGE);
+}
+
+void
+Viewport::loadTargetCursor(std::string filename, int width, int height,
+                           bool outRange, Being::TargetCursorSize size)
+{
+    assert(size > -1);
+    assert(size < 3);
+
+    ImageSet* currentImageSet;
+    SimpleAnimation* currentCursor;
+
     ResourceManager *resman = ResourceManager::getInstance();
-    mInRangeImages = resman->getImageSet(
-            "graphics/gui/target-cursor-blue.png", 44, 35);
-    mOutRangeImages = resman->getImageSet(
-            "graphics/gui/target-cursor-red.png", 44, 35);
-    Animation *animInRange = new Animation();
-    Animation *animOutRange = new Animation();
-
-    for (unsigned int i = 0; i < mInRangeImages->size(); ++i)
+
+    currentImageSet = resman->getImageSet(filename, width, height);
+    Animation *anim = new Animation();
+    for (unsigned int i = 0; i < currentImageSet->size(); ++i)
     {
-        animInRange->addFrame(mInRangeImages->get(i), 75, 0, 0);
+        anim->addFrame(currentImageSet->get(i), 75, 0, 0);
     }
+    currentCursor = new SimpleAnimation(anim);
 
-    for (unsigned int j = 0; j < mOutRangeImages->size(); ++j)
+    if (outRange)
     {
-        animOutRange->addFrame(mOutRangeImages->get(j), 75, 0, 0);
+        mOutRangeImages[size] = currentImageSet;
+        mTargetCursorOutRange[size] = currentCursor;
+    }
+    else {
+        mInRangeImages[size] = currentImageSet;
+        mTargetCursorInRange[size] = currentCursor;
     }
-
-    mTargetCursorInRange = new SimpleAnimation(animInRange);
-    mTargetCursorOutRange = new SimpleAnimation(animOutRange);
 }
 
 Viewport::~Viewport()
 {
     delete mPopupMenu;
 
-    delete mTargetCursorInRange;
-    delete mTargetCursorOutRange;
-
-    mInRangeImages->decRef();
-    mOutRangeImages->decRef();
+    for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
+    {
+        delete mTargetCursorInRange[i];
+        delete mTargetCursorOutRange[i];
+        mInRangeImages[i]->decRef();
+        mOutRangeImages[i]->decRef();
+    }
 }
 
 void
@@ -259,8 +287,11 @@ Viewport::logic()
         mWalkTime = player_node->mWalkTime;
     }
 
-    mTargetCursorInRange->update(10);
-    mTargetCursorOutRange->update(10);
+    for (int i = 0; i < 3; i++)
+    {
+        mTargetCursorInRange[i]->update(10);
+        mTargetCursorOutRange[i]->update(10);
+    }
 }
 
 void
@@ -270,26 +301,31 @@ Viewport::drawTargetCursor(Graphics *graphics)
     Being *target = player_node->getTarget();
     if (target)
     {
+        // Calculate target circle position
+
         // Find whether target is in range
         int rangeX = abs(target->mX - player_node->mX);
         int rangeY = abs(target->mY - player_node->mY);
         int attackRange = player_node->getAttackRange();
 
-        // Draw the target cursor, which one depends if the target is in range
+        // Get the correct target cursors graphic
+        Being::TargetCursorSize cursorSize = target->getTargetCursorSize();
+        Image* targetCursor;
         if (rangeX > attackRange || rangeY > attackRange)
         {
-            // Draw the out of range cursor
-            graphics->drawImage(mTargetCursorOutRange->getCurrentImage(),
-                                target->getPixelX() - mCameraX,
-                                target->getPixelY() - mCameraY);
+            targetCursor = mTargetCursorOutRange[cursorSize]->getCurrentImage();
         }
-        else
-        {
-            // Draw the in range cursor
-            graphics->drawImage(mTargetCursorInRange->getCurrentImage(),
-                                target->getPixelX() - mCameraX,
-                                target->getPixelY() - mCameraY);
+        else {
+            targetCursor = mTargetCursorInRange[cursorSize]->getCurrentImage();
         }
+
+        // Draw the target cursor at the correct position
+        int posX = target->getPixelX() + 16 -
+                   targetCursor->getWidth() / 2 - mCameraX;
+        int posY = target->getPixelY() + 16 -
+                   targetCursor->getHeight() / 2 - mCameraY;
+
+        graphics->drawImage(targetCursor, posX, posY);
     }
 }
 
@@ -304,10 +340,10 @@ Viewport::drawTargetName(Graphics *graphics)
         graphics->setColor(gcn::Color(255, 32, 32));
 
         const MonsterInfo &mi = static_cast<Monster*>(target)->getInfo();
-        graphics->drawText(mi.getName(),
-                           target->getPixelX() - mCameraX + 15,
-                           target->getPixelY() - mCameraY - 42,
-                           gcn::Graphics::CENTER);
+        int posX = target->getPixelX() + 16 - mCameraX;
+        int posY = target->getPixelY() + 16 - target->getHeight() - mCameraY;
+
+        graphics->drawText(mi.getName(), posX, posY, gcn::Graphics::CENTER);
     }
 }
 
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 84efeff3..22d0f249 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -29,9 +29,9 @@
 #include "windowcontainer.h"
 
 #include "../configlistener.h"
+#include "../being.h"
 
 class Map;
-class Being;
 class FloorItem;
 class ImageSet;
 class Item;
@@ -141,6 +141,13 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
          */
         void showPopup(int x, int y, Being *being);
 
+        /**
+         * Helper function for loading target cursors
+         */
+        void
+        loadTargetCursor(std::string filename, int width, int height,
+                         bool outRange, Being::TargetCursorSize size);
+
         /**
          * Draws range based target cursor
          */
@@ -164,14 +171,17 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         int mCameraY;              /**< Current viewpoint in tiles. */
         bool mShowDebugPath;       /**< Show a path from player to pointer. */
 
-        ImageSet *mInRangeImages;  /**< Images of in range target cursor. */
-        ImageSet *mOutRangeImages; /**< Images of out of range target cursor.*/
+        /** Images of in range target cursor. */
+        ImageSet *mInRangeImages[Being::NUM_TC];
+
+        /** Images of out of range target cursor. */
+        ImageSet *mOutRangeImages[Being::NUM_TC];
 
         /** Animated in range target cursor. */
-        SimpleAnimation *mTargetCursorInRange;
+        SimpleAnimation *mTargetCursorInRange[Being::NUM_TC];
 
         /** Animated out of range target cursor. */
-        SimpleAnimation *mTargetCursorOutRange;
+        SimpleAnimation *mTargetCursorOutRange[Being::NUM_TC];
 
         bool mPlayerFollowMouse;
         int mWalkTime;
diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp
new file mode 100644
index 00000000..50a6fce4
--- /dev/null
+++ b/src/gui/widgets/resizegrip.cpp
@@ -0,0 +1,65 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "resizegrip.h"
+
+#include <guichan/graphics.hpp>
+
+#include "../../graphics.h"
+
+#include "../../resources/image.h"
+#include "../../resources/resourcemanager.h"
+
+Image *ResizeGrip::gripImage = 0;
+int ResizeGrip::mInstances = 0;
+
+ResizeGrip::ResizeGrip()
+{
+    if (mInstances == 0)
+    {
+        // Load the grip image
+        ResourceManager *resman = ResourceManager::getInstance();
+        gripImage = resman->getImage("graphics/gui/resize.png");
+    }
+
+    mInstances++;
+
+    setWidth(gripImage->getWidth() + 2);
+    setHeight(gripImage->getHeight() + 2);
+}
+
+ResizeGrip::~ResizeGrip()
+{
+    mInstances--;
+
+    if (mInstances == 0)
+    {
+        gripImage->decRef();
+    }
+}
+
+void
+ResizeGrip::draw(gcn::Graphics *graphics)
+{
+    dynamic_cast<Graphics*>(graphics)->drawImage(gripImage, 0, 0);
+}
diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h
new file mode 100644
index 00000000..04be3db3
--- /dev/null
+++ b/src/gui/widgets/resizegrip.h
@@ -0,0 +1,61 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_RESIZEGRIP_H
+#define _TMW_RESIZEGRIP_H
+
+#include <guichan/widget.hpp>
+
+class Image;
+
+/**
+ * Resize grip. The resize grip is part of a resizable Window. It relies on the
+ * fact that uncaught mouse events are automatically routed to the parent
+ * window.
+ *
+ * \ingroup GUI
+ */
+class ResizeGrip : public gcn::Widget
+{
+    public:
+        /**
+         * Constructor.
+         */
+        ResizeGrip();
+
+        /**
+         * Destructor.
+         */
+        ~ResizeGrip();
+
+        /**
+         * Draws the resize grip.
+         */
+        void draw(gcn::Graphics *graphics);
+
+    private:
+        static Image *gripImage;   /**< Resize grip image */
+        static int mInstances;     /**< Number of resize grip instances */
+};
+
+#endif
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index bb60c6ff..8a052bba 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -24,10 +24,13 @@
 #include "window.h"
 
 #include <guichan/exception.hpp>
+#include <guichan/widgets/icon.hpp>
 
 #include "gccontainer.h"
 #include "windowcontainer.h"
 
+#include "widgets/resizegrip.h"
+
 #include "../configlistener.h"
 #include "../configuration.h"
 #include "../graphics.h"
@@ -36,11 +39,10 @@
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
 
-ConfigListener *Window::windowConfigListener = NULL;
-WindowContainer *Window::windowContainer = NULL;
+ConfigListener *Window::windowConfigListener = 0;
+WindowContainer *Window::windowContainer = 0;
 int Window::instances = 0;
 ImageRect Window::border;
-Image *Window::resizeGrip;
 
 class WindowConfigListener : public ConfigListener
 {
@@ -54,16 +56,16 @@ class WindowConfigListener : public ConfigListener
 
 Window::Window(const std::string& caption, bool modal, Window *parent):
     gcn::Window(caption),
+    mGrip(0),
     mParent(parent),
     mWindowName("window"),
-    mSnapSize(8),
     mShowTitle(true),
     mModal(modal),
     mResizable(false),
-    mMouseResize(false),
+    mMouseResize(0),
     mSticky(false),
     mMinWinWidth(100),
-    mMinWinHeight(28),
+    mMinWinHeight(40),
     mMaxWinWidth(INT_MAX),
     mMaxWinHeight(INT_MAX)
 {
@@ -87,7 +89,6 @@ Window::Window(const std::string& caption, bool modal, Window *parent):
         border.grid[6] = dBorders->getSubImage(0, 15, 4, 4);
         border.grid[7] = dBorders->getSubImage(4, 15, 3, 4);
         border.grid[8] = dBorders->getSubImage(7, 15, 4, 4);
-        resizeGrip = resman->getImage("graphics/gui/resize.png");
         dBorders->decRef();
         windowConfigListener = new WindowConfigListener();
         // Send GUI alpha changed for initialization
@@ -151,10 +152,10 @@ Window::~Window()
         delete border.grid[6];
         delete border.grid[7];
         delete border.grid[8];
-        resizeGrip->decRef();
     }
 
     delete mChrome;
+    delete mGrip;
 }
 
 void Window::setWindowContainer(WindowContainer *wc)
@@ -162,22 +163,15 @@ void Window::setWindowContainer(WindowContainer *wc)
     windowContainer = wc;
 }
 
-void Window::draw(gcn::Graphics* graphics)
+void Window::draw(gcn::Graphics *graphics)
 {
-    Graphics *g = (Graphics*)graphics;
+    Graphics *g = static_cast<Graphics*>(graphics);
 
     g->drawImageRect(0, 0, getWidth(), getHeight(), border);
 
-    // Draw grip
-    if (mResizable)
-    {
-        g->drawImage(Window::resizeGrip,
-                     getWidth() - resizeGrip->getWidth(),
-                     getHeight() - resizeGrip->getHeight());
-    }
-
     // Draw title
-    if (mShowTitle) {
+    if (mShowTitle)
+    {
         graphics->setFont(getFont());
         graphics->drawText(getCaption(), 7, 5, gcn::Graphics::LEFT);
     }
@@ -188,13 +182,13 @@ void Window::draw(gcn::Graphics* graphics)
 void Window::setContentWidth(int width)
 {
     mChrome->setWidth(width);
-    resizeToContent();
+    setWidth(width + 2 * getPadding());
 }
 
 void Window::setContentHeight(int height)
 {
     mChrome->setHeight(height);
-    resizeToContent();
+    setHeight(height + getPadding() + getTitleBarHeight());
 }
 
 void Window::setContentSize(int width, int height)
@@ -203,6 +197,37 @@ void Window::setContentSize(int width, int height)
     setContentHeight(height);
 }
 
+void Window::setWidth(int width)
+{
+    gcn::Window::setWidth(width);
+
+    if (mGrip)
+    {
+        mGrip->setX(getWidth() - mGrip->getWidth() - getChildrenArea().x);
+    }
+}
+
+void Window::setHeight(int height)
+{
+    gcn::Window::setHeight(height);
+
+    if (mGrip)
+    {
+        mGrip->setY(getHeight() - mGrip->getHeight() - getChildrenArea().y);
+    }
+}
+
+void Window::setDimension(const gcn::Rectangle &dimension)
+{
+    gcn::Window::setDimension(dimension);
+
+    if (mGrip)
+    {
+        mGrip->setX(getWidth() - mGrip->getWidth() - getChildrenArea().x);
+        mGrip->setY(getHeight() - mGrip->getHeight() - getChildrenArea().y);
+    }
+}
+
 void Window::setLocationRelativeTo(gcn::Widget *widget)
 {
     int wx, wy;
@@ -238,6 +263,19 @@ void Window::setMaxHeight(unsigned int height)
 void Window::setResizable(bool r)
 {
     mResizable = r;
+
+    if (mResizable)
+    {
+        mGrip = new ResizeGrip();
+        mGrip->setX(getWidth() - mGrip->getWidth() - getChildrenArea().x);
+        mGrip->setY(getHeight() - mGrip->getHeight() - getChildrenArea().y);
+        gcn::Window::add(mGrip);
+    }
+    else
+    {
+        delete mGrip;
+        mGrip = 0;
+    }
 }
 
 bool Window::isResizable()
@@ -287,15 +325,27 @@ void Window::mousePressed(gcn::MouseEvent &event)
     // Let Guichan move window to top and figure out title bar drag
     gcn::Window::mousePressed(event);
 
-    int x = event.getX();
-    int y = event.getY();
+    const int x = event.getX();
+    const int y = event.getY();
+    mMouseResize = 0;
 
-    // Activate resizing if the left mouse button was pressed on the grip
-    mMouseResize =
-        isResizable() &&
-        event.getButton() == gcn::MouseEvent::LEFT &&
-        getGripDimension().isPointInRect(x, y) &&
-        !getChildrenArea().isPointInRect(x, y);
+    // Activate resizing handles as appropriate
+    if (event.getSource() == this && isResizable() &&
+            event.getButton() == gcn::MouseEvent::LEFT &&
+            !getChildrenArea().isPointInRect(x, y))
+    {
+        mMouseResize |= (x > getWidth() - resizeBorderWidth) ? RIGHT :
+                        (x < resizeBorderWidth) ? LEFT : 0;
+        mMouseResize |= (y > getHeight() - resizeBorderWidth) ? BOTTOM :
+                        (y < resizeBorderWidth) ? TOP : 0;
+    }
+    else if (event.getSource() == mGrip)
+    {
+        mDragOffsetX = x + mGrip->getX();
+        mDragOffsetY = y + mGrip->getY();
+        mMouseResize |= BOTTOM | RIGHT;
+        mIsMoving = false;
+    }
 }
 
 void Window::mouseDragged(gcn::MouseEvent &event)
@@ -303,20 +353,47 @@ void Window::mouseDragged(gcn::MouseEvent &event)
     // Let Guichan handle title bar drag
     gcn::Window::mouseDragged(event);
 
-    // Keep guichan window inside screen
-    int newX = std::max(0, getX());
-    int newY = std::max(0, getY());
-    newX = std::min(windowContainer->getWidth() - getWidth(), newX);
-    newY = std::min(windowContainer->getHeight() - getHeight(), newY);
-    setPosition(newX, newY);
+    // Keep guichan window inside screen when it may be moved
+    if (isMovable() && mIsMoving)
+    {
+        int newX = std::max(0, getX());
+        int newY = std::max(0, getY());
+        newX = std::min(windowContainer->getWidth() - getWidth(), newX);
+        newY = std::min(windowContainer->getHeight() - getHeight(), newY);
+        setPosition(newX, newY);
+    }
 
     if (mMouseResize && !mIsMoving)
     {
+        const int dx = event.getX() - mDragOffsetX +
+            ((event.getSource() == mGrip) ? mGrip->getX() : 0);
+        const int dy = event.getY() - mDragOffsetY +
+            ((event.getSource() == mGrip) ? mGrip->getY() : 0);
         gcn::Rectangle newDim = getDimension();
 
-        // We're dragging bottom right
-        newDim.width += event.getX() - mDragOffsetX;
-        newDim.height += event.getY() - mDragOffsetY;
+        if (mMouseResize & (TOP | BOTTOM))
+        {
+            int newHeight = newDim.height + ((mMouseResize & TOP) ? -dy : dy);
+            newDim.height = std::min(mMaxWinHeight,
+                                     std::max(mMinWinHeight, newHeight));
+
+            if (mMouseResize & TOP)
+            {
+                newDim.y -= newDim.height - getHeight();
+            }
+        }
+
+        if (mMouseResize & (LEFT | RIGHT))
+        {
+            int newWidth = newDim.width + ((mMouseResize & LEFT) ? -dx : dx);
+            newDim.width = std::min(mMaxWinWidth,
+                                    std::max(mMinWinWidth, newWidth));
+
+            if (mMouseResize & LEFT)
+            {
+                newDim.x -= newDim.width - getWidth();
+            }
+        }
 
         // Keep guichan window inside screen (supports resizing any side)
         if (newDim.x < 0)
@@ -338,29 +415,16 @@ void Window::mouseDragged(gcn::MouseEvent &event)
             newDim.height = windowContainer->getHeight() - newDim.y;
         }
 
-        // Keep the window at least its minimum size
-        if (newDim.width < mMinWinWidth)
-        {
-            newDim.width = mMinWinWidth;
-        }
-        else if (newDim.width > mMaxWinWidth)
-        {
-            newDim.width = mMaxWinWidth;
-        }
-
-        if (newDim.height < mMinWinHeight)
+        // Update mouse offset when dragging bottom or right border
+        if (mMouseResize & BOTTOM)
         {
-            newDim.height = mMinWinHeight;
+            mDragOffsetY += newDim.height - getHeight();
         }
-        else if (newDim.height > mMaxWinHeight)
+        if (mMouseResize & RIGHT)
         {
-            newDim.height = mMaxWinHeight;
+            mDragOffsetX += newDim.width - getWidth();
         }
 
-        // Update mouse offset when dragging bottom or right border
-        mDragOffsetX += newDim.width - getWidth();
-        mDragOffsetY += newDim.height - getHeight();
-
         // Set the new window and content dimensions
         setDimension(newDim);
         const gcn::Rectangle area = getChildrenArea();
@@ -368,15 +432,6 @@ void Window::mouseDragged(gcn::MouseEvent &event)
     }
 }
 
-gcn::Rectangle
-Window::getGripDimension()
-{
-    return gcn::Rectangle(getWidth() - resizeGrip->getWidth(),
-                          getHeight() - resizeGrip->getHeight(),
-                          getWidth(),
-                          getHeight());
-}
-
 void
 Window::loadWindowState()
 {
diff --git a/src/gui/window.h b/src/gui/window.h
index 31c260cf..03248908 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -30,11 +30,10 @@
 
 class ConfigListener;
 class GCContainer;
-class Image;
 class ImageRect;
+class ResizeGrip;
 class WindowContainer;
 
-
 /**
  * A window. This window can be dragged around and has a title bar. Windows are
  * invisible by default.
@@ -99,6 +98,21 @@ class Window : public gcn::Window
          */
         void setContentSize(int width, int height);
 
+        /**
+         * Sets the width of this window.
+         */
+        void setWidth(int width);
+
+        /**
+         * Sets the height of this window.
+         */
+        void setHeight(int height);
+
+        /**
+         * Sets the position and size of this window.
+         */
+        void setDimension(const gcn::Rectangle &dimension);
+
         /**
          * Sets the location relative to the given widget.
          */
@@ -168,16 +182,15 @@ class Window : public gcn::Window
         void scheduleDelete();
 
         /**
-         * Window dragging and resizing mouse related. These methods also makes
-         * sure the window is not dragged/resized outside of the screen.
+         * Starts window resizing when appropriate.
          */
         void mousePressed(gcn::MouseEvent &event);
-        void mouseDragged(gcn::MouseEvent &event);
 
         /**
-         * Gets the position of the resize grip.
+         * Implements window resizing and makes sure the window is not
+         * dragged/resized outside of the screen.
          */
-        gcn::Rectangle getGripDimension();
+        void mouseDragged(gcn::MouseEvent &event);
 
         /**
          * Sets the name of the window. This is not the window title.
@@ -214,37 +227,50 @@ class Window : public gcn::Window
          */
         virtual void resetToDefaultSize();
 
+        enum ResizeHandles
+        {
+            TOP    = 0x01,
+            RIGHT  = 0x02,
+            BOTTOM = 0x04,
+            LEFT   = 0x08
+        };
+
     protected:
-        GCContainer *mChrome;   /**< Contained container */
+        GCContainer *mChrome;      /**< Contained container */
+        ResizeGrip *mGrip;         /**< Resize grip */
         Window *mParent;           /**< The parent window */
         std::string mWindowName;   /**< Name of the window */
-        int mSnapSize;              /**< Snap distance to window edge */
         bool mShowTitle;           /**< Window has a title bar */
         bool mModal;               /**< Window is modal */
-        bool mResizable;            /**< Window can be resized */
-        bool mMouseResize;         /**< Window is being resized */
-        bool mSticky;              /**< Window resists minimzation */
-        int mMinWinWidth;           /**< Minimum window width */
-        int mMinWinHeight;          /**< Minimum window height */
-        int mMaxWinWidth;           /**< Maximum window width */
-        int mMaxWinHeight;          /**< Maximum window height */
+        bool mResizable;           /**< Window can be resized */
+        int mMouseResize;          /**< Window is being resized */
+        bool mSticky;              /**< Window resists minimization */
+        int mMinWinWidth;          /**< Minimum window width */
+        int mMinWinHeight;         /**< Minimum window height */
+        int mMaxWinWidth;          /**< Maximum window width */
+        int mMaxWinHeight;         /**< Maximum window height */
         int mDefaultX;             /**< Default window X position */
         int mDefaultY;             /**< Default window Y position */
         int mDefaultWidth;         /**< Default window width */
         int mDefaultHeight;        /**< Default window height */
 
         /** The window container windows add themselves to. */
-        static WindowContainer* windowContainer;
+        static WindowContainer *windowContainer;
 
         /**
-         * The config listener that listens to changes relevant to all
-         * windows
+         * The config listener that listens to changes relevant to all windows.
          */
         static ConfigListener *windowConfigListener;
 
         static int instances;      /**< Number of Window instances */
         static ImageRect border;   /**< The window border and background */
-        static Image *resizeGrip;  /**< The grip to resize window */
+
+        /**
+         * The width of the resize border. Is independent of the actual window
+         * border width, and determines mostly the size of the corner area
+         * where two borders are moved at the same time.
+         */
+        static const int resizeBorderWidth = 10;
 };
 
 #endif
diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp
new file mode 100644
index 00000000..35cc21ad
--- /dev/null
+++ b/src/imageparticle.cpp
@@ -0,0 +1,69 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "imageparticle.h"
+
+#include "graphics.h"
+
+#include "resources/image.h"
+
+ImageParticle::ImageParticle(Map *map, Image *image):
+    Particle(map),
+    mImage(image)
+{
+    mImage->incRef();
+}
+
+ImageParticle::~ImageParticle()
+{
+    mImage->decRef();
+}
+
+void ImageParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
+{
+    if (!mAlive)
+        return;
+
+    int screenX = (int) mPosX + offsetX - mImage->getWidth() / 2;
+    int screenY = (int) mPosY - (int) mPosZ + offsetY - mImage->getHeight()/2;
+
+    // Check if on screen
+    if (screenX + mImage->getWidth() < 0 ||
+            screenX > graphics->getWidth() ||
+            screenY + mImage->getHeight() < 0 ||
+            screenY > graphics->getHeight())
+    {
+        return;
+    }
+
+    float alphafactor = 1.0f;
+
+    if (mLifetimeLeft > -1 && mLifetimeLeft < mFadeOut)
+        alphafactor *= (float) mLifetimeLeft / (float) mFadeOut;
+
+    if (mLifetimePast < mFadeIn)
+        alphafactor *= (float) mLifetimePast / (float) mFadeIn;
+
+    mImage->setAlpha(alphafactor);
+    graphics->drawImage(mImage, screenX, screenY);
+}
diff --git a/src/imageparticle.h b/src/imageparticle.h
new file mode 100644
index 00000000..0ad515cc
--- /dev/null
+++ b/src/imageparticle.h
@@ -0,0 +1,61 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _IMAGEPARTICLE_H
+#define _IMAGEPARTICLE_H
+
+#include "particle.h"
+
+class Image;
+class Map;
+
+/**
+ * A particle that uses an image for its visualization.
+ */
+class ImageParticle : public Particle
+{
+    public:
+        /**
+         * Constructor. The image is reference counted by this particle.
+         *
+         * @param map   the map this particle appears on
+         * @param image an Image instance, may not be NULL
+         */
+        ImageParticle(Map *map, Image *image);
+
+        /**
+         * Destructor.
+         */
+        ~ImageParticle();
+
+        /**
+         * Draws the particle image
+         */
+        virtual void
+        draw(Graphics *graphics, int offsetX, int offsetY) const;
+
+    protected:
+        Image *mImage;   /**< The image used for this particle. */
+};
+
+#endif
diff --git a/src/main.cpp b/src/main.cpp
index bbbf0fd1..58c563ab 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -40,7 +40,7 @@
 
 #include <libxml/parser.h>
 
-#if (defined __USE_UNIX98 || defined __FreeBSD__ || defined __APPLE__)
+#ifndef WIN32
 #include <cerrno>
 #include <sys/stat.h>
 #endif
@@ -148,21 +148,21 @@ struct Options
  */
 void initHomeDir()
 {
-#if !(defined __USE_UNIX98 || defined __FreeBSD__ || defined __APPLE__)
-    homeDir = ".";
-#else
     homeDir = std::string(PHYSFS_getUserDir()) + "/.tmw";
-
+#if defined WIN32
+    if (!CreateDirectory(homeDir.c_str(), 0) &&
+            GetLastError() != ERROR_ALREADY_EXISTS)
+#else
     // Checking if /home/user/.tmw folder exists.
     if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) &&
             (errno != EEXIST))
+#endif
     {
         std::cout << homeDir
-                  << " can't be made, but it doesn't exist! Exiting."
+                  << " can't be created, but it doesn't exist! Exiting."
                   << std::endl;
         exit(1);
     }
-#endif
 }
 
 /**
@@ -236,11 +236,17 @@ void initEngine()
     static SDL_SysWMinfo pInfo;
     SDL_GetWMInfo(&pInfo);
     HICON icon = LoadIcon(GetModuleHandle(NULL), "A");
-    SetClassLong(pInfo.window, GCL_HICON, (LONG) icon);
+    if (icon)
+    {
+        SetClassLong(pInfo.window, GCL_HICON, (LONG) icon);
+    }
 #else
     SDL_Surface *icon = IMG_Load(TMW_DATADIR "data/icons/tmw.png");
-    SDL_SetAlpha(icon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
-    SDL_WM_SetIcon(icon, NULL);
+    if (icon)
+    {
+        SDL_SetAlpha(icon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
+        SDL_WM_SetIcon(icon, NULL);
+    }
 #endif
 
     ResourceManager *resman = ResourceManager::getInstance();
diff --git a/src/map.cpp b/src/map.cpp
index a6beb951..ac570627 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -29,6 +29,7 @@
 #include "beingmanager.h"
 #include "game.h"
 #include "graphics.h"
+#include "particle.h"
 #include "sprite.h"
 #include "tileset.h"
 
@@ -530,3 +531,25 @@ Map::findPath(int startX, int startY, int destX, int destY)
 
     return path;
 }
+
+void
+Map::addParticleEffect (std::string effectFile, int x, int y)
+{
+    ParticleEffectData newEffect;
+    newEffect.file = effectFile;
+    newEffect.x = x;
+    newEffect.y = y;
+    particleEffects.push_back(newEffect);
+}
+
+void
+Map::initializeParticleEffects(Particle* particleEngine)
+{
+    for (std::list<ParticleEffectData>::iterator i = particleEffects.begin();
+         i != particleEffects.end();
+         i++
+        )
+    {
+        particleEngine->addEffect(i->file, i->x, i->y);
+    }
+}
diff --git a/src/map.h b/src/map.h
index c8a6fdb3..17772847 100644
--- a/src/map.h
+++ b/src/map.h
@@ -32,8 +32,9 @@
 class AmbientOverlay;
 class Graphics;
 class Image;
-class Tileset;
+class Particle;
 class Sprite;
+class Tileset;
 
 struct PATH_NODE;
 
@@ -185,6 +186,17 @@ class Map : public Properties
         void
         removeSprite(SpriteIterator iterator);
 
+        /**
+         * Adds a particle effect
+         */
+        void addParticleEffect (std::string effectFile, int x, int y);
+
+        /**
+         * Initializes all added particle effects
+         */
+        void
+        initializeParticleEffects(Particle* particleEngine);
+
     private:
         /**
          * Converts a global tile id to the Image* pointing to the associated
@@ -220,10 +232,19 @@ class Map : public Properties
         // Pathfinding members
         int mOnClosedList, mOnOpenList;
 
-        //overlay Data
+        // Overlay Data
         std::list<AmbientOverlay*> mOverlays;
         float mLastScrollX;
         float mLastScrollY;
+
+        // Particle effect data
+        struct ParticleEffectData
+        {
+            std::string file;
+            int x;
+            int y;
+        };
+        std::list<ParticleEffectData> particleEffects;
 };
 
 #endif
diff --git a/src/monster.cpp b/src/monster.cpp
index bea5b7a5..768bf16a 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -93,6 +93,12 @@ Monster::handleAttack()
     sound.playSfx(mi.getSound(EVENT_HIT));
 }
 
+Being::TargetCursorSize
+Monster::getTargetCursorSize() const
+{
+    return getInfo().getTargetCursorSize();
+}
+
 const MonsterInfo&
 Monster::getInfo() const
 {
diff --git a/src/monster.h b/src/monster.h
index 39bbf3d7..4915520d 100644
--- a/src/monster.h
+++ b/src/monster.h
@@ -37,6 +37,9 @@ class Monster : public Being
 
         virtual Type getType() const;
 
+        virtual TargetCursorSize
+        getTargetCursorSize() const;
+
         /**
          * Handles an attack of another being by this monster. Plays a hit or
          * miss sound when appropriate.
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 53746671..f82a0fa8 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -34,6 +34,7 @@
 #include "../localplayer.h"
 #include "../log.h"
 #include "../main.h"
+#include "../particle.h"
 #include "../sound.h"
 
 const int EMOTION_TIME = 150;    /**< Duration of emotion icon */
@@ -240,13 +241,23 @@ void BeingHandler::handleMessage(MessageIn &msg)
             break;
 
         case SMSG_BEING_LEVELUP:
-            if ((Uint32) msg.readLong() == player_node->getId()) {
+            id = (Uint32) msg->readLong();
+
+            if (id == player_node->getId()) {
                 logger->log("Level up");
                 sound.playSfx("sfx/levelup.ogg");
-            } else {
+            }
+            else {
                 logger->log("Someone else went level up");
             }
-            msg.readLong();  // type
+            Particle *levelupFX;
+            if (msg->readLong() == 0) { // type
+                levelupFX = particleEngine->addEffect("graphics/particles/levelup.particle.xml", 0, 0);
+            }
+            else {
+                levelupFX = particleEngine->addEffect("graphics/particles/skillup.particle.xml", 0, 0);
+            }
+            beingManager->findBeing(id)->controlParticle(levelupFX);
             break;
 
         case SMSG_BEING_EMOTION:
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index ec6c1ee3..f4cda0b9 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -261,7 +261,7 @@ void OpenGLGraphics::drawPoint(int x, int y)
     setTexturingAndBlending(false);
 
     glBegin(GL_POINTS);
-    glVertex3i(x, y, 0);
+    glVertex2i(x, y);
     glEnd();
 }
 
@@ -270,12 +270,12 @@ void OpenGLGraphics::drawLine(int x1, int y1, int x2, int y2)
     setTexturingAndBlending(false);
 
     glBegin(GL_LINES);
-    glVertex3f(x1 + 0.5f, y1 + 0.5f, 0);
-    glVertex3f(x2 + 0.5f, y2 + 0.5f, 0);
+    glVertex2f(x1 + 0.5f, y1 + 0.5f);
+    glVertex2f(x2 + 0.5f, y2 + 0.5f);
     glEnd();
 
     glBegin(GL_POINTS);
-    glVertex3f(x2 + 0.5f, y2 + 0.5f, 0);
+    glVertex2f(x2 + 0.5f, y2 + 0.5f);
     glEnd();
 }
 
@@ -329,10 +329,10 @@ void OpenGLGraphics::drawRectangle(const gcn::Rectangle& rect, bool filled)
     setTexturingAndBlending(false);
 
     glBegin(filled ? GL_QUADS : GL_LINE_LOOP);
-    glVertex3f(rect.x + offset, rect.y + offset, 0);
-    glVertex3f(rect.x + rect.width - offset, rect.y + offset, 0);
-    glVertex3f(rect.x + rect.width - offset, rect.y + rect.height - offset, 0);
-    glVertex3f(rect.x + offset, rect.y + rect.height - offset, 0);
+    glVertex2f(rect.x + offset, rect.y + offset);
+    glVertex2f(rect.x + rect.width - offset, rect.y + offset);
+    glVertex2f(rect.x + rect.width - offset, rect.y + rect.height - offset);
+    glVertex2f(rect.x + offset, rect.y + rect.height - offset);
     glEnd();
 }
 
@@ -344,16 +344,16 @@ void OpenGLGraphics::drawTexedQuad(int x, int y, int w, int h,
     // Draw a textured quad
     glBegin(GL_QUADS);
     glTexCoord2f(texX1, texY1);
-    glVertex3i(x, y, 0);
+    glVertex2i(x, y);
 
     glTexCoord2f(texX2, texY1);
-    glVertex3i(x + w, y, 0);
+    glVertex2i(x + w, y);
 
     glTexCoord2f(texX2, texY2);
-    glVertex3i(x + w, y + h, 0);
+    glVertex2i(x + w, y + h);
 
     glTexCoord2f(texX1, texY2);
-    glVertex3i(x, y + h, 0);
+    glVertex2i(x, y + h);
     glEnd();
 }
 
diff --git a/src/particle.cpp b/src/particle.cpp
new file mode 100644
index 00000000..509c20ee
--- /dev/null
+++ b/src/particle.cpp
@@ -0,0 +1,370 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "particle.h"
+
+#include <cmath>
+
+#include "animationparticle.h"
+#include "configuration.h"
+#include "imageparticle.h"
+#include "log.h"
+#include "map.h"
+#include "particleemitter.h"
+#include "textparticle.h"
+
+#include "resources/resourcemanager.h"
+
+#include "utils/dtor.h"
+#include "utils/fastsqrt.h"
+#include "utils/xml.h"
+
+class Graphics;
+class Image;
+
+int Particle::particleCount = 0;
+int Particle::maxCount = 0;
+int Particle::fastPhysics = 0;
+int Particle::emitterSkip = 1;
+const float Particle::PARTICLE_SKY = 800.0f;
+
+Particle::Particle(Map *map):
+    mAlive(true),
+    mPosX(0.0f), mPosY(0.0f), mPosZ(0.0f),
+    mLifetimeLeft(-1),
+    mLifetimePast(0),
+    mFadeOut(0),
+    mFadeIn(0),
+    mAutoDelete(true),
+    mMap(map),
+    mVectorX(0.0f), mVectorY(0.0f), mVectorZ(0.0f),
+    mGravity(0.0f),
+    mRandomnes(0),
+    mBounce(0.0f),
+    mTarget(NULL),
+    mAcceleration(0.0f),
+    mInvDieDistance(-1.0f),
+    mMomentum(1.0f)
+{
+    Particle::particleCount++;
+    if (mMap) setSpriteIterator(mMap->addSprite(this));
+}
+
+
+void
+Particle::setupEngine()
+{
+    Particle::maxCount = (int)config.getValue("particleMaxCount", 3000);
+    Particle::fastPhysics = (int)config.getValue("particleFastPhysics", 0);
+    Particle::emitterSkip = (int)config.getValue("particleEmitterSkip", 0) + 1;
+    disableAutoDelete();
+    logger->log("Particle engine set up");
+}
+
+bool
+Particle::update()
+{
+    if (!mMap) return false;
+
+    if (mLifetimeLeft == 0)
+    {
+        mAlive = false;
+    }
+
+    if (mAlive)
+    {
+        // Update child emitters
+        if (mLifetimePast%Particle::emitterSkip == 0)
+        {
+            for (   EmitterIterator e = mChildEmitters.begin();
+                    e != mChildEmitters.end();
+                    e++
+                )
+            {
+                Particles newParticles = (*e)->createParticles();
+                for (   ParticleIterator p = newParticles.begin();
+                        p != newParticles.end();
+                        p++
+                    )
+                {
+                    (*p)->moveBy(mPosX, mPosY, mPosZ);
+                    mChildParticles.push_back (*p);
+                }
+            }
+        }
+
+        if (mMomentum != 1.0f)
+        {
+            mVectorX *= mMomentum;
+            mVectorY *= mMomentum;
+            mVectorZ *= mMomentum;
+        }
+
+        if (mTarget && mAcceleration != 0.0f)
+        {
+            float distX = mPosX - mTarget->getPosX();
+            float distY = mPosY - mTarget->getPosY();
+            float distZ = mPosZ - mTarget->getPosZ();
+            float invHypotenuse;
+
+            switch(Particle::fastPhysics)
+            {
+                case 1:
+                    invHypotenuse = fastInvSqrt(
+                        distX * distX + distY * distY + distZ * distZ);
+                    break;
+                case 2:
+                    invHypotenuse = 2.0f /
+                        fabs(distX) + fabs(distY) + fabs(distZ);
+                    break;
+                default:
+                    invHypotenuse = 1.0f / sqrt(
+                        distX * distX + distY * distY + distZ * distZ);
+                    break;
+            }
+
+            if (invHypotenuse)
+            {
+                if (mInvDieDistance > 0.0f && invHypotenuse > mInvDieDistance)
+                {
+                    mAlive = false;
+                }
+                float accFactor = invHypotenuse * mAcceleration;
+                mVectorX -= distX * accFactor;
+                mVectorY -= distY * accFactor;
+                mVectorZ -= distZ * accFactor;
+            }
+        }
+
+        if (mRandomnes > 0)
+        {
+            mVectorX += (rand()%mRandomnes - rand()%mRandomnes) / 1000.0f;
+            mVectorY += (rand()%mRandomnes - rand()%mRandomnes) / 1000.0f;
+            mVectorZ += (rand()%mRandomnes - rand()%mRandomnes) / 1000.0f;
+        }
+
+        mVectorZ -= mGravity;
+
+        // Update position
+        mPosX += mVectorX;
+        mPosY += mVectorY;
+        mPosZ += mVectorZ;
+
+        // Update other stuff
+        if (mLifetimeLeft > 0)
+        {
+            mLifetimeLeft--;
+        }
+        mLifetimePast++;
+
+        if (mPosZ > PARTICLE_SKY || mPosZ < 0.0f)
+        {
+            if (mBounce > 0.0f)
+            {
+                mPosZ *= -mBounce;
+                mVectorX *= mBounce;
+                mVectorY *= mBounce;
+                mVectorZ *= -mBounce;
+            }
+            else {
+                mAlive = false;
+            }
+        }
+    }
+
+    // Update child particles
+    for (   ParticleIterator p = mChildParticles.begin();
+            p != mChildParticles.end();
+
+        )
+    {
+        if ((*p)->update())
+        {
+            p++;
+        } else {
+            delete (*p);
+            p = mChildParticles.erase(p);
+        }
+    }
+
+    if (!mAlive && mChildParticles.empty() && mAutoDelete)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+
+void Particle::draw(Graphics *graphics, int offsetX, int offsetY) const
+{
+}
+
+
+Particle*
+Particle::addEffect(std::string particleEffectFile, int pixelX, int pixelY)
+{
+    Particle *newParticle = NULL;
+
+    // XML parser initialisation stuff
+    int size;
+    ResourceManager *resman = ResourceManager::getInstance();
+    char *data = (char*) resman->loadFile(particleEffectFile.c_str(), size);
+
+    if (!data) {
+        logger->log("Warning: Particle engine could not find %s !",
+                    particleEffectFile.c_str());
+        return NULL;
+    }
+
+    xmlDocPtr doc = xmlParseMemory(data, size);
+    free(data);
+
+    if (!doc) {
+        logger->log("Warning: Particle engine found syntax error in %s!",
+                    particleEffectFile.c_str());
+        return NULL;
+    }
+
+    xmlNodePtr rootNode = xmlDocGetRootElement(doc);
+    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "effect"))
+    {
+        logger->log("Warning: %s is not a valid particle effect definition file!",
+                    particleEffectFile.c_str());
+        return NULL;
+    }
+
+    // Parse particles
+    for_each_xml_child_node(effectChildNode, rootNode)
+    {
+        // We're only interested in particles
+        if (!xmlStrEqual(effectChildNode->name, BAD_CAST "particle"))
+            continue;
+
+        // Determine the exact particle type
+        xmlNodePtr node;
+
+        // Animation
+        if ((node = XML::findFirstChildByName(
+                        effectChildNode, "animation"))) {
+            newParticle = new AnimationParticle(mMap, node);
+        }
+        // Image
+        else if ((node = XML::findFirstChildByName(
+                        effectChildNode, "image"))) {
+            Image *img= resman->getImage((const char*)
+                    node->xmlChildrenNode->content);
+
+            newParticle = new ImageParticle(mMap, img);
+        }
+        // Other
+        else {
+            newParticle = new Particle(mMap);
+        }
+
+        // Read and set the basic properties of the particle
+        int offsetX = XML::getProperty(effectChildNode, "position-x", 0);
+        int offsetY = XML::getProperty(effectChildNode, "position-y", 0);
+        int offsetZ = XML::getProperty(effectChildNode, "position-z", 0);
+
+        int particleX = (int)mPosX + pixelX + offsetX;
+        int particleY = (int)mPosY + pixelY + offsetY;
+        int particleZ = (int)mPosZ          + offsetZ;
+
+        int lifetime = XML::getProperty(effectChildNode, "lifetime", -1);
+
+        newParticle->setPosition(particleX, particleY, particleZ);
+        newParticle->setLifetime(lifetime);
+
+        // Look for additional emitters for this particle
+        for_each_xml_child_node(emitterNode, effectChildNode)
+        {
+            if (!xmlStrEqual(emitterNode->name, BAD_CAST "emitter"))
+                continue;
+
+            ParticleEmitter *newEmitter;
+            newEmitter = new ParticleEmitter(emitterNode, newParticle, mMap);
+            newParticle->addEmitter(newEmitter);
+        }
+
+        mChildParticles.push_back(newParticle);
+    }
+
+    return newParticle;
+}
+
+
+Particle*
+Particle::addTextSplashEffect(std::string text,
+                              int colorR, int colorG, int colorB,
+                              gcn::Font *font, int x, int y)
+{
+    Particle *newParticle = new TextParticle(mMap, text, colorR, colorG, colorB,
+                                             font);
+    newParticle->setPosition(x, y, 0);
+    newParticle->setVector  (   ((rand()%100) - 50) / 200.0f,  // X vector
+                                ((rand()%100) - 50) / 200.0f,  // Y vector
+                                ((rand()%100) / 200.0f) + 4.0f // Z vector
+                            );
+    newParticle->setGravity(0.1f);
+    newParticle->setBounce(0.5f);
+    newParticle->setLifetime(200);
+    newParticle->setFadeOut(100);
+
+    mChildParticles.push_back(newParticle);
+
+    return newParticle;
+}
+
+
+void
+Particle::setMap(Map *map)
+{
+    mMap = map;
+    if (mMap) setSpriteIterator(mMap->addSprite(this));
+
+    // TODO: Create map emitters based on emitter data in map data
+}
+
+
+Particle::~Particle()
+{
+    // Remove from map sprite list
+    if (mMap) mMap->removeSprite(mSpriteIterator);
+    // Delete child emitters and child particles
+    clear();
+    Particle::particleCount--;
+}
+
+
+void
+Particle::clear()
+{
+    std::for_each(mChildEmitters.begin(), mChildEmitters.end(),
+            make_dtor(mChildEmitters));
+    mChildEmitters.clear();
+
+    std::for_each(mChildParticles.begin(), mChildParticles.end(),
+            make_dtor(mChildParticles));
+    mChildParticles.clear();
+}
diff --git a/src/particle.h b/src/particle.h
new file mode 100644
index 00000000..7a747a5f
--- /dev/null
+++ b/src/particle.h
@@ -0,0 +1,288 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _PARTICLE_H
+#define _PARTICLE_H
+
+#include <list>
+#include <string>
+
+#include <guichan/color.hpp>
+
+#include "guichanfwd.h"
+#include "sprite.h"
+
+
+class Map;
+class Particle;
+class ParticleEmitter;
+
+typedef std::list<Particle *> Particles;
+typedef Particles::iterator ParticleIterator;
+typedef std::list<ParticleEmitter *> Emitters;
+typedef Emitters::iterator EmitterIterator;
+
+/**
+ * A particle spawned by a ParticleEmitter.
+ */
+class Particle : public Sprite
+{
+    public:
+        static const float PARTICLE_SKY; /**< Maximum Z position of particles */
+        static int fastPhysics;          /**< Mode of squareroot calculation */
+        static int particleCount;        /**< Current number of particles */
+        static int maxCount;             /**< Maximum number of particles */
+        static int emitterSkip;          /**< Duration of pause between two emitter updates in ticks */
+
+        /**
+         * Constructor.
+         *
+         * @param map the map this particle will add itself to, may be NULL
+         */
+        Particle(Map *map);
+
+        /**
+         * Destructor.
+         */
+        ~Particle();
+
+        /**
+         * Deletes all child particles and emitters
+         */
+        void
+        clear();
+
+        /**
+         * Gives a particle the properties of an engine root particle and loads
+         * the particle-related config settings
+         */
+        void
+        setupEngine();
+
+        /**
+         * Updates particle position, returns false when the particle should
+         * be deleted
+         */
+        virtual bool
+        update();
+
+        /**
+         * Draws the particle image
+         */
+        virtual void
+        draw(Graphics *graphics, int offsetX, int offsetY) const;
+
+        /**
+         * Necessary for sorting with the other sprites
+         */
+        virtual int
+        getPixelY() const
+        {
+            return (int)(mPosY + mPosZ) - 64;
+        };
+
+        /*
+            Basic Particle properties:
+         */
+
+        /**
+         * Sets the map the particle is on.
+         */
+        void setMap(Map *map);
+
+        /**
+         * Creates a child particle that hosts some emitters described in the
+         * particleEffectFile.
+         */
+        Particle*
+        addEffect(std::string particleEffectFile, int pixelX, int pixelY);
+
+        /**
+         * Creates a standalone text particle.
+         */
+        Particle*
+        addTextSplashEffect(std::string text, int colorR, int colorG, int colorB,
+                            gcn::Font *font, int x, int y);
+
+        /**
+         * Adds an emitter to the particle.
+         */
+        void
+        addEmitter (ParticleEmitter* emitter)
+        { mChildEmitters.push_back(emitter); }
+
+        /**
+         * Sets the position in 3 dimensional space in pixels relative to map
+         */
+        void
+        setPosition(float x, float y, float z)
+        { mPosX = x; mPosY = y; mPosZ = z; }
+
+        /**
+         * Sets the position in 2 dimensional space in pixels relative to map
+         */
+        void
+        setPosition(float x, float y)
+        { mPosX = x; mPosY = y; }
+
+        float getPosX() const
+        { return mPosX; }
+
+        float getPosY() const
+        { return mPosY; }
+
+        float getPosZ() const
+        { return mPosZ; }
+
+        /**
+         * Changes the particle position relative
+         */
+        void
+        moveBy(float x, float y, float z)
+        { mPosX += x; mPosY += y; mPosZ += z; }
+
+        /**
+         * Sets the time in game ticks until the particle is destroyed.
+         */
+        void
+        setLifetime(int lifetime)
+        { mLifetimeLeft = lifetime; mLifetimePast = 0; }
+
+        /**
+         * Sets the age of the pixel in game ticks where the particle has
+         * faded in completely
+         */
+        void
+        setFadeOut (int fadeOut)
+        { mFadeOut = fadeOut; }
+
+        /**
+         * Sets the remaining particle lifetime where the particle starts to
+         * fade out
+         */
+        void
+        setFadeIn (int fadeIn)
+        { mFadeIn = fadeIn; }
+
+        /**
+         * Sets the sprite iterator of the particle on the current map to make
+         * it easier to remove the particle from the map when it is destroyed
+         */
+        void
+        setSpriteIterator(std::list<Sprite*>::iterator spriteIterator)
+        { mSpriteIterator = spriteIterator; }
+
+        /**
+         * Gets the sprite iterator of the particle on the current map
+         */
+        std::list<Sprite*>::iterator
+        getSpriteIterator() const
+        { return mSpriteIterator; }
+
+        /**
+         * Sets the current velocity in 3 dimensional space
+         */
+        void
+        setVector(float x, float y, float z)
+        { mVectorX = x; mVectorY = y; mVectorZ = z; }
+
+        /**
+         * Sets the downward acceleration
+         */
+        void
+        setGravity(float g)
+        { mGravity = g; }
+
+        /**
+         * Sets the ammount of random vector changes
+         */
+        void
+        setRandomnes(int r)
+        { mRandomnes = r; }
+
+        /**
+         * Sets the ammount of velocity particles retain after
+         * hitting the ground.
+         */
+        void
+        setBounce(float bouncieness)
+        { mBounce = bouncieness; }
+
+        /**
+         * Makes the particle move toward another particle with a
+         * given acceleration and momentum
+         */
+        void setDestination(Particle *target, float accel, float moment)
+        { mTarget = target; mAcceleration = accel; mMomentum = moment; }
+
+        /**
+         * Sets the distance in pixel the particle can come near the target
+         * particle before it is destroyed. Does only make sense after a
+         * target particle has been set using setDestination.
+         */
+        void setDieDistance(float dist)
+        { mInvDieDistance = 1.0f / dist; }
+
+        /**
+         * Manually marks the particle for deletion
+         */
+        void kill()
+        { mAlive = false; mAutoDelete = true; }
+
+        /**
+         * After calling this function the particle will only request
+         * deletion when kill() is called
+         */
+        void disableAutoDelete()
+        { mAutoDelete = false; }
+
+    protected:
+        bool mAlive;                /**< Is the particle supposed to be drawn and updated?*/
+        float mPosX, mPosY, mPosZ;  /**< Position in 3 dimensonal space - pixel based relative to map */
+        int mLifetimeLeft;          /**< Lifetime left in game ticks*/
+        int mLifetimePast;          /**< Age of the particle in game ticks*/
+        int mFadeOut;               /**< Lifetime in game ticks left where fading out begins*/
+        int mFadeIn;                /**< Age in game ticks where fading in is finished*/
+
+    private:
+        // generic properties
+        bool mAutoDelete;           /**< May the particle request its deletion by the parent particle?*/
+        Map *mMap;                  /**< Map the particle is on*/
+        std::list<Sprite*>::iterator mSpriteIterator;   /**< iterator of the particle on the current map */
+        Emitters mChildEmitters;    /**< List of child emitters*/
+        Particles mChildParticles;  /**< List of particles controlled by this particle*/
+        //dynamic particle
+        float mVectorX, mVectorY, mVectorZ; /**< Speed in 3 dimensional space in pixels per game-tick */
+        float mGravity;             /**< Downward acceleration in pixels per game-tick²*/
+        int mRandomnes;             /**< Ammount of random vector change*/
+        float mBounce;              /**< How much the particle bounces off when hitting the ground*/
+        //follow-point particles
+        Particle *mTarget;          /**< The particle that attracts this particle*/
+        float mAcceleration;        /**< Acceleration towards the target particle in pixels per game-tick²*/
+        float mInvDieDistance;      /**< Distance in pixels from the target particle that causes the destruction of the particle*/
+        float mMomentum;            /**< How much speed the particle retains after each game tick*/
+};
+
+extern Particle *particleEngine;
+
+#endif
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
new file mode 100644
index 00000000..2387c652
--- /dev/null
+++ b/src/particleemitter.cpp
@@ -0,0 +1,327 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "particleemitter.h"
+
+#include "animationparticle.h"
+#include "imageparticle.h"
+#include "log.h"
+#include "particle.h"
+
+#include "resources/animation.h"
+#include "resources/image.h"
+#include "resources/resourcemanager.h"
+#include "resources/imageset.h"
+
+#include <cmath>
+
+#define SIN45 0.707106781f
+#define DEG_RAD_FACTOR 0.017453293f
+
+ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *map):
+    mParticleImage(0)
+{
+    mMap = map;
+    mParticleTarget = target;
+
+    //initializing default values
+    mParticlePosX.set(0.0f);
+    mParticlePosY.set(0.0f);
+    mParticlePosZ.set(0.0f);
+    mParticleAngleHorizontal.set(0.0f);
+    mParticleAngleVertical.set(0.0f);
+    mParticlePower.set(0.0f);
+    mParticleGravity.set(0.0f);
+    mParticleRandomnes.set(0);
+    mParticleBounce.set(0.0f);
+    mParticleAcceleration.set(0.0f);
+    mParticleDieDistance.set(-1.0f);
+    mParticleMomentum.set(1.0f);
+    mParticleLifetime.set(-1);
+    mParticleFadeOut.set(0);
+    mParticleFadeIn.set(0);
+    mOutput.set(1);
+
+    for_each_xml_child_node(propertyNode, emitterNode)
+    {
+        if (xmlStrEqual(propertyNode->name, BAD_CAST "property"))
+        {
+            std::string name = XML::getProperty(propertyNode, "name", "");
+
+            if (name == "position-x")
+            {
+                mParticlePosX = readMinMax(propertyNode, 0.0f);
+            }
+            else if (name == "position-y")
+            {
+
+                mParticlePosY = readMinMax(propertyNode, 0.0f);
+             }
+            else if (name == "position-z")
+            {
+                mParticlePosZ = readMinMax(propertyNode, 0.0f);
+            }
+            else if (name == "image")
+            {
+                std::string image = XML::getProperty(propertyNode, "value", "");
+                // Don't leak when multiple images are defined
+                if (image != "" && !mParticleImage)
+                {
+                    ResourceManager *resman = ResourceManager::getInstance();
+                    mParticleImage = resman->getImage(image);
+                }
+            }
+            else if (name == "horizontal-angle")
+            {
+                mParticleAngleHorizontal = readMinMax(propertyNode, 0.0f);
+                mParticleAngleHorizontal.minVal *= DEG_RAD_FACTOR;
+                mParticleAngleHorizontal.maxVal *= DEG_RAD_FACTOR;
+            }
+            else if (name == "vertical-angle")
+            {
+                mParticleAngleVertical = readMinMax(propertyNode, 0.0f);
+                mParticleAngleVertical.minVal *= DEG_RAD_FACTOR;
+                mParticleAngleVertical.maxVal *= DEG_RAD_FACTOR;
+            }
+            else if (name == "power")
+            {
+                mParticlePower = readMinMax(propertyNode, 0.0f);
+            }
+            else if (name == "gravity")
+            {
+                mParticleGravity = readMinMax(propertyNode, 0.0f);
+            }
+            else if (name == "randomnes")
+            {
+                mParticleRandomnes = readMinMax(propertyNode, 0);
+            }
+            else if (name == "bounce")
+            {
+                mParticleBounce = readMinMax(propertyNode, 0.0f);
+            }
+            else if (name == "lifetime")
+            {
+                mParticleLifetime = readMinMax(propertyNode, 0);
+                mParticleLifetime.minVal += 1;
+            }
+            else if (name == "output")
+            {
+                mOutput = readMinMax(propertyNode, 0);
+                mOutput.maxVal +=1;
+            }
+            else if (name == "acceleration")
+            {
+                mParticleAcceleration = readMinMax(propertyNode, 0.0f);
+            }
+            else if (name == "die-distance")
+            {
+                mParticleDieDistance = readMinMax(propertyNode, 0.0f);
+            }
+            else if (name == "momentum")
+            {
+                mParticleMomentum = readMinMax(propertyNode, 1.0f);
+            }
+            else if (name == "fade-out")
+            {
+                mParticleFadeOut = readMinMax(propertyNode, 0);
+            }
+            else if (name == "fade-in")
+            {
+                mParticleFadeIn = readMinMax(propertyNode, 0);
+            }
+            else
+            {
+                logger->log("Particle Engine: Warning, unknown emitter property \"%s\"",
+                            name.c_str()
+                           );
+            }
+        }
+        else if (xmlStrEqual(propertyNode->name, BAD_CAST "emitter"))
+        {
+            ParticleEmitter newEmitter(propertyNode, mParticleTarget, map);
+            mParticleChildEmitters.push_back(newEmitter);
+        }
+        else if (xmlStrEqual(propertyNode->name, BAD_CAST "animation"))
+        {
+            ImageSet *imageset = ResourceManager::getInstance()->getImageSet(
+                XML::getProperty(propertyNode, "imageset", ""),
+                XML::getProperty(propertyNode, "width", 0),
+                XML::getProperty(propertyNode, "height", 0)
+            );
+
+            // Get animation frames
+            for_each_xml_child_node(frameNode, propertyNode)
+            {
+                int delay = XML::getProperty(frameNode, "delay", 0);
+                int offsetX = XML::getProperty(frameNode, "offsetX", 0);
+                int offsetY = XML::getProperty(frameNode, "offsetY", 0);
+                offsetY -= imageset->getHeight() - 32;
+                offsetX -= imageset->getWidth() / 2 - 16;
+
+                if (xmlStrEqual(frameNode->name, BAD_CAST "frame"))
+                {
+                    int index = XML::getProperty(frameNode, "index", -1);
+
+                    if (index < 0)
+                    {
+                        logger->log("No valid value for 'index'");
+                        continue;
+                    }
+
+                    Image *img = imageset->get(index);
+
+                    if (!img)
+                    {
+                        logger->log("No image at index " + (index));
+                        continue;
+                    }
+
+                    mParticleAnimation.addFrame(img, delay, offsetX, offsetY);
+                }
+                else if (xmlStrEqual(frameNode->name, BAD_CAST "sequence"))
+                {
+                    int start = XML::getProperty(frameNode, "start", -1);
+                    int end = XML::getProperty(frameNode, "end", -1);
+
+                    if (start < 0 || end < 0)
+                    {
+                        logger->log("No valid value for 'start' or 'end'");
+                        continue;
+                    }
+
+                    while (end >= start)
+                    {
+                        Image *img = imageset->get(start);
+
+                        if (!img)
+                        {
+                            logger->log("No image at index " +
+                                    (start));
+                            continue;
+                        }
+
+                        mParticleAnimation.addFrame(img, delay, offsetX, offsetY);
+                        start++;
+                    }
+                }
+                else if (xmlStrEqual(frameNode->name, BAD_CAST "end"))
+                {
+                    mParticleAnimation.addTerminator();
+                }
+            } // for frameNode
+        }
+    }
+}
+
+
+ParticleEmitter::~ParticleEmitter()
+{
+    if (mParticleImage)
+    {
+        mParticleImage->decRef();
+    }
+}
+
+
+template <typename T> MinMax<T>
+ParticleEmitter::readMinMax(xmlNodePtr propertyNode, T def)
+{
+    MinMax<T> retval;
+
+    def = (T)XML::getFloatProperty(propertyNode, "value", (double)def);
+    retval.set  (   (T)XML::getFloatProperty(propertyNode, "min", (double)def),
+                    (T)XML::getFloatProperty(propertyNode, "max", (double)def)
+                );
+
+    return retval;
+}
+
+
+std::list<Particle *>
+ParticleEmitter::createParticles()
+{
+    std::list<Particle *> newParticles;
+
+    for (int i = mOutput.value(); i > 0; i--)
+    {
+        // Limit maximum particles
+        if (Particle::particleCount > Particle::maxCount) break;
+
+        Particle *newParticle;
+        if (mParticleImage)
+        {
+            newParticle = new ImageParticle(mMap, mParticleImage);
+        }
+        else if (mParticleAnimation.getLength() > 0)
+        {
+            Animation *newAnimation = new Animation(mParticleAnimation);
+            newParticle = new AnimationParticle(mMap, newAnimation);
+        }
+        else
+        {
+            newParticle = new Particle(mMap);
+        }
+
+
+        newParticle->setPosition(
+            mParticlePosX.value(),
+            mParticlePosY.value(),
+            mParticlePosZ.value()
+        );
+
+        float angleH = mParticleAngleHorizontal.value();
+        float angleV = mParticleAngleVertical.value();
+        float power = mParticlePower.value();
+        newParticle->setVector(
+            cos(angleH) * cos(angleV) * power,
+            sin(angleH) * cos(angleV) * SIN45 * power,
+            sin(angleV) * SIN45 * power
+        );
+
+        newParticle->setRandomnes(mParticleRandomnes.value());
+        newParticle->setGravity(mParticleGravity.value());
+        newParticle->setBounce(mParticleBounce.value());
+
+        newParticle->setDestination(mParticleTarget,
+                                    mParticleAcceleration.value(),
+                                    mParticleMomentum.value()
+                                   );
+        newParticle->setDieDistance(mParticleDieDistance.value());
+
+        newParticle->setLifetime(mParticleLifetime.value());
+        newParticle->setFadeOut(mParticleFadeOut.value());
+        newParticle->setFadeIn(mParticleFadeIn.value());
+
+        for (   std::list<ParticleEmitter>::iterator i = mParticleChildEmitters.begin();
+                i != mParticleChildEmitters.end();
+                i++
+            )
+        {
+            newParticle->addEmitter(new ParticleEmitter(*i));
+        }
+
+        newParticles.push_back(newParticle);
+    }
+
+    return newParticles;
+}
diff --git a/src/particleemitter.h b/src/particleemitter.h
new file mode 100644
index 00000000..ca6d8622
--- /dev/null
+++ b/src/particleemitter.h
@@ -0,0 +1,120 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _PARTICLEEMITTER_H
+#define _PARTICLEEMITTER_H
+
+#include <list>
+
+#include "utils/xml.h"
+#include "utils/minmax.h"
+
+#include "resources/animation.h"
+
+class Image;
+class Map;
+class Particle;
+
+/**
+ * Every Particle can have one or more particle emitters that create new
+ * particles when they are updated
+ */
+class ParticleEmitter
+{
+    public:
+        /**
+         * Constructor.
+         */
+        ParticleEmitter(xmlNodePtr emitterNode,  Particle *target, Map *map);
+
+        /**
+         * Destructor.
+         */
+        ~ParticleEmitter();
+
+        /**
+         * Spawns new particles
+         * @return: a list of created particles
+         */
+        std::list<Particle *> createParticles();
+
+        /**
+         * Sets the target of the particles that are created
+         */
+        void
+        setTarget(Particle *target)
+        { mParticleTarget = target; };
+
+    private:
+        template <typename T> MinMax<T> readMinMax(xmlNodePtr propertyNode, T def);
+
+        /**
+         * initial position of particles:
+         */
+        MinMax<float> mParticlePosX, mParticlePosY, mParticlePosZ;
+
+        /**
+         * initial vector of particles:
+         */
+        MinMax<float> mParticleAngleHorizontal, mParticleAngleVertical;
+
+        /**
+         * Initial velocity of particles
+         */
+        MinMax<float> mParticlePower;
+
+        /*
+         * Vector changing of particles:
+         */
+        MinMax<float> mParticleGravity;
+        MinMax<int> mParticleRandomnes;
+        MinMax<float> mParticleBounce;
+
+        /*
+         * Properties of targeting particles:
+         */
+        Particle *mParticleTarget;
+        MinMax<float> mParticleAcceleration;
+        MinMax<float> mParticleDieDistance;
+        MinMax<float> mParticleMomentum;
+
+        /*
+         * Behavior over time of the particles:
+         */
+        MinMax<int> mParticleLifetime;
+        MinMax<int> mParticleFadeOut;
+        MinMax<int> mParticleFadeIn;
+
+        Map *mMap;             /**< Map the particles are spawned on */
+
+        MinMax<int> mOutput;   /**< Number of particles spawned per update */
+
+        Image *mParticleImage; /**< Particle image, if used */
+
+        /** Filename of particle animation file */
+        Animation mParticleAnimation;
+
+        /** List of emitters the spawned particles are equipped with */
+        std::list<ParticleEmitter> mParticleChildEmitters;
+};
+#endif
diff --git a/src/resources/animation.h b/src/resources/animation.h
index d0d11c69..aad93cda 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -54,7 +54,7 @@ class Animation
         Animation();
 
         /**
-         * Appends a new animation at the end of the sequence
+         * Appends a new animation at the end of the sequence.
          */
         void
         addFrame(Image *image, unsigned int delay, int offsetX, int offsetY);
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index a27783d4..d7d4e64b 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -187,19 +187,22 @@ Image* Image::load(void *buffer, unsigned int bufferSize,
 
     bool hasAlpha = false;
 
-    // Figure out whether the image uses its alpha layer
-    for (int i = 0; i < tmpImage->w * tmpImage->h; ++i)
+    if (tmpImage->format->BitsPerPixel == 32)
     {
-        Uint8 r, g, b, a;
-        SDL_GetRGBA(
-                ((Uint32*) tmpImage->pixels)[i],
-                tmpImage->format,
-                &r, &g, &b, &a);
-
-        if (a != 255)
+        // Figure out whether the image uses its alpha layer
+        for (int i = 0; i < tmpImage->w * tmpImage->h; ++i)
         {
-            hasAlpha = true;
-            break;
+            Uint8 r, g, b, a;
+            SDL_GetRGBA(
+                    ((Uint32*) tmpImage->pixels)[i],
+                    tmpImage->format,
+                    &r, &g, &b, &a);
+
+            if (a != 255)
+            {
+                hasAlpha = true;
+                break;
+            }
         }
     }
 
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index fda8916d..2230cb6a 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -231,6 +231,30 @@ MapReader::readMap(xmlNodePtr node, const std::string &path)
         {
             readProperties(childNode, map);
         }
+        else if (xmlStrEqual(childNode->name, BAD_CAST "objectgroup"))
+        {
+            for_each_xml_child_node(objectNode, childNode)
+            {
+                if (xmlStrEqual(objectNode->name, BAD_CAST "object"))
+                {
+                    std::string objName = XML::getProperty(objectNode, "name", "");
+                    std::string objType = XML::getProperty(objectNode, "type", "");
+                    int objX = XML::getProperty(objectNode, "x", 0);
+                    int objY = XML::getProperty(objectNode, "y", 0);
+
+                    logger->log("- Loading object name: %s type: %s at %d:%d",
+                                objName.c_str(), objType.c_str(), objX, objY);
+                    if (objType == "PARTICLE_EFFECT")
+                    {
+                        map->addParticleEffect(objName, objX, objY);
+                    }
+                    else
+                    {
+                        logger->log("   Warning: Unknown object type");
+                    }
+                }
+            }
+        }
     }
 
     map->initializeOverlays();
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index ac3ac3bc..89afc549 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -83,6 +83,27 @@ MonsterDB::load()
 
         currentInfo->setName (XML::getProperty(monsterNode, "name", "unnamed"));
 
+        std::string targetCursor;
+        targetCursor = XML::getProperty(monsterNode, "targetCursor", "medium");
+        if (targetCursor == "small")
+        {
+            currentInfo->setTargetCursorSize(Being::TC_SMALL);
+        }
+        else if (targetCursor == "medium")
+        {
+            currentInfo->setTargetCursorSize(Being::TC_MEDIUM);
+        }
+        else if (targetCursor == "large")
+        {
+            currentInfo->setTargetCursorSize(Being::TC_LARGE);
+        }
+        else
+        {
+            logger->log("MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one",
+                        targetCursor.c_str(), currentInfo->getName().c_str());
+            currentInfo->setTargetCursorSize(Being::TC_MEDIUM);
+        }
+
         //iterate <sprite>s and <sound>s
         for_each_xml_child_node(spriteNode, monsterNode)
         {
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index 05d4c014..d2a0a2c8 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -28,6 +28,9 @@
 #include <string>
 #include <vector>
 
+#include "../being.h"
+
+
 enum SoundEvent
 {
     EVENT_HIT,
@@ -62,7 +65,11 @@ class MonsterInfo
         setSprite(std::string filename) { mSprite = filename; }
 
         void
-        addSound (SoundEvent event, std::string filename);
+        setTargetCursorSize(Being::TargetCursorSize targetCursorSize)
+        { mTargetCursorSize = targetCursorSize; }
+
+        void
+        addSound(SoundEvent event, std::string filename);
 
         const std::string&
         getName () const { return mName; };
@@ -70,13 +77,16 @@ class MonsterInfo
         const std::string&
         getSprite () const { return mSprite; };
 
+        const Being::TargetCursorSize
+        getTargetCursorSize() const { return mTargetCursorSize; }
+
         std::string
         getSound (SoundEvent event) const;
 
     private:
         std::string mName;
         std::string mSprite;
-
+        Being::TargetCursorSize mTargetCursorSize;
         std::map<SoundEvent, std::vector<std::string>* > mSounds;
 };
 
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index 5fc35bcd..18e732ef 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -23,6 +23,91 @@
 
 #include "simpleanimation.h"
 
+#include "graphics.h"
+#include "log.h"
+
+#include "resources/image.h"
+#include "resources/resourcemanager.h"
+#include "resources/imageset.h"
+
+
+SimpleAnimation::SimpleAnimation(xmlNodePtr animationNode):
+    mAnimationTime(0),
+    mAnimationPhase(0)
+{
+    mAnimation = new Animation();
+
+    ImageSet *imageset = ResourceManager::getInstance()->getImageSet(
+        XML::getProperty(animationNode, "imageset", ""),
+        XML::getProperty(animationNode, "width", 0),
+        XML::getProperty(animationNode, "height", 0)
+    );
+
+    // Get animation frames
+    for (   xmlNodePtr frameNode = animationNode->xmlChildrenNode;
+            frameNode != NULL;
+            frameNode = frameNode->next)
+    {
+        int delay = XML::getProperty(frameNode, "delay", 0);
+        int offsetX = XML::getProperty(frameNode, "offsetX", 0);
+        int offsetY = XML::getProperty(frameNode, "offsetY", 0);
+        offsetY -= imageset->getHeight() - 32;
+        offsetX -= imageset->getWidth() / 2 - 16;
+
+        if (xmlStrEqual(frameNode->name, BAD_CAST "frame"))
+        {
+            int index = XML::getProperty(frameNode, "index", -1);
+
+            if (index < 0)
+            {
+                logger->log("No valid value for 'index'");
+                continue;
+            }
+
+            Image *img = imageset->get(index);
+
+            if (!img)
+            {
+                logger->log("No image at index " + (index));
+                continue;
+            }
+
+            mAnimation->addFrame(img, delay, offsetX, offsetY);
+        }
+        else if (xmlStrEqual(frameNode->name, BAD_CAST "sequence"))
+        {
+            int start = XML::getProperty(frameNode, "start", -1);
+            int end = XML::getProperty(frameNode, "end", -1);
+
+            if (start < 0 || end < 0)
+            {
+                logger->log("No valid value for 'start' or 'end'");
+                continue;
+            }
+
+            while (end >= start)
+            {
+                Image *img = imageset->get(start);
+
+                if (!img)
+                {
+                    logger->log("No image at index " +
+                            (start));
+                    continue;
+                }
+
+                mAnimation->addFrame(img, delay, offsetX, offsetY);
+                start++;
+            }
+        }
+        else if (xmlStrEqual(frameNode->name, BAD_CAST "end"))
+        {
+            mAnimation->addTerminator();
+        }
+    }
+
+    mCurrentFrame = mAnimation->getFrame(0);
+}
 
 void SimpleAnimation::update(unsigned int timePassed)
 {
diff --git a/src/simpleanimation.h b/src/simpleanimation.h
index a56c31da..561c540d 100644
--- a/src/simpleanimation.h
+++ b/src/simpleanimation.h
@@ -26,7 +26,10 @@
 
 #include "resources/animation.h"
 
+#include "utils/xml.h"
+
 class Frame;
+class Graphics;
 
 /**
  * This class is a leightweight alternative to the AnimatedSprite class.
@@ -35,6 +38,9 @@ class Frame;
 class SimpleAnimation
 {
     public:
+        /**
+         * Creates a simple animation with an already created animation.
+         */
         SimpleAnimation(Animation *animation):
             mAnimation(animation),
             mAnimationTime(0),
@@ -42,6 +48,11 @@ class SimpleAnimation
             mCurrentFrame(mAnimation->getFrame(0))
         {};
 
+        /**
+         * Creates a simple animation that creates its animation from XML Data.
+         */
+        SimpleAnimation(xmlNodePtr animationNode);
+
         ~SimpleAnimation();
 
         void update(unsigned int timePassed);
@@ -55,10 +66,10 @@ class SimpleAnimation
         /** Time in game ticks the current frame is shown. */
         unsigned int mAnimationTime;
 
-        /** Index of current animation frame. */
+        /** Index of current animation phase. */
         unsigned int mAnimationPhase;
 
-        /** Current animation frame. */
+        /** Current animation phase. */
         Frame *mCurrentFrame;
 };
 
diff --git a/src/sprite.h b/src/sprite.h
index 51811149..89780519 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -49,6 +49,22 @@ class Sprite
         virtual void
         draw(Graphics *graphics, int offsetX, int offsetY) const = 0;
 
+        /**
+         * Returns the horizontal size of the sprites graphical representation
+         * in pixels or 0 when it is undefined.
+         */
+        virtual int
+        getWidth() const
+        { return 0; }
+
+        /**
+         * Returns the vertical size of the sprites graphical representation
+         * in pixels or 0 when it is undefined.
+         */
+        virtual int
+        getHeight() const
+        { return 0; }
+
         /**
          * Returns the pixel Y coordinate of the sprite.
          */
diff --git a/src/textparticle.cpp b/src/textparticle.cpp
new file mode 100644
index 00000000..dd01d2fe
--- /dev/null
+++ b/src/textparticle.cpp
@@ -0,0 +1,64 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "textparticle.h"
+
+#include "graphics.h"
+
+TextParticle::TextParticle(Map *map, const std::string &text,
+        int colorR, int colorG, int colorB, gcn::Font *font):
+    Particle(map),
+    mText(text),
+    mTextFont(font),
+    mColorR(colorR),
+    mColorG(colorG),
+    mColorB(colorB)
+{
+}
+
+void TextParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
+{
+    if (!mAlive)
+        return;
+
+    int screenX = (int)mPosX + offsetX;
+    int screenY = (int)mPosY - int(mPosZ) + offsetY;
+
+    int alpha = 255;
+
+    if (mLifetimeLeft > -1 && mLifetimeLeft < mFadeOut)
+    {
+        alpha *= mLifetimeLeft;
+        alpha /= mFadeOut;
+    };
+
+    if (mLifetimePast < mFadeIn)
+    {
+        alpha *= mLifetimePast;
+        alpha /= mFadeIn;
+    }
+
+    graphics->setFont(mTextFont);
+    graphics->setColor(gcn::Color (mColorR, mColorG, mColorB, alpha));
+    graphics->drawText(mText, screenX, screenY, gcn::Graphics::CENTER);
+}
diff --git a/src/textparticle.h b/src/textparticle.h
new file mode 100644
index 00000000..b365c885
--- /dev/null
+++ b/src/textparticle.h
@@ -0,0 +1,53 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TEXTPARTICLE_H
+#define _TEXTPARTICLE_H
+
+#include "particle.h"
+
+#include <guichan/color.hpp>
+
+#include "guichanfwd.h"
+
+class TextParticle : public Particle
+{
+    public:
+        TextParticle(Map *map, const std::string &text,
+                int colorR, int colorG, int colorB, gcn::Font *font);
+        /**
+         * Draws the particle image
+         */
+        virtual void
+        draw(Graphics *graphics, int offsetX, int offsetY) const;
+
+        // hack to improve text visibility
+        virtual int getPixelY() const { return (int)(mPosY + mPosZ); }
+
+    private:
+        std::string mText;              /**< Text of the particle */
+        gcn::Font *mTextFont;           /**< Font used for drawing the text */
+        int mColorR, mColorG, mColorB;  /**< Color used for drawing the text */
+};
+
+#endif
diff --git a/src/utils/fastsqrt.h b/src/utils/fastsqrt.h
new file mode 100644
index 00000000..8da1d354
--- /dev/null
+++ b/src/utils/fastsqrt.h
@@ -0,0 +1,24 @@
+/* A very fast function to calculate the approximate inverse square root of a
+ * floating point value and a helper function that uses it for getting the
+ * normal squareroot. For an explanation of the inverse squareroot function
+ * read:
+ * http://www.math.purdue.edu/~clomont/Math/Papers/2003/InvSqrt.pdf
+ *
+ * Unfortunately the original creator of this function seems to be unknown.
+ */
+
+float fastInvSqrt(float x)
+{
+    union { int i; float x; } tmp;
+    float xhalf = 0.5f * x;
+    tmp.x = x;
+    tmp.i = 0x5f375a86 - (tmp.i >> 1);
+    x = tmp.x;
+    x = x * (1.5f - xhalf * x * x);
+    return x;
+}
+
+float fastSqrt(float x)
+{
+    return 1.0f / fastInvSqrt(x);
+}
diff --git a/src/utils/minmax.h b/src/utils/minmax.h
new file mode 100644
index 00000000..1add2b7e
--- /dev/null
+++ b/src/utils/minmax.h
@@ -0,0 +1,47 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+/**
+ * Returns a random numeric value that is larger than or equal min and smaller
+ * than max
+ */
+
+template <typename T> struct MinMax
+{
+    void set(T min, T max)
+    {
+        minVal=min; maxVal=max;
+    }
+
+    void set(T val)
+    {
+        set(val, val);
+    }
+
+    T value()
+    {
+        return (T)(minVal + (maxVal - minVal) * (rand() / ((double) RAND_MAX + 1)));
+    }
+
+    T minVal;
+    T maxVal;
+};
diff --git a/src/utils/wingettimeofday.h b/src/utils/wingettimeofday.h
index a5537f39..28afb7e5 100644
--- a/src/utils/wingettimeofday.h
+++ b/src/utils/wingettimeofday.h
@@ -1,113 +1,113 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#ifndef _TMW_WINGETTIMEOFDAY_H_
-#define _TMW_WINGETTIMEOFDAY_H_
-
-#ifdef WIN32
-
-#include <windows.h>
-
-/*
- * the function gettimeofday() is available on UNIX but not on windows.
- * this header defines a windows implementation as a
- * GetSystemTimeAsFileTime() wrapper.
- */
-
-int gettimeofday(struct timeval* tv, void *tz)
-/*---------------------------------------------------------------
- * Copyright (c) 1999,2000,2001,2002,2003
- * The Board of Trustees of the University of Illinois
- * All Rights Reserved.
- *---------------------------------------------------------------
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software (Iperf) and associated
- * documentation files (the "Software"), to deal in the Software
- * without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- *
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and
- * the following disclaimers.
- *
- *
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimers in the documentation and/or other materials
- * provided with the distribution.
- *
- *
- * Neither the names of the University of Illinois, NCSA,
- * nor the names of its contributors may be used to endorse
- * or promote products derived from this Software without
- * specific prior written permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE CONTIBUTORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * ________________________________________________________________
- * National Laboratory for Applied Network Research
- * National Center for Supercomputing Applications
- * University of Illinois at Urbana-Champaign
- * http://www.ncsa.uiuc.edu
- * ________________________________________________________________
- *
- * gettimeofday.c
- * by Mark Gates <mgates@nlanr.net>
- * -------------------------------------------------------------------
- * A (hack) implementation of gettimeofday for Windows.
- * Since I send sec/usec in UDP packets, this made the most sense.
- * ------------------------------------------------------------------- */
-{
-    FILETIME time;
-    double   timed;
-
-    GetSystemTimeAsFileTime( &time );
-
-    // Apparently Win32 has units of 1e-7 sec (tenths of microsecs)
-    // 4294967296 is 2^32, to shift high word over
-    // 11644473600 is the number of seconds between
-    // the Win32 epoch 1601-Jan-01 and the Unix epoch 1970-Jan-01
-    // Tests found floating point to be 10x faster than 64bit int math.
-
-    timed = ((time.dwHighDateTime * 4294967296e-7) - 11644473600.0) +
-            (time.dwLowDateTime  * 1e-7);
-
-    tv->tv_sec  = (long) timed;
-    tv->tv_usec = (long) ((timed - tv->tv_sec) * 1e6);
-
-    return 0;
-}
-
-
-#endif // WIN32
-#endif
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_WINGETTIMEOFDAY_H_
+#define _TMW_WINGETTIMEOFDAY_H_
+
+#ifdef WIN32
+
+#include <windows.h>
+
+/*
+ * the function gettimeofday() is available on UNIX but not on windows.
+ * this header defines a windows implementation as a
+ * GetSystemTimeAsFileTime() wrapper.
+ */
+
+int gettimeofday(struct timeval* tv, void *tz)
+/*---------------------------------------------------------------
+ * Copyright (c) 1999,2000,2001,2002,2003
+ * The Board of Trustees of the University of Illinois
+ * All Rights Reserved.
+ *---------------------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software (Iperf) and associated
+ * documentation files (the "Software"), to deal in the Software
+ * without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit
+ * persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ *
+ * Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and
+ * the following disclaimers.
+ *
+ *
+ * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimers in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ *
+ * Neither the names of the University of Illinois, NCSA,
+ * nor the names of its contributors may be used to endorse
+ * or promote products derived from this Software without
+ * specific prior written permission.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE CONTIBUTORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * ________________________________________________________________
+ * National Laboratory for Applied Network Research
+ * National Center for Supercomputing Applications
+ * University of Illinois at Urbana-Champaign
+ * http://www.ncsa.uiuc.edu
+ * ________________________________________________________________
+ *
+ * gettimeofday.c
+ * by Mark Gates <mgates@nlanr.net>
+ * -------------------------------------------------------------------
+ * A (hack) implementation of gettimeofday for Windows.
+ * Since I send sec/usec in UDP packets, this made the most sense.
+ * ------------------------------------------------------------------- */
+{
+    FILETIME time;
+    double   timed;
+
+    GetSystemTimeAsFileTime( &time );
+
+    // Apparently Win32 has units of 1e-7 sec (tenths of microsecs)
+    // 4294967296 is 2^32, to shift high word over
+    // 11644473600 is the number of seconds between
+    // the Win32 epoch 1601-Jan-01 and the Unix epoch 1970-Jan-01
+    // Tests found floating point to be 10x faster than 64bit int math.
+
+    timed = ((time.dwHighDateTime * 4294967296e-7) - 11644473600.0) +
+            (time.dwLowDateTime  * 1e-7);
+
+    tv->tv_sec  = (long) timed;
+    tv->tv_usec = (long) ((timed - tv->tv_sec) * 1e6);
+
+    return 0;
+}
+
+
+#endif // WIN32
+#endif
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 7c917dc0..e30450f0 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -39,6 +39,20 @@ namespace XML
         return ret;
     }
 
+    double
+    getFloatProperty(xmlNodePtr node, const char* name, double def)
+    {
+        double &ret = def;
+
+        xmlChar *prop = xmlGetProp(node, BAD_CAST name);
+        if (prop) {
+            ret = atof((char*)prop);
+            xmlFree(prop);
+        }
+
+        return ret;
+    }
+
     std::string
     getProperty(xmlNodePtr node, const char *name, const std::string &def)
     {
@@ -51,4 +65,13 @@ namespace XML
 
         return def;
     }
+
+    xmlNodePtr findFirstChildByName(xmlNodePtr parent, const char *name)
+    {
+        for_each_xml_child_node(child, parent)
+            if (xmlStrEqual(child->name, BAD_CAST name))
+                return child;
+
+        return NULL;
+    }
 }
diff --git a/src/utils/xml.h b/src/utils/xml.h
index db4c264a..ef3bad3d 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -39,11 +39,22 @@ namespace XML
     int
     getProperty(xmlNodePtr node, const char *name, int def);
 
+    /**
+     * Gets an floating point property from an xmlNodePtr.
+     */
+    double
+    getFloatProperty(xmlNodePtr node, const char *name, double def);
+
     /**
      * Gets a string property from an xmlNodePtr.
      */
     std::string
     getProperty(xmlNodePtr node, const char *name, const std::string &def);
+
+    /**
+     * Finds the first child node with the given name
+     */
+    xmlNodePtr findFirstChildByName(xmlNodePtr parent, const char *name);
 }
 
 #define for_each_xml_child_node(var, parent) \
-- 
cgit v1.2.3-70-g09d2


From 1a9320fafb23940d0463e6f384713d0f99fc0c61 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Wed, 19 Sep 2007 17:28:33 +0000
Subject: Merged 0.0 changes from revision 3362 to 3580 to trunk.

---
 ChangeLog                                | 306 ++++++++++++++++++++++++++++++-
 data/graphics/gui/CMakeLists.txt         |   4 +
 data/graphics/gui/Makefile.am            |   4 +
 data/graphics/gui/close_button.png       | Bin 0 -> 650 bytes
 data/graphics/gui/hits_yellow.png        | Bin 356 -> 894 bytes
 data/graphics/gui/item_shortcut_bgr.png  | Bin 0 -> 1026 bytes
 data/graphics/gui/mouse.png              | Bin 1134 -> 4508 bytes
 data/graphics/gui/unknown-item.png       | Bin 0 -> 540 bytes
 data/graphics/images/login_wallpaper.png | Bin 215527 -> 643307 bytes
 src/CMakeLists.txt                       |  22 ++-
 src/Makefile.am                          |  38 ++--
 src/animationparticle.cpp                |   3 +-
 src/being.cpp                            |  90 ++-------
 src/being.h                              |  42 +----
 src/game.cpp                             | 179 ++++++++++--------
 src/gui/button.cpp                       |  20 +-
 src/gui/button.h                         |  10 +-
 src/gui/buy.cpp                          | 125 ++++++++-----
 src/gui/buy.h                            |  10 +-
 src/gui/char_select.cpp                  |  12 +-
 src/gui/char_select.h                    |  31 ++--
 src/gui/chat.cpp                         |  10 +-
 src/gui/debugwindow.cpp                  |  14 +-
 src/gui/debugwindow.h                    |   9 +-
 src/gui/equipmentwindow.cpp              |   1 +
 src/gui/gui.cpp                          |  45 +++--
 src/gui/gui.h                            |  43 +++--
 src/gui/inventorywindow.cpp              |  13 +-
 src/gui/inventorywindow.h                |  11 +-
 src/gui/itemcontainer.cpp                |   4 +
 src/gui/itemshortcutcontainer.cpp        | 224 ++++++++++++++++++++++
 src/gui/itemshortcutcontainer.h          | 115 ++++++++++++
 src/gui/itemshortcutwindow.cpp           |  74 ++++++++
 src/gui/itemshortcutwindow.h             |  69 +++++++
 src/gui/menuwindow.cpp                   |  12 +-
 src/gui/popupmenu.cpp                    |   6 -
 src/gui/selectionlistener.h              |  16 +-
 src/gui/sell.cpp                         | 127 +++++++------
 src/gui/sell.h                           |  16 +-
 src/gui/setup.cpp                        |  10 +-
 src/gui/setup_keyboard.cpp               | 187 +++++++++++++++++++
 src/gui/setup_keyboard.h                 |  84 +++++++++
 src/gui/shoplistbox.cpp                  |  20 +-
 src/gui/skill.cpp                        |   6 +-
 src/gui/skill.h                          |   1 -
 src/gui/status.cpp                       |   6 +-
 src/gui/status.h                         |   3 +-
 src/gui/updatewindow.cpp                 |   4 +-
 src/gui/viewport.cpp                     |  25 +--
 src/gui/viewport.h                       |  13 --
 src/gui/window.cpp                       | 198 +++++++++++++++++---
 src/gui/window.h                         |  99 +++++++++-
 src/gui/windowlistener.h                 |  86 +++++++++
 src/imageparticle.cpp                    |   8 +-
 src/itemshortcut.cpp                     |  87 +++++++++
 src/itemshortcut.h                       | 130 +++++++++++++
 src/keyboardconfig.cpp                   | 144 +++++++++++++++
 src/keyboardconfig.h                     | 185 +++++++++++++++++++
 src/localplayer.cpp                      |  43 ++++-
 src/localplayer.h                        |  22 +++
 src/main.cpp                             |  19 +-
 src/monster.cpp                          |  10 +-
 src/net/beinghandler.cpp                 |  84 +++++----
 src/net/chathandler.cpp                  |   2 +
 src/net/inventoryhandler.cpp             |   2 +
 src/net/playerhandler.cpp                |   3 +-
 src/particle.cpp                         |  96 +++++-----
 src/particle.h                           | 112 +++++------
 src/particleemitter.cpp                  |  30 ++-
 src/player.cpp                           |  50 ++---
 src/player.h                             |   3 -
 src/resources/equipmentdb.cpp            | 156 ----------------
 src/resources/equipmentdb.h              |  55 ------
 src/resources/equipmentinfo.h            |  52 ------
 src/resources/itemdb.cpp                 | 126 ++++++++++---
 src/resources/iteminfo.cpp               |  86 ++++++++-
 src/resources/iteminfo.h                 | 118 +++++++-----
 src/resources/mapreader.cpp              |   2 +-
 src/resources/monsterdb.cpp              |   8 +-
 src/resources/monsterinfo.cpp            |  12 +-
 src/resources/monsterinfo.h              |  16 +-
 src/resources/spritedef.h                |   4 +-
 src/textparticle.cpp                     |  11 +-
 src/textparticle.h                       |  17 +-
 src/utils/fastsqrt.h                     |   2 +
 src/utils/minmax.h                       |   1 +
 src/utils/trim.h                         |  53 ++++++
 src/vector.h                             | 134 ++++++++++++++
 tools/adler32.c                          |  67 +++++++
 89 files changed, 3257 insertions(+), 1140 deletions(-)
 create mode 100644 data/graphics/gui/close_button.png
 create mode 100644 data/graphics/gui/item_shortcut_bgr.png
 create mode 100644 data/graphics/gui/unknown-item.png
 create mode 100644 src/gui/itemshortcutcontainer.cpp
 create mode 100644 src/gui/itemshortcutcontainer.h
 create mode 100644 src/gui/itemshortcutwindow.cpp
 create mode 100644 src/gui/itemshortcutwindow.h
 create mode 100644 src/gui/setup_keyboard.cpp
 create mode 100644 src/gui/setup_keyboard.h
 create mode 100644 src/gui/windowlistener.h
 create mode 100644 src/itemshortcut.cpp
 create mode 100644 src/itemshortcut.h
 create mode 100644 src/keyboardconfig.cpp
 create mode 100644 src/keyboardconfig.h
 delete mode 100644 src/resources/equipmentdb.cpp
 delete mode 100644 src/resources/equipmentdb.h
 delete mode 100644 src/resources/equipmentinfo.h
 create mode 100644 src/utils/trim.h
 create mode 100644 src/vector.h
 create mode 100644 tools/adler32.c

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index 082c9b94..d0e43d40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 
 	* src/gui/button.cpp: Fixed improper const qualifier.
 
+2007-09-12  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* data/items.xml, data/equipment.xml: Added temporary weapon IDs below
+	256 to use as view-ID in eAthena's item DB.
+	* src/gui/shoplistbox.cpp, src/gui/buy.h, src/gui/buy.cpp: Allowed
+	selection of items that cannot be afforded, so that their descriptions
+	are still accessible. Also made sure the player's money value of
+	ShopItemList gets updated.
+
+2007-09-11  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* src/gui/chat.cpp, tmw.cbp: Fixed admin commands.
+
 2007-09-10  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
 	* configure.ac, data/fonts/dejavusans.ttf,
@@ -18,17 +31,103 @@
 	* po/LINGUAS: Added German to the list of available languages.
 	* po/de.po: Fixed two syntax errors preventing compilation.
 
-2007-08-27  Matthias Hartmann  <hartmann.matthias@gmail.com>
+2007-09-08  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/particles/aniblaze.png,
+	data/graphics/particles/cookingfire.particle.xml,
+	data/graphics/particles/fireplace.particle.xml,
+	data/graphics/particles/flame.particle.xml: Improved fire effects by
+	using animated particles.
 
-	* po/de.po: Added german translation.
+2007-09-06  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/animationparticle.cpp, src/imageparticle.cpp: Fixed animated
+	particles.
+
+2007-09-01  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/Makefile.am: Fixed the entry for windowlistener.h.
+
+2007-08-30  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/localplayer.cpp, src/player.cpp, src/main.cpp, src/being.cpp,
+	src/CMakeLists.txt, src/Makefile.am, src/resources/iteminfo.h,
+	src/resources/equipmentdb.h, src/resources/equipmentinfo.h,
+	src/resources/itemdb.cpp, src/resources/iteminfo.cpp,
+	src/resources/equipmentdb.cpp, src/resources/equipmentinfo.cpp,
+	src/resources/spritedef.h, src/being.h, data/items.xml,
+	data/equipment.xml: Merged equipment database with items database and
+	got rid of the unused item art attribute.
+	* src/net/beinghandler.cpp, src/net/charserverhandler.cpp: Removed the
+	now unnecessary multiplication of weapon IDs with 10000.
+	* src/resources/iteminfo.cpp, data/graphics/items/unknown.png: Added
+	fallback item icon and use it for unknown items or when item image
+	fails to load.
+	* NEWS: Updated with changes since last update.
+	* data/items.xml, data/equipment.xml: Reverted equipment database and
+	included original low-ID items in items.xml for compatibility with
+	eAthena, which doesn't support View ID to come above 255.
+	* src/resources/itemdb.cpp: Accept items without a name.
+
+2007-08-29  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/sell.cpp, src/gui/inventorywindow.cpp, src/gui/sell.h: Made
+	sell dialog resizable and tweaked inventory resize code a bit.
+	* data/items.xml: Fixed typo in chainmail description.
+
+2007-08-28  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/window.cpp, src/gui/inventorywindow.h,
+	src/gui/selectionlistener.h, src/gui/buy.h,
+	src/gui/itemshortcutwindow.cpp, src/gui/inventorywindow.cpp,
+	src/gui/buy.cpp, src/gui/window.h, src/gui/windowlistener.h,
+	src/gui/itemshortcutwindow.h, src/CMakeLists.txt, src/Makefile.am:
+	Made buy dialog resizable and added a WindowListener class for
+	listening for window resize and move events.
+	* src/textparticle.h, src/particle.h, src/CMakeLists.txt,
+	src/particle.cpp, src/imageparticle.cpp, src/vector.h,
+	src/textparticle.cpp, src/Makefile.am: Added Vector class and used it
+	in the particle engine.
+
+2007-08-27  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/engine.cpp, src/resources/mapreader.cpp: Made client search for
+	both compressed and non-compressed map files.
 
 2007-08-27  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
+	* src/game.cpp: Assigned unused emotions to Alt +/-. (applied a patch
+	by Quiche_on_a_leash).
+	* data/maps/new_1-1.tmx, data/maps/new_1-1.tmx.gz,
+	data/maps/new_10-1.tmx, data/maps/new_10-1.tmx.gz,
+	data/maps/new_11-1.tmx, data/maps/new_11-1.tmx.gz,
+	data/maps/new_12-1.tmx, data/maps/new_12-1.tmx.gz,
+	data/maps/new_13-1.tmx, data/maps/new_13-1.tmx.gz,
+	data/maps/new_14-1.tmx, data/maps/new_14-1.tmx.gz,
+	data/maps/new_15-1.tmx, data/maps/new_15-1.tmx.gz,
+	data/maps/new_16-1.tmx, data/maps/new_16-1.tmx.gz,
+	data/maps/new_17-1.tmx, data/maps/new_17-1.tmx.gz,
+	data/maps/new_18-1.tmx, data/maps/new_18-1.tmx.gz,
+	data/maps/new_19-1.tmx, data/maps/new_19-1.tmx.gz,
+	data/maps/new_2-1.tmx, data/maps/new_2-1.tmx.gz,
+	data/maps/new_20-1.tmx, data/maps/new_20-1.tmx.gz,
+	data/maps/new_3-1.tmx, data/maps/new_3-1.tmx.gz,
+	data/maps/new_4-1.tmx, data/maps/new_4-1.tmx.gz,
+	data/maps/new_5-1.tmx, data/maps/new_5-1.tmx.gz,
+	data/maps/new_6-1.tmx, data/maps/new_6-1.tmx.gz,
+	data/maps/new_7-1.tmx, data/maps/new_7-1.tmx.gz,
+	data/maps/new_8-1.tmx, data/maps/new_8-1.tmx.gz,
+	data/maps/new_9-1.tmx, data/maps/new_9-1.tmx.gz: Replaced compressed
+	maps with layer compressed maps.
 	* data/maps/new_1-1.tmx.gz: Added test npcs.
 	* src/openglgraphics.cpp, tmw.cbp: Fixed compilation with old OpenGL
 	headers.
 	* po/it.po: Updated italian translation.
 
+2007-08-27  Matthias Hartmann  <hartmann.matthias@gmail.com>
+
+	* po/de.po: Added German translation.
+
 2007-08-27  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
 	* src/gui/chat.h, src/gui/chat.cpp: Added "/admin" chat command for
@@ -36,6 +135,11 @@
 	* src/engine.cpp, src/resources/mapreader.cpp: Ported patch from 0.0,
 	in order to support missing extensions and uncompressed maps.
 
+2007-08-26  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* src/gui/updatewindow.cpp, src/main.cpp, tmw.cbp: Removed home dir
+	from config file to avoid encoding issues.
+
 2007-08-26  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
 	* src/gui/button.cpp: Fixed incorrect button dimensions, as they mess
@@ -58,10 +162,103 @@
 	for rectangle OpenGL textures when available, in order to reduce video
 	memory usage.
 
+2007-08-24  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/gui.h, src/gui/gui.cpp: Removed useless logic method and
+	reverted mouse cursor to non-static since there can be only one Gui
+	instance so there is no point in supporting a shared resource.
+	* src/gui/window.cpp, src/gui/gui.h: Removed unnecessary
+	Gui::isCustomCursor method.
+	* src/gui/char_select.h, src/gui/char_select.cpp, src/utils/trim.h:
+	Added trimming of name for new character creation.
+	* src/net/chathandler.cpp: Added trimming of chat messages appearing
+	above players.
+	* src/gui/window.cpp, src/gui/window.h: Improved resize mouse cursor
+	indication, removing duplicated code and fixing indicator above resize
+	grip.
+
+2007-08-23  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/viewport.h, src/gui/viewport.cpp: Removed two useless popup
+	related methods.
+	* src/gui/debugwindow.h, src/gui/debugwindow.cpp: Use generic close
+	button functionality.
+	* src/particle.h, src/particleemitter.cpp, src/particle.cpp: Renamed
+	Particle::mVector to Particle::mVelocity for clarity.
+	* src/localplayer.cpp, src/gui/ministatus.cpp, src/gui/status.cpp,
+	src/being.cpp, src/net/charserverhandler.cpp,
+	src/net/playerhandler.cpp, src/localplayer.h, src/being.h: Changed XP
+	gaining effect to appear on the player instead.
+	* data/graphics/gui/hits_yellow.png: Restored shadow of yellow font.
+
+2007-08-22  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/itemshortcutcontainer.h: Fixed compiler warning.
+	* src/CMakeLists.txt, src/Makefile.am: Updated source lists.
+	* data/graphics/gui/CMakeLists.txt, data/graphics/gui/Makefile.am:
+	Added close button and item shortcut backgrounds to files that will be
+	installed.
+	* src/gui/itemshortcutcontainer.cpp: Make sure mGridWidth and
+	mGridHeight are initialized properly (fixes arithmetic exception in
+	ItemShortcutContainer::draw).
+	* src/keyboardconfig.cpp: Changed default sitting key back to 's'.
+	* src/net/equipmenthandler.cpp: Removed a line that attempted to set
+	the player's weapon sprite with each kind of equipment. Seems to work
+	fine without as well.
+	* src/gui/chat.cpp, src/utils/trim.h, src/CMakeLists.txt,
+	src/Makefile.am: Added trimming of chat messages.
+
+2007-08-22  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/sprites/chest-lightplatemail-male.png,
+	data/graphics/sprites/chest-lightplatemail-female.png,
+	data/graphics/items/armor-chest-lightplatemail.png,
+	data/graphics/tiles/woodland_indoor_x2.png: Another color correction
+	at the light platemail (looks more metalic now)
+	* data/maps/new_18-1.tmx.gz, data/maps/new_19-1.tmx.gz,
+	data/images/minimap_new_18-1.png, data/images/minimap_new_19-1.png:
+	Removed a tree that prevented people from sitting on one of the
+	benches properly. Added correct minimap to woodland village and
+	surrounding.
+
+2007-08-22  Joshua Langley  <joshlangley[at]optusnet.com.au>
+
+	* data/graphics/gui/item_shortcut_bgr.png, src/game.cpp,
+	src/gui/gui.cpp, src/gui/itemcontainer.cpp,
+	src/gui/itemshortcutcontainer.cpp, src/gui/itemshortcutcontainer.h,
+	src/gui/itemshortcutwindow.cpp, src/gui/itemshortcutwindow.h,
+	src/gui/menuwindow.cpp, src/gui/setup_keyboard.cpp, src/gui/window.h,
+	src/itemshortcut.cpp, src/itemshortcut.h, src/keyboardconfig.cpp,
+	src/keyboardconfig.h, src/localplayer.cpp, src/localplayer.h,
+	src/main.cpp, src/net/inventoryhandler.cpp, src/utils/tostring.h,
+	tmw.cbp: Added item shortcut bar.
+
+2007-08-20  Joshua Langley  <joshlangley[at]optusnet.com.au>
+
+	* data/graphics/gui/mouse.png, src/gui/equipmentwindow.cpp,
+	src/gui/gui.cpp, src/gui/gui.h, src/gui/inventorywindow.cpp,
+	src/gui/setup.cpp, src/gui/skill.cpp, src/gui/skill.h,
+	src/gui/status.cpp, src/gui/window.cpp, src/gui/window.h,
+	data/graphics/gui/close_button.png: Added close button functionality,
+	resize cursor cues.
+	* data/graphics/gui/hits_yellow.png, src/being.cpp, src/being.h,
+	src/gui/gui.cpp, src/localplayer.cpp, src/localplayer.h,
+	src/net/charserverhandler.cpp, src/net/playerhandler.cpp,
+	src/particle.cpp, src/particle.h: Added monster killed xp notification
+	effect.
+
 2007-08-19  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
-	* src/CMakeLists.txt: Updated CMake file.
 	* data/equipment.xml: Fixed typo in female light plate mail.
+	* NEWS: Updated with changes since 0.0.23.
+	* src/CMakeLists.txt: Updated CMake file.
+
+2007-08-19  Joshua Langley  <joshlangley[at]optusnet.com.au>
+
+	* src/keyboardconfig.cpp, src/keyboardconfig.h: Minor cleanup.
+	* src/gui/buy.cpp, src/gui/sell.cpp: Buy/sell fixed minimum quantity.
+	* src/gui/setup_keyboard.cpp, src/gui/setup_keyboard.h: Fixed bug -
+	reverts unassigned key.
 
 2007-08-19  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
@@ -73,6 +270,23 @@
 	src/net/playerhandler.cpp, src/localplayer.h: Adapted to new server
 	handling of character attributes.
 
+2007-08-17  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* tools/adler32.c: Added little program for calculating adler32
+	checksums of files.
+	* src/gui/setup_keyboard.cpp: Fixed compile issue related to array
+	bound not being an integer constant.
+
+2007-08-15  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/sprites/npcs.png, data/graphics/sprites/npc.xml:
+	Added farmer NPC for woodland village.
+
+2007-08-14  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* src/gui/popupmenu.cpp, src/gui/viewport.cpp, src/gui/viewport.h,
+	tmw.cbp: Fixed popup menu requiring one more click after being used.
+
 2007-08-14  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
 	* src/net/messagein.h, src/net/messagein.cpp: Fixed error-prone
@@ -111,6 +325,15 @@
 	* src/gui/npclistdialog.cpp, src/gui/npclistdialog.h,
 	src/net/npchandler.cpp: Removed colon in NPC choice messages.
 
+2007-08-09  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/sprites/chest-lightplatemail-male.png,
+	data/graphics/sprites/chest-lightplatemail-female.png,
+	data/graphics/items/armor-chest-lightplatemail.png,
+	data/graphics/tiles/woodland_indoor_x2.png: Gave the platemail
+	armor a blue tint. Looks less boring and makes recoloring through
+	hue shifting possible.
+
 2007-08-09  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
 	* po/POTFILES.in: Updated list of translatable source files.
@@ -133,9 +356,29 @@
 	data/graphics/images/EquipBackground.png: Re-designed equipment
 	window, un-equip created.
 
+2007-08-08  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/particles/cookingfire.particle.xml,
+	data/graphics/particles/fireplace.particle.xml,
+	data/maps/new_20-1.tmx.gz: Added particle effects and music to the
+	woodland village indoor map.
+	* data/maps/new_19-1.tmx.gz: Added overlay effect and music to
+	woodland village outdoor map.
+	* data/maps/new_18-1.tmx.gz: Fixed some collision map errors and added
+	music and overlay effect to the surrounding of the woodland village.
+
+2007-08-07  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/sprites/npcs.png: Added two new NPCs and gave some
+	of the older NPCs a makeover to look more like the style of the new
+	playerset.
+	* data/maps/new_20-1.tmx.gz: Corrected a few mapping errors in the
+	new woodland village.
+	* data/items.xml: Tweaked description and values of the scythe.
+
 2007-08-07  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
-	* po/Makevars, src/main.cpp: Replaced PACKAGE by tmw to	reduce
+	* po/Makevars, src/main.cpp: Replaced PACKAGE by tmw to reduce
 	preprocessing hell. Set gettext charset to utf8.
 	* src/gui/menuwindow.cpp, src/gui/connection.cpp,
 	src/gui/register.cpp, src/gui/equipmentwindow.cpp,
@@ -172,6 +415,14 @@
 	Makefile.am, autogen.sh: Used autopoint for generating gettext
 	environment, and removed conflicting files.
 
+2007-08-05  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/tiles/woodland_indoor.png,
+	data/graphics/tiles/woodland_indoor_x2.png,
+	data/graphics/tiles/woodland_indoor_x3.png: Added woodland
+	village indoor tilesets.
+	* data/maps/new_20-1.tmx.gz: Added woodland village indoor map.
+
 2007-08-05  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
 	* configure.ac, Makefile.am, po, src/Makefile.am, src/main.cpp,
@@ -222,12 +473,22 @@
 	src/gui/itemcontainer.cpp, src/gui/checkbox.cpp, src/gui/minimap.cpp,
 	src/gui/scrollarea.cpp, src/gui/popupmenu.cpp: Removed useless yet
 	costly dynamic casts.
-
-2007-07-25  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
-
 	* src/net/beinghandler.cpp, src/net/protocol.h: Added being speed to
 	protocol.
 
+2007-07-25  Joshua Langley  <joshlangley[at]optusnet.com.au>
+
+	* src/gui/setup.cpp, src/gui/setup_keyboard.cpp,
+	src/gui/setup_keyboard.h, src/keyboardconfig.cpp,
+	src/keyboardconfig.h, src/main.cpp: Minor changes to keyboard config,
+	keyboard setup gui re-designed.
+
+2007-07-24  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/CMakeLists.txt, src/Makefile.am: Added setup_keyboard.* and
+	keyboardconfig.* to the list of source files.
+	* src/keyboardconfig.h: Fixed initialization order.
+
 2007-07-23  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
 	* data/maps/new_1-1.tar.gz, data/maps/new_3-1.tar.gz: Fixed warp
@@ -247,8 +508,21 @@
 
 	* data/maps/new_1-1.tar.gz: Fixed insecure filenames.
 
+2007-07-17  Joshua Langley  <joshlangley[at]optusnet.com.au>
+
+	* src/game.cpp: Only one key per function.
+	* src/main.cpp: Keyboard configuration included.
+	* src/gui/button.cpp, src/gui/button.h: Default constructor and
+	init function added.
+	* src/gui/setup.cpp: Keyboard setup tab added.
+	* src/gui/setup_keyboard.cpp, src/gui/setup_keyboard.h: Add to project
+	file, it is the keyboard setup tab.
+	* src/keyboardconfig.cpp, src/keyboardconfig.h: Add to project file,
+	the main keyboard config operations.
+
 2007-07-16  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
+	* data/items.xml: Fixed description of silk headband.
 	* data/maps/new_1-1.tar.gz, data/maps/new_3-1.tar.gz: Added warp and
 	spawn areas.
 
@@ -262,6 +536,24 @@
 	* src/net/beinghandler.cpp, src/net/beinghandler.h,
 	src/net/protocol.h: Added support for visible equipment.
 
+2007-07-11  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/resources/monsterdb.cpp, src/resources/monsterinfo.cpp,
+	src/resources/monsterinfo.h, src/monster.cpp: Renamed SoundEvent
+	to MonsterSoundEvent.
+	* src/resources/equipmentdb.cpp, src/resources/equipmentinfo.cpp,
+	src/resources/equipmentinfo.h: EquipmentDB now holds the type of
+	attack animation and the sounds of weapons.
+	* src/being.cpp. src/being.h, src/localplayer.cpp,
+	src/net/beinghandler.cpp, src/net/charserverhandler.cpp,
+	src/net/equipmenthandler.cpp, src/player.cpp, src/player.h: The
+	type of weapon player characters are using is now set using
+	setVisibleEquipment() instead of setWeapon() or setWeaponById().
+	* src/CMakeLists.txt, src/Makefile.AM, tmw.cbp, The Mana World.dev:
+	Updated project files and buildscripts.
+	* data/graphics/images/login-wallpaper.png: Replaced login wallpaper
+	with a new one by Irukard.
+
 2007-07-11  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/gui/window.cpp: Fixed resizing windows by their resize grip.
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 5a02d7f1..649e0917 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -7,6 +7,7 @@ SET (FILES
     button.png
     buttonpress.png
     checkbox.png
+    close_button.png
     deepbox.png
     fixedfont.png
     hits_blue.png
@@ -18,6 +19,8 @@ SET (FILES
     hscroll_right_default.png
     hscroll_right_highlight.png
     hscroll_right_pressed.png
+    item_shortcut_bgr.png
+    mouse.png
     menuitemD.png
     menuitemF.png
     menuitemN.png
@@ -37,6 +40,7 @@ SET (FILES
     target-cursor-red-m.png
     target-cursor-red-s.png
     thickborder.png
+    unknown-item.png
     vscroll_blue.png
     vscroll_down_default.png
     vscroll_down_highlight.png
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 92e4f3bb..7287d717 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -10,6 +10,7 @@ gui_DATA =				\
 	buttonhi.png			\
 	buttonpress.png			\
 	checkbox.png			\
+	close_button.png		\
 	deepbox.png			\
 	equip_bg.png                    \
 	fixedfont.png			\
@@ -22,6 +23,8 @@ gui_DATA =				\
 	hscroll_right_default.png	\
 	hscroll_right_highlight.png	\
 	hscroll_right_pressed.png	\
+	item_shortcut_bgr.png		\
+	mouse.png			\
 	menuitemD.png			\
 	menuitemF.png			\
 	menuitemN.png			\
@@ -41,6 +44,7 @@ gui_DATA =				\
 	target-cursor-red-m.png		\
 	target-cursor-red-s.png		\
 	thickborder.png			\
+	unknown-item.png		\
 	vscroll_blue.png		\
 	vscroll_down_default.png	\
 	vscroll_down_highlight.png	\
diff --git a/data/graphics/gui/close_button.png b/data/graphics/gui/close_button.png
new file mode 100644
index 00000000..f87cc2a9
Binary files /dev/null and b/data/graphics/gui/close_button.png differ
diff --git a/data/graphics/gui/hits_yellow.png b/data/graphics/gui/hits_yellow.png
index f917bc67..d77b7c05 100644
Binary files a/data/graphics/gui/hits_yellow.png and b/data/graphics/gui/hits_yellow.png differ
diff --git a/data/graphics/gui/item_shortcut_bgr.png b/data/graphics/gui/item_shortcut_bgr.png
new file mode 100644
index 00000000..e878fc7a
Binary files /dev/null and b/data/graphics/gui/item_shortcut_bgr.png differ
diff --git a/data/graphics/gui/mouse.png b/data/graphics/gui/mouse.png
index 2eeb0e51..84dc2ad1 100644
Binary files a/data/graphics/gui/mouse.png and b/data/graphics/gui/mouse.png differ
diff --git a/data/graphics/gui/unknown-item.png b/data/graphics/gui/unknown-item.png
new file mode 100644
index 00000000..9201d688
Binary files /dev/null and b/data/graphics/gui/unknown-item.png differ
diff --git a/data/graphics/images/login_wallpaper.png b/data/graphics/images/login_wallpaper.png
index 54692dfd..7af4f913 100644
Binary files a/data/graphics/images/login_wallpaper.png and b/data/graphics/images/login_wallpaper.png differ
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fa19cfb5..96338338 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -97,6 +97,12 @@ SET(SRCS
     gui/item_amount.h
     gui/itemcontainer.cpp
     gui/itemcontainer.h
+    gui/itemshortcutcontainer.cpp
+    gui/itemshortcutcontainer.h
+    gui/itemshortcutwindow.cpp
+    gui/itemshortcutwindow.h
+    gui/item_amount.cpp
+    gui/item_amount.h
     gui/linkhandler.h
     gui/listbox.cpp
     gui/listbox.h
@@ -143,6 +149,8 @@ SET(SRCS
     gui/setup.h
     gui/setup_joystick.cpp
     gui/setup_joystick.h
+    gui/setup_keyboard.cpp
+    gui/setup_keyboard.h
     gui/setuptab.h
     gui/setup_video.cpp
     gui/setup_video.h
@@ -170,12 +178,13 @@ SET(SRCS
     gui/updatewindow.h
     gui/vbox.cpp
     gui/vbox.h
-    gui/windowcontainer.cpp
-    gui/windowcontainer.h
     gui/viewport.cpp
     gui/viewport.h
     gui/window.cpp
     gui/window.h
+    gui/windowcontainer.cpp
+    gui/windowcontainer.h
+    gui/windowlistener.h
     gui/widgets/dropdown.cpp
     gui/widgets/dropdown.h
     net/beinghandler.cpp
@@ -239,9 +248,6 @@ SET(SRCS
     resources/buddylist.h
     resources/animation.cpp
     resources/animation.h
-    resources/equipmentdb.cpp
-    resources/equipmentdb.h
-    resources/equipmentinfo.h
     resources/image.cpp
     resources/image.h
     resources/imagewriter.cpp
@@ -281,6 +287,7 @@ SET(SRCS
     utils/strprintf.cpp
     utils/strprintf.h
     utils/tostring.h
+    utils/trim.h
     utils/xml.cpp
     utils/xml.h
     animatedsprite.cpp
@@ -317,8 +324,12 @@ SET(SRCS
     inventory.h
     item.cpp
     item.h
+    itemshortcut.cpp
+    itemshortcut.h
     joystick.cpp
     joystick.h
+    keyboardconfig.cpp
+    keyboardconfig.h
     localplayer.cpp
     localplayer.h
     lockedarray.h
@@ -351,6 +362,7 @@ SET(SRCS
     textparticle.cpp
     textparticle.h
     tileset.h
+    vector.h
     )
 
 ADD_EXECUTABLE(tmw ${SRCS})
diff --git a/src/Makefile.am b/src/Makefile.am
index 7006f66e..2f29e299 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,6 +5,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/widgets/dropdown.h \
 	      gui/widgets/resizegrip.cpp \
 	      gui/widgets/resizegrip.h \
+	      gui/box.h \
+	      gui/box.cpp \
 	      gui/browserbox.cpp \
 	      gui/browserbox.h \
 	      gui/buddywindow.cpp \
@@ -39,12 +41,20 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/gccontainer.h \
 	      gui/gui.cpp \
 	      gui/gui.h \
+	      gui/hbox.h \
+	      gui/hbox.cpp \
 	      gui/help.cpp \
 	      gui/help.h \
+	      gui/inttextbox.h \
+	      gui/inttextbox.cpp \
 	      gui/inventorywindow.cpp \
 	      gui/inventorywindow.h \
 	      gui/itemcontainer.cpp \
 	      gui/itemcontainer.h \
+	      gui/itemshortcutcontainer.cpp \
+	      gui/itemshortcutcontainer.h \
+	      gui/itemshortcutwindow.cpp \
+	      gui/itemshortcutwindow.h \
 	      gui/item_amount.cpp \
 	      gui/item_amount.h \
 	      gui/linkhandler.h \
@@ -95,6 +105,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/setup.h \
 	      gui/setup_joystick.cpp \
 	      gui/setup_joystick.h \
+	      gui/setup_keyboard.cpp \
+	      gui/setup_keyboard.h \
 	      gui/setuptab.h \
 	      gui/setup_video.cpp \
 	      gui/setup_video.h \
@@ -118,22 +130,17 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/trade.h \
 	      gui/unregisterdialog.cpp \
 	      gui/unregisterdialog.h \
+	      gui/updatewindow.h \
+	      gui/updatewindow.cpp \
+	      gui/vbox.h \
+	      gui/vbox.cpp \
 	      gui/viewport.cpp \
 	      gui/viewport.h \
 	      gui/window.cpp \
 	      gui/window.h \
 	      gui/windowcontainer.cpp \
 	      gui/windowcontainer.h \
-	      gui/inttextbox.h \
-	      gui/inttextbox.cpp \
-	      gui/box.h \
-	      gui/box.cpp \
-	      gui/vbox.h \
-	      gui/vbox.cpp \
-	      gui/hbox.h \
-	      gui/hbox.cpp \
-	      gui/updatewindow.h \
-	      gui/updatewindow.cpp \
+	      gui/windowlistener.h \
 	      net/beinghandler.h \
 	      net/beinghandler.cpp \
 	      net/buysellhandler.h \
@@ -193,9 +200,6 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      resources/ambientoverlay.h \
 	      resources/animation.cpp \
 	      resources/animation.h \
-	      resources/equipmentdb.cpp \
-	      resources/equipmentdb.h \
-	      resources/equipmentinfo.h \
 	      resources/image.cpp \
 	      resources/image.h \
 	      resources/imageloader.cpp \
@@ -235,6 +239,7 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      utils/strprintf.h \
 	      utils/strprintf.cpp \
 	      utils/tostring.h \
+	      utils/trim.h \
 	      utils/xml.cpp \
 	      utils/xml.h \
 	      animatedsprite.cpp \
@@ -271,8 +276,12 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      inventory.h \
 	      item.cpp \
 	      item.h \
+	      itemshortcut.cpp \
+	      itemshortcut.h \
 	      joystick.cpp \
 	      joystick.h \
+	      keyboardconfig.cpp \
+	      keyboardconfig.h \
 	      localplayer.cpp \
 	      localplayer.h \
 	      lockedarray.h \
@@ -304,7 +313,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      sprite.h \
 	      textparticle.cpp \
 	      textparticle.h \
-	      tileset.h
+	      tileset.h \
+	      vector.h
 
 # set the include path found by configure
 INCLUDES =					\
diff --git a/src/animationparticle.cpp b/src/animationparticle.cpp
index 30c33da7..c79a5bc4 100644
--- a/src/animationparticle.cpp
+++ b/src/animationparticle.cpp
@@ -26,7 +26,7 @@
 #include "simpleanimation.h"
 
 AnimationParticle::AnimationParticle(Map *map, Animation *animation):
-    ImageParticle(map, 0),
+    ImageParticle(map, NULL),
     mAnimation(new SimpleAnimation(animation))
 {
 }
@@ -40,6 +40,7 @@ AnimationParticle::AnimationParticle(Map *map, xmlNodePtr animationNode):
 AnimationParticle::~AnimationParticle()
 {
     delete mAnimation;
+    mImage = NULL;
 }
 
 bool AnimationParticle::update()
diff --git a/src/being.cpp b/src/being.cpp
index bdb27384..81bed667 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -36,12 +36,10 @@
 
 #include "resources/resourcemanager.h"
 #include "resources/imageset.h"
+#include "resources/iteminfo.h"
 
 #include "gui/gui.h"
 
-#include "resources/resourcemanager.h"
-#include "resources/imageset.h"
-
 #include "utils/dtor.h"
 #include "utils/tostring.h"
 
@@ -58,11 +56,11 @@ Being::Being(Uint16 id, Uint16 job, Map *map):
     mEquipment(new Equipment()),
     mId(id),
     mSex(2),
-    mWeapon(0),
     mWalkSpeed(150),
     mSpeedModifier(1024),
     mSpriteDirection(DIRECTION_DOWN), mDirection(DOWN),
     mMap(NULL),
+    mEquippedWeapon(NULL),
     mHairStyle(0), mHairColor(0),
     mSpeechTime(0),
     mPx(0), mPy(0),
@@ -302,7 +300,7 @@ Being::setSpeech(const std::string &text, Uint32 time)
 void
 Being::takeDamage(int amount)
 {
-    gcn::Font* font;
+    gcn::Font *font;
     std::string damage = amount ? toString(amount) : "miss";
 
     // Selecting the right color
@@ -312,8 +310,9 @@ Being::takeDamage(int amount)
     }
     else
     {
-        // hit particle effect
-        controlParticle(particleEngine->addEffect("graphics/particles/hit.particle.xml", 0, 0));
+        // Hit particle effect
+        controlParticle(particleEngine->addEffect(
+                    "graphics/particles/hit.particle.xml", 0, 0));
 
         if (getType() == MONSTER)
         {
@@ -325,7 +324,7 @@ Being::takeDamage(int amount)
         }
     }
 
-    // show damage number
+    // Show damage number
     particleEngine->addTextSplashEffect(damage, 255, 255, 255, font,
                                         mPx + 16, mPy + 16);
 }
@@ -340,7 +339,7 @@ void
 Being::setMap(Map *map)
 {
     // Remove sprite from potential previous map
-    if (mMap != NULL)
+    if (mMap)
     {
         mMap->removeSprite(mSpriteIterator);
     }
@@ -348,12 +347,12 @@ Being::setMap(Map *map)
     mMap = map;
 
     // Add sprite to potential new map
-    if (mMap != NULL)
+    if (mMap)
     {
         mSpriteIterator = mMap->addSprite(this);
     }
 
-    //clear particle effect list because child particles became invalid
+    // Clear particle effect list because child particles became invalid
     mChildParticleEffects.clear();
 }
 
@@ -362,7 +361,8 @@ Being::controlParticle(Particle *particle)
 {
     if (particle)
     {
-        particle->disableAutoDelete();  //the effect may not die without the beings permission or we segvault
+        // The effect may not die without the beings permission or we segfault
+        particle->disableAutoDelete();
         mChildParticleEffects.push_back(particle);
     }
 }
@@ -380,20 +380,12 @@ Being::setAction(Action action)
             currentAction = ACTION_SIT;
             break;
         case ATTACK:
-            switch (getWeapon())
+            if (mEquippedWeapon)
             {
-                case 3:
-                    currentAction = ACTION_ATTACK;
-                    break;
-                case 2:
-                    currentAction = ACTION_ATTACK_BOW;
-                    break;
-                case 1:
-                    currentAction = ACTION_ATTACK_STAB;
-                    break;
-                case 0:
-                    currentAction = ACTION_ATTACK;
-                    break;
+                currentAction = mEquippedWeapon->getAttackType();
+            }
+            else {
+                currentAction = ACTION_ATTACK;
             }
             for (int i = 0; i < VECTOREND_SPRITE; i++)
             {
@@ -533,11 +525,9 @@ Being::logic()
         }
     }
 
-    //Update particle effects
-    for (   std::list<Particle *>::iterator i = mChildParticleEffects.begin();
-            i != mChildParticleEffects.end();
-
-        )
+    // Update particle effects
+    for (std::list<Particle *>::iterator i = mChildParticleEffects.begin();
+         i != mChildParticleEffects.end();)
     {
         (*i)->setPosition((float)mPx + 16.0f, (float)mPy + 32.0f);
         if (!(*i)->isAlive())
@@ -599,46 +589,6 @@ Being::getType() const
     return UNKNOWN;
 }
 
-void
-Being::setWeaponById(Uint16 weapon)
-{
-    //TODO: Use an external file to map weapon IDs to weapon types
-    switch (weapon)
-    {
-    case 529: // iron arrows
-    case 1199: // arrows
-        break;
-
-    case 623: //scythe
-        setWeapon(3);
-        break;
-
-    case 1200: // bow
-    case 530: // short bow
-    case 545: // forest bow
-        setWeapon(2);
-        break;
-
-    case 521: // sharp knife
-        /*  UNCOMMENT TO TEST SHARP KNIFE AS SCYTHE
-         *  setWeapon(3)
-         *  break;
-         */
-    case 522: // dagger
-    case 536: // short sword
-    case 1201: // knife
-        setWeapon(1);
-        break;
-
-    case 0: // unequip
-        setWeapon(0);
-        break;
-
-    default:
-        logger->log("Not a weapon: %d", weapon);
-    }
-}
-
 int Being::getOffset(int step) const
 {
     // Check whether we're walking in the requested direction
diff --git a/src/being.h b/src/being.h
index afb3cb8b..fadf9656 100644
--- a/src/being.h
+++ b/src/being.h
@@ -38,6 +38,7 @@
 
 class AnimatedSprite;
 class Equipment;
+class ItemInfo;
 class Item;
 class Map;
 class Graphics;
@@ -161,8 +162,7 @@ class Being : public Sprite
         void setSpeech(const std::string &text, Uint32 time);
 
         /**
-         * Puts a damage bubble above this being for the specified amount of
-         * time.
+         * Puts a damage bubble above this being.
          *
          * @param amount The amount of damage.
          */
@@ -266,27 +266,6 @@ class Being : public Sprite
          */
         virtual Type getType() const;
 
-        /**
-         * Gets the weapon picture id.
-         */
-        Uint16 getWeapon() const { return mWeapon; }
-
-        /**
-         * Sets the weapon picture id.
-         *
-         * @param weapon the picture id
-         */
-        virtual void
-        setWeapon(Uint16 weapon) { mWeapon = weapon; }
-
-        /**
-         * Sets the weapon picture id with the weapon id.
-         *
-         * @param weapon the weapon id
-         */
-        void
-        setWeaponById(Uint16 weapon);
-
         /**
          * Gets the walk speed.
          */
@@ -380,30 +359,26 @@ class Being : public Sprite
         getHeight() const;
 
         /**
-         * Returns the required size of a target cursor for this being
+         * Returns the required size of a target cursor for this being.
          */
-        virtual Being::TargetCursorSize
-        getTargetCursorSize() const
+        virtual Being::TargetCursorSize getTargetCursorSize() const
         { return TC_MEDIUM; }
 
         std::auto_ptr<Equipment> mEquipment;
 
         /**
-         * Take control of a particle
+         * Take control of a particle.
          */
-        void
-        controlParticle(Particle *particle);
+        void controlParticle(Particle *particle);
 
     protected:
         /**
          * Sets the new path for this being.
          */
-        void
-        setPath(const Path &path, int mod = 1024);
+        void setPath(const Path &path, int mod = 1024);
 
         Uint16 mId;                     /**< Unique being id */
         Uint8 mSex;                     /**< Character's gender */
-        Uint16 mWeapon;                 /**< Weapon picture id */
         Uint16 mWalkSpeed;              /**< Walking speed */
         Uint16 mSpeedModifier;          /**< Modifier to keep course on sync (1024 = normal speed) */
         Uint8 mSpriteDirection;         /**< Facing direction */
@@ -411,6 +386,9 @@ class Being : public Sprite
         Map *mMap;                      /**< Map on which this being resides */
         SpriteIterator mSpriteIterator;
 
+        /** Engine-related infos about weapon. */
+        const ItemInfo* mEquippedWeapon;
+
         Path mPath;
         std::string mSpeech;
         Uint16 mHairStyle, mHairColor;
diff --git a/src/game.cpp b/src/game.cpp
index 495f9a8d..a40bfa28 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -37,7 +37,9 @@
 #include "engine.h"
 #include "flooritemmanager.h"
 #include "graphics.h"
+#include "itemshortcut.h"
 #include "joystick.h"
+#include "keyboardconfig.h"
 #include "localplayer.h"
 #include "log.h"
 #include "npc.h"
@@ -53,6 +55,7 @@
 #include "gui/gui.h"
 #include "gui/help.h"
 #include "gui/inventorywindow.h"
+#include "gui/itemshortcutwindow.h"
 #include "gui/menuwindow.h"
 #include "gui/minimap.h"
 #include "gui/ministatus.h"
@@ -116,6 +119,7 @@ TradeWindow *tradeWindow;
 //BuddyWindow *buddyWindow;
 HelpWindow *helpWindow;
 DebugWindow *debugWindow;
+ItemShortcutWindow *itemShortcutWindow;
 
 BeingManager *beingManager = NULL;
 FloorItemManager *floorItemManager = NULL;
@@ -181,6 +185,7 @@ void createGuiWindows()
     //buddyWindow = new BuddyWindow();
     helpWindow = new HelpWindow();
     debugWindow = new DebugWindow();
+    itemShortcutWindow = new ItemShortcutWindow();
 
     // Initialize window positions
     //chargeDialog->setPosition(
@@ -193,6 +198,7 @@ void createGuiWindows()
     chatWindow->setVisible(true);
     miniStatusWindow->setVisible(true);
     menuWindow->setVisible(true);
+    itemShortcutWindow->setVisible(true);
 }
 
 /**
@@ -220,6 +226,7 @@ void destroyGuiWindows()
     //delete buddyWindow;
     delete helpWindow;
     delete debugWindow;
+    delete itemShortcutWindow;
 }
 
 Game::Game():
@@ -420,6 +427,14 @@ void Game::handleInput()
         {
             gcn::Window *requestedWindow = NULL;
 
+            if (setupWindow->isVisible() &&
+                keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE)
+            {
+                keyboard.setNewKey((int) event.key.keysym.sym);
+                keyboard.callbackNewKey();
+                keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
+                return;
+            }
             switch (event.key.keysym.sym)
             {
                 case SDLK_F1:
@@ -473,65 +488,7 @@ void Game::handleInput()
                         used = true;
                     }
                     break;
-
-                // Hide certain windows
-                case SDLK_h:
-                    if (!chatWindow->isFocused())
-                    {
-                        statusWindow->setVisible(false);
-                        inventoryWindow->setVisible(false);
-                        skillDialog->setVisible(false);
-                        setupWindow->setVisible(false);
-                        equipmentWindow->setVisible(false);
-                        helpWindow->setVisible(false);
-                        debugWindow->setVisible(false);
-                    }
-                break;
-
-                // Picking up items on the floor
-                case SDLK_g:
-                case SDLK_z:
-                    if (!chatWindow->isFocused())
-                    {
-                        Uint16 x = player_node->mX / 32, y = player_node->mY / 32;
-                        FloorItem *item = floorItemManager->findByCoordinates(x, y);
-
-                        // If none below the player, try the tile in front of
-                        // the player
-                        if (!item)
-                        {
-                            // Temporary until tile-based picking is removed.
-                            switch (player_node->getSpriteDirection())
-                            {
-                                case DIRECTION_UP   : --y; break;
-                                case DIRECTION_DOWN : ++y; break;
-                                case DIRECTION_LEFT : --x; break;
-                                case DIRECTION_RIGHT: ++x; break;
-                                default: break;
-                            }
-
-                            item = floorItemManager->findByCoordinates(x, y);
-                        }
-
-                        if (item)
-                            player_node->pickUp(item);
-
-                        used = true;
-                    }
-                    break;
-
-                // attacking
-                // TODO: Reimplement attacking with joystick buttons
-                //       (old code allowed permanent attacking and not 1 attack
-                //       with each button push)
-                //       I would like to do this but i don't own a joystick.
-                case SDLK_LCTRL:
-                case SDLK_RCTRL:
-                    player_node->attack();
-                    used = true;
-                    break;
-
-                    // Quitting confirmation dialog
+                   // Quitting confirmation dialog
                 case SDLK_ESCAPE:
                     if (!quitDialog)
                     {
@@ -547,6 +504,74 @@ void Game::handleInput()
                     break;
             }
 
+            if (keyboard.isEnabled() && !chatWindow->isFocused())
+            {
+                const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
+                // Checks if any item shortcut is pressed.
+                for (int i = KeyboardConfig::KEY_SHORTCUT_0;
+                    i <= KeyboardConfig::KEY_SHORTCUT_9;
+                    i++)
+                {
+                    if (tKey == i) {
+                        itemShortcut->useItem(
+                                i - KeyboardConfig::KEY_SHORTCUT_0);
+                        break;
+                    }
+                }
+                switch (tKey) {
+                    case KeyboardConfig::KEY_PICKUP:
+                        {
+                            Uint16 x = player_node->mX / 32;
+                            Uint16 y = player_node->mY / 32;
+                            FloorItem *item =
+                                floorItemManager->findByCoordinates(x, y);
+
+                            // If none below the player, try the tile in front
+                            // of the player
+                            if (!item)
+                            {
+                                // Temporary until tile-based picking is
+                                // removed.
+                                switch (player_node->getSpriteDirection())
+                                {
+                                    case DIRECTION_UP   : --y; break;
+                                    case DIRECTION_DOWN : ++y; break;
+                                    case DIRECTION_LEFT : --x; break;
+                                    case DIRECTION_RIGHT: ++x; break;
+                                    default: break;
+                                }
+
+                                item =
+                                    floorItemManager->findByCoordinates(x, y);
+                            }
+
+                            if (item)
+                                player_node->pickUp(item);
+
+                            used = true;
+                        }
+                        break;
+                    case KeyboardConfig::KEY_SIT:
+                        // Player sit action
+                        player_node->toggleSit();
+                        used = true;
+                        break;
+                    case KeyboardConfig::KEY_HIDE_WINDOWS:
+                         // Hide certain windows
+                        if (!chatWindow->isFocused())
+                        {
+                            statusWindow->setVisible(false);
+                            inventoryWindow->setVisible(false);
+                            skillDialog->setVisible(false);
+                            setupWindow->setVisible(false);
+                            equipmentWindow->setVisible(false);
+                            helpWindow->setVisible(false);
+                            debugWindow->setVisible(false);
+                        }
+                        break;
+                }
+            }
+
             if (requestedWindow)
             {
                 requestedWindow->setVisible(!requestedWindow->isVisible());
@@ -563,19 +588,14 @@ void Game::handleInput()
             {
                 switch (event.key.keysym.sym)
                 {
-                    case SDLK_s:
-                        // Player sit action
-                        player_node->toggleSit();
-                        used = true;
-                        break;
-
                     case SDLK_p:
                         // Screenshot (picture, hence the p)
                         {
                             SDL_Surface *screenshot = graphics->getScreenshot();
                             if (!saveScreenshot(screenshot))
                             {
-                                logger->log("Error: could not save Screenshot.");
+                                logger->log(
+                                        "Error: could not save Screenshot.");
                             }
                             SDL_FreeSurface(screenshot);
                         }
@@ -606,6 +626,8 @@ void Game::handleInput()
                     case SDLK_8: emotion = 8; break;
                     case SDLK_9: emotion = 9; break;
                     case SDLK_0: emotion = 10; break;
+                    case SDLK_MINUS: emotion = 11; break;
+                    case SDLK_EQUALS: emotion = 12; break;
                     default: emotion = 0; break;
                 }
 
@@ -638,41 +660,41 @@ void Game::handleInput()
         }
 
     } // End while
-
+    // If the user is configuring the keys then don't respond.
+    if (!keyboard.isEnabled())
+    {
+       return;
+    }
     // Moving player around
     if (player_node->mAction != Being::DEAD &&
         current_npc == 0 &&
         !chatWindow->isFocused())
     {
         // Get the state of the keyboard keys
-        Uint8* keys;
-        keys = SDL_GetKeyState(NULL);
+        keyboard.refreshActiveKeys();
 
         Uint16 x = player_node->mX / 32, y = player_node->mY / 32;
 
         unsigned char direction = 0;
 
         // Translate pressed keys to movement and direction
-        if (keys[SDLK_UP] || keys[SDLK_KP8] ||
-                keys[SDLK_KP7] || keys[SDLK_KP9] ||
+        if ( keyboard.isKeyActive(keyboard.KEY_MOVE_UP) ||
                 joystick && joystick->isUp())
         {
             direction |= Being::UP;
         }
-        else if (keys[SDLK_DOWN] || keys[SDLK_KP2] ||
-                keys[SDLK_KP1] || keys[SDLK_KP3] ||
+        else if ( keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) ||
                 joystick && joystick->isDown())
         {
             direction |= Being::DOWN;
         }
-        if (keys[SDLK_LEFT] || keys[SDLK_KP4] ||
-                keys[SDLK_KP1] || keys[SDLK_KP7] ||
+
+        if ( keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) ||
                 joystick && joystick->isLeft())
         {
             direction |= Being::LEFT;
         }
-        else if (keys[SDLK_RIGHT] || keys[SDLK_KP6] ||
-                keys[SDLK_KP3] || keys[SDLK_KP9] ||
+        else if ( keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) ||
                 joystick && joystick->isRight())
         {
             direction |= Being::RIGHT;
@@ -681,7 +703,8 @@ void Game::handleInput()
         player_node->setWalkingDir(direction);
 
         // Target the nearest monster if 'a' pressed
-        if (keys[SDLK_a])
+        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) )
+        //if (keys[SDLK_a])
         {
             Being *target =
                 beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER);
diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index 4e236c33..0379ebc0 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -60,10 +60,25 @@ static ButtonData const data[BUTTON_COUNT] = {
 
 ImageRect Button::button[BUTTON_COUNT];
 
+Button::Button():
+    mIsLogged(false)
+{
+    init();
+}
+
 Button::Button(const std::string& caption, const std::string &actionEventId,
     gcn::ActionListener *listener):
     gcn::Button(caption),
     mIsLogged(false)
+{
+    init();
+    setActionEventId(actionEventId);
+    if (listener) {
+        addActionListener(listener);
+    }
+}
+
+void Button::init()
 {
     setBorderSize(0);
 
@@ -91,12 +106,7 @@ Button::Button(const std::string& caption, const std::string &actionEventId,
             btn[mode]->decRef();
         }
     }
-
     mInstances++;
-    setActionEventId(actionEventId);
-    if (listener) {
-        addActionListener(listener);
-    }
 }
 
 Button::~Button()
diff --git a/src/gui/button.h b/src/gui/button.h
index eb73e311..d12173b2 100644
--- a/src/gui/button.h
+++ b/src/gui/button.h
@@ -38,7 +38,13 @@ class ImageRect;
 class Button : public gcn::Button {
     public:
         /**
-         * Constructor, sets the caption of the button to the given string.
+         * Default constructor.
+         */
+        Button();
+
+        /**
+         * Constructor, sets the caption of the button to the given string and
+         * adds the given action listener.
          */
         Button(const std::string& caption, const std::string &actionEventId,
                 gcn::ActionListener *listener);
@@ -60,6 +66,8 @@ class Button : public gcn::Button {
         { mIsLogged = enable; }
 
     private:
+        void init();
+
         static ImageRect button[4];    /**< Button state graphics */
         static int mInstances;         /**< Number of button instances */
         bool mIsLogged;                /**< Makes the button appear pressed all the time */
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 6cfe5e18..bbf2102e 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -28,6 +28,7 @@
 #include "button.h"
 #include "scrollarea.h"
 #include "shop.h"
+#include "shoplistbox.h"
 #include "slider.h"
 
 #include "../npc.h"
@@ -35,11 +36,15 @@
 #include "../resources/itemdb.h"
 #include "../utils/tostring.h"
 
-
 BuyDialog::BuyDialog():
     Window("Buy"),
     mMoney(0), mAmountItems(0), mMaxItems(0)
 {
+    setResizable(true);
+    setMinWidth(260);
+    setMinHeight(230);
+    setDefaultSize(0, 0, 260, 230);
+
     mShopItems = new ShopItems;
 
     mShopItemList = new ShopListBox(mShopItems, mShopItems);
@@ -54,32 +59,15 @@ BuyDialog::BuyDialog():
     mItemDescLabel = new gcn::Label("Description:");
     mItemEffectLabel = new gcn::Label("Effect:");
 
-    setContentSize(260, 210);
-    mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    mScrollArea->setDimension(gcn::Rectangle(5, 5, 250, 110));
-    mShopItemList->setDimension(gcn::Rectangle(5, 5, 238, 110));
-
-    mSlider->setDimension(gcn::Rectangle(5, 120, 200, 10));
-    mSlider->setEnabled(false);
-
-    mQuantityLabel->setPosition(215, 120);
-    mMoneyLabel->setPosition(5, 130);
-
-    mIncreaseButton->setPosition(40, 186);
     mIncreaseButton->setSize(20, 20);
-    mIncreaseButton->setEnabled(false);
-
-    mDecreaseButton->setPosition(10, 186);
     mDecreaseButton->setSize(20, 20);
-    mDecreaseButton->setEnabled(false);
+    mQuantityLabel->setWidth(60);
 
-    mBuyButton->setPosition(180, 186);
+    mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mIncreaseButton->setEnabled(false);
+    mDecreaseButton->setEnabled(false);
     mBuyButton->setEnabled(false);
-
-    mQuitButton->setPosition(212, 186);
-
-    mItemEffectLabel->setDimension(gcn::Rectangle(5, 150, 240, 14));
-    mItemDescLabel->setDimension(gcn::Rectangle(5, 169, 240, 14));
+    mSlider->setEnabled(false);
 
     mShopItemList->setActionEventId("item");
     mSlider->setActionEventId("slider");
@@ -98,6 +86,8 @@ BuyDialog::BuyDialog():
     add(mItemDescLabel);
     add(mItemEffectLabel);
 
+    addWindowListener(this);
+    loadWindowState("Buy");
     setLocationRelativeTo(getParent());
 }
 
@@ -118,13 +108,12 @@ void BuyDialog::reset()
 {
     mShopItems->clear();
     mShopItemList->adjustSize();
-    mMoney = 0;
-    mSlider->setValue(0.0);
 
-    // Reset Previous Selected Items to prevent failing asserts
+    // Reset previous selected items to prevent failing asserts
     mShopItemList->setSelected(-1);
+    mSlider->setValue(0);
 
-    updateButtonsAndLabels();
+    setMoney(0);
 }
 
 void BuyDialog::addItem(int id, int amount, int price)
@@ -141,6 +130,7 @@ void BuyDialog::action(const gcn::ActionEvent &event)
     {
         setVisible(false);
         current_npc = 0;
+        return;
     }
 
     // The following actions require a valid selection
@@ -152,21 +142,19 @@ void BuyDialog::action(const gcn::ActionEvent &event)
 
     if (event.getId() == "slider")
     {
-        mAmountItems = (int)(mSlider->getValue() * mMaxItems);
+        mAmountItems = (int) mSlider->getValue();
         updateButtonsAndLabels();
     }
     else if (event.getId() == "+" && mAmountItems < mMaxItems)
     {
         mAmountItems++;
-
-        mSlider->setValue((double) mAmountItems / (double) mMaxItems);
+        mSlider->setValue(mAmountItems);
         updateButtonsAndLabels();
     }
-    else if (event.getId() == "-" && mAmountItems > 0)
+    else if (event.getId() == "-" && mAmountItems > 1)
     {
         mAmountItems--;
-
-        mSlider->setValue((double) mAmountItems / (double) mMaxItems);
+        mSlider->setValue(mAmountItems);
         updateButtonsAndLabels();
     }
     // TODO: Actually we'd have a bug elsewhere if this check for the number
@@ -178,25 +166,69 @@ void BuyDialog::action(const gcn::ActionEvent &event)
         Net::GameServer::Player::tradeWithNPC
             (mShopItems->at(selectedItem).id, mAmountItems);
 
-        // Update money and adjust the max number of items that can be bought
-        mMoney -= mAmountItems * mShopItems->at(selectedItem).price;
-        mMaxItems -= mAmountItems;
-
         // Reset selection
-        mAmountItems = 0;
-        mSlider->setValue(0.0);
+        mAmountItems = 1;
+        mSlider->setValue(1);
+        mSlider->gcn::Slider::setScale(1, mMaxItems);
 
-        updateButtonsAndLabels();
+        // Update money and adjust the max number of items that can be bought
+        mMaxItems -= mAmountItems;
+        setMoney(mMoney - mAmountItems * mShopItems->at(selectedItem).price);
     }
 }
 
 void BuyDialog::selectionChanged(const SelectionEvent &event)
 {
+
     // Reset amount of items and update labels
-    mAmountItems = 0;
-    mSlider->setValue(0.0);
+    mAmountItems = 1;
+    mSlider->setValue(1);
 
     updateButtonsAndLabels();
+    mSlider->gcn::Slider::setScale(1, mMaxItems);
+}
+
+void BuyDialog::windowResized(const WindowEvent &event)
+{
+    gcn::Rectangle area = getChildrenArea();
+    int width = area.width;
+    int height = area.height;
+
+    mDecreaseButton->setPosition(8, height - 8 - mDecreaseButton->getHeight());
+    mIncreaseButton->setPosition(
+            mDecreaseButton->getX() + mDecreaseButton->getWidth() + 5,
+            mDecreaseButton->getY());
+
+    mQuitButton->setPosition(
+            width - 8 - mQuitButton->getWidth(),
+            height - 8 - mQuitButton->getHeight());
+    mBuyButton->setPosition(
+            mQuitButton->getX() - 5 - mBuyButton->getWidth(),
+            mQuitButton->getY());
+
+    mItemDescLabel->setDimension(gcn::Rectangle(8,
+                mBuyButton->getY() - 5 - mItemDescLabel->getHeight(),
+                width - 16,
+                mItemDescLabel->getHeight()));
+    mItemEffectLabel->setDimension(gcn::Rectangle(8,
+                mItemDescLabel->getY() - 5 - mItemEffectLabel->getHeight(),
+                width - 16,
+                mItemEffectLabel->getHeight()));
+    mMoneyLabel->setDimension(gcn::Rectangle(8,
+                mItemEffectLabel->getY() - 5 - mMoneyLabel->getHeight(),
+                width - 16,
+                mMoneyLabel->getHeight()));
+
+    mQuantityLabel->setPosition(
+            width - mQuantityLabel->getWidth() - 8,
+            mMoneyLabel->getY() - 5 - mQuantityLabel->getHeight());
+    mSlider->setDimension(gcn::Rectangle(8,
+                mQuantityLabel->getY(),
+                mQuantityLabel->getX() - 8 - 8,
+                10));
+
+    mScrollArea->setDimension(gcn::Rectangle(8, 8, width - 16,
+                mSlider->getY() - 5 - 8));
 }
 
 void
@@ -232,14 +264,13 @@ BuyDialog::updateButtonsAndLabels()
 
     // Enable or disable buttons and slider
     mIncreaseButton->setEnabled(mAmountItems < mMaxItems);
-    mDecreaseButton->setEnabled(mAmountItems > 0);
+    mDecreaseButton->setEnabled(mAmountItems > 1);
     mBuyButton->setEnabled(mAmountItems > 0);
-    mSlider->setEnabled(mMaxItems > 0);
+    mSlider->setEnabled(mMaxItems > 1);
 
     // Update quantity and money labels
-    mQuantityLabel->setCaption(toString(mAmountItems));
-    mQuantityLabel->adjustSize();
+    mQuantityLabel->setCaption(
+        toString(mAmountItems) + " / " + toString(mMaxItems));
     mMoneyLabel->setCaption("Price: " + toString(price)  + " GP / "
                              + toString(mMoney - price) + " GP" );
-    mMoneyLabel->adjustSize();
 }
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 875deef9..63d25583 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -28,11 +28,11 @@
 
 #include "window.h"
 #include "selectionlistener.h"
-#include "shoplistbox.h"
 
 #include "../guichanfwd.h"
 
 class ShopItems;
+class ShopListBox;
 class ListBox;
 
 /**
@@ -40,7 +40,8 @@ class ListBox;
  *
  * \ingroup Interface
  */
-class BuyDialog : public Window, public gcn::ActionListener, SelectionListener
+class BuyDialog : public Window, public gcn::ActionListener, SelectionListener,
+    WindowListener
 {
     public:
         /**
@@ -98,6 +99,11 @@ class BuyDialog : public Window, public gcn::ActionListener, SelectionListener
         void
         updateButtonsAndLabels();
 
+        /**
+         * Called whenever the window is resized.
+         */
+        void windowResized(const WindowEvent &event);
+
     private:
         gcn::Button *mBuyButton;
         gcn::Button *mQuitButton;
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index d752cdb3..e8381bef 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -48,6 +48,7 @@
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
 #include "../utils/tostring.h"
+#include "../utils/trim.h"
 
 // Defined in main.cpp, used here for setting the char create dialog
 extern CharServerHandler charServerHandler;
@@ -255,11 +256,6 @@ bool CharSelectDialog::selectByName(const std::string &name)
     return false;
 }
 
-std::string CharSelectDialog::getName()
-{
-    return mNameLabel->getCaption();
-}
-
 CharCreateDialog::CharCreateDialog(Window *parent, int slot):
     Window(_("Create Character"), true, parent), mSlot(slot)
 {
@@ -410,10 +406,12 @@ CharCreateDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-const std::string&
+std::string
 CharCreateDialog::getName()
 {
-    return mNameField->getText();
+    std::string name = mNameField->getText();
+    trim(name);
+    return name;
 }
 
 void CharCreateDialog::UpdateSliders()
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index 9d9184ea..5d0b42fa 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -60,11 +60,6 @@ class CharSelectDialog : public Window, public gcn::ActionListener
 
         bool selectByName(const std::string &name);
 
-        /**
-         * Returns name of selected player
-         */
-        std::string getName();
-
     private:
         LockedArray<LocalPlayer*> *mCharInfo;
 
@@ -114,22 +109,28 @@ class CharCreateDialog : public Window, public gcn::ActionListener
          */
         ~CharCreateDialog();
 
-        void
-        action(const gcn::ActionEvent &event);
-
-        const std::string&
-        getName();
+        void action(const gcn::ActionEvent &event);
 
         /**
          * Unlocks the dialog, enabling the create character button again.
          */
-        void
-        unlock();
+        void unlock();
 
     private:
         int getDistributedPoints();
+
         void UpdateSliders();
 
+        /**
+         * Returns the name of the character to create.
+         */
+        std::string getName();
+
+        /**
+         * Communicate character creation to the server.
+         */
+        void attemptCharCreate();
+
         gcn::TextField *mNameField;
         gcn::Label *mNameLabel;
         gcn::Button *mNextHairColorButton;
@@ -154,12 +155,6 @@ class CharCreateDialog : public Window, public gcn::ActionListener
 
         static const int mMaxPoints = 70;
         int mUsedPoints;
-
-
-        /**
-         * Communicate character creation to the server.
-         */
-        void attemptCharCreate();
 };
 
 #endif
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index ba7c7f02..4ed8bb97 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -44,6 +44,7 @@
 #include "../net/gameserver/player.h"
 
 #include "../utils/dtor.h"
+#include "../utils/trim.h"
 
 ChatWindow::ChatWindow():
     Window(),
@@ -125,7 +126,7 @@ void
 ChatWindow::chatLog(std::string line, int own, std::string channelName)
 {
     // Delete overhead from the end of the list
-    while ((int)mChatlog.size() > mItemsKeep) {
+    while ((int) mChatlog.size() > mItemsKeep) {
         mChatlog.pop_back();
     }
 
@@ -142,12 +143,15 @@ ChatWindow::chatLog(std::string line, int own, std::string channelName)
         own = BY_SERVER;
     }
 
-    int pos = line.find(" : ");
-    if (pos > 0) {
+    std::string::size_type pos = line.find(" : ");
+    if (pos != std::string::npos) {
         tmp.nick = line.substr(0, pos);
         line.erase(0, pos + 3);
     }
 
+    // Trim whitespace
+    trim(line);
+
     std::string lineColor = "##0"; // Equiv. to BrowserBox::BLACK
     switch (own) {
         case BY_GM:
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 11ad37c2..884cdf7e 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -42,6 +42,7 @@ DebugWindow::DebugWindow():
     Window("Debug")
 {
     setResizable(true);
+    setCloseButton(true);
     setDefaultSize(0, 0, 400, 100);
     loadWindowState("Debug");
 
@@ -60,15 +61,11 @@ DebugWindow::DebugWindow():
     mParticleCountLabel = new gcn::Label("[Particle count: 0]");
     mParticleCountLabel->setPosition(100, 60);
 
-    Button *closeButton = new Button("Close", "close", this);
-    closeButton->setPosition(5, 60);
-
     add(mFPSLabel);
     add(mMusicFileLabel);
     add(mMapFileLabel);
     add(mTileMouseLabel);
     add(mParticleCountLabel);
-    add(closeButton);
 }
 
 void
@@ -106,12 +103,3 @@ DebugWindow::logic()
                                     +"]");
     mParticleCountLabel->adjustSize();
 }
-
-void
-DebugWindow::action(const gcn::ActionEvent &event)
-{
-    if (event.getId() == "close")
-    {
-        setVisible(false);
-    }
-}
diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h
index d082b2ca..9b6f2017 100644
--- a/src/gui/debugwindow.h
+++ b/src/gui/debugwindow.h
@@ -33,11 +33,11 @@
 #include "../guichanfwd.h"
 
 /**
- * The chat window.
+ * The debug window.
  *
  * \ingroup Interface
  */
-class DebugWindow : public Window, public gcn::ActionListener
+class DebugWindow : public Window
 {
     public:
         /**
@@ -50,11 +50,6 @@ class DebugWindow : public Window, public gcn::ActionListener
          */
         void logic();
 
-        /**
-         * Performs action.
-         */
-        void action(const gcn::ActionEvent &event);
-
     private:
         gcn::Label *mMusicFileLabel, *mMapFileLabel;
         gcn::Label *mTileMouseLabel, *mFPSLabel;
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 5e835985..c86a27fc 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -59,6 +59,7 @@ EquipmentWindow::EquipmentWindow(Equipment *equipment):
     mBackground(NULL),
     mSelected(-1)
 {
+    setCloseButton(true);
     setDefaultSize(5, 195, 216, 260);
     loadWindowState("Equipment");
 
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index dc51054c..97dd4d44 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -42,7 +42,7 @@
 #include "../graphics.h"
 #include "../log.h"
 
-#include "../resources/image.h"
+#include "../resources/imageset.h"
 #include "../resources/resourcemanager.h"
 #include "../resources/imageloader.h"
 
@@ -77,8 +77,9 @@ class GuiConfigListener : public ConfigListener
 };
 
 Gui::Gui(Graphics *graphics):
-    mMouseCursor(NULL),
-    mCustomCursor(false)
+    mCustomCursor(false),
+    mMouseCursors(NULL),
+    mCursorType(CURSOR_POINTER)
 {
     logger->log("Initializing GUI...");
     // Set graphics
@@ -106,7 +107,7 @@ Gui::Gui(Graphics *graphics):
 
     // Set global font
     try {
-        mGuiFont = new TrueTypeFont("data/fonts/dejavusans.ttf", 12);
+        mGuiFont = new TrueTypeFont("data/fonts/dejavusans.ttf", 11);
     }
     catch (gcn::Exception e)
     {
@@ -139,7 +140,7 @@ Gui::Gui(Graphics *graphics):
         hitBlueFont = new gcn::ImageFont("graphics/gui/hits_blue.png",
                 "0123456789");
         hitYellowFont = new gcn::ImageFont("graphics/gui/hits_yellow.png",
-                "mis");
+                "0123456789misxp ");
     }
     catch (gcn::Exception e)
     {
@@ -169,8 +170,8 @@ Gui::~Gui()
     delete hitBlueFont;
     delete hitYellowFont;
 
-    if (mMouseCursor) {
-        mMouseCursor->decRef();
+    if (mMouseCursors) {
+        mMouseCursors->decRef();
     }
 
     delete mGuiFont;
@@ -181,12 +182,6 @@ Gui::~Gui()
     delete guiInput;
 }
 
-void
-Gui::logic()
-{
-    gcn::Gui::logic();
-}
-
 void
 Gui::draw()
 {
@@ -196,11 +191,13 @@ Gui::draw()
     int mouseX, mouseY;
     Uint8 button = SDL_GetMouseState(&mouseX, &mouseY);
 
-    if ((SDL_GetAppState() & SDL_APPMOUSEFOCUS || button & SDL_BUTTON(1))
-            && mCustomCursor)
+    if ((SDL_GetAppState() & SDL_APPMOUSEFOCUS || button & SDL_BUTTON(1)) &&
+            mCustomCursor)
     {
-        static_cast<Graphics*>(mGraphics)->
-            drawImage(mMouseCursor, mouseX - 5, mouseY - 2);
+        static_cast<Graphics*>(mGraphics)->drawImage(
+                mMouseCursors->get(mCursorType),
+                mouseX - 15,
+                mouseY - 17);
     }
 
     mGraphics->popClipArea();
@@ -220,9 +217,11 @@ Gui::setUseCustomCursor(bool customCursor)
 
             // Load the mouse cursor
             ResourceManager *resman = ResourceManager::getInstance();
-            mMouseCursor = resman->getImage("graphics/gui/mouse.png");
-            if (!mMouseCursor) {
-                logger->error("Unable to load mouse cursor.");
+            mMouseCursors =
+                resman->getImageSet("graphics/gui/mouse.png", 40, 40);
+
+            if (!mMouseCursors) {
+                logger->error("Unable to load mouse cursors.");
             }
         }
         else
@@ -231,9 +230,9 @@ Gui::setUseCustomCursor(bool customCursor)
             SDL_ShowCursor(SDL_ENABLE);
 
             // Unload the mouse cursor
-            if (mMouseCursor) {
-                mMouseCursor->decRef();
-                mMouseCursor = NULL;
+            if (mMouseCursors) {
+                mMouseCursors->decRef();
+                mMouseCursors = NULL;
             }
         }
     }
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 5f2cc810..1e4b9348 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -30,7 +30,7 @@
 
 class GuiConfigListener;
 class Graphics;
-class Image;
+class ImageSet;
 class Viewport;
 
 /**
@@ -59,36 +59,49 @@ class Gui : public gcn::Gui
          */
         ~Gui();
 
-        /**
-         * Works around Guichan bug
-         */
-        void
-        logic();
-
         /**
          * Draws the whole Gui by calling draw functions down in the
          * Gui hierarchy. It also draws the mouse pointer.
          */
-        void
-        draw();
+        void draw();
 
         /**
-         * Return game font
+         * Return game font.
          */
-        gcn::Font*
-        getFont() { return mGuiFont; }
+        gcn::Font* getFont() const
+        { return mGuiFont; }
 
         /**
          * Sets whether a custom cursor should be rendered.
          */
-        void
-        setUseCustomCursor(bool customCursor);
+        void setUseCustomCursor(bool customCursor);
+
+        /**
+         * Sets which cursor should be used.
+         */
+        void setCursorType(int index)
+        { mCursorType = index; }
+
+        /**
+         * Cursors are in graphic order from left to right.
+         * CURSOR_POINTER should be left untouched.
+         * CURSOR_TOTAL should always be last.
+         */
+        enum {
+            CURSOR_POINTER = 0,
+            CURSOR_RESIZE_ACROSS,
+            CURSOR_RESIZE_DOWN,
+            CURSOR_RESIZE_DOWN_LEFT,
+            CURSOR_RESIZE_DOWN_RIGHT,
+            CURSOR_TOTAL
+        };
 
     private:
         GuiConfigListener *mConfigListener;
         gcn::Font *mGuiFont;                  /**< The global GUI font */
-        Image *mMouseCursor;                  /**< Mouse cursor image */
         bool mCustomCursor;                   /**< Show custom cursor */
+        ImageSet *mMouseCursors;              /**< Mouse cursor images */
+        int mCursorType;
 };
 
 extern Gui *gui;                              /**< The GUI system */
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 085ab188..1e62b130 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -51,6 +51,7 @@ InventoryWindow::InventoryWindow():
     mSplit(false)
 {
     setResizable(true);
+    setCloseButton(true);
     setMinWidth(240);
     setMinHeight(172);
     // If you adjust these defaults, don't forget to adjust the trade window's.
@@ -69,7 +70,6 @@ InventoryWindow::InventoryWindow():
     mItems->addSelectionListener(this);
 
     mInvenScroll = new ScrollArea(mItems);
-    mInvenScroll->setPosition(8, 8);
 
     mItemNameLabel = new gcn::Label(strprintf(_("Name: %s"), ""));
     mItemDescriptionLabel = new gcn::Label(
@@ -100,8 +100,8 @@ InventoryWindow::InventoryWindow():
         mSplitButton->setWidth(48);
     }
 
+    addWindowListener(this);
     loadWindowState("Inventory");
-    updateContentSize();
 }
 
 InventoryWindow::~InventoryWindow()
@@ -130,7 +130,6 @@ void InventoryWindow::logic()
     mWeightLabel->setCaption(
         strprintf(_("Total Weight: %d - Maximum Weight: %d"),
         player_node->getTotalWeight(), player_node->getMaxWeight()));
-    mWeightLabel->adjustSize();
 }
 
 void InventoryWindow::action(const gcn::ActionEvent &event)
@@ -215,7 +214,7 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
     }
 }
 
-void InventoryWindow::updateContentSize()
+void InventoryWindow::windowResized(const WindowEvent &event)
 {
     const gcn::Rectangle area = getChildrenArea();
 
@@ -260,8 +259,7 @@ Item* InventoryWindow::getItem()
     return mItems->getItem();
 }
 
-void
-InventoryWindow::keyPressed(gcn::KeyEvent &event)
+void InventoryWindow::keyPressed(gcn::KeyEvent &event)
 {
     switch (event.getKey().getValue())
     {
@@ -271,8 +269,7 @@ InventoryWindow::keyPressed(gcn::KeyEvent &event)
     }
 }
 
-void
-InventoryWindow::keyReleased(gcn::KeyEvent &event)
+void InventoryWindow::keyReleased(gcn::KeyEvent &event)
 {
     switch (event.getKey().getValue())
     {
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 37ef0406..a9fdadf2 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -29,8 +29,9 @@
 
 #include <guichan/widgets/checkbox.hpp>
 
-#include "window.h"
 #include "selectionlistener.h"
+#include "window.h"
+#include "windowlistener.h"
 
 #include "../guichanfwd.h"
 
@@ -45,7 +46,8 @@ class ItemContainer;
 class InventoryWindow : public Window,
                         public gcn::ActionListener,
                         public gcn::KeyListener,
-                        public SelectionListener
+                        public SelectionListener,
+                        public WindowListener
 {
     public:
         /**
@@ -92,7 +94,10 @@ class InventoryWindow : public Window,
          */
         void selectionChanged(const SelectionEvent &event);
 
-        void updateContentSize();    /**< Updates widgets size/position. */
+        /**
+         * Called whenever the window is resized.
+         */
+        void windowResized(const WindowEvent &event);
 
     private:
         void updateButtons();    /**< Updates button states. */
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index b032bd49..bddf7cee 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -30,6 +30,7 @@
 #include "../graphics.h"
 #include "../inventory.h"
 #include "../item.h"
+#include "../itemshortcut.h"
 #include "../localplayer.h"
 
 #include "../resources/image.h"
@@ -38,6 +39,9 @@
 
 #include "../utils/tostring.h"
 
+// TODO: Add support for adding items to the item shortcut window (global
+// itemShortcut).
+
 static const int BOX_WIDTH = 36;
 static const int BOX_HEIGHT = 44;
 
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
new file mode 100644
index 00000000..1943ef93
--- /dev/null
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -0,0 +1,224 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include "itemshortcutcontainer.h"
+
+#include "../graphics.h"
+#include "../item.h"
+#include "../itemshortcut.h"
+#include "../keyboardconfig.h"
+
+#include "../resources/image.h"
+#include "../resources/resourcemanager.h"
+
+#include "../utils/tostring.h"
+
+ItemShortcutContainer::ItemShortcutContainer():
+    mGridWidth(1),
+    mGridHeight(1),
+    mItemClicked(false),
+    mItemMoved(NULL)
+{
+    addMouseListener(this);
+
+    ResourceManager *resman = ResourceManager::getInstance();
+
+    mBackgroundImg = resman->getImage("graphics/gui/item_shortcut_bgr.png");
+    mMaxItems = itemShortcut->getItemCount();
+
+    mBoxHeight = 42;
+    mBoxWidth = 36;
+}
+
+ItemShortcutContainer::~ItemShortcutContainer()
+{
+    mBackgroundImg->decRef();
+}
+
+void
+ItemShortcutContainer::logic()
+{
+    gcn::Widget::logic();
+
+    int i = itemShortcut->getItemCount();
+
+    if (i != mMaxItems)
+    {
+        mMaxItems = i;
+        setWidth(getWidth());
+    }
+}
+
+void
+ItemShortcutContainer::draw(gcn::Graphics *graphics)
+{
+    Graphics *g = static_cast<Graphics*>(graphics);
+
+    for (int i = 0; i < mMaxItems; i++)
+    {
+        const int itemX = (i % mGridWidth) * mBoxWidth;
+        const int itemY = (i / mGridWidth) * mBoxHeight;
+
+        g->drawImage(mBackgroundImg, itemX, itemY);
+
+        // Draw item keyboard shortcut.
+        const char *key = SDL_GetKeyName(
+            (SDLKey) keyboard.getKeyValue(keyboard.KEY_SHORTCUT_0+i));
+        g->drawText(key, itemX + 2, itemY + 2, gcn::Graphics::LEFT);
+
+        Item *item = itemShortcut->getItem(i);
+        if (item) {
+            // Draw item icon.
+            Image* image = item->getInfo().getImage();
+            if (image) {
+                g->drawImage(image, itemX, itemY);
+                g->drawText(
+                        toString(item->getQuantity()),
+                        itemX + mBoxWidth / 2,
+                        itemY + mBoxHeight - 14,
+                        gcn::Graphics::CENTER);
+            }
+        }
+    }
+    if (mItemMoved)
+    {
+        // Draw the item image being dragged by the cursor.
+        Image* image = mItemMoved->getInfo().getImage();
+        if (image)
+        {
+            const int tPosX = mCursorPosX - (image->getWidth() / 2);
+            const int tPosY = mCursorPosY - (image->getHeight() / 2);
+
+            g->drawImage(image, tPosX, tPosY);
+            g->drawText(
+                    toString(mItemMoved->getQuantity()),
+                    tPosX + mBoxWidth / 2,
+                    tPosY + mBoxHeight - 14,
+                    gcn::Graphics::CENTER);
+        }
+    }
+}
+
+void
+ItemShortcutContainer::setWidth(int width)
+{
+    gcn::Widget::setWidth(width);
+
+    mGridWidth = getWidth() / mBoxWidth;
+    if (mGridWidth < 1) {
+        mGridWidth = 1;
+    }
+
+    setHeight((mMaxItems / mGridWidth +
+                (mMaxItems % mGridWidth > 0 ? 1 : 0)) * mBoxHeight);
+
+    mGridHeight = getHeight() / mBoxHeight;
+    if (mGridHeight < 1) {
+        mGridHeight = 1;
+    }
+}
+
+void
+ItemShortcutContainer::mouseDragged(gcn::MouseEvent &event)
+{
+    if (event.getButton() == gcn::MouseEvent::LEFT) {
+        if (!mItemMoved && mItemClicked) {
+            const int index = getIndexFromGrid(event.getX(), event.getY());
+            if (index == -1) {
+                return;
+            }
+            Item *item = itemShortcut->getItem(index);
+            if (item)
+            {
+                mItemMoved = item;
+                itemShortcut->removeItem(index);
+            }
+        }
+        if (mItemMoved) {
+            mCursorPosX = event.getX();
+            mCursorPosY = event.getY();
+        }
+    }
+}
+
+void
+ItemShortcutContainer::mousePressed(gcn::MouseEvent &event)
+{
+    const int index = getIndexFromGrid(event.getX(), event.getY());
+    if (index == -1) {
+        return;
+    }
+
+    // Stores the selected item if theirs one.
+    if (itemShortcut->isItemSelected()) {
+        itemShortcut->setItem(index);
+        itemShortcut->setItemSelected(NULL);
+    }
+    else if (itemShortcut->getItem(index)) {
+        mItemClicked = true;
+    }
+}
+
+void
+ItemShortcutContainer::mouseReleased(gcn::MouseEvent &event)
+{
+    if (event.getButton() == gcn::MouseEvent::LEFT)
+    {
+        if (itemShortcut->isItemSelected())
+        {
+            itemShortcut->setItemSelected(NULL);
+        }
+        const int index = getIndexFromGrid(event.getX(), event.getY());
+        if (index == -1) {
+            mItemMoved = NULL;
+            return;
+        }
+        if (mItemMoved) {
+            itemShortcut->setItems(index, mItemMoved);
+            mItemMoved = NULL;
+        }
+        else if (itemShortcut->getItem(index) && mItemClicked)
+        {
+            itemShortcut->useItem(index);
+        }
+        if (mItemClicked) {
+            mItemClicked = false;
+        }
+    }
+}
+
+int
+ItemShortcutContainer::getIndexFromGrid(int pointX, int pointY) const
+{
+    const gcn::Rectangle tRect = gcn::Rectangle(
+        0, 0, mGridWidth * mBoxWidth, mGridHeight * mBoxHeight);
+    if (!tRect.isPointInRect(pointX, pointY)) {
+        return -1;
+    }
+    const int index = ((pointY / mBoxHeight) * mGridWidth) +
+        pointX / mBoxWidth;
+    if (index >= mMaxItems)
+    {
+        return -1;
+    }
+    return index;
+}
diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h
new file mode 100644
index 00000000..4b154cbb
--- /dev/null
+++ b/src/gui/itemshortcutcontainer.h
@@ -0,0 +1,115 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#ifndef _TMW_ITEMSHORTCUTCONTAINER_H__
+#define _TMW_ITEMSHORTCUTCONTAINER_H__
+
+#include <guichan/mouselistener.hpp>
+#include <guichan/widget.hpp>
+
+#include <list>
+
+class Image;
+class Item;
+
+/**
+ * An item shortcut container. Used to quickly use items.
+ *
+ * \ingroup GUI
+ */
+class ItemShortcutContainer : public gcn::Widget, public gcn::MouseListener
+{
+    public:
+        /**
+         * Constructor. Initializes the graphic.
+         */
+        ItemShortcutContainer();
+
+        /**
+         * Destructor.
+         */
+        virtual ~ItemShortcutContainer();
+
+        /**
+         * Handles the logic of the ItemContainer
+         */
+        void logic();
+
+        /**
+         * Draws the items.
+         */
+        void draw(gcn::Graphics *graphics);
+
+        /**
+         * Sets the width of the container. This is used to determine the new
+         * height of the container.
+         */
+        void setWidth(int width);
+
+        /**
+         * Handles mouse when dragged.
+         */
+        void mouseDragged(gcn::MouseEvent &event);
+
+        /**
+         * Handles mouse when pressed.
+         */
+        void mousePressed(gcn::MouseEvent &event);
+
+        /**
+         * Handles mouse release.
+         */
+        void mouseReleased(gcn::MouseEvent &event);
+
+
+        int getMaxItems()
+        { return mMaxItems; }
+
+        int getBoxWidth()
+        { return mBoxWidth; }
+
+        int getBoxHeight()
+        { return mBoxHeight; }
+
+    private:
+        /**
+         * Gets the index from the grid provided the point is in an item box.
+         *
+         * @param pointX X coordinate of the point.
+         * @param pointY Y coordinate of the point.
+         * @return index on success, -1 on failure.
+         */
+        int getIndexFromGrid(int pointX, int pointY) const;
+
+        Image *mBackgroundImg;
+
+        int mMaxItems;
+        int mBoxWidth;
+        int mBoxHeight;
+        int mCursorPosX, mCursorPosY;
+        int mGridWidth, mGridHeight;
+        bool mItemClicked;
+        Item *mItemMoved;
+
+};
+
+#endif
diff --git a/src/gui/itemshortcutwindow.cpp b/src/gui/itemshortcutwindow.cpp
new file mode 100644
index 00000000..dd97a7db
--- /dev/null
+++ b/src/gui/itemshortcutwindow.cpp
@@ -0,0 +1,74 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include "itemshortcutwindow.h"
+
+#include "itemshortcutcontainer.h"
+#include "scrollarea.h"
+
+static const int SCROLL_PADDING = 0;
+
+ItemShortcutWindow::ItemShortcutWindow()
+{
+    // no title presented, title bar is padding so window can be moved.
+    gcn::Window::setTitleBarHeight(gcn::Window::getPadding());
+    setShowTitle(false);
+    setResizable(true);
+    setDefaultSize(758, 174, 42, 426);
+
+    mItems = new ItemShortcutContainer();
+
+    int border = SCROLL_PADDING * 2 + getPadding() * 2;
+    setMinWidth(mItems->getBoxWidth() + border);
+    setMinHeight(mItems->getBoxHeight() + border);
+    setMaxWidth(mItems->getBoxWidth() * mItems->getMaxItems() + border);
+    setMaxHeight(mItems->getBoxHeight() * mItems->getMaxItems() + border);
+
+    mInvenScroll = new ScrollArea(mItems);
+    mInvenScroll->setPosition(SCROLL_PADDING, SCROLL_PADDING);
+    mInvenScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+
+    add(mInvenScroll);
+
+    addWindowListener(this);
+    loadWindowState("ItemShortcut");
+}
+
+ItemShortcutWindow::~ItemShortcutWindow()
+{
+    delete mItems;
+    delete mInvenScroll;
+}
+
+void ItemShortcutWindow::logic()
+{
+    Window::logic();
+}
+
+void ItemShortcutWindow::windowResized(const WindowEvent &event)
+{
+    const gcn::Rectangle area = getChildrenArea();
+
+    mInvenScroll->setSize(
+            area.width - SCROLL_PADDING,
+            area.height - SCROLL_PADDING);
+}
diff --git a/src/gui/itemshortcutwindow.h b/src/gui/itemshortcutwindow.h
new file mode 100644
index 00000000..83bc348d
--- /dev/null
+++ b/src/gui/itemshortcutwindow.h
@@ -0,0 +1,69 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#ifndef _TMW_ITEMSHORTCUTWINDOW_H
+#define _TMW_ITEMSHORTCUTWINDOW_H
+
+#include "window.h"
+#include "windowlistener.h"
+
+#include "../guichanfwd.h"
+
+class ItemShortcutContainer;
+
+/**
+ * Inventory dialog.
+ *
+ * \ingroup Interface
+ */
+class ItemShortcutWindow : public Window, WindowListener
+{
+    public:
+        /**
+         * Constructor.
+         */
+        ItemShortcutWindow();
+
+        /**
+         * Destructor.
+         */
+        ~ItemShortcutWindow();
+
+        /**
+         * Logic (updates buttons and weight information).
+         */
+        void logic();
+
+        /**
+         * Called whenever the window is resized.
+         */
+        void windowResized(const WindowEvent &event);
+
+    private:
+        ItemShortcutContainer *mItems;
+
+        gcn::ScrollArea *mInvenScroll;
+};
+
+extern ItemShortcutWindow *itemShortcutWindow;
+
+#endif
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index bfa2f1f2..8d4d184d 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -37,6 +37,7 @@ extern Window *inventoryWindow;
 extern Window *equipmentWindow;
 extern Window *skillDialog;
 extern Window *statusWindow;
+extern Window *itemShortcutWindow;
 
 namespace {
     struct MenuWindowListener : public gcn::ActionListener
@@ -62,6 +63,7 @@ MenuWindow::MenuWindow():
         N_("Equipment"),
         N_("Inventory"),
         N_("Skills"),
+        N_("Shortcut"),
         N_("Setup"),
         0
     };
@@ -109,14 +111,20 @@ void MenuWindowListener::action(const gcn::ActionEvent &event)
     {
         window = skillDialog;
     }
+    else if (event.getId() == "Shortcut")
+    {
+        window = itemShortcutWindow;
+    }
     else if (event.getId() == "Setup")
     {
         window = setupWindow;
     }
 
-    if (window) {
+    if (window)
+    {
         window->setVisible(!window->isVisible());
-        if (window->isVisible()) {
+        if (window->isVisible())
+        {
             window->requestMoveToTop();
         }
     }
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 48bbd3d0..aeb6637d 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -200,12 +200,6 @@ void PopupMenu::handleLink(const std::string& link)
 
     setVisible(false);
 
-    /*
-     * This is need cause of a bug in guichan that leave
-     * the focus on the popup menu even if is not visible.
-     */
-    _getFocusHandler()->focusNone();
-
     mBeing = NULL;
     mFloorItem = NULL;
     mItem = NULL;
diff --git a/src/gui/selectionlistener.h b/src/gui/selectionlistener.h
index b39672b5..917a4871 100644
--- a/src/gui/selectionlistener.h
+++ b/src/gui/selectionlistener.h
@@ -25,33 +25,23 @@
 #define _TMW_SELECTIONLISTENER_H__
 
 #include <guichan/widget.hpp>
+#include <guichan/event.hpp>
 
 /**
  * An event that characterizes a change in the current selection.
  *
  * \ingroup GUI
  */
-class SelectionEvent
+class SelectionEvent : public gcn::Event
 {
     public:
         /**
          * Constructor.
          */
         SelectionEvent(gcn::Widget *source):
-            mSource(source)
+            gcn::Event(source)
         {
         }
-
-        /**
-         * The widget from which the event originated.
-         */
-        gcn::Widget* getSource() const
-        {
-            return mSource;
-        }
-
-    private:
-        gcn::Widget *mSource;
 };
 
 /**
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index b601d70c..5f1011c1 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -44,58 +44,44 @@ SellDialog::SellDialog():
     Window("Sell"),
     mMaxItems(0), mAmountItems(0)
 {
+    setResizable(true);
+    setMinWidth(260);
+    setMinHeight(230);
+    setDefaultSize(0, 0, 260, 230);
+
     mShopItems = new ShopItems();
 
     mShopItemList = new ShopListBox(mShopItems, mShopItems);
-    ScrollArea *scrollArea = new ScrollArea(mShopItemList);
+    mScrollArea = new ScrollArea(mShopItemList);
     mSlider = new Slider(1.0);
     mQuantityLabel = new gcn::Label("0");
     mMoneyLabel = new gcn::Label("Money: 0 GP / Total: 0 GP");
-    mItemDescLabel = new gcn::Label("Description:");
-    mItemEffectLabel = new gcn::Label("Effect:");
     mIncreaseButton = new Button("+", "+", this);
     mDecreaseButton = new Button("-", "-", this);
     mSellButton = new Button("Sell", "sell", this);
-    Button *quitButton = new Button("Quit", "quit", this);
-    mSellButton->setEnabled(false);
-
-    setContentSize(260, 210);
-    scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    scrollArea->setDimension(gcn::Rectangle(5, 5, 250, 110));
-    mShopItemList->setDimension(gcn::Rectangle(5, 5, 238, 110));
-
-    mSlider->setDimension(gcn::Rectangle(5, 120, 200, 10));
-    mSlider->setEnabled(false);
-
-    mQuantityLabel->setPosition(215, 120);
+    mQuitButton = new Button("Quit", "quit", this);
+    mItemDescLabel = new gcn::Label("Description:");
+    mItemEffectLabel = new gcn::Label("Effect:");
 
-    mIncreaseButton->setPosition(40, 186);
     mIncreaseButton->setSize(20, 20);
-    mIncreaseButton->setEnabled(false);
-
-    mDecreaseButton->setPosition(10, 186);
     mDecreaseButton->setSize(20, 20);
-    mDecreaseButton->setEnabled(false);
+    mQuantityLabel->setWidth(60);
 
-    mMoneyLabel->setPosition(5, 130);
-    mItemEffectLabel->setDimension(gcn::Rectangle(5, 150, 240, 14));
-    mItemDescLabel->setDimension(gcn::Rectangle(5, 169, 240, 14));
-
-    mSellButton->setPosition(175, 186);
+    mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mIncreaseButton->setEnabled(false);
+    mDecreaseButton->setEnabled(false);
     mSellButton->setEnabled(false);
+    mSlider->setEnabled(false);
 
-    quitButton->setPosition(208, 186);
-
+    mShopItemList->setPriceCheck(false);
     mShopItemList->setActionEventId("item");
     mSlider->setActionEventId("slider");
 
-    mShopItemList->setPriceCheck(false);
-
     mShopItemList->addActionListener(this);
     mShopItemList->addSelectionListener(this);
     mSlider->addActionListener(this);
 
-    add(scrollArea);
+    add(mScrollArea);
     add(mSlider);
     add(mQuantityLabel);
     add(mMoneyLabel);
@@ -104,8 +90,10 @@ SellDialog::SellDialog():
     add(mIncreaseButton);
     add(mDecreaseButton);
     add(mSellButton);
-    add(quitButton);
+    add(mQuitButton);
 
+    addWindowListener(this);
+    loadWindowState("Sell");
     setLocationRelativeTo(getParent());
 }
 
@@ -117,7 +105,7 @@ SellDialog::~SellDialog()
 void SellDialog::reset()
 {
     mShopItems->clear();
-    mSlider->setValue(0.0);
+    mSlider->setValue(0);
 
     // Reset previous selected item to prevent failing asserts
     mShopItemList->setSelected(-1);
@@ -135,16 +123,11 @@ void SellDialog::action(const gcn::ActionEvent &event)
 {
     int selectedItem = mShopItemList->getSelected();
 
-    if (event.getId() == "item")
-    {
-        mAmountItems = 0;
-        mSlider->setValue(0);
-        updateButtonsAndLabels();
-    }
-    else if (event.getId() == "quit")
+    if (event.getId() == "quit")
     {
         setVisible(false);
         current_npc = 0;
+        return;
     }
 
     // The following actions require a valid item selection
@@ -156,21 +139,19 @@ void SellDialog::action(const gcn::ActionEvent &event)
 
     if (event.getId() == "slider")
     {
-        mAmountItems = (int) (mSlider->getValue() * mMaxItems);
+        mAmountItems = (int) mSlider->getValue();
         updateButtonsAndLabels();
     }
     else if (event.getId() == "+" && mAmountItems < mMaxItems)
     {
         mAmountItems++;
-
-        mSlider->setValue((double) mAmountItems /(double) mMaxItems);
+        mSlider->setValue(mAmountItems);
         updateButtonsAndLabels();
     }
-    else if (event.getId() == "-" && mAmountItems > 0)
+    else if (event.getId() == "-" && mAmountItems > 1)
     {
         mAmountItems--;
-
-        mSlider->setValue((double) mAmountItems / (double) mMaxItems);
+        mSlider->setValue(mAmountItems);
         updateButtonsAndLabels();
     }
     else if (event.getId() == "sell" && mAmountItems > 0
@@ -182,8 +163,7 @@ void SellDialog::action(const gcn::ActionEvent &event)
         mMaxItems -= mAmountItems;
         mShopItems->getShop()->at(selectedItem).quantity = mMaxItems;
         mPlayerMoney += (mAmountItems * mShopItems->at(selectedItem).price);
-        mAmountItems = 0;
-        mSlider->setValue(0);
+        mAmountItems = 1;
 
         if (!mMaxItems)
         {
@@ -194,6 +174,7 @@ void SellDialog::action(const gcn::ActionEvent &event)
         }
         else
         {
+            mSlider->gcn::Slider::setScale(1, mMaxItems);
             // Update only when there are items left, the entry doesn't exist
             // otherwise and can't be updated
             updateButtonsAndLabels();
@@ -204,10 +185,54 @@ void SellDialog::action(const gcn::ActionEvent &event)
 void SellDialog::selectionChanged(const SelectionEvent &event)
 {
     // Reset amount of items and update labels
-    mAmountItems = 0;
+    mAmountItems = 1;
     mSlider->setValue(0);
 
     updateButtonsAndLabels();
+    mSlider->gcn::Slider::setScale(1, mMaxItems);
+}
+
+void SellDialog::windowResized(const WindowEvent &event)
+{
+    gcn::Rectangle area = getChildrenArea();
+    int width = area.width;
+    int height = area.height;
+
+    mDecreaseButton->setPosition(8, height - 8 - mDecreaseButton->getHeight());
+    mIncreaseButton->setPosition(
+            mDecreaseButton->getX() + mDecreaseButton->getWidth() + 5,
+            mDecreaseButton->getY());
+
+    mQuitButton->setPosition(
+            width - 8 - mQuitButton->getWidth(),
+            height - 8 - mQuitButton->getHeight());
+    mSellButton->setPosition(
+            mQuitButton->getX() - 5 - mSellButton->getWidth(),
+            mQuitButton->getY());
+
+    mItemDescLabel->setDimension(gcn::Rectangle(8,
+                mSellButton->getY() - 5 - mItemDescLabel->getHeight(),
+                width - 16,
+                mItemDescLabel->getHeight()));
+    mItemEffectLabel->setDimension(gcn::Rectangle(8,
+                mItemDescLabel->getY() - 5 - mItemEffectLabel->getHeight(),
+                width - 16,
+                mItemEffectLabel->getHeight()));
+    mMoneyLabel->setDimension(gcn::Rectangle(8,
+                mItemEffectLabel->getY() - 5 - mMoneyLabel->getHeight(),
+                width - 16,
+                mMoneyLabel->getHeight()));
+
+    mQuantityLabel->setPosition(
+            width - mQuantityLabel->getWidth() - 8,
+            mMoneyLabel->getY() - 5 - mQuantityLabel->getHeight());
+    mSlider->setDimension(gcn::Rectangle(8,
+                mQuantityLabel->getY(),
+                mQuantityLabel->getX() - 8 - 8,
+                10));
+
+    mScrollArea->setDimension(gcn::Rectangle(8, 8, width - 16,
+                mSlider->getY() - 5 - 8));
 }
 
 void SellDialog::setMoney(int amount)
@@ -246,15 +271,13 @@ SellDialog::updateButtonsAndLabels()
 
     // Update Buttons and slider
     mSellButton->setEnabled(mAmountItems > 0);
-    mDecreaseButton->setEnabled(mAmountItems > 0);
+    mDecreaseButton->setEnabled(mAmountItems > 1);
     mIncreaseButton->setEnabled(mAmountItems < mMaxItems);
-    mSlider->setEnabled(selectedItem > -1);
+    mSlider->setEnabled(mMaxItems > 1);
 
     // Update the quantity and money labels
     mQuantityLabel->setCaption(
             toString(mAmountItems) + " / " + toString(mMaxItems));
-    mQuantityLabel->adjustSize();
     mMoneyLabel->setCaption("Money: " + toString(income) + " GP / Total: "
                             + toString(mPlayerMoney + income) + " GP");
-    mMoneyLabel->adjustSize();
 }
diff --git a/src/gui/sell.h b/src/gui/sell.h
index fc42fd1c..d1e2ddd2 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -28,6 +28,7 @@
 
 #include "window.h"
 #include "selectionlistener.h"
+#include "windowlistener.h"
 
 #include "../guichanfwd.h"
 
@@ -40,7 +41,8 @@ class ShopListBox;
  *
  * \ingroup Interface
  */
-class SellDialog : public Window, gcn::ActionListener, SelectionListener
+class SellDialog : public Window, gcn::ActionListener, SelectionListener,
+    WindowListener
 {
     public:
         /**
@@ -77,22 +79,28 @@ class SellDialog : public Window, gcn::ActionListener, SelectionListener
          */
         void selectionChanged(const SelectionEvent &event);
 
+        /**
+         * Called whenever the window is resized.
+         */
+        void windowResized(const WindowEvent &event);
+
         /**
          * Gives Player's Money amount
          */
         void setMoney(int amount);
 
+    private:
         /**
          * Updates the state of buttons and labels.
          */
-        void
-        updateButtonsAndLabels();
+        void updateButtonsAndLabels();
 
-    private:
         gcn::Button *mSellButton;
+        gcn::Button *mQuitButton;
         gcn::Button *mIncreaseButton;
         gcn::Button *mDecreaseButton;
         ShopListBox *mShopItemList;
+        gcn::ScrollArea *mScrollArea;
         gcn::Label *mMoneyLabel;
         gcn::Label *mItemDescLabel;
         gcn::Label *mItemEffectLabel;
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 3ea19059..6a13232a 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -27,6 +27,7 @@
 #include "setup_audio.h"
 #include "setup_joystick.h"
 #include "setup_video.h"
+#include "setup_keyboard.h"
 #include "tabbedcontainer.h"
 
 #include "../utils/dtor.h"
@@ -43,7 +44,8 @@ extern Window *skillDialog;
 Setup::Setup():
     Window(_("Setup"))
 {
-    int width = 230;
+    setCloseButton(true);
+    int width = 250;
     int height = 245;
     setContentSize(width, height);
 
@@ -59,7 +61,7 @@ Setup::Setup():
     }
 
     TabbedContainer *panel = new TabbedContainer();
-    panel->setDimension(gcn::Rectangle(5, 5, 220, 205));
+    panel->setDimension(gcn::Rectangle(5, 5, 250, 205));
     panel->setOpaque(false);
 
     SetupTab *tab;
@@ -76,6 +78,10 @@ Setup::Setup():
     panel->addTab(tab, _("Joystick"));
     mTabs.push_back(tab);
 
+    tab = new Setup_Keyboard();
+    panel->addTab(tab, "Keyboard");
+    mTabs.push_back(tab);
+
     add(panel);
 
     setLocationRelativeTo(getParent());
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
new file mode 100644
index 00000000..e88080b5
--- /dev/null
+++ b/src/gui/setup_keyboard.cpp
@@ -0,0 +1,187 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "setup_keyboard.h"
+
+#include <guichan/widgets/label.hpp>
+#include <guichan/listmodel.hpp>
+
+#include "button.h"
+#include "listbox.h"
+#include "ok_dialog.h"
+#include "scrollarea.h"
+
+#include "../configuration.h"
+#include "../keyboardconfig.h"
+
+#include "../utils/tostring.h"
+
+#include <SDL_keyboard.h>
+
+/**
+ * The list model for key function list.
+ *
+ * \ingroup Interface
+ */
+class KeyListModel : public gcn::ListModel
+{
+    public:
+        /**
+         * Returns the number of elements in container.
+         */
+        int getNumberOfElements() { return keyboard.KEY_TOTAL; }
+
+        /**
+         * Returns element from container.
+         */
+        std::string getElementAt(int i) { return mKeyFunctions[i]; }
+
+        /**
+         * Sets element from container.
+         */
+        void setElementAt(int i, std::string caption)
+        {
+            mKeyFunctions[i] = caption;
+        }
+
+    private:
+        std::string mKeyFunctions[KeyboardConfig::KEY_TOTAL];
+};
+
+Setup_Keyboard::Setup_Keyboard():
+    mKeyListModel(new KeyListModel()),
+    mKeyList(new ListBox(mKeyListModel)),
+    mKeySetting(false)
+{
+    keyboard.setSetupKeyboard(this);
+    setOpaque(false);
+
+    refreshKeys();
+
+    mKeyList->setDimension(gcn::Rectangle(0, 0, 185, 140));
+    mKeyList->addActionListener(this);
+    mKeyList->setSelected(-1);
+
+    ScrollArea *scrollArea = new ScrollArea(mKeyList);
+    scrollArea->setDimension(gcn::Rectangle(10, 10, 200, 140));
+    add(scrollArea);
+
+    mAssignKeyButton = new Button("Assign", "assign", this);
+    mAssignKeyButton->setPosition(165, 155);
+    mAssignKeyButton->addActionListener(this);
+    mAssignKeyButton->setEnabled(false);
+    add(mAssignKeyButton);
+
+    mMakeDefaultButton = new Button("Default", "makeDefault", this);
+    mMakeDefaultButton->setPosition(10, 155);
+    mMakeDefaultButton->addActionListener(this);
+    add(mMakeDefaultButton);
+}
+
+Setup_Keyboard::~Setup_Keyboard()
+{
+    delete mKeyList;
+    delete mKeyListModel;
+
+    delete mAssignKeyButton;
+    delete mMakeDefaultButton;
+}
+
+void Setup_Keyboard::apply()
+{
+    keyUnresolved();
+
+    if (keyboard.hasConflicts())
+    {
+        new OkDialog("Key Conflict(s) Detected.",
+            "Resolve them, or gameplay may result in strange behaviour.");
+    }
+    keyboard.setEnabled(true);
+    keyboard.store();
+}
+
+void Setup_Keyboard::cancel()
+{
+    keyUnresolved();
+
+    keyboard.retrieve();
+    keyboard.setEnabled(true);
+
+    refreshKeys();
+}
+
+void Setup_Keyboard::action(const gcn::ActionEvent &event)
+{
+    if (event.getSource() == mKeyList)
+    {
+        if (!mKeySetting) {
+            mAssignKeyButton->setEnabled(true);
+        }
+    }
+    else if (event.getId() == "assign")
+    {
+        mKeySetting = true;
+        mAssignKeyButton->setEnabled(false);
+        keyboard.setEnabled(false);
+        int i(mKeyList->getSelected());
+        keyboard.setNewKeyIndex(i);
+        mKeyListModel->setElementAt(i, keyboard.getKeyCaption(i) + ": ?");
+    }
+    else if (event.getId() == "makeDefault")
+    {
+        keyboard.makeDefault();
+        refreshKeys();
+    }
+}
+
+void Setup_Keyboard::refreshAssignedKey(int index)
+{
+    std::string caption;
+    char *temp = SDL_GetKeyName(
+        (SDLKey) keyboard.getKeyValue(index));
+    caption = keyboard.getKeyCaption(index) + ": " + toString(temp);
+    mKeyListModel->setElementAt(index, caption);
+}
+
+void Setup_Keyboard::newKeyCallback(int index)
+{
+    mKeySetting = false;
+    refreshAssignedKey(index);
+    mAssignKeyButton->setEnabled(true);
+}
+
+void Setup_Keyboard::refreshKeys()
+{
+    for(int i = 0; i < keyboard.KEY_TOTAL; i++)
+    {
+        refreshAssignedKey(i);
+    }
+}
+
+void Setup_Keyboard::keyUnresolved()
+{
+    if (mKeySetting) {
+        newKeyCallback(keyboard.getNewKeyIndex());
+        keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
+    }
+}
diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h
new file mode 100644
index 00000000..b72e8746
--- /dev/null
+++ b/src/gui/setup_keyboard.h
@@ -0,0 +1,84 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_GUI_SETUP_KEYBOARD_H
+#define _TMW_GUI_SETUP_KEYBOARD_H
+
+#include "setuptab.h"
+#include "button.h"
+#include "../guichanfwd.h"
+
+#include <guichan/actionlistener.hpp>
+
+
+#include <string>
+
+class Setup_Keyboard : public SetupTab, public gcn::ActionListener
+{
+    public:
+        /**
+         * Constructor
+         */
+        Setup_Keyboard();
+
+        /**
+         * Destructor
+         */
+        ~Setup_Keyboard();
+
+        void apply();
+        void cancel();
+
+        void action(const gcn::ActionEvent &event);
+
+        /**
+         * Get an update on the assigned key.
+         */
+        void refreshAssignedKey(int index);
+
+        /**
+         * The callback function when a new key has been pressed.
+         */
+        void newKeyCallback(int index);
+
+        /**
+         * Shorthand method to update all the keys.
+         */
+        void refreshKeys();
+
+        /**
+         * If a key function is unresolved, then this reverts it.
+         */
+        void keyUnresolved();
+
+    private:
+        class KeyListModel *mKeyListModel;
+        gcn::ListBox *mKeyList;
+
+        gcn::Button *mAssignKeyButton;
+        gcn::Button *mMakeDefaultButton;
+
+        bool mKeySetting; /**< flag to check if key being set. */
+};
+
+#endif
diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp
index 0e2ea6d3..ae787ab7 100644
--- a/src/gui/shoplistbox.cpp
+++ b/src/gui/shoplistbox.cpp
@@ -129,24 +129,8 @@ void ShopListBox::mousePressed(gcn::MouseEvent &event)
 {
     if (event.getButton() == gcn::MouseEvent::LEFT)
     {
-        bool enoughMoney = false;
-        int y = event.getY();
-
-        if (mShopItems && mPriceCheck)
-        {
-            if (mPlayerMoney >= mShopItems->at(y / mRowHeight).price)
-                enoughMoney = true;
-        }
-        else // Old Behaviour
-        {
-            enoughMoney = true;
-        }
-
-        if (enoughMoney)
-        {
-            setSelected(y / mRowHeight);
-            generateAction();
-        }
+        setSelected(event.getY() / mRowHeight);
+        generateAction();
     }
 }
 
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 884b3744..d5cfe76a 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -63,22 +63,18 @@ const char *skill_db[] = {
 SkillDialog::SkillDialog():
     Window("Skills")
 {
+    setCloseButton(true);
     setDefaultSize(windowContainer->getWidth() - 255, 25, 240, 240);
 
     mSkillListBox = new ListBox(this);
     ScrollArea *skillScrollArea = new ScrollArea(mSkillListBox);
-    mCloseButton = new Button("Close", "close", this);
 
     mSkillListBox->setActionEventId("skill");
 
     skillScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     skillScrollArea->setDimension(gcn::Rectangle(5, 5, 230, 180));
-    mCloseButton->setPosition(
-        skillScrollArea->getX() + skillScrollArea->getWidth() - mCloseButton->getWidth(),
-        210);
 
     add(skillScrollArea);
-    add(mCloseButton);
 
     mSkillListBox->addActionListener(this);
 
diff --git a/src/gui/skill.h b/src/gui/skill.h
index b8794e35..f1a14d50 100644
--- a/src/gui/skill.h
+++ b/src/gui/skill.h
@@ -71,7 +71,6 @@ class SkillDialog : public Window, public gcn::ActionListener,
 
     private:
         gcn::ListBox *mSkillListBox;
-        gcn::Button *mCloseButton;
 
         std::vector<SKILL*> mSkillList;
 };
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 7da3b905..323a6b16 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -39,6 +39,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     mPlayer(player)
 {
     setResizable(true);
+    setCloseButton(true);
     setDefaultSize((windowContainer->getWidth() - 365) / 2,
                    (windowContainer->getHeight() - 255) / 2, 365, 280);
     loadWindowState("Status");
@@ -219,7 +220,7 @@ void StatusWindow::update()
         mHpBar->setColor(0, 171, 34); // Green
     }
 
-    mHpBar->setProgress((float)hp / maxHp);
+    mHpBar->setProgress((float) hp / maxHp);
 
     // Stats Part
     // ----------
@@ -235,7 +236,8 @@ void StatusWindow::update()
     int statusPoints = mPlayer->getAttributeIncreasePoints();
 
     // Update labels
-    for (int i = 0; i < 7; i++) {
+    for (int i = 0; i < 7; i++)
+    {
         mStatsLabel[i]->setCaption(attrNames[i]);
         mStatsDisplayLabel[i]->setCaption(
             strprintf("%d / %d",
diff --git a/src/gui/status.h b/src/gui/status.h
index 40d25a2a..62cd8805 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -41,7 +41,8 @@ class ProgressBar;
  *
  * \ingroup Interface
  */
-class StatusWindow : public Window, public gcn::ActionListener {
+class StatusWindow : public Window, public gcn::ActionListener
+{
     public:
         /**
          * Constructor.
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index ed75e5b3..5d81bb9c 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -46,6 +46,8 @@
 
 #include "../resources/resourcemanager.h"
 
+extern std::string homeDir;
+
 /**
  * Calculates the Alder-32 checksum for the given file.
  */
@@ -119,7 +121,7 @@ UpdaterWindow::UpdaterWindow():
 
     mUpdateHost =
         config.getValue("updatehost", "http://updates.themanaworld.org");
-    mBasePath = config.getValue("homeDir", ".");
+    mBasePath = homeDir;
 
     // Try to download the updates list
     download();
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 2af1d960..4c6b04a2 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -55,8 +55,7 @@ Viewport::Viewport():
     mCameraX(0),
     mCameraY(0),
     mShowDebugPath(false),
-    mPlayerFollowMouse(false),
-    mPopupActive(false)
+    mPlayerFollowMouse(false)
 {
     setOpaque(false);
     addMouseListener(this);
@@ -372,21 +371,20 @@ Viewport::mousePressed(gcn::MouseEvent &event)
         if ((being = beingManager->findBeing(tilex, tiley)) &&
                 being->getType() != Being::LOCALPLAYER)
         {
-            showPopup(event.getX(), event.getY(), being);
+            mPopupMenu->showPopup(event.getX(), event.getY(), being);
             return;
         }
         else if((floorItem = floorItemManager->findByCoordinates(tilex, tiley)))
         {
-            showPopup(event.getX(), event.getY(), floorItem);
+            mPopupMenu->showPopup(event.getX(), event.getY(), floorItem);
             return;
         }
     }
 
     // If a popup is active, just remove it
-    if (mPopupActive)
+    if (mPopupMenu->isVisible())
     {
         mPopupMenu->setVisible(false);
-        mPopupActive = false;
         return;
     }
 
@@ -450,21 +448,6 @@ void
 Viewport::showPopup(int x, int y, Item *item)
 {
     mPopupMenu->showPopup(x, y, item);
-    mPopupActive = true;
-}
-
-void
-Viewport::showPopup(int x, int y, FloorItem *floorItem)
-{
-    mPopupMenu->showPopup(x, y, floorItem);
-    mPopupActive = true;
-}
-
-void
-Viewport::showPopup(int x, int y, Being *being)
-{
-    mPopupMenu->showPopup(x, y, being);
-    mPopupActive = true;
 }
 
 void
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 22d0f249..eeb31bae 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -129,18 +129,6 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         getCameraY() { return mCameraY; }
 
     private:
-        /**
-         * Shows a popup for a floor item.
-         * TODO Find some way to get rid of FloorItem here
-         */
-        void showPopup(int x, int y, FloorItem *floorItem);
-
-        /**
-         * Shows a popup for a being.
-         * TODO Find some way to get rid of Being here
-         */
-        void showPopup(int x, int y, Being *being);
-
         /**
          * Helper function for loading target cursors
          */
@@ -187,7 +175,6 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         int mWalkTime;
 
         PopupMenu *mPopupMenu;     /**< Popup menu. */
-        bool mPopupActive;
 };
 
 #endif
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 84f4466c..17447009 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -26,6 +26,7 @@
 #include <guichan/exception.hpp>
 #include <guichan/widgets/icon.hpp>
 
+#include "gui.h"
 #include "gccontainer.h"
 #include "windowcontainer.h"
 
@@ -42,7 +43,9 @@
 ConfigListener *Window::windowConfigListener = 0;
 WindowContainer *Window::windowContainer = 0;
 int Window::instances = 0;
+int Window::mouseResize = 0;
 ImageRect Window::border;
+Image *Window::closeImage = NULL;
 
 class WindowConfigListener : public ConfigListener
 {
@@ -60,7 +63,7 @@ Window::Window(const std::string& caption, bool modal, Window *parent):
     mParent(parent),
     mModal(modal),
     mResizable(false),
-    mMouseResize(0),
+    mCloseButton(false),
     mSticky(false),
     mMinWinWidth(100),
     mMinWinHeight(40),
@@ -88,6 +91,8 @@ Window::Window(const std::string& caption, bool modal, Window *parent):
         border.grid[7] = dBorders->getSubImage(4, 15, 3, 4);
         border.grid[8] = dBorders->getSubImage(7, 15, 4, 4);
         dBorders->decRef();
+        closeImage = resman->getImage("graphics/gui/close_button.png");
+
         windowConfigListener = new WindowConfigListener();
         // Send GUI alpha changed for initialization
         windowConfigListener->optionChanged("guialpha");
@@ -110,6 +115,7 @@ Window::Window(const std::string& caption, bool modal, Window *parent):
 
     if (mModal)
     {
+        gui->setCursorType(Gui::CURSOR_POINTER);
         requestModalFocus();
     }
 
@@ -153,6 +159,7 @@ Window::~Window()
         delete border.grid[6];
         delete border.grid[7];
         delete border.grid[8];
+        closeImage->decRef();
     }
 
     delete mChrome;
@@ -173,11 +180,19 @@ void Window::draw(gcn::Graphics *graphics)
     // Draw title
     if (getTitleBarHeight())
     {
-        graphics->setColor(gcn::Color(0, 0, 0));
-        graphics->setFont(getFont());
-        graphics->drawText(getCaption(), 7, 5, gcn::Graphics::LEFT);
+        g->setColor(gcn::Color(0, 0, 0));
+        g->setFont(getFont());
+        g->drawText(getCaption(), 7, 5, gcn::Graphics::LEFT);
     }
 
+    // Draw Close Button
+    if (mCloseButton)
+    {
+        g->drawImage(closeImage,
+            getWidth() - closeImage->getWidth() - getPadding(),
+            getPadding()
+        );
+    }
     drawChildren(graphics);
 }
 
@@ -207,6 +222,8 @@ void Window::setWidth(int width)
     {
         mGrip->setX(getWidth() - mGrip->getWidth() - getChildrenArea().x);
     }
+
+    fireWindowEvent(WindowEvent(this, WindowEvent::WINDOW_RESIZED));
 }
 
 void Window::setHeight(int height)
@@ -217,6 +234,8 @@ void Window::setHeight(int height)
     {
         mGrip->setY(getHeight() - mGrip->getHeight() - getChildrenArea().y);
     }
+
+    fireWindowEvent(WindowEvent(this, WindowEvent::WINDOW_RESIZED));
 }
 
 void Window::setDimension(const gcn::Rectangle &dimension)
@@ -228,6 +247,27 @@ void Window::setDimension(const gcn::Rectangle &dimension)
         mGrip->setX(getWidth() - mGrip->getWidth() - getChildrenArea().x);
         mGrip->setY(getHeight() - mGrip->getHeight() - getChildrenArea().y);
     }
+
+    fireWindowEvent(WindowEvent(this, WindowEvent::WINDOW_RESIZED));
+    fireWindowEvent(WindowEvent(this, WindowEvent::WINDOW_MOVED));
+}
+
+void Window::setPosition(int x, int y)
+{
+    gcn::Window::setPosition(x, y);
+    fireWindowEvent(WindowEvent(this, WindowEvent::WINDOW_MOVED));
+}
+
+void Window::setX(int x)
+{
+    gcn::Window::setX(x);
+    fireWindowEvent(WindowEvent(this, WindowEvent::WINDOW_MOVED));
+}
+
+void Window::setY(int y)
+{
+    gcn::Window::setY(y);
+    fireWindowEvent(WindowEvent(this, WindowEvent::WINDOW_MOVED));
 }
 
 void Window::setLocationRelativeTo(gcn::Widget *widget)
@@ -280,6 +320,11 @@ void Window::setResizable(bool r)
     }
 }
 
+void Window::setCloseButton(bool flag)
+{
+    mCloseButton = flag;
+}
+
 bool Window::isResizable()
 {
     return mResizable;
@@ -327,27 +372,73 @@ void Window::mousePressed(gcn::MouseEvent &event)
     // Let Guichan move window to top and figure out title bar drag
     gcn::Window::mousePressed(event);
 
-    const int x = event.getX();
-    const int y = event.getY();
-    mMouseResize = 0;
+    if (event.getButton() == gcn::MouseEvent::LEFT)
+    {
+        const int x = event.getX();
+        const int y = event.getY();
+
+        // Handle close button
+        if (mCloseButton)
+        {
+            gcn::Rectangle closeButtonRect(
+                getWidth() - closeImage->getWidth() - getPadding(),
+                getPadding(),
+                closeImage->getWidth(),
+                closeImage->getHeight());
+
+            if (closeButtonRect.isPointInRect(x, y))
+            {
+                setVisible(false);
+            }
+        }
+
+        // Handle window resizing
+        mouseResize = getResizeHandles(event);
+    }
+}
+
+void Window::mouseReleased(gcn::MouseEvent &event)
+{
+    if (mResizable && mouseResize)
+    {
+        mouseResize = 0;
+        gui->setCursorType(Gui::CURSOR_POINTER);
+    }
+
+    // This should be the responsibility of Guichan (and is from 0.8.0 on)
+    mIsMoving = false;
+}
 
-    // Activate resizing handles as appropriate
-    if (event.getSource() == this && isResizable() &&
-            event.getButton() == gcn::MouseEvent::LEFT &&
-            !getChildrenArea().isPointInRect(x, y))
+void Window::mouseExited(gcn::MouseEvent &event)
+{
+    if (mResizable && !mouseResize)
     {
-        mMouseResize |= (x > getWidth() - resizeBorderWidth) ? RIGHT :
-                        (x < resizeBorderWidth) ? LEFT : 0;
-        mMouseResize |= (y > getHeight() - resizeBorderWidth) ? BOTTOM :
-                        (y < resizeBorderWidth) ? TOP : 0;
+        gui->setCursorType(Gui::CURSOR_POINTER);
     }
-    else if (event.getSource() == mGrip &&
-            event.getButton() == gcn::MouseEvent::LEFT)
+}
+
+void Window::mouseMoved(gcn::MouseEvent &event)
+{
+    int resizeHandles = getResizeHandles(event);
+
+    // Changes the custom mouse cursor based on it's current position.
+    switch (resizeHandles)
     {
-        mDragOffsetX = x;
-        mDragOffsetY = y;
-        mMouseResize |= BOTTOM | RIGHT;
-        mIsMoving = false;
+        case BOTTOM | RIGHT:
+            gui->setCursorType(Gui::CURSOR_RESIZE_DOWN_RIGHT);
+            break;
+        case BOTTOM | LEFT:
+            gui->setCursorType(Gui::CURSOR_RESIZE_DOWN_LEFT);
+            break;
+        case BOTTOM:
+            gui->setCursorType(Gui::CURSOR_RESIZE_DOWN);
+            break;
+        case RIGHT:
+        case LEFT:
+            gui->setCursorType(Gui::CURSOR_RESIZE_ACROSS);
+            break;
+        default:
+            gui->setCursorType(Gui::CURSOR_POINTER);
     }
 }
 
@@ -366,31 +457,31 @@ void Window::mouseDragged(gcn::MouseEvent &event)
         setPosition(newX, newY);
     }
 
-    if (mMouseResize && !mIsMoving)
+    if (mouseResize && !mIsMoving)
     {
         const int dx = event.getX() - mDragOffsetX;
         const int dy = event.getY() - mDragOffsetY;
         gcn::Rectangle newDim = getDimension();
 
-        if (mMouseResize & (TOP | BOTTOM))
+        if (mouseResize & (TOP | BOTTOM))
         {
-            int newHeight = newDim.height + ((mMouseResize & TOP) ? -dy : dy);
+            int newHeight = newDim.height + ((mouseResize & TOP) ? -dy : dy);
             newDim.height = std::min(mMaxWinHeight,
                                      std::max(mMinWinHeight, newHeight));
 
-            if (mMouseResize & TOP)
+            if (mouseResize & TOP)
             {
                 newDim.y -= newDim.height - getHeight();
             }
         }
 
-        if (mMouseResize & (LEFT | RIGHT))
+        if (mouseResize & (LEFT | RIGHT))
         {
-            int newWidth = newDim.width + ((mMouseResize & LEFT) ? -dx : dx);
+            int newWidth = newDim.width + ((mouseResize & LEFT) ? -dx : dx);
             newDim.width = std::min(mMaxWinWidth,
                                     std::max(mMinWinWidth, newWidth));
 
-            if (mMouseResize & LEFT)
+            if (mouseResize & LEFT)
             {
                 newDim.x -= newDim.width - getWidth();
             }
@@ -417,11 +508,11 @@ void Window::mouseDragged(gcn::MouseEvent &event)
         }
 
         // Update mouse offset when dragging bottom or right border
-        if (mMouseResize & BOTTOM)
+        if (mouseResize & BOTTOM)
         {
             mDragOffsetY += newDim.height - getHeight();
         }
-        if (mMouseResize & RIGHT)
+        if (mouseResize & RIGHT)
         {
             mDragOffsetX += newDim.width - getWidth();
         }
@@ -469,3 +560,50 @@ void Window::resetToDefaultSize()
     setContentSize(mDefaultWidth, mDefaultHeight);
     updateContentSize();
 }
+
+int Window::getResizeHandles(gcn::MouseEvent &event)
+{
+    int resizeHandles = 0;
+    const int y = event.getY();
+
+    if (mResizable && y > (int) mTitleBarHeight)
+    {
+        const int x = event.getX();
+
+        if (!getChildrenArea().isPointInRect(x, y) &&
+                event.getSource() == this)
+        {
+            resizeHandles |= (x > getWidth() - resizeBorderWidth) ? RIGHT :
+                              (x < resizeBorderWidth) ? LEFT : 0;
+            resizeHandles |= (y > getHeight() - resizeBorderWidth) ? BOTTOM :
+                              (y < resizeBorderWidth) ? TOP : 0;
+        }
+
+        if (event.getSource() == mGrip)
+        {
+            mDragOffsetX = x;
+            mDragOffsetY = y;
+            resizeHandles |= BOTTOM | RIGHT;
+        }
+    }
+
+    return resizeHandles;
+}
+
+void Window::fireWindowEvent(const WindowEvent &event)
+{
+    WindowListeners::iterator i_end = mListeners.end();
+    WindowListeners::iterator i = mListeners.begin();
+
+    switch (event.getType())
+    {
+        case WindowEvent::WINDOW_MOVED:
+            for (; i != i_end; ++i)
+            { (*i)->windowMoved(event); }
+            break;
+        case WindowEvent::WINDOW_RESIZED:
+            for (; i != i_end; ++i)
+            { (*i)->windowResized(event); }
+            break;
+    }
+}
diff --git a/src/gui/window.h b/src/gui/window.h
index 1ba23fb2..ab266422 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -28,11 +28,14 @@
 
 #include "../guichanfwd.h"
 
+#include "windowlistener.h"
+
 class ConfigListener;
 class GCContainer;
 class ImageRect;
 class ResizeGrip;
 class WindowContainer;
+class Image;
 
 /**
  * A window. This window can be dragged around and has a title bar. Windows are
@@ -119,16 +122,36 @@ class Window : public gcn::Window
          */
         void setDimension(const gcn::Rectangle &dimension);
 
+        /**
+         * Sets the position of this window.
+         */
+        void setPosition(int x, int y);
+
+        /**
+         * Sets the window x coordinate.
+         */
+        void setX(int x);
+
+        /**
+         * Sets the window y coordinate.
+         */
+        void setY(int y);
+
         /**
          * Sets the location relative to the given widget.
          */
         void setLocationRelativeTo(gcn::Widget *widget);
 
         /**
-         * Sets whether of not the window can be resized.
+         * Sets whether or not the window can be resized.
          */
         void setResizable(bool resize);
 
+        /**
+         * Sets whether or not the window has a close button.
+         */
+        void setCloseButton(bool flag);
+
         /**
          * Returns whether the window can be resized.
          */
@@ -155,9 +178,14 @@ class Window : public gcn::Window
         void setMaxHeight(unsigned int height);
 
         /**
-          * Sets whether the window is sticky.
-          * A sticky window will not have its visibility set to false
-          * on a general setVisible(false) call.
+         * Sets flag to show a title or not.
+         */
+        void setShowTitle(bool flag)
+        { mShowTitle = flag; }
+
+        /**
+          * Sets whether the window is sticky. A sticky window will not have
+          * its visibility set to false on a general setVisible(false) call.
           */
         void setSticky(bool sticky);
 
@@ -167,10 +195,9 @@ class Window : public gcn::Window
         bool isSticky();
 
         /**
-         * Overloads window setVisible by guichan to allow sticky window
-         * Handling
+         * Overloads window setVisible by Guichan to allow sticky window
+         * handling.
          */
-
         void setVisible(bool visible);
 
         /**
@@ -198,6 +225,24 @@ class Window : public gcn::Window
          */
         void mouseDragged(gcn::MouseEvent &event);
 
+        /**
+         * Implements custom cursor image changing context, based on mouse
+         * relative position.
+         */
+        void mouseMoved(gcn::MouseEvent &event);
+
+        /**
+         * When the mouse button has been let go, this ensures that the mouse
+         * custom cursor is restored back to it's standard image.
+         */
+        void mouseReleased(gcn::MouseEvent &event);
+
+        /**
+         * When the mouse leaves the window this ensures that the custom cursor
+         * is restored back to it's standard image.
+         */
+        void mouseExited(gcn::MouseEvent &event);
+
         /**
          * Read the x, y, and width and height for resizables in the config
          * based on the given string.
@@ -216,11 +261,25 @@ class Window : public gcn::Window
                             int defaultWidth, int defaultHeight);
 
         /**
-         * Reset the win pos and size to default.
-         * Don't forget to set defaults first.
+         * Reset the win pos and size to default. Don't forget to set defaults
+         * first.
          */
         void resetToDefaultSize();
 
+        /**
+         * Adds a listener to the list that's notified when the window is
+         * moved or resized.
+         */
+        void addWindowListener(WindowListener *listener)
+        { mListeners.push_back(listener); }
+
+        /**
+         * Removes a listener from the list that's notified when the window is
+         * moved or resized.
+         */
+        void removeWindowListener(WindowListener *listener)
+        { mListeners.remove(listener); }
+
         enum ResizeHandles
         {
             TOP    = 0x01,
@@ -233,13 +292,23 @@ class Window : public gcn::Window
         static WindowContainer *windowContainer;
 
     private:
+        /**
+         * Determines if the mouse is in a resize area and returns appropriate
+         * resize handles. Also initializes drag offset in case the resize
+         * grip is used.
+         *
+         * @see ResizeHandles
+         */
+        int getResizeHandles(gcn::MouseEvent &event);
+
         GCContainer *mChrome;      /**< Contained container */
         ResizeGrip *mGrip;         /**< Resize grip */
         Window *mParent;           /**< The parent window */
         std::string mConfigName;   /**< Name used for saving window-related data */
+        bool mShowTitle;           /**< Window has a title bar */
         bool mModal;               /**< Window is modal */
         bool mResizable;           /**< Window can be resized */
-        int mMouseResize;          /**< Window is being resized */
+        bool mCloseButton;         /**< Window has a close button */
         bool mSticky;              /**< Window resists minimization */
         int mMinWinWidth;          /**< Minimum window width */
         int mMinWinHeight;         /**< Minimum window height */
@@ -255,8 +324,10 @@ class Window : public gcn::Window
          */
         static ConfigListener *windowConfigListener;
 
+        static int mouseResize;    /**< Active resize handles */
         static int instances;      /**< Number of Window instances */
         static ImageRect border;   /**< The window border and background */
+        static Image *closeImage;  /**< Close Button Image */
 
         /**
          * The width of the resize border. Is independent of the actual window
@@ -264,6 +335,14 @@ class Window : public gcn::Window
          * where two borders are moved at the same time.
          */
         static const int resizeBorderWidth = 10;
+
+    private:
+        /**
+         * Sends out a window event to the list of selection listeners.
+         */
+        void fireWindowEvent(const WindowEvent &event);
+
+        WindowListeners mListeners;
 };
 
 #endif
diff --git a/src/gui/windowlistener.h b/src/gui/windowlistener.h
new file mode 100644
index 00000000..08aab71d
--- /dev/null
+++ b/src/gui/windowlistener.h
@@ -0,0 +1,86 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_WINDOW_LISTENER_H_
+#define _TMW_WINDOW_LISTENER_H_
+
+#include <guichan/widgets/window.hpp>
+#include <guichan/event.hpp>
+
+/**
+ * An event that characterizes a window move or resize.
+ *
+ * \ingroup GUI
+ */
+class WindowEvent : public gcn::Event
+{
+    public:
+        /**
+         * Constructor.
+         */
+        WindowEvent(gcn::Window *source, int type):
+            gcn::Event(source)
+        {
+            mType = type;
+        }
+
+        /**
+         * Returns the event type.
+         */
+        int getType() const
+        { return mType; }
+
+        enum WindowEventType
+        {
+            WINDOW_MOVED,
+            WINDOW_RESIZED
+        };
+};
+
+/**
+ * The listener that's notified when a window is moved or resized.
+ *
+ * \ingroup GUI
+ */
+class WindowListener
+{
+    public:
+        /**
+         * Virtual destructor.
+         */
+        virtual ~WindowListener() {}
+
+        /**
+         * Called whenever the window is moved.
+         */
+        virtual void windowMoved(const WindowEvent &event) {}
+
+        /**
+         * Called whenever the window is resized.
+         */
+        virtual void windowResized(const WindowEvent &event) {}
+};
+
+typedef std::list<WindowListener*> WindowListeners;
+
+#endif
diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp
index 35cc21ad..17581a2a 100644
--- a/src/imageparticle.cpp
+++ b/src/imageparticle.cpp
@@ -31,12 +31,12 @@ ImageParticle::ImageParticle(Map *map, Image *image):
     Particle(map),
     mImage(image)
 {
-    mImage->incRef();
+    if (mImage) mImage->incRef();
 }
 
 ImageParticle::~ImageParticle()
 {
-    mImage->decRef();
+    if (mImage) mImage->decRef();
 }
 
 void ImageParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
@@ -44,8 +44,8 @@ void ImageParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
     if (!mAlive)
         return;
 
-    int screenX = (int) mPosX + offsetX - mImage->getWidth() / 2;
-    int screenY = (int) mPosY - (int) mPosZ + offsetY - mImage->getHeight()/2;
+    int screenX = (int) mPos.x + offsetX - mImage->getWidth() / 2;
+    int screenY = (int) mPos.y - (int)mPos.z + offsetY - mImage->getHeight()/2;
 
     // Check if on screen
     if (screenX + mImage->getWidth() < 0 ||
diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp
new file mode 100644
index 00000000..8a514c7e
--- /dev/null
+++ b/src/itemshortcut.cpp
@@ -0,0 +1,87 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include "itemshortcut.h"
+
+#include "localplayer.h"
+#include "configuration.h"
+
+#include "utils/tostring.h"
+
+ItemShortcut::ItemShortcut *itemShortcut;
+
+ItemShortcut::ItemShortcut():
+    mItemSelected(NULL)
+{
+    for (int i = 0; i < SHORTCUT_ITEMS; i++)
+    {
+        mItems[i] = NULL;
+    }
+}
+
+ItemShortcut::~ItemShortcut()
+{
+    save();
+}
+
+void ItemShortcut::load()
+{
+    for (int i = 0; i < SHORTCUT_ITEMS; i++)
+    {
+        int itemId = (int) config.getValue("itemShortcut" + toString(i), -1);
+
+        if (itemId != -1)
+        {
+            ItemPtr item = player_node->searchForItem(itemId);
+            if (item)
+            {
+                mItems[i] = item;
+            }
+        }
+    }
+}
+
+void ItemShortcut::save()
+{
+    for (int i = 0; i < SHORTCUT_ITEMS; i++)
+    {
+        if (mItems[i])
+        {
+            config.setValue("shortcut" + toString(i), mItems[i]->getId());
+        }
+        else
+        {
+            config.setValue("shortcut" + toString(i), -1);
+        }
+    }
+}
+
+void ItemShortcut::useItem(int index)
+{
+    if (mItems[index])
+    {
+        if (mItems[index]->getQuantity()) {
+            // TODO: Fix this (index vs. pointer mismatch)
+            //player_node->useItem(mItems[index]);
+        }
+    }
+}
diff --git a/src/itemshortcut.h b/src/itemshortcut.h
new file mode 100644
index 00000000..d211c7f3
--- /dev/null
+++ b/src/itemshortcut.h
@@ -0,0 +1,130 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#ifndef _TMW_ITEMSHORTCUT_H__
+#define _TMW_ITEMSHORTCUT_H__
+
+#include "item.h"
+
+#define SHORTCUT_ITEMS 10
+
+/**
+ * The item pointer
+ */
+typedef Item* ItemPtr;
+
+class ItemShortcut
+{
+    public:
+        /**
+         * Constructor.
+         */
+        ItemShortcut();
+
+        /**
+         * Destructor.
+         */
+        ~ItemShortcut();
+
+        /**
+         * Load the configuration information.
+         */
+        void load();
+
+        /**
+         * Returns the shortcut item specified by the index.
+         *
+         * @param index Index of the shortcut item.
+         */
+        ItemPtr getItem(int index) const
+        { return mItems[index]; }
+
+        /**
+         * Returns the amount of shortcut items.
+         */
+        int getItemCount() const
+        { return SHORTCUT_ITEMS; }
+
+        /**
+         * Returns the item that is currently selected.
+         */
+        ItemPtr getItemSelected() const
+        { return mItemSelected; }
+
+        /**
+         * Adds the selected item to the items specified by the index.
+         *
+         * @param index Index of the items.
+         */
+        void setItem(int index)
+        { mItems[index] = mItemSelected; }
+
+        /**
+         * Adds an item to the items store specified by the index.
+         *
+         * @param index Index of the items.
+         * @param item Item to store.
+         */
+        void setItems(int index, Item *item)
+        { mItems[index] = item; }
+
+        /**
+         * Set the item that is selected.
+         *
+         * @param item The item that is to be assigned.
+         */
+        void setItemSelected(ItemPtr item)
+        { mItemSelected = item; }
+
+        /**
+         * A flag to check if the item is selected.
+         */
+        bool isItemSelected()
+        { return (mItemSelected) ? true : false; }
+
+        /**
+         * Remove a item from the shortcut.
+         */
+        void removeItem(int index)
+        { mItems[index] = NULL; }
+
+        /**
+         * Try to use the item specified by the index.
+         *
+         * @param index Index of the item shortcut.
+         */
+        void useItem(int index);
+
+    private:
+        /**
+         * Save the configuration information.
+         */
+        void save();
+
+        ItemPtr mItems[SHORTCUT_ITEMS]; /**< the items stored */
+        ItemPtr mItemSelected;              /**< the item held by cursor */
+
+};
+
+extern ItemShortcut *itemShortcut;
+
+#endif
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
new file mode 100644
index 00000000..271961c8
--- /dev/null
+++ b/src/keyboardconfig.cpp
@@ -0,0 +1,144 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "keyboardconfig.h"
+#include "configuration.h"
+#include "log.h"
+
+#include <guichan/sdl/sdlinput.hpp>
+
+#include "gui/setup_keyboard.h"
+
+struct KeyData
+{
+    const char *configField;
+    int defaultValue;
+    const char *caption;
+};
+
+// keyData must be in same order as enum keyAction.
+static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
+    {"keyMoveUp", SDLK_UP, "Move Up"},
+    {"keyMoveDown", SDLK_DOWN, "Move Down"},
+    {"keyMoveLeft", SDLK_LEFT, "Move Left"},
+    {"keyMoveRight", SDLK_RIGHT, "Move Right"},
+    {"keyAttack", SDLK_LCTRL, "Attack"},
+    {"keyTarget", SDLK_LSHIFT, "Target"},
+    {"keyTargetClosest", SDLK_a, "Target Closest"},
+    {"keyPickup", SDLK_z, "Pickup"},
+    {"keyHideWindows", SDLK_h, "Hide Windows"},
+    {"keyBeingSit", SDLK_s, "Sit"},
+    {"keyShortcut0", SDLK_0, "Item Shortcut 0"},
+    {"keyShortcut1", SDLK_1, "Item Shortcut 1"},
+    {"keyShortcut2", SDLK_2, "Item Shortcut 2"},
+    {"keyShortcut3", SDLK_3, "Item Shortcut 3"},
+    {"keyShortcut4", SDLK_4, "Item Shortcut 4"},
+    {"keyShortcut5", SDLK_5, "Item Shortcut 5"},
+    {"keyShortcut6", SDLK_6, "Item Shortcut 6"},
+    {"keyShortcut7", SDLK_7, "Item Shortcut 7"},
+    {"keyShortcut8", SDLK_8, "Item Shortcut 8"},
+    {"keyShortcut9", SDLK_9, "Item Shortcut 9"}
+};
+
+void KeyboardConfig::init()
+{
+    for (int i = 0; i < KEY_TOTAL; i++)
+    {
+        mKey[i].configField = keyData[i].configField;
+        mKey[i].defaultValue = keyData[i].defaultValue;
+        mKey[i].caption = keyData[i].caption;
+        mKey[i].value = KEY_NO_VALUE;
+    }
+    mNewKeyIndex = KEY_NO_VALUE;
+    mEnabled = true;
+
+    retrieve();
+}
+
+void KeyboardConfig::retrieve()
+{
+    for (int i = 0; i < KEY_TOTAL; i++)
+    {
+        mKey[i].value = (int) config.getValue(
+            mKey[i].configField, mKey[i].defaultValue);
+    }
+}
+
+void KeyboardConfig::store()
+{
+    for (int i = 0; i < KEY_TOTAL; i++)
+    {
+        config.setValue(mKey[i].configField, mKey[i].value);
+    }
+}
+
+void KeyboardConfig::makeDefault()
+{
+    for (int i = 0; i < KEY_TOTAL; i++)
+    {
+        mKey[i].value = mKey[i].defaultValue;
+    }
+}
+
+bool KeyboardConfig::hasConflicts()
+{
+    int i, j;
+    for (i = 0; i < KEY_TOTAL; i++)
+    {
+        for (j = 0; j < KEY_TOTAL; j++)
+        {
+            if (i != j && mKey[i].value == mKey[j].value)
+            {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+void KeyboardConfig::callbackNewKey()
+{
+    mSetupKey->newKeyCallback(mNewKeyIndex);
+}
+
+int KeyboardConfig::getKeyIndex(int keyValue) const
+{
+    for (int i = 0; i < KEY_TOTAL; i++)
+    {
+        if(keyValue == mKey[i].value)
+        {
+            return i;
+        }
+    }
+    return KEY_NO_VALUE;
+}
+
+bool KeyboardConfig::isKeyActive(int index)
+{
+    return mActiveKeys[ mKey[index].value];
+}
+
+void KeyboardConfig::refreshActiveKeys()
+{
+    mActiveKeys = SDL_GetKeyState(NULL);
+}
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
new file mode 100644
index 00000000..46394fa5
--- /dev/null
+++ b/src/keyboardconfig.h
@@ -0,0 +1,185 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_KEYBOARDCONFIG_H
+#define _TMW_KEYBOARDCONFIG_H
+
+#include <string>
+
+#include "gui/setup_keyboard.h"
+
+#include <guichan/sdl/sdlinput.hpp>
+
+/**
+ * Each key represents a key function. Such as 'Move up', 'Attack' etc.
+ */
+struct KeyFunction
+{
+    const char* configField;    /** Field index that is in the config file. */
+    int defaultValue;           /** The default key value used. */
+    std::string caption;        /** The caption value for the key function. */
+    int value;                  /** The actual value that is used. */
+};
+
+class KeyboardConfig
+{
+    public:
+        /**
+         * Initializes the keyboard config explicitly.
+         */
+        void init();
+
+        /**
+         * Retrieve the key values from config file.
+         */
+        void retrieve();
+
+        /**
+         * Store the key values to config file.
+         */
+        void store();
+
+        /**
+         * Make the keys their default values.
+         */
+        void makeDefault();
+
+        /**
+         * Determines if any key assignments are the same as each other.
+         */
+        bool hasConflicts();
+
+        /**
+         * Calls a function back so the key re-assignment(s) can be seen.
+         */
+        void callbackNewKey();
+
+        /**
+         * Obtain the value stored in memory.
+         */
+        int getKeyValue(int index) const
+        { return mKey[index].value; }
+
+        /**
+         * Get the index of the new key to be assigned.
+         */
+        int getNewKeyIndex() const
+        { return mNewKeyIndex; }
+
+        /**
+         * Get the enable flag, which will stop the user from doing actions.
+         */
+        bool isEnabled() const
+        { return mEnabled; }
+
+        /**
+         * Get the key caption, providing more meaning to the user.
+         */
+        const std::string &getKeyCaption(int index) const
+        { return mKey[index].caption; }
+
+        /**
+         * Get the key function index by providing the keys value.
+         */
+        int getKeyIndex(int keyValue) const;
+
+        /**
+         * Set the enable flag, which will stop the user from doing actions.
+         */
+        void setEnabled(bool flag)
+        { mEnabled = flag; }
+
+        /**
+         * Set the index of the new key to be assigned.
+         */
+        void setNewKeyIndex(int value)
+        { mNewKeyIndex = value; }
+
+        /**
+         * Set the value of the new key.
+         */
+        void setNewKey(int value)
+        { mKey[mNewKeyIndex].value = value; }
+
+        /**
+         * Set a reference to the key setup window.
+         */
+        void setSetupKeyboard(Setup_Keyboard *setupKey)
+        { mSetupKey = setupKey; }
+
+        /**
+         * Checks if the key is active, by providing the key function index.
+         */
+        bool isKeyActive(int index);
+
+        /**
+         * Takes a snapshot of all the active keys.
+         */
+        void refreshActiveKeys();
+
+        /**
+         * All the key functions.
+         * KEY_NO_VALUE is used in initialization, and should be unchanged.
+         * KEY_TOTAL should always be last (used as a conditional in loops).
+         * The key assignment view gets arranged according to the order of
+         * these values.
+         */
+        enum KeyAction {
+            KEY_NO_VALUE = -1,
+            KEY_MOVE_UP,
+            KEY_MOVE_DOWN,
+            KEY_MOVE_LEFT,
+            KEY_MOVE_RIGHT,
+            KEY_ATTACK,
+            KEY_TARGET,
+            KEY_TARGET_CLOSEST,
+            KEY_PICKUP,
+            KEY_HIDE_WINDOWS,
+            KEY_SIT,
+            KEY_SHORTCUT_0,
+            KEY_SHORTCUT_1,
+            KEY_SHORTCUT_2,
+            KEY_SHORTCUT_3,
+            KEY_SHORTCUT_4,
+            KEY_SHORTCUT_5,
+            KEY_SHORTCUT_6,
+            KEY_SHORTCUT_7,
+            KEY_SHORTCUT_8,
+            KEY_SHORTCUT_9,
+            KEY_TOTAL
+        };
+
+    private:
+        int mNewKeyIndex;              /**< Index of new key to be assigned */
+        bool mEnabled;                 /**< Flag to respond to key input */
+
+        Setup_Keyboard *mSetupKey;     /**< Reference to setup window */
+
+        KeyFunction mKey[KEY_TOTAL];   /**< Pointer to all the key data */
+
+        Uint8 *mActiveKeys;            /**< Stores a list of all the keys */
+};
+
+extern KeyboardConfig keyboard;
+
+#endif
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 95e7a478..f4ad7587 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -29,11 +29,19 @@
 #include "inventory.h"
 #include "item.h"
 #include "main.h"
+#include "particle.h"
 #include "sound.h"
 #include "log.h"
 
 #include "net/gameserver/player.h"
 
+#include "gui/gui.h"
+
+#include "net/messageout.h"
+#include "net/protocol.h"
+
+#include "utils/tostring.h"
+
 LocalPlayer *player_node = NULL;
 
 LocalPlayer::LocalPlayer():
@@ -46,6 +54,7 @@ LocalPlayer::LocalPlayer():
     mLevel(1), mMoney(0),
     mTotalWeight(1), mMaxWeight(1),
     mHP(1), mMaxHP(1),
+    mXp(0),
     mTarget(NULL), mPickUpTarget(NULL),
     mTrading(false),
     mLastAction(-1), mWalkingDir(0),
@@ -112,6 +121,17 @@ LocalPlayer::moveInvItem(Item *item, int newIndex)
         item->getInvIndex(), newIndex, item->getQuantity());
 }
 
+Item* LocalPlayer::searchForItem(int itemId)
+{
+    for (int i = 0; i < INVENTORY_SIZE; i++)
+    {
+        if (itemId == mInventory->getItem(i)->getId()) {
+            return mInventory->getItem(i);
+        }
+    }
+    return NULL;
+}
+
 void LocalPlayer::equipItem(Item *item)
 {
     Net::GameServer::Player::equip(item->getInvIndex());
@@ -302,10 +322,14 @@ void LocalPlayer::attack()
 
     setAction(ATTACK);
 
-    if (getWeapon() == 2)
-        sound.playSfx("sfx/bow_shoot_1.ogg");
-    else
+    if (mEquippedWeapon)
+    {
+        std::string soundFile = mEquippedWeapon->getSound(EQUIP_EVENT_STRIKE);
+        if (soundFile != "") sound.playSfx(soundFile);
+    }
+    else {
         sound.playSfx("sfx/fist-swish.ogg");
+    }
 
     Net::GameServer::Player::attack(getSpriteDirection());
 }
@@ -329,3 +353,16 @@ void LocalPlayer::raiseAttribute(size_t attr)
     mAttributeBase.at(attr)++;
     // TODO: Inform the server about our desire to raise the attribute
 }
+
+void LocalPlayer::setXp(int xp)
+{
+    if (mMap && xp > mXp)
+    {
+        const std::string text = toString(xp - mXp) + " xp";
+
+        // Show XP number
+        particleEngine->addTextRiseFadeOutEffect(text, hitYellowFont,
+                                                 mPx + 16, mPy - 16);
+    }
+    mXp = xp;
+}
diff --git a/src/localplayer.h b/src/localplayer.h
index 4f38fdad..ff7bf0b7 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -151,6 +151,14 @@ class LocalPlayer : public Player
          */
         void moveInvItem(Item *item, int newIndex);
 
+        /**
+         * Searches for the specified item by it's identification.
+         *
+         * @param itemId The id of the item to be searched.
+         * @return Item found on success, NULL on failure.
+         */
+        Item* searchForItem(int itemId);
+
         /**
          * Equips an item.
          */
@@ -237,6 +245,19 @@ class LocalPlayer : public Player
         int getHP() const
         { return mHP; }
 
+        /**
+         * Sets the amount of XP. Shows XP gaining effect if the player is on
+         * a map.
+         */
+        void setXp(int xp);
+
+        /**
+         * Returns the amount of experience points.
+         */
+        int getXp() const { return mXp; }
+
+        Uint32 mCharId;
+
         int getMaxHP() const
         { return mMaxHP; }
 
@@ -298,6 +319,7 @@ class LocalPlayer : public Player
         int mMaxWeight;
         int mHP;
         int mMaxHP;
+        int mXp;            /**< Experience points. */
 
         Being *mTarget;
         FloorItem *mPickUpTarget;
diff --git a/src/main.cpp b/src/main.cpp
index 1f4eafde..30fb7c1c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -48,8 +48,10 @@
 #endif
 
 #include "configuration.h"
+#include "keyboardconfig.h"
 #include "game.h"
 #include "graphics.h"
+#include "itemshortcut.h"
 #include "lockedarray.h"
 #include "localplayer.h"
 #include "log.h"
@@ -84,7 +86,6 @@
 
 #include "net/gameserver/gameserver.h"
 
-#include "resources/equipmentdb.h"
 #include "resources/image.h"
 #include "resources/itemdb.h"
 #include "resources/monsterdb.h"
@@ -108,6 +109,7 @@ Music *bgm;
 
 Configuration config;         /**< XML file configuration reader */
 Logger *logger;               /**< Log object */
+KeyboardConfig keyboard;
 
 Net::Connection *accountServerConnection = 0;
 Net::Connection *gameServerConnection = 0;
@@ -189,7 +191,6 @@ void initConfiguration(const Options &options)
     config.setValue("fpslimit", 0);
     config.setValue("updatehost", "http://updates.themanaworld.org");
     config.setValue("customcursor", 1);
-    config.setValue("homeDir", homeDir);
 
     // Checking if the configuration file exists... otherwise create it with
     // default options.
@@ -319,6 +320,9 @@ void initEngine()
     // Initialize for drawing
     graphics->_beginDraw();
 
+    // Initialize the item shortcuts.
+    itemShortcut = new ItemShortcut();
+
     gui = new Gui(graphics);
     state = STATE_CHOOSE_SERVER; /**< Initial game state */
 
@@ -337,12 +341,19 @@ void initEngine()
         errorMessage = err;
         logger->log("Warning: %s", err);
     }
+
+    // Initialize keyboard
+    keyboard.init();
 }
 
 /** Clear the engine */
 void exit_engine()
 {
+    // Before config.write() since it writes the shortcuts to the config
+    delete itemShortcut;
+
     config.write();
+
     delete gui;
     delete graphics;
 
@@ -353,7 +364,6 @@ void exit_engine()
     sound.close();
 
     // Unload XML databases
-    EquipmentDB::unload();
     ItemDB::unload();
     MonsterDB::unload();
 
@@ -457,7 +467,6 @@ void loadUpdates()
     const std::string updatesFile = "updates/resources2.txt";
     ResourceManager *resman = ResourceManager::getInstance();
     std::vector<std::string> lines = resman->loadTextFile(updatesFile);
-    std::string homeDir = config.getValue("homeDir", "");
 
     for (unsigned int i = 0; i < lines.size(); ++i)
     {
@@ -895,7 +904,6 @@ int main(int argc, char *argv[])
                             false);
 
                         // Load XML databases
-                        EquipmentDB::load();
                         ItemDB::load();
                         MonsterDB::load();
                         state = STATE_LOGIN;
@@ -1039,7 +1047,6 @@ int main(int argc, char *argv[])
                 }
             }
         }
-
     }
     catch (...)
     {
diff --git a/src/monster.cpp b/src/monster.cpp
index 768bf16a..2522a3e1 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -57,7 +57,7 @@ Monster::setAction(Action action)
             break;
         case DEAD:
             currentAction = ACTION_DEAD;
-            sound.playSfx(getInfo().getSound(EVENT_DIE));
+            sound.playSfx(getInfo().getSound(MONSTER_EVENT_DIE));
             break;
         case ATTACK:
             currentAction = ACTION_ATTACK;
@@ -87,10 +87,10 @@ Monster::handleAttack()
 
     const MonsterInfo &mi = getInfo();
 
-    // TODO: It's not possible to determine hit or miss here, so this stuff probably needs
-    // to be moved somewhere else. We may lose synchronization between attack animation and
-    // the sound, unless we adapt the protocol...
-    sound.playSfx(mi.getSound(EVENT_HIT));
+    // TODO: It's not possible to determine hit or miss here, so this stuff
+    // probably needs to be moved somewhere else. We may lose synchronization
+    // between attack animation and the sound, unless we adapt the protocol...
+    sound.playSfx(mi.getSound(MONSTER_EVENT_HIT));
 }
 
 Being::TargetCursorSize
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 87972212..b88d443e 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -114,7 +114,7 @@ void BeingHandler::handleMessage(MessageIn &msg)
 
             dstBeing = beingManager->findBeing(id);
 
-            if (dstBeing == NULL)
+            if (!dstBeing)
             {
                 // Being with id >= 110000000 and job 0 are better
                 // known as ghosts, so don't create those.
@@ -138,30 +138,32 @@ void BeingHandler::handleMessage(MessageIn &msg)
 
             dstBeing->setWalkSpeed(speed);
             dstBeing->mJob = job;
-            dstBeing->setHairStyle(msg.readShort());
-            dstBeing->setWeapon(msg.readShort());
+            dstBeing->setHairStyle(msg->readShort());
+            dstBeing->setVisibleEquipment(
+                    Being::WEAPON_SPRITE, msg->readShort());
             dstBeing->setVisibleEquipment(
-                    Being::BOTTOMCLOTHES_SPRITE, msg.readShort());
+                    Being::BOTTOMCLOTHES_SPRITE, msg->readShort());
 
             if (msg.getId() == SMSG_BEING_MOVE)
             {
                 msg.readLong(); // server tick
             }
 
-            msg.readShort();  // shield
-            dstBeing->setVisibleEquipment(Being::HAIT_SPRITE, msg.readShort());
-            dstBeing->setVisibleEquipment(
-                    Being::TOPCLOTHES_SPRITE, msg.readShort());
-            dstBeing->setHairColor(msg.readShort());
-            msg.readShort();  // unknown
-            msg.readShort();  // head dir
-            msg.readShort();  // guild
-            msg.readShort();  // unknown
-            msg.readShort();  // unknown
-            msg.readShort();  // manner
-            msg.readShort();  // karma
-            msg.readByte();   // unknown
-            dstBeing->setSex(1 - msg.readByte());   // sex
+            msg->readShort();  // shield
+            headTop = msg->readShort();
+            headMid = msg->readShort();
+            dstBeing->setVisibleEquipment(Being::HAT_SPRITE, headTop);
+            dstBeing->setVisibleEquipment(Being::TOPCLOTHES_SPRITE, headMid);
+            dstBeing->setHairColor(msg->readShort());
+            msg->readShort();  // unknown
+            msg->readShort();  // head dir
+            msg->readShort();  // guild
+            msg->readShort();  // unknown
+            msg->readShort();  // unknown
+            msg->readShort();  // manner
+            msg->readShort();  // karma
+            msg->readByte();   // unknown
+            dstBeing->setSex(1 - msg->readByte());   // sex
 
             if (msg.getId() == SMSG_BEING_MOVE)
             {
@@ -256,10 +258,12 @@ void BeingHandler::handleMessage(MessageIn &msg)
             }
             Particle *levelupFX;
             if (msg->readLong() == 0) { // type
-                levelupFX = particleEngine->addEffect("graphics/particles/levelup.particle.xml", 0, 0);
+                levelupFX = particleEngine->addEffect(
+                        "graphics/particles/levelup.particle.xml", 0, 0);
             }
             else {
-                levelupFX = particleEngine->addEffect("graphics/particles/skillup.particle.xml", 0, 0);
+                levelupFX = particleEngine->addEffect(
+                        "graphics/particles/skillup.particle.xml", 0, 0);
             }
             beingManager->findBeing(id)->controlParticle(levelupFX);
             break;
@@ -289,28 +293,26 @@ void BeingHandler::handleMessage(MessageIn &msg)
                     dstBeing->setHairStyle(id);
                     break;
                 case 2:
-                    dstBeing->setWeapon(id);
+                    dstBeing->setVisibleEquipment(Being::WEAPON_SPRITE, id);
                     break;
                 case 3:     // Change lower headgear for eAthena, pants for us
                     dstBeing->setVisibleEquipment(
-                            Being::BOTTOMCLOTHES_SPRITE,
-                            id);
+                            Being::BOTTOMCLOTHES_SPRITE, id);
                     break;
                 case 4:     // Change upper headgear for eAthena, hat for us
                     dstBeing->setVisibleEquipment(
-                            Being::HAT_SPRITE,
-                            id);
+                            Being::HAT_SPRITE, id);
                     break;
                 case 5:     // Change middle headgear for eathena, armor for us
                      dstBeing->setVisibleEquipment(
-                            Being::TOPCLOTHES_SPRITE,
-                            id);
+                            Being::TOPCLOTHES_SPRITE, id);
                     break;
                 case 6:
                     dstBeing->setHairColor(id);
                     break;
                 default:
-                    logger->log("c3: %i\n", id); // unsupported
+                    logger->log("SMSG_BEING_CHANGE_LOOKS: unsupported type: "
+                            "%d, id: %d", type, id);
                     break;
             }
         }
@@ -336,17 +338,18 @@ void BeingHandler::handleMessage(MessageIn &msg)
 
             dstBeing = beingManager->findBeing(id);
 
-            if (dstBeing == NULL)
+            if (!dstBeing)
             {
                 dstBeing = beingManager->createBeing(id, job);
             }
 
             dstBeing->setWalkSpeed(speed);
             dstBeing->mJob = job;
-            dstBeing->setHairStyle(msg.readShort());
-            dstBeing->setWeaponById(msg.readShort());  // item id 1
-            msg.readShort();  // item id 2
-            headBottom = msg.readShort();
+            dstBeing->setHairStyle(msg->readShort());
+            dstBeing->setVisibleEquipment(
+                    Being::WEAPON_SPRITE, msg->readShort());
+            msg->readShort();  // item id 2
+            headBottom = msg->readShort();
 
             if (msg.getId() == SMSG_PLAYER_MOVE)
             {
@@ -407,9 +410,9 @@ void BeingHandler::handleMessage(MessageIn &msg)
 
         case 0x0119:
             // Change in players look
-            logger->log("0x0119 %li %i %i %x %i\n", msg.readLong(),
-                   msg.readShort(), msg.readShort(), msg.readShort(),
-                   msg.readByte());
+            logger->log("0x0119 %i %i %i %x %i", msg->readLong(),
+                    msg->readShort(), msg->readShort(), msg->readShort(),
+                    msg->readByte());
             break;
         */
     }
@@ -428,11 +431,9 @@ static void handleLooks(Being *being, MessageIn &msg)
     if (mask & (1 << 7))
     {
         // The equipment has to be cleared first.
-        being->setWeaponById(0);
         for (int i = 0; i < nb_slots; ++i)
         {
-            if (slots[i] != Being::WEAPON_SPRITE)
-                being->setVisibleEquipment(slots[i], 0);
+            being->setVisibleEquipment(slots[i], 0);
         }
     }
 
@@ -441,10 +442,7 @@ static void handleLooks(Being *being, MessageIn &msg)
     {
         if (!(mask & (1 << i))) continue;
         int id = msg.readShort();
-        if (slots[i] != Being::WEAPON_SPRITE)
-            being->setVisibleEquipment(slots[i], id);
-        else
-            being->setWeaponById(id);
+        being->setVisibleEquipment(slots[i], id);
     }
 }
 
diff --git a/src/net/chathandler.cpp b/src/net/chathandler.cpp
index 3efe3174..afdc2ab5 100644
--- a/src/net/chathandler.cpp
+++ b/src/net/chathandler.cpp
@@ -37,6 +37,7 @@
 #include "../gui/chat.h"
 
 #include "../utils/tostring.h"
+#include "../utils/trim.h"
 
 extern Being *player_node;
 
@@ -167,6 +168,7 @@ void ChatHandler::handleMessage(MessageIn &msg)
             chatMsg = msg.readString(chatMsgLength);
             chatWindow->chatLog(chatMsg, BY_OTHER);
             chatMsg.erase(0, chatMsg.find(" : ", 0) + 3);
+            trim(chatMsg);
             being->setSpeech(chatMsg, SPEECH_TIME);
             break;
 
diff --git a/src/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp
index 354dd685..de74e8f5 100644
--- a/src/net/inventoryhandler.cpp
+++ b/src/net/inventoryhandler.cpp
@@ -31,6 +31,7 @@
 #include "../equipment.h"
 #include "../inventory.h"
 #include "../item.h"
+#include "../itemshortcut.h"
 #include "../localplayer.h"
 
 #include "../gui/chat.h"
@@ -77,6 +78,7 @@ void InventoryHandler::handleMessage(MessageIn &msg)
                     it->setQuantity(amount);
                 }
             };
+            itemShortcut->load();
             break;
     }
 }
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index b94b5128..afaeca69 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -133,7 +133,8 @@ void PlayerHandler::handleMessage(MessageIn &msg)
                 }
                 else
                 {
-                    logger->log("Warning: server wants to update unknown attribute %d to %d", stat, value);
+                    logger->log("Warning: server wants to update unknown "
+                                "attribute %d to %d", stat, value);
                 }
             }
         } break;
diff --git a/src/particle.cpp b/src/particle.cpp
index 805da102..148bbf6f 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -52,14 +52,12 @@ const float Particle::PARTICLE_SKY = 800.0f;
 
 Particle::Particle(Map *map):
     mAlive(true),
-    mPosX(0.0f), mPosY(0.0f), mPosZ(0.0f),
     mLifetimeLeft(-1),
     mLifetimePast(0),
     mFadeOut(0),
     mFadeIn(0),
     mAutoDelete(true),
     mMap(map),
-    mVectorX(0.0f), mVectorY(0.0f), mVectorZ(0.0f),
     mGravity(0.0f),
     mRandomnes(0),
     mBounce(0.0f),
@@ -109,7 +107,7 @@ Particle::update()
                         p++
                     )
                 {
-                    (*p)->moveBy(mPosX, mPosY, mPosZ);
+                    (*p)->moveBy(mPos.x, mPos.y, mPos.z);
                     mChildParticles.push_back (*p);
                 }
             }
@@ -117,31 +115,28 @@ Particle::update()
 
         if (mMomentum != 1.0f)
         {
-            mVectorX *= mMomentum;
-            mVectorY *= mMomentum;
-            mVectorZ *= mMomentum;
+            mVelocity *= mMomentum;
         }
 
         if (mTarget && mAcceleration != 0.0f)
         {
-            float distX = (mPosX - mTarget->getPosX()) * SIN45;
-            float distY = mPosY - mTarget->getPosY();
-            float distZ = mPosZ - mTarget->getPosZ();
+            Vector dist = mPos - mTarget->getPosition();
+            dist.x *= SIN45;
             float invHypotenuse;
 
-            switch(Particle::fastPhysics)
+            switch (Particle::fastPhysics)
             {
                 case 1:
                     invHypotenuse = fastInvSqrt(
-                        distX * distX + distY * distY + distZ * distZ);
+                        dist.x * dist.x + dist.y * dist.y + dist.z * dist.z);
                     break;
                 case 2:
                     invHypotenuse = 2.0f /
-                        fabs(distX) + fabs(distY) + fabs(distZ);
+                        fabs(dist.x) + fabs(dist.y) + fabs(dist.z);
                     break;
                 default:
                     invHypotenuse = 1.0f / sqrt(
-                        distX * distX + distY * distY + distZ * distZ);
+                        dist.x * dist.x + dist.y * dist.y + dist.z * dist.z);
                     break;
             }
 
@@ -152,25 +147,23 @@ Particle::update()
                     mAlive = false;
                 }
                 float accFactor = invHypotenuse * mAcceleration;
-                mVectorX -= distX * accFactor;
-                mVectorY -= distY * accFactor;
-                mVectorZ -= distZ * accFactor;
+                mVelocity -= dist * accFactor;
             }
         }
 
         if (mRandomnes > 0)
         {
-            mVectorX += (rand()%mRandomnes - rand()%mRandomnes) / 1000.0f;
-            mVectorY += (rand()%mRandomnes - rand()%mRandomnes) / 1000.0f;
-            mVectorZ += (rand()%mRandomnes - rand()%mRandomnes) / 1000.0f;
+            mVelocity.x += (rand()%mRandomnes - rand()%mRandomnes) / 1000.0f;
+            mVelocity.y += (rand()%mRandomnes - rand()%mRandomnes) / 1000.0f;
+            mVelocity.z += (rand()%mRandomnes - rand()%mRandomnes) / 1000.0f;
         }
 
-        mVectorZ -= mGravity;
+        mVelocity.z -= mGravity;
 
         // Update position
-        mPosX += mVectorX;
-        mPosY += mVectorY * SIN45;
-        mPosZ += mVectorZ * SIN45;
+        mPos.x += mVelocity.x;
+        mPos.y += mVelocity.y * SIN45;
+        mPos.z += mVelocity.z * SIN45;
 
         // Update other stuff
         if (mLifetimeLeft > 0)
@@ -179,14 +172,13 @@ Particle::update()
         }
         mLifetimePast++;
 
-        if (mPosZ > PARTICLE_SKY || mPosZ < 0.0f)
+        if (mPos.z > PARTICLE_SKY || mPos.z < 0.0f)
         {
             if (mBounce > 0.0f)
             {
-                mPosZ *= -mBounce;
-                mVectorX *= mBounce;
-                mVectorY *= mBounce;
-                mVectorZ *= -mBounce;
+                mPos.z *= -mBounce;
+                mVelocity *= mBounce;
+                mVelocity.z = -mVelocity.z;
             }
             else {
                 mAlive = false;
@@ -195,10 +187,8 @@ Particle::update()
     }
 
     // Update child particles
-    for (   ParticleIterator p = mChildParticles.begin();
-            p != mChildParticles.end();
-
-        )
+    for (ParticleIterator p = mChildParticles.begin();
+         p != mChildParticles.end();)
     {
         if ((*p)->update())
         {
@@ -217,14 +207,9 @@ Particle::update()
     return true;
 }
 
-
-void Particle::draw(Graphics *graphics, int offsetX, int offsetY) const
-{
-}
-
-
 Particle*
-Particle::addEffect(std::string particleEffectFile, int pixelX, int pixelY)
+Particle::addEffect(const std::string &particleEffectFile,
+                    int pixelX, int pixelY)
 {
     Particle *newParticle = NULL;
 
@@ -289,9 +274,9 @@ Particle::addEffect(std::string particleEffectFile, int pixelX, int pixelY)
         int offsetY = XML::getProperty(effectChildNode, "position-y", 0);
         int offsetZ = XML::getProperty(effectChildNode, "position-z", 0);
 
-        int particleX = (int)mPosX + pixelX + offsetX;
-        int particleY = (int)mPosY + pixelY + offsetY;
-        int particleZ = (int)mPosZ          + offsetZ;
+        int particleX = (int) mPos.x + pixelX + offsetX;
+        int particleY = (int) mPos.y + pixelY + offsetY;
+        int particleZ = (int) mPos.z          + offsetZ;
 
         int lifetime = XML::getProperty(effectChildNode, "lifetime", -1);
 
@@ -317,17 +302,16 @@ Particle::addEffect(std::string particleEffectFile, int pixelX, int pixelY)
 
 
 Particle*
-Particle::addTextSplashEffect(std::string text,
+Particle::addTextSplashEffect(const std::string &text,
                               int colorR, int colorG, int colorB,
                               gcn::Font *font, int x, int y)
 {
     Particle *newParticle = new TextParticle(mMap, text, colorR, colorG, colorB,
                                              font);
     newParticle->setPosition(x, y, 0);
-    newParticle->setVector  (   ((rand()%100) - 50) / 200.0f,  // X vector
-                                ((rand()%100) - 50) / 200.0f,  // Y vector
-                                ((rand()%100) / 200.0f) + 4.0f // Z vector
-                            );
+    newParticle->setVelocity(((rand() % 100) - 50) / 200.0f,    // X
+                             ((rand() % 100) - 50) / 200.0f,    // Y
+                             ((rand() % 100) / 200.0f) + 4.0f); // Z
     newParticle->setGravity(0.1f);
     newParticle->setBounce(0.5f);
     newParticle->setLifetime(200);
@@ -338,14 +322,28 @@ Particle::addTextSplashEffect(std::string text,
     return newParticle;
 }
 
+Particle*
+Particle::addTextRiseFadeOutEffect(const std::string &text, gcn::Font *font,
+                                   int x, int y)
+{
+    Particle *newParticle = new TextParticle(mMap, text, 255, 255, 255, font);
+    newParticle->setPosition(x, y, 0);
+    newParticle->setVelocity(0.0f, 0.0f, 0.5f);
+    newParticle->setGravity(0.0015f);
+    newParticle->setLifetime(300);
+    newParticle->setFadeOut(50);
+    newParticle->setFadeIn(200);
+
+    mChildParticles.push_back(newParticle);
+
+    return newParticle;
+}
 
 void
 Particle::setMap(Map *map)
 {
     mMap = map;
     if (mMap) setSpriteIterator(mMap->addSprite(this));
-
-    // TODO: Create map emitters based on emitter data in map data
 }
 
 
diff --git a/src/particle.h b/src/particle.h
index 9e9223c7..dd7c5ee2 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -31,7 +31,7 @@
 
 #include "guichanfwd.h"
 #include "sprite.h"
-
+#include "vector.h"
 
 class Map;
 class Particle;
@@ -67,43 +67,37 @@ class Particle : public Sprite
         ~Particle();
 
         /**
-         * Deletes all child particles and emitters
+         * Deletes all child particles and emitters.
          */
         void
         clear();
 
         /**
          * Gives a particle the properties of an engine root particle and loads
-         * the particle-related config settings
+         * the particle-related config settings.
          */
         void
         setupEngine();
 
         /**
          * Updates particle position, returns false when the particle should
-         * be deleted
+         * be deleted.
          */
         virtual bool
         update();
 
         /**
-         * Draws the particle image
+         * Draws the particle image.
          */
         virtual void
-        draw(Graphics *graphics, int offsetX, int offsetY) const;
+        draw(Graphics *graphics, int offsetX, int offsetY) const {}
 
         /**
-         * Necessary for sorting with the other sprites
+         * Necessary for sorting with the other sprites.
          */
         virtual int
         getPixelY() const
-        {
-            return (int)(mPosY + mPosZ) - 64;
-        };
-
-        /*
-            Basic Particle properties:
-         */
+        { return (int) (mPos.y + mPos.z) - 64; }
 
         /**
          * Sets the map the particle is on.
@@ -115,15 +109,24 @@ class Particle : public Sprite
          * particleEffectFile.
          */
         Particle*
-        addEffect(std::string particleEffectFile, int pixelX, int pixelY);
+        addEffect(const std::string &particleEffectFile,
+                  int pixelX, int pixelY);
 
         /**
          * Creates a standalone text particle.
          */
         Particle*
-        addTextSplashEffect(std::string text, int colorR, int colorG, int colorB,
+        addTextSplashEffect(const std::string &text,
+                            int colorR, int colorG, int colorB,
                             gcn::Font *font, int x, int y);
 
+        /**
+         * Creates a standalone text particle.
+         */
+        Particle*
+        addTextRiseFadeOutEffect(const std::string &text, gcn::Font *font,
+                                 int x, int y);
+
         /**
          * Adds an emitter to the particle.
          */
@@ -132,34 +135,31 @@ class Particle : public Sprite
         { mChildEmitters.push_back(emitter); }
 
         /**
-         * Sets the position in 3 dimensional space in pixels relative to map
+         * Sets the position in 3 dimensional space in pixels relative to map.
          */
         void
         setPosition(float x, float y, float z)
-        { mPosX = x; mPosY = y; mPosZ = z; }
+        { mPos.x = x; mPos.y = y; mPos.z = z; }
 
         /**
-         * Sets the position in 2 dimensional space in pixels relative to map
+         * Sets the position in 2 dimensional space in pixels relative to map.
          */
         void
         setPosition(float x, float y)
-        { mPosX = x; mPosY = y; }
-
-        float getPosX() const
-        { return mPosX; }
+        { mPos.x = x; mPos.y = y; }
 
-        float getPosY() const
-        { return mPosY; }
-
-        float getPosZ() const
-        { return mPosZ; }
+        /**
+         * Returns the particle position.
+         */
+        const Vector& getPosition() const
+        { return mPos; }
 
         /**
          * Changes the particle position relative
          */
         void
         moveBy(float x, float y, float z)
-        { mPosX += x; mPosY += y; mPosZ += z; }
+        { mPos.x += x; mPos.y += y; mPos.z += z; }
 
         /**
          * Sets the time in game ticks until the particle is destroyed.
@@ -170,48 +170,48 @@ class Particle : public Sprite
 
         /**
          * Sets the age of the pixel in game ticks where the particle has
-         * faded in completely
+         * faded in completely.
          */
         void
-        setFadeOut (int fadeOut)
+        setFadeOut(int fadeOut)
         { mFadeOut = fadeOut; }
 
         /**
          * Sets the remaining particle lifetime where the particle starts to
-         * fade out
+         * fade out.
          */
         void
-        setFadeIn (int fadeIn)
+        setFadeIn(int fadeIn)
         { mFadeIn = fadeIn; }
 
         /**
          * Sets the sprite iterator of the particle on the current map to make
-         * it easier to remove the particle from the map when it is destroyed
+         * it easier to remove the particle from the map when it is destroyed.
          */
         void
         setSpriteIterator(std::list<Sprite*>::iterator spriteIterator)
         { mSpriteIterator = spriteIterator; }
 
         /**
-         * Gets the sprite iterator of the particle on the current map
+         * Gets the sprite iterator of the particle on the current map.
          */
         std::list<Sprite*>::iterator
         getSpriteIterator() const
         { return mSpriteIterator; }
 
         /**
-         * Sets the current velocity in 3 dimensional space
+         * Sets the current velocity in 3 dimensional space.
          */
         void
-        setVector(float x, float y, float z)
-        { mVectorX = x; mVectorY = y; mVectorZ = z; }
+        setVelocity(float x, float y, float z)
+        { mVelocity.x = x; mVelocity.y = y; mVelocity.z = z; }
 
         /**
-         * Sets the downward acceleration
+         * Sets the downward acceleration.
          */
         void
-        setGravity(float g)
-        { mGravity = g; }
+        setGravity(float gravity)
+        { mGravity = gravity; }
 
         /**
          * Sets the ammount of random vector changes
@@ -237,8 +237,8 @@ class Particle : public Sprite
 
         /**
          * Sets the distance in pixel the particle can come near the target
-         * particle before it is destroyed. Does only make sense after a
-         * target particle has been set using setDestination.
+         * particle before it is destroyed. Does only make sense after a target
+         * particle has been set using setDestination.
          */
         void setDieDistance(float dist)
         { mInvDieDistance = 1.0f / dist; }
@@ -247,7 +247,7 @@ class Particle : public Sprite
         { return mAlive; }
 
         /**
-         * Manually marks the particle for deletion
+         * Manually marks the particle for deletion.
          */
         void kill()
         { mAlive = false; mAutoDelete = true; }
@@ -261,7 +261,7 @@ class Particle : public Sprite
 
     protected:
         bool mAlive;                /**< Is the particle supposed to be drawn and updated?*/
-        float mPosX, mPosY, mPosZ;  /**< Position in 3 dimensonal space - pixel based relative to map */
+        Vector mPos;                /**< Position in pixels relative to map. */
         int mLifetimeLeft;          /**< Lifetime left in game ticks*/
         int mLifetimePast;          /**< Age of the particle in game ticks*/
         int mFadeOut;               /**< Lifetime in game ticks left where fading out begins*/
@@ -269,17 +269,19 @@ class Particle : public Sprite
 
     private:
         // generic properties
-        bool mAutoDelete;           /**< May the particle request its deletion by the parent particle?*/
-        Map *mMap;                  /**< Map the particle is on*/
+        bool mAutoDelete;           /**< May the particle request its deletion by the parent particle? */
+        Map *mMap;                  /**< Map the particle is on. */
         std::list<Sprite*>::iterator mSpriteIterator;   /**< iterator of the particle on the current map */
-        Emitters mChildEmitters;    /**< List of child emitters*/
-        Particles mChildParticles;  /**< List of particles controlled by this particle*/
-        //dynamic particle
-        float mVectorX, mVectorY, mVectorZ; /**< Speed in 3 dimensional space in pixels per game-tick */
-        float mGravity;             /**< Downward acceleration in pixels per game-tick²*/
-        int mRandomnes;             /**< Ammount of random vector change*/
-        float mBounce;              /**< How much the particle bounces off when hitting the ground*/
-        //follow-point particles
+        Emitters mChildEmitters;    /**< List of child emitters. */
+        Particles mChildParticles;  /**< List of particles controlled by this particle */
+
+        // dynamic particle
+        Vector mVelocity;           /**< Speed in pixels per game-tick. */
+        float mGravity;             /**< Downward acceleration in pixels per game-tick. */
+        int mRandomnes;             /**< Ammount of random vector change */
+        float mBounce;              /**< How much the particle bounces off when hitting the ground */
+
+        // follow-point particles
         Particle *mTarget;          /**< The particle that attracts this particle*/
         float mAcceleration;        /**< Acceleration towards the target particle in pixels per game-tick²*/
         float mInvDieDistance;      /**< Distance in pixels from the target particle that causes the destruction of the particle*/
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index 60a98cc5..035882b6 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -248,10 +248,9 @@ ParticleEmitter::readMinMax(xmlNodePtr propertyNode, T def)
 {
     MinMax<T> retval;
 
-    def = (T)XML::getFloatProperty(propertyNode, "value", (double)def);
-    retval.set  (   (T)XML::getFloatProperty(propertyNode, "min", (double)def),
-                    (T)XML::getFloatProperty(propertyNode, "max", (double)def)
-                );
+    def = (T) XML::getFloatProperty(propertyNode, "value", (double) def);
+    retval.set((T) XML::getFloatProperty(propertyNode, "min", (double) def),
+               (T) XML::getFloatProperty(propertyNode, "max", (double) def));
 
     return retval;
 }
@@ -284,19 +283,17 @@ ParticleEmitter::createParticles()
 
 
         newParticle->setPosition(
-            mParticlePosX.value(),
-            mParticlePosY.value(),
-            mParticlePosZ.value()
-        );
+                mParticlePosX.value(),
+                mParticlePosY.value(),
+                mParticlePosZ.value());
 
         float angleH = mParticleAngleHorizontal.value();
         float angleV = mParticleAngleVertical.value();
         float power = mParticlePower.value();
-        newParticle->setVector(
-            cos(angleH) * cos(angleV) * power,
-            sin(angleH) * cos(angleV) * power,
-            sin(angleV) * power
-        );
+        newParticle->setVelocity(
+                cos(angleH) * cos(angleV) * power,
+                sin(angleH) * cos(angleV) * power,
+                sin(angleV) * power);
 
         newParticle->setRandomnes(mParticleRandomnes.value());
         newParticle->setGravity(mParticleGravity.value());
@@ -312,10 +309,9 @@ ParticleEmitter::createParticles()
         newParticle->setFadeOut(mParticleFadeOut.value());
         newParticle->setFadeIn(mParticleFadeIn.value());
 
-        for (   std::list<ParticleEmitter>::iterator i = mParticleChildEmitters.begin();
-                i != mParticleChildEmitters.end();
-                i++
-            )
+        for (std::list<ParticleEmitter>::iterator i = mParticleChildEmitters.begin();
+             i != mParticleChildEmitters.end();
+             i++)
         {
             newParticle->addEmitter(new ParticleEmitter(*i));
         }
diff --git a/src/player.cpp b/src/player.cpp
index d3c27aa0..b63dcd5b 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -28,7 +28,8 @@
 #include "graphics.h"
 #include "log.h"
 
-#include "resources/equipmentdb.h"
+#include "resources/itemdb.h"
+#include "resources/iteminfo.h"
 
 #include "utils/tostring.h"
 
@@ -37,7 +38,6 @@
 Player::Player(Uint16 id, Uint16 job, Map *map):
     Being(id, job, map)
 {
-    setWeapon(0);
 }
 
 Being::Type
@@ -93,8 +93,8 @@ Player::setSex(Uint8 sex)
             if (i != HAIR_SPRITE && mEquipmentSpriteIDs.at(i) != 0)
             {
                 AnimatedSprite *newEqSprite = new AnimatedSprite(
-                        "graphics/sprites/" + EquipmentDB::get(
-                            mEquipmentSpriteIDs.at(i))->getSprite(sex));
+                        "graphics/sprites/" + ItemDB::get(
+                            mEquipmentSpriteIDs.at(i)).getSprite(sex));
                 delete mSprites[i];
                 mSprites[i] = newEqSprite;
             }
@@ -102,39 +102,6 @@ Player::setSex(Uint8 sex)
     }
 }
 
-void
-Player::setWeapon(Uint16 weapon)
-{
-    if (weapon != mWeapon)
-    {
-        AnimatedSprite *newWeaponSprite = NULL;
-
-        switch (weapon)
-        {
-            case 0:
-                newWeaponSprite =
-                    new AnimatedSprite("graphics/sprites/weapon-fist.xml");
-                break;
-            case 1:
-                newWeaponSprite =
-                    new AnimatedSprite("graphics/sprites/weapon-dagger.xml");
-                break;
-            case 2:
-                newWeaponSprite =
-                    new AnimatedSprite("graphics/sprites/weapon-bow.xml");
-                break;
-            case 3:
-                newWeaponSprite =
-                    new AnimatedSprite("graphics/sprites/weapon-scythe.xml");
-                break;
-        }
-
-        delete mSprites[WEAPON_SPRITE];
-        mSprites[WEAPON_SPRITE] = newWeaponSprite;
-    }
-    Being::setWeapon(weapon);
-}
-
 void
 Player::setHairColor(Uint16 color)
 {
@@ -189,11 +156,11 @@ Player::setVisibleEquipment(Uint8 slot, int id)
         if (mSex == 0)
         {
             equipmentSprite = new AnimatedSprite(
-                "graphics/sprites/" + EquipmentDB::get(id)->getSprite(0));
+                "graphics/sprites/" + ItemDB::get(id).getSprite(0));
         }
         else {
             equipmentSprite = new AnimatedSprite(
-                "graphics/sprites/" + EquipmentDB::get(id)->getSprite(1));
+                "graphics/sprites/" + ItemDB::get(id).getSprite(1));
         }
 
         equipmentSprite->setDirection(getSpriteDirection());
@@ -201,6 +168,11 @@ Player::setVisibleEquipment(Uint8 slot, int id)
         delete mSprites[slot];
         mSprites[slot] = equipmentSprite;
 
+        if (slot == WEAPON_SPRITE)
+        {
+            mEquippedWeapon = &ItemDB::get(id);
+        }
+
         setAction(mAction);
     }
 
diff --git a/src/player.h b/src/player.h
index 8aa84992..2c06bfba 100644
--- a/src/player.h
+++ b/src/player.h
@@ -59,9 +59,6 @@ class Player : public Being
 
         virtual void
         setVisibleEquipment(Uint8 slot, int id);
-
-        virtual void
-        setWeapon(Uint16 weapon);
 };
 
 #endif
diff --git a/src/resources/equipmentdb.cpp b/src/resources/equipmentdb.cpp
deleted file mode 100644
index 38ac6415..00000000
--- a/src/resources/equipmentdb.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2006 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#include "equipmentdb.h"
-
-#include "resourcemanager.h"
-
-#include "../log.h"
-
-#include "../utils/dtor.h"
-#include "../utils/xml.h"
-
-namespace
-{
-    EquipmentDB::EquipmentInfos mEquipmentInfos;
-    EquipmentInfo mUnknown;
-    bool mLoaded = false;
-}
-
-void
-EquipmentDB::load()
-{
-    if (mLoaded)
-        return;
-
-    logger->log("Initializing equipment database...");
-    mUnknown.setSprite("error.xml", 0);
-    mUnknown.setSprite("error.xml", 1);
-
-    ResourceManager *resman = ResourceManager::getInstance();
-    int size;
-    char *data = (char*)resman->loadFile("equipment.xml", size);
-
-    if (!data)
-    {
-        logger->error("Equipment Database: Could not find equipment.xml!");
-    }
-
-    xmlDocPtr doc = xmlParseMemory(data, size);
-    free(data);
-
-    if (!doc)
-    {
-        logger->error("Equipment Database: Error while parsing equipment database (equipment.xml)!");
-    }
-
-    xmlNodePtr rootNode = xmlDocGetRootElement(doc);
-    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "equipments"))
-    {
-        logger->error("Equipment Database: equipment.xml is not a valid database file!");
-    }
-
-    //iterate <equipment>s
-    for_each_xml_child_node(equipmentNode, rootNode)
-    {
-        if (!xmlStrEqual(equipmentNode->name, BAD_CAST "equipment"))
-        {
-            continue;
-        }
-
-        EquipmentInfo *currentInfo = new EquipmentInfo();
-
-        currentInfo->setSlot (XML::getProperty(equipmentNode, "slot", 0));
-
-        //iterate <sprite>s
-        for_each_xml_child_node(spriteNode, equipmentNode)
-        {
-            if (!xmlStrEqual(spriteNode->name, BAD_CAST "sprite"))
-            {
-                continue;
-            }
-
-            std::string gender = XML::getProperty(spriteNode, "gender", "unisex");
-            std::string filename = (const char*) spriteNode->xmlChildrenNode->content;
-
-            if (gender == "male" || gender == "unisex")
-            {
-                currentInfo->setSprite(filename, 0);
-            }
-
-            if (gender == "female" || gender == "unisex")
-            {
-                currentInfo->setSprite(filename, 1);
-            }
-        }
-
-        setEquipment(   XML::getProperty(equipmentNode, "id", 0),
-                        currentInfo);
-    }
-
-    mLoaded = true;
-}
-
-void
-EquipmentDB::unload()
-{
-    // kill EquipmentInfos
-    for_each (  mEquipmentInfos.begin(), mEquipmentInfos.end(),
-                make_dtor(mEquipmentInfos));
-    mEquipmentInfos.clear();
-
-    mLoaded = false;
-}
-
-EquipmentInfo*
-EquipmentDB::get(int id)
-{
-    if (!mLoaded) {
-        logger->error("Error: Equipment database used before initialization!");
-    }
-
-    EquipmentInfoIterator i = mEquipmentInfos.find(id);
-
-    if (i == mEquipmentInfos.end() )
-    {
-        logger->log("EquipmentDB: Error, unknown equipment ID# %d", id);
-        return &mUnknown;
-    }
-    else
-    {
-        return i->second;
-    }
-}
-
-void
-EquipmentDB::setEquipment(int id, EquipmentInfo* equipmentInfo)
-{
-    if (mEquipmentInfos.find(id) != mEquipmentInfos.end()) {
-        logger->log("Warning: Equipment Piece with ID %d defined multiple times",
-                    id);
-        delete equipmentInfo;
-    }
-    else {
-        mEquipmentInfos[id] = equipmentInfo;
-    };
-}
diff --git a/src/resources/equipmentdb.h b/src/resources/equipmentdb.h
deleted file mode 100644
index 1c1db7d1..00000000
--- a/src/resources/equipmentdb.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2006 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#ifndef _TMW_EQUIPMENT_DB_H
-#define _TMW_EQUIPMENT_DB_H
-
-#include <map>
-
-#include "equipmentinfo.h"
-
-/**
- * Equipment information database.
- */
-namespace EquipmentDB
-{
-    /**
-     * Loads the equipment info from Items.xml
-     */
-    void load();
-
-    /**
-     * Frees equipment data
-     */
-    void unload();
-
-    void setEquipment(int id, EquipmentInfo* equipmentInfo);
-
-    EquipmentInfo* get(int id);
-
-    // Equipment database types
-    typedef std::map<int, EquipmentInfo*> EquipmentInfos;
-    typedef EquipmentInfos::iterator EquipmentInfoIterator;
-}
-
-#endif
diff --git a/src/resources/equipmentinfo.h b/src/resources/equipmentinfo.h
deleted file mode 100644
index 75ed1b8a..00000000
--- a/src/resources/equipmentinfo.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2006 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id:
- */
-
-#ifndef _TMW_EQUIPMENTINFO_H_
-#define _TMW_EQUIPMENTINFO_H_
-
-#include <string>
-#include <map>
-
-class EquipmentInfo
-{
-    public:
-        EquipmentInfo():
-            mSlot (0)
-        {
-        };
-
-        void
-        setSlot (int slot) { mSlot = slot; };
-
-        const std::string&
-        getSprite(int gender) {return animationFiles[gender]; };
-
-        void
-        setSprite(std::string animationFile, int gender) {animationFiles[gender] = animationFile; };
-
-    private:
-        int mSlot;   //not used at the moment but maybe useful on our own server
-        std::map<int, std::string> animationFiles;
-};
-
-#endif
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 7b16339c..18952ae9 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -18,9 +18,11 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id:
+ *  $Id$
  */
 
+#include <cassert>
+
 #include "itemdb.h"
 
 #include <libxml/tree.h>
@@ -36,10 +38,13 @@
 namespace
 {
     ItemDB::ItemInfos mItemInfos;
-    ItemInfo mUnknown;
+    ItemInfo *mUnknown;
     bool mLoaded = false;
 }
 
+// Forward declarations
+static void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node);
+static void loadSoundRef(ItemInfo *itemInfo, xmlNodePtr node);
 
 void ItemDB::load()
 {
@@ -47,11 +52,16 @@ void ItemDB::load()
         return;
 
     logger->log("Initializing item database...");
-    mUnknown.setName("Unknown item");
+
+    mUnknown = new ItemInfo();
+    mUnknown->setName("Unknown item");
+    mUnknown->setImage("");
+    mUnknown->setSprite("error.xml", 0);
+    mUnknown->setSprite("error.xml", 1);
 
     ResourceManager *resman = ResourceManager::getInstance();
     int size;
-    char *data = (char*)resman->loadFile("items.xml", size);
+    char *data = (char*) resman->loadFile("items.xml", size);
 
     if (!data) {
         logger->error("ItemDB: Could not find items.xml!");
@@ -73,48 +83,66 @@ void ItemDB::load()
 
     for_each_xml_child_node(node, rootNode)
     {
-        if (!xmlStrEqual(node->name, BAD_CAST "item")) {
+        if (!xmlStrEqual(node->name, BAD_CAST "item"))
             continue;
-        }
 
         int id = XML::getProperty(node, "id", 0);
-        int art = XML::getProperty(node, "art", 0);
+
+        if (id == 0)
+        {
+            logger->log("ItemDB: Invalid or missing item ID in items.xml!");
+            continue;
+        }
+        else if (mItemInfos.find(id) != mItemInfos.end())
+        {
+            logger->log("ItemDB: Redefinition of item ID %d", id);
+        }
+
         int type = XML::getProperty(node, "type", 0);
         int weight = XML::getProperty(node, "weight", 0);
+        int view = XML::getProperty(node, "view", 0);
         int slot = XML::getProperty(node, "slot", 0);
 
         std::string name = XML::getProperty(node, "name", "");
         std::string image = XML::getProperty(node, "image", "");
         std::string description = XML::getProperty(node, "description", "");
         std::string effect = XML::getProperty(node, "effect", "");
+        std::string attackType = XML::getProperty(node, "attacktype", "");
 
-        if (id && name != "")
+        if (id)
         {
             ItemInfo *itemInfo = new ItemInfo();
             itemInfo->setImage(image);
-            itemInfo->setArt(art);
-            itemInfo->setName(name);
+            itemInfo->setName((name == "") ? "Unnamed" : name);
             itemInfo->setDescription(description);
             itemInfo->setEffect(effect);
             itemInfo->setType(type);
+            itemInfo->setView(view);
             itemInfo->setWeight(weight);
             itemInfo->setSlot(slot);
-            mItemInfos[id] = itemInfo;
-        }
+            itemInfo->setAttackType(attackType);
+
+            for_each_xml_child_node(itemChild, node)
+            {
+                if (xmlStrEqual(itemChild->name, BAD_CAST "sprite"))
+                {
+                    loadSpriteRef(itemInfo, itemChild);
+                }
+                else if (xmlStrEqual(itemChild->name, BAD_CAST "sound"))
+                {
+                    loadSoundRef(itemInfo, itemChild);
+                }
+            }
 
-        if (id == 0)
-        {
-            logger->log("ItemDB: An item has no ID in items.xml!");
+            mItemInfos[id] = itemInfo;
         }
 
 #define CHECK_PARAM(param, error_value) \
         if (param == error_value) \
-            logger->log("ItemDB: Missing" #param " parameter for item %i! %s", \
-                    id, name.c_str())
+            logger->log("ItemDB: Missing " #param " attribute for item %i!",id)
 
         CHECK_PARAM(name, "");
         CHECK_PARAM(image, "");
-        // CHECK_PARAM(art, 0);
         // CHECK_PARAM(description, "");
         // CHECK_PARAM(effect, "");
         // CHECK_PARAM(type, 0);
@@ -131,19 +159,65 @@ void ItemDB::load()
 
 void ItemDB::unload()
 {
-    for (ItemInfoIterator i = mItemInfos.begin(); i != mItemInfos.end(); i++)
-    {
-        delete i->second;
-    }
-    mItemInfos.clear();
+    logger->log("Unloading item database...");
+
+    delete mUnknown;
+    mUnknown = NULL;
 
+    for_each(mItemInfos.begin(), mItemInfos.end(), make_dtor(mItemInfos));
+    mItemInfos.clear();
     mLoaded = false;
 }
 
-const ItemInfo&
-ItemDB::get(int id)
+const ItemInfo& ItemDB::get(int id)
 {
+    assert(mLoaded);
+
     ItemInfoIterator i = mItemInfos.find(id);
 
-    return (i != mItemInfos.end()) ? *(i->second) : mUnknown;
+    if (i == mItemInfos.end())
+    {
+        logger->log("ItemDB: Error, unknown item ID# %d", id);
+        return *mUnknown;
+    }
+    else
+    {
+        return *(i->second);
+    }
+}
+
+void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node)
+{
+    std::string gender = XML::getProperty(node, "gender", "unisex");
+    std::string filename = (const char*) node->xmlChildrenNode->content;
+
+    if (gender == "male" || gender == "unisex")
+    {
+        itemInfo->setSprite(filename, 0);
+    }
+
+    if (gender == "female" || gender == "unisex")
+    {
+        itemInfo->setSprite(filename, 1);
+    }
+}
+
+void loadSoundRef(ItemInfo *itemInfo, xmlNodePtr node)
+{
+    std::string event = XML::getProperty(node, "event", "");
+    std::string filename = (const char*) node->xmlChildrenNode->content;
+
+    if (event == "hit")
+    {
+        itemInfo->addSound(EQUIP_EVENT_HIT, filename);
+    }
+    else if (event == "strike")
+    {
+        itemInfo->addSound(EQUIP_EVENT_STRIKE, filename);
+    }
+    else
+    {
+        logger->log("ItemDB: Ignoring unknown sound event '%s'",
+                event.c_str());
+    }
 }
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 3a41c657..b5b25ac0 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -25,11 +25,11 @@
 
 #include "resourcemanager.h"
 #include "image.h"
-
+#include "itemdb.h"
 
 ItemInfo::~ItemInfo()
 {
-    if (mImage != NULL)
+    if (mImage)
     {
         mImage->decRef();
     }
@@ -38,19 +38,87 @@ ItemInfo::~ItemInfo()
 void
 ItemInfo::setImage(const std::string &image)
 {
+    if (mImage)
+    {
+        mImage->decRef();
+    }
+
+    ResourceManager *resman = ResourceManager::getInstance();
     mImageName = "graphics/items/" + image;
+    mImage = ResourceManager::getInstance()->getImage(mImageName);
 
-    if (mImageName != "")
+    if (!mImage)
     {
-        if (mImage != NULL)
-        {
-            mImage->decRef();
-        }
+        mImage = resman->getImage("graphics/gui/unknown-item.png");
+    }
+}
 
-        mImage = ResourceManager::getInstance()->getImage(mImageName);
+const std::string&
+ItemInfo::getSprite(int gender) const
+{
+    if (mView)
+    {
+        // Forward the request to the item defining how to view this item
+        return ItemDB::get(mView).getSprite(gender);
     }
     else
     {
-        mImage = NULL;
+        static const std::string empty = "";
+        std::map<int, std::string>::const_iterator i =
+            mAnimationFiles.find(gender);
+
+        return (i != mAnimationFiles.end()) ? i->second : empty;
+    }
+}
+
+void
+ItemInfo::setAttackType(const std::string &attackType)
+{
+    if (attackType == "swing")
+    {
+        mAttackType = ACTION_ATTACK_SWING;
+    }
+    else if (attackType == "stab")
+    {
+        mAttackType = ACTION_ATTACK_STAB;
+    }
+    else if (attackType == "bow")
+    {
+        mAttackType = ACTION_ATTACK_BOW;
     }
+    else if (attackType == "throw")
+    {
+        mAttackType = ACTION_ATTACK_THROW;
+    }
+    else if (attackType == "none")
+    {
+        mAttackType = ACTION_DEFAULT;
+    }
+    else
+    {
+        mAttackType = ACTION_ATTACK;
+    }
+}
+
+void
+ItemInfo::addSound(EquipmentSoundEvent event, const std::string &filename)
+{
+    if (mSounds.find(event) == mSounds.end())
+    {
+        mSounds[event] = new std::vector<std::string>;
+    }
+
+    mSounds[event]->push_back("sfx/" + filename);
+}
+
+
+const std::string&
+ItemInfo::getSound(EquipmentSoundEvent event) const
+{
+    static const std::string empty = "";
+    std::map<EquipmentSoundEvent, std::vector<std::string>*>::const_iterator i;
+    i = mSounds.find(event);
+
+    return (i == mSounds.end()) ? empty :
+        i->second->at(rand() % i->second->size());
 }
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index e4f851bb..4fd1638e 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -24,12 +24,23 @@
 #ifndef _TMW_ITEMINFO_H_
 #define _TMW_ITEMINFO_H_
 
+#include <map>
 #include <string>
+#include <vector>
+
+#include "spritedef.h"
 
 class Image;
 
+enum EquipmentSoundEvent
+{
+    EQUIP_EVENT_STRIKE,
+    EQUIP_EVENT_HIT
+};
+
 /**
- * Defines a class for storing item infos.
+ * Defines a class for storing item infos. This includes information used when
+ * the item is equipped.
  */
 class ItemInfo
 {
@@ -40,10 +51,11 @@ class ItemInfo
         ItemInfo():
             mImageName(""),
             mImage(NULL),
-            mArt(0),
             mType(0),
             mWeight(0),
-            mSlot(0)
+            mView(0),
+            mSlot(0),
+            mAttackType(ACTION_DEFAULT)
         {
         }
 
@@ -52,73 +64,89 @@ class ItemInfo
          */
         ~ItemInfo();
 
-        void
-        setArt(short art) { mArt = art; }
+        void setName(const std::string &name)
+        { mName = name; }
 
-        short
-        getArt() const { return mArt; }
+        const std::string& getName() const
+        { return mName; }
 
-        void
-        setName(const std::string &name) { mName = name; }
+        void setImage(const std::string &image);
 
-        const std::string&
-        getName() const { return mName; }
+        Image* getImage() const
+        { return mImage; }
 
-        void
-        setImage(const std::string &image);
+        void setDescription(const std::string &description)
+        { mDescription = description; }
 
-        Image*
-        getImage() const { return mImage; }
+        const std::string& getDescription() const
+        { return mDescription; }
 
-        void
-        setDescription(const std::string &description)
-        {
-            mDescription = description;
-        }
+        void setEffect(const std::string &effect)
+        { mEffect = effect; }
 
         const std::string&
-        getDescription() const { return mDescription; }
+        getEffect() const { return mEffect; }
 
-        void
-        setEffect(const std::string &effect) { mEffect = effect; }
+        void setType(short type)
+        { mType = type; }
 
-        const std::string&
-        getEffect() const { return mEffect; }
+        short getType() const
+        { return mType; }
+
+        void setWeight(short weight)
+        { mWeight = weight; }
+
+        short getWeight() const
+        { return mWeight; }
+
+        void setView(int view)
+        { mView = view; }
+
+        void setSlot(char slot)
+        { mSlot = slot; }
 
-        void
-        setType(short type) { mType = type; }
+        char getSlot() const
+        { return mSlot; }
 
-        short
-        getType() const { return mType; }
+        void setSprite(const std::string &animationFile, int gender)
+        { mAnimationFiles[gender] = animationFile; }
 
-        void
-        setWeight(short weight) { mWeight = weight; }
+        const std::string& getSprite(int gender) const;
 
-        short
-        getWeight() const { return mWeight; }
+        void setAttackType(const std::string &attackType);
 
-        void
-        setSlot(char slot) { mSlot = slot; }
+        const SpriteAction getAttackType() const
+        { return mAttackType; }
 
-        char
-        getSlot() const { return mSlot; }
+        void addSound(EquipmentSoundEvent event, const std::string &filename);
+
+        const std::string& getSound(EquipmentSoundEvent event) const;
 
     protected:
-        std::string mImageName;
+        std::string mImageName;        /**< The filename of the icon image. */
 
         /* TODO (BL): I do not think the item info should keep a reference to
          * the item icon. It would probably be better if this was kept in the
          * Item class, so that the images can be lazily instantiated and also
          * unloaded when no longer used.
          */
-        Image *mImage;
-        short mArt;
+        Image *mImage;                 /**< The loaded icon image. */
         std::string mName;
-        std::string mDescription;
-        std::string mEffect;
-        short mType;
-        short mWeight;
-        char mSlot;
+        std::string mDescription;      /**< Short description. */
+        std::string mEffect;           /**< Description of effects. */
+        short mType;                   /**< Item type (never used). */
+        short mWeight;                 /**< Weight in grams. */
+        int mView;                     /**< Item ID of how this item looks. */
+
+        // Equipment related members
+        char mSlot;                    /**< Equipment slot. */
+        SpriteAction mAttackType;      /**< Attack type, in case of weapon. */
+
+        /** Maps gender to sprite filenames. */
+        std::map<int, std::string> mAnimationFiles;
+
+        /** Stores the names of sounds to be played at certain event. */
+        std::map<EquipmentSoundEvent, std::vector<std::string>* > mSounds;
 };
 
 #endif
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 260d5aa9..940ded36 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -156,7 +156,7 @@ MapReader::readMap(const std::string &filename)
 
     if (buffer == NULL)
     {
-        logger->log("Map file not found (%s)\n", filename.c_str());
+        logger->log("Map file not found (%s)", filename.c_str());
         return NULL;
     }
 
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 339ed6ba..f4864eea 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -120,19 +120,19 @@ MonsterDB::load()
 
                 if (event == "hit")
                 {
-                    currentInfo->addSound(EVENT_HIT, filename);
+                    currentInfo->addSound(MONSTER_EVENT_HIT, filename);
                 }
                 else if (event == "miss")
                 {
-                    currentInfo->addSound(EVENT_MISS, filename);
+                    currentInfo->addSound(MONSTER_EVENT_MISS, filename);
                 }
                 else if (event == "hurt")
                 {
-                    currentInfo->addSound(EVENT_HURT, filename);
+                    currentInfo->addSound(MONSTER_EVENT_HURT, filename);
                 }
                 else if (event == "die")
                 {
-                    currentInfo->addSound(EVENT_DIE, filename);
+                    currentInfo->addSound(MONSTER_EVENT_DIE, filename);
                 }
                 else
                 {
diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp
index 2a59419e..2e896237 100644
--- a/src/resources/monsterinfo.cpp
+++ b/src/resources/monsterinfo.cpp
@@ -33,15 +33,15 @@ MonsterInfo::MonsterInfo():
 
 MonsterInfo::~MonsterInfo()
 {
-    //kill vectors in mSoundEffects
-    for_each (  mSounds.begin(), mSounds.end(),
-                make_dtor(mSounds));
+    // kill vectors in mSoundEffects
+    for_each (mSounds.begin(), mSounds.end(),
+              make_dtor(mSounds));
     mSounds.clear();
 }
 
 
 void
-MonsterInfo::addSound (SoundEvent event, std::string filename)
+MonsterInfo::addSound(MonsterSoundEvent event, std::string filename)
 {
     if (mSounds.find(event) == mSounds.end())
     {
@@ -53,9 +53,9 @@ MonsterInfo::addSound (SoundEvent event, std::string filename)
 
 
 std::string
-MonsterInfo::getSound (SoundEvent event) const
+MonsterInfo::getSound(MonsterSoundEvent event) const
 {
-    std::map<SoundEvent, std::vector<std::string>* >::const_iterator i;
+    std::map<MonsterSoundEvent, std::vector<std::string>* >::const_iterator i;
 
     i = mSounds.find(event);
 
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index aa7db9f0..c9fbd4c9 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -31,12 +31,12 @@
 #include "../being.h"
 
 
-enum SoundEvent
+enum MonsterSoundEvent
 {
-    EVENT_HIT,
-    EVENT_MISS,
-    EVENT_HURT,
-    EVENT_DIE
+    MONSTER_EVENT_HIT,
+    MONSTER_EVENT_MISS,
+    MONSTER_EVENT_HURT,
+    MONSTER_EVENT_DIE
 };
 
 /**
@@ -69,7 +69,7 @@ class MonsterInfo
         { mTargetCursorSize = targetCursorSize; }
 
         void
-        addSound(SoundEvent event, std::string filename);
+        addSound(MonsterSoundEvent event, std::string filename);
 
         const std::string&
         getName () const { return mName; };
@@ -81,13 +81,13 @@ class MonsterInfo
         getTargetCursorSize() const { return mTargetCursorSize; }
 
         std::string
-        getSound (SoundEvent event) const;
+        getSound(MonsterSoundEvent event) const;
 
     private:
         std::string mName;
         std::string mSprite;
         Being::TargetCursorSize mTargetCursorSize;
-        std::map<SoundEvent, std::vector<std::string>* > mSounds;
+        std::map<MonsterSoundEvent, std::vector<std::string>* > mSounds;
 };
 
 #endif
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 6d335b02..55d7f459 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -24,11 +24,11 @@
 #ifndef _TMW_SPRITEDEF_H
 #define _TMW_SPRITEDEF_H
 
-#include "resource.h"
-
 #include <map>
 #include <string>
 
+#include "resource.h"
+
 #include <libxml/tree.h>
 
 class Action;
diff --git a/src/textparticle.cpp b/src/textparticle.cpp
index dd01d2fe..4bc859cd 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.cpp
@@ -26,7 +26,8 @@
 #include "graphics.h"
 
 TextParticle::TextParticle(Map *map, const std::string &text,
-        int colorR, int colorG, int colorB, gcn::Font *font):
+                           int colorR, int colorG, int colorB,
+                           gcn::Font *font):
     Particle(map),
     mText(text),
     mTextFont(font),
@@ -41,8 +42,8 @@ void TextParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
     if (!mAlive)
         return;
 
-    int screenX = (int)mPosX + offsetX;
-    int screenY = (int)mPosY - int(mPosZ) + offsetY;
+    int screenX = (int) mPos.x + offsetX;
+    int screenY = (int) mPos.y - (int) mPos.z + offsetY;
 
     int alpha = 255;
 
@@ -50,7 +51,7 @@ void TextParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
     {
         alpha *= mLifetimeLeft;
         alpha /= mFadeOut;
-    };
+    }
 
     if (mLifetimePast < mFadeIn)
     {
@@ -59,6 +60,6 @@ void TextParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
     }
 
     graphics->setFont(mTextFont);
-    graphics->setColor(gcn::Color (mColorR, mColorG, mColorB, alpha));
+    graphics->setColor(gcn::Color(mColorR, mColorG, mColorB, alpha));
     graphics->drawText(mText, screenX, screenY, gcn::Graphics::CENTER);
 }
diff --git a/src/textparticle.h b/src/textparticle.h
index b365c885..34badb57 100644
--- a/src/textparticle.h
+++ b/src/textparticle.h
@@ -33,21 +33,26 @@
 class TextParticle : public Particle
 {
     public:
+        /**
+         * Constructor.
+         */
         TextParticle(Map *map, const std::string &text,
-                int colorR, int colorG, int colorB, gcn::Font *font);
+                     int colorR, int colorG, int colorB,
+                     gcn::Font *font);
         /**
-         * Draws the particle image
+         * Draws the particle image.
          */
         virtual void
         draw(Graphics *graphics, int offsetX, int offsetY) const;
 
         // hack to improve text visibility
-        virtual int getPixelY() const { return (int)(mPosY + mPosZ); }
+        virtual int getPixelY() const
+        { return (int) (mPos.y + mPos.z); }
 
     private:
-        std::string mText;              /**< Text of the particle */
-        gcn::Font *mTextFont;           /**< Font used for drawing the text */
-        int mColorR, mColorG, mColorB;  /**< Color used for drawing the text */
+        std::string mText;             /**< Text of the particle. */
+        gcn::Font *mTextFont;          /**< Font used for drawing the text. */
+        int mColorR, mColorG, mColorB; /**< Color used for drawing the text. */
 };
 
 #endif
diff --git a/src/utils/fastsqrt.h b/src/utils/fastsqrt.h
index 78768149..b7b036e9 100644
--- a/src/utils/fastsqrt.h
+++ b/src/utils/fastsqrt.h
@@ -5,6 +5,8 @@
  * http://www.math.purdue.edu/~clomont/Math/Papers/2003/InvSqrt.pdf
  *
  * Unfortunately the original creator of this function seems to be unknown.
+ *
+ * $Id$
  */
 
 float fastInvSqrt(float x)
diff --git a/src/utils/minmax.h b/src/utils/minmax.h
index 27eb2565..ea6ad9e0 100644
--- a/src/utils/minmax.h
+++ b/src/utils/minmax.h
@@ -18,6 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
+ *  $Id$
  */
 
 /**
diff --git a/src/utils/trim.h b/src/utils/trim.h
new file mode 100644
index 00000000..1b5311e6
--- /dev/null
+++ b/src/utils/trim.h
@@ -0,0 +1,53 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_UTILS_TRIM_H_
+#define _TMW_UTILS_TRIM_H_
+
+#include <string>
+
+/**
+ * Trims spaces off the end and the beginning of the given string.
+ *
+ * @param str the string to trim spaces off
+ */
+static void trim(std::string &str)
+{
+    std::string::size_type pos = str.find_last_not_of(' ');
+    if (pos != std::string::npos)
+    {
+        str.erase(pos + 1);
+        pos = str.find_first_not_of(' ');
+        if (pos != std::string::npos)
+        {
+            str.erase(0, pos);
+        }
+    }
+    else
+    {
+        // There is nothing else but whitespace in the string
+        str.clear();
+    }
+}
+
+#endif
diff --git a/src/vector.h b/src/vector.h
new file mode 100644
index 00000000..7a5da241
--- /dev/null
+++ b/src/vector.h
@@ -0,0 +1,134 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_VECTOR_H_
+#define _TMW_VECTOR_H_
+
+/**
+ * Vector class. Represents either a 3D point in space, a velocity or a force.
+ * Provides several convenient operator overloads.
+ */
+class Vector
+{
+    public:
+        /**
+         * Constructor.
+         */
+        Vector():
+            x(0.0f),
+            y(0.0f),
+            z(0.0f)
+        {}
+
+        /**
+         * Constructor.
+         */
+        Vector(float x, float y, float z):
+            x(x),
+            y(y),
+            z(z)
+        {}
+
+        /**
+         * Copy constructor.
+         */
+        Vector(const Vector &v):
+            x(v.x),
+            y(v.y),
+            z(v.z)
+        {}
+
+        /**
+         * Scale vector operator.
+         */
+        Vector operator*(float c) const
+        {
+            return Vector(x * c,
+                          y * c,
+                          z * c);
+        }
+
+        /**
+         * In-place scale vector operator.
+         */
+        void operator*=(float c)
+        {
+            x *= c;
+            y *= c;
+            z *= c;
+        }
+
+        /**
+         * Scale vector operator.
+         */
+        Vector operator/(float c) const
+        {
+            return Vector(x / c,
+                          y / c,
+                          z / c);
+        }
+
+        /**
+         * Add vector operator.
+         */
+        Vector operator+(const Vector &v) const
+        {
+            return Vector(x + v.x,
+                          y + v.y,
+                          z + v.z);
+        }
+
+        /**
+         * In-place add vector operator.
+         */
+        void operator+=(const Vector &v)
+        {
+            x += v.x;
+            y += v.y;
+            z += v.z;
+        }
+
+        /**
+         * Substract vector operator.
+         */
+        Vector operator-(const Vector &v) const
+        {
+            return Vector(x - v.x,
+                          y - v.y,
+                          z - v.z);
+        }
+
+        /**
+         * In-place substract vector operator.
+         */
+        void operator-=(const Vector &v)
+        {
+            x -= v.x;
+            y -= v.y;
+            z -= v.z;
+        }
+
+        float x, y, z;
+};
+
+#endif
diff --git a/tools/adler32.c b/tools/adler32.c
new file mode 100644
index 00000000..4e851713
--- /dev/null
+++ b/tools/adler32.c
@@ -0,0 +1,67 @@
+/*
+ * adler32.c (c) 2006 Bjorn Lindeijer
+ * License: GPL, v2 or later
+ *
+ * Calculates Adler-32 checksums for all files passed as argument.
+ *
+ *  Usage: adler32 [file]...
+ */
+
+#include <stdio.h>
+#include <zlib.h>
+
+/**
+ * Calculates the Adler-32 checksum for the given file.
+ */
+unsigned long fadler32(FILE *file)
+{
+    // Obtain file size
+    fseek(file, 0, SEEK_END);
+    long fileSize = ftell(file);
+    rewind(file);
+
+    // Calculate Adler-32 checksum
+    char *buffer = (char*) malloc(fileSize);
+    fread(buffer, 1, fileSize, file);
+    unsigned long adler = adler32(0L, Z_NULL, 0);
+    adler = adler32(adler, (Bytef*) buffer, fileSize);
+    free(buffer);
+
+    return adler;
+}
+
+/**
+ * Prints out usage and exists.
+ */
+void print_usage()
+{
+    printf("Usage: adler32 [file]...\n");
+    exit(0);
+}
+
+int main(int argc, char *argv[])
+{
+    int i;                            /**< Loops through arguments. */
+
+    if (argc == 1)
+    {
+        print_usage();
+    }
+
+    for (i = 1; i < argc; ++i)
+    {
+        FILE *file = fopen(argv[i], "r");
+
+        if (!file)
+        {
+            printf("Error while opening '%s' for reading!\n", argv[i]);
+            exit(1);
+        }
+
+        unsigned long adler = fadler32(file);
+        printf("%s %lx\n", argv[i], adler);
+        fclose(file);
+    }
+
+    return 0;
+}
-- 
cgit v1.2.3-70-g09d2


From 1e949983c13cab920a4cc445b2ed6429dd9aad5a Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 15 Oct 2007 21:08:39 +0000
Subject: Added Dutch translation (incomplete) and put drawing of debug path
 into a private method.

---
 ChangeLog            |   6 +
 po/LINGUAS           |   1 +
 po/nl.po             | 458 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/gui/viewport.cpp |  58 ++++---
 src/gui/viewport.h   |  17 +-
 5 files changed, 506 insertions(+), 34 deletions(-)
 create mode 100644 po/nl.po

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index d1d9530e..2c35fb50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-15  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/viewport.h, src/gui/viewport.cpp: Put drawing of debug path
+	into a private method.
+	* po/LINGUAS, po/nl.po: Added Dutch translation (incomplete).
+
 2007-10-01  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
 	* src/item.cpp, src/gui/itemcontainer.cpp, src/resources/itemdb.cpp:
diff --git a/po/LINGUAS b/po/LINGUAS
index 594e8ba7..4876a643 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -2,4 +2,5 @@
 de
 fr
 it
+nl
 pl
diff --git a/po/nl.po b/po/nl.po
new file mode 100644
index 00000000..b856ff56
--- /dev/null
+++ b/po/nl.po
@@ -0,0 +1,458 @@
+# Dutch translation of The Mana World.
+# Copyright (C) 2007 The Mana World Development Team
+# This file is distributed under the same license as the The Mana World package.
+# Bjørn Lindeijer <bjorn@lindeijer.nl>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: The Mana World 0.1.0\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2007-08-13 12:30+0200\n"
+"PO-Revision-Date: 2007-10-15 17:05+0000\n"
+"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
+"Language-Team: Dutch\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2007-10-15 17:28+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/char_select.cpp:68
+msgid "Confirm"
+msgstr "Bevestigen"
+
+#: src/gui/char_select.cpp:69
+msgid "Are you sure you want to delete this character?"
+msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
+
+#: src/gui/char_select.cpp:85
+msgid "Select Character"
+msgstr "Kies Personage"
+
+#: src/gui/char_select.cpp:89 src/gui/item_amount.cpp:46 src/gui/login.cpp:49
+#: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
+#: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
+#: src/gui/serverdialog.cpp:138
+msgid "Ok"
+msgstr "Oké"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:279
+#: src/gui/connection.cpp:59 src/gui/item_amount.cpp:47 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:139 src/gui/setup.cpp:51
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: src/gui/char_select.cpp:91
+msgid "New"
+msgstr "Nieuw"
+
+#: src/gui/char_select.cpp:92
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: src/gui/char_select.cpp:93
+msgid "Previous"
+msgstr "Vorige"
+
+#: src/gui/char_select.cpp:94
+msgid "Next"
+msgstr "Volgende"
+
+#: src/gui/char_select.cpp:95
+msgid "Unregister"
+msgstr "Registreren"
+
+#: src/gui/char_select.cpp:97 src/gui/char_select.cpp:203
+#: src/gui/char_select.cpp:214 src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:131
+#, c-format
+msgid "Name: %s"
+msgstr "Naam: %s"
+
+#: src/gui/char_select.cpp:98 src/gui/char_select.cpp:204
+#: src/gui/char_select.cpp:215
+#, c-format
+msgid "Level: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:99 src/gui/char_select.cpp:205
+#: src/gui/char_select.cpp:216
+#, c-format
+msgid "Money: %d"
+msgstr "Geld: %d"
+
+#: src/gui/char_select.cpp:264
+msgid "Create Character"
+msgstr "Personage Aanmaken"
+
+#: src/gui/char_select.cpp:271 src/gui/login.cpp:44 src/gui/register.cpp:67
+msgid "Name:"
+msgstr "Naam:"
+
+#: src/gui/char_select.cpp:274
+msgid "Hair Color:"
+msgstr "Haarkleur:"
+
+#: src/gui/char_select.cpp:277
+msgid "Hair Style:"
+msgstr "Haarstijl:"
+
+#: src/gui/char_select.cpp:278
+msgid "Create"
+msgstr "Aanmaken"
+
+#: src/gui/char_select.cpp:281
+msgid "Strength:"
+msgstr ""
+
+#: src/gui/char_select.cpp:282
+msgid "Agility:"
+msgstr ""
+
+#: src/gui/char_select.cpp:283
+msgid "Dexterity:"
+msgstr ""
+
+#: src/gui/char_select.cpp:284
+msgid "Vitality:"
+msgstr ""
+
+#: src/gui/char_select.cpp:285
+msgid "Intelligence:"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Willpower:"
+msgstr ""
+
+#: src/gui/char_select.cpp:287
+msgid "Charisma:"
+msgstr ""
+
+#: src/gui/char_select.cpp:295 src/gui/char_select.cpp:441
+#, c-format
+msgid "Please distribute %d points"
+msgstr ""
+
+#: src/gui/char_select.cpp:387 src/gui/register.cpp:220
+#: src/gui/serverdialog.cpp:205
+msgid "Error"
+msgstr "Fout"
+
+#: src/gui/char_select.cpp:388
+msgid "Your name needs to be at least 4 characters."
+msgstr "Je naam moet uit tenminste 4 tekens bestaan"
+
+#: src/gui/char_select.cpp:433
+msgid "Character stats OK"
+msgstr ""
+
+#: src/gui/char_select.cpp:445
+#, c-format
+msgid "Please remove %d points"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:37
+msgid "Yes"
+msgstr "Ja"
+
+#: src/gui/confirm_dialog.cpp:38
+msgid "No"
+msgstr "Nee"
+
+#: src/gui/connection.cpp:62
+msgid "Connecting..."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:65
+msgid "Unequip"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:48 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:195
+msgid "Use"
+msgstr "Gebruiken"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "Neerleggen"
+
+#: src/gui/inventorywindow.cpp:67 src/gui/inventorywindow.cpp:135
+#, c-format
+msgid "Description: %s"
+msgstr "Beschrijving: %s"
+
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:133
+#, c-format
+msgid "Effect: %s"
+msgstr "Effect: %s"
+
+#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:97
+#, c-format
+msgid "Total Weight: %d - Maximum Weight: %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:192
+msgid "Equip"
+msgstr ""
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to trade."
+msgstr ""
+
+#: src/gui/item_amount.cpp:83
+msgid "Select amount of items to drop."
+msgstr ""
+
+#: src/gui/login.cpp:42
+msgid "Login"
+msgstr ""
+
+#: src/gui/login.cpp:45 src/gui/register.cpp:68
+msgid "Password:"
+msgstr "Wachtword:"
+
+#: src/gui/login.cpp:48
+msgid "Keep"
+msgstr "Behouden"
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:63 src/gui/register.cpp:75
+msgid "Register"
+msgstr "Aanmelden"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:65 src/gui/setup.cpp:44
+msgid "Setup"
+msgstr ""
+
+#: src/gui/minimap.cpp:35
+msgid "MiniMap"
+msgstr ""
+
+#: src/gui/npclistdialog.cpp:37 src/gui/npc_text.cpp:37
+msgid "NPC"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:79
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:90
+msgid "@@talk|Talk To NPC@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
+#: src/gui/popupmenu.cpp:227
+msgid "@@cancel|Cancel@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:112
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:219
+msgid "@@use|Equip@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:222
+msgid "@@use|Use@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:224
+msgid "@@drop|Drop@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:225
+msgid "@@description|Description@@"
+msgstr ""
+
+#: src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41
+msgid "Quit"
+msgstr "Afsluiten"
+
+#: src/gui/quitdialog.cpp:42
+msgid "Switch server"
+msgstr ""
+
+#: src/gui/quitdialog.cpp:43
+msgid "Switch character"
+msgstr ""
+
+#: src/gui/register.cpp:69
+msgid "Confirm:"
+msgstr "Bevestigen:"
+
+#: src/gui/register.cpp:70
+msgid "Email:"
+msgstr "E-mail:"
+
+#: src/gui/register.cpp:168
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:199
+msgid "Passwords do not match."
+msgstr "Wachtwoorden komen niet overeen."
+
+#: src/gui/serverdialog.cpp:102
+msgid "Choose your Mana World Server"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:104
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/serverdialog.cpp:105
+msgid "Port:"
+msgstr "Poort:"
+
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Geluid"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "Muziek volume"
+
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Toepassen"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr ""
+
+#: src/gui/setup.cpp:68
+msgid "Video"
+msgstr ""
+
+#: src/gui/setup.cpp:72
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup.cpp:76
+msgid "Joystick"
+msgstr "Joystick"
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+msgid "Press the button to start calibration"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+msgid "Calibrate"
+msgstr "Kalibreren"
+
+#: src/gui/setup_joystick.cpp:40
+msgid "Enable joystick"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:75
+msgid "Stop"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:76
+msgid "Rotate the stick"
+msgstr ""
+
+#: src/gui/setup_video.cpp:113
+msgid "Full screen"
+msgstr "Volledig scherm"
+
+#: src/gui/setup_video.cpp:114
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/gui/setup_video.cpp:115
+msgid "Custom cursor"
+msgstr ""
+
+#: src/gui/setup_video.cpp:117
+msgid "FPS Limit:"
+msgstr ""
+
+#: src/gui/setup_video.cpp:133
+msgid "Gui opacity"
+msgstr ""
+
+#: src/gui/setup_video.cpp:186
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_video.cpp:194
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_video.cpp:202
+msgid "Ambient FX"
+msgstr ""
+
+#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+msgid "off"
+msgstr "uit"
+
+#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+msgid "low"
+msgstr "laag"
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+msgid "high"
+msgstr "hoog"
+
+#: src/gui/setup_video.cpp:268
+msgid "Switching to full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:269
+msgid "Restart needed for changes to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:280
+msgid "Changing OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:281
+msgid "Applying change to OpenGL requires restart."
+msgstr ""
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 4c6b04a2..915b618d 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -87,8 +87,8 @@ void
 Viewport::loadTargetCursor(std::string filename, int width, int height,
                            bool outRange, Being::TargetCursorSize size)
 {
-    assert(size > -1);
-    assert(size < 3);
+    assert(size >= Being::TC_SMALL);
+    assert(size < Being::NUM_TC);
 
     ImageSet* currentImageSet;
     SimpleAnimation* currentCursor;
@@ -226,32 +226,9 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
         drawTargetName(graphics);
     }
 
-    // Find a path from the player to the mouse, and draw it. This is for debug
-    // purposes.
     if (mShowDebugPath && mMap)
     {
-        // Get the current mouse position
-        int mouseX, mouseY;
-        SDL_GetMouseState(&mouseX, &mouseY);
-
-        int mouseTileX = (mouseX + mCameraX) / 32;
-        int mouseTileY = (mouseY + mCameraY) / 32;
-
-        Path debugPath = mMap->findPath(
-                player_node->mX / 32, player_node->mY / 32,
-                mouseTileX, mouseTileY);
-
-        graphics->setColor(gcn::Color(255, 0, 0));
-        for (PathIterator i = debugPath.begin(); i != debugPath.end(); i++)
-        {
-            int squareX = i->x * 32 - mCameraX + 12;
-            int squareY = i->y * 32 - mCameraY + 12;
-
-            graphics->fillRectangle(gcn::Rectangle(squareX, squareY, 8, 8));
-            graphics->drawText(
-                    toString(mMap->getMetaTile(i->x, i->y)->Gcost),
-                    squareX + 4, squareY + 12, gcn::Graphics::CENTER);
-        }
+        drawDebugPath(graphics);
     }
 
     // Draw player nickname, speech, and emotion sprite as needed
@@ -286,7 +263,7 @@ Viewport::logic()
         mWalkTime = player_node->mWalkTime;
     }
 
-    for (int i = 0; i < 3; i++)
+    for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
     {
         mTargetCursorInRange[i]->update(10);
         mTargetCursorOutRange[i]->update(10);
@@ -346,6 +323,33 @@ Viewport::drawTargetName(Graphics *graphics)
     }
 }
 
+void
+Viewport::drawDebugPath(Graphics *graphics)
+{
+    // Get the current mouse position
+    int mouseX, mouseY;
+    SDL_GetMouseState(&mouseX, &mouseY);
+
+    int mouseTileX = (mouseX + mCameraX) / 32;
+    int mouseTileY = (mouseY + mCameraY) / 32;
+
+    Path debugPath = mMap->findPath(
+            player_node->mX / 32, player_node->mY / 32,
+            mouseTileX, mouseTileY);
+
+    graphics->setColor(gcn::Color(255, 0, 0));
+    for (PathIterator i = debugPath.begin(); i != debugPath.end(); i++)
+    {
+        int squareX = i->x * 32 - mCameraX + 12;
+        int squareY = i->y * 32 - mCameraY + 12;
+
+        graphics->fillRectangle(gcn::Rectangle(squareX, squareY, 8, 8));
+        graphics->drawText(
+                toString(mMap->getMetaTile(i->x, i->y)->Gcost),
+                squareX + 4, squareY + 12, gcn::Graphics::CENTER);
+    }
+}
+
 void
 Viewport::mousePressed(gcn::MouseEvent &event)
 {
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index eeb31bae..1547c0a4 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -132,21 +132,24 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         /**
          * Helper function for loading target cursors
          */
-        void
-        loadTargetCursor(std::string filename, int width, int height,
-                         bool outRange, Being::TargetCursorSize size);
+        void loadTargetCursor(std::string filename, int width, int height,
+                              bool outRange, Being::TargetCursorSize size);
 
         /**
          * Draws range based target cursor
          */
-        void
-        drawTargetCursor(Graphics *graphics);
+        void drawTargetCursor(Graphics *graphics);
 
         /**
          * Draws target name
          */
-        void
-        drawTargetName(Graphics *graphics);
+        void drawTargetName(Graphics *graphics);
+
+        /**
+         * Finds a path from the player to the mouse, and draws it. This is for
+         * debug purposes.
+         */
+        void drawDebugPath(Graphics *graphics);
 
 
         Map *mMap;                 /**< The current map. */
-- 
cgit v1.2.3-70-g09d2


From 54ac35bc5a1484757efeae9b342469b9a00fe2a2 Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@gmail.com>
Date: Thu, 18 Oct 2007 19:00:38 +0000
Subject: Removed player looks from generic beings. Prevented client
 termination on missing sprites. Merged weapon-type and attack-type fields for
 items.

---
 ChangeLog                         | 15 +++++++++
 src/animatedsprite.cpp            | 18 ++++-------
 src/animatedsprite.h              |  4 +--
 src/being.cpp                     | 26 ++--------------
 src/being.h                       | 50 +-----------------------------
 src/gui/minimap.cpp               | 12 +++++---
 src/gui/viewport.cpp              |  2 +-
 src/localplayer.cpp               |  8 ++---
 src/localplayer.h                 |  3 +-
 src/monster.cpp                   |  2 +-
 src/net/beinghandler.cpp          | 15 ++++-----
 src/net/charserverhandler.cpp     |  2 +-
 src/npc.cpp                       |  2 +-
 src/player.cpp                    | 64 +++++++++++++++++----------------------
 src/player.h                      | 43 ++++++++++++++++++++------
 src/resources/itemdb.cpp          |  4 +--
 src/resources/iteminfo.cpp        | 45 +++++++++++++--------------
 src/resources/iteminfo.h          |  2 +-
 src/resources/resourcemanager.cpp |  7 +++++
 src/resources/spritedef.cpp       |  4 +--
 20 files changed, 143 insertions(+), 185 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index e7c46186..e01f8574 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,21 @@
 	* src/monster.cpp: Removed compatibility hack.
 	* data/monsters.xml: Merged client and server monster data.
 	* data/items.xml: Merged server item data. Removed obsolete fields.
+	* src/localplayer.cpp, src/localplayer.h: Moved equipment and inventory
+	storage to local player. Removed specific type.
+	* src/gui/viewport.cpp, src/gui/minimap.cpp: Changed identification of
+	local player to a check of player_node.
+	* src/animatedsprite.cpp, src/animatedsprite.h, src/npc.cpp,
+	src/player.cpp, src/monster.cpp:
+	* src/being.cpp, src/being.h, src/player.h, src/net/beinghandler.cpp,
+	src/net/charserverhandler.cpp: Removed hair style, hair color, gender,
+	and equipment from generic being.
+	* src/resources/spritedef.cpp: Added filename to fatal error messages.
+	* src/resources/resourcemanager.cpp: Prevented client from exiting on
+	missing sprite.
+	* src/resources/iteminfo.cpp, src/resources/iteminfo.h,
+	src/resources/itemdb.cpp, data/items.xml: Merged weapon_type and
+	attacktype field.
 
 2007-10-15  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index c1e89ff0..466779fd 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -54,20 +54,14 @@ AnimatedSprite::AnimatedSprite(SpriteDef *sprite):
     play(ACTION_STAND);
 }
 
-AnimatedSprite::AnimatedSprite(const std::string& filename, int variant):
-    mDirection(DIRECTION_DOWN),
-    mLastTime(0),
-    mFrameIndex(0),
-    mFrameTime(0),
-    mAnimation(0),
-    mFrame(0)
+AnimatedSprite *AnimatedSprite::load(const std::string& filename, int variant)
 {
     ResourceManager *resman = ResourceManager::getInstance();
-    mSprite = resman->getSprite(filename, variant);
-    assert(mSprite);
-
-    // Play the stand animation by default
-    play(ACTION_STAND);
+    SpriteDef *s = resman->getSprite(filename, variant);
+    if (!s) return NULL;
+    AnimatedSprite *as = new AnimatedSprite(s);
+    s->decRef();
+    return as;
 }
 
 AnimatedSprite::~AnimatedSprite()
diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index d77d08f5..a1fbe7a0 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -46,13 +46,13 @@ class AnimatedSprite
         AnimatedSprite(SpriteDef *sprite);
 
         /**
-         * A convenience constructor, which will request the sprite to animate
+         * An helper function, which will request the sprite to animate
          * from the resource manager.
          *
          * @param filename the file of the sprite to animate
          * @param variant  the sprite variant
          */
-        AnimatedSprite(const std::string& filename, int variant = 0);
+        static AnimatedSprite *load(std::string const &filename, int variant = 0);
 
         /**
          * Destructor.
diff --git a/src/being.cpp b/src/being.cpp
index 81bed667..d5f37371 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -46,26 +46,22 @@
 int Being::instances = 0;
 ImageSet *Being::emotionSet = NULL;
 
-Being::Being(Uint16 id, Uint16 job, Map *map):
+Being::Being(int id, int job, Map *map):
     mJob(job),
     mX(0), mY(0),
     mAction(STAND),
     mWalkTime(0),
     mEmotion(0), mEmotionTime(0),
     mAttackSpeed(350),
-    mEquipment(new Equipment()),
     mId(id),
-    mSex(2),
     mWalkSpeed(150),
     mSpeedModifier(1024),
     mSpriteDirection(DIRECTION_DOWN), mDirection(DOWN),
     mMap(NULL),
     mEquippedWeapon(NULL),
-    mHairStyle(0), mHairColor(0),
     mSpeechTime(0),
     mPx(0), mPy(0),
-    mSprites(VECTOREND_SPRITE, NULL),
-    mEquipmentSpriteIDs(VECTOREND_SPRITE, 0)
+    mSprites(VECTOREND_SPRITE, NULL)
 {
     setMap(map);
 
@@ -272,24 +268,6 @@ Being::setPath(const Path &path, int mod)
     }
 }
 
-void
-Being::setHairColor(Uint16 color)
-{
-    mHairColor = (color < NR_HAIR_COLORS) ? color : 0;
-}
-
-void
-Being::setHairStyle(Uint16 style)
-{
-    mHairStyle = (style < NR_HAIR_STYLES) ? style : 0;
-}
-
-void
-Being::setVisibleEquipment(Uint8 slot, int id)
-{
-    mEquipmentSpriteIDs[slot] = id;
-}
-
 void
 Being::setSpeech(const std::string &text, Uint32 time)
 {
diff --git a/src/being.h b/src/being.h
index fadf9656..fd17caf5 100644
--- a/src/being.h
+++ b/src/being.h
@@ -68,7 +68,6 @@ class Being : public Sprite
     public:
         enum Type {
             UNKNOWN,
-            LOCALPLAYER,
             PLAYER,
             NPC,
             MONSTER
@@ -125,7 +124,7 @@ class Being : public Sprite
         /**
          * Constructor.
          */
-        Being(Uint16 id, Uint16 job, Map *map);
+        Being(int id, int job, Map *map);
 
         /**
          * Destructor.
@@ -189,48 +188,6 @@ class Being : public Sprite
         void
         setName(const std::string &name) { mName = name; }
 
-        /**
-         * Sets the hair color for this being.
-         */
-        virtual void
-        setHairColor(Uint16 color);
-
-        /**
-         * Gets the hair color for this being.
-         */
-        Uint16
-        getHairColor() const { return mHairColor; }
-
-        /**
-         * Sets the hair style for this being.
-         */
-        virtual void
-        setHairStyle(Uint16 style);
-
-        /**
-         * Gets the hair style for this being.
-         */
-        Uint16
-        getHairStyle() const { return mHairStyle; }
-
-        /**
-         * Sets visible equipments for this being.
-         */
-        virtual void
-        setVisibleEquipment(Uint8 slot, int id);
-
-        /**
-         * Sets the sex for this being.
-         */
-        virtual void
-        setSex(Uint8 sex) { mSex = sex; }
-
-        /**
-         * Gets the sex for this being.
-         */
-        Uint8
-        getSex() const { return mSex; }
-
         /**
          * Makes this being take the next step of his path.
          */
@@ -364,8 +321,6 @@ class Being : public Sprite
         virtual Being::TargetCursorSize getTargetCursorSize() const
         { return TC_MEDIUM; }
 
-        std::auto_ptr<Equipment> mEquipment;
-
         /**
          * Take control of a particle.
          */
@@ -378,7 +333,6 @@ class Being : public Sprite
         void setPath(const Path &path, int mod = 1024);
 
         Uint16 mId;                     /**< Unique being id */
-        Uint8 mSex;                     /**< Character's gender */
         Uint16 mWalkSpeed;              /**< Walking speed */
         Uint16 mSpeedModifier;          /**< Modifier to keep course on sync (1024 = normal speed) */
         Uint8 mSpriteDirection;         /**< Facing direction */
@@ -391,12 +345,10 @@ class Being : public Sprite
 
         Path mPath;
         std::string mSpeech;
-        Uint16 mHairStyle, mHairColor;
         Uint32 mSpeechTime;
         Sint32 mPx, mPy;                /**< Pixel coordinates */
 
         std::vector<AnimatedSprite*> mSprites;
-        std::vector<int> mEquipmentSpriteIDs;
         std::list<Particle *> mChildParticleEffects;
 
     private:
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index a8e9dafd..f78447cd 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -26,6 +26,7 @@
 #include "../being.h"
 #include "../beingmanager.h"
 #include "../graphics.h"
+#include "../localplayer.h"
 
 #include "../resources/image.h"
 
@@ -86,12 +87,13 @@ void Minimap::draw(gcn::Graphics *graphics)
         int dotSize = 2;
 
         switch (being->getType()) {
-            case Being::LOCALPLAYER:
-                dotSize = 3;
-                graphics->setColor(gcn::Color(61, 209, 52));
-                break;
-
             case Being::PLAYER:
+                if (being == player_node)
+                {
+                    dotSize = 3;
+                    graphics->setColor(gcn::Color(61, 209, 52));
+                    break;
+                }
                 graphics->setColor(gcn::Color(61, 52, 209));
                 break;
 
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 915b618d..5c48c355 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -373,7 +373,7 @@ Viewport::mousePressed(gcn::MouseEvent &event)
         FloorItem *floorItem;
 
         if ((being = beingManager->findBeing(tilex, tiley)) &&
-                being->getType() != Being::LOCALPLAYER)
+            being != player_node)
         {
             mPopupMenu->showPopup(event.getX(), event.getY(), being);
             return;
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index f4ad7587..346597a8 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -47,7 +47,8 @@ LocalPlayer *player_node = NULL;
 LocalPlayer::LocalPlayer():
     Player(65535, 0, NULL),
     mAttackRange(0),
-    mInventory(new Inventory()),
+    mInventory(new Inventory),
+    mEquipment(new Equipment),
     mAttributeBase(NB_CHARACTER_ATTRIBUTES, 0),
     mAttributeEffective(NB_CHARACTER_ATTRIBUTES, 0),
     mAttributeIncreasePoints(0),
@@ -94,11 +95,6 @@ void LocalPlayer::nextStep()
     Player::nextStep();
 }
 
-Being::Type LocalPlayer::getType() const
-{
-    return LOCALPLAYER;
-}
-
 void LocalPlayer::clearInventory()
 {
     mEquipment->clear();
diff --git a/src/localplayer.h b/src/localplayer.h
index ff7bf0b7..6349f7ed 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -141,8 +141,6 @@ class LocalPlayer : public Player
         virtual void
         drawName(Graphics *, int, int) {};
 
-        virtual Type getType() const;
-
         void clearInventory();
         Item* getInvItem(int index);
 
@@ -305,6 +303,7 @@ class LocalPlayer : public Player
         float mLastAttackTime; /**< Used to synchronize the charge dialog */
 
         std::auto_ptr<Inventory> mInventory;
+        std::auto_ptr<Equipment> mEquipment;
 
     protected:
         void walk(unsigned char dir);
diff --git a/src/monster.cpp b/src/monster.cpp
index fe78c878..bc964b0b 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -35,7 +35,7 @@
 Monster::Monster(Uint16 id, Uint16 job, Map *map):
     Being(id, job, map)
 {
-    mSprites[BASE_SPRITE] = new AnimatedSprite(
+    mSprites[BASE_SPRITE] = AnimatedSprite::load(
             "graphics/sprites/" + getInfo().getSprite());
 }
 
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 020d24af..6bd31c9f 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -418,7 +418,7 @@ void BeingHandler::handleMessage(MessageIn &msg)
     }
 }
 
-static void handleLooks(Being *being, MessageIn &msg)
+static void handleLooks(Player *being, MessageIn &msg)
 {
     // Order of sent slots. Has to be in sync with the server code.
     static int const nb_slots = 4;
@@ -471,10 +471,11 @@ BeingHandler::handleBeingEnterMessage(MessageIn &msg)
                 being = beingManager->createBeing(id, type, 0);
                 being->setName(name);
             }
-            being->setHairStyle(msg.readByte());
-            being->setHairColor(msg.readByte());
-            being->setSex(msg.readByte());
-            handleLooks(being, msg);
+            Player *p = static_cast< Player * >(being);
+            p->setHairStyle(msg.readByte());
+            p->setHairColor(msg.readByte());
+            p->setGender(msg.readByte());
+            handleLooks(p, msg);
         } break;
 
         case OBJECT_MONSTER:
@@ -591,7 +592,7 @@ void BeingHandler::handleBeingActionChangeMessage(MessageIn &msg)
 void BeingHandler::handleBeingLooksChangeMessage(MessageIn &msg)
 {
     Being *being = beingManager->findBeing(msg.readShort());
-    if (!being) return;
-    handleLooks(being, msg);
+    if (!being || being->getType() != Being::PLAYER) return;
+    handleLooks(static_cast< Player * >(being), msg);
 }
 
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 820aaea4..1cfd815b 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -216,7 +216,7 @@ CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
     LocalPlayer *tempPlayer = new LocalPlayer;
     slot = msg.readByte(); // character slot
     tempPlayer->mName = msg.readString();
-    tempPlayer->setSex(msg.readByte());
+    tempPlayer->setGender(msg.readByte());
     tempPlayer->setHairStyle(msg.readByte());
     tempPlayer->setHairColor(msg.readByte());
     tempPlayer->setLevel(msg.readByte());
diff --git a/src/npc.cpp b/src/npc.cpp
index f65c8d19..980f1c8b 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -35,7 +35,7 @@ NPC *current_npc = 0;
 NPC::NPC(Uint16 id, Uint16 job, Map *map):
     Being(id, job, map)
 {
-    mSprites[BASE_SPRITE] = new AnimatedSprite("graphics/sprites/npc.xml",
+    mSprites[BASE_SPRITE] = AnimatedSprite::load("graphics/sprites/npc.xml",
             job - 100);
 }
 
diff --git a/src/player.cpp b/src/player.cpp
index b63dcd5b..0fe6460c 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -35,8 +35,10 @@
 
 #include "gui/gui.h"
 
-Player::Player(Uint16 id, Uint16 job, Map *map):
-    Being(id, job, map)
+Player::Player(int id, int job, Map *map):
+    Being(id, job, map),
+    mEquipmentSpriteIDs(VECTOREND_SPRITE, 0),
+    mGender(2), mHairStyle(0), mHairColor(0)
 {
 }
 
@@ -57,8 +59,7 @@ Player::drawName(Graphics *graphics, int offsetX, int offsetY)
     graphics->drawText(mName, px + 15, py + 30, gcn::Graphics::CENTER);
 }
 
-void
-Player::setSex(Uint8 sex)
+void Player::setGender(int sex)
 {
     // Players can only be male or female
     if (sex > 1)
@@ -67,20 +68,20 @@ Player::setSex(Uint8 sex)
         sex = 0;
     }
 
-    if (sex != mSex)
+    if (sex != mGender)
     {
-        Being::setSex(sex);
+        mGender = sex;
 
         // Reload base sprite
         AnimatedSprite *newBaseSprite;
         if (sex == 0)
         {
-            newBaseSprite = new AnimatedSprite(
+            newBaseSprite = AnimatedSprite::load(
                     "graphics/sprites/player_male_base.xml");
         }
         else
         {
-            newBaseSprite = new AnimatedSprite(
+            newBaseSprite = AnimatedSprite::load(
                     "graphics/sprites/player_female_base.xml");
         }
 
@@ -92,7 +93,7 @@ Player::setSex(Uint8 sex)
         {
             if (i != HAIR_SPRITE && mEquipmentSpriteIDs.at(i) != 0)
             {
-                AnimatedSprite *newEqSprite = new AnimatedSprite(
+                AnimatedSprite *newEqSprite = AnimatedSprite::load(
                         "graphics/sprites/" + ItemDB::get(
                             mEquipmentSpriteIDs.at(i)).getSprite(sex));
                 delete mSprites[i];
@@ -102,17 +103,17 @@ Player::setSex(Uint8 sex)
     }
 }
 
-void
-Player::setHairColor(Uint16 color)
+void Player::setHairColor(int color)
 {
     if (color != mHairColor)
     {
-        Being::setHairColor(color);
+        mHairColor = color < NR_HAIR_COLORS ? color : 0;
 
-        AnimatedSprite *newHairSprite = new AnimatedSprite(
-                "graphics/sprites/hairstyle" + toString(mHairStyle) + ".xml",
+        AnimatedSprite *newHairSprite = AnimatedSprite::load(
+                "graphics/sprites/hairstyle" + toString(getHairStyle()) + ".xml",
                 mHairColor);
-        newHairSprite->setDirection(getSpriteDirection());
+        if (newHairSprite)
+            newHairSprite->setDirection(getSpriteDirection());
 
         delete mSprites[HAIR_SPRITE];
         mSprites[HAIR_SPRITE] = newHairSprite;
@@ -121,17 +122,17 @@ Player::setHairColor(Uint16 color)
     }
 }
 
-void
-Player::setHairStyle(Uint16 style)
+void Player::setHairStyle(int style)
 {
     if (style != mHairStyle)
     {
-        Being::setHairStyle(style);
+        mHairStyle = style < NR_HAIR_STYLES ? style : 0;
 
-        AnimatedSprite *newHairSprite = new AnimatedSprite(
-                "graphics/sprites/hairstyle" + toString(mHairStyle) + ".xml",
+        AnimatedSprite *newHairSprite = AnimatedSprite::load(
+                "graphics/sprites/hairstyle" + toString(getHairStyle()) + ".xml",
                 mHairColor);
-        newHairSprite->setDirection(getSpriteDirection());
+        if (newHairSprite)
+            newHairSprite->setDirection(getSpriteDirection());
 
         delete mSprites[HAIR_SPRITE];
         mSprites[HAIR_SPRITE] = newHairSprite;
@@ -140,8 +141,7 @@ Player::setHairStyle(Uint16 style)
     }
 }
 
-void
-Player::setVisibleEquipment(Uint8 slot, int id)
+void Player::setVisibleEquipment(int slot, int id)
 {
     // id = 0 means unequip
     if (id == 0)
@@ -151,19 +151,11 @@ Player::setVisibleEquipment(Uint8 slot, int id)
     }
     else
     {
-        AnimatedSprite *equipmentSprite;
-
-        if (mSex == 0)
-        {
-            equipmentSprite = new AnimatedSprite(
-                "graphics/sprites/" + ItemDB::get(id).getSprite(0));
-        }
-        else {
-            equipmentSprite = new AnimatedSprite(
-                "graphics/sprites/" + ItemDB::get(id).getSprite(1));
-        }
+        AnimatedSprite *equipmentSprite = AnimatedSprite::load(
+            "graphics/sprites/" + ItemDB::get(id).getSprite(mGender));
 
-        equipmentSprite->setDirection(getSpriteDirection());
+        if (equipmentSprite)
+            equipmentSprite->setDirection(getSpriteDirection());
 
         delete mSprites[slot];
         mSprites[slot] = equipmentSprite;
@@ -176,5 +168,5 @@ Player::setVisibleEquipment(Uint8 slot, int id)
         setAction(mAction);
     }
 
-    Being::setVisibleEquipment(slot, id);
+    mEquipmentSpriteIDs[slot] = id;
 }
diff --git a/src/player.h b/src/player.h
index 2c06bfba..e6d3743a 100644
--- a/src/player.h
+++ b/src/player.h
@@ -40,7 +40,7 @@ class Player : public Being
         /**
          * Constructor.
          */
-        Player(Uint16 id, Uint16 job, Map *map);
+        Player(int id, int job, Map *map);
 
         virtual Type
         getType() const;
@@ -48,17 +48,42 @@ class Player : public Being
         virtual void
         drawName(Graphics *graphics, int offsetX, int offsetY);
 
-        virtual void
-        setSex(Uint8 sex);
+        /**
+         * Sets the sex for this player.
+         */
+        void setGender(int);
 
-        virtual void
-        setHairColor(Uint16 color);
+        /**
+         * Gets the hair color for this player.
+         */
+        int getHairColor() const
+        { return mHairColor; }
 
-        virtual void
-        setHairStyle(Uint16 style);
+        /**
+         * Sets the hair color for this player.
+         */
+        void setHairColor(int color);
 
-        virtual void
-        setVisibleEquipment(Uint8 slot, int id);
+        /**
+         * Gets the hair style for this player.
+         */
+        int getHairStyle() const
+        { return mHairStyle; }
+
+        /**
+         * Sets the hair style for this player.
+         */
+        void setHairStyle(int style);
+
+        /**
+         * Sets visible equipments for this player.
+         */
+        void setVisibleEquipment(int slot, int id);
+
+    private:
+
+        std::vector<int> mEquipmentSpriteIDs;
+        Uint8 mGender, mHairStyle, mHairColor;
 };
 
 #endif
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 157e522c..4e978093 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -107,7 +107,7 @@ void ItemDB::load()
         std::string image = XML::getProperty(node, "image", "");
         std::string description = XML::getProperty(node, "description", "");
         std::string effect = XML::getProperty(node, "effect", "");
-        std::string attackType = XML::getProperty(node, "attacktype", "");
+        int weaponType = XML::getProperty(node, "weapon_type", 0);
 
         if (id)
         {
@@ -120,7 +120,7 @@ void ItemDB::load()
             itemInfo->setView(view);
             itemInfo->setWeight(weight);
             itemInfo->setSlot(slot);
-            itemInfo->setAttackType(attackType);
+            itemInfo->setWeaponType(weaponType);
 
             for_each_xml_child_node(itemChild, node)
             {
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index b5b25ac0..6654ccca 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -71,32 +71,29 @@ ItemInfo::getSprite(int gender) const
     }
 }
 
-void
-ItemInfo::setAttackType(const std::string &attackType)
+void ItemInfo::setWeaponType(int type)
 {
-    if (attackType == "swing")
-    {
-        mAttackType = ACTION_ATTACK_SWING;
-    }
-    else if (attackType == "stab")
-    {
-        mAttackType = ACTION_ATTACK_STAB;
-    }
-    else if (attackType == "bow")
-    {
-        mAttackType = ACTION_ATTACK_BOW;
-    }
-    else if (attackType == "throw")
-    {
-        mAttackType = ACTION_ATTACK_THROW;
-    }
-    else if (attackType == "none")
-    {
-        mAttackType = ACTION_DEFAULT;
-    }
-    else
+    // See server item.hpp file for type values.
+    switch (type)
     {
-        mAttackType = ACTION_ATTACK;
+        case 0:     // none
+            mAttackType = ACTION_DEFAULT;
+            break;
+        case 1:     // knife
+        case 2:     // sword
+            mAttackType = ACTION_ATTACK_STAB;
+            break;
+        case 8:     // projectile
+            mAttackType = ACTION_ATTACK_THROW;
+            break;
+        case 10:    // bow
+            mAttackType = ACTION_ATTACK_BOW;
+            break;
+        case 11:    // sickle
+            mAttackType = ACTION_ATTACK_SWING;
+            break;
+        default:
+            mAttackType = ACTION_ATTACK;
     }
 }
 
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 4fd1638e..4cab66fa 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -113,7 +113,7 @@ class ItemInfo
 
         const std::string& getSprite(int gender) const;
 
-        void setAttackType(const std::string &attackType);
+        void setWeaponType(int);
 
         const SpriteAction getAttackType() const
         { return mAttackType; }
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 448e7f80..5e3f3bc7 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -275,6 +275,13 @@ ResourceManager::getSprite(const std::string &path, int variant)
         return dynamic_cast<SpriteDef*>(resIter->second);
     }
 
+    // FIXME: modify SpriteDef so that it gracefully fails on missing sprite.
+    if (!exists(path) || isDirectory(path))
+    {
+        logger->log("Failed to load file: %s", path.c_str());
+        return NULL;
+    }
+
     SpriteDef *sprite = new SpriteDef(idPath, path, variant);
     sprite->incRef();
     mResources[idPath] = sprite;
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 24156be1..d90d4067 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -73,13 +73,13 @@ SpriteDef::load(const std::string &animationFile, int variant)
 
     if (!doc) {
         logger->error(
-                "Animation: Error while parsing animation definition file!");
+                "Animation: Error while parsing " + animationFile + " file!");
     }
 
     xmlNodePtr rootNode = xmlDocGetRootElement(doc);
     if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "sprite")) {
         logger->error(
-                "Animation: this is not a valid animation definition file!");
+                "Animation: this is not a valid " + animationFile + " file!");
     }
 
     // Get the variant
-- 
cgit v1.2.3-70-g09d2


From 19eaabe57c3efb6b6b8b7bd9bcde8277c71a485d Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@gmail.com>
Date: Wed, 14 Nov 2007 10:28:49 +0000
Subject: Experimented with non-stuck gaming when talking to NPCs.

---
 ChangeLog             | 2 ++
 src/game.cpp          | 1 -
 src/gui/popupmenu.cpp | 3 +--
 src/gui/viewport.cpp  | 4 ----
 4 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index 0782f0f9..47f6f28e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 	* src/gui/inttextbox.h, src/gui/inttextbox.cpp: Changed to textfield so
 	that it is visibly editable.
 	* src/gui/item_amount.cpp: Converted to layout handler.
+	* src/game.cpp, src/gui/viewport.cpp, src/gui/popupmenu.cpp: Removed
+	tests on current_npc.
 
 2007-11-13  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
diff --git a/src/game.cpp b/src/game.cpp
index b4887f5b..4bf42a2d 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -673,7 +673,6 @@ void Game::handleInput()
     }
     // Moving player around
     if (player_node->mAction != Being::DEAD &&
-        current_npc == 0 &&
         !chatWindow->isFocused())
     {
         // Get the state of the keyboard keys
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index aeb6637d..a1148379 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -123,8 +123,7 @@ void PopupMenu::handleLink(const std::string& link)
     // Talk To action
     if (link == "talk" &&
         mBeing != NULL &&
-        mBeing->getType() == Being::NPC &&
-        current_npc == 0)
+        mBeing->getType() == Being::NPC)
     {
         static_cast<NPC*>(mBeing)->talk();
     }
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 5c48c355..57c64cd6 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -357,10 +357,6 @@ Viewport::mousePressed(gcn::MouseEvent &event)
     if (!mMap || !player_node || player_node->mAction == Being::DEAD)
         return;
 
-    // Check if we are busy
-    if (current_npc)
-        return;
-
     mPlayerFollowMouse = false;
 
     int tilex = (event.getX() + mCameraX) / 32;
-- 
cgit v1.2.3-70-g09d2


From fe474eb4fae9d89e3797d0ceaae6613798ce491f Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Thu, 13 Mar 2008 07:29:30 +0000
Subject: Synchronized pathfinding algorithmns with those used by the server to
 avoid asynchronisation.

---
 ChangeLog                 |  11 +++
 src/being.cpp             |  24 +++++--
 src/being.h               |  39 ++++++++--
 src/gui/viewport.cpp      |   8 ++-
 src/localplayer.cpp       |  14 ++--
 src/map.cpp               | 179 +++++++++++++++++++++++++++++++++++-----------
 src/map.h                 |  46 ++++++++----
 src/monster.cpp           |   5 ++
 src/monster.h             |  15 ++++
 src/net/beinghandler.cpp  |  10 +--
 src/net/playerhandler.cpp |   3 +-
 src/player.cpp            |   5 ++
 src/player.h              |  14 +++-
 13 files changed, 286 insertions(+), 87 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index f7760321..2eec14f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-03-13  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/being.cpp, src/being.h, src/gui/viewport.cpp,
+	src/localplayer.cpp, src/map.cpp, src/map.h, src/monster.cpp,
+	src/monster.h, src/net/beinghandler.cpp, src/net/playerhandler.cpp.
+	src/player.cpp, src/player.h: Unified route finding algorithmns
+	with those used by the server to minimize asynchronisation.
+	* src/map.cpp, src/gui/viewport.cpp: Improved path debugging tool
+	by displaying a raster and showing blocked tiles when it is
+	activated (alt+F).
+
 2008-03-12  David Athay  <ko2fan@gmail.com>
 
 	* src/gui/guildwindow.cpp, src/gui/guildwindow.h,
diff --git a/src/being.cpp b/src/being.cpp
index a55158c6..55530080 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -47,12 +47,12 @@ int Being::instances = 0;
 ImageSet *Being::emotionSet = NULL;
 
 Being::Being(int id, int job, Map *map):
-    mJob(job),
     mX(0), mY(0),
-    mAction(STAND),
-    mWalkTime(0),
     mEmotion(0), mEmotionTime(0),
     mAttackSpeed(350),
+    mWalkTime(0),
+    mAction(STAND),
+    mJob(job),
     mId(id),
     mWalkSpeed(150),
     mSpeedModifier(1024),
@@ -100,6 +100,14 @@ Being::~Being()
     }
 }
 
+void Being::setPositionInPixels(int x, int y)
+{
+    mMap->freeTile(mX / 32, mY / 32, getBlockType());
+    mX = x;
+    mY = y;
+    mMap->blockTile(x / 32, y / 32, getBlockType());
+}
+
 void Being::adjustCourse(Uint16 srcX, Uint16 srcY, Uint16 dstX, Uint16 dstY)
 {
     if (!mMap || (mX == dstX && mY == dstY))
@@ -130,7 +138,7 @@ void Being::adjustCourse(Uint16 srcX, Uint16 srcY, Uint16 dstX, Uint16 dstY)
     }
     else
     {
-        p1 = mMap->findPath(srcX / 32, srcY / 32, dstX / 32, dstY / 32);
+        p1 = mMap->findPath(srcX / 32, srcY / 32, dstX / 32, dstY / 32, getWalkMask());
         if (p1.empty())
         {
             // No path, but don't teleport since it could be user input.
@@ -190,7 +198,7 @@ void Being::adjustCourse(Uint16 srcX, Uint16 srcY, Uint16 dstX, Uint16 dstY)
     for (Path::iterator i = p1.begin(), i_end = p1.end(); i != i_end; ++i)
     {
         // Look if it is worth passing by tile i.
-        Path p2 = mMap->findPath(mX / 32, mY / 32, i->x / 32, i->y / 32);
+        Path p2 = mMap->findPath(mX / 32, mY / 32, i->x / 32, i->y / 32, getWalkMask());
         if (!p2.empty())
         {
             int l1 = mMap->getMetaTile(i->x / 32, i->y / 32)->Gcost;
@@ -343,9 +351,11 @@ Being::handleAttack()
 void
 Being::setMap(Map *map)
 {
+
     // Remove sprite from potential previous map
     if (mMap)
     {
+        mMap->freeTile(mX / 32, mY / 32, getBlockType());
         mMap->removeSprite(mSpriteIterator);
     }
 
@@ -355,6 +365,7 @@ Being::setMap(Map *map)
     if (mMap)
     {
         mSpriteIterator = mMap->addSprite(this);
+        mMap->blockTile(mX / 32, mY / 32, getBlockType());
     }
 
     // Clear particle effect list because child particles became invalid
@@ -488,8 +499,7 @@ Being::nextStep()
 
     setDirection(dir);
 
-    mX = node.x;
-    mY = node.y;
+    setPositionInPixels(node.x, node.y);
     setAction(WALK);
     mWalkTime += mStepTime / 10;
     mStepTime = mWalkSpeed * (int)std::sqrt((double)mStepX * mStepX + (double)mStepY * mStepY) *
diff --git a/src/being.h b/src/being.h
index 0b56994e..f4cdc743 100644
--- a/src/being.h
+++ b/src/being.h
@@ -112,14 +112,13 @@ class Being : public Sprite
         enum { DOWN = 1, LEFT = 2, UP = 4, RIGHT = 8 };
 
         std::string mName;      /**< Name of character */
-        Uint16 mJob;            /**< Job (player job, npc, monster, ) */
-        Uint16 mX, mY;          /**< Pixel coordinates (tile center) */
-        Action mAction;         /**< Action the being is performing */
-        Uint16 mWalkTime;
+        Uint16 mX, mY;          /**< Pixel coordinates of tile center */
         Uint8 mEmotion;         /**< Currently showing emotion */
         Uint8 mEmotionTime;     /**< Time until emotion disappears */
-
         Uint16 mAttackSpeed;          /**< Attack speed */
+        Uint16 mWalkTime;
+        Action mAction;                 /**< Action the being is performing */
+        Uint16 mJob;                    /**< Job (player job, npc, monster, ) */
 
         /**
          * Constructor.
@@ -264,6 +263,13 @@ class Being : public Sprite
         virtual void
         setAction(Action action, int attackType = 0);
 
+        /**
+         * Gets the current action.
+         */
+        bool isAlive() { return mAction != DEAD; }
+
+        int getWalkTime() { return mWalkTime; }
+
         /**
          * Returns the direction the being is facing.
          */
@@ -297,6 +303,17 @@ class Being : public Sprite
         int
         getPixelY() const { return mPy; }
 
+        /**
+         * sets the position in pixels using pixel coordinates
+         */
+        void setPositionInPixels(int x, int y);
+
+        /**
+         * sets the position in pixels using tile coordinates
+         */
+        void setPositionInTiles(int x, int y)
+        { setPositionInPixels(x * 32 + 16, y * 32 + 16); }
+
         /**
          * Get the current X pixel offset.
          */
@@ -332,12 +349,24 @@ class Being : public Sprite
          */
         void controlParticle(Particle *particle);
 
+        /**
+         * Gets the way the object is blocked by other objects
+         */
+        virtual unsigned char getWalkMask() const
+        { return 0x00; } //can walk through everything
+
     protected:
         /**
          * Sets the new path for this being.
          */
         void setPath(const Path &path, int mod = 1024);
 
+        /**
+         * Gets the way the object blocks pathfinding for other objects
+         */
+        virtual Map::BlockType getBlockType() const
+        { return Map::BLOCKTYPE_NONE; }
+
         Uint16 mId;                     /**< Unique being id */
         Uint16 mWalkSpeed;              /**< Walking speed */
         Uint16 mSpeedModifier;          /**< Modifier to keep course on sync (1024 = normal speed) */
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 57c64cd6..d6c49fb2 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -221,6 +221,10 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
         drawTargetCursor(graphics);
         mMap->draw(graphics, mCameraX, mCameraY, 1);
         mMap->draw(graphics, mCameraX, mCameraY, 2);
+        if (mShowDebugPath)
+        {
+            mMap->drawCollision(graphics, mCameraX, mCameraY);
+        }
         mMap->drawOverlay(graphics, mViewX, mViewY,
                 (int) config.getValue("OverlayDetail", 2));
         drawTargetName(graphics);
@@ -335,7 +339,7 @@ Viewport::drawDebugPath(Graphics *graphics)
 
     Path debugPath = mMap->findPath(
             player_node->mX / 32, player_node->mY / 32,
-            mouseTileX, mouseTileY);
+            mouseTileX, mouseTileY, 0xFF);
 
     graphics->setColor(gcn::Color(255, 0, 0));
     for (PathIterator i = debugPath.begin(); i != debugPath.end(); i++)
@@ -399,7 +403,7 @@ Viewport::mousePressed(gcn::MouseEvent &event)
                 player_node->pickUp(item);
         }
         // Just walk around
-        else if (mMap->getWalk(tilex, tiley))
+        else if (mMap->getWalk(tilex, tiley, player_node->getWalkMask()))
         {
             // XXX XXX XXX REALLY UGLY!
             Uint8 *keys = SDL_GetKeyState(NULL);
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 1614b7e7..aa3bb6ba 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -233,17 +233,17 @@ void LocalPlayer::walk(unsigned char dir)
         dx += 32;
 
     // Prevent skipping corners over colliding tiles
-    if (dx && mMap->tileCollides((mX + dx) / 32, mY / 32))
+    if (dx && !mMap->getWalk((mX + dx) / 32, mY / 32, getWalkMask()))
         dx = 16 - mX % 32;
-    if (dy && mMap->tileCollides(mX / 32, (mY + dy) / 32))
+    if (dy && !mMap->getWalk(mX / 32, (mY + dy) / 32, getWalkMask()))
         dy = 16 - mY % 32;
 
     // Choose a straight direction when diagonal target is blocked
-    if (dx && dy && !mMap->getWalk((mX + dx) / 32, (mY + dy) / 32))
+    if (dx && dy && !mMap->getWalk((mX + dx) / 32, (mY + dy) / 32, getWalkMask()))
         dx = 16 - mX % 32;
 
     // Walk to where the player can actually go
-    if ((dx || dy) && mMap->getWalk((mX + dx) / 32, (mY + dy) / 32))
+    if ((dx || dy) && mMap->getWalk((mX + dx) / 32, (mY + dy) / 32, getWalkMask()))
     {
         setDestination(mX + dx, mY + dy);
     }
@@ -259,9 +259,9 @@ void LocalPlayer::setDestination(Uint16 x, Uint16 y)
 {
     // Fix coordinates so that the player does not seem to dig into walls.
     int tx = x / 32, ty = y / 32, fx = x % 32, fy = y % 32;
-    if (fx != 16 && mMap->tileCollides(tx + fx / 16 * 2 - 1, ty)) fx = 16;
-    if (fy != 16 && mMap->tileCollides(tx, ty + fy / 16 * 2 - 1)) fy = 16;
-    if (fx != 16 && fy != 16 && mMap->tileCollides(tx + fx / 16 * 2 - 1, ty + fy / 16 * 2 - 1)) fx = 16;
+    if (fx != 16 && !mMap->getWalk(tx + fx / 16 * 2 - 1, ty, getWalkMask())) fx = 16;
+    if (fy != 16 && !mMap->getWalk(tx, ty + fy / 16 * 2 - 1, getWalkMask())) fy = 16;
+    if (fx != 16 && fy != 16 && !mMap->getWalk(tx + fx / 16 * 2 - 1, ty + fy / 16 * 2 - 1, getWalkMask())) fx = 16;
     x = tx * 32 + fx;
     y = ty * 32 + fy;
 
diff --git a/src/map.cpp b/src/map.cpp
index c2b0b9a1..afa2bcc5 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -72,6 +72,11 @@ Map::Map(int width, int height, int tileWidth, int tileHeight):
     int size = mWidth * mHeight;
 
     mMetaTiles = new MetaTile[size];
+    for (int i=0; i < NB_BLOCKTYPES; i++)
+    {
+        mOccupation[i] = new int[size];
+        memset(mOccupation[i], 0, size * sizeof(int));
+    }
     mTiles = new Image*[size * 3];
     std::fill_n(mTiles, size * 3, (Image*)0);
 }
@@ -81,6 +86,10 @@ Map::~Map()
     // clean up map data
     delete[] mMetaTiles;
     delete[] mTiles;
+    for (int i=0; i < NB_BLOCKTYPES; i++)
+    {
+        delete[] mOccupation[i];
+    }
     // clean up tilesets
     for_each(mTilesets.begin(), mTilesets.end(), make_dtor(mTilesets));
     mTilesets.clear();
@@ -186,6 +195,59 @@ void Map::draw(Graphics *graphics, int scrollX, int scrollY, int layer)
     }
 }
 
+void Map::drawCollision(Graphics *graphics, int scrollX, int scrollY)
+{
+    int endPixelY = graphics->getHeight() + scrollY + mTileHeight - 1;
+    int startX = scrollX / mTileWidth;
+    int startY = scrollY / mTileHeight;
+    int endX = (graphics->getWidth() + scrollX + mTileWidth - 1) / mTileWidth;
+    int endY = endPixelY / mTileHeight;
+
+    if (startX < 0) startX = 0;
+    if (startY < 0) startY = 0;
+    if (endX > mWidth) endX = mWidth;
+    if (endY > mHeight) endY = mHeight;
+
+    for (int y = startY; y < endY; y++)
+    {
+        for (int x = startX; x < endX; x++)
+        {
+            graphics->setColor(gcn::Color(0, 0, 0, 64));
+                graphics->drawRectangle(gcn::Rectangle(
+                    x * mTileWidth - scrollX,
+                    y * mTileWidth - scrollY,
+                    33, 33));
+
+            if (!getWalk(x, y, BLOCKMASK_WALL))
+            {
+                graphics->setColor(gcn::Color(0, 0, 200, 64));
+                graphics->fillRectangle(gcn::Rectangle(
+                    x * mTileWidth - scrollX,
+                    y * mTileWidth - scrollY,
+                    32, 32));
+            }
+
+            if (!getWalk(x, y, BLOCKMASK_MONSTER))
+            {
+                graphics->setColor(gcn::Color(200, 0, 0, 64));
+                graphics->fillRectangle(gcn::Rectangle(
+                    x * mTileWidth - scrollX,
+                    y * mTileWidth - scrollY,
+                    32, 32));
+            }
+
+            if (!getWalk(x, y, BLOCKMASK_CHARACTER))
+            {
+                graphics->setColor(gcn::Color(0, 200, 0, 64));
+                graphics->fillRectangle(gcn::Rectangle(
+                    x * mTileWidth - scrollX,
+                    y * mTileWidth - scrollY,
+                    32, 32));
+            }
+        }
+    }
+}
+
 void Map::drawOverlay(Graphics *graphics,
                       float scrollX, float scrollY, int detail)
 {
@@ -231,7 +293,10 @@ void Map::setTileWithGid(int x, int y, int layer, int gid)
     if (layer == 3)
     {
         Tileset *set = getTilesetWithGid(gid);
-        setWalk(x, y, (!set || (gid - set->getFirstGid() == 0)));
+        if (set && (gid - set->getFirstGid() != 0))
+        {
+            blockTile(x, y, BLOCKTYPE_WALL);
+        }
     }
     else if (layer < 3)
     {
@@ -271,34 +336,69 @@ Image* Map::getTileWithGid(int gid) const
     return NULL;
 }
 
-void Map::setWalk(int x, int y, bool walkable)
+void Map::blockTile(int x, int y, BlockType type)
 {
-    mMetaTiles[x + y * mWidth].walkable = walkable;
-}
+    if (type == BLOCKTYPE_NONE) return;
+    int tileNum = x + y * mWidth;
+    assert (tileNum <= mWidth * mHeight);
 
-bool Map::getWalk(int x, int y) const
-{
-    return !tileCollides(x, y) && !occupied(x, y);
+    if ((++mOccupation[type][tileNum]) > 0)
+    {
+        switch (type)
+        {
+            case BLOCKTYPE_WALL:
+                mMetaTiles[tileNum].blockmask |= BLOCKMASK_WALL;
+                break;
+            case BLOCKTYPE_CHARACTER:
+                mMetaTiles[tileNum].blockmask |= BLOCKMASK_CHARACTER;
+                break;
+            case BLOCKTYPE_MONSTER:
+                mMetaTiles[tileNum].blockmask |= BLOCKMASK_MONSTER;
+                break;
+            default:
+                // shut up!
+                break;
+        }
+    }
 }
 
-bool Map::occupied(int x, int y) const
+void Map::freeTile(int x, int y, BlockType type)
 {
-    Beings &beings = beingManager->getAll();
-    for (BeingIterator i = beings.begin(); i != beings.end(); i++)
+    if (type == BLOCKTYPE_NONE) return;
+
+    int tileNum = x + y * mWidth;
+    assert (tileNum <= mWidth * mHeight);
+
+    if ((--mOccupation[type][tileNum]) <= 0)
     {
-        // job 45 is a portal, they don't collide
-        if ((*i)->mX / 32 == x && (*i)->mY / 32 == y && (*i)->mJob != 45)
+        switch (type)
         {
-            return true;
+            case BLOCKTYPE_WALL:
+                mMetaTiles[tileNum].blockmask &= (BLOCKMASK_WALL xor 0xff);
+                break;
+            case BLOCKTYPE_CHARACTER:
+                mMetaTiles[tileNum].blockmask &= (BLOCKMASK_CHARACTER xor 0xff);
+                break;
+            case BLOCKTYPE_MONSTER:
+                mMetaTiles[tileNum].blockmask &= (BLOCKMASK_MONSTER xor 0xff);
+                break;
+            default:
+                // shut up!
+                break;
         }
     }
-
-    return false;
 }
 
-bool Map::tileCollides(int x, int y) const
+bool Map::getWalk(int x, int y, char walkmask) const
 {
-    return !(contains(x, y) && mMetaTiles[x + y * mWidth].walkable);
+    // You can't walk outside of the map
+    if (x < 0 || y < 0 || x >= mWidth || y >= mHeight)
+    {
+        return false;
+    }
+
+    // Check if the tile is walkable
+    return !(mMetaTiles[x + y * mWidth].blockmask & walkmask);
 }
 
 bool Map::contains(int x, int y) const
@@ -334,17 +434,16 @@ void Map::removeSprite(SpriteIterator iterator)
 
 static int const basicCost = 100;
 
-Path Map::findPath(int startX, int startY, int destX, int destY)
+Path Map::findPath(int startX, int startY, int destX, int destY, unsigned char walkmask, int maxCost)
 {
     // Path to be built up (empty by default)
-    Path path;
+    std::list<PATH_NODE> path;
 
     // Declare open list, a list with open tiles sorted on F cost
     std::priority_queue<Location> openList;
 
-    // Return empty path when destination collides
-    if (tileCollides(destX, destY))
-        return path;
+    // Return when destination not walkable
+    if (!getWalk(destX, destY, walkmask)) return path;
 
     // Reset starting tile's G cost to 0
     MetaTile *startTile = getMetaTile(startX, startY);
@@ -358,19 +457,20 @@ Path Map::findPath(int startX, int startY, int destX, int destY)
     // Keep trying new open tiles until no more tiles to try or target found
     while (!openList.empty() && !foundPath)
     {
-        // Take the location with the lowest F cost from the open list.
+        // Take the location with the lowest F cost from the open list, and
+        // add it to the closed list.
         Location curr = openList.top();
         openList.pop();
 
         // If the tile is already on the closed list, this means it has already
         // been processed with a shorter path to the start point (lower G cost)
-        if (curr.tile->whichList == mOnClosedList)
+        if (curr.tile->whichList == onClosedList)
         {
             continue;
         }
 
         // Put the current tile on the closed list
-        curr.tile->whichList = mOnClosedList;
+        curr.tile->whichList = onClosedList;
 
         // Check the adjacent tiles
         for (int dy = -1; dy <= 1; dy++)
@@ -383,28 +483,28 @@ Path Map::findPath(int startX, int startY, int destX, int destY)
 
                 // Skip if if we're checking the same tile we're leaving from,
                 // or if the new location falls outside of the map boundaries
-                if ((dx == 0 && dy == 0) || !contains(x, y))
+                if ((dx == 0 && dy == 0) ||
+                        (x < 0 || y < 0 || x >= mWidth || y >= mHeight))
                 {
                     continue;
                 }
 
                 MetaTile *newTile = getMetaTile(x, y);
 
-                // Skip if the tile is on the closed list or collides
-                if (newTile->whichList == mOnClosedList || tileCollides(x, y))
+                // Skip if the tile is on the closed list or is not walkable
+                if (newTile->whichList == onClosedList || newTile->blockmask & walkmask)
                 {
                     continue;
                 }
 
                 // When taking a diagonal step, verify that we can skip the
-                // corner. We allow skipping past beings but not past non-
-                // walkable tiles.
+                // corner.
                 if (dx != 0 && dy != 0)
                 {
                     MetaTile *t1 = getMetaTile(curr.x, curr.y + dy);
                     MetaTile *t2 = getMetaTile(curr.x + dx, curr.y);
 
-                    if (!(t1->walkable && t2->walkable))
+                    if (t1->blockmask & walkmask && !(t2->blockmask & walkmask)) // I hope I didn't fuck this line up
                     {
                         continue;
                     }
@@ -428,21 +528,14 @@ Path Map::findPath(int startX, int startY, int destX, int destY)
                     ++Gcost;
                 }
 
-                // It costs extra to walk through a being (needs to be enough
-                // to make it more attractive to walk around).
-                if (occupied(x, y))
-                {
-                    Gcost += 30;
-                }
-
                 // Skip if Gcost becomes too much
                 // Warning: probably not entirely accurate
-                if (Gcost > 20 * basicCost)
+                if (Gcost > maxCost * basicCost)
                 {
                     continue;
                 }
 
-                if (newTile->whichList != mOnOpenList)
+                if (newTile->whichList != onOpenList)
                 {
                     // Found a new tile (not on open nor on closed list)
 
@@ -464,7 +557,7 @@ Path Map::findPath(int startX, int startY, int destX, int destY)
 
                     if (x != destX || y != destY) {
                         // Add this tile to the open list
-                        newTile->whichList = mOnOpenList;
+                        newTile->whichList = onOpenList;
                         openList.push(Location(x, y, newTile));
                     }
                     else {
@@ -493,8 +586,8 @@ Path Map::findPath(int startX, int startY, int destX, int destY)
 
     // Two new values to indicate whether a tile is on the open or closed list,
     // this way we don't have to clear all the values between each pathfinding.
-    mOnClosedList += 2;
-    mOnOpenList += 2;
+    onClosedList += 2;
+    onOpenList += 2;
 
     // If a path has been found, iterate backwards using the parent locations
     // to extract it.
diff --git a/src/map.h b/src/map.h
index d8cc2189..71bbf843 100644
--- a/src/map.h
+++ b/src/map.h
@@ -54,7 +54,7 @@ struct MetaTile
     /**
      * Constructor.
      */
-    MetaTile():whichList(0) {};
+    MetaTile():whichList(0), blockmask(0) {};
 
     // Pathfinding members
     int Fcost;              /**< Estimation of total path cost */
@@ -63,7 +63,7 @@ struct MetaTile
     int whichList;          /**< No list, open list or closed list */
     int parentX;            /**< X coordinate of parent tile */
     int parentY;            /**< Y coordinate of parent tile */
-    bool walkable;          /**< Can beings walk on this tile */
+    unsigned char blockmask;          /**< Can beings walk on this tile */
 };
 
 /**
@@ -72,6 +72,15 @@ struct MetaTile
 class Map : public Properties
 {
     public:
+        enum BlockType
+        {
+            BLOCKTYPE_NONE = -1,
+            BLOCKTYPE_WALL,
+            BLOCKTYPE_CHARACTER,
+            BLOCKTYPE_MONSTER,
+            NB_BLOCKTYPES
+        };
+
         /**
          * Constructor, taking map and tile size as parameters.
          */
@@ -93,6 +102,11 @@ class Map : public Properties
          */
         void draw(Graphics *graphics, int scrollX, int scrollY, int layer);
 
+        /**
+         * Visualizes collision layer for debugging
+         */
+        void drawCollision(Graphics *graphics, int scrollX, int scrollY);
+
         /**
          * Draws the overlay graphic to the given graphics output.
          */
@@ -129,19 +143,19 @@ class Map : public Properties
         MetaTile *getMetaTile(int x, int y) const;
 
         /**
-         * Set walkability flag for a tile.
+         * Marks a tile as occupied
          */
-        void setWalk(int x, int y, bool walkable);
+        void blockTile(int x, int y, BlockType type);
 
         /**
-         * Tell if a tile is walkable or not, includes checking beings.
+         * Marks a tile as unoccupied
          */
-        bool getWalk(int x, int y) const;
+        void freeTile(int x, int y, BlockType type);
 
         /**
-         * Tell if a tile collides, not including a check on beings.
+         * Gets walkability for a tile with a blocking bitmask
          */
-        bool tileCollides(int x, int y) const;
+        bool getWalk(int x, int y, char walkmask) const;
 
         /**
          * Returns the width of this map.
@@ -171,7 +185,7 @@ class Map : public Properties
          * Find a path from one location to the next.
          */
         std::list<PATH_NODE>
-        findPath(int startX, int startY, int destX, int destY);
+        findPath(int startX, int startY, int destX, int destY, unsigned char walkmask, int maxCost = 20);
 
         /**
          * Adds a sprite to the map.
@@ -209,14 +223,20 @@ class Map : public Properties
         Tileset* getTilesetWithGid(int gid) const;
 
         /**
-         * Tells whether a tile is occupied by a being.
+         * Tells whether the given coordinates fall within the map boundaries.
          */
-        bool occupied(int x, int y) const;
+        bool contains(int x, int y) const;
 
         /**
-         * Tells whether the given coordinates fall within the map boundaries.
+         * Blockmasks for different entities
          */
-        bool contains(int x, int y) const;
+        static const unsigned char BLOCKMASK_WALL = 128;   // = bin 1000 0000
+        static const unsigned char BLOCKMASK_CHARACTER = 1;// = bin 0000 0001
+        static const unsigned char BLOCKMASK_MONSTER = 2;  // = bin 0000 0010
+        int *mOccupation[NB_BLOCKTYPES];
+
+        // Pathfinding members
+        int onClosedList, onOpenList;
 
         int mWidth, mHeight;
         int mTileWidth, mTileHeight;
diff --git a/src/monster.cpp b/src/monster.cpp
index 5fbcfaea..abc7946f 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -44,6 +44,11 @@ Monster::Monster(Uint16 id, Uint16 job, Map *map):
         AnimatedSprite::load("graphics/sprites/" + filename);
 }
 
+Monster::~Monster()
+{
+    if (mMap) mMap->freeTile(mX / 32, mY / 32, getBlockType());
+}
+
 Being::Type
 Monster::getType() const
 {
diff --git a/src/monster.h b/src/monster.h
index 585f6f09..ecf7ad51 100644
--- a/src/monster.h
+++ b/src/monster.h
@@ -33,6 +33,8 @@ class Monster : public Being
     public:
         Monster(Uint16 id, Uint16 job, Map *map);
 
+        virtual ~Monster();
+
         virtual void setAction(Action action, int attackType);
 
         virtual Type getType() const;
@@ -58,6 +60,19 @@ class Monster : public Being
          */
         const MonsterInfo&
         getInfo() const;
+
+        /**
+         * Gets the way the monster is blocked for other objects
+         */
+        virtual unsigned char getWalkMask() const
+        { return 0x83; } // blocked walls, other monsters and players ( bin 1000 0011)
+
+    protected:
+        /**
+         * Gets the way the monster blocks pathfinding for other objects
+         */
+        virtual Map::BlockType getBlockType() const
+        { return Map::BLOCKTYPE_MONSTER; }
 };
 
 #endif
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 05795cb1..f31ee48b 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -496,8 +496,7 @@ BeingHandler::handleBeingEnterMessage(MessageIn &msg)
             return;
     }
 
-    being->mX = px;
-    being->mY = py;
+    being->setPositionInPixels(px, py);
     being->setDestination(px, py);
     being->setAction(action);
 }
@@ -544,11 +543,10 @@ void BeingHandler::handleBeingsMoveMessage(MessageIn &msg)
         {
             being->setWalkSpeed(speed * 10);
         }
-        if (abs(being->mX - sx) + abs(being->mY - sy) > 4 * 32)
+        if (abs(being->getPixelX() - sx) + abs(being->getPixelY() - sy) > 4 * 32)
         {
             // Too large a desynchronization.
-            being->mX = sx;
-            being->mY = sy;
+            being->setPositionInPixels(sx, sy);
             being->setDestination(dx, dy);
         }
         else if (!(flags & MOVING_POSITION))
@@ -582,8 +580,6 @@ void BeingHandler::handleBeingAttackMessage(MessageIn &msg)
         case DIRECTION_RIGHT: being->setDirection(Being::RIGHT); break;
     }
 
-    logger->log("Attacktype: %d", attackType);
-
     being->setAction(Being::ATTACK, attackType);
 }
 
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 3c06d2f5..b908eae5 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -301,6 +301,5 @@ PlayerHandler::handleMapChangeMessage(MessageIn &msg)
     current_npc = 0;
 
     player_node->setAction(Being::STAND);
-    player_node->mX = x;
-    player_node->mY = y;
+    player_node->setPositionInPixels(x, y);
 }
diff --git a/src/player.cpp b/src/player.cpp
index 2f1fc648..c218ad01 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -44,6 +44,11 @@ Player::Player(int id, int job, Map *map):
 {
 }
 
+Player::~Player()
+{
+    if (mMap) mMap->freeTile(mX / 32, mY / 32, getBlockType());
+}
+
 Being::Type
 Player::getType() const
 {
diff --git a/src/player.h b/src/player.h
index aff75221..76d6b460 100644
--- a/src/player.h
+++ b/src/player.h
@@ -49,6 +49,8 @@ class Player : public Being
          */
         Player(int id, int job, Map *map);
 
+        virtual ~Player();
+
         virtual Type
         getType() const;
 
@@ -113,10 +115,20 @@ class Player : public Being
          */
         short getNumberOfGuilds();
 
+        /**
+         * Gets the way the character is blocked by other objects
+         */
+        virtual unsigned char getWalkMask() const
+        { return 0x82; } // blocked by walls and monsters ( bin 1000 0010)
+
     protected:
         // Character guild information
         std::map<int, Guild*> mGuilds;
-
+        /**
+         * Gets the way the monster blocks pathfinding for other objects
+         */
+        virtual Map::BlockType getBlockType() const
+        { return Map::BLOCKTYPE_CHARACTER; }
     private:
         Gender mGender;
         Uint8 mHairStyle;
-- 
cgit v1.2.3-70-g09d2


From fa8b0a19084c0c2d369cda199b87c03fe838fa79 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 23 Mar 2008 22:41:21 +0000
Subject: Merged revisions
 3828-3829,3831-3838,3841,3843-3844,3847-3872,3874,3876-3900 via svnmerge from
 https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0

........
  r3828 | crush_tmw | 2007-12-31 17:14:27 +0100 (Mon, 31 Dec 2007) | 1 line

  Added config options to set the scroll center. Retained scroll offset during map change for smoother map transitions.
........
  r3859 | b_lindeijer | 2008-01-26 20:38:43 +0100 (Sat, 26 Jan 2008) | 3 lines

  Fixed a GCC 4.3 compile error and constified the usage of auto_ptr, since
  that's the way in which we are using them.
........
  r3876 | crush_tmw | 2008-02-11 20:00:43 +0100 (Mon, 11 Feb 2008) | 1 line

  Added music and overlay to snake dungeon.
........
  r3883 | crush_tmw | 2008-02-12 15:00:22 +0100 (Tue, 12 Feb 2008) | 1 line

  Particle emitters are now activated after the parent particle has moved instead of before (small change which allows a little trick to create polar emitters)
........
  r3887 | umperio | 2008-02-12 20:49:37 +0100 (Tue, 12 Feb 2008) | 1 line

  Made pathfinding not halt on collision destination tile, made moving around with mouse smoother. Added possibility to pass through players with key controls.
........
  r3888 | crush_tmw | 2008-02-13 21:49:55 +0100 (Wed, 13 Feb 2008) | 1 line

  Added new headgears by Black Don (thanks to QOAL for testing and implementation)
........
  r3891 | umperio | 2008-02-18 09:52:06 +0100 (Mon, 18 Feb 2008) | 1 line

  Fixed image name.
........
  r3892 | umperio | 2008-02-18 11:00:45 +0100 (Mon, 18 Feb 2008) | 1 line

  Forgot a %s
........
  r3899 | crush_tmw | 2008-02-19 14:23:34 +0100 (Tue, 19 Feb 2008) | 1 line

  Map fixes at snake dungeon by QOAL
........
  r3900 | crush_tmw | 2008-02-19 14:32:24 +0100 (Tue, 19 Feb 2008) | 1 line

  More map fixes at snake dungeon by QOAL
........
---
 ChangeLog                 | 43 +++++++++++++++++++++++++++++++---
 src/being.cpp             |  6 +++++
 src/game.h                |  2 +-
 src/gui/trade.h           |  1 -
 src/gui/viewport.cpp      | 59 ++++++++++++++++++++++-------------------------
 src/gui/viewport.h        | 18 ++++++++++-----
 src/localplayer.h         |  4 +++-
 src/map.h                 | 19 +++++++--------
 src/net/playerhandler.cpp | 15 +++++++++---
 src/particle.cpp          | 41 ++++++++++++++++----------------
 src/player.h              | 18 ++++++++-------
 src/sound.cpp             |  3 ++-
 src/utils/strprintf.cpp   |  2 +-
 13 files changed, 146 insertions(+), 85 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index 755ad5d9..696024f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -134,19 +134,53 @@
 	* src/gui/gui.cpp: Showing a visible error message to the user when
 	the font file can't be found.
 	
+2008-02-19  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/maps/new_22-1.tmx: Map fixes at snake dungeon by QOAL.
+
 2008-02-18  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* INSTALL: Added notes about installing gettext and cvs and updated
 	required ENet version to 1.2.
 
+2008-02-18  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* data/graphics/sprites/hairstyle7-female.xml, src/sound.cpp,
+	src/utils/strprintf.cpp, tmw.cbp: Fixed image name.
+
 2008-02-13  Philipp Sehmisch  <tmw@crushnet.org>
 
+	* data/equipment.xml, data/items.xml,
+	data/graphics/items/armor-head-crusaderhelm.png,
+	data/graphics/items/armor-head-infantryhelm.png,
+	data/graphics/items/armor-head-knighthelm.png,
+	data/graphics/items/armor-head-warlordhelm.png,
+	data/graphics/sprites/head-crusaderhelm.png,
+	data/graphics/sprites/head-infantryhelm.png,
+	data/graphics/sprites/head-knighthelm.png,
+	data/graphics/sprites/head-warlordhelm.png,
+	data/graphics/sprites/head-crusaderhelm.xml,
+	data/graphics/sprites/head-infantryhelm.xml,
+	data/graphics/sprites/head-knighthelm.xml,
+	data/graphics/sprites/head-warlordhelm.xml: Added new headgears by
+	Black Don (thanks to QOAL for testing and implementation)
 	* data/monsters.xml: Converted movement speed to pixels per second.
 
 2008-02-12  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* data/monsters.xml: Added size and speed to the first four monsters.
 
+2008-02-12  Dennis Friis  <peavey@placid.dk>
+
+	* src/localplayer.cpp, src/map.cpp, src/gui/viewport.cpp, src/being.cpp
+	src/map.h: Made pathfinding not halt on collision destination tile,
+	made moving around with mouse smoother. Added possibility to pass
+	through players with key controls.
+
+2008-02-11  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/maps/new_22-1.tmx: Added music and overlay to snake dungeon.
+
 2008-02-10  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* data/maps/new_23-1.tmx: Added Dimonds Cove outdoor map by MerlinX420.
@@ -160,9 +194,6 @@
 2008-02-07  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/gui/skill.cpp: Fixed unix compilation problem.
-
-2008-02-07  Philipp Sehmisch  <tmw@crushnet.org>
-
 	* data/monsters.xml: Added different behaviors to maggots,
 	scorpions, red scorpions and green slimes.
 
@@ -196,6 +227,9 @@
 	* src/gui/truetypefont.cpp: Image alpha should also be set to 1, in
 	case it was changed before.
 	* src/gui/truetypefont.h: Corrected documentation.
+	* src/game.h, src/localplayer.h: Fixed a GCC 4.3 compile error and
+	constified the usage of auto_ptr, since that's the way in which we are
+	using them.
 
 2008-01-26  Philipp Sehmisch  <tmw@crushnet.org>
 
@@ -280,6 +314,9 @@
 	* src/game.cpp, src/beingmanager.cpp, src/beingmanager.h,
 	src/keyboardconfig.cpp, src/keyboardconfig.h: Added a key for targeting
 	the nearest player character based on patches by Trinexx.
+	* src/gui/viewport.cpp: Added config options to set the scroll center.
+	* src/gui/viewport.h, src/net/playerhandler.cpp: Retained scroll
+	offset during map change for smoother map transitions.
 
 2007-12-28  Philipp Sehmisch  <tmw@crushnet.org>
 
diff --git a/src/being.cpp b/src/being.cpp
index b187d28a..5a877d85 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -500,6 +500,12 @@ Being::nextStep()
 
     setDirection(dir);
 
+    if (!mMap->getWalk(node.x / 32, node.y / 32))
+    {
+        setAction(STAND);
+        return;
+    }
+
     setPositionInPixels(node.x, node.y);
     setAction(WALK);
     mWalkTime += mStepTime / 10;
diff --git a/src/game.h b/src/game.h
index 3b27660a..28feae44 100644
--- a/src/game.h
+++ b/src/game.h
@@ -59,7 +59,7 @@ class Game : public ConfigListener
         /** The minimum frame time (used for frame limiting). */
         int mMinFrameTime;
 
-        typedef std::auto_ptr<MessageHandler> MessageHandlerPtr;
+        typedef const std::auto_ptr<MessageHandler> MessageHandlerPtr;
         MessageHandlerPtr mBeingHandler;
         MessageHandlerPtr mBuySellHandler;
         MessageHandlerPtr mChatHandler;
diff --git a/src/gui/trade.h b/src/gui/trade.h
index b5b0db6a..cd943a41 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -92,7 +92,6 @@ class TradeWindow : public Window, gcn::ActionListener, SelectionListener
         void action(const gcn::ActionEvent &event);
 
     private:
-
         enum Status
         {
             PREPARING, /**< Players are adding items. */
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index d6c49fb2..7c68b577 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -52,8 +52,6 @@ Viewport::Viewport():
     mMap(0),
     mViewX(0.0f),
     mViewY(0.0f),
-    mCameraX(0),
-    mCameraY(0),
     mShowDebugPath(false),
     mPlayerFollowMouse(false)
 {
@@ -62,6 +60,8 @@ Viewport::Viewport():
 
     mScrollLaziness = (int) config.getValue("ScrollLaziness", 32);
     mScrollRadius = (int) config.getValue("ScrollRadius", 32);
+    mScrollCenterOffsetX = (int) config.getValue("ScrollCenterOffsetX", 0);
+    mScrollCenterOffsetY = (int) config.getValue("ScrollCenterOffsetY", 0);
 
     config.addListener("ScrollLaziness", this);
     config.addListener("ScrollRadius", this);
@@ -150,8 +150,8 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     }
 
     // Calculate viewpoint
-    int midTileX = graphics->getWidth() / 2;
-    int midTileY = graphics->getHeight() / 2;
+    int midTileX = (graphics->getWidth() + mScrollCenterOffsetX) / 2;
+    int midTileY = (graphics->getHeight() + mScrollCenterOffsetX) / 2;
 
     int player_x = player_node->mX - midTileX + player_node->getXOffset();
     int player_y = player_node->mY - midTileY + player_node->getYOffset();
@@ -211,19 +211,16 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
         }
     }
 
-    mCameraX = (int) mViewX;
-    mCameraY = (int) mViewY;
-
     // Draw tiles and sprites
     if (mMap)
     {
-        mMap->draw(graphics, mCameraX, mCameraY, 0);
+        mMap->draw(graphics, (int) mViewX, (int) mViewY, 0);
         drawTargetCursor(graphics);
-        mMap->draw(graphics, mCameraX, mCameraY, 1);
-        mMap->draw(graphics, mCameraX, mCameraY, 2);
+        mMap->draw(graphics, (int) mViewX, (int) mViewY, 1);
+        mMap->draw(graphics, (int) mViewX, (int) mViewY, 2);
         if (mShowDebugPath)
         {
-            mMap->drawCollision(graphics, mCameraX, mCameraY);
+            mMap->drawCollision(graphics, (int) mViewX, (int) mViewY);
         }
         mMap->drawOverlay(graphics, mViewX, mViewY,
                 (int) config.getValue("OverlayDetail", 2));
@@ -239,9 +236,9 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     Beings &beings = beingManager->getAll();
     for (BeingIterator i = beings.begin(); i != beings.end(); i++)
     {
-        (*i)->drawSpeech(graphics, -mCameraX, -mCameraY);
-        (*i)->drawName(graphics, -mCameraX, -mCameraY);
-        (*i)->drawEmotion(graphics, -mCameraX, -mCameraY);
+        (*i)->drawSpeech(graphics, -(int) mViewX, -(int) mViewY);
+        (*i)->drawName(graphics, -(int) mViewX, -(int) mViewY);
+        (*i)->drawEmotion(graphics, -(int) mViewX, -(int) mViewY);
     }
 
     // Draw contained widgets
@@ -262,8 +259,8 @@ Viewport::logic()
     if (mPlayerFollowMouse && button & SDL_BUTTON(1) &&
             mWalkTime != player_node->mWalkTime)
     {
-        player_node->setDestination(mouseX + mCameraX,
-                                    mouseY + mCameraY);
+        player_node->setDestination(mouseX + (int) mViewX,
+                                    mouseY + (int) mViewY);
         mWalkTime = player_node->mWalkTime;
     }
 
@@ -301,9 +298,9 @@ Viewport::drawTargetCursor(Graphics *graphics)
 
         // Draw the target cursor at the correct position
         int posX = target->getPixelX() + 16 -
-                   targetCursor->getWidth() / 2 - mCameraX;
+                   targetCursor->getWidth() / 2 - (int) mViewX;
         int posY = target->getPixelY() + 16 -
-                   targetCursor->getHeight() / 2 - mCameraY;
+                   targetCursor->getHeight() / 2 - (int) mViewY;
 
         graphics->drawImage(targetCursor, posX, posY);
     }
@@ -320,8 +317,8 @@ Viewport::drawTargetName(Graphics *graphics)
         graphics->setColor(gcn::Color(255, 32, 32));
 
         const MonsterInfo &mi = static_cast<Monster*>(target)->getInfo();
-        int posX = target->getPixelX() + 16 - mCameraX;
-        int posY = target->getPixelY() + 16 - target->getHeight() - mCameraY;
+        int posX = target->getPixelX() + 16 - (int) mViewX;
+        int posY = target->getPixelY() + 16 - target->getHeight() - (int) mViewY;
 
         graphics->drawText(mi.getName(), posX, posY, gcn::Graphics::CENTER);
     }
@@ -334,8 +331,8 @@ Viewport::drawDebugPath(Graphics *graphics)
     int mouseX, mouseY;
     SDL_GetMouseState(&mouseX, &mouseY);
 
-    int mouseTileX = (mouseX + mCameraX) / 32;
-    int mouseTileY = (mouseY + mCameraY) / 32;
+    const int mouseTileX = (mouseX + (int) mViewX) / 32;
+    const int mouseTileY = (mouseY + (int) mViewY) / 32;
 
     Path debugPath = mMap->findPath(
             player_node->mX / 32, player_node->mY / 32,
@@ -344,8 +341,8 @@ Viewport::drawDebugPath(Graphics *graphics)
     graphics->setColor(gcn::Color(255, 0, 0));
     for (PathIterator i = debugPath.begin(); i != debugPath.end(); i++)
     {
-        int squareX = i->x * 32 - mCameraX + 12;
-        int squareY = i->y * 32 - mCameraY + 12;
+        int squareX = i->x * 32 - (int) mViewX + 12;
+        int squareY = i->y * 32 - (int) mViewY + 12;
 
         graphics->fillRectangle(gcn::Rectangle(squareX, squareY, 8, 8));
         graphics->drawText(
@@ -363,8 +360,8 @@ Viewport::mousePressed(gcn::MouseEvent &event)
 
     mPlayerFollowMouse = false;
 
-    int tilex = (event.getX() + mCameraX) / 32;
-    int tiley = (event.getY() + mCameraY) / 32;
+    const int tilex = (event.getX() + (int) mViewX) / 32;
+    const int tiley = (event.getY() + (int) mViewY) / 32;
 
     // Right click might open a popup
     if (event.getButton() == gcn::MouseEvent::RIGHT)
@@ -403,14 +400,14 @@ Viewport::mousePressed(gcn::MouseEvent &event)
                 player_node->pickUp(item);
         }
         // Just walk around
-        else if (mMap->getWalk(tilex, tiley, player_node->getWalkMask()))
+        else
         {
             // XXX XXX XXX REALLY UGLY!
             Uint8 *keys = SDL_GetKeyState(NULL);
             if (!(keys[SDLK_LSHIFT] || keys[SDLK_RSHIFT]))
             {
-                player_node->setDestination(event.getX() + mCameraX,
-                                            event.getY() + mCameraY);
+                player_node->setDestination(event.getX() + (int) mViewX,
+                                            event.getY() + (int) mViewY);
             }
             mPlayerFollowMouse = true;
         }
@@ -437,8 +434,8 @@ Viewport::mouseDragged(gcn::MouseEvent &event)
 
     if (mPlayerFollowMouse && mWalkTime == player_node->mWalkTime)
     {
-        player_node->setDestination(event.getX() + mCameraX,
-                                    event.getY() + mCameraY);
+        player_node->setDestination(event.getX() + (int) mViewX,
+                                    event.getY() + (int) mViewY);
     }
 }
 
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 1547c0a4..c8f7a9ec 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -117,16 +117,22 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         optionChanged(const std::string &name);
 
         /**
-         * Returns camera x offset in tiles.
+         * Returns camera x offset in pixels.
          */
         int
-        getCameraX() { return mCameraX; }
+        getCameraX() const { return (int) mViewX; }
 
         /**
-         * Returns camera y offset in tiles.
+         * Returns camera y offset in pixels.
          */
         int
-        getCameraY() { return mCameraY; }
+        getCameraY() const { return (int) mViewY; }
+
+        /**
+         * Changes viewpoint by relative pixel coordinates.
+         */
+        void
+        scrollBy(float x, float y) { mViewX += x; mViewY += y; }
 
     private:
         /**
@@ -156,10 +162,10 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
 
         int mScrollRadius;
         int mScrollLaziness;
+        int mScrollCenterOffsetX;
+        int mScrollCenterOffsetY;
         float mViewX;              /**< Current viewpoint in pixels. */
         float mViewY;              /**< Current viewpoint in pixels. */
-        int mCameraX;              /**< Current viewpoint in tiles. */
-        int mCameraY;              /**< Current viewpoint in tiles. */
         bool mShowDebugPath;       /**< Show a path from player to pointer. */
 
         /** Images of in range target cursor. */
diff --git a/src/localplayer.h b/src/localplayer.h
index 9bad9436..f325e19a 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -26,6 +26,8 @@
 
 #include "player.h"
 
+#include <memory>
+
 // TODO move into some sane place...
 #define MAX_SLOT 2
 
@@ -336,7 +338,7 @@ class LocalPlayer : public Player
         float mLastAttackTime; /**< Used to synchronize the charge dialog */
 
         Inventory *mInventory;
-        std::auto_ptr<Equipment> mEquipment;
+        const std::auto_ptr<Equipment> mEquipment;
 
     protected:
         void walk(unsigned char dir);
diff --git a/src/map.h b/src/map.h
index 3a3945d1..126cb70b 100644
--- a/src/map.h
+++ b/src/map.h
@@ -57,13 +57,13 @@ struct MetaTile
     MetaTile():whichList(0), blockmask(0) {};
 
     // Pathfinding members
-    int Fcost;              /**< Estimation of total path cost */
-    int Gcost;              /**< Cost from start to this location */
-    int Hcost;              /**< Estimated cost to goal */
-    int whichList;          /**< No list, open list or closed list */
-    int parentX;            /**< X coordinate of parent tile */
-    int parentY;            /**< Y coordinate of parent tile */
-    unsigned char blockmask;          /**< Can beings walk on this tile */
+    int Fcost;               /**< Estimation of total path cost */
+    int Gcost;               /**< Cost from start to this location */
+    int Hcost;               /**< Estimated cost to goal */
+    int whichList;           /**< No list, open list or closed list */
+    int parentX;             /**< X coordinate of parent tile */
+    int parentY;             /**< Y coordinate of parent tile */
+    unsigned char blockmask; /**< Blocking properties of this tile */
 };
 
 /**
@@ -153,9 +153,10 @@ class Map : public Properties
         void freeTile(int x, int y, BlockType type);
 
         /**
-         * Gets walkability for a tile with a blocking bitmask
+         * Gets walkability for a tile with a blocking bitmask. When called
+         * without walkmask, only blocks against colliding tiles.
          */
-        bool getWalk(int x, int y, char walkmask) const;
+        bool getWalk(int x, int y, char walkmask = BLOCKMASK_WALL) const;
 
         /**
          * Returns the width of this map.
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index b908eae5..ea581095 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -34,11 +34,13 @@
 
 #include "../gui/buy.h"
 #include "../gui/chat.h"
+#include "../gui/gui.h"
 #include "../gui/npclistdialog.h"
 #include "../gui/npc_text.h"
 #include "../gui/ok_dialog.h"
 #include "../gui/sell.h"
 #include "../gui/skill.h"
+#include "../gui/viewport.h"
 
 // TODO Move somewhere else
 OkDialog *weightNotice = NULL;
@@ -289,9 +291,9 @@ void PlayerHandler::handleMessage(MessageIn &msg)
 void
 PlayerHandler::handleMapChangeMessage(MessageIn &msg)
 {
-    std::string mapName = msg.readString();
-    unsigned short x = msg.readInt16();
-    unsigned short y = msg.readInt16();
+    const std::string mapName = msg.readString();
+    const unsigned short x = msg.readInt16();
+    const unsigned short y = msg.readInt16();
 
     logger->log("Changing map to %s (%d, %d)", mapName.c_str(), x, y);
 
@@ -300,6 +302,13 @@ PlayerHandler::handleMapChangeMessage(MessageIn &msg)
 
     current_npc = 0;
 
+    const float scrollOffsetX = x - player_node->mX;
+    const float scrollOffsetY = y - player_node->mY;
+
     player_node->setAction(Being::STAND);
     player_node->setPositionInPixels(x, y);
+
+    logger->log("Adjust scrolling by %d,%d", (int) scrollOffsetX,
+                                             (int) scrollOffsetY);
+    viewport->scrollBy(scrollOffsetX, scrollOffsetY);
 }
diff --git a/src/particle.cpp b/src/particle.cpp
index 11d91b47..dcb2eed3 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -96,26 +96,7 @@ Particle::update()
 
     if (mAlive)
     {
-        // Update child emitters
-        if (mLifetimePast%Particle::emitterSkip == 0)
-        {
-            for (   EmitterIterator e = mChildEmitters.begin();
-                    e != mChildEmitters.end();
-                    e++
-                )
-            {
-                Particles newParticles = (*e)->createParticles();
-                for (   ParticleIterator p = newParticles.begin();
-                        p != newParticles.end();
-                        p++
-                    )
-                {
-                    (*p)->moveBy(mPos.x, mPos.y, mPos.z);
-                    mChildParticles.push_back (*p);
-                }
-            }
-        }
-
+        //calculate particle movement
         if (mMomentum != 1.0f)
         {
             mVelocity *= mMomentum;
@@ -187,6 +168,26 @@ Particle::update()
                 mAlive = false;
             }
         }
+
+        // Update child emitters
+        if (mLifetimePast%Particle::emitterSkip == 0)
+        {
+            for (   EmitterIterator e = mChildEmitters.begin();
+                    e != mChildEmitters.end();
+                    e++
+                )
+            {
+                Particles newParticles = (*e)->createParticles();
+                for (   ParticleIterator p = newParticles.begin();
+                        p != newParticles.end();
+                        p++
+                    )
+                {
+                    (*p)->moveBy(mPos.x, mPos.y, mPos.z);
+                    mChildParticles.push_back (*p);
+                }
+            }
+        }
     }
 
     // Update child particles
diff --git a/src/player.h b/src/player.h
index 76d6b460..4949783e 100644
--- a/src/player.h
+++ b/src/player.h
@@ -101,34 +101,36 @@ class Player : public Being
         void removeGuild(int id);
 
         /**
-         * Returns a pointer to the specified guild
+         * Returns a pointer to the specified guild.
          */
         Guild* getGuild(const std::string &guildName);
 
         /**
-         * Returns a pointer to the guild with matching id
+         * Returns a pointer to the guild with matching id.
          */
         Guild* getGuild(int id);
 
         /**
-         * Get number of guilds the player belongs to
+         * Get number of guilds the player belongs to.
          */
         short getNumberOfGuilds();
 
         /**
-         * Gets the way the character is blocked by other objects
+         * Gets the way the character is blocked by other objects.
          */
         virtual unsigned char getWalkMask() const
-        { return 0x82; } // blocked by walls and monsters ( bin 1000 0010)
+        { return 0x82; } // blocked by walls and monsters (bin 1000 0010)
 
     protected:
-        // Character guild information
-        std::map<int, Guild*> mGuilds;
         /**
-         * Gets the way the monster blocks pathfinding for other objects
+         * Gets the way the monster blocks pathfinding for other objects.
          */
         virtual Map::BlockType getBlockType() const
         { return Map::BLOCKTYPE_CHARACTER; }
+
+        // Character guild information
+        std::map<int, Guild*> mGuilds;
+
     private:
         Gender mGender;
         Uint8 mHairStyle;
diff --git a/src/sound.cpp b/src/sound.cpp
index 063195ae..0a20d3f2 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -145,7 +145,8 @@ void Sound::playMusic(const std::string &filename, int loop)
         Mix_PlayMusic(mMusic, loop);
     }
     else {
-        logger->log("Sound::startMusic() Warning: error loading file.");
+        logger->log("Sound::startMusic() Warning: error loading file: %s",
+                Mix_GetError());
     }
 }
 
diff --git a/src/utils/strprintf.cpp b/src/utils/strprintf.cpp
index 27dd5462..26313fe9 100644
--- a/src/utils/strprintf.cpp
+++ b/src/utils/strprintf.cpp
@@ -22,7 +22,7 @@
  */
 
 #ifndef _TMW_UTILS_TOSTRING_H
-#define _TMW_UTISL_TOSTRING_H
+#define _TMW_UTILS_TOSTRING_H
 
 #include <cstdarg>
 
-- 
cgit v1.2.3-70-g09d2


From 720f716ba8d98a85266b8e81a534737c6fcdcf5f Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 8 Apr 2008 18:43:44 +0000
Subject: Implemented support for an arbitrary number of map layers. The only
 layer requirement for map layers are now that the fringe layer is called
 "Fringe" and that the collision layer is called "Collision".

---
 ChangeLog                   |  10 +++
 src/gui/viewport.cpp        |  24 ++---
 src/map.cpp                 | 208 +++++++++++++++++++++++---------------------
 src/map.h                   | 110 +++++++++++++++--------
 src/resources/imageset.cpp  |   2 +-
 src/resources/imageset.h    |  14 ++-
 src/resources/mapreader.cpp | 151 ++++++++++++++++++--------------
 src/resources/mapreader.h   |   4 +-
 src/tileset.h               |   3 +-
 9 files changed, 298 insertions(+), 228 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index 6acb5e22..597a5c0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-04-08  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/map.cpp, src/gui/viewport.cpp, src/tileset.h, src/map.h,
+	src/resources/imageset.cpp, src/resources/mapreader.cpp,
+	src/resources/imageset.h, src/resources/mapreader.h,
+	data/maps/new_3-1.tmx, data/maps/new_1-1.tmx: Implemented support for
+	an arbitrary number of map layers. The only layer requirement for map
+	layers are now that the fringe layer is called "Fringe" and that the
+	collision layer is called "Collision".
+
 2008-04-07  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/particle.cpp, src/utils/xml.cpp, src/utils/xml.h,
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 7c68b577..33449659 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -48,6 +48,8 @@
 
 #include <cassert>
 
+extern volatile int tick_time;
+
 Viewport::Viewport():
     mMap(0),
     mViewX(0.0f),
@@ -214,25 +216,17 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     // Draw tiles and sprites
     if (mMap)
     {
-        mMap->draw(graphics, (int) mViewX, (int) mViewY, 0);
-        drawTargetCursor(graphics);
-        mMap->draw(graphics, (int) mViewX, (int) mViewY, 1);
-        mMap->draw(graphics, (int) mViewX, (int) mViewY, 2);
-        if (mShowDebugPath)
-        {
-            mMap->drawCollision(graphics, (int) mViewX, (int) mViewY);
-        }
-        mMap->drawOverlay(graphics, mViewX, mViewY,
-                (int) config.getValue("OverlayDetail", 2));
+        mMap->draw(graphics, (int) mViewX, (int) mViewY);
+        drawTargetCursor(graphics); // TODO: Draw the cursor with the sprite
         drawTargetName(graphics);
-    }
 
-    if (mShowDebugPath && mMap)
-    {
-        drawDebugPath(graphics);
+        if (mShowDebugPath) {
+            mMap->drawCollision(graphics, (int) mViewX, (int) mViewY);
+            drawDebugPath(graphics);
+        }
     }
 
-    // Draw player nickname, speech, and emotion sprite as needed
+    // Draw player names, speech, and emotion sprite as needed
     Beings &beings = beingManager->getAll();
     for (BeingIterator i = beings.begin(); i != beings.end(); i++)
     {
diff --git a/src/map.cpp b/src/map.cpp
index c7d1d3b8..28d07022 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -28,6 +28,7 @@
 #include <cassert>
 
 #include "beingmanager.h"
+#include "configuration.h"
 #include "game.h"
 #include "graphics.h"
 #include "particle.h"
@@ -41,6 +42,8 @@
 #include "utils/dtor.h"
 #include "utils/tostring.h"
 
+extern volatile int tick_time;
+
 /**
  * A location on a tile map. Used for pathfinding, open list.
  */
@@ -63,6 +66,80 @@ struct Location
     MetaTile *tile;
 };
 
+MapLayer::MapLayer(int x, int y, int width, int height, bool isFringeLayer):
+    mX(x), mY(y),
+    mWidth(width), mHeight(height),
+    mIsFringeLayer(isFringeLayer)
+{
+    const int size = mWidth * mHeight;
+    mTiles = new Image*[size];
+    std::fill_n(mTiles, size, (Image*) 0);
+}
+
+MapLayer::~MapLayer()
+{
+    delete[] mTiles;
+}
+
+void MapLayer::setTile(int x, int y, Image *img)
+{
+    mTiles[x + y * mWidth] = img;
+}
+
+Image* MapLayer::getTile(int x, int y) const
+{
+    return mTiles[x + y * mWidth];
+}
+
+void MapLayer::draw(Graphics *graphics,
+                    int startX, int startY,
+                    int endX, int endY,
+                    int scrollX, int scrollY,
+                    const Sprites &sprites) const
+{
+    startX -= mX;
+    startY -= mY;
+    endX -= mX;
+    endY -= mY;
+
+    if (startX < 0) startX = 0;
+    if (startY < 0) startY = 0;
+    if (endX > mWidth) endX = mWidth;
+    if (endY > mHeight) endY = mHeight;
+
+    Sprites::const_iterator si = sprites.begin();
+
+    for (int y = startY; y < endY; y++)
+    {
+        // If drawing the fringe layer, make sure all sprites above this row of
+        // tiles have been drawn
+        if (mIsFringeLayer) {
+            while (si != sprites.end() && (*si)->getPixelY() <= y * 32 - 32) {
+                (*si)->draw(graphics, -scrollX, -scrollY);
+                si++;
+            }
+        }
+
+        for (int x = startX; x < endX; x++)
+        {
+            Image *img = getTile(x, y);
+            if (img) {
+                const int px = (x + mX) * 32 - scrollX;
+                const int py = (y + mY) * 32 - scrollY + 32 - img->getHeight();
+                graphics->drawImage(img, px, py);
+            }
+        }
+    }
+
+    // Draw any remaining sprites
+    if (mIsFringeLayer) {
+        while (si != sprites.end()) {
+            (*si)->draw(graphics, -scrollX, -scrollY);
+            si++;
+        }
+    }
+}
+
 Map::Map(int width, int height, int tileWidth, int tileHeight):
     mWidth(width), mHeight(height),
     mTileWidth(tileWidth), mTileHeight(tileHeight),
@@ -70,31 +147,26 @@ Map::Map(int width, int height, int tileWidth, int tileHeight):
     mOnClosedList(1), mOnOpenList(2),
     mLastScrollX(0.0f), mLastScrollY(0.0f)
 {
-    int size = mWidth * mHeight;
+    const int size = mWidth * mHeight;
 
     mMetaTiles = new MetaTile[size];
-    for (int i=0; i < NB_BLOCKTYPES; i++)
+    for (int i = 0; i < NB_BLOCKTYPES; i++)
     {
         mOccupation[i] = new int[size];
         memset(mOccupation[i], 0, size * sizeof(int));
     }
-    mTiles = new Image*[size * 3];
-    std::fill_n(mTiles, size * 3, (Image*)0);
 }
 
 Map::~Map()
 {
-    // clean up map data
+    // delete metadata, layers, tilesets and overlays
     delete[] mMetaTiles;
-    delete[] mTiles;
     for (int i=0; i < NB_BLOCKTYPES; i++)
     {
         delete[] mOccupation[i];
     }
-    // clean up tilesets
+    for_each(mLayers.begin(), mLayers.end(), make_dtor(mLayers));
     for_each(mTilesets.begin(), mTilesets.end(), make_dtor(mTilesets));
-    mTilesets.clear();
-    // clean up overlays
     for_each(mOverlays.begin(), mOverlays.end(), make_dtor(mOverlays));
 }
 
@@ -109,9 +181,9 @@ void Map::initializeOverlays()
         const std::string name = "overlay" + toString(i);
 
         Image *img = resman->getImage(getProperty(name + "image"));
-        float speedX = getFloatProperty(name + "scrollX");
-        float speedY = getFloatProperty(name + "scrollY");
-        float parallax = getFloatProperty(name + "parallax");
+        const float speedX = getFloatProperty(name + "scrollX");
+        const float speedY = getFloatProperty(name + "scrollY");
+        const float parallax = getFloatProperty(name + "parallax");
 
         if (img)
         {
@@ -124,6 +196,11 @@ void Map::initializeOverlays()
     }
 }
 
+void Map::addLayer(MapLayer *layer)
+{
+    mLayers.push_back(layer);
+}
+
 void Map::addTileset(Tileset *tileset)
 {
     mTilesets.push_back(tileset);
@@ -137,63 +214,31 @@ bool spriteCompare(const Sprite *a, const Sprite *b)
     return a->getPixelY() < b->getPixelY();
 }
 
-void Map::draw(Graphics *graphics, int scrollX, int scrollY, int layer)
+void Map::draw(Graphics *graphics, int scrollX, int scrollY)
 {
     int endPixelY = graphics->getHeight() + scrollY + mTileHeight - 1;
 
-    // If drawing the fringe layer, make sure sprites are sorted
-    SpriteIterator si;
-    if (layer == 1)
-    {
-        mSprites.sort(spriteCompare);
-        si = mSprites.begin();
-        endPixelY += mMaxTileHeight - mTileHeight;
-    }
+    // TODO: Do this per-layer
+    endPixelY += mMaxTileHeight - mTileHeight;
 
     int startX = scrollX / mTileWidth;
     int startY = scrollY / mTileHeight;
     int endX = (graphics->getWidth() + scrollX + mTileWidth - 1) / mTileWidth;
     int endY = endPixelY / mTileHeight;
 
-    if (startX < 0) startX = 0;
-    if (startY < 0) startY = 0;
-    if (endX > mWidth) endX = mWidth;
-    if (endY > mHeight) endY = mHeight;
+    // Make sure sprites are sorted
+    mSprites.sort(spriteCompare);
 
-    for (int y = startY; y < endY; y++)
-    {
-        // If drawing the fringe layer, make sure all sprites above this row of
-        // tiles have been drawn
-        if (layer == 1)
-        {
-            while (si != mSprites.end() && (*si)->getPixelY() <= y * 32 - 32)
-            {
-                (*si)->draw(graphics, -scrollX, -scrollY);
-                si++;
-            }
-        }
-
-        for (int x = startX; x < endX; x++)
-        {
-            Image *img = getTile(x, y, layer);
-            if (img) {
-                graphics->drawImage(img,
-                        x * mTileWidth - scrollX,
-                        y * mTileHeight - scrollY +
-                            mTileHeight - img->getHeight());
-            }
-        }
+    Layers::const_iterator layeri = mLayers.begin();
+    for (; layeri != mLayers.end(); ++layeri) {
+        (*layeri)->draw(graphics,
+                        startX, startY, endX, endY,
+                        scrollX, scrollY,
+                        mSprites);
     }
 
-    // Draw any remaining sprites
-    if (layer == 1)
-    {
-        while (si != mSprites.end())
-        {
-            (*si)->draw(graphics, -scrollX, -scrollY);
-            si++;
-        }
-    }
+    drawOverlay(graphics, scrollX, scrollY,
+            (int) config.getValue("OverlayDetail", 2));
 }
 
 void Map::drawCollision(Graphics *graphics, int scrollX, int scrollY)
@@ -289,26 +334,10 @@ void Map::drawOverlay(Graphics *graphics,
     };
 }
 
-void Map::setTileWithGid(int x, int y, int layer, int gid)
-{
-    if (layer == 3)
-    {
-        Tileset *set = getTilesetWithGid(gid);
-        if (set && (gid - set->getFirstGid() != 0))
-        {
-            blockTile(x, y, BLOCKTYPE_WALL);
-        }
-    }
-    else if (layer < 3)
-    {
-        setTile(x, y, layer, getTileWithGid(gid));
-    }
-}
-
 class ContainsGidFunctor
 {
     public:
-        bool operator() (Tileset* set)
+        bool operator() (const Tileset* set) const
         {
             return (set->getFirstGid() <= gid &&
                     gid - set->getFirstGid() < (int)set->size());
@@ -326,17 +355,6 @@ Tileset* Map::getTilesetWithGid(int gid) const
     return (i == mTilesets.end()) ? NULL : *i;
 }
 
-Image* Map::getTileWithGid(int gid) const
-{
-    Tileset *set = getTilesetWithGid(gid);
-
-    if (set) {
-        return set->get(gid - set->getFirstGid());
-    }
-
-    return NULL;
-}
-
 void Map::blockTile(int x, int y, BlockType type)
 {
     if (type == BLOCKTYPE_NONE || x < 0 || y < 0 || x >= mWidth || y >= mHeight)
@@ -412,16 +430,6 @@ bool Map::contains(int x, int y) const
     return x >= 0 && y >= 0 && x < mWidth && y < mHeight;
 }
 
-void Map::setTile(int x, int y, int layer, Image *img)
-{
-    mTiles[x + y * mWidth + layer * (mWidth * mHeight)] = img;
-}
-
-Image* Map::getTile(int x, int y, int layer) const
-{
-    return mTiles[x + y * mWidth + layer * (mWidth * mHeight)];
-}
-
 MetaTile* Map::getMetaTile(int x, int y) const
 {
     return &mMetaTiles[x + y * mWidth];
@@ -484,8 +492,8 @@ Path Map::findPath(int startX, int startY, int destX, int destY, unsigned char w
             for (int dx = -1; dx <= 1; dx++)
             {
                 // Calculate location of tile to check
-                int x = curr.x + dx;
-                int y = curr.y + dy;
+                const int x = curr.x + dx;
+                const int y = curr.y + dy;
 
                 // Skip if if we're checking the same tile we're leaving from,
                 // or if the new location falls outside of the map boundaries
@@ -559,7 +567,7 @@ Path Map::findPath(int startX, int startY, int destX, int destY, unsigned char w
 
                     // Update Gcost and Fcost of new tile
                     newTile->Gcost = Gcost;
-                    newTile->Fcost = newTile->Gcost + newTile->Hcost;
+                    newTile->Fcost = Gcost + newTile->Hcost;
 
                     if (x != destX || y != destY) {
                         // Add this tile to the open list
@@ -576,7 +584,7 @@ Path Map::findPath(int startX, int startY, int destX, int destY, unsigned char w
                     // Found a shorter route.
                     // Update Gcost and Fcost of the new tile
                     newTile->Gcost = Gcost;
-                    newTile->Fcost = newTile->Gcost + newTile->Hcost;
+                    newTile->Fcost = Gcost + newTile->Hcost;
 
                     // Set the current tile as the parent of the new tile
                     newTile->parentX = curr.x;
@@ -617,7 +625,7 @@ Path Map::findPath(int startX, int startY, int destX, int destY, unsigned char w
     return path;
 }
 
-void Map::addParticleEffect (std::string effectFile, int x, int y)
+void Map::addParticleEffect(const std::string &effectFile, int x, int y)
 {
     ParticleEffectData newEffect;
     newEffect.file = effectFile;
diff --git a/src/map.h b/src/map.h
index 126cb70b..31c6be00 100644
--- a/src/map.h
+++ b/src/map.h
@@ -32,6 +32,7 @@
 class AmbientOverlay;
 class Graphics;
 class Image;
+class MapLayer;
 class Particle;
 class Sprite;
 class Tileset;
@@ -41,8 +42,7 @@ struct PATH_NODE;
 typedef std::vector<Tileset*> Tilesets;
 typedef std::list<Sprite*> Sprites;
 typedef Sprites::iterator SpriteIterator;
-
-extern volatile int tick_time;
+typedef std::vector<MapLayer*> Layers;
 
 /**
  * A meta tile stores additional information about a location on a tile map.
@@ -66,6 +66,56 @@ struct MetaTile
     unsigned char blockmask; /**< Blocking properties of this tile */
 };
 
+/**
+ * A map layer. Stores a grid of tiles and their offset, and implements layer
+ * rendering.
+ */
+class MapLayer
+{
+    public:
+        /**
+         * Constructor, taking layer origin, size and whether this layer is the
+         * fringe layer. The fringe layer is the layer that draws the sprites.
+         * There can be only one fringe layer per map.
+         */
+        MapLayer(int x, int y, int width, int height, bool isFringeLayer);
+
+        /**
+         * Destructor.
+         */
+        ~MapLayer();
+
+        /**
+         * Set tile image, with x and y in layer coordinates.
+         */
+        void setTile(int x, int y, Image *img);
+
+        /**
+         * Get tile image, with x and y in layer coordinates.
+         */
+        Image *getTile(int x, int y) const;
+
+        /**
+         * Draws this layer to the given graphics context. The coordinates are
+         * expected to be in map range and will be translated to local layer
+         * coordinates and clipped to the layer's dimensions.
+         *
+         * The given sprites are only drawn when this layer is the fringe
+         * layer.
+         */
+        void draw(Graphics *graphics,
+                  int startX, int startY,
+                  int endX, int endY,
+                  int scrollX, int scrollY,
+                  const Sprites &sprites) const;
+
+    private:
+        int mX, mY;
+        int mWidth, mHeight;
+        bool mIsFringeLayer;    /**< Whether the sprites are drawn. */
+        Image **mTiles;
+};
+
 /**
  * A tile map.
  */
@@ -98,9 +148,14 @@ class Map : public Properties
         void initializeOverlays();
 
         /**
-         * Draws a map layer to the given graphics output.
+         * Draws the map to the given graphics output. This method draws all
+         * layers, sprites and overlay effects.
+         *
+         * TODO: For efficiency reasons, this method could take into account
+         * the clipping rectangle set on the Graphics object. However,
+         * currently the map is always drawn full-screen.
          */
-        void draw(Graphics *graphics, int scrollX, int scrollY, int layer);
+        void draw(Graphics *graphics, int scrollX, int scrollY);
 
         /**
          * Visualizes collision layer for debugging
@@ -108,34 +163,20 @@ class Map : public Properties
         void drawCollision(Graphics *graphics, int scrollX, int scrollY);
 
         /**
-         * Draws the overlay graphic to the given graphics output.
-         */
-        void
-        drawOverlay(Graphics *graphics, float scrollX, float scrollY,
-                    int detail);
-
-        /**
-         * Adds a tileset to this map.
-         */
-        void
-        addTileset(Tileset *tileset);
-
-        /**
-         * Sets a tile using a global tile id. Used by the layer loading
-         * routine.
+         * Adds a layer to this map. The map takes ownership of the layer.
          */
-        void
-        setTileWithGid(int x, int y, int layer, int gid);
+        void addLayer(MapLayer *layer);
 
         /**
-         * Set tile ID.
+         * Adds a tileset to this map. The map takes ownership of the tileset.
          */
-        void setTile(int x, int y, int layer, Image *img);
+        void addTileset(Tileset *tileset);
 
         /**
-         * Get tile ID.
+         * Finds the tile set that a tile with the given global id is part of.
          */
-        Image *getTile(int x, int y, int layer) const;
+        Tileset*
+        getTilesetWithGid(int gid) const;
 
         /**
          * Get tile reference.
@@ -203,7 +244,7 @@ class Map : public Properties
         /**
          * Adds a particle effect
          */
-        void addParticleEffect (std::string effectFile, int x, int y);
+        void addParticleEffect(const std::string &effectFile, int x, int y);
 
         /**
          * Initializes all added particle effects
@@ -213,15 +254,11 @@ class Map : public Properties
 
     private:
         /**
-         * Converts a global tile id to the Image* pointing to the associated
-         * tile image.
-         */
-        Image* getTileWithGid(int gid) const;
-
-        /**
-         * Finds the tile set that a tile with the given global id is part of.
+         * Draws the overlay graphic to the given graphics output.
          */
-        Tileset* getTilesetWithGid(int gid) const;
+        void
+        drawOverlay(Graphics *graphics, float scrollX, float scrollY,
+                    int detail);
 
         /**
          * Tells whether the given coordinates fall within the map boundaries.
@@ -243,15 +280,14 @@ class Map : public Properties
         int mTileWidth, mTileHeight;
         int mMaxTileHeight;
         MetaTile *mMetaTiles;
-        Image **mTiles;
-
+        Layers mLayers;
         Tilesets mTilesets;
         Sprites mSprites;
 
         // Pathfinding members
         int mOnClosedList, mOnOpenList;
 
-        // Overlay Data
+        // Overlay data
         std::list<AmbientOverlay*> mOverlays;
         float mLastScrollX;
         float mLastScrollY;
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index 08a6a110..5618abfa 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.cpp
@@ -50,7 +50,7 @@ ImageSet::~ImageSet()
 }
 
 Image*
-ImageSet::get(size_type i)
+ImageSet::get(size_type i) const
 {
     if (i >= mImages.size())
     {
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index 15c21d90..fa1840ec 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.h
@@ -47,14 +47,20 @@ class ImageSet : public Resource
          */
         ~ImageSet();
 
-        int getWidth() { return mWidth; };
+        /**
+         * Returns the width of the images in the image set.
+         */
+        int getWidth() const { return mWidth; };
 
-        int getHeight() { return mHeight; };
+        /**
+         * Returns the height of the images in the image set.
+         */
+        int getHeight() const { return mHeight; };
 
         typedef std::vector<Image*>::size_type size_type;
-        Image* get(size_type i);
+        Image* get(size_type i) const;
 
-        size_type size() { return mImages.size(); }
+        size_type size() const { return mImages.size(); }
 
     private:
         std::vector<Image*> mImages;
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 3864580b..9c6c52aa 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -206,20 +206,17 @@ MapReader::readMap(const std::string &filename)
 Map*
 MapReader::readMap(xmlNodePtr node, const std::string &path)
 {
-    xmlChar *prop;
-
     // Take the filename off the path
-    std::string pathDir = path.substr(0, path.rfind("/") + 1);
+    const std::string pathDir = path.substr(0, path.rfind("/") + 1);
 
-    prop = xmlGetProp(node, BAD_CAST "version");
-    xmlFree(prop);
+    //xmlChar *prop = xmlGetProp(node, BAD_CAST "version");
+    //xmlFree(prop);
 
-    int w = XML::getProperty(node, "width", 0);
-    int h = XML::getProperty(node, "height", 0);
-    int tilew = XML::getProperty(node, "tilewidth", DEFAULT_TILE_WIDTH);
-    int tileh = XML::getProperty(node, "tileheight", DEFAULT_TILE_HEIGHT);
-    int layerNr = 0;
-    Map *map = new Map(w, h, tilew, tileh);
+    const int w = XML::getProperty(node, "width", 0);
+    const int h = XML::getProperty(node, "height", 0);
+    const int tw = XML::getProperty(node, "tilewidth", DEFAULT_TILE_WIDTH);
+    const int th = XML::getProperty(node, "tileheight", DEFAULT_TILE_HEIGHT);
+    Map *map = new Map(w, h, tw, th);
 
     for_each_xml_child_node(childNode, node)
     {
@@ -232,9 +229,7 @@ MapReader::readMap(xmlNodePtr node, const std::string &path)
         }
         else if (xmlStrEqual(childNode->name, BAD_CAST "layer"))
         {
-            logger->log("- Loading layer %d", layerNr);
-            readLayer(childNode, map, layerNr);
-            layerNr++;
+            readLayer(childNode, map);
         }
         else if (xmlStrEqual(childNode->name, BAD_CAST "properties"))
         {
@@ -246,7 +241,8 @@ MapReader::readMap(xmlNodePtr node, const std::string &path)
             {
                 if (xmlStrEqual(objectNode->name, BAD_CAST "object"))
                 {
-                    std::string objType = XML::getProperty(objectNode, "type", "");
+                    const std::string objType =
+                        XML::getProperty(objectNode, "type", "");
 
                     if (objType == "WARP" || objType == "NPC" ||
                         objType == "SCRIPT" || objType == "SPAWN")
@@ -255,9 +251,10 @@ MapReader::readMap(xmlNodePtr node, const std::string &path)
                         continue;
                     }
 
-                    std::string objName = XML::getProperty(objectNode, "name", "");
-                    int objX = XML::getProperty(objectNode, "x", 0);
-                    int objY = XML::getProperty(objectNode, "y", 0);
+                    const std::string objName =
+                        XML::getProperty(objectNode, "name", "");
+                    const int objX = XML::getProperty(objectNode, "x", 0);
+                    const int objY = XML::getProperty(objectNode, "y", 0);
 
                     logger->log("- Loading object name: %s type: %s at %d:%d",
                                 objName.c_str(), objType.c_str(), objX, objY);
@@ -288,43 +285,67 @@ MapReader::readProperties(xmlNodePtr node, Properties* props)
             continue;
 
         // Example: <property name="name" value="value"/>
-        xmlChar *name = xmlGetProp(childNode, BAD_CAST "name");
-        xmlChar *value = xmlGetProp(childNode, BAD_CAST "value");
+        const std::string name = XML::getProperty(childNode, "name", "");
+        const std::string value = XML::getProperty(childNode, "value", "");
 
-        if (name && value) {
-            props->setProperty((const char*)name, (const char*)value);
-        }
+        if (!name.empty() && !value.empty())
+            props->setProperty(name, value);
+    }
+}
 
-        if (name) xmlFree(name);
-        if (value) xmlFree(value);
+static void setTile(Map *map, MapLayer *layer, int x, int y, int gid)
+{
+    const Tileset * const set = map->getTilesetWithGid(gid);
+    if (layer) {
+        // Set regular tile on a layer
+        Image * const img = set ? set->get(gid - set->getFirstGid()) : 0;
+        layer->setTile(x, y, img);
+    } else {
+        // Set collision tile
+        if (set && (gid - set->getFirstGid() != 0))
+            map->blockTile(x, y, Map::BLOCKTYPE_WALL);
     }
 }
 
 void
-MapReader::readLayer(xmlNodePtr node, Map *map, int layer)
+MapReader::readLayer(xmlNodePtr node, Map *map)
 {
-    int h = map->getHeight();
-    int w = map->getWidth();
+    // Layers are not necessarily the same size as the map
+    const int w = XML::getProperty(node, "width", map->getWidth());
+    const int h = XML::getProperty(node, "height", map->getHeight());
+    const int offsetX = XML::getProperty(node, "xoffset", 0);
+    const int offsetY = XML::getProperty(node, "yoffset", 0);
+    const std::string name = XML::getProperty(node, "name", "");
+
+    const bool isFringeLayer = (name == "Fringe");
+    const bool isCollisionLayer = (name == "Collision");
+
+    MapLayer *layer = 0;
+
+    if (!isCollisionLayer) {
+        layer = new MapLayer(offsetX, offsetY, w, h, isFringeLayer);
+        map->addLayer(layer);
+    }
+
+    logger->log("- Loading layer \"%s\"", name.c_str());
     int x = 0;
     int y = 0;
 
-    // Load the tile data. Layers are assumed to be map size, with (0,0) as
-    // origin.
+    // Load the tile data
     for_each_xml_child_node(childNode, node)
     {
         if (!xmlStrEqual(childNode->name, BAD_CAST "data"))
             continue;
 
-        xmlChar *encoding = xmlGetProp(childNode, BAD_CAST "encoding");
-        xmlChar *compression = xmlGetProp(childNode, BAD_CAST "compression");
+        const std::string encoding =
+            XML::getProperty(childNode, "encoding", "");
+        const std::string compression =
+            XML::getProperty(childNode, "compression", "");
 
-        if (encoding && xmlStrEqual(encoding, BAD_CAST "base64"))
+        if (encoding == "base64")
         {
-            xmlFree(encoding);
-
-            if (compression && !xmlStrEqual(compression, BAD_CAST "gzip")) {
+            if (!compression.empty() && compression != "gzip") {
                 logger->log("Warning: only gzip layer compression supported!");
-                xmlFree(compression);
                 return;
             }
 
@@ -356,34 +377,29 @@ MapReader::readLayer(xmlNodePtr node, Map *map, int layer)
             delete[] charData;
 
             if (binData) {
-                if (compression) {
-                    if (xmlStrEqual(compression, BAD_CAST "gzip")) {
-                        // Inflate the gzipped layer data
-                        unsigned char *inflated;
-                        unsigned int inflatedSize =
-                            inflateMemory(binData, binLen, inflated);
-
-                        free(binData);
-                        binData = inflated;
-                        binLen = inflatedSize;
-
-                        if (inflated == NULL)
-                        {
-                            logger->log("Error: Could not decompress layer!");
-                            xmlFree(compression);
-                            return;
-                        }
+                if (compression == "gzip") {
+                    // Inflate the gzipped layer data
+                    unsigned char *inflated;
+                    unsigned int inflatedSize =
+                        inflateMemory(binData, binLen, inflated);
+
+                    free(binData);
+                    binData = inflated;
+                    binLen = inflatedSize;
+
+                    if (!inflated) {
+                        logger->log("Error: Could not decompress layer!");
+                        return;
                     }
-                    xmlFree(compression);
                 }
 
                 for (int i = 0; i < binLen - 3; i += 4) {
-                    int gid = binData[i] |
+                    const int gid = binData[i] |
                         binData[i + 1] << 8 |
                         binData[i + 2] << 16 |
                         binData[i + 3] << 24;
 
-                    map->setTileWithGid(x, y, layer, gid);
+                    setTile(map, layer, x, y, gid);
 
                     x++;
                     if (x == w) {x = 0; y++;}
@@ -398,8 +414,8 @@ MapReader::readLayer(xmlNodePtr node, Map *map, int layer)
                 if (!xmlStrEqual(childNode2->name, BAD_CAST "tile"))
                     continue;
 
-                int gid = XML::getProperty(childNode2, "gid", -1);
-                map->setTileWithGid(x, y, layer, gid);
+                const int gid = XML::getProperty(childNode2, "gid", -1);
+                setTile(map, layer, x, y, gid);
 
                 x++;
                 if (x == w) {
@@ -431,20 +447,20 @@ MapReader::readTileset(xmlNodePtr node,
         return NULL;
     }
 
-    int firstGid = XML::getProperty(node, "firstgid", 0);
-    int tw = XML::getProperty(node, "tilewidth", map->getTileWidth());
-    int th = XML::getProperty(node, "tileheight", map->getTileHeight());
+    const int firstGid = XML::getProperty(node, "firstgid", 0);
+    const int tw = XML::getProperty(node, "tilewidth", map->getTileWidth());
+    const int th = XML::getProperty(node, "tileheight", map->getTileHeight());
 
     for_each_xml_child_node(childNode, node)
     {
         if (!xmlStrEqual(childNode->name, BAD_CAST "image"))
             continue;
 
-        xmlChar* source = xmlGetProp(childNode, BAD_CAST "source");
+        const std::string source = XML::getProperty(childNode, "source", "");
 
-        if (source)
+        if (!source.empty())
         {
-            std::string sourceStr = std::string((const char*)source);
+            std::string sourceStr = source;
             sourceStr.erase(0, 3);  // Remove "../"
 
             ResourceManager *resman = ResourceManager::getInstance();
@@ -454,14 +470,15 @@ MapReader::readTileset(xmlNodePtr node,
             {
                 Tileset *set = new Tileset(tilebmp, tw, th, firstGid);
                 tilebmp->decRef();
-                xmlFree(source);
                 return set;
             }
             else {
-                logger->log("Warning: Failed to load tileset (%s)", source);
+                logger->log("Warning: Failed to load tileset (%s)",
+                        source.c_str());
             }
         }
 
+        // Only one image element expected
         break;
     }
 
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index d16ff1d5..60056358 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -63,10 +63,10 @@ class MapReader
         readProperties(xmlNodePtr node, Properties* props);
 
         /**
-         * Reads a map layer.
+         * Reads a map layer and adds it to the given map.
          */
         static void
-        readLayer(xmlNodePtr node, Map *map, int layer);
+        readLayer(xmlNodePtr node, Map *map);
 
         /**
          * Reads a tile set.
diff --git a/src/tileset.h b/src/tileset.h
index 6af69235..625fac1b 100644
--- a/src/tileset.h
+++ b/src/tileset.h
@@ -44,8 +44,7 @@ class Tileset : public ImageSet
         /**
          * Returns the first gid.
          */
-        int
-        getFirstGid()
+        int getFirstGid() const
         {
             return mFirstGid;
         }
-- 
cgit v1.2.3-70-g09d2


From c93e1faa1034519c26ef4481c7cfd0bd465a6d85 Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <bertram@cegetel.net>
Date: Thu, 17 Apr 2008 16:23:36 +0000
Subject: Added input type parameter to the LocalPlayer::SetDestination methods
 in order to keep control over message flooding to the server with mouse
 dragging. (I need feedback !)

---
 ChangeLog            |  5 ++++-
 src/gui/viewport.cpp | 16 ++++++++++------
 src/localplayer.cpp  | 18 ++++++++++++++----
 src/localplayer.h    | 11 +++++++----
 src/main.h           |  3 +++
 5 files changed, 38 insertions(+), 15 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index 7777e3fc..36d175a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,13 +6,16 @@
 	src/net/chatserver/party.h, src/localplayer.h: Added basic party 
 	support.
 
-
 2008-04-17  Yohann Ferreira <bertram@cegetel.net>
 
 	* src/gui/progressbar.h, src/gui/progressbar.cpp: Added smooth
 	changes in progressbar.
 	* src/net/chatserver/chatserver.h: One file was forgotten into the
 	private channels removal.
+	* src/localplayer.h, src/localplayer.cpp, src/gui/viewport.cpp,
+	src/main.h: Added input type parameter to the 
+	LocalPlayer::SetDestination methods in order to keep control over
+	message flooding to the server with mouse dragging.
 
 2008-04-16  David Athay  <ko2fan@gmail.com>
 
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 33449659..1b6cfa1c 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -253,9 +253,10 @@ Viewport::logic()
     if (mPlayerFollowMouse && button & SDL_BUTTON(1) &&
             mWalkTime != player_node->mWalkTime)
     {
-        player_node->setDestination(mouseX + (int) mViewX,
-                                    mouseY + (int) mViewY);
-        mWalkTime = player_node->mWalkTime;
+            player_node->setDestination(mouseX + (int) mViewX,
+                                        mouseY + (int) mViewY,
+                                        BY_MOUSE);
+            mWalkTime = player_node->mWalkTime;
     }
 
     for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
@@ -396,12 +397,14 @@ Viewport::mousePressed(gcn::MouseEvent &event)
         // Just walk around
         else
         {
-            // XXX XXX XXX REALLY UGLY!
+            // FIXME: REALLY UGLY!
             Uint8 *keys = SDL_GetKeyState(NULL);
             if (!(keys[SDLK_LSHIFT] || keys[SDLK_RSHIFT]))
             {
+
                 player_node->setDestination(event.getX() + (int) mViewX,
-                                            event.getY() + (int) mViewY);
+                                            event.getY() + (int) mViewY,
+                                            BY_MOUSE);
             }
             mPlayerFollowMouse = true;
         }
@@ -429,7 +432,8 @@ Viewport::mouseDragged(gcn::MouseEvent &event)
     if (mPlayerFollowMouse && mWalkTime == player_node->mWalkTime)
     {
         player_node->setDestination(event.getX() + (int) mViewX,
-                                    event.getY() + (int) mViewY);
+                                    event.getY() + (int) mViewY,
+                                    BY_MOUSE);
     }
 }
 
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 78dac6f8..e4c2624e 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -66,6 +66,7 @@ LocalPlayer::LocalPlayer():
     mTrading(false),
     mLastAction(-1), mWalkingDir(0),
     mDestX(0), mDestY(0),
+    mLocalWalkTime(-1),
     mExpMessageTime(0)
 {
 }
@@ -222,7 +223,8 @@ void LocalPlayer::pickUp(FloorItem *item)
         Net::GameServer::Player::pickUp(id >> 16, id & 0xFFFF);
         mPickUpTarget = NULL;
     } else {
-        setDestination(item->getX() * 32 + 16, item->getY() * 32 + 16);
+        setDestination(item->getX() * 32 + 16, item->getY() * 32 + 16,
+                       BY_SYSTEM);
         mPickUpTarget = item;
     }
 }
@@ -262,7 +264,7 @@ void LocalPlayer::walk(unsigned char dir)
     // Walk to where the player can actually go
     if ((dx || dy) && mMap->getWalk((mX + dx) / 32, (mY + dy) / 32, getWalkMask()))
     {
-        setDestination(mX + dx, mY + dy);
+        setDestination(mX + dx, mY + dy, BY_SYSTEM);
     }
     else if (dir)
     {
@@ -272,7 +274,7 @@ void LocalPlayer::walk(unsigned char dir)
     }
 }
 
-void LocalPlayer::setDestination(Uint16 x, Uint16 y)
+void LocalPlayer::setDestination(Uint16 x, Uint16 y, InputType inputType)
 {
     // Fix coordinates so that the player does not seem to dig into walls.
     int tx = x / 32, ty = y / 32, fx = x % 32, fy = y % 32;
@@ -285,6 +287,14 @@ void LocalPlayer::setDestination(Uint16 x, Uint16 y)
     // Only send a new message to the server when destination changes
     if (x != mDestX || y != mDestY)
     {
+        // Using mouse, Walkings are allowed twice per second
+        if (inputType == BY_MOUSE && get_elapsed_time(mLocalWalkTime) < 500) return;
+
+        // Using keyboard, Walkings are allowed ten times per second
+        if (inputType == BY_KEYBOARD && get_elapsed_time(mLocalWalkTime) < 100) return;
+
+        mLocalWalkTime = tick_time;
+
         mDestX = x;
         mDestY = y;
 
@@ -292,8 +302,8 @@ void LocalPlayer::setDestination(Uint16 x, Uint16 y)
         particleEngine->addEffect("graphics/particles/hit.particle.xml", x, y);
     }
 
-    mPickUpTarget = NULL;
     Being::setDestination(x, y);
+    mPickUpTarget = NULL;
 }
 
 void LocalPlayer::setWalkingDir(int dir)
diff --git a/src/localplayer.h b/src/localplayer.h
index b5e7c3eb..2813ca77 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -28,9 +28,6 @@
 
 #include <memory>
 
-// TODO move into some sane place...
-#define MAX_SLOT 2
-
 class FloorItem;
 class Inventory;
 class Item;
@@ -118,6 +115,10 @@ enum
     NB_CHARACTER_ATTRIBUTES = CHAR_SKILL_END
 };
 
+enum InputType {
+    BY_MOUSE = 0, BY_KEYBOARD, BY_SYSTEM
+};
+
 
 /**
  * The local player character.
@@ -248,7 +249,7 @@ class LocalPlayer : public Player
         /**
          * Sets a new destination for this being to walk to.
          */
-        void setDestination(Uint16 x, Uint16 y);
+        void setDestination(Uint16 x, Uint16 y, InputType inputType);
 
         /**
          * Sets a new direction to keep walking in.
@@ -371,6 +372,8 @@ class LocalPlayer : public Player
         int mWalkingDir;    /**< The direction the player is walking in. */
         int mDestX;         /**< X coordinate of destination. */
         int mDestY;         /**< Y coordinate of destination. */
+        int mLocalWalkTime;    /**< Time in millisecs before the next walk
+                                    can be sent when using mouse. */
 
         std::list<std::string> mExpMessages; /**< Queued exp messages*/
         int mExpMessageTime;
diff --git a/src/main.h b/src/main.h
index 691660e5..3835f355 100644
--- a/src/main.h
+++ b/src/main.h
@@ -116,6 +116,9 @@ const short defaultMusicVolume = 60;
 const std::string defaultAccountServerName = "testing.themanaworld.org";
 const short defaultAccountServerPort = 9601;
 
+// Defines the number of usable player slots
+const short maxSlot = 2;
+
 extern std::string token;
 extern unsigned char state;
 extern std::string errorMessage;
-- 
cgit v1.2.3-70-g09d2


From f43ce278866a2c42f67f75972c2e4abe46f8fd82 Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <bertram@cegetel.net>
Date: Thu, 17 Apr 2008 20:14:24 +0000
Subject: Moved walking calls flooding control when dragging mouse to viewport.

---
 src/gui/viewport.cpp | 26 +++++++++++++++-----------
 src/gui/viewport.h   |  4 ++++
 src/localplayer.cpp  | 18 ++++--------------
 src/localplayer.h    |  9 +--------
 4 files changed, 24 insertions(+), 33 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 1b6cfa1c..a8fd452c 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -49,13 +49,15 @@
 #include <cassert>
 
 extern volatile int tick_time;
+extern int get_elapsed_time(int start_time);
 
 Viewport::Viewport():
     mMap(0),
     mViewX(0.0f),
     mViewY(0.0f),
     mShowDebugPath(false),
-    mPlayerFollowMouse(false)
+    mPlayerFollowMouse(false),
+    mLocalWalkTime(-1)
 {
     setOpaque(false);
     addMouseListener(this);
@@ -251,11 +253,12 @@ Viewport::logic()
     Uint8 button = SDL_GetMouseState(&mouseX, &mouseY);
 
     if (mPlayerFollowMouse && button & SDL_BUTTON(1) &&
-            mWalkTime != player_node->mWalkTime)
+            mWalkTime != player_node->mWalkTime && 
+            get_elapsed_time(mLocalWalkTime) >= walkingMouseDelay)
     {
+            mLocalWalkTime = tick_time;
             player_node->setDestination(mouseX + (int) mViewX,
-                                        mouseY + (int) mViewY,
-                                        BY_MOUSE);
+                                        mouseY + (int) mViewY);
             mWalkTime = player_node->mWalkTime;
     }
 
@@ -399,12 +402,12 @@ Viewport::mousePressed(gcn::MouseEvent &event)
         {
             // FIXME: REALLY UGLY!
             Uint8 *keys = SDL_GetKeyState(NULL);
-            if (!(keys[SDLK_LSHIFT] || keys[SDLK_RSHIFT]))
+            if (!(keys[SDLK_LSHIFT] || keys[SDLK_RSHIFT]) &&
+                get_elapsed_time(mLocalWalkTime) >= walkingMouseDelay)
             {
-
+                mLocalWalkTime = tick_time;
                 player_node->setDestination(event.getX() + (int) mViewX,
-                                            event.getY() + (int) mViewY,
-                                            BY_MOUSE);
+                                            event.getY() + (int) mViewY);
             }
             mPlayerFollowMouse = true;
         }
@@ -429,11 +432,12 @@ Viewport::mouseDragged(gcn::MouseEvent &event)
     if (!mMap || !player_node)
         return;
 
-    if (mPlayerFollowMouse && mWalkTime == player_node->mWalkTime)
+    if (mPlayerFollowMouse && mWalkTime == player_node->mWalkTime
+        && get_elapsed_time(mLocalWalkTime) >= walkingMouseDelay)
     {
+        mLocalWalkTime = tick_time;
         player_node->setDestination(event.getX() + (int) mViewX,
-                                    event.getY() + (int) mViewY,
-                                    BY_MOUSE);
+                                    event.getY() + (int) mViewY);
     }
 }
 
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index c8f7a9ec..cb47b5fe 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -39,6 +39,9 @@ class PopupMenu;
 class Graphics;
 class SimpleAnimation;
 
+/** Delay between two mouse calls when dragging mouse and move the player */
+const int walkingMouseDelay = 500;
+
 /**
  * The viewport on the map. Displays the current map and handles mouse input
  * and the popup menu.
@@ -182,6 +185,7 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
 
         bool mPlayerFollowMouse;
         int mWalkTime;
+        int mLocalWalkTime; /**< Timestamp before the next walk can be sent. */
 
         PopupMenu *mPopupMenu;     /**< Popup menu. */
 };
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index e4c2624e..78dac6f8 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -66,7 +66,6 @@ LocalPlayer::LocalPlayer():
     mTrading(false),
     mLastAction(-1), mWalkingDir(0),
     mDestX(0), mDestY(0),
-    mLocalWalkTime(-1),
     mExpMessageTime(0)
 {
 }
@@ -223,8 +222,7 @@ void LocalPlayer::pickUp(FloorItem *item)
         Net::GameServer::Player::pickUp(id >> 16, id & 0xFFFF);
         mPickUpTarget = NULL;
     } else {
-        setDestination(item->getX() * 32 + 16, item->getY() * 32 + 16,
-                       BY_SYSTEM);
+        setDestination(item->getX() * 32 + 16, item->getY() * 32 + 16);
         mPickUpTarget = item;
     }
 }
@@ -264,7 +262,7 @@ void LocalPlayer::walk(unsigned char dir)
     // Walk to where the player can actually go
     if ((dx || dy) && mMap->getWalk((mX + dx) / 32, (mY + dy) / 32, getWalkMask()))
     {
-        setDestination(mX + dx, mY + dy, BY_SYSTEM);
+        setDestination(mX + dx, mY + dy);
     }
     else if (dir)
     {
@@ -274,7 +272,7 @@ void LocalPlayer::walk(unsigned char dir)
     }
 }
 
-void LocalPlayer::setDestination(Uint16 x, Uint16 y, InputType inputType)
+void LocalPlayer::setDestination(Uint16 x, Uint16 y)
 {
     // Fix coordinates so that the player does not seem to dig into walls.
     int tx = x / 32, ty = y / 32, fx = x % 32, fy = y % 32;
@@ -287,14 +285,6 @@ void LocalPlayer::setDestination(Uint16 x, Uint16 y, InputType inputType)
     // Only send a new message to the server when destination changes
     if (x != mDestX || y != mDestY)
     {
-        // Using mouse, Walkings are allowed twice per second
-        if (inputType == BY_MOUSE && get_elapsed_time(mLocalWalkTime) < 500) return;
-
-        // Using keyboard, Walkings are allowed ten times per second
-        if (inputType == BY_KEYBOARD && get_elapsed_time(mLocalWalkTime) < 100) return;
-
-        mLocalWalkTime = tick_time;
-
         mDestX = x;
         mDestY = y;
 
@@ -302,8 +292,8 @@ void LocalPlayer::setDestination(Uint16 x, Uint16 y, InputType inputType)
         particleEngine->addEffect("graphics/particles/hit.particle.xml", x, y);
     }
 
-    Being::setDestination(x, y);
     mPickUpTarget = NULL;
+    Being::setDestination(x, y);
 }
 
 void LocalPlayer::setWalkingDir(int dir)
diff --git a/src/localplayer.h b/src/localplayer.h
index 2813ca77..75a1af7d 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -115,11 +115,6 @@ enum
     NB_CHARACTER_ATTRIBUTES = CHAR_SKILL_END
 };
 
-enum InputType {
-    BY_MOUSE = 0, BY_KEYBOARD, BY_SYSTEM
-};
-
-
 /**
  * The local player character.
  */
@@ -249,7 +244,7 @@ class LocalPlayer : public Player
         /**
          * Sets a new destination for this being to walk to.
          */
-        void setDestination(Uint16 x, Uint16 y, InputType inputType);
+        void setDestination(Uint16 x, Uint16 y);
 
         /**
          * Sets a new direction to keep walking in.
@@ -372,8 +367,6 @@ class LocalPlayer : public Player
         int mWalkingDir;    /**< The direction the player is walking in. */
         int mDestX;         /**< X coordinate of destination. */
         int mDestY;         /**< Y coordinate of destination. */
-        int mLocalWalkTime;    /**< Time in millisecs before the next walk
-                                    can be sent when using mouse. */
 
         std::list<std::string> mExpMessages; /**< Queued exp messages*/
         int mExpMessageTime;
-- 
cgit v1.2.3-70-g09d2


From 843cfe68a7dc43f14522f80725627599c949b70d Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 20 Apr 2008 16:24:06 +0000
Subject: Merged revisions 3962-3983,3985-3999,4001-4021 via svnmerge from
 https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0

........
  r3962 | crush_tmw | 2008-03-09 16:35:00 +0100 (Sun, 09 Mar 2008) | 1 line

  Applied some patches by peavey related to chatlog and the quit dialog.
........
  r3968 | umperio | 2008-03-11 14:56:47 +0100 (Tue, 11 Mar 2008) | 1 line

  Removed unused image.
........
  r3969 | b_lindeijer | 2008-03-11 17:44:20 +0100 (Tue, 11 Mar 2008) | 2 lines

  Also removed unused image from the files to be installed.
........
  r4006 | crush_tmw | 2008-03-26 00:28:05 +0100 (Wed, 26 Mar 2008) | 1 line

  Initialized some uninitialized variables (patch by peavey).
........
  r4008 | b_lindeijer | 2008-03-27 15:51:10 +0100 (Thu, 27 Mar 2008) | 2 lines

  Applied patch by peavey and added his name to the ChangeLog some more.
........
  r4010 | b_lindeijer | 2008-03-30 16:06:14 +0200 (Sun, 30 Mar 2008) | 2 lines

  Updated configure.ac for tmwdata split (patch by peavey).
........
  r4018 | crush_tmw | 2008-04-01 03:02:30 +0200 (Tue, 01 Apr 2008) | 1 line

  Added makefile for TMXCopy by jaxad.
........
  r4019 | crush_tmw | 2008-04-01 03:34:29 +0200 (Tue, 01 Apr 2008) | 1 line

  compilation fixes suggested by peavey.
........
  r4020 | crush_tmw | 2008-04-01 03:37:51 +0200 (Tue, 01 Apr 2008) | 1 line

  renaming makefile to Makefile
........
  r4021 | crush_tmw | 2008-04-01 03:38:35 +0200 (Tue, 01 Apr 2008) | 1 line

  renaming makefile to Makefile
........
---
 ChangeLog                           |  40 +++++++++++++++++++++++++++++++-----
 configure.ac                        |   2 --
 data/graphics/gui/CMakeLists.txt    |   1 -
 data/graphics/gui/Makefile.am       |   1 -
 data/graphics/gui/attack_target.png | Bin 359 -> 0 bytes
 src/game.cpp                        |   3 ++-
 src/gui/chat.cpp                    |  23 +++++++++++++++------
 src/gui/scrollarea.cpp              |   4 ++--
 src/gui/viewport.cpp                |   1 +
 src/openglgraphics.cpp              |   2 +-
 tools/tmxcopy/Makefile              |  18 ++++++++++++++++
 tools/tmxcopy/zlibutils.cpp         |   1 +
 12 files changed, 77 insertions(+), 19 deletions(-)
 delete mode 100644 data/graphics/gui/attack_target.png
 create mode 100644 tools/tmxcopy/Makefile

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index 58e8c72c..4e672369 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2008-04-19  Yohann Ferreira  <bertram@cegetel.net>
 
-	* src/gui/char_select.cpp: Made the client clean characters information
-	to avoid a freeze at relogin with another account.
+	* src/gui/char_select.cpp: Made the client clean characters
+	information to avoid a freeze at relogin with another account.
 
 2008-04-19  Dennis Friis  <peavey@placid.dk>
 
@@ -168,11 +168,25 @@
 	* data/test.lua: Removed the +100 offset of NPC IDs (relict from
 	eAthena)
 
+2008-03-30  Dennis Friis  <peavey@placid.dk>
+
+	* configure.ac: Updated for tmwdata split.
+
 2008-03-28  David Athay  <ko2fan@gmail.com>
 
 	* tmw.cbp, src/gui/guildwindow.cpp, src/gui/shop.cpp: Updated
 	project file and added some headers to help compiling on gcc 4.3.
 
+2008-03-27  Dennis Friis  <peavey@placid.dk>
+
+	* src/gui/progressbar.cpp, src/gui/scrollarea.cpp: Revert progress bar
+	changes and initialize mWalkTime.
+
+2008-03-26  Dennis Friis  <peavey@placid.dk>
+
+	* src/gui/progressbar.cpp, src/localplayer.cpp: Initialized some
+	uninitialized variables.
+
 2008-03-24  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/main.h: Updated default account server name.
@@ -211,6 +225,15 @@
 	src/net/chatserver.cpp, src/net/chatserver.h: Added ability to 
 	quit guilds.
 
+2008-03-11  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* data/graphics/gui/CMakeLists.txt, data/graphics/gui/Makefile.am:
+	Removed unused image here too.
+
+2008-03-11  Eugenio Favalli  <elvenprogrammer@themanaworld.org>
+
+	* data/graphics/gui/attack_target.png: Removed unused image.
+
 2008-03-09  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
@@ -230,10 +253,17 @@
 	data/graphics/sprites/scorpion.xml: Gave the tail attack of the
 	scorpion a custom animation and a particle effect.
 
+2008-03-09  Dennis Friis  <peavey@placid.dk>
+
+	* src/game.cpp: Pressing escape in the quit dialog closes the dialog.
+	* src/gui/chat.cpp, src/gui/chat.h: Fixed a bug with chat messages
+	without a sender which include semicolons.
+	* src/chat.cpp: Added "/clear" command to clear chat window.
+
 2008-03-08  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* tools/tmxcopy/main.cpp, tools/tmxcopy/main.map.cpp,
-	tools/tmxcopy/plibutils.cpp: Fixed some width/height mixups in
+	tools/tmxcopy/zlibutils.cpp: Fixed some width/height mixups in
 	TMXCopy.
 
 2008-03-07  Bjørn Lindeijer  <bjorn@lindeijer.nl>
@@ -1004,7 +1034,7 @@
 
 	* src/gui/textfield.cpp: Fixed a windows compilation problem
 	caused by a define macro of the Windows API that conflicts
-	with a guichan identifier. 
+	with a guichan identifier.
 
 2007-10-27  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
@@ -2289,7 +2319,7 @@
 2007-03-16  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/gui/char_select.cpp, src/net/accountserver/account.cpp,
-	src/net/accountserver/account.hpp: Implemented 7 atribute system
+	src/net/accountserver/account.hpp: Implemented 7 attribute system
 	in character creation.
 
 2007-03-14  Bjørn Lindeijer  <bjorn@lindeijer.nl>
diff --git a/configure.ac b/configure.ac
index 1ee6dfb7..506ef0f7 100755
--- a/configure.ac
+++ b/configure.ac
@@ -113,8 +113,6 @@ data/Makefile
 data/graphics/Makefile
 data/graphics/gui/Makefile
 data/graphics/images/Makefile
-data/graphics/images/ambient/Makefile
-data/graphics/tiles/Makefile
 data/help/Makefile
 data/icons/Makefile
 docs/Makefile
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 252348e5..4a5ea7e5 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -1,5 +1,4 @@
 SET (FILES
-    attack_target.png
     bg_quad_dis.png
     browserfont.png
     button_disabled.png
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 7287d717..724631fe 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -2,7 +2,6 @@
 guidir = $(pkgdatadir)/data/graphics/gui
 
 gui_DATA =				\
-	attack_target.png		\
 	bg_quad_dis.png			\
 	browserfont.png			\
 	button.png			\
diff --git a/data/graphics/gui/attack_target.png b/data/graphics/gui/attack_target.png
deleted file mode 100644
index b1306f97..00000000
Binary files a/data/graphics/gui/attack_target.png and /dev/null differ
diff --git a/src/game.cpp b/src/game.cpp
index fcbc5aba..039a1916 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -540,10 +540,11 @@ void Game::handleInput()
                     if (!quitDialog)
                     {
                         quitDialog = new QuitDialog(&done, &quitDialog);
+                        quitDialog->requestMoveToTop();
                     }
                     else
                     {
-                        quitDialog->requestMoveToTop();
+                        quitDialog->action(gcn::ActionEvent(NULL, "cancel"));
                     }
                     break;
 
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index d490853c..a9f3b931 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -120,9 +120,13 @@ ChatWindow::logic()
 void
 ChatWindow::chatLog(std::string line, int own, const std::string &channelName)
 {
+    // Trim whitespace
+    trim(line);
+
     CHATLOG tmp;
     tmp.own  = own;
     tmp.nick = "";
+    tmp.text = line;
 
     BrowserBox *output = mChannelOutput[channelName];
     ScrollArea *scroll = mChannelScroll[channelName];
@@ -136,12 +140,9 @@ ChatWindow::chatLog(std::string line, int own, const std::string &channelName)
     std::string::size_type pos = line.find(" : ");
     if (pos != std::string::npos) {
         tmp.nick = line.substr(0, pos);
-        line.erase(0, pos + 3);
+        tmp.text = line.substr(pos + 3);
     }
 
-    // Trim whitespace
-    trim(line);
-
     std::string lineColor = "##0"; // Equiv. to BrowserBox::BLACK
     switch (own) {
         case BY_GM:
@@ -157,10 +158,13 @@ ChatWindow::chatLog(std::string line, int own, const std::string &channelName)
             lineColor = "##0"; // Equiv. to BrowserBox::BLACK
             break;
         case BY_SERVER:
-            tmp.nick += "Server: ";
+            tmp.nick = "Server: ";
+            tmp.text = line;
             lineColor = "##7"; // Equiv. to BrowserBox::PINK
             break;
         case BY_LOGGER:
+            tmp.nick = "";
+            tmp.text = line;
             lineColor = "##8"; // Equiv. to BrowserBox::GREY
             break;
     }
@@ -179,7 +183,7 @@ ChatWindow::chatLog(std::string line, int own, const std::string &channelName)
             << (int)((t / 60) % 60)
             << "] ";
 
-    line = lineColor + timeStr.str() + tmp.nick + line;
+    line = lineColor + timeStr.str() + tmp.nick + tmp.text;
 
     // We look if the Vertical Scroll Bar is set at the max before
     // adding a row, otherwise the max will always be a row higher
@@ -314,6 +318,7 @@ void ChatWindow::chatSend(std::string const &nick, std::string const &msg,
         chatLog("/join > Join an already registered channel", BY_SERVER, channelName);
         chatLog("/quit > Leave a channel", BY_SERVER, channelName);
         chatLog("/admin > Send a command to the server (GM only)", BY_SERVER, channelName);
+        chatLog("/clear > Clears this window", BY_SERVER);
     }
     else if (command == "where")
     {
@@ -365,6 +370,12 @@ void ChatWindow::chatSend(std::string const &nick, std::string const &msg,
     {
         Net::GameServer::Player::say("/" + arg);
     }
+    else if (command == "clear")
+    {
+        BrowserBox *output = mChannelOutput[channelName];
+        if (output)
+            output->clearRows();
+    }
     else
     {
         chatLog("Unknown command", BY_SERVER, channelName);
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index 97384fa3..9c88f8e3 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -86,8 +86,8 @@ void ScrollArea::init()
         // Load the background skin
         ResourceManager *resman = ResourceManager::getInstance();
         Image *textbox = resman->getImage("graphics/gui/deepbox.png");
-        int bggridx[4] = {0, 3, 28, 31};
-        int bggridy[4] = {0, 3, 28, 31};
+        const int bggridx[4] = {0, 3, 28, 31};
+        const int bggridy[4] = {0, 3, 28, 31};
         int a = 0, x, y;
 
         for (y = 0; y < 3; y++) {
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index a8fd452c..819cb761 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -57,6 +57,7 @@ Viewport::Viewport():
     mViewY(0.0f),
     mShowDebugPath(false),
     mPlayerFollowMouse(false),
+    mWalkTime(0),
     mLocalWalkTime(-1)
 {
     setOpaque(false);
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index 92ce2fe9..76efe380 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -354,7 +354,7 @@ void OpenGLGraphics::setTexturingAndBlending(bool enable)
 
 void OpenGLGraphics::drawRectangle(const gcn::Rectangle& rect, bool filled)
 {
-    float offset = filled ? 0 : 0.5f;
+    const float offset = filled ? 0 : 0.5f;
 
     setTexturingAndBlending(false);
 
diff --git a/tools/tmxcopy/Makefile b/tools/tmxcopy/Makefile
new file mode 100644
index 00000000..732dec36
--- /dev/null
+++ b/tools/tmxcopy/Makefile
@@ -0,0 +1,18 @@
+CC=g++
+CFLAGS=-c `pkg-config --cflags libxml-2.0`
+LDFLAGS=`pkg-config --libs libxml-2.0`
+SOURCES=base64.cpp main.cpp map.cpp xmlutils.cpp zlibutils.cpp
+OBJECTS=$(SOURCES:.cpp=.o)
+EXECUTABLE=tmxcopy
+
+all: $(SOURCES) $(EXECUTABLE)
+	make clean
+
+$(EXECUTABLE): $(OBJECTS)
+	$(CC) $(LDFLAGS) $(OBJECTS) -o $@
+
+.cpp.o:
+	$(CC) $(CFLAGS) $< -o $@
+
+clean:
+	rm -f *.o
diff --git a/tools/tmxcopy/zlibutils.cpp b/tools/tmxcopy/zlibutils.cpp
index 9145f459..39c19aee 100644
--- a/tools/tmxcopy/zlibutils.cpp
+++ b/tools/tmxcopy/zlibutils.cpp
@@ -119,3 +119,4 @@ compressMemory(unsigned char *in, unsigned int inLength,
 
     assert (ret == Z_OK);
 }
+*/
-- 
cgit v1.2.3-70-g09d2


From 54d3f15fde8305e7e65944668bde66d7a4e127db Mon Sep 17 00:00:00 2001
From: Mateusz Kaduk <mateusz.kaduk@gmail.com>
Date: Wed, 4 Jun 2008 08:32:39 +0000
Subject: Added switch option drawing nicknames only if mouse hover. Useful in
 crowded places.

---
 src/gui/setup.cpp       |  6 +++---
 src/gui/setup_video.cpp | 40 +++++++++++++++++++++++++++-------------
 src/gui/setup_video.h   |  2 ++
 src/gui/viewport.cpp    | 26 +++++++++++++++++++++++++-
 src/gui/viewport.h      |  8 ++++++++
 5 files changed, 65 insertions(+), 17 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index d1f8a38a..22b91ed4 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -49,8 +49,8 @@ Setup::Setup():
     Window(_("Setup"))
 {
     setCloseButton(true);
-    int width = 250;
-    int height = 245;
+    int width = 260;
+    int height = 265;
     setContentSize(width, height);
 
     static char const *buttonNames[] = {
@@ -65,7 +65,7 @@ Setup::Setup():
     }
 
     TabbedArea *panel = new TabbedArea();
-    panel->setDimension(gcn::Rectangle(5, 5, 250, 205));
+    panel->setDimension(gcn::Rectangle(5, 5, 260, 225));
 
     SetupTab *tab;
 
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index eb3c3df2..4d9b5d74 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -106,6 +106,7 @@ Setup_Video::Setup_Video():
     mFullScreenEnabled(config.getValue("screen", 0)),
     mOpenGLEnabled(config.getValue("opengl", 0)),
     mCustomCursorEnabled(config.getValue("customcursor", 1)),
+    mVisibleNamesEnabled(config.getValue("visiblenames", 1)),
     mOpacity(config.getValue("guialpha", 0.8)),
     mFps((int)config.getValue("fpslimit", 60)),
     mModeListModel(new ModeListModel()),
@@ -113,6 +114,7 @@ Setup_Video::Setup_Video():
     mFsCheckBox(new CheckBox(_("Full screen"), mFullScreenEnabled)),
     mOpenGLCheckBox(new CheckBox(_("OpenGL"), mOpenGLEnabled)),
     mCustomCursorCheckBox(new CheckBox(_("Custom cursor"), mCustomCursorEnabled)),
+    mVisibleNamesCheckBox(new CheckBox(_("Visible names"), mVisibleNamesEnabled)),
     mAlphaSlider(new Slider(0.2, 1.0)),
     mFpsCheckBox(new CheckBox(_("FPS Limit:"))),
     mFpsSlider(new Slider(10, 200)),
@@ -143,12 +145,13 @@ Setup_Video::Setup_Video():
     mFsCheckBox->setPosition(110, 10);
     mOpenGLCheckBox->setPosition(110, 30);
     mCustomCursorCheckBox->setPosition(110, 50);
-    mAlphaSlider->setDimension(gcn::Rectangle(10, 80, 100, 10));
+    mVisibleNamesCheckBox->setPosition(110, 70);
+    mAlphaSlider->setDimension(gcn::Rectangle(10, 100, 100, 10));
     alphaLabel->setPosition(20 + mAlphaSlider->getWidth(),
                             mAlphaSlider->getY());
-    mFpsCheckBox->setPosition(90, 100);
-    mFpsSlider->setDimension(gcn::Rectangle(10, 100, 75, 10));
-    mFpsField->setPosition(100 + mFpsCheckBox->getWidth(), 100);
+    mFpsCheckBox->setPosition(90, 120);
+    mFpsSlider->setDimension(gcn::Rectangle(10, 120, 75, 10));
+    mFpsField->setPosition(100 + mFpsCheckBox->getWidth(), 120);
     mFpsField->setWidth(30);
 
     mModeList->setSelected(-1);
@@ -161,6 +164,7 @@ Setup_Video::Setup_Video():
     mFpsCheckBox->setSelected(mFps > 0);
 
     mCustomCursorCheckBox->setActionEventId("customcursor");
+    mVisibleNamesCheckBox->setActionEventId("visiblenames");
     mAlphaSlider->setActionEventId("guialpha");
     mFpsCheckBox->setActionEventId("fpslimitcheckbox");
     mFpsSlider->setActionEventId("fpslimitslider");
@@ -172,6 +176,7 @@ Setup_Video::Setup_Video():
     mOverlayDetailField->setActionEventId("overlaydetailfield");
 
     mCustomCursorCheckBox->addActionListener(this);
+    mVisibleNamesCheckBox->addActionListener(this);
     mAlphaSlider->addActionListener(this);
     mFpsCheckBox->addActionListener(this);
     mFpsSlider->addActionListener(this);
@@ -183,26 +188,26 @@ Setup_Video::Setup_Video():
     mOverlayDetailSlider->addActionListener(this);
     mOverlayDetailField->addKeyListener(this);
 
-    mScrollRadiusSlider->setDimension(gcn::Rectangle(10, 120, 75, 10));
+    mScrollRadiusSlider->setDimension(gcn::Rectangle(10, 140, 75, 10));
     gcn::Label *scrollRadiusLabel = new gcn::Label(_("Scroll radius"));
-    scrollRadiusLabel->setPosition(90, 120);
-    mScrollRadiusField->setPosition(180, 120);
+    scrollRadiusLabel->setPosition(90, 140);
+    mScrollRadiusField->setPosition(180, 140);
     mScrollRadiusField->setWidth(30);
     mScrollRadiusField->setText(toString(mOriginalScrollRadius));
     mScrollRadiusSlider->setValue(mOriginalScrollRadius);
 
-    mScrollLazinessSlider->setDimension(gcn::Rectangle(10, 140, 75, 10));
+    mScrollLazinessSlider->setDimension(gcn::Rectangle(10, 160, 75, 10));
     gcn::Label *scrollLazinessLabel = new gcn::Label(_("Scroll laziness"));
-    scrollLazinessLabel->setPosition(90, 140);
-    mScrollLazinessField->setPosition(180, 140);
+    scrollLazinessLabel->setPosition(90, 160);
+    mScrollLazinessField->setPosition(180, 160);
     mScrollLazinessField->setWidth(30);
     mScrollLazinessField->setText(toString(mOriginalScrollLaziness));
     mScrollLazinessSlider->setValue(mOriginalScrollLaziness);
 
-    mOverlayDetailSlider->setDimension(gcn::Rectangle(10, 160, 75, 10));
+    mOverlayDetailSlider->setDimension(gcn::Rectangle(10, 180, 75, 10));
     gcn::Label *overlayDetailLabel = new gcn::Label(_("Ambient FX"));
-    overlayDetailLabel->setPosition(90, 160);
-    mOverlayDetailField->setPosition(180, 160);
+    overlayDetailLabel->setPosition(90, 180);
+    mOverlayDetailField->setPosition(180, 180);
     mOverlayDetailField->setWidth(30);
     switch (mOverlayDetail)
     {
@@ -222,6 +227,7 @@ Setup_Video::Setup_Video():
     add(mFsCheckBox);
     add(mOpenGLCheckBox);
     add(mCustomCursorCheckBox);
+    add(mVisibleNamesCheckBox);
     add(mAlphaSlider);
     add(alphaLabel);
     add(mFpsCheckBox);
@@ -288,6 +294,7 @@ void Setup_Video::apply()
     // We sync old and new values at apply time
     mFullScreenEnabled = config.getValue("screen", 0);
     mCustomCursorEnabled = config.getValue("customcursor", 1);
+    mVisibleNamesEnabled = config.getValue("visiblenames", 1);
     mOpacity = config.getValue("guialpha", 0.8);
     mOverlayDetail = (int)config.getValue("OverlayDetail", 2);
     mOpenGLEnabled = config.getValue("opengl", 0);
@@ -319,6 +326,7 @@ void Setup_Video::cancel()
     mFsCheckBox->setSelected(mFullScreenEnabled);
     mOpenGLCheckBox->setSelected(mOpenGLEnabled);
     mCustomCursorCheckBox->setSelected(mCustomCursorEnabled);
+    mVisibleNamesCheckBox->setSelected(mVisibleNamesEnabled);
     mAlphaSlider->setValue(mOpacity);
     mOverlayDetailSlider->setValue(mOverlayDetail);
 
@@ -329,6 +337,7 @@ void Setup_Video::cancel()
 
     config.setValue("screen", mFullScreenEnabled ? 1 : 0);
     config.setValue("customcursor", mCustomCursorEnabled ? 1 : 0);
+    config.setValue("visiblenames", mVisibleNamesEnabled ? 1 : 0);
     config.setValue("guialpha", mOpacity);
     config.setValue("opengl", mOpenGLEnabled ? 1 : 0);
 }
@@ -344,6 +353,11 @@ void Setup_Video::action(const gcn::ActionEvent &event)
         config.setValue("customcursor",
                 mCustomCursorCheckBox->isSelected() ? 1 : 0);
     }
+    else if (event.getId() == "visiblenames")
+    {
+        config.setValue("visiblenames",
+                mVisibleNamesCheckBox->isSelected() ? 1 : 0);
+    }
     else if (event.getId() == "fpslimitslider")
     {
         mFps = (int) mFpsSlider->getValue();
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index 095fdbd6..e4e9fcf1 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -51,6 +51,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
         bool mFullScreenEnabled;
         bool mOpenGLEnabled;
         bool mCustomCursorEnabled;
+        bool mVisibleNamesEnabled;
         double mOpacity;
         int mFps;
 
@@ -60,6 +61,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
         gcn::CheckBox *mFsCheckBox;
         gcn::CheckBox *mOpenGLCheckBox;
         gcn::CheckBox *mCustomCursorCheckBox;
+        gcn::CheckBox *mVisibleNamesCheckBox;
 
         gcn::Slider *mAlphaSlider;
         gcn::CheckBox *mFpsCheckBox;
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 819cb761..0dcebd87 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -58,7 +58,8 @@ Viewport::Viewport():
     mShowDebugPath(false),
     mPlayerFollowMouse(false),
     mWalkTime(0),
-    mLocalWalkTime(-1)
+    mLocalWalkTime(-1),
+    mVisibleNames(false)
 {
     setOpaque(false);
     addMouseListener(this);
@@ -67,9 +68,11 @@ Viewport::Viewport():
     mScrollRadius = (int) config.getValue("ScrollRadius", 32);
     mScrollCenterOffsetX = (int) config.getValue("ScrollCenterOffsetX", 0);
     mScrollCenterOffsetY = (int) config.getValue("ScrollCenterOffsetY", 0);
+    mVisibleNames = (config.getValue("visiblenames", 1) == 1);
 
     config.addListener("ScrollLaziness", this);
     config.addListener("ScrollRadius", this);
+    config.addListener("visiblenames", this);
 
     mPopupMenu = new PopupMenu();
 
@@ -122,6 +125,8 @@ Viewport::loadTargetCursor(std::string filename, int width, int height,
 Viewport::~Viewport()
 {
     delete mPopupMenu;
+    
+    config.removeListener("visiblenames", this);
 
     for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
     {
@@ -234,6 +239,7 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     for (BeingIterator i = beings.begin(); i != beings.end(); i++)
     {
         (*i)->drawSpeech(graphics, -(int) mViewX, -(int) mViewY);
+        if(mVisibleNames && (*i) == mSelectedBeing)
         (*i)->drawName(graphics, -(int) mViewX, -(int) mViewY);
         (*i)->drawEmotion(graphics, -(int) mViewX, -(int) mViewY);
     }
@@ -459,4 +465,22 @@ Viewport::optionChanged(const std::string &name)
 {
     mScrollLaziness = (int) config.getValue("ScrollLaziness", 32);
     mScrollRadius = (int) config.getValue("ScrollRadius", 32);
+
+    if (name == "visiblenames") {
+                mVisibleNames = config.getValue("visiblenames", 1) == 1;     
+    }
 }
+
+void
+Viewport::mouseMoved(gcn::MouseEvent &event)
+{
+    // Check if we are on the map
+    if (!mMap || !player_node)
+        return;
+
+    const int tilex = (event.getX() + (int) mViewX) / 32;
+    const int tiley = (event.getY() + (int) mViewY) / 32;
+
+    mSelectedBeing = beingManager->findBeing(tilex, tiley);
+}
+
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index cb47b5fe..82587938 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -106,6 +106,12 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         void
         mouseReleased(gcn::MouseEvent &event);
 
+        /**
+         * Handles mouse move on map.
+         */
+        void
+        mouseMoved(gcn::MouseEvent &event);
+
         /**
          * Shows a popup for an item.
          * TODO Find some way to get rid of Item here
@@ -170,6 +176,7 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         float mViewX;              /**< Current viewpoint in pixels. */
         float mViewY;              /**< Current viewpoint in pixels. */
         bool mShowDebugPath;       /**< Show a path from player to pointer. */
+        bool mVisibleNames;        /**< Show target names. */
 
         /** Images of in range target cursor. */
         ImageSet *mInRangeImages[Being::NUM_TC];
@@ -188,6 +195,7 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         int mLocalWalkTime; /**< Timestamp before the next walk can be sent. */
 
         PopupMenu *mPopupMenu;     /**< Popup menu. */
+        Being *mSelectedBeing;     /**< Current selected being. */
 };
 
 #endif
-- 
cgit v1.2.3-70-g09d2


From 2cf38d37f86c5e5d82d77713afd093735db0598a Mon Sep 17 00:00:00 2001
From: Mateusz Kaduk <mateusz.kaduk@gmail.com>
Date: Wed, 4 Jun 2008 08:57:45 +0000
Subject: Small fix for displaying all names.

---
 src/gui/viewport.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 0dcebd87..4036f588 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -240,7 +240,9 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     {
         (*i)->drawSpeech(graphics, -(int) mViewX, -(int) mViewY);
         if(mVisibleNames && (*i) == mSelectedBeing)
-        (*i)->drawName(graphics, -(int) mViewX, -(int) mViewY);
+            (*i)->drawName(graphics, -(int) mViewX, -(int) mViewY);
+	else if(!mVisibleNames)
+            (*i)->drawName(graphics, -(int) mViewX, -(int) mViewY);
         (*i)->drawEmotion(graphics, -(int) mViewX, -(int) mViewY);
     }
 
-- 
cgit v1.2.3-70-g09d2


From a0b6e09737b7b416a38c08d8e1d6744a4cc12f7d Mon Sep 17 00:00:00 2001
From: Roderic Morris <roderic@ccs.neu.edu>
Date: Sun, 15 Jun 2008 02:24:40 +0000
Subject: fix compiler and cmake warnings

---
 ChangeLog                           | 5 +++++
 data/graphics/CMakeLists.txt        | 1 -
 data/graphics/images/CMakeLists.txt | 2 --
 src/gui/viewport.cpp                | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index 24b2ab34..47d0b364 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-14  Roderic Morris  <roderic@ccs.neu.edu>
+
+	* src/gui/viewport.cpp, data/graphics/images/CMakeLists.txt,
+	data/graphics/CMakeLists.txt: Fix compiler and cmake warnings.
+
 2008-06-11  David Athay  <ko2fan@gmail.com>
 
 	* src/gui/guildlistbox.cpp: Fixed displaying guild members in guild 
diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt
index 9a916db3..58d75523 100644
--- a/data/graphics/CMakeLists.txt
+++ b/data/graphics/CMakeLists.txt
@@ -1,3 +1,2 @@
 ADD_SUBDIRECTORY(gui)
 ADD_SUBDIRECTORY(images)
-ADD_SUBDIRECTORY(tiles)
diff --git a/data/graphics/images/CMakeLists.txt b/data/graphics/images/CMakeLists.txt
index a8b6ddbd..5181b4e1 100644
--- a/data/graphics/images/CMakeLists.txt
+++ b/data/graphics/images/CMakeLists.txt
@@ -1,5 +1,3 @@
-ADD_SUBDIRECTORY(ambient)
-
 SET(FILES
     error.png
     login_wallpaper.png
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 4036f588..11dbb146 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -56,10 +56,10 @@ Viewport::Viewport():
     mViewX(0.0f),
     mViewY(0.0f),
     mShowDebugPath(false),
+    mVisibleNames(false),
     mPlayerFollowMouse(false),
     mWalkTime(0),
-    mLocalWalkTime(-1),
-    mVisibleNames(false)
+    mLocalWalkTime(-1)
 {
     setOpaque(false);
     addMouseListener(this);
-- 
cgit v1.2.3-70-g09d2


From 1e5a8a201f59cb54f725ac4660a41013bcd768cf Mon Sep 17 00:00:00 2001
From: Roderic Morris <roderic@ccs.neu.edu>
Date: Mon, 14 Jul 2008 23:15:10 +0000
Subject: fix view names checkbox, fix compilation with cmake

---
 ChangeLog            | 6 ++++++
 src/CMakeLists.txt   | 2 ++
 src/gui/chat.cpp     | 2 +-
 src/gui/chat.h       | 2 +-
 src/gui/viewport.cpp | 8 ++++----
 5 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index eee2a19d..7cdd321f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-14  Roderic Morris  <roderic@ccs.neu.edu>
+
+	* src/CMakeLists.txt: Added the partyhandler to the cmake build list.
+	* src/gui/viewport.cpp: Reverse the effect of visible names.
+	* src/gui/chat.cpp, src/gui/chat.h: Cosmetic changes to a hack.
+
 2008-07-14  David Athay  <ko2fan@gmail.com>
 
 	* src/game.cpp, src/commandhandler.cpp, src/game.h: Added admin commands
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ce322bdc..117ca7a9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -241,6 +241,8 @@ SET(SRCS
     net/network.h
     net/npchandler.cpp
     net/npchandler.h
+    net/partyhandler.cpp
+    net/partyhandler.h
     net/playerhandler.cpp
     net/playerhandler.h
     net/protocol.h
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index ad5e0c9b..b7c63247 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -155,7 +155,7 @@ void ChatWindow::logic()
 void
 ChatWindow::chatLog(std::string line, int own, std::string channelName)
 {
-    if(channelName == "getFocused\"")
+    if(channelName.empty())
         channelName = getFocused();
 
     ChannelMap::const_iterator chan = mChannels.find(channelName);
diff --git a/src/gui/chat.h b/src/gui/chat.h
index e0e61ce5..3923e097 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -95,7 +95,7 @@ class ChatWindow : public Window,
          */
         void chatLog(std::string line,
                      int own = BY_SERVER,
-                     std::string channelName = "getFocused\"");
+                     std::string channelName = "");
 
         /**
          * Performs action.
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 11dbb146..9677f81a 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -68,7 +68,7 @@ Viewport::Viewport():
     mScrollRadius = (int) config.getValue("ScrollRadius", 32);
     mScrollCenterOffsetX = (int) config.getValue("ScrollCenterOffsetX", 0);
     mScrollCenterOffsetY = (int) config.getValue("ScrollCenterOffsetY", 0);
-    mVisibleNames = (config.getValue("visiblenames", 1) == 1);
+    mVisibleNames = config.getValue("visiblenames", 1);
 
     config.addListener("ScrollLaziness", this);
     config.addListener("ScrollRadius", this);
@@ -239,9 +239,9 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     for (BeingIterator i = beings.begin(); i != beings.end(); i++)
     {
         (*i)->drawSpeech(graphics, -(int) mViewX, -(int) mViewY);
-        if(mVisibleNames && (*i) == mSelectedBeing)
+        if(mVisibleNames)
             (*i)->drawName(graphics, -(int) mViewX, -(int) mViewY);
-	else if(!mVisibleNames)
+	else if((*i) == mSelectedBeing)
             (*i)->drawName(graphics, -(int) mViewX, -(int) mViewY);
         (*i)->drawEmotion(graphics, -(int) mViewX, -(int) mViewY);
     }
@@ -469,7 +469,7 @@ Viewport::optionChanged(const std::string &name)
     mScrollRadius = (int) config.getValue("ScrollRadius", 32);
 
     if (name == "visiblenames") {
-                mVisibleNames = config.getValue("visiblenames", 1) == 1;     
+                mVisibleNames = config.getValue("visiblenames", 1);     
     }
 }
 
-- 
cgit v1.2.3-70-g09d2


From 3fe1772b1e00344365e3cf8204225be19925b9e5 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 9 Oct 2008 19:42:13 +0000
Subject: Merged the movement branch into trunk

I consider this the only way forward. In my tests this code isn't actually
doing worse than what was there before. Of course some cases are a bit broken,
and I'm open to any kind of feedback so that we can fix those issues.
---
 ChangeLog                   |  66 ++++++++
 src/CMakeLists.txt          |   3 +
 src/Makefile.am             |   7 +-
 src/animatedsprite.cpp      |  26 +---
 src/being.cpp               | 230 +++++++++++----------------
 src/being.h                 | 110 +++++--------
 src/beingmanager.cpp        |  15 +-
 src/game.cpp                |   9 +-
 src/gui/minimap.cpp         |   7 +-
 src/gui/playerbox.cpp       |   7 +-
 src/gui/updatewindow.cpp    |   4 +-
 src/gui/viewport.cpp        |  91 +++++------
 src/gui/viewport.h          |  11 +-
 src/localplayer.cpp         |  63 +++++---
 src/map.cpp                 |  35 +----
 src/map.h                   |  12 +-
 src/monster.cpp             |   1 -
 src/net/beinghandler.cpp    | 370 +++-----------------------------------------
 src/net/playerhandler.cpp   |   7 +-
 src/npc.cpp                 |  10 +-
 src/particleemitter.cpp     |   5 +-
 src/player.cpp              |  11 +-
 src/position.cpp            |  47 ++++++
 src/position.h              |  60 +++++++
 src/resources/spritedef.cpp |   5 +-
 src/simpleanimation.cpp     |   5 +-
 src/vector.cpp              |  30 ++++
 src/vector.h                |  68 +++++++-
 28 files changed, 573 insertions(+), 742 deletions(-)
 create mode 100644 src/position.cpp
 create mode 100644 src/position.h
 create mode 100644 src/vector.cpp

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index 74cc958b..4294d0e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,76 @@
+2008-10-07  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/updatewindow.cpp, src/particleemitter.cpp,
+	src/simpleanimation.cpp, src/resources/spritedef.cpp: Fixed some
+	compiler warnings. This probably also fixed the logging of several
+	error messages.
+
+2008-09-30  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/being.cpp: Fixed conversion of positions in the path to pixel
+	coordinates. Solves issues with keyboard walking and other
+	strangeness.
+	* src/localplayer.cpp, src/gui/playerbox.cpp, src/npc.cpp,
+	src/player.cpp, src/being.cpp, src/being.h: Fixed updating of player
+	direction and animation. Also fixed position of name, particle effects
+	and the position of the player sprite in the player box.
+	* src/map.cpp: Fixed ordering of sprites and tiles on the fringe
+	layer.
+
+2008-09-29  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/localplayer.cpp, src/being.cpp, src/being.h: Reenabled keyboard
+	walking (though its offset is broken) and make the player walk to the
+	exact destination when reaching the end of the path.
+	* src/being.cpp, src/animatedsprite.cpp: Corrected the location at
+	which the player sprite is drawn to match with the clicking location.
+	Might be a workaround for a bug elsewhere, I'm not sure yet.
+
+2008-09-28  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/localplayer.cpp, src/gui/viewport.h, src/gui/viewport.cpp,
+	src/position.cpp, src/position.h, src/being.cpp, src/CMakeLists.txt,
+	src/Makefile.am, src/being.h: Added printing and drawing of paths
+	beings are taking and fixed an issue in adjustPath (interpreting tiles
+	as pixels) that caused beings to stop moving.
+
+2008-09-26  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/net/beinghandler.cpp: Fixed interpretation of being speed.
+
 2008-09-14  Roderic Morris  <roderic@ccs.neu.edu>
 
 	* src/gui/widgets/tabbedarea.cpp, src/gui/widgets/tabbedarea.h:
 	Fix to avoid guichan bug and call logic in tabbed area children.
 
+2008-09-09  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/being.cpp, src/net/beinghandler.cpp, src/being.h: Take into
+	account the speed sent by the server. Currently interpreted as pixels
+	per second, but this seems to be a bit too slow.
+	* src/localplayer.cpp: Re-enabled moving by mouse. Shows how utterly
+	broken the thing still is, but makes testing easier.
+
+2008-09-08  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/vector.cpp, src/being.cpp, src/CMakeLists.txt, src/vector.h,
+	src/Makefile.am: Made sure at least something happens.
+
+2008-09-07  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/map.cpp, src/position.h, src/being.cpp, src/CMakeLists.txt,
+	src/net/beinghandler.cpp, src/vector.h, src/map.h, src/Makefile.am,
+	src/being.h: Some late night fiddling around. It isn't doing anything
+	yet, but no time left to figure out why.
+
 2008-09-04  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
+	* src/localplayer.cpp, src/game.cpp, src/map.cpp, src/gui/viewport.h,
+	src/gui/viewport.cpp, src/gui/minimap.cpp, src/beingmanager.cpp,
+	src/npc.cpp, src/player.cpp, src/being.cpp, src/monster.cpp,
+	src/net/beinghandler.cpp, src/net/playerhandler.cpp, src/vector.h,
+	src/map.h, src/being.h: Almost completely disabled old style movement.
+	Clearing the road for a new movement system.
 	* src/map.cpp, src/gui/setup.cpp, src/gui/shop.cpp,
 	src/gui/windowcontainer.cpp, src/gui/skill.cpp, src/beingmanager.cpp,
 	src/flooritemmanager.cpp, src/channelmanager.cpp, src/being.cpp,
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aee99d2e..688f8787 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -390,6 +390,8 @@ SET(SRCS
     particleemitter.h
     player.cpp
     player.h
+    position.cpp
+    position.h
     properties.h
     serverinfo.h
     shopitem.cpp
@@ -402,6 +404,7 @@ SET(SRCS
     textparticle.cpp
     textparticle.h
     tileset.h
+    vector.cpp
     vector.h
     )
 
diff --git a/src/Makefile.am b/src/Makefile.am
index e7752477..e1de3a34 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,8 +7,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/widgets/layout.h \
 	      gui/widgets/resizegrip.cpp \
 	      gui/widgets/resizegrip.h \
-              gui/widgets/tab.cpp \
-              gui/widgets/tab.h \
+	      gui/widgets/tab.cpp \
+	      gui/widgets/tab.h \
 	      gui/widgets/tabbedarea.cpp \
 	      gui/widgets/tabbedarea.h \
 	      gui/box.h \
@@ -342,6 +342,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      particleemitter.h \
 	      player.cpp \
 	      player.h \
+	      position.cpp \
+	      position.h \
 	      properties.h \
 	      serverinfo.h \
 	      shopitem.cpp \
@@ -354,6 +356,7 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      textparticle.cpp \
 	      textparticle.h \
 	      tileset.h \
+	      vector.cpp \
 	      vector.h
 
 # set the include path found by configure
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 466779fd..13596a70 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -160,9 +160,7 @@ bool
 AnimatedSprite::draw(Graphics* graphics, int posX, int posY) const
 {
     if (!mFrame || !mFrame->image)
-    {
         return false;
-    }
 
     return graphics->drawImage(mFrame->image,
                                posX + mFrame->offsetX,
@@ -177,9 +175,7 @@ AnimatedSprite::setDirection(SpriteDirection direction)
         mDirection = direction;
 
         if (!mAction)
-        {
             return;
-        }
 
         Animation *animation = mAction->getAnimation(mDirection);
 
@@ -192,26 +188,12 @@ AnimatedSprite::setDirection(SpriteDirection direction)
     }
 }
 
-int
-AnimatedSprite::getWidth() const
+int AnimatedSprite::getWidth() const
 {
-    if (mFrame)
-    {
-        return mFrame->image->getWidth();
-    }
-    else {
-        return 0;
-    }
+    return mFrame ? mFrame->image->getWidth() : 0;
 }
 
-int
-AnimatedSprite::getHeight() const
+int AnimatedSprite::getHeight() const
 {
-    if (mFrame)
-    {
-        return mFrame->image->getHeight();
-    }
-    else {
-        return 0;
-    }
+    return mFrame ? mFrame->image->getHeight() : 0;
 }
diff --git a/src/being.cpp b/src/being.cpp
index cf2e3772..7b77ed5a 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -43,27 +43,27 @@
 #include "utils/dtor.h"
 #include "utils/tostring.h"
 
+namespace {
+const bool debug_movement = true;
+}
+
 int Being::instances = 0;
 ImageSet *Being::emotionSet = NULL;
 
 Being::Being(int id, int job, Map *map):
-    mX(0), mY(0),
     mEmotion(0), mEmotionTime(0),
     mAttackSpeed(350),
-    mWalkTime(0),
     mAction(STAND),
     mJob(job),
     mId(id),
-    mWalkSpeed(150),
-    mSpeedModifier(1024),
     mSpriteDirection(DIRECTION_DOWN), mDirection(DOWN),
     mMap(NULL),
     mEquippedWeapon(NULL),
     mSpeechTime(0),
-    mPx(0), mPy(0),
     mSprites(VECTOREND_SPRITE, NULL),
     mSpriteIDs(VECTOREND_SPRITE, 0),
-    mSpriteColors(VECTOREND_SPRITE, "")
+    mSpriteColors(VECTOREND_SPRITE, ""),
+    mWalkSpeed(100)
 {
     setMap(map);
 
@@ -106,27 +106,36 @@ Being::~Being()
     delete mSpeechBubble;
 }
 
-void Being::setPositionInPixels(int x, int y)
+void Being::setPosition(const Vector &pos)
 {
-    mMap->freeTile(mX / 32, mY / 32, getBlockType());
-    mX = x;
-    mY = y;
-    mMap->blockTile(x / 32, y / 32, getBlockType());
+    mPos = pos;
+    mDest = pos;
 }
 
-void Being::adjustCourse(Uint16 srcX, Uint16 srcY, Uint16 dstX, Uint16 dstY)
+void Being::adjustCourse(int srcX, int srcY, int dstX, int dstY)
 {
-    if (!mMap || (mX == dstX && mY == dstY))
-    {
+    if (debug_movement)
+        printf("%p adjustCourse(%d, %d, %d, %d)\n",
+                (void*) this, srcX, srcY, dstX, dstY);
+
+    mDest.x = dstX;
+    mDest.y = dstY;
+
+    // Find a path to the destination when it is at least a tile away
+    if (mMap && fabsf((mDest - mPos).length()) > 32) {
+        setPath(mMap->findPath((int) mPos.x / 32, (int) mPos.y / 32,
+                               dstX / 32, dstY / 32, getWalkMask()));
+    } else {
         setPath(Path());
-        return;
     }
 
+    // TODO: Evaluate the implementation of this method
+    /*
     if (mX / 32 == dstX / 32 && mY / 32 == dstY / 32)
     {
         // The being is already on the last tile of the path.
         Path p;
-        p.push_back(PATH_NODE(dstX, dstY));
+        p.push_back(Position(dstX, dstY));
         setPath(p);
         return;
     }
@@ -173,7 +182,7 @@ void Being::adjustCourse(Uint16 srcX, Uint16 srcY, Uint16 dstX, Uint16 dstY)
         p1_length = mMap->getMetaTile(dstX / 32, dstY / 32)->Gcost;
         p1_dist[p1_size - 1] = p1_length;
     }
-    p1.push_back(PATH_NODE(dstX, dstY));
+    p1.push_back(Position(dstX, dstY));
 
     if (mX / 32 == srcX / 32 && mY / 32 == srcY / 32)
     {
@@ -248,19 +257,24 @@ void Being::adjustCourse(Uint16 srcX, Uint16 srcY, Uint16 dstX, Uint16 dstY)
     assert(bestLength > 0);
     setPath(p1, p1_length * 1024 / bestLength);
     delete[] p1_dist;
+    */
 }
 
-void Being::adjustCourse(Uint16 srcX, Uint16 srcY)
+void Being::adjustCourse(int srcX, int srcY)
 {
+    if (debug_movement)
+        printf("%p adjustCourse(%d, %d)\n", (void*) this, srcX, srcY);
+
     if (!mPath.empty())
-    {
-        adjustCourse(srcX, srcY, mPath.back().x, mPath.back().y);
-    }
+        adjustCourse(srcX, srcY, mPath.back().x * 32, mPath.back().y * 32);
 }
 
-void Being::setDestination(Uint16 destX, Uint16 destY)
+void Being::setDestination(int destX, int destY)
 {
-    adjustCourse(mX, mY, destX, destY);
+    if (debug_movement)
+        printf("%p setDestination(%d, %d)\n", (void*) this, destX, destY);
+
+    adjustCourse((int) mPos.x, (int) mPos.y, destX, destY);
 }
 
 void Being::clearPath()
@@ -268,34 +282,10 @@ void Being::clearPath()
     mPath.clear();
 }
 
-void Being::setPath(const Path &path, int mod)
+void Being::setPath(const Path &path)
 {
+    std::cout << this << " New path: " << path << std::endl;
     mPath = path;
-    mSpeedModifier = mod >= 512 ? (mod <= 2048 ? mod : 2048) : 512; // TODO: tune bounds
-
-    int sz = mPath.size();
-    if (sz > 1)
-    {
-        // The path contains intermediate steps, so avoid going through tile
-        // centers for them. Instead, interpolate the tile offset.
-        int sx = mX & 31, sy = mY & 31;
-        int dx = (mPath.back().x & 31) - sx;
-        int dy = (mPath.back().y & 31) - sy;
-        Path::iterator j = mPath.begin();
-        for (int i = 0; i < sz - 1; ++i)
-        {
-            j->x |= sx + dx * (i + 1) / (sz - 1);
-            j->y |= sy + dy * (i + 1) / (sz - 1);
-            ++j;
-        }
-    }
-
-    if (mAction != WALK && mAction != DEAD)
-    {
-        mWalkTime = tick_time;
-        mStepTime = 0;
-        nextStep();
-    }
 }
 
 void Being::setSprite(int slot, int id, const std::string &color)
@@ -339,7 +329,8 @@ void Being::takeDamage(int amount)
 
     // Show damage number
     particleEngine->addTextSplashEffect(damage, 255, 255, 255, font,
-                                        mPx + 16, mPy + 16);
+                                        (int) mPos.x + 16,
+                                        (int) mPos.y + 16);
 }
 
 void Being::handleAttack()
@@ -349,11 +340,9 @@ void Being::handleAttack()
 
 void Being::setMap(Map *map)
 {
-
     // Remove sprite from potential previous map
     if (mMap)
     {
-        mMap->freeTile(mX / 32, mY / 32, getBlockType());
         mMap->removeSprite(mSpriteIterator);
     }
 
@@ -363,7 +352,6 @@ void Being::setMap(Map *map)
     if (mMap)
     {
         mSpriteIterator = mMap->addSprite(this);
-        mMap->blockTile(mX / 32, mY / 32, getBlockType());
     }
 
     // Clear particle effect list because child particles became invalid
@@ -447,21 +435,13 @@ void Being::setDirection(Uint8 direction)
 
     SpriteDirection dir;
     if (mFaceDirection & UP)
-    {
         dir = DIRECTION_UP;
-    }
     else if (mFaceDirection & RIGHT)
-    {
         dir = DIRECTION_RIGHT;
-    }
     else if (mFaceDirection & DOWN)
-    {
         dir = DIRECTION_DOWN;
-    }
     else
-    {
         dir = DIRECTION_LEFT;
-    }
     mSpriteDirection = dir;
 
     for (int i = 0; i < VECTOREND_SPRITE; i++)
@@ -471,57 +451,48 @@ void Being::setDirection(Uint8 direction)
     }
 }
 
-void Being::nextStep()
-{
-    if (mPath.empty())
-    {
-        setAction(STAND);
-        return;
-    }
-
-    PATH_NODE node = mPath.front();
-    mPath.pop_front();
-
-    mStepX = node.x - mX;
-    mStepY = node.y - mY;
-
-    int dir = 0, dx = std::abs(mStepX), dy = std::abs(mStepY);
-    if (dx * 2 > dy)
-        dir |= mStepX > 0 ? RIGHT : LEFT;
-    if (dy * 2 > dx)
-        dir |= mStepY > 0 ? DOWN : UP;
-
-    setDirection(dir);
-
-    if (!mMap->getWalk(node.x / 32, node.y / 32))
-    {
-        setAction(STAND);
-        return;
-    }
-
-    setPositionInPixels(node.x, node.y);
-    setAction(WALK);
-    mWalkTime += mStepTime / 10;
-    mStepTime = mWalkSpeed * (int)std::sqrt((double)mStepX * mStepX + (double)mStepY * mStepY) *
-                mSpeedModifier / (32 * 1024);
-}
-
 void Being::logic()
 {
-    // Determine whether the being should take another step
-    if (mAction == WALK && get_elapsed_time(mWalkTime) >= mStepTime)
-    {
-        nextStep();
+    const Vector dest = (mPath.empty()) ?
+        mDest : Vector(mPath.front().x * 32 + 16,
+                       mPath.front().y * 32 + 16);
+
+    Vector dir = dest - mPos;
+    const float length = dir.length();
+
+    // When we're over 2 pixels from our destination, move to it
+    // TODO: Should be possible to make it even pixel exact, but this solves
+    //       the jigger caused by moving too far.
+    if (length > 2.0f) {
+        const float speed = mWalkSpeed / 100.0f;
+        dir /= (length / speed);
+        mPos += dir;
+
+        if (mAction != WALK)
+            setAction(WALK);
+
+        // Update the player sprite direction
+        int direction = 0;
+        const float dx = std::abs(dir.x);
+        const float dy = std::abs(dir.y);
+        if (dx * 2 > dy)
+            direction |= (dir.x > 0) ? RIGHT : LEFT;
+        if (dy * 2 > dx)
+            direction |= (dir.y > 0) ? DOWN : UP;
+        setDirection(direction);
+    }
+    else if (!mPath.empty()) {
+        // TODO: Pop as soon as there is a direct unblocked line to the next
+        //       point on the path.
+        mPath.pop_front();
+    } else if (mAction == WALK) {
+        setAction(STAND);
     }
 
     // Reduce the time that speech is still displayed
     if (mSpeechTime > 0)
         mSpeechTime--;
 
-    // Update pixel coordinates
-    mPx = mX - 16 + getXOffset();
-    mPy = mY - 16 + getYOffset();
-
     if (mEmotion != 0)
     {
         mEmotionTime--;
@@ -543,7 +514,7 @@ void Being::logic()
     for (std::list<Particle *>::iterator i = mChildParticleEffects.begin();
          i != mChildParticleEffects.end();)
     {
-        (*i)->setPosition((float)mPx + 16.0f, (float)mPy + 32.0f);
+        (*i)->setPosition(mPos.x, mPos.y);
         if (!(*i)->isAlive())
         {
             (*i)->kill();
@@ -557,14 +528,16 @@ void Being::logic()
 
 void Being::draw(Graphics *graphics, int offsetX, int offsetY) const
 {
-    int px = mPx + offsetX;
-    int py = mPy + offsetY;
+    int px = (int) mPos.x + offsetX;
+    int py = (int) mPos.y + offsetY;
 
     for (int i = 0; i < VECTOREND_SPRITE; i++)
     {
         if (mSprites[i] != NULL)
         {
-            mSprites[i]->draw(graphics, px, py);
+            // TODO: Eventually, we probably should fix all sprite offsets so
+            //       that this translation isn't necessary anymore.
+            mSprites[i]->draw(graphics, px - 16, py - 32);
         }
     }
 }
@@ -574,18 +547,18 @@ void Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
     if (!mEmotion)
         return;
 
-    const int px = mPx + offsetX + 3;
-    const int py = mPy + offsetY - 60;
+    const int px = (int) mPos.x + offsetX + 3;
+    const int py = (int) mPos.y + offsetY - 60;
     const int emotionIndex = mEmotion - 1;
 
-    if ( emotionIndex >= 0 && emotionIndex < (int) emotionSet->size() )
+    if (emotionIndex >= 0 && emotionIndex < (int) emotionSet->size())
         graphics->drawImage(emotionSet->get(emotionIndex), px, py);
 }
 
 void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
 {
-    int px = mPx + offsetX;
-    int py = mPy + offsetY;
+    int px = (int) mPos.x + offsetX;
+    int py = (int) mPos.y + offsetY;
 
     // Draw speech above this being
     if (mSpeechTime > 0)
@@ -605,32 +578,7 @@ Being::Type Being::getType() const
     return UNKNOWN;
 }
 
-int Being::getOffset(int step) const
-{
-    // Check whether we're walking in the requested direction
-    if (mAction != WALK || step == 0) {
-        return 0;
-    }
-
-    int offset = (get_elapsed_time(mWalkTime) * std::abs(step)) / mStepTime;
-
-    // We calculate the offset _from_ the _target_ location
-    offset -= std::abs(step);
-    if (offset > 0) {
-        offset = 0;
-    }
-
-    // Going into negative direction? Invert the offset.
-    if (step < 0) {
-        offset = -offset;
-    }
-
-    return offset;
-}
-
-
-int
-Being::getWidth() const
+int Being::getWidth() const
 {
     if (mSprites[BASE_SPRITE])
     {
@@ -641,9 +589,7 @@ Being::getWidth() const
     }
 }
 
-
-int
-Being::getHeight() const
+int Being::getHeight() const
 {
     if (mSprites[BASE_SPRITE])
     {
diff --git a/src/being.h b/src/being.h
index 9d04f383..567a0d98 100644
--- a/src/being.h
+++ b/src/being.h
@@ -29,9 +29,11 @@
 #include <SDL_types.h>
 #include <vector>
 
+#include "position.h"
 #include "sprite.h"
 #include "map.h"
 #include "animatedsprite.h"
+#include "vector.h"
 
 #define NR_HAIR_STYLES 8
 #define NR_HAIR_COLORS 10
@@ -46,24 +48,6 @@ class ImageSet;
 class Particle;
 class SpeechBubble;
 
-/**
- * A position along a being's path.
- */
-struct PATH_NODE
-{
-    /**
-     * Constructor.
-     */
-    PATH_NODE(unsigned short x, unsigned short y):
-        x(x), y(y)
-    { }
-
-    unsigned short x;
-    unsigned short y;
-};
-typedef std::list<PATH_NODE> Path;
-typedef Path::iterator PathIterator;
-
 class Being : public Sprite
 {
     public:
@@ -113,11 +97,9 @@ class Being : public Sprite
         enum { DOWN = 1, LEFT = 2, UP = 4, RIGHT = 8 };
 
         std::string mName;      /**< Name of character */
-        Uint16 mX, mY;          /**< Pixel coordinates of tile center */
         Uint8 mEmotion;         /**< Currently showing emotion */
         Uint8 mEmotionTime;     /**< Time until emotion disappears */
         Uint16 mAttackSpeed;    /**< Attack speed */
-        Uint16 mWalkTime;
         Action mAction;         /**< Action the being is performing */
         Uint16 mJob;            /**< Job (player job, npc, monster, creature ) */
 
@@ -139,17 +121,17 @@ class Being : public Sprite
         /**
          * Sets a new destination for this being to walk to.
          */
-        void setDestination(Uint16 destX, Uint16 destY);
+        void setDestination(int x, int y);
 
         /**
          * Adjusts course to expected stat point.
          */
-        void adjustCourse(Uint16, Uint16);
+        void adjustCourse(int, int);
 
         /**
          * Adjusts course to expected start and end points.
          */
-        void adjustCourse(Uint16, Uint16, Uint16, Uint16);
+        void adjustCourse(int, int, int, int);
 
         /**
          * Puts a "speech balloon" above this being for the specified amount
@@ -194,12 +176,6 @@ class Being : public Sprite
         virtual void
         setSprite(int slot, int id, const std::string &color = "");
 
-        /**
-         * Makes this being take the next step of his path.
-         */
-        virtual void
-        nextStep();
-
         /**
          * Performs being logic.
          */
@@ -231,15 +207,14 @@ class Being : public Sprite
 
         /**
          * Gets the walk speed.
+         * @see setWalkSpeed(int)
          */
-        Uint16
-        getWalkSpeed() const { return mWalkSpeed; }
+        int getWalkSpeed() const { return mWalkSpeed; }
 
         /**
-         * Sets the walk speed.
+         * Sets the walk speed (in pixels per second).
          */
-        void
-        setWalkSpeed(Uint16 speed) { mWalkSpeed = speed; }
+        void setWalkSpeed(int speed) { mWalkSpeed = speed; }
 
         /**
          * Gets the being id.
@@ -269,8 +244,6 @@ class Being : public Sprite
          */
         bool isAlive() { return mAction != DEAD; }
 
-        int getWalkTime() { return mWalkTime; }
-
         /**
          * Returns the direction the being is facing.
          */
@@ -287,57 +260,49 @@ class Being : public Sprite
          *
          * @see Sprite::draw(Graphics, int, int)
          */
-        virtual void
-        draw(Graphics *graphics, int offsetX, int offsetY) const;
+        virtual void draw(Graphics *graphics, int offsetX, int offsetY) const;
 
         /**
          * Returns the pixel X coordinate.
          */
-        int
-        getPixelX() const { return mPx; }
+        int getPixelX() const { return (int) mPos.x; }
 
         /**
          * Returns the pixel Y coordinate.
          *
          * @see Sprite::getPixelY()
          */
-        int
-        getPixelY() const { return mPy; }
+        int getPixelY() const { return (int) mPos.y; }
 
         /**
-         * sets the position in pixels using pixel coordinates
+         * Sets the position of this being.
          */
-        void setPositionInPixels(int x, int y);
+        void setPosition(const Vector &pos);
 
         /**
-         * sets the position in pixels using tile coordinates
-         */
-        void setPositionInTiles(int x, int y)
-        { setPositionInPixels(x * 32 + 16, y * 32 + 16); }
-
-        /**
-         * Get the current X pixel offset.
+         * Overloaded method provided for convenience.
+         *
+         * @see setPosition(const Vector &pos)
          */
-        int
-        getXOffset() const { return getOffset(mStepX); }
+        void setPosition(float x, float y, float z = 0.0f)
+        {
+            setPosition(Vector(x, y, z));
+        }
 
         /**
-         * Get the current Y pixel offset.
+         * Returns the position of this being.
          */
-        int
-        getYOffset() const { return getOffset(mStepY); }
+        const Vector &getPosition() const { return mPos; }
 
         /**
-         * Returns the horizontal size of the current base sprite of the being
+         * Returns the horizontal size of the current base sprite of the being.
          */
-        virtual int
-        getWidth() const;
+        virtual int getWidth() const;
 
         /**
-         * Returns the vertical size of the current base sprite of the being
+         * Returns the vertical size of the current base sprite of the being.
          */
-        virtual int
-        getHeight() const;
+        virtual int getHeight() const;
 
         /**
          * Returns the required size of a target cursor for this being.
@@ -351,16 +316,22 @@ class Being : public Sprite
         void controlParticle(Particle *particle);
 
         /**
-         * Gets the way the object is blocked by other objects
+         * Gets the way the object is blocked by other objects.
          */
         virtual unsigned char getWalkMask() const
         { return 0x00; } //can walk through everything
 
+        /**
+         * Returns the path this being is following. An empty path is returned
+         * when this being isn't following any path currently.
+         */
+        const Path &getPath() const { return mPath; }
+
     protected:
         /**
          * Sets the new path for this being.
          */
-        void setPath(const Path &path, int mod = 1024);
+        void setPath(const Path &path);
 
         /**
          * Gets the way the object blocks pathfinding for other objects
@@ -369,8 +340,6 @@ class Being : public Sprite
         { return Map::BLOCKTYPE_NONE; }
 
         Uint16 mId;                     /**< Unique being id */
-        Uint16 mWalkSpeed;              /**< Walking speed */
-        Uint16 mSpeedModifier;          /**< Modifier to keep course on sync (1024 = normal speed) */
         Uint8 mSpriteDirection;         /**< Facing direction */
         Uint8 mDirection;               /**< Walking direction */
         Map *mMap;                      /**< Map on which this being resides */
@@ -382,7 +351,6 @@ class Being : public Sprite
         Path mPath;
         std::string mSpeech;
         Uint32 mSpeechTime;
-        Sint32 mPx, mPy;                /**< Pixel coordinates */
 
         std::vector<AnimatedSprite*> mSprites;
         std::vector<int> mSpriteIDs;
@@ -390,13 +358,13 @@ class Being : public Sprite
         std::list<Particle *> mChildParticleEffects;
 
     private:
-        int getOffset(int step) const;
-
         // Speech Bubble components
         SpeechBubble *mSpeechBubble;
 
-        Sint16 mStepX, mStepY;
-        Uint16 mStepTime;
+        int mWalkSpeed;                 /**< Walking speed (pixels/sec) */
+
+        Vector mPos;
+        Vector mDest;
 
         static int instances;           /**< Number of Being instances */
         static ImageSet *emotionSet;    /**< Emoticons used by beings */
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index a58c97e7..abb23f5e 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -39,8 +39,9 @@ class FindBeingFunctor
         bool operator() (Being *being)
         {
             Uint16 other_y = y + ((being->getType() == Being::NPC) ? 1 : 0);
-            return (being->mX / 32 == x &&
-                    (being->mY / 32 == y || being->mY / 32 == other_y) &&
+            const Vector &pos = being->getPosition();
+            return ((int) pos.x / 32 == x &&
+                    ((int) pos.y / 32 == y || (int) pos.y / 32 == other_y) &&
                     being->mAction != Being::DEAD &&
                     (type == Being::UNKNOWN || being->getType() == type));
         }
@@ -165,7 +166,8 @@ Being* BeingManager::findNearestLivingBeing(Uint16 x, Uint16 y, int maxdist,
     for (BeingIterator i = mBeings.begin(); i != mBeings.end(); i++)
     {
         Being *being = (*i);
-        int d = abs(being->mX - x) + abs(being->mY - y);
+        const Vector &pos = being->getPosition();
+        int d = abs((int) pos.x - x) + abs((int) pos.y - y);
 
         if ((being->getType() == type || type == Being::UNKNOWN)
                 && (d < dist || closestBeing == NULL)   // it is closer
@@ -185,13 +187,14 @@ Being* BeingManager::findNearestLivingBeing(Being *aroundBeing, int maxdist,
 {
     Being *closestBeing = NULL;
     int dist = 0;
-    int x = aroundBeing->mX;
-    int y = aroundBeing->mY;
+    const Vector &aroundBeingPos = aroundBeing->getPosition();
 
     for (BeingIterator i = mBeings.begin(); i != mBeings.end(); i++)
     {
         Being *being = (*i);
-        int d = abs(being->mX - x) + abs(being->mY - y);
+        const Vector &pos = being->getPosition();
+        int d = abs((int) pos.x - aroundBeingPos.x) +
+                abs((int) pos.y - aroundBeingPos.y);
 
         if ((being->getType() == type || type == Being::UNKNOWN)
                 && (d < dist || closestBeing == NULL)   // it is closer
diff --git a/src/game.cpp b/src/game.cpp
index e2343f39..fb434be2 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -580,8 +580,9 @@ void Game::handleInput()
                 switch (tKey) {
                     case KeyboardConfig::KEY_PICKUP:
                         {
-                            Uint16 x = player_node->mX / 32;
-                            Uint16 y = player_node->mY / 32;
+                            const Vector &pos = player_node->getPosition();
+                            Uint16 x = (int) pos.x / 32;
+                            Uint16 y = (int) pos.y / 32;
                             FloorItem *item =
                                 floorItemManager->findByCoordinates(x, y);
 
@@ -754,7 +755,9 @@ void Game::handleInput()
         // Get the state of the keyboard keys
         keyboard.refreshActiveKeys();
 
-        Uint16 x = player_node->mX / 32, y = player_node->mY / 32;
+        const Vector &pos = player_node->getPosition();
+        Uint16 x = (int) pos.x / 32;
+        Uint16 y = (int) pos.y / 32;
 
         unsigned char direction = 0;
 
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 4e5664d6..ca6f4fd7 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -113,11 +113,12 @@ void Minimap::draw(gcn::Graphics *graphics)
                 break;
         }
 
-        int offset = (dotSize - 1) / 2;
+        const int offset = (dotSize - 1) / 2;
+        const Vector &pos = being->getPosition();
 
         graphics->fillRectangle(gcn::Rectangle(
-                    being->mX / 64 + getPadding() - offset,
-                    being->mY / 64 + getTitleBarHeight() - offset,
+                    (int) pos.x / 64 + getPadding() - offset,
+                    (int) pos.y / 64 + getTitleBarHeight() - offset,
                     dotSize, dotSize));
     }
 }
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index 2c633b72..e9237110 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -82,10 +82,9 @@ PlayerBox::draw(gcn::Graphics *graphics)
     if (mPlayer)
     {
         // Draw character
-        int x, y, bs;
-        bs = getFrameSize();
-        x = getWidth() / 2 - 16 + bs;
-        y = getHeight() / 2 + bs;
+        const int bs = getFrameSize();
+        const int x = getWidth() / 2 + bs;
+        const int y = getHeight() - bs - 8;
         mPlayer->draw(static_cast<Graphics*>(graphics), x, y);
     }
 }
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index abae69f6..10d0c826 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -60,9 +60,9 @@ unsigned long fadler32(FILE *file)
 
     // Calculate Adler-32 checksum
     char *buffer = (char*) malloc(fileSize);
-    fread(buffer, 1, fileSize, file);
+    const size_t read = fread(buffer, 1, fileSize, file);
     unsigned long adler = adler32(0L, Z_NULL, 0);
-    adler = adler32(adler, (Bytef*) buffer, fileSize);
+    adler = adler32(adler, (Bytef*) buffer, read);
     free(buffer);
 
     return adler;
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 9677f81a..80dcf489 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -58,7 +58,6 @@ Viewport::Viewport():
     mShowDebugPath(false),
     mVisibleNames(false),
     mPlayerFollowMouse(false),
-    mWalkTime(0),
     mLocalWalkTime(-1)
 {
     setOpaque(false);
@@ -91,9 +90,9 @@ Viewport::Viewport():
                      true, Being::TC_LARGE);
 }
 
-void
-Viewport::loadTargetCursor(std::string filename, int width, int height,
-                           bool outRange, Being::TargetCursorSize size)
+void Viewport::loadTargetCursor(const std::string &filename,
+                                int width, int height,
+                                bool outRange, Being::TargetCursorSize size)
 {
     assert(size >= Being::TC_SMALL);
     assert(size < Being::NUM_TC);
@@ -125,7 +124,7 @@ Viewport::loadTargetCursor(std::string filename, int width, int height,
 Viewport::~Viewport()
 {
     delete mPopupMenu;
-    
+
     config.removeListener("visiblenames", this);
 
     for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
@@ -137,14 +136,12 @@ Viewport::~Viewport()
     }
 }
 
-void
-Viewport::setMap(Map *map)
+void Viewport::setMap(Map *map)
 {
     mMap = map;
 }
 
-void
-Viewport::draw(gcn::Graphics *gcnGraphics)
+void Viewport::draw(gcn::Graphics *gcnGraphics)
 {
     static int lastTick = tick_time;
 
@@ -163,8 +160,9 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     int midTileX = (graphics->getWidth() + mScrollCenterOffsetX) / 2;
     int midTileY = (graphics->getHeight() + mScrollCenterOffsetX) / 2;
 
-    int player_x = player_node->mX - midTileX + player_node->getXOffset();
-    int player_y = player_node->mY - midTileY + player_node->getYOffset();
+    const Vector &playerPos = player_node->getPosition();
+    const int player_x = (int) playerPos.x - midTileX;
+    const int player_y = (int) playerPos.y - midTileY;
 
     if (mScrollLaziness < 1)
         mScrollLaziness = 1; // Avoids division by zero
@@ -203,8 +201,10 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     };
 
     // Don't move camera so that the end of the map is on screen
-    int viewXmax = mMap->getWidth() * 32 - graphics->getWidth();
-    int viewYmax = mMap->getHeight() * 32 - graphics->getHeight();
+    const int viewXmax =
+        mMap->getWidth() * mMap->getTileWidth() - graphics->getWidth();
+    const int viewYmax =
+        mMap->getHeight() * mMap->getTileHeight() - graphics->getHeight();
     if (mMap)
     {
         if (mViewX < 0) {
@@ -227,10 +227,11 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
         mMap->draw(graphics, (int) mViewX, (int) mViewY);
         drawTargetCursor(graphics); // TODO: Draw the cursor with the sprite
         drawTargetName(graphics);
-
         if (mShowDebugPath) {
             mMap->drawCollision(graphics, (int) mViewX, (int) mViewY);
+#if 0
             drawDebugPath(graphics);
+#endif
         }
     }
 
@@ -239,19 +240,21 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     for (BeingIterator i = beings.begin(); i != beings.end(); i++)
     {
         (*i)->drawSpeech(graphics, -(int) mViewX, -(int) mViewY);
-        if(mVisibleNames)
+        if (mVisibleNames)
             (*i)->drawName(graphics, -(int) mViewX, -(int) mViewY);
-	else if((*i) == mSelectedBeing)
+        else if ((*i) == mSelectedBeing)
             (*i)->drawName(graphics, -(int) mViewX, -(int) mViewY);
         (*i)->drawEmotion(graphics, -(int) mViewX, -(int) mViewY);
+
+        if (mShowDebugPath && !(*i)->getPath().empty())
+            drawPath(graphics, (*i)->getPath());
     }
 
     // Draw contained widgets
     WindowContainer::draw(gcnGraphics);
 }
 
-void
-Viewport::logic()
+void Viewport::logic()
 {
     WindowContainer::logic();
 
@@ -262,13 +265,11 @@ Viewport::logic()
     Uint8 button = SDL_GetMouseState(&mouseX, &mouseY);
 
     if (mPlayerFollowMouse && button & SDL_BUTTON(1) &&
-            mWalkTime != player_node->mWalkTime && 
             get_elapsed_time(mLocalWalkTime) >= walkingMouseDelay)
     {
             mLocalWalkTime = tick_time;
             player_node->setDestination(mouseX + (int) mViewX,
                                         mouseY + (int) mViewY);
-            mWalkTime = player_node->mWalkTime;
     }
 
     for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
@@ -278,8 +279,7 @@ Viewport::logic()
     }
 }
 
-void
-Viewport::drawTargetCursor(Graphics *graphics)
+void Viewport::drawTargetCursor(Graphics *graphics)
 {
     // Draw target marker if needed
     Being *target = player_node->getTarget();
@@ -288,9 +288,11 @@ Viewport::drawTargetCursor(Graphics *graphics)
         // Calculate target circle position
 
         // Find whether target is in range
-        int rangeX = abs(target->mX - player_node->mX);
-        int rangeY = abs(target->mY - player_node->mY);
-        int attackRange = player_node->getAttackRange();
+        const Vector &dist =
+            target->getPosition() - player_node->getPosition();
+        const int rangeX = abs((int) dist.x);
+        const int rangeY = abs((int) dist.y);
+        const int attackRange = player_node->getAttackRange();
 
         // Get the correct target cursors graphic
         Being::TargetCursorSize cursorSize = target->getTargetCursorSize();
@@ -313,8 +315,7 @@ Viewport::drawTargetCursor(Graphics *graphics)
     }
 }
 
-void
-Viewport::drawTargetName(Graphics *graphics)
+void Viewport::drawTargetName(Graphics *graphics)
 {
     // Draw target marker if needed
     Being *target = player_node->getTarget();
@@ -331,8 +332,7 @@ Viewport::drawTargetName(Graphics *graphics)
     }
 }
 
-void
-Viewport::drawDebugPath(Graphics *graphics)
+void Viewport::drawDebugPath(Graphics *graphics)
 {
     // Get the current mouse position
     int mouseX, mouseY;
@@ -340,13 +340,20 @@ Viewport::drawDebugPath(Graphics *graphics)
 
     const int mouseTileX = (mouseX + (int) mViewX) / 32;
     const int mouseTileY = (mouseY + (int) mViewY) / 32;
+    const Vector &playerPos = player_node->getPosition();
 
     Path debugPath = mMap->findPath(
-            player_node->mX / 32, player_node->mY / 32,
+            (int) playerPos.x / 32,
+            (int) playerPos.y / 32,
             mouseTileX, mouseTileY, 0xFF);
 
+    drawPath(graphics, debugPath);
+}
+
+void Viewport::drawPath(Graphics *graphics, const Path &path)
+{
     graphics->setColor(gcn::Color(255, 0, 0));
-    for (PathIterator i = debugPath.begin(); i != debugPath.end(); i++)
+    for (Path::const_iterator i = path.begin(); i != path.end(); ++i)
     {
         int squareX = i->x * 32 - (int) mViewX + 12;
         int squareY = i->y * 32 - (int) mViewY + 12;
@@ -358,8 +365,7 @@ Viewport::drawDebugPath(Graphics *graphics)
     }
 }
 
-void
-Viewport::mousePressed(gcn::MouseEvent &event)
+void Viewport::mousePressed(gcn::MouseEvent &event)
 {
     // Check if we are alive and kickin'
     if (!mMap || !player_node || player_node->mAction == Being::DEAD)
@@ -435,13 +441,12 @@ Viewport::mousePressed(gcn::MouseEvent &event)
     }
 }
 
-void
-Viewport::mouseDragged(gcn::MouseEvent &event)
+void Viewport::mouseDragged(gcn::MouseEvent &event)
 {
     if (!mMap || !player_node)
         return;
 
-    if (mPlayerFollowMouse && mWalkTime == player_node->mWalkTime
+    if (mPlayerFollowMouse
         && get_elapsed_time(mLocalWalkTime) >= walkingMouseDelay)
     {
         mLocalWalkTime = tick_time;
@@ -450,31 +455,27 @@ Viewport::mouseDragged(gcn::MouseEvent &event)
     }
 }
 
-void
-Viewport::mouseReleased(gcn::MouseEvent &event)
+void Viewport::mouseReleased(gcn::MouseEvent &event)
 {
     mPlayerFollowMouse = false;
 }
 
-void
-Viewport::showPopup(int x, int y, Item *item)
+void Viewport::showPopup(int x, int y, Item *item)
 {
     mPopupMenu->showPopup(x, y, item);
 }
 
-void
-Viewport::optionChanged(const std::string &name)
+void Viewport::optionChanged(const std::string &name)
 {
     mScrollLaziness = (int) config.getValue("ScrollLaziness", 32);
     mScrollRadius = (int) config.getValue("ScrollRadius", 32);
 
     if (name == "visiblenames") {
-                mVisibleNames = config.getValue("visiblenames", 1);     
+        mVisibleNames = config.getValue("visiblenames", 1);
     }
 }
 
-void
-Viewport::mouseMoved(gcn::MouseEvent &event)
+void Viewport::mouseMoved(gcn::MouseEvent &event)
 {
     // Check if we are on the map
     if (!mMap || !player_node)
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 82587938..5dedcea8 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -145,9 +145,10 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
 
     private:
         /**
-         * Helper function for loading target cursors
+         * Helper function for loading target cursors.
          */
-        void loadTargetCursor(std::string filename, int width, int height,
+        void loadTargetCursor(const std::string &filename,
+                              int width, int height,
                               bool outRange, Being::TargetCursorSize size);
 
         /**
@@ -166,6 +167,11 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
          */
         void drawDebugPath(Graphics *graphics);
 
+        /**
+         * Draws the given path.
+         */
+        void drawPath(Graphics *graphics, const Path &path);
+
 
         Map *mMap;                 /**< The current map. */
 
@@ -191,7 +197,6 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         SimpleAnimation *mTargetCursorOutRange[Being::NUM_TC];
 
         bool mPlayerFollowMouse;
-        int mWalkTime;
         int mLocalWalkTime; /**< Timestamp before the next walk can be sent. */
 
         PopupMenu *mPopupMenu;     /**< Popup menu. */
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 00ea6a49..f596a8d9 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -87,14 +87,16 @@ void LocalPlayer::logic()
     }
 
     // Show XP messages
-    if(!mExpMessages.empty())
+    if (!mExpMessages.empty())
     {
         if (mExpMessageTime == 0)
         {
+            const Vector &pos = getPosition();
             particleEngine->addTextRiseFadeOutEffect(mExpMessages.front(),
                                                      0, 128, 255,
                                                      speechFont,
-                                                     mPx + 16, mPy - 16);
+                                                     (int) pos.x + 16,
+                                                     (int) pos.y - 16);
             mExpMessages.pop_front();
             mExpMessageTime = 30;
         }
@@ -106,6 +108,8 @@ void LocalPlayer::logic()
 
 void LocalPlayer::nextStep()
 {
+    // TODO: Fix picking up when reaching target (this method is obsolete)
+    // TODO: Fix holding walking button to keep walking smoothly
     if (mPath.empty())
     {
         if (mPickUpTarget)
@@ -118,8 +122,6 @@ void LocalPlayer::nextStep()
             walk(mWalkingDir);
         }
     }
-
-    Player::nextStep();
 }
 
 bool LocalPlayer::checkInviteRights(const std::string &guildName)
@@ -165,8 +167,7 @@ void LocalPlayer::setInvItem(int index, int id, int amount)
     mInventory->setItem(index, id, amount);
 }
 
-void
-LocalPlayer::moveInvItem(Item *item, int newIndex)
+void LocalPlayer::moveInvItem(Item *item, int newIndex)
 {
     // special case, the old and new cannot copy over each other.
     if (item->getInvIndex() == newIndex)
@@ -218,13 +219,12 @@ void LocalPlayer::splitItem(Item *item, int quantity)
         Net::GameServer::Player::moveItem(
             item->getInvIndex(), newIndex, quantity);
     }
-
 }
 
 void LocalPlayer::pickUp(FloorItem *item)
 {
-    int dx = item->getX() - mX / 32;
-    int dy = item->getY() - mY / 32;
+    int dx = item->getX() - (int) getPosition().x / 32;
+    int dy = item->getY() - (int) getPosition().y / 32;
 
     if (dx * dx + dy * dy < 4) {
         int id = item->getId();
@@ -238,13 +238,16 @@ void LocalPlayer::pickUp(FloorItem *item)
 
 void LocalPlayer::walk(unsigned char dir)
 {
+    // TODO: Evaluate the implementation of this method
     if (!mMap || !dir)
         return;
 
+    const Vector &pos = getPosition();
+
     if (mAction == WALK && !mPath.empty())
     {
         // Just finish the current action, otherwise we get out of sync
-        Being::setDestination(mX, mY);
+        Being::setDestination(pos.x, pos.y);
         return;
     }
 
@@ -259,19 +262,23 @@ void LocalPlayer::walk(unsigned char dir)
         dx += 32;
 
     // Prevent skipping corners over colliding tiles
-    if (dx && !mMap->getWalk((mX + dx) / 32, mY / 32, getWalkMask()))
-        dx = 16 - mX % 32;
-    if (dy && !mMap->getWalk(mX / 32, (mY + dy) / 32, getWalkMask()))
-        dy = 16 - mY % 32;
+    if (dx && !mMap->getWalk(((int) pos.x + dx) / 32,
+                             (int) pos.y / 32, getWalkMask()))
+        dx = 16 - (int) pos.x % 32;
+    if (dy && !mMap->getWalk((int) pos.x / 32,
+                             ((int) pos.y + dy) / 32, getWalkMask()))
+        dy = 16 - (int) pos.y % 32;
 
     // Choose a straight direction when diagonal target is blocked
-    if (dx && dy && !mMap->getWalk((mX + dx) / 32, (mY + dy) / 32, getWalkMask()))
-        dx = 16 - mX % 32;
+    if (dx && dy && !mMap->getWalk((pos.x + dx) / 32,
+                                   (pos.y + dy) / 32, getWalkMask()))
+        dx = 16 - (int) pos.x % 32;
 
     // Walk to where the player can actually go
-    if ((dx || dy) && mMap->getWalk((mX + dx) / 32, (mY + dy) / 32, getWalkMask()))
+    if ((dx || dy) && mMap->getWalk(((int) pos.x + dx) / 32,
+                                    ((int) pos.y + dy) / 32, getWalkMask()))
     {
-        setDestination(mX + dx, mY + dy);
+        setDestination((int) pos.x + dx, (int) pos.y + dy);
     }
     else if (dir)
     {
@@ -284,10 +291,20 @@ void LocalPlayer::walk(unsigned char dir)
 void LocalPlayer::setDestination(Uint16 x, Uint16 y)
 {
     // Fix coordinates so that the player does not seem to dig into walls.
-    int tx = x / 32, ty = y / 32, fx = x % 32, fy = y % 32;
-    if (fx != 16 && !mMap->getWalk(tx + fx / 16 * 2 - 1, ty, getWalkMask())) fx = 16;
-    if (fy != 16 && !mMap->getWalk(tx, ty + fy / 16 * 2 - 1, getWalkMask())) fy = 16;
-    if (fx != 16 && fy != 16 && !mMap->getWalk(tx + fx / 16 * 2 - 1, ty + fy / 16 * 2 - 1, getWalkMask())) fx = 16;
+    const int tx = x / 32;
+    const int ty = y / 32;
+    int fx = x % 32;
+    int fy = y % 32;
+
+    if (fx != 16 && !mMap->getWalk(tx + fx / 16 * 2 - 1, ty, getWalkMask()))
+        fx = 16;
+    if (fy != 16 && !mMap->getWalk(tx, ty + fy / 16 * 2 - 1, getWalkMask()))
+        fy = 16;
+    if (fx != 16 && fy != 16 && !mMap->getWalk(tx + fx / 16 * 2 - 1,
+                                               ty + fy / 16 * 2 - 1,
+                                               getWalkMask()))
+        fx = 16;
+
     x = tx * 32 + fx;
     y = ty * 32 + fy;
 
@@ -375,7 +392,6 @@ void LocalPlayer::attack()
         return;
 
     mLastAction = tick_time;
-    mWalkTime = tick_time;
 
     setAction(ATTACK);
 
@@ -449,7 +465,6 @@ const struct LocalPlayer::SkillInfo& LocalPlayer::getSkillInfo(int skill)
     {
         return skills[skill];
     }
-
 }
 
 void LocalPlayer::setExperience(int skill, int current, int next)
diff --git a/src/map.cpp b/src/map.cpp
index 888ea3a8..e10e4fad 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -113,7 +113,7 @@ void MapLayer::draw(Graphics *graphics,
         // If drawing the fringe layer, make sure all sprites above this row of
         // tiles have been drawn
         if (mIsFringeLayer) {
-            while (si != sprites.end() && (*si)->getPixelY() <= y * 32 - 32) {
+            while (si != sprites.end() && (*si)->getPixelY() <= y * 32) {
                 (*si)->draw(graphics, -scrollX, -scrollY);
                 si++;
             }
@@ -383,35 +383,6 @@ void Map::blockTile(int x, int y, BlockType type)
     }
 }
 
-void Map::freeTile(int x, int y, BlockType type)
-{
-    if (type == BLOCKTYPE_NONE || x < 0 || y < 0 || x >= mWidth || y >= mHeight)
-    {
-        return;
-    }
-
-    int tileNum = x + y * mWidth;
-
-    if ((--mOccupation[type][tileNum]) <= 0)
-    {
-        switch (type)
-        {
-            case BLOCKTYPE_WALL:
-                mMetaTiles[tileNum].blockmask &= (BLOCKMASK_WALL xor 0xff);
-                break;
-            case BLOCKTYPE_CHARACTER:
-                mMetaTiles[tileNum].blockmask &= (BLOCKMASK_CHARACTER xor 0xff);
-                break;
-            case BLOCKTYPE_MONSTER:
-                mMetaTiles[tileNum].blockmask &= (BLOCKMASK_MONSTER xor 0xff);
-                break;
-            default:
-                // shut up!
-                break;
-        }
-    }
-}
-
 bool Map::getWalk(int x, int y, char walkmask) const
 {
     // You can't walk outside of the map
@@ -450,7 +421,7 @@ static int const basicCost = 100;
 Path Map::findPath(int startX, int startY, int destX, int destY, unsigned char walkmask, int maxCost)
 {
     // Path to be built up (empty by default)
-    std::list<PATH_NODE> path;
+    std::list<Position> path;
 
     // Declare open list, a list with open tiles sorted on F cost
     std::priority_queue<Location> openList;
@@ -612,7 +583,7 @@ Path Map::findPath(int startX, int startY, int destX, int destY, unsigned char w
         while (pathX != startX || pathY != startY)
         {
             // Add the new path node to the start of the path list
-            path.push_front(PATH_NODE(pathX, pathY));
+            path.push_front(Position(pathX, pathY));
 
             // Find out the next parent
             MetaTile *tile = getMetaTile(pathX, pathY);
diff --git a/src/map.h b/src/map.h
index 31c6be00..c4a4fc0b 100644
--- a/src/map.h
+++ b/src/map.h
@@ -27,6 +27,7 @@
 #include <list>
 #include <vector>
 
+#include "position.h"
 #include "properties.h"
 
 class AmbientOverlay;
@@ -37,8 +38,6 @@ class Particle;
 class Sprite;
 class Tileset;
 
-struct PATH_NODE;
-
 typedef std::vector<Tileset*> Tilesets;
 typedef std::list<Sprite*> Sprites;
 typedef Sprites::iterator SpriteIterator;
@@ -188,11 +187,6 @@ class Map : public Properties
          */
         void blockTile(int x, int y, BlockType type);
 
-        /**
-         * Marks a tile as unoccupied
-         */
-        void freeTile(int x, int y, BlockType type);
-
         /**
          * Gets walkability for a tile with a blocking bitmask. When called
          * without walkmask, only blocks against colliding tiles.
@@ -226,8 +220,8 @@ class Map : public Properties
         /**
          * Find a path from one location to the next.
          */
-        std::list<PATH_NODE>
-        findPath(int startX, int startY, int destX, int destY, unsigned char walkmask, int maxCost = 20);
+        Path findPath(int startX, int startY, int destX, int destY,
+                      unsigned char walkmask, int maxCost = 20);
 
         /**
          * Adds a sprite to the map.
diff --git a/src/monster.cpp b/src/monster.cpp
index 1561b2ea..396d0c06 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -55,7 +55,6 @@ Monster::Monster(Uint16 id, Uint16 job, Map *map):
 
 Monster::~Monster()
 {
-    if (mMap) mMap->freeTile(mX / 32, mY / 32, getBlockType());
 }
 
 Being::Type
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index b1c502e1..7e37aa27 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -48,18 +48,6 @@ const int EMOTION_TIME = 150;    /**< Duration of emotion icon */
 BeingHandler::BeingHandler()
 {
     static const Uint16 _messages[] = {
-        //SMSG_BEING_VISIBLE,
-        //SMSG_BEING_MOVE,
-        //SMSG_BEING_REMOVE,
-        //SMSG_BEING_ACTION,
-        //SMSG_BEING_LEVELUP,
-        //SMSG_BEING_EMOTION,
-        //SMSG_BEING_CHANGE_LOOKS,
-        //SMSG_BEING_NAME_RESPONSE,
-        //SMSG_PLAYER_UPDATE_1,
-        //SMSG_PLAYER_UPDATE_2,
-        //SMSG_PLAYER_MOVE,
-        //0x0119,
         GPMSG_BEING_ATTACK,
         GPMSG_BEING_ENTER,
         GPMSG_BEING_LEAVE,
@@ -74,15 +62,6 @@ BeingHandler::BeingHandler()
 
 void BeingHandler::handleMessage(MessageIn &msg)
 {
-    /*
-    Uint32 id;
-    Uint16 job, speed;
-    Uint16 headBottom, headTop, headMid;
-    Sint16 param1;
-    Sint8 type;
-    Being *srcBeing, *dstBeing;
-    */
-
     switch (msg.getId())
     {
         case GPMSG_BEING_ENTER:
@@ -106,322 +85,6 @@ void BeingHandler::handleMessage(MessageIn &msg)
         case GPMSG_BEING_LOOKS_CHANGE:
             handleBeingLooksChangeMessage(msg);
             break;
-
-
-        /*
-        case SMSG_BEING_VISIBLE:
-        case SMSG_BEING_MOVE:
-            // Information about a being in range
-            id = msg.readInt32();
-            speed = msg.readInt16();
-            msg.readInt16();  // unknown
-            msg.readInt16();  // unknown
-            msg.readInt16();  // option
-            job = msg.readInt16();  // class
-
-            dstBeing = beingManager->findBeing(id);
-
-            if (!dstBeing)
-            {
-                // Being with id >= 110000000 and job 0 are better
-                // known as ghosts, so don't create those.
-                if (job == 0 && id >= 110000000)
-                {
-                    break;
-                }
-
-                dstBeing = beingManager->createBeing(id, job);
-            }
-            else if (msg.getId() == 0x0078)
-            {
-                dstBeing->clearPath();
-                dstBeing->mFrame = 0;
-                dstBeing->mWalkTime = tick_time;
-                dstBeing->setAction(Being::STAND);
-            }
-
-            // Prevent division by 0 when calculating frame
-            if (speed == 0) { speed = 150; }
-
-            dstBeing->setWalkSpeed(speed);
-            dstBeing->mJob = job;
-            dstBeing->setHairStyle(msg->readInt16());
-            dstBeing->setSprite(
-                    Being::WEAPON_SPRITE, msg->readInt16());
-            dstBeing->setSprite(
-                    Being::BOTTOMCLOTHES_SPRITE, msg->readInt16());
-
-            if (msg.getId() == SMSG_BEING_MOVE)
-            {
-                msg.readInt32(); // server tick
-            }
-
-            msg->readInt16();  // shield
-            headTop = msg->readInt16();
-            headMid = msg->readInt16();
-            dstBeing->setSprite(Being::HAT_SPRITE, headTop);
-            dstBeing->setSprite(Being::TOPCLOTHES_SPRITE, headMid);
-            dstBeing->setHairColor(msg->readInt16());
-            msg->readInt16();  // unknown
-            msg->readInt16();  // head dir
-            msg->readInt16();  // guild
-            msg->readInt16();  // unknown
-            msg->readInt16();  // unknown
-            msg->readInt16();  // manner
-            msg->readInt16();  // karma
-            msg->readInt8();   // unknown
-            dstBeing->setSex(1 - msg->readInt8());   // sex
-
-            if (msg.getId() == SMSG_BEING_MOVE)
-            {
-                //Uint16 srcX, srcY, dstX, dstY;
-                //msg.readCoordinatePair(srcX, srcY, dstX, dstY);
-                //dstBeing->setAction(Being::STAND);
-                //dstBeing->mX = srcX;
-                //dstBeing->mY = srcY;
-                //dstBeing->setDestination(dstX, dstY);
-            }
-            else
-            {
-                //Uint8 dir;
-                //msg->readCoordinates(dstBeing->mX, dstBeing->mY, dir);
-                //dstBeing->setDirection(dir);
-            }
-
-            msg.readInt8();   // unknown
-            msg.readInt8();   // unknown
-            msg.readInt8();   // unknown / sit
-            break;
-
-        case SMSG_BEING_REMOVE:
-            // A being should be removed or has died
-            dstBeing = beingManager->findBeing(msg.readInt32());
-
-            if (!dstBeing)
-                break;
-
-            if (msg.readInt8() == 1)
-            {
-                dstBeing->setAction(Being::DEAD);
-            }
-            else
-            {
-                beingManager->destroyBeing(dstBeing);
-            }
-
-            if (dstBeing == player_node->getTarget())
-            {
-                player_node->stopAttack();
-            }
-            break;
-
-        case SMSG_BEING_ACTION:
-            srcBeing = beingManager->findBeing(msg.readInt32());
-            dstBeing = beingManager->findBeing(msg.readInt32());
-            msg.readInt32();   // server tick
-            msg.readInt32();   // src speed
-            msg.readInt32();   // dst speed
-            param1 = msg.readInt16();
-            msg.readInt16();  // param 2
-            type = msg.readInt8();
-            msg.readInt16();  // param 3
-
-            switch (type)
-            {
-                case 0: // Damage
-                    if (dstBeing) {
-                        dstBeing->takeDamage(param1);
-                    }
-                    if (srcBeing) {
-                        srcBeing->handleAttack(dstBeing, param1);
-                    }
-                    break;
-
-                case 2: // Sit
-                    if (srcBeing) {
-                        srcBeing->mFrame = 0;
-                        srcBeing->setAction(Being::SIT);
-                    }
-                    break;
-
-                case 3: // Stand up
-                    if (srcBeing) {
-                        srcBeing->mFrame = 0;
-                        srcBeing->setAction(Being::STAND);
-                    }
-                    break;
-            }
-            break;
-
-        case SMSG_BEING_LEVELUP:
-            id = (Uint32) msg->readInt32();
-
-            if (id == player_node->getId()) {
-                logger->log("Level up");
-                sound.playSfx("sfx/levelup.ogg");
-            }
-            else {
-                logger->log("Someone else went level up");
-            }
-            Particle *levelupFX;
-            if (msg->readInt32() == 0) { // type
-                levelupFX = particleEngine->addEffect(
-                        "graphics/particles/levelup.particle.xml", 0, 0);
-            }
-            else {
-                levelupFX = particleEngine->addEffect(
-                        "graphics/particles/skillup.particle.xml", 0, 0);
-            }
-            beingManager->findBeing(id)->controlParticle(levelupFX);
-            break;
-
-        case SMSG_BEING_EMOTION:
-            if (!(dstBeing = beingManager->findBeing(msg.readInt32())))
-            {
-                break;
-            }
-
-            dstBeing->mEmotion = msg.readInt8();
-            dstBeing->mEmotionTime = EMOTION_TIME;
-            break;
-
-        case SMSG_BEING_CHANGE_LOOKS:
-        {
-            if (!(dstBeing = beingManager->findBeing(msg.readInt32())))
-            {
-                break;
-            }
-
-            int type = msg.readInt8();
-            int id = msg.readInt8();
-
-            switch (type) {
-                case 1:
-                    dstBeing->setHairStyle(id);
-                    break;
-                case 2:
-                    dstBeing->setSprite(Being::WEAPON_SPRITE, id);
-                    break;
-                case 3:     // Change lower headgear for eAthena, pants for us
-                    dstBeing->setSprite(
-                            Being::BOTTOMCLOTHES_SPRITE, id);
-                    break;
-                case 4:     // Change upper headgear for eAthena, hat for us
-                    dstBeing->setSprite(
-                            Being::HAT_SPRITE, id);
-                    break;
-                case 5:     // Change middle headgear for eathena, armor for us
-                     dstBeing->setSprite(
-                            Being::TOPCLOTHES_SPRITE, id);
-                    break;
-                case 6:
-                    dstBeing->setHairColor(id);
-                    break;
-                default:
-                    logger->log("SMSG_BEING_CHANGE_LOOKS: unsupported type: "
-                            "%d, id: %d", type, id);
-                    break;
-            }
-        }
-            break;
-
-        case SMSG_BEING_NAME_RESPONSE:
-            if ((dstBeing = beingManager->findBeing(msg.readInt32())))
-            {
-                dstBeing->setName(msg.readString(24));
-            }
-            break;
-
-        case SMSG_PLAYER_UPDATE_1:
-        case SMSG_PLAYER_UPDATE_2:
-        case SMSG_PLAYER_MOVE:
-            // An update about a player, potentially including movement.
-            id = msg.readInt32();
-            speed = msg.readInt16();
-            msg.readInt16();  // option 1
-            msg.readInt16();  // option 2
-            msg.readInt16();  // option
-            job = msg.readInt16();
-
-            dstBeing = beingManager->findBeing(id);
-
-            if (!dstBeing)
-            {
-                dstBeing = beingManager->createBeing(id, job);
-            }
-
-            dstBeing->setWalkSpeed(speed);
-            dstBeing->mJob = job;
-            dstBeing->setHairStyle(msg->readInt16());
-            dstBeing->setSprite(
-                    Being::WEAPON_SPRITE, msg->readInt16());
-            msg->readInt16();  // item id 2
-            headBottom = msg->readInt16();
-
-            if (msg.getId() == SMSG_PLAYER_MOVE)
-            {
-                msg.readInt32(); // server tick
-            }
-
-            headTop = msg.readInt16();
-            headMid = msg.readInt16();
-            dstBeing->setHairColor(msg.readInt16());
-            msg.readInt16();  // unknown
-            msg.readInt16();  // head dir
-            msg.readInt32();  // guild
-            msg.readInt32();  // emblem
-            msg.readInt16();  // manner
-            msg.readInt8();   // karma
-            dstBeing->setSex(1 - msg.readInt8());   // sex
-            dstBeing->setSprite(
-                    Being::BOTTOMCLOTHES_SPRITE, headBottom);
-            dstBeing->setSprite(Being::HAT_SPRITE, headTop);
-            dstBeing->setSprite(Being::TOPCLOTHES_SPRITE, headMid);
-
-            if (msg.getId() == SMSG_PLAYER_MOVE)
-            {
-                //Uint16 srcX, srcY, dstX, dstY;
-                //msg.readCoordinatePair(srcX, srcY, dstX, dstY);
-                //dstBeing->mX = srcX;
-                //dstBeing->mY = srcY;
-                //dstBeing->setDestination(dstX, dstY);
-            }
-            else
-            {
-                //Uint8 dir;
-                //msg->readCoordinates(dstBeing->mX, dstBeing->mY, dir);
-                //dstBeing->setDirection(dir);
-            }
-
-            msg.readInt8();   // unknown
-            msg.readInt8();   // unknown
-
-            if (msg.getId() == SMSG_PLAYER_UPDATE_1)
-            {
-                if (msg.readInt8() == 2)
-                {
-                    dstBeing->setAction(Being::SIT);
-                }
-            }
-            else if (msg.getId() == SMSG_PLAYER_MOVE)
-            {
-                msg.readInt8(); // unknown
-            }
-
-            msg.readInt8();   // Lv
-            msg.readInt8();   // unknown
-
-            dstBeing->mWalkTime = tick_time;
-            dstBeing->mFrame = 0;
-            break;
-
-        case 0x0119:
-            // Change in players look
-            logger->log("0x0119 %i %i %i %x %i", msg->readInt32(),
-                    msg->readInt16(), msg->readInt16(), msg->readInt16(),
-                    msg->readInt8());
-            break;
-        */
     }
 }
 
@@ -453,8 +116,7 @@ static void handleLooks(Player *being, MessageIn &msg)
     }
 }
 
-void
-BeingHandler::handleBeingEnterMessage(MessageIn &msg)
+void BeingHandler::handleBeingEnterMessage(MessageIn &msg)
 {
     int type = msg.readInt8();
     int id = msg.readInt16();
@@ -481,7 +143,8 @@ BeingHandler::handleBeingEnterMessage(MessageIn &msg)
             Player *p = static_cast< Player * >(being);
             int hs = msg.readInt8(), hc = msg.readInt8();
             p->setHairStyle(hs, hc);
-            p->setGender(msg.readInt8() == GENDER_MALE ? GENDER_MALE : GENDER_FEMALE);
+            p->setGender(msg.readInt8() == GENDER_MALE ?
+                    GENDER_MALE : GENDER_FEMALE);
             handleLooks(p, msg);
         } break;
 
@@ -498,7 +161,7 @@ BeingHandler::handleBeingEnterMessage(MessageIn &msg)
             return;
     }
 
-    being->setPositionInPixels(px, py);
+    being->setPosition(px, py);
     being->setDestination(px, py);
     being->setAction(action);
 }
@@ -518,7 +181,17 @@ void BeingHandler::handleBeingsMoveMessage(MessageIn &msg)
         int id = msg.readInt16();
         int flags = msg.readInt8();
         Being *being = beingManager->findBeing(id);
-        int sx = 0, sy = 0, dx = 0, dy = 0, speed = 0;
+        int sx = 0;
+        int sy = 0;
+        int dx = 0;
+        int dy = 0;
+        int speed = 0;
+
+        printf("handleBeingsMoveMessage for %p (%s | %s)\n",
+                (void*) being,
+                (flags & MOVING_POSITION) ? "pos" : "",
+                (flags & MOVING_DESTINATION) ? "dest" : "");
+
         if (flags & MOVING_POSITION)
         {
             Uint16 sx2, sy2;
@@ -543,12 +216,19 @@ void BeingHandler::handleBeingsMoveMessage(MessageIn &msg)
         }
         if (speed)
         {
-            being->setWalkSpeed(speed * 10);
+            /* The speed on the server is the cost of moving from one tile to
+             * the next. Beings get 1000 cost units per second. The speed is
+             * transferred as devided by 10, so that slower speeds fit in a
+             * byte. Here we convert the speed to pixels per second.
+             */
+            const float tilesPerSecond = 100.0f / speed;
+            being->setWalkSpeed((int) (tilesPerSecond * 32));
         }
-        if (abs(being->getPixelX() - sx) + abs(being->getPixelY() - sy) > 4 * 32)
+        if (abs(being->getPixelX() - sx) +
+                abs(being->getPixelY() - sy) > 4 * 32)
         {
             // Too large a desynchronization.
-            being->setPositionInPixels(sx, sy);
+            being->setPosition(sx, sy);
             being->setDestination(dx, dy);
         }
         else if (!(flags & MOVING_POSITION))
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index ea581095..3c0a1835 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -302,11 +302,12 @@ PlayerHandler::handleMapChangeMessage(MessageIn &msg)
 
     current_npc = 0;
 
-    const float scrollOffsetX = x - player_node->mX;
-    const float scrollOffsetY = y - player_node->mY;
+    const Vector &playerPos = player_node->getPosition();
+    const float scrollOffsetX = x - (int) playerPos.x;
+    const float scrollOffsetY = y - (int) playerPos.y;
 
     player_node->setAction(Being::STAND);
-    player_node->setPositionInPixels(x, y);
+    player_node->setPosition(x, y);
 
     logger->log("Adjust scrolling by %d,%d", (int) scrollOffsetX,
                                              (int) scrollOffsetY);
diff --git a/src/npc.cpp b/src/npc.cpp
index c2b266ff..a7302e0d 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -69,15 +69,15 @@ NPC::getType() const
     return Being::NPC;
 }
 
-void
-NPC::drawName(Graphics *graphics, Sint32 offsetX, Sint32 offsetY)
+void NPC::drawName(Graphics *graphics, Sint32 offsetX, Sint32 offsetY)
 {
-    int px = mPx + offsetX;
-    int py = mPy + offsetY;
+    const Vector &pos = getPosition();
+    const int px = (int) pos.x + offsetX;
+    const int py = (int) pos.y + offsetY;
 
     graphics->setFont(speechFont);
     graphics->setColor(gcn::Color(200, 200, 255));
-    graphics->drawText(mName, px + 15, py + 30, gcn::Graphics::CENTER);
+    graphics->drawText(mName, px, py, gcn::Graphics::CENTER);
 }
 
 void
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index f03490ac..23c6879e 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -195,7 +195,7 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *
 
                     if (!img)
                     {
-                        logger->log("No image at index " + (index));
+                        logger->log("No image at index %d", index);
                         continue;
                     }
 
@@ -218,8 +218,7 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *
 
                         if (!img)
                         {
-                            logger->log("No image at index " +
-                                    (start));
+                            logger->log("No image at index %d", start);
                             continue;
                         }
 
diff --git a/src/player.cpp b/src/player.cpp
index 49f0221d..97c60789 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -46,7 +46,6 @@ Player::Player(int id, int job, Map *map):
 
 Player::~Player()
 {
-    if (mMap) mMap->freeTile(mX / 32, mY / 32, getBlockType());
 }
 
 Being::Type
@@ -55,15 +54,15 @@ Player::getType() const
     return PLAYER;
 }
 
-void
-Player::drawName(Graphics *graphics, int offsetX, int offsetY)
+void Player::drawName(Graphics *graphics, int offsetX, int offsetY)
 {
-    int px = mPx + offsetX;
-    int py = mPy + offsetY;
+    const Vector &pos = getPosition();
+    const int px = (int) pos.x + offsetX;
+    const int py = (int) pos.y + offsetY;
 
     graphics->setFont(speechFont);
     graphics->setColor(gcn::Color(255, 255, 255));
-    graphics->drawText(mName, px + 15, py + 30, gcn::Graphics::CENTER);
+    graphics->drawText(mName, px, py, gcn::Graphics::CENTER);
 }
 
 void Player::setGender(Gender gender)
diff --git a/src/position.cpp b/src/position.cpp
new file mode 100644
index 00000000..334079bb
--- /dev/null
+++ b/src/position.cpp
@@ -0,0 +1,47 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "position.h"
+
+std::ostream& operator <<(std::ostream &os, const Position &p)
+{
+    os << "(" << p.x << ", " << p.y << ")";
+    return os;
+}
+
+std::ostream& operator <<(std::ostream &os, const Path &path)
+{
+    Path::const_iterator i = path.begin();
+
+    os << "(";
+    while (i != path.end())
+    {
+        os << *i;
+        ++i;
+        if (i != path.end())
+            os << ", ";
+    }
+    os << ")";
+
+    return os;
+}
diff --git a/src/position.h b/src/position.h
new file mode 100644
index 00000000..d1aa2ee6
--- /dev/null
+++ b/src/position.h
@@ -0,0 +1,60 @@
+/*
+ *  The Mana World
+ *  Copyright 2008 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: being.h 4570 2008-09-04 20:59:34Z b_lindeijer $
+ */
+
+#ifndef TMW_POSITION_H
+#define TMW_POSITION_H
+
+#include <list>
+#include <iostream>
+
+/**
+ * A position along a being's path.
+ */
+struct Position
+{
+    /**
+     * Constructor.
+     */
+    Position(int x, int y):
+        x(x), y(y)
+    { }
+
+    int x;
+    int y;
+};
+
+typedef std::list<Position> Path;
+typedef Path::iterator PathIterator;
+
+/**
+ * Appends a string representation of a position to the output stream.
+ */
+std::ostream& operator <<(std::ostream &os, const Position &p);
+
+/**
+ * Appends a string representation of a path (sequence of positions) to the
+ * output stream.
+ */
+std::ostream& operator <<(std::ostream &os, const Path &path);
+
+#endif // TMW_POSITION_H
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 9d98184a..dcfee165 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -232,7 +232,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
 
             if (!img)
             {
-                logger->log("No image at index " + (index + variant_offset));
+                logger->log("No image at index %d", index + variant_offset);
                 continue;
             }
 
@@ -255,8 +255,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
 
                 if (!img)
                 {
-                    logger->log("No image at index " +
-                            (start + variant_offset));
+                    logger->log("No image at index %d", start + variant_offset);
                     continue;
                 }
 
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index 18e732ef..f425d3c1 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -68,7 +68,7 @@ SimpleAnimation::SimpleAnimation(xmlNodePtr animationNode):
 
             if (!img)
             {
-                logger->log("No image at index " + (index));
+                logger->log("No image at index %d", index);
                 continue;
             }
 
@@ -91,8 +91,7 @@ SimpleAnimation::SimpleAnimation(xmlNodePtr animationNode):
 
                 if (!img)
                 {
-                    logger->log("No image at index " +
-                            (start));
+                    logger->log("No image at index %d", start);
                     continue;
                 }
 
diff --git a/src/vector.cpp b/src/vector.cpp
new file mode 100644
index 00000000..88092c9b
--- /dev/null
+++ b/src/vector.cpp
@@ -0,0 +1,30 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: vector.h 4592 2008-09-07 20:38:52Z b_lindeijer $
+ */
+
+#include "vector.h"
+
+std::ostream& operator <<(std::ostream &os, const Vector &v)
+{
+    os << "Vector(" << v.x << ", " << v.y << ", " << v.z << ")";
+    return os;
+}
diff --git a/src/vector.h b/src/vector.h
index 7a5da241..7251eff0 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -24,6 +24,10 @@
 #ifndef _TMW_VECTOR_H_
 #define _TMW_VECTOR_H_
 
+#include <math.h>
+
+#include <iostream>
+
 /**
  * Vector class. Represents either a 3D point in space, a velocity or a force.
  * Provides several convenient operator overloads.
@@ -43,7 +47,7 @@ class Vector
         /**
          * Constructor.
          */
-        Vector(float x, float y, float z):
+        Vector(float x, float y, float z = 0.0f):
             x(x),
             y(y),
             z(z)
@@ -71,11 +75,12 @@ class Vector
         /**
          * In-place scale vector operator.
          */
-        void operator*=(float c)
+        Vector &operator*=(float c)
         {
             x *= c;
             y *= c;
             z *= c;
+            return *this;
         }
 
         /**
@@ -88,6 +93,17 @@ class Vector
                           z / c);
         }
 
+        /**
+         * In-place scale vector operator.
+         */
+        Vector &operator/=(float c)
+        {
+            x /= c;
+            y /= c;
+            z /= c;
+            return *this;
+        }
+
         /**
          * Add vector operator.
          */
@@ -101,11 +117,12 @@ class Vector
         /**
          * In-place add vector operator.
          */
-        void operator+=(const Vector &v)
+        Vector &operator+=(const Vector &v)
         {
             x += v.x;
             y += v.y;
             z += v.z;
+            return *this;
         }
 
         /**
@@ -121,14 +138,55 @@ class Vector
         /**
          * In-place substract vector operator.
          */
-        void operator-=(const Vector &v)
+        Vector &operator-=(const Vector &v)
         {
             x -= v.x;
             y -= v.y;
             z -= v.z;
+            return *this;
+        }
+
+        /**
+         * Returns the length of this vector. This method does a relatively
+         * slow square root.
+         */
+        float length() const
+        {
+            return sqrtf(x * x + y * y + z * z);
+        }
+
+        /**
+         * Returns the squared length of this vector. Avoids the square root.
+         */
+        float squaredLength() const
+        {
+            return x * x + y * y + z * z;
+        }
+
+        /**
+         * Returns the manhattan length of this vector.
+         */
+        float manhattanLength() const
+        {
+            return fabsf(x) + fabsf(y) + fabsf(z);
+        }
+
+        /**
+         * Returns a normalized version of this vector. This is a unit vector
+         * running parallel to it.
+         */
+        Vector normalized() const
+        {
+            const float l = length();
+            return Vector(x / l, y / l, z / l);
         }
 
         float x, y, z;
 };
 
-#endif
+/**
+ * Appends a string representation of a vector to the output stream.
+ */
+std::ostream& operator <<(std::ostream &os, const Vector &v);
+
+#endif // _TMW_VECTOR_H_
-- 
cgit v1.2.3-70-g09d2


From 0b2235dfff7f7c0f534746271ff66275297fd328 Mon Sep 17 00:00:00 2001
From: Roderic Morris <roderic@ccs.neu.edu>
Date: Fri, 24 Oct 2008 00:28:05 +0000
Subject: fixes for targetting (by Chuck Miller)

---
 ChangeLog            |  7 +++++++
 src/beingmanager.cpp |  6 ++++--
 src/gui/viewport.cpp | 19 ++++++++-----------
 src/main.cpp         |  6 ++++--
 4 files changed, 23 insertions(+), 15 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index 3c262ff6..3a77d38b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-23  Chuck Miller  <shadowmil@gmail.com>
+	
+	* src/beingmanager.cpp: Fixed a bug causing targets not to work, and
+	added code that sets player_node's target to null if it gets deleted
+	* src/gui/viewport.cpp: Changed some values to make targets show
+	correctly
+
 2008-10-23  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/Makefile.am: Fixed building with configure.
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index abb23f5e..22b3de9b 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -89,6 +89,8 @@ Being* BeingManager::createBeing(int id, int type, int subtype)
 void BeingManager::destroyBeing(Being *being)
 {
     mBeings.remove(being);
+    if(being == player_node->getTarget())
+        player_node->setTarget(NULL);
     delete being;
 }
 
@@ -179,7 +181,7 @@ Being* BeingManager::findNearestLivingBeing(Uint16 x, Uint16 y, int maxdist,
         }
     }
 
-    return (maxdist >= dist) ? closestBeing : NULL;
+    return (maxdist >= dist) ? NULL : closestBeing;
 }
 
 Being* BeingManager::findNearestLivingBeing(Being *aroundBeing, int maxdist,
@@ -207,5 +209,5 @@ Being* BeingManager::findNearestLivingBeing(Being *aroundBeing, int maxdist,
         }
     }
 
-    return (maxdist >= dist) ? closestBeing : NULL;
+    return (maxdist >= dist) ? NULL : closestBeing;
 }
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 80dcf489..d086418f 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -298,18 +298,15 @@ void Viewport::drawTargetCursor(Graphics *graphics)
         Being::TargetCursorSize cursorSize = target->getTargetCursorSize();
         Image* targetCursor;
         if (rangeX > attackRange || rangeY > attackRange)
-        {
-            targetCursor = mTargetCursorOutRange[cursorSize]->getCurrentImage();
-        }
-        else {
-            targetCursor = mTargetCursorInRange[cursorSize]->getCurrentImage();
-        }
+	    targetCursor = mTargetCursorOutRange[cursorSize]->getCurrentImage();
+        else
+	    targetCursor = mTargetCursorInRange[cursorSize]->getCurrentImage();
 
         // Draw the target cursor at the correct position
-        int posX = target->getPixelX() + 16 -
-                   targetCursor->getWidth() / 2 - (int) mViewX;
-        int posY = target->getPixelY() + 16 -
-                   targetCursor->getHeight() / 2 - (int) mViewY;
+        int posX = target->getPixelX() -
+            targetCursor->getWidth() / 2 - (int) mViewX;
+        int posY = target->getPixelY() - 16 -
+            targetCursor->getHeight() / 2 - (int) mViewY;
 
         graphics->drawImage(targetCursor, posX, posY);
     }
@@ -325,7 +322,7 @@ void Viewport::drawTargetName(Graphics *graphics)
         graphics->setColor(gcn::Color(255, 32, 32));
 
         const MonsterInfo &mi = static_cast<Monster*>(target)->getInfo();
-        int posX = target->getPixelX() + 16 - (int) mViewX;
+        int posX = target->getPixelX() - (int) mViewX;
         int posY = target->getPixelY() + 16 - target->getHeight() - (int) mViewY;
 
         graphics->drawText(mi.getName(), posX, posY, gcn::Graphics::CENTER);
diff --git a/src/main.cpp b/src/main.cpp
index 59c7f74f..628ad8dc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -798,8 +798,10 @@ int main(int argc, char *argv[])
         while (state != STATE_FORCE_QUIT)
         {
             // Handle SDL events
-            while (SDL_PollEvent(&event)) {
-                switch (event.type) {
+            while (SDL_PollEvent(&event)) 
+            {
+                switch (event.type) 
+                {
                     case SDL_QUIT:
                         state = STATE_FORCE_QUIT;
                         break;
-- 
cgit v1.2.3-70-g09d2


From 052cdbd8fce689b64371da82409bfd4e0f189f45 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 31 Oct 2008 23:01:23 +0000
Subject: Merged revisions 4071,4093,4100,4363 via svnmerge from
 https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0

........
  r4071 | the_enemy | 2008-04-11 16:12:30 +0200 (Fri, 11 Apr 2008) | 3 lines

   Players now need to
          click on the monster sprites rather than the tile. Players will now
          move to the target before attacking it.
........
  r4093 | the_enemy | 2008-04-15 18:10:32 +0200 (Tue, 15 Apr 2008) | 1 line

  Fixed clicking near player.
........
  r4100 | peaveydk | 2008-04-16 13:59:36 +0200 (Wed, 16 Apr 2008) | 1 line

  Cancel walking to a clicked monster if the target is lost while getting to it (killed or otherwise removed).
........
  r4363 | crush_tmw | 2008-06-24 14:42:04 +0200 (Tue, 24 Jun 2008) | 1 line

  corrected date in changelog
........
---
 ChangeLog                | 17 ++++++++++++++---
 src/beingmanager.cpp     | 22 ++++++++++++++++++++++
 src/beingmanager.h       |  1 +
 src/effectmanager.cpp    | 14 ++++++--------
 src/gui/viewport.cpp     |  8 +++++---
 src/localplayer.cpp      | 43 ++++++++++++++++++++++++++++++++++++++-----
 src/localplayer.h        | 11 +++++++++++
 src/resources/iteminfo.h |  2 +-
 8 files changed, 98 insertions(+), 20 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index 94b3644e..307bca84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2008-10-27  David Athay  <ko2fan@gmail.com>
 
-	* src/commandhandler.cpp: Remove check command, now there is an NPC for
-	 checking for post.
+	* src/commandhandler.cpp: Remove check command, now there is an NPC
+	for checking for post.
 
 2008-10-27  Chuck Miller  <shadowmil@gmail.com>
 
@@ -9,7 +9,7 @@
 	src/net/effecthandler.cpp: Added a handler for handling effects sent
 	from the server, you'll need the latest server patch for them too work
 	* src/effectmanager.cpp: Removed some debugging code left in by
-	mistake
+	mistake.
 
 2008-10-26  Chuck Miller  <shadowmil@gmail.com>
 
@@ -614,6 +614,8 @@
 
 	* src/gui/browserbox.cpp: Fix a basic_string::at sometimes being out
 	of range in BrowserBox::draw when checking for color codes.
+	* src/localplayer.cpp: Cancel walking to a clicked monster if the
+	target is lost while getting to it (killed or otherwise removed).
 
 2008-04-15  David Athay  <ko2fan@gmail.com>
 
@@ -625,6 +627,8 @@
 	src/Makefile.am, data/graphics/gui/circle-green.png
 	data/graphics/gui/circle-gray.png, tmw.cbp: Added online status of
 	guild members.
+	* src/gui/viewport.cpp, src/beingmanager.cpp, tmw.cbp: Fixed clicking
+	near player.
 
 2008-04-14 Yohann Ferreira <bertram@cegetel.net>
 
@@ -659,6 +663,13 @@
 	src/gui/scrollarea.cpp, src/gui/itemshortcutwindow.h: Fixed display of
 	item shortcut container. gcn::Widget::setWidth is no longer virtual.
 
+2008-04-11  David Athay  <ko2fan@gmail.com>
+
+	* src/localplayer.cpp, src/beingmanager.h, src/gui/viewport.cpp,
+	src/beingmanager.cpp, src/localplayer.h, tmw.cbp: Players now need to
+	click on the monster sprites rather than the tile. Players will now
+	move to the target before attacking it.
+
 2008-04-09  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/gui/shoplistbox.cpp, src/gui/shoplistbox.h: Fixed problem with
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index 2ab29fd2..40f438df 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -117,6 +117,28 @@ Being* BeingManager::findBeing(Uint16 x, Uint16 y, Being::Type type)
     return (i == mBeings.end()) ? NULL : *i;
 }
 
+Being* BeingManager::findBeingByPixel(Uint16 x, Uint16 y)
+{
+    BeingIterator itr = mBeings.begin();
+    BeingIterator itr_end = mBeings.end();
+
+    for (; itr != itr_end; ++itr)
+    {
+        Being *being = (*itr);
+        if ((being->mAction != Being::DEAD) &&
+            (being != player_node) &&
+            (being->getPixelX() <= x) &&
+            (being->getPixelX() + being->getWidth() >= x) &&
+            (being->getPixelY() <= y) &&
+            (being->getPixelY() + being->getHeight() >= y))
+        {
+            return being;
+        }
+    }
+
+    return NULL;
+}
+
 Beings& BeingManager::getAll()
 {
     return mBeings;
diff --git a/src/beingmanager.h b/src/beingmanager.h
index 6792ed0e..f7a3b8f0 100644
--- a/src/beingmanager.h
+++ b/src/beingmanager.h
@@ -64,6 +64,7 @@ class BeingManager
          * Returns a being at specific coordinates.
          */
         Being* findBeing(Uint16 x, Uint16 y, Being::Type type = Being::UNKNOWN);
+        Being* findBeingByPixel(Uint16 x, Uint16 y);
 
         /**
          * Returns a being nearest to specific coordinates.
diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp
index bb8b5733..87d98834 100644
--- a/src/effectmanager.cpp
+++ b/src/effectmanager.cpp
@@ -42,12 +42,10 @@ EffectManager::EffectManager()
     else
     {
         logger->log("Effects are now loading");
-    } 
+    }
 
     for_each_xml_child_node(node, root)
     {
-        int id;
-
         if (xmlStrEqual(node->name, BAD_CAST "effect"))
         {
             EffectDescription ed;
@@ -61,22 +59,22 @@ EffectManager::EffectManager()
 
 EffectManager::~EffectManager()
 {
-
 }
 
 bool EffectManager::trigger(int id, int x, int y)
 {
     bool rValue = false;
-    for (std::list<EffectDescription>::iterator i = mEffects.begin(); i != mEffects.end(); ++i)
+    for (std::list<EffectDescription>::iterator i = mEffects.begin();
+            i != mEffects.end(); ++i)
     {
         if ((*i).id == id)
         {
             rValue = true;
-            if((*i).GFX != "")
+            if ((*i).GFX != "")
                 particleEngine->addEffect((*i).GFX, x, y);
-            if((*i).SFX != "")
+            if ((*i).SFX != "")
                 sound.playSfx((*i).SFX);
-            break;            
+            break;
         }
     }
     return rValue;
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index d086418f..9671e34f 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -370,8 +370,10 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
 
     mPlayerFollowMouse = false;
 
-    const int tilex = (event.getX() + (int) mViewX) / 32;
-    const int tiley = (event.getY() + (int) mViewY) / 32;
+    const int pixelx = event.getX() + (int) mViewX;
+    const int pixely = event.getY() + (int) mViewY;
+    const int tilex = pixelx / mMap->getTileWidth();
+    const int tiley = pixely / mMap->getTileHeight();
 
     // Right click might open a popup
     if (event.getButton() == gcn::MouseEvent::RIGHT)
@@ -379,7 +381,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
         Being *being;
         FloorItem *floorItem;
 
-        if ((being = beingManager->findBeing(tilex, tiley)) &&
+        if ((being = beingManager->findBeingByPixel(tilex, tiley)) &&
             being != player_node)
         {
             mPopupMenu->showPopup(event.getX(), event.getY(), being);
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index fce9506a..fe3f1f45 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -66,8 +66,9 @@ LocalPlayer::LocalPlayer():
     mTotalWeight(1), mMaxWeight(1),
     mHP(1), mMaxHP(1),
     mTarget(NULL), mPickUpTarget(NULL),
-    mTrading(false),
-    mLastAction(-1), mWalkingDir(0),
+    mTrading(false), mGoingToTarget(false),
+    mLastAction(-1),
+    mWalkingDir(0),
     mDestX(0), mDestY(0),
     mLocalWalkTime(-1),
     mExpMessageTime(0)
@@ -122,6 +123,21 @@ void LocalPlayer::nextStep()
             walk(mWalkingDir);
         }
     }
+
+    // TODO: Fix automatically walking within range of target, when wanted
+    if (mGoingToTarget && mTarget && withinAttackRange(mTarget))
+    {
+        mAction = Being::STAND;
+        //attack(mTarget, true);
+        mGoingToTarget = false;
+        mPath.clear();
+        return;
+    }
+    else if (mGoingToTarget && !mTarget)
+    {
+        mGoingToTarget = false;
+        mPath.clear();
+    }
 }
 
 bool LocalPlayer::checkInviteRights(const std::string &guildName)
@@ -541,12 +557,29 @@ std::pair<int, int> LocalPlayer::getExperience(int skill)
 int LocalPlayer::getAttackRange()
 {
     Item *weapon = mEquipment->getEquipment(EQUIP_FIGHT1_SLOT);
-    if(weapon)
+    if (weapon)
     {
         const ItemInfo info = weapon->getInfo();
         return info.getAttackRange();
     }
-    return 32; //unarmed range
-    
+    return 32; // unarmed range
 }
 
+bool LocalPlayer::withinAttackRange(Being *target)
+{
+    const Vector &targetPos = target->getPosition();
+    const Vector &pos = getPosition();
+    const int dx = abs(targetPos.x - pos.x);
+    const int dy = abs(targetPos.y - pos.y);
+    const int range = getAttackRange();
+
+    return !(dx > range || dy > range);
+}
+
+void LocalPlayer::setGotoTarget(Being *target)
+{
+    mTarget = target;
+    mGoingToTarget = true;
+    const Vector &targetPos = target->getPosition();
+    setDestination(targetPos.x, targetPos.y);
+}
diff --git a/src/localplayer.h b/src/localplayer.h
index 7a5158cc..b44ac14a 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -257,6 +257,16 @@ class LocalPlayer : public Player
         int getWalkingDir() const
         { return mWalkingDir; }
 
+        /**
+         * Sets going to being to attack
+         */
+        void setGotoTarget(Being *target);
+
+        /**
+         * Returns whether the target is in range to attack
+         */
+        bool withinAttackRange(Being *target);
+
         /**
          * Stops the player dead in his tracks
          */
@@ -377,6 +387,7 @@ class LocalPlayer : public Player
         FloorItem *mPickUpTarget;
 
         bool mTrading;
+        bool mGoingToTarget;
         int mLastAction;    /**< Time stamp of the last action, -1 if none. */
         int mWalkingDir;    /**< The direction the player is walking in. */
         int mDestX;         /**< X coordinate of destination. */
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index a8e9f2e4..5b500dcf 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -64,7 +64,7 @@ enum EquipmentSlot
     EQUIP_FIGHT2_SLOT = 9,
     // Projectile:
     //   this item does not amount to one, it only indicates the chosen projectile.
-    EQUIP_PROJECTILE_SLOT = 10,
+    EQUIP_PROJECTILE_SLOT = 10
 };
 
 
-- 
cgit v1.2.3-70-g09d2


From a9a59f28594b87c8ac29e6739e34decd79f2fd2a Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 2 Nov 2008 22:16:30 +0000
Subject: Fixed right-clicking on NPCs.

---
 ChangeLog            | 4 ++++
 src/gui/viewport.cpp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/ChangeLog b/ChangeLog
index a06bdf3e..4cad0bd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-02  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/viewport.cpp: Fixed right-clicking on NPCs.
+
 2008-11-01  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/game.cpp, src7gui/menuwindow.cpp, src/gui/setup.cpp,
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 9671e34f..14239094 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -381,7 +381,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
         Being *being;
         FloorItem *floorItem;
 
-        if ((being = beingManager->findBeingByPixel(tilex, tiley)) &&
+        if ((being = beingManager->findBeingByPixel(pixelx, pixely)) &&
             being != player_node)
         {
             mPopupMenu->showPopup(event.getX(), event.getY(), being);
-- 
cgit v1.2.3-70-g09d2


From ff61662640c4053220464f34413568f06f51154a Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 16 Nov 2008 15:37:13 +0100
Subject: Got rid of CVS/Subversion $Id$ markers

I don't know why we dealt with these things for so long. Did we ever get
anything out of it?
---
 src/animatedsprite.cpp                  | 2 --
 src/animatedsprite.h                    | 2 --
 src/animationparticle.cpp               | 1 -
 src/animationparticle.h                 | 1 -
 src/being.cpp                           | 2 --
 src/being.h                             | 2 --
 src/beingmanager.cpp                    | 2 --
 src/beingmanager.h                      | 2 --
 src/channel.cpp                         | 2 --
 src/channel.h                           | 2 --
 src/channelmanager.cpp                  | 2 --
 src/channelmanager.h                    | 2 --
 src/commandhandler.cpp                  | 2 --
 src/commandhandler.h                    | 2 --
 src/configlistener.h                    | 2 --
 src/configuration.cpp                   | 2 --
 src/configuration.h                     | 2 --
 src/effectmanager.cpp                   | 1 -
 src/effectmanager.h                     | 1 -
 src/engine.cpp                          | 2 --
 src/engine.h                            | 2 --
 src/equipment.cpp                       | 2 --
 src/equipment.h                         | 2 --
 src/floor_item.cpp                      | 2 --
 src/floor_item.h                        | 2 --
 src/flooritemmanager.cpp                | 2 --
 src/flooritemmanager.h                  | 2 --
 src/game.cpp                            | 2 --
 src/game.h                              | 2 --
 src/graphics.cpp                        | 2 --
 src/graphics.h                          | 2 --
 src/gui/box.cpp                         | 2 --
 src/gui/box.h                           | 2 --
 src/gui/browserbox.cpp                  | 2 --
 src/gui/browserbox.h                    | 2 --
 src/gui/buddywindow.cpp                 | 2 --
 src/gui/buddywindow.h                   | 2 --
 src/gui/button.cpp                      | 2 --
 src/gui/button.h                        | 2 --
 src/gui/buy.cpp                         | 2 --
 src/gui/buy.h                           | 2 --
 src/gui/buysell.cpp                     | 2 --
 src/gui/buysell.h                       | 2 --
 src/gui/changeemaildialog.cpp           | 2 --
 src/gui/changeemaildialog.h             | 2 --
 src/gui/changepassworddialog.cpp        | 2 --
 src/gui/changepassworddialog.h          | 2 --
 src/gui/char_select.cpp                 | 2 --
 src/gui/char_select.h                   | 2 --
 src/gui/chargedialog.cpp                | 1 -
 src/gui/chargedialog.h                  | 1 -
 src/gui/chat.cpp                        | 2 --
 src/gui/chat.h                          | 2 --
 src/gui/chatinput.cpp                   | 2 --
 src/gui/chatinput.h                     | 2 --
 src/gui/checkbox.cpp                    | 2 --
 src/gui/checkbox.h                      | 2 --
 src/gui/confirm_dialog.cpp              | 2 --
 src/gui/confirm_dialog.h                | 2 --
 src/gui/connection.cpp                  | 2 --
 src/gui/connection.h                    | 2 --
 src/gui/debugwindow.cpp                 | 2 --
 src/gui/debugwindow.h                   | 2 --
 src/gui/equipmentwindow.cpp             | 2 --
 src/gui/equipmentwindow.h               | 2 --
 src/gui/focushandler.cpp                | 2 --
 src/gui/focushandler.h                  | 2 --
 src/gui/gccontainer.cpp                 | 2 --
 src/gui/gccontainer.h                   | 2 --
 src/gui/gui.cpp                         | 2 --
 src/gui/gui.h                           | 2 --
 src/gui/guildlistbox.cpp                | 2 --
 src/gui/guildlistbox.h                  | 2 --
 src/gui/guildwindow.cpp                 | 1 -
 src/gui/guildwindow.h                   | 2 --
 src/gui/hbox.cpp                        | 2 --
 src/gui/hbox.h                          | 2 --
 src/gui/help.cpp                        | 2 --
 src/gui/help.h                          | 2 --
 src/gui/icon.cpp                        | 2 --
 src/gui/icon.h                          | 2 --
 src/gui/inttextbox.cpp                  | 2 --
 src/gui/inttextbox.h                    | 2 --
 src/gui/inventorywindow.cpp             | 2 --
 src/gui/inventorywindow.h               | 2 --
 src/gui/item_amount.cpp                 | 2 --
 src/gui/item_amount.h                   | 2 --
 src/gui/itemcontainer.cpp               | 2 --
 src/gui/itemcontainer.h                 | 2 --
 src/gui/itempopup.cpp                   | 2 --
 src/gui/itempopup.h                     | 3 ---
 src/gui/itemshortcutcontainer.cpp       | 2 --
 src/gui/itemshortcutcontainer.h         | 2 --
 src/gui/itemshortcutwindow.cpp          | 2 --
 src/gui/itemshortcutwindow.h            | 2 --
 src/gui/linkhandler.h                   | 2 --
 src/gui/listbox.cpp                     | 2 --
 src/gui/listbox.h                       | 2 --
 src/gui/login.cpp                       | 2 --
 src/gui/login.h                         | 2 --
 src/gui/magic.cpp                       | 2 --
 src/gui/magic.h                         | 3 ---
 src/gui/menuwindow.cpp                  | 2 --
 src/gui/menuwindow.h                    | 2 --
 src/gui/minimap.cpp                     | 2 --
 src/gui/minimap.h                       | 2 --
 src/gui/ministatus.cpp                  | 2 --
 src/gui/ministatus.h                    | 2 --
 src/gui/newskill.cpp                    | 2 --
 src/gui/newskill.h                      | 2 --
 src/gui/npc_text.cpp                    | 2 --
 src/gui/npc_text.h                      | 2 --
 src/gui/npclistdialog.cpp               | 2 --
 src/gui/npclistdialog.h                 | 2 --
 src/gui/npcpostdialog.cpp               | 2 --
 src/gui/npcpostdialog.h                 | 2 --
 src/gui/ok_dialog.cpp                   | 2 --
 src/gui/ok_dialog.h                     | 2 --
 src/gui/partywindow.cpp                 | 2 --
 src/gui/partywindow.h                   | 2 --
 src/gui/passwordfield.cpp               | 2 --
 src/gui/passwordfield.h                 | 2 --
 src/gui/playerbox.cpp                   | 2 --
 src/gui/playerbox.h                     | 2 --
 src/gui/popupmenu.cpp                   | 2 --
 src/gui/popupmenu.h                     | 2 --
 src/gui/progressbar.cpp                 | 2 --
 src/gui/progressbar.h                   | 2 --
 src/gui/quitdialog.cpp                  | 1 -
 src/gui/quitdialog.h                    | 1 -
 src/gui/radiobutton.cpp                 | 2 --
 src/gui/radiobutton.h                   | 2 --
 src/gui/register.cpp                    | 2 --
 src/gui/register.h                      | 2 --
 src/gui/scrollarea.cpp                  | 2 --
 src/gui/scrollarea.h                    | 2 --
 src/gui/sdlinput.cpp                    | 2 --
 src/gui/sdlinput.h                      | 2 --
 src/gui/sell.cpp                        | 2 --
 src/gui/sell.h                          | 2 --
 src/gui/serverdialog.cpp                | 2 --
 src/gui/serverdialog.h                  | 2 --
 src/gui/setup.cpp                       | 2 --
 src/gui/setup.h                         | 2 --
 src/gui/setup_audio.cpp                 | 2 --
 src/gui/setup_audio.h                   | 2 --
 src/gui/setup_joystick.cpp              | 2 --
 src/gui/setup_joystick.h                | 2 --
 src/gui/setup_keyboard.cpp              | 2 --
 src/gui/setup_keyboard.h                | 2 --
 src/gui/setup_video.cpp                 | 2 --
 src/gui/setup_video.h                   | 2 --
 src/gui/setuptab.h                      | 2 --
 src/gui/shop.cpp                        | 2 --
 src/gui/shop.h                          | 2 --
 src/gui/shoplistbox.cpp                 | 2 --
 src/gui/shoplistbox.h                   | 2 --
 src/gui/skill.cpp                       | 2 --
 src/gui/skill.h                         | 2 --
 src/gui/slider.cpp                      | 2 --
 src/gui/slider.h                        | 2 --
 src/gui/speechbubble.cpp                | 2 --
 src/gui/speechbubble.h                  | 2 --
 src/gui/status.cpp                      | 2 --
 src/gui/status.h                        | 2 --
 src/gui/textbox.cpp                     | 2 --
 src/gui/textbox.h                       | 2 --
 src/gui/textdialog.cpp                  | 2 --
 src/gui/textdialog.h                    | 2 --
 src/gui/textfield.cpp                   | 2 --
 src/gui/textfield.h                     | 2 --
 src/gui/trade.cpp                       | 2 --
 src/gui/trade.h                         | 2 --
 src/gui/truetypefont.cpp                | 2 --
 src/gui/truetypefont.h                  | 2 --
 src/gui/unregisterdialog.cpp            | 2 --
 src/gui/unregisterdialog.h              | 2 --
 src/gui/updatewindow.cpp                | 2 --
 src/gui/updatewindow.h                  | 2 --
 src/gui/vbox.cpp                        | 2 --
 src/gui/vbox.h                          | 2 --
 src/gui/viewport.cpp                    | 2 --
 src/gui/viewport.h                      | 2 --
 src/gui/widgets/avatar.cpp              | 2 --
 src/gui/widgets/avatar.h                | 2 --
 src/gui/widgets/dropdown.cpp            | 2 --
 src/gui/widgets/dropdown.h              | 2 --
 src/gui/widgets/layout.cpp              | 2 --
 src/gui/widgets/layout.h                | 2 --
 src/gui/widgets/resizegrip.cpp          | 2 --
 src/gui/widgets/resizegrip.h            | 2 --
 src/gui/widgets/tab.cpp                 | 2 --
 src/gui/widgets/tab.h                   | 2 --
 src/gui/widgets/tabbedarea.cpp          | 2 --
 src/gui/widgets/tabbedarea.h            | 2 --
 src/gui/window.cpp                      | 2 --
 src/gui/window.h                        | 2 --
 src/gui/windowcontainer.cpp             | 2 --
 src/gui/windowcontainer.h               | 2 --
 src/guichanfwd.h                        | 2 --
 src/guild.cpp                           | 2 --
 src/guild.h                             | 2 --
 src/imageparticle.cpp                   | 2 --
 src/imageparticle.h                     | 2 --
 src/inventory.cpp                       | 2 --
 src/inventory.h                         | 2 --
 src/item.cpp                            | 2 --
 src/item.h                              | 2 --
 src/itemshortcut.cpp                    | 2 --
 src/itemshortcut.h                      | 2 --
 src/joystick.cpp                        | 2 --
 src/joystick.h                          | 2 --
 src/keyboardconfig.cpp                  | 2 --
 src/keyboardconfig.h                    | 2 --
 src/localplayer.cpp                     | 2 --
 src/localplayer.h                       | 2 --
 src/lockedarray.h                       | 2 --
 src/logindata.h                         | 2 --
 src/main.cpp                            | 2 --
 src/main.h                              | 2 --
 src/map.cpp                             | 2 --
 src/map.h                               | 2 --
 src/monster.cpp                         | 2 --
 src/monster.h                           | 2 --
 src/net/accountserver/account.cpp       | 2 --
 src/net/accountserver/account.h         | 2 --
 src/net/accountserver/accountserver.cpp | 2 --
 src/net/accountserver/accountserver.h   | 2 --
 src/net/accountserver/internal.cpp      | 2 --
 src/net/accountserver/internal.h        | 2 --
 src/net/beinghandler.cpp                | 2 --
 src/net/beinghandler.h                  | 2 --
 src/net/buysellhandler.cpp              | 2 --
 src/net/buysellhandler.h                | 2 --
 src/net/charserverhandler.cpp           | 2 --
 src/net/charserverhandler.h             | 2 --
 src/net/chathandler.cpp                 | 2 --
 src/net/chathandler.h                   | 2 --
 src/net/chatserver/chatserver.cpp       | 2 --
 src/net/chatserver/chatserver.h         | 2 --
 src/net/chatserver/guild.cpp            | 2 --
 src/net/chatserver/guild.h              | 2 --
 src/net/chatserver/internal.cpp         | 2 --
 src/net/chatserver/internal.h           | 2 --
 src/net/chatserver/party.cpp            | 2 --
 src/net/chatserver/party.h              | 2 --
 src/net/connection.cpp                  | 2 --
 src/net/connection.h                    | 2 --
 src/net/effecthandler.cpp               | 1 -
 src/net/effecthandler.h                 | 1 -
 src/net/gameserver/gameserver.cpp       | 2 --
 src/net/gameserver/gameserver.h         | 2 --
 src/net/gameserver/internal.cpp         | 2 --
 src/net/gameserver/internal.h           | 2 --
 src/net/gameserver/player.cpp           | 2 --
 src/net/gameserver/player.h             | 2 --
 src/net/guildhandler.cpp                | 2 --
 src/net/guildhandler.h                  | 2 --
 src/net/internal.cpp                    | 2 --
 src/net/internal.h                      | 2 --
 src/net/inventoryhandler.cpp            | 2 --
 src/net/inventoryhandler.h              | 2 --
 src/net/itemhandler.cpp                 | 2 --
 src/net/itemhandler.h                   | 2 --
 src/net/loginhandler.cpp                | 2 --
 src/net/loginhandler.h                  | 2 --
 src/net/logouthandler.cpp               | 2 --
 src/net/logouthandler.h                 | 2 --
 src/net/messagehandler.cpp              | 2 --
 src/net/messagehandler.h                | 2 --
 src/net/messagein.cpp                   | 2 --
 src/net/messagein.h                     | 2 --
 src/net/messageout.cpp                  | 2 --
 src/net/messageout.h                    | 2 --
 src/net/network.cpp                     | 2 --
 src/net/network.h                       | 2 --
 src/net/npchandler.cpp                  | 2 --
 src/net/npchandler.h                    | 2 --
 src/net/partyhandler.cpp                | 2 --
 src/net/partyhandler.h                  | 2 --
 src/net/playerhandler.cpp               | 2 --
 src/net/playerhandler.h                 | 2 --
 src/net/protocol.h                      | 2 --
 src/net/tradehandler.cpp                | 2 --
 src/net/tradehandler.h                  | 2 --
 src/npc.cpp                             | 2 --
 src/npc.h                               | 2 --
 src/openglgraphics.cpp                  | 2 --
 src/openglgraphics.h                    | 2 --
 src/particle.cpp                        | 2 --
 src/particle.h                          | 2 --
 src/particleemitter.cpp                 | 2 --
 src/particleemitter.h                   | 2 --
 src/player.cpp                          | 2 --
 src/player.h                            | 2 --
 src/position.cpp                        | 2 --
 src/position.h                          | 2 --
 src/properties.h                        | 2 --
 src/resources/action.cpp                | 2 --
 src/resources/action.h                  | 2 --
 src/resources/ambientoverlay.cpp        | 2 --
 src/resources/ambientoverlay.h          | 2 --
 src/resources/animation.cpp             | 2 --
 src/resources/animation.h               | 2 --
 src/resources/buddylist.cpp             | 2 --
 src/resources/buddylist.h               | 2 --
 src/resources/dye.cpp                   | 2 --
 src/resources/dye.h                     | 2 --
 src/resources/image.cpp                 | 2 --
 src/resources/image.h                   | 2 --
 src/resources/imageloader.cpp           | 2 --
 src/resources/imageloader.h             | 2 --
 src/resources/imageset.cpp              | 2 --
 src/resources/imageset.h                | 2 --
 src/resources/imagewriter.cpp           | 2 --
 src/resources/imagewriter.h             | 2 --
 src/resources/itemdb.cpp                | 2 --
 src/resources/itemdb.h                  | 2 --
 src/resources/iteminfo.cpp              | 2 --
 src/resources/iteminfo.h                | 2 --
 src/resources/mapreader.cpp             | 2 --
 src/resources/mapreader.h               | 2 --
 src/resources/monsterdb.cpp             | 2 --
 src/resources/monsterdb.h               | 2 --
 src/resources/monsterinfo.cpp           | 2 --
 src/resources/monsterinfo.h             | 2 --
 src/resources/music.cpp                 | 2 --
 src/resources/music.h                   | 2 --
 src/resources/npcdb.cpp                 | 2 --
 src/resources/npcdb.h                   | 2 --
 src/resources/resource.cpp              | 2 --
 src/resources/resource.h                | 2 --
 src/resources/resourcemanager.cpp       | 2 --
 src/resources/resourcemanager.h         | 2 --
 src/resources/soundeffect.cpp           | 2 --
 src/resources/soundeffect.h             | 2 --
 src/resources/spritedef.cpp             | 2 --
 src/resources/spritedef.h               | 2 --
 src/serverinfo.h                        | 2 --
 src/shopitem.cpp                        | 2 --
 src/shopitem.h                          | 2 --
 src/simpleanimation.cpp                 | 2 --
 src/simpleanimation.h                   | 2 --
 src/sound.cpp                           | 2 --
 src/sound.h                             | 2 --
 src/sprite.h                            | 2 --
 src/textparticle.cpp                    | 2 --
 src/textparticle.h                      | 2 --
 src/tileset.h                           | 2 --
 src/utils/base64.cpp                    | 1 -
 src/utils/base64.h                      | 1 -
 src/utils/dtor.h                        | 2 --
 src/utils/fastsqrt.h                    | 2 --
 src/utils/gettext.h                     | 2 --
 src/utils/minmax.h                      | 2 --
 src/utils/sha256.cpp                    | 2 --
 src/utils/sha256.h                      | 2 --
 src/utils/strprintf.cpp                 | 2 --
 src/utils/strprintf.h                   | 2 --
 src/utils/tostring.h                    | 2 --
 src/utils/trim.h                        | 2 --
 src/utils/xml.cpp                       | 2 --
 src/utils/xml.h                         | 2 --
 src/vector.cpp                          | 2 --
 src/vector.h                            | 2 --
 tools/dyecmd/src/dye.cpp                | 2 --
 tools/dyecmd/src/dye.h                  | 2 --
 tools/dyecmd/src/dyecmd.cpp             | 2 --
 tools/dyecmd/src/imagewriter.cpp        | 2 --
 tools/dyecmd/src/imagewriter.h          | 2 --
 tools/tmxcopy/base64.cpp                | 1 -
 tools/tmxcopy/base64.h                  | 1 -
 tools/tmxcopy/tostring.h                | 2 --
 tools/tmxcopy/xmlutils.cpp              | 1 -
 tools/tmxcopy/xmlutils.h                | 1 -
 375 files changed, 735 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 13596a70..b2bb1f28 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "animatedsprite.h"
diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index a1fbe7a0..405bf42e 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_ANIMATEDSPRITE_H
diff --git a/src/animationparticle.cpp b/src/animationparticle.cpp
index c79a5bc4..eb260157 100644
--- a/src/animationparticle.cpp
+++ b/src/animationparticle.cpp
@@ -17,7 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #include "animationparticle.h"
diff --git a/src/animationparticle.h b/src/animationparticle.h
index 054b1b73..eabc2742 100644
--- a/src/animationparticle.h
+++ b/src/animationparticle.h
@@ -17,7 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #ifndef _ANIMATION_PARTICLE
diff --git a/src/being.cpp b/src/being.cpp
index bac66d48..a267d033 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 #include "being.h"
 
diff --git a/src/being.h b/src/being.h
index a0475910..bf11e3ed 100644
--- a/src/being.h
+++ b/src/being.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_BEING_H
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index 40f438df..6d9267d2 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <cassert>
diff --git a/src/beingmanager.h b/src/beingmanager.h
index f7a3b8f0..d3fb9888 100644
--- a/src/beingmanager.h
+++ b/src/beingmanager.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_BEINGMANAGER_H
diff --git a/src/channel.cpp b/src/channel.cpp
index 969386f1..c62d6590 100644
--- a/src/channel.cpp
+++ b/src/channel.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 
diff --git a/src/channel.h b/src/channel.h
index 3cb38a1c..01bd2728 100644
--- a/src/channel.h
+++ b/src/channel.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <string>
diff --git a/src/channelmanager.cpp b/src/channelmanager.cpp
index 3c66f4bb..a332edbb 100644
--- a/src/channelmanager.cpp
+++ b/src/channelmanager.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <list>
diff --git a/src/channelmanager.h b/src/channelmanager.h
index 5e6b5ba1..c19c548a 100644
--- a/src/channelmanager.h
+++ b/src/channelmanager.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_CHANNELMANAGER_H
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 5c7b5e52..4b1a0225 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 
diff --git a/src/commandhandler.h b/src/commandhandler.h
index 10a4376f..eab0f077 100644
--- a/src/commandhandler.h
+++ b/src/commandhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_COMMANDHANDLER_H
diff --git a/src/configlistener.h b/src/configlistener.h
index 7ce5d949..b740720f 100644
--- a/src/configlistener.h
+++ b/src/configlistener.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_CONFIGLISTENER_H
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 864ad7c3..e801083f 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 
diff --git a/src/configuration.h b/src/configuration.h
index 28246a02..a2d3b55d 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_CONFIGURATION_H
diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp
index 87d98834..52f1eb31 100644
--- a/src/effectmanager.cpp
+++ b/src/effectmanager.cpp
@@ -17,7 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #include "effectmanager.h"
diff --git a/src/effectmanager.h b/src/effectmanager.h
index b5451f27..1ae82caf 100644
--- a/src/effectmanager.h
+++ b/src/effectmanager.h
@@ -17,7 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #ifndef _EFFECT_MANAGER_H
diff --git a/src/engine.cpp b/src/engine.cpp
index e4b25c02..ba5ce5e3 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "engine.h"
diff --git a/src/engine.h b/src/engine.h
index 0e77bf3d..dbee1258 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _ENGINE_H
diff --git a/src/equipment.cpp b/src/equipment.cpp
index 265f230a..aa56b791 100644
--- a/src/equipment.cpp
+++ b/src/equipment.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
diff --git a/src/equipment.h b/src/equipment.h
index 7a0c8238..736074dd 100644
--- a/src/equipment.h
+++ b/src/equipment.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_EQUIPMENT_H_
diff --git a/src/floor_item.cpp b/src/floor_item.cpp
index 9727093f..7ad3c0c0 100644
--- a/src/floor_item.cpp
+++ b/src/floor_item.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "floor_item.h"
diff --git a/src/floor_item.h b/src/floor_item.h
index a87e3f79..b747310b 100644
--- a/src/floor_item.h
+++ b/src/floor_item.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_FLOORITEM_H_
diff --git a/src/flooritemmanager.cpp b/src/flooritemmanager.cpp
index c28755fb..68c84b5b 100644
--- a/src/flooritemmanager.cpp
+++ b/src/flooritemmanager.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "flooritemmanager.h"
diff --git a/src/flooritemmanager.h b/src/flooritemmanager.h
index c12883a4..3dbaf988 100644
--- a/src/flooritemmanager.h
+++ b/src/flooritemmanager.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_FLOORITEMMANAGER_H
diff --git a/src/game.cpp b/src/game.cpp
index 421c8aac..df6d5578 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "game.h"
diff --git a/src/game.h b/src/game.h
index 56923bd0..4035584b 100644
--- a/src/game.h
+++ b/src/game.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_GAME_
diff --git a/src/graphics.cpp b/src/graphics.cpp
index 586f9f49..6920bcb0 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <cassert>
diff --git a/src/graphics.h b/src/graphics.h
index 564826a2..efdd1ac1 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _GRAPHICS_H
diff --git a/src/gui/box.cpp b/src/gui/box.cpp
index 6af3ae3e..59d8c135 100644
--- a/src/gui/box.cpp
+++ b/src/gui/box.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "box.h"
diff --git a/src/gui/box.h b/src/gui/box.h
index ed1a7163..46654b48 100644
--- a/src/gui/box.h
+++ b/src/gui/box.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 53a2ac0f..b0b6f48e 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h
index 0a9032e4..465ff497 100644
--- a/src/gui/browserbox.h
+++ b/src/gui/browserbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef __TMW_BROWSERBOX_H__
diff --git a/src/gui/buddywindow.cpp b/src/gui/buddywindow.cpp
index 0ed383ce..14a941a5 100644
--- a/src/gui/buddywindow.cpp
+++ b/src/gui/buddywindow.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "buddywindow.h"
diff --git a/src/gui/buddywindow.h b/src/gui/buddywindow.h
index a3ca4de2..6b07f470 100644
--- a/src/gui/buddywindow.h
+++ b/src/gui/buddywindow.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_BUDDYWINDOW_H
diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index c6bc4ccb..40ecd1b7 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
diff --git a/src/gui/button.h b/src/gui/button.h
index d12173b2..f451416c 100644
--- a/src/gui/button.h
+++ b/src/gui/button.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_BUTTON_H
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 49d19675..a948b136 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "buy.h"
diff --git a/src/gui/buy.h b/src/gui/buy.h
index ec7419be..24f18742 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_BUY_H
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index ae5c7358..42380882 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "buysell.h"
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index 97caf34b..2391ed1c 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_BUYSELL_H
diff --git a/src/gui/changeemaildialog.cpp b/src/gui/changeemaildialog.cpp
index 94253d31..c9bc2570 100644
--- a/src/gui/changeemaildialog.cpp
+++ b/src/gui/changeemaildialog.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "changeemaildialog.h"
diff --git a/src/gui/changeemaildialog.h b/src/gui/changeemaildialog.h
index 862c9d10..8ec3705d 100644
--- a/src/gui/changeemaildialog.h
+++ b/src/gui/changeemaildialog.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_GUI_CHANGEEMAIL_H
diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp
index e3bb0511..8d667790 100644
--- a/src/gui/changepassworddialog.cpp
+++ b/src/gui/changepassworddialog.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "changepassworddialog.h"
diff --git a/src/gui/changepassworddialog.h b/src/gui/changepassworddialog.h
index 450cce61..0cf744da 100644
--- a/src/gui/changepassworddialog.h
+++ b/src/gui/changepassworddialog.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_CHANGEPASSWORDDIALOG_H
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index c011aa84..3adfbc08 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "char_select.h"
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index 0c1dbe45..ed03cedd 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _CHAR_SELECT_H
diff --git a/src/gui/chargedialog.cpp b/src/gui/chargedialog.cpp
index 862378ae..1c9edf45 100644
--- a/src/gui/chargedialog.cpp
+++ b/src/gui/chargedialog.cpp
@@ -17,7 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
  /* The window supported by this class shows player stats and keeps a charging
diff --git a/src/gui/chargedialog.h b/src/gui/chargedialog.h
index c09c692c..9517ef6a 100644
--- a/src/gui/chargedialog.h
+++ b/src/gui/chargedialog.h
@@ -17,7 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #ifndef _TMW_CHARGE_H
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 82e7d372..c94429c8 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
diff --git a/src/gui/chat.h b/src/gui/chat.h
index f7af6480..a41b11fb 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_CHAT_H
diff --git a/src/gui/chatinput.cpp b/src/gui/chatinput.cpp
index fc5d6aab..afe7f037 100644
--- a/src/gui/chatinput.cpp
+++ b/src/gui/chatinput.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "chatinput.h"
diff --git a/src/gui/chatinput.h b/src/gui/chatinput.h
index da2342ae..e04dfa6e 100644
--- a/src/gui/chatinput.h
+++ b/src/gui/chatinput.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_CHATINPUT_H
diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp
index 5b300d33..20e24dee 100644
--- a/src/gui/checkbox.cpp
+++ b/src/gui/checkbox.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "checkbox.h"
diff --git a/src/gui/checkbox.h b/src/gui/checkbox.h
index 262e63ae..839ca97e 100644
--- a/src/gui/checkbox.h
+++ b/src/gui/checkbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_CHECKBOX_H
diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp
index 65ca27f7..5f2b9cb2 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirm_dialog.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "confirm_dialog.h"
diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h
index 8728f83f..c9bfca02 100644
--- a/src/gui/confirm_dialog.h
+++ b/src/gui/confirm_dialog.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_OPTION_DIALOG_H
diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index a9fa2a56..f54c9dd5 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "connection.h"
diff --git a/src/gui/connection.h b/src/gui/connection.h
index 51ad5467..36ccd8a9 100644
--- a/src/gui/connection.h
+++ b/src/gui/connection.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_CONNECTION_H
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 3d0690b9..d92c3575 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "debugwindow.h"
diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h
index 9b6f2017..ae1d8b14 100644
--- a/src/gui/debugwindow.h
+++ b/src/gui/debugwindow.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_DEBUGWINDOW_H
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 9a96b4d6..aee262d0 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #define BOX_WIDTH 36
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 696f4fc6..b6d2e2f4 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_EQUIPMENT_H
diff --git a/src/gui/focushandler.cpp b/src/gui/focushandler.cpp
index ffdb7896..1bda568e 100644
--- a/src/gui/focushandler.cpp
+++ b/src/gui/focushandler.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "focushandler.h"
diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h
index 252fdd9d..a5218485 100644
--- a/src/gui/focushandler.h
+++ b/src/gui/focushandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_FOCUSHANDLER_H
diff --git a/src/gui/gccontainer.cpp b/src/gui/gccontainer.cpp
index 1edb4daf..ec3c8a5c 100644
--- a/src/gui/gccontainer.cpp
+++ b/src/gui/gccontainer.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "gccontainer.h"
diff --git a/src/gui/gccontainer.h b/src/gui/gccontainer.h
index 8b8a7ffe..cc7c9336 100644
--- a/src/gui/gccontainer.h
+++ b/src/gui/gccontainer.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_GUI_GCCONTAINER_H
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index bc2f017b..6803be65 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "gui.h"
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 84f52a31..a07d236f 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_GUI
diff --git a/src/gui/guildlistbox.cpp b/src/gui/guildlistbox.cpp
index 5fe62fe5..556df3fe 100644
--- a/src/gui/guildlistbox.cpp
+++ b/src/gui/guildlistbox.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id $
  */
 
 #include "guildlistbox.h"
diff --git a/src/gui/guildlistbox.h b/src/gui/guildlistbox.h
index b3892955..cc8e3ce7 100644
--- a/src/gui/guildlistbox.h
+++ b/src/gui/guildlistbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id $
  */
 
 #ifndef _TMW_GUI_GUILDLISTBOX_H
diff --git a/src/gui/guildwindow.cpp b/src/gui/guildwindow.cpp
index 3319489c..ae9684df 100644
--- a/src/gui/guildwindow.cpp
+++ b/src/gui/guildwindow.cpp
@@ -17,7 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  *  $$
  */
 
diff --git a/src/gui/guildwindow.h b/src/gui/guildwindow.h
index e1bd99d7..4f6b9cbb 100644
--- a/src/gui/guildwindow.h
+++ b/src/gui/guildwindow.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_GUI_GUILDWINDOW_H
diff --git a/src/gui/hbox.cpp b/src/gui/hbox.cpp
index 69564fbb..020e85c6 100644
--- a/src/gui/hbox.cpp
+++ b/src/gui/hbox.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "hbox.h"
diff --git a/src/gui/hbox.h b/src/gui/hbox.h
index 560b1a29..4b241383 100644
--- a/src/gui/hbox.h
+++ b/src/gui/hbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef HBOX_H
diff --git a/src/gui/help.cpp b/src/gui/help.cpp
index 87de1e2f..ffe9c02d 100644
--- a/src/gui/help.cpp
+++ b/src/gui/help.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "help.h"
diff --git a/src/gui/help.h b/src/gui/help.h
index 3c3715a0..053df723 100644
--- a/src/gui/help.h
+++ b/src/gui/help.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_HELP_H
diff --git a/src/gui/icon.cpp b/src/gui/icon.cpp
index 58b3ae8a..1e352292 100644
--- a/src/gui/icon.cpp
+++ b/src/gui/icon.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "icon.h"
diff --git a/src/gui/icon.h b/src/gui/icon.h
index f0d3a70a..9baf1a99 100644
--- a/src/gui/icon.h
+++ b/src/gui/icon.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 
diff --git a/src/gui/inttextbox.cpp b/src/gui/inttextbox.cpp
index 17e87afd..644601cf 100644
--- a/src/gui/inttextbox.cpp
+++ b/src/gui/inttextbox.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "inttextbox.h"
diff --git a/src/gui/inttextbox.h b/src/gui/inttextbox.h
index 219c6018..8dad0c39 100644
--- a/src/gui/inttextbox.h
+++ b/src/gui/inttextbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef INTTEXTBOX_H
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 2127442a..82b36aef 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "inventorywindow.h"
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index f9ff8ea2..a7130b65 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_INVENTORYWINDOW_H
diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp
index 6f1c8ae6..c6763014 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "item_amount.h"
diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h
index 03303603..dd1026b7 100644
--- a/src/gui/item_amount.h
+++ b/src/gui/item_amount.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_ITEM_AMOUNT_WINDOW_H
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 4c528a16..5fb99ffc 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "itemcontainer.h"
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index 9ae5c9c2..8d93671c 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_ITEMCONTAINER_H__
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index cf719f9f..02d35570 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -18,8 +18,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Legend of Mazzeroth; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "itempopup.h"
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index 499b2e0a..cb55296c 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -1,5 +1,4 @@
 /*
-*
  *  The Legend of Mazzeroth
  *  Copyright (C) 2008, The Legend of Mazzeroth Development Team
  *
@@ -19,8 +18,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Legend of Mazzeroth; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _LOM_ITEMPOPUP_H__
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index 23b41650..76104e12 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "itemshortcutcontainer.h"
diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h
index 58f0aea7..76ca870c 100644
--- a/src/gui/itemshortcutcontainer.h
+++ b/src/gui/itemshortcutcontainer.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_ITEMSHORTCUTCONTAINER_H__
diff --git a/src/gui/itemshortcutwindow.cpp b/src/gui/itemshortcutwindow.cpp
index fb75e20d..e4d352fe 100644
--- a/src/gui/itemshortcutwindow.cpp
+++ b/src/gui/itemshortcutwindow.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "itemshortcutwindow.h"
diff --git a/src/gui/itemshortcutwindow.h b/src/gui/itemshortcutwindow.h
index 9742abdc..017df5ec 100644
--- a/src/gui/itemshortcutwindow.h
+++ b/src/gui/itemshortcutwindow.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_ITEMSHORTCUTWINDOW_H
diff --git a/src/gui/linkhandler.h b/src/gui/linkhandler.h
index 3a32f825..44f906db 100644
--- a/src/gui/linkhandler.h
+++ b/src/gui/linkhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_LINK_HANDLER_H_
diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp
index ac18c2cd..204d7961 100644
--- a/src/gui/listbox.cpp
+++ b/src/gui/listbox.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "listbox.h"
diff --git a/src/gui/listbox.h b/src/gui/listbox.h
index 03a8b541..d42c7d3e 100644
--- a/src/gui/listbox.h
+++ b/src/gui/listbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_LISTBOX_H
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 72d7ee51..24c55e37 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "login.h"
diff --git a/src/gui/login.h b/src/gui/login.h
index d8ae7eaf..1c23a0f5 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_LOGIN_H
diff --git a/src/gui/magic.cpp b/src/gui/magic.cpp
index 28e7de92..a31b661a 100644
--- a/src/gui/magic.cpp
+++ b/src/gui/magic.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: skill.cpp 4569 2008-09-04 20:09:57Z b_lindeijer $
  */
 
 #include <guichan/widgets/label.hpp>
diff --git a/src/gui/magic.h b/src/gui/magic.h
index a8082755..af46c823 100644
--- a/src/gui/magic.h
+++ b/src/gui/magic.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: skill.h 4476 2008-08-18 01:23:58Z rhoderyc $
  */
 
 #ifndef _TMW_MAGIC_H
@@ -32,7 +30,6 @@
 #include "../guichanfwd.h"
 
 
-
 /**
  * The skill dialog.
  *
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index c3e572a7..dbbb08d2 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "menuwindow.h"
diff --git a/src/gui/menuwindow.h b/src/gui/menuwindow.h
index f43b9921..03ec3380 100644
--- a/src/gui/menuwindow.h
+++ b/src/gui/menuwindow.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_MENU_H
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 5f768609..501530f1 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "minimap.h"
diff --git a/src/gui/minimap.h b/src/gui/minimap.h
index 5e9458bf..f91dc22d 100644
--- a/src/gui/minimap.h
+++ b/src/gui/minimap.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_MINIMAP_H
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 3742be64..424c3558 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "ministatus.h"
diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h
index 1192bc1e..f512ef25 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatus.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_MINISTATUS_H
diff --git a/src/gui/newskill.cpp b/src/gui/newskill.cpp
index 6783a546..20fc01bd 100644
--- a/src/gui/newskill.cpp
+++ b/src/gui/newskill.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
  /* This file implements the new skill dialog for use under the latest
diff --git a/src/gui/newskill.h b/src/gui/newskill.h
index 6e12169f..49476e5e 100644
--- a/src/gui/newskill.h
+++ b/src/gui/newskill.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NSKILL_H
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index fd02a14a..c593feb1 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "npc_text.h"
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 0ef1b938..2c9771d3 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NPC_TEXT_H
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index ff017a0e..918031b4 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "npclistdialog.h"
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index 02b9cd49..e21f9e8c 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_GUI_NPCLISTDIALOG_H
diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp
index 2d3fce64..3a72b21b 100644
--- a/src/gui/npcpostdialog.cpp
+++ b/src/gui/npcpostdialog.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "npcpostdialog.h"
diff --git a/src/gui/npcpostdialog.h b/src/gui/npcpostdialog.h
index e142dac5..1956c877 100644
--- a/src/gui/npcpostdialog.h
+++ b/src/gui/npcpostdialog.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_GUI_NPCPOSTDIALOG_H
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index 37d66353..b03c3964 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "ok_dialog.h"
diff --git a/src/gui/ok_dialog.h b/src/gui/ok_dialog.h
index a7b24a90..cba12d72 100644
--- a/src/gui/ok_dialog.h
+++ b/src/gui/ok_dialog.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _OK_DIALOG_H
diff --git a/src/gui/partywindow.cpp b/src/gui/partywindow.cpp
index 1b963dae..262e3b2e 100644
--- a/src/gui/partywindow.cpp
+++ b/src/gui/partywindow.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: box.cpp 1456 2005-07-15 23:17:00Z b_lindeijer $
  */
 
 #include "partywindow.h"
diff --git a/src/gui/partywindow.h b/src/gui/partywindow.h
index f09eeb6a..e79bf392 100644
--- a/src/gui/partywindow.h
+++ b/src/gui/partywindow.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: box.cpp 1456 2005-07-15 23:17:00Z b_lindeijer $
  */
 
 #ifndef _TMW_PARTYWINDOW_H
diff --git a/src/gui/passwordfield.cpp b/src/gui/passwordfield.cpp
index 533f54fb..01c7e15d 100644
--- a/src/gui/passwordfield.cpp
+++ b/src/gui/passwordfield.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "passwordfield.h"
diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h
index cae1f92e..8a14b72a 100644
--- a/src/gui/passwordfield.h
+++ b/src/gui/passwordfield.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_PASSWORDFIELD_H_
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index e9237110..0a0c8a17 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
diff --git a/src/gui/playerbox.h b/src/gui/playerbox.h
index c226e750..78eeee91 100644
--- a/src/gui/playerbox.h
+++ b/src/gui/playerbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef __TMW_PLAYERBOX_H__
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 2888382b..59ca0867 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "popupmenu.h"
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index 9fe9f866..2d10e6eb 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_POPUP_MENU_H
diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index 90a85478..9a47eefc 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "progressbar.h"
diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h
index ddabbb77..0b1616f5 100644
--- a/src/gui/progressbar.h
+++ b/src/gui/progressbar.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_PROGRESSBAR_H
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index 7ed4f913..563ed34a 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -17,7 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #include "quitdialog.h"
diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h
index 97a03f2e..018f1e52 100644
--- a/src/gui/quitdialog.h
+++ b/src/gui/quitdialog.h
@@ -17,7 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #ifndef _TMW_QUITDIALOG_H
diff --git a/src/gui/radiobutton.cpp b/src/gui/radiobutton.cpp
index 57d6772d..619ec84f 100644
--- a/src/gui/radiobutton.cpp
+++ b/src/gui/radiobutton.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "radiobutton.h"
diff --git a/src/gui/radiobutton.h b/src/gui/radiobutton.h
index 3b97ad86..09f703dc 100644
--- a/src/gui/radiobutton.h
+++ b/src/gui/radiobutton.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_RADIOBUTTON_H
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 7e236a7d..051c0fa4 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "register.h"
diff --git a/src/gui/register.h b/src/gui/register.h
index 088e8f9b..79578461 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_REGISTER_H
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index 255aa2d8..032e3f78 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
diff --git a/src/gui/scrollarea.h b/src/gui/scrollarea.h
index be361f68..d21dae11 100644
--- a/src/gui/scrollarea.h
+++ b/src/gui/scrollarea.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef __TMW_SCROLLAREA_H__
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index cef53697..ee94b2c6 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -53,8 +53,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
  */
 
 #include "sdlinput.h"
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index e23178fa..72d949e1 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -53,8 +53,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
  */
 
 #ifndef _TMW_SDLINPUT_
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 37626155..30e78368 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "sell.h"
diff --git a/src/gui/sell.h b/src/gui/sell.h
index 63a16770..742c28fb 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_SELL_H
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index a6d1d1f0..b11aea6c 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <cstdlib>
diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h
index 53474611..268b1baf 100644
--- a/src/gui/serverdialog.h
+++ b/src/gui/serverdialog.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_SERVERDIALOG_H
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index b6b052bc..2a60308b 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
diff --git a/src/gui/setup.h b/src/gui/setup.h
index 77173367..2142a67d 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_SETUP_H
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 1ed4fc94..4f09cde0 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "setup_audio.h"
diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h
index 6e722f74..eaa55de6 100644
--- a/src/gui/setup_audio.h
+++ b/src/gui/setup_audio.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_GUI_SETUP_AUDIO_H
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 57adef28..9de5be9f 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "setup_joystick.h"
diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h
index 6d3ad129..0b7ebe98 100644
--- a/src/gui/setup_joystick.h
+++ b/src/gui/setup_joystick.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_GUI_SETUP_JOYSTICK_H
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 2b785dd5..270f4a0e 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "setup_keyboard.h"
diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h
index b72e8746..50fa76fb 100644
--- a/src/gui/setup_keyboard.h
+++ b/src/gui/setup_keyboard.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_GUI_SETUP_KEYBOARD_H
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 4d9b5d74..51cee8e3 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "setup_video.h"
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index e4e9fcf1..17ca1241 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_GUI_SETUP_VIDEO_H
diff --git a/src/gui/setuptab.h b/src/gui/setuptab.h
index a7d45b9a..6c276c35 100644
--- a/src/gui/setuptab.h
+++ b/src/gui/setuptab.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_GUI_SETUPTAB_H
diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp
index 2a7ea0ce..a521c75b 100644
--- a/src/gui/shop.cpp
+++ b/src/gui/shop.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "shop.h"
diff --git a/src/gui/shop.h b/src/gui/shop.h
index f4329b4d..62b60cae 100644
--- a/src/gui/shop.h
+++ b/src/gui/shop.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _SHOP_H
diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp
index ba77be47..bce6a48c 100644
--- a/src/gui/shoplistbox.cpp
+++ b/src/gui/shoplistbox.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "shoplistbox.h"
diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h
index d5e2d836..75f514ab 100644
--- a/src/gui/shoplistbox.h
+++ b/src/gui/shoplistbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_SHOPLISTBOX_H
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 49037cbd..49bacaf0 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <guichan/widgets/label.hpp>
diff --git a/src/gui/skill.h b/src/gui/skill.h
index 12f619bd..3d010daa 100644
--- a/src/gui/skill.h
+++ b/src/gui/skill.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_SKILL_H
diff --git a/src/gui/slider.cpp b/src/gui/slider.cpp
index c94c7bfb..afeecf17 100644
--- a/src/gui/slider.cpp
+++ b/src/gui/slider.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "slider.h"
diff --git a/src/gui/slider.h b/src/gui/slider.h
index dc38b738..3b796425 100644
--- a/src/gui/slider.h
+++ b/src/gui/slider.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_SLIDER_H
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 815238b9..d3ef7bbe 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -18,8 +18,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Legend of Mazzeroth; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "speechbubble.h"
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
index c4ca9109..ed69a8d2 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -18,8 +18,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Legend of Mazzeroth; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _LOM_SPEECHBUBBLE_H__
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index b9ebfecf..43f81135 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "status.h"
diff --git a/src/gui/status.h b/src/gui/status.h
index 6e613495..262b89f6 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_STATUS_H
diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp
index 8d16dc46..619265ec 100644
--- a/src/gui/textbox.cpp
+++ b/src/gui/textbox.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "textbox.h"
diff --git a/src/gui/textbox.h b/src/gui/textbox.h
index f06f98ec..2060e377 100644
--- a/src/gui/textbox.h
+++ b/src/gui/textbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef __TMW_TEXTBOX_H__
diff --git a/src/gui/textdialog.cpp b/src/gui/textdialog.cpp
index 3986ed4e..05e43906 100644
--- a/src/gui/textdialog.cpp
+++ b/src/gui/textdialog.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id$
  */
 
 #include "textdialog.h"
diff --git a/src/gui/textdialog.h b/src/gui/textdialog.h
index c03ce7e6..8b4e2cc3 100644
--- a/src/gui/textdialog.h
+++ b/src/gui/textdialog.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id$
  */
 
 #ifndef _TMW_GUI_GUILD_DIALOG_H
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index 4fd85d36..49c0c91d 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
diff --git a/src/gui/textfield.h b/src/gui/textfield.h
index 36f921ac..b808fad2 100644
--- a/src/gui/textfield.h
+++ b/src/gui/textfield.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef __TMW_TEXTFIELD_H__
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index c098c04c..38064f48 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <sstream>
diff --git a/src/gui/trade.h b/src/gui/trade.h
index c8ece8d9..c51e0fdd 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_TRADE_H
diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index 7f9abd3a..1132c3b5 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "truetypefont.h"
diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
index 6dbc6634..3b39329e 100644
--- a/src/gui/truetypefont.h
+++ b/src/gui/truetypefont.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_TRUETYPEFONT_H
diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp
index 4b8755d5..1e09ca23 100644
--- a/src/gui/unregisterdialog.cpp
+++ b/src/gui/unregisterdialog.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "unregisterdialog.h"
diff --git a/src/gui/unregisterdialog.h b/src/gui/unregisterdialog.h
index 8c8eaf64..4056d251 100644
--- a/src/gui/unregisterdialog.h
+++ b/src/gui/unregisterdialog.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_UNREGISTERDIALOG_H
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 22bf8c13..ff1e600c 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "updatewindow.h"
diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index 61ea4a27..d7e3c4c7 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _UPDATERWINDOW_H
diff --git a/src/gui/vbox.cpp b/src/gui/vbox.cpp
index b503508e..2ec1112d 100644
--- a/src/gui/vbox.cpp
+++ b/src/gui/vbox.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "vbox.h"
diff --git a/src/gui/vbox.h b/src/gui/vbox.h
index 06a270ef..2072ab24 100644
--- a/src/gui/vbox.h
+++ b/src/gui/vbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef VBOX_H
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 14239094..1795836d 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "viewport.h"
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 5dedcea8..dd17fa24 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_VIEWPORT_H_
diff --git a/src/gui/widgets/avatar.cpp b/src/gui/widgets/avatar.cpp
index 03fa1aeb..68ce5243 100644
--- a/src/gui/widgets/avatar.cpp
+++ b/src/gui/widgets/avatar.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "avatar.h"
diff --git a/src/gui/widgets/avatar.h b/src/gui/widgets/avatar.h
index 3707e8f8..0f657895 100644
--- a/src/gui/widgets/avatar.h
+++ b/src/gui/widgets/avatar.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_AVATAR_H
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index b33a55cf..d4c2bc4b 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index d0dab7d2..58a18a15 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef DROPDOWN_H
diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp
index 02ed42a1..bcc54cf7 100644
--- a/src/gui/widgets/layout.cpp
+++ b/src/gui/widgets/layout.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <cassert>
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index 5914b5c1..d631c154 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_WIDGET_LAYOUT_H__
diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp
index 6be50f2c..c3b537db 100644
--- a/src/gui/widgets/resizegrip.cpp
+++ b/src/gui/widgets/resizegrip.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "resizegrip.h"
diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h
index 04be3db3..f57eda94 100644
--- a/src/gui/widgets/resizegrip.h
+++ b/src/gui/widgets/resizegrip.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_RESIZEGRIP_H
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index 990c6a95..c53ac85c 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
index b18c93e3..42964b0f 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_TAB_H
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 7a4d153a..205fdc99 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "tabbedarea.h"
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 554a68b6..2199264b 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_TABBEDAREA_H
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 2bce49b2..e498236a 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
diff --git a/src/gui/window.h b/src/gui/window.h
index 44982500..22355572 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_WINDOW_H__
diff --git a/src/gui/windowcontainer.cpp b/src/gui/windowcontainer.cpp
index 006dbf44..d8535f73 100644
--- a/src/gui/windowcontainer.cpp
+++ b/src/gui/windowcontainer.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "windowcontainer.h"
diff --git a/src/gui/windowcontainer.h b/src/gui/windowcontainer.h
index df255f84..88a13d31 100644
--- a/src/gui/windowcontainer.h
+++ b/src/gui/windowcontainer.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_WINDOWCONTAINER_H_
diff --git a/src/guichanfwd.h b/src/guichanfwd.h
index 812f3f7a..4fb7ea3e 100644
--- a/src/guichanfwd.h
+++ b/src/guichanfwd.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_GUICHANFWD_H
diff --git a/src/guild.cpp b/src/guild.cpp
index c02af865..68e65cb9 100644
--- a/src/guild.cpp
+++ b/src/guild.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "guild.h"
diff --git a/src/guild.h b/src/guild.h
index e262d3df..7c85fe31 100644
--- a/src/guild.h
+++ b/src/guild.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef TMW_GUILD_H
diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp
index 965434b0..65780345 100644
--- a/src/imageparticle.cpp
+++ b/src/imageparticle.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "imageparticle.h"
diff --git a/src/imageparticle.h b/src/imageparticle.h
index 0ad515cc..91c5426c 100644
--- a/src/imageparticle.h
+++ b/src/imageparticle.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _IMAGEPARTICLE_H
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 807e1223..85461f90 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "inventory.h"
diff --git a/src/inventory.h b/src/inventory.h
index 48ace29c..90d9c7a2 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _INVENTORY_H
diff --git a/src/item.cpp b/src/item.cpp
index 210589e9..374d5051 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "item.h"
diff --git a/src/item.h b/src/item.h
index fc71e53d..37db52a4 100644
--- a/src/item.h
+++ b/src/item.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _ITEM_H_
diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp
index 59c1ee3b..a89da974 100644
--- a/src/itemshortcut.cpp
+++ b/src/itemshortcut.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "itemshortcut.h"
diff --git a/src/itemshortcut.h b/src/itemshortcut.h
index d75db2e8..a0c52468 100644
--- a/src/itemshortcut.h
+++ b/src/itemshortcut.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_ITEMSHORTCUT_H__
diff --git a/src/joystick.cpp b/src/joystick.cpp
index a5dab4f4..b69537cf 100644
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "joystick.h"
diff --git a/src/joystick.h b/src/joystick.h
index 321e3e7d..4cc1babd 100644
--- a/src/joystick.h
+++ b/src/joystick.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_JOYSTICK_H
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index a959e244..37d5f276 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "keyboardconfig.h"
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index 53a5c96d..d9886150 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_KEYBOARDCONFIG_H
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 30ad7b2e..14d253c0 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "localplayer.h"
diff --git a/src/localplayer.h b/src/localplayer.h
index 16b9715a..5dce5ebe 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_LOCALPLAYER_H
diff --git a/src/lockedarray.h b/src/lockedarray.h
index f31292d7..8e525191 100644
--- a/src/lockedarray.h
+++ b/src/lockedarray.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_LOCKEDARRAY_H
diff --git a/src/logindata.h b/src/logindata.h
index 689a5aaa..3d959ad4 100644
--- a/src/logindata.h
+++ b/src/logindata.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_LOGINDATA_H
diff --git a/src/main.cpp b/src/main.cpp
index ede00d57..33900d5d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "main.h"
diff --git a/src/main.h b/src/main.h
index d123834b..49173266 100644
--- a/src/main.h
+++ b/src/main.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_MAIN_H
diff --git a/src/map.cpp b/src/map.cpp
index e10e4fad..5c2290d6 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "map.h"
diff --git a/src/map.h b/src/map.h
index c4a4fc0b..07bf2866 100644
--- a/src/map.h
+++ b/src/map.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_MAP_H_
diff --git a/src/monster.cpp b/src/monster.cpp
index 396d0c06..a62c1f4c 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "monster.h"
diff --git a/src/monster.h b/src/monster.h
index bde99ed6..5b6fcf61 100644
--- a/src/monster.h
+++ b/src/monster.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_MONSTER_H
diff --git a/src/net/accountserver/account.cpp b/src/net/accountserver/account.cpp
index d1fe6863..f734c4eb 100644
--- a/src/net/accountserver/account.cpp
+++ b/src/net/accountserver/account.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "account.h"
diff --git a/src/net/accountserver/account.h b/src/net/accountserver/account.h
index 0cf0758e..581bcb42 100644
--- a/src/net/accountserver/account.h
+++ b/src/net/accountserver/account.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_ACCOUNTSERVER_CHARACTER_H
diff --git a/src/net/accountserver/accountserver.cpp b/src/net/accountserver/accountserver.cpp
index db94563b..b1ce590c 100644
--- a/src/net/accountserver/accountserver.cpp
+++ b/src/net/accountserver/accountserver.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "accountserver.h"
diff --git a/src/net/accountserver/accountserver.h b/src/net/accountserver/accountserver.h
index 8bfe991c..8e0573fc 100644
--- a/src/net/accountserver/accountserver.h
+++ b/src/net/accountserver/accountserver.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_ACCOUNTSERVER_ACCOUNTSERVER_H
diff --git a/src/net/accountserver/internal.cpp b/src/net/accountserver/internal.cpp
index 28a9695e..a3be76a1 100644
--- a/src/net/accountserver/internal.cpp
+++ b/src/net/accountserver/internal.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "internal.h"
diff --git a/src/net/accountserver/internal.h b/src/net/accountserver/internal.h
index 8af5ec04..35f986cd 100644
--- a/src/net/accountserver/internal.h
+++ b/src/net/accountserver/internal.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_ACCOUNTSERVER_INTERNAL_H
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index dd7d467b..72371da5 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "beinghandler.h"
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index 8ac07017..b02728b4 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_BEINGHANDLER_H
diff --git a/src/net/buysellhandler.cpp b/src/net/buysellhandler.cpp
index 57806edc..596ac434 100644
--- a/src/net/buysellhandler.cpp
+++ b/src/net/buysellhandler.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "buysellhandler.h"
diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h
index e242d373..52e9b2f7 100644
--- a/src/net/buysellhandler.h
+++ b/src/net/buysellhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_BUYSELLHANDLER_H
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 6cc9e384..bde856a5 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "charserverhandler.h"
diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h
index 4a4fe0c3..08ba5102 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_CHARSERVERHANDLER_H
diff --git a/src/net/chathandler.cpp b/src/net/chathandler.cpp
index 0cb59403..d81a8b7d 100644
--- a/src/net/chathandler.cpp
+++ b/src/net/chathandler.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "chathandler.h"
diff --git a/src/net/chathandler.h b/src/net/chathandler.h
index 7ca4d50d..aeaf5368 100644
--- a/src/net/chathandler.h
+++ b/src/net/chathandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_CHATHANDLER_H
diff --git a/src/net/chatserver/chatserver.cpp b/src/net/chatserver/chatserver.cpp
index f302a0ef..94e36b94 100644
--- a/src/net/chatserver/chatserver.cpp
+++ b/src/net/chatserver/chatserver.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "chatserver.h"
diff --git a/src/net/chatserver/chatserver.h b/src/net/chatserver/chatserver.h
index 10de1213..1129239a 100644
--- a/src/net/chatserver/chatserver.h
+++ b/src/net/chatserver/chatserver.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_CHATSERVER_CHATSERVER_H
diff --git a/src/net/chatserver/guild.cpp b/src/net/chatserver/guild.cpp
index fb400d5d..042ff013 100644
--- a/src/net/chatserver/guild.cpp
+++ b/src/net/chatserver/guild.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 
diff --git a/src/net/chatserver/guild.h b/src/net/chatserver/guild.h
index 354ecd82..6c35be9f 100644
--- a/src/net/chatserver/guild.h
+++ b/src/net/chatserver/guild.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 
diff --git a/src/net/chatserver/internal.cpp b/src/net/chatserver/internal.cpp
index c1f7a3f7..0822d93d 100644
--- a/src/net/chatserver/internal.cpp
+++ b/src/net/chatserver/internal.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "internal.h"
diff --git a/src/net/chatserver/internal.h b/src/net/chatserver/internal.h
index 7579972b..b0f137c5 100644
--- a/src/net/chatserver/internal.h
+++ b/src/net/chatserver/internal.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_CHATSERVER_INTERNAL_H
diff --git a/src/net/chatserver/party.cpp b/src/net/chatserver/party.cpp
index ff465924..56eb57d2 100644
--- a/src/net/chatserver/party.cpp
+++ b/src/net/chatserver/party.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 
diff --git a/src/net/chatserver/party.h b/src/net/chatserver/party.h
index 1d47c2c5..c1febd66 100644
--- a/src/net/chatserver/party.h
+++ b/src/net/chatserver/party.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 
diff --git a/src/net/connection.cpp b/src/net/connection.cpp
index caaa0ce1..7d3c2328 100644
--- a/src/net/connection.cpp
+++ b/src/net/connection.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "connection.h"
diff --git a/src/net/connection.h b/src/net/connection.h
index 734c8d65..4ab3d24d 100644
--- a/src/net/connection.h
+++ b/src/net/connection.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_CONNECTION_H
diff --git a/src/net/effecthandler.cpp b/src/net/effecthandler.cpp
index 04951d46..f7ff2bf2 100644
--- a/src/net/effecthandler.cpp
+++ b/src/net/effecthandler.cpp
@@ -17,7 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #include "effecthandler.h"
diff --git a/src/net/effecthandler.h b/src/net/effecthandler.h
index d836b341..283c7c10 100644
--- a/src/net/effecthandler.h
+++ b/src/net/effecthandler.h
@@ -17,7 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #ifndef _TMW_NET_EFFECTSHANDLER_H
diff --git a/src/net/gameserver/gameserver.cpp b/src/net/gameserver/gameserver.cpp
index e451d473..1bdaef26 100644
--- a/src/net/gameserver/gameserver.cpp
+++ b/src/net/gameserver/gameserver.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "gameserver.h"
diff --git a/src/net/gameserver/gameserver.h b/src/net/gameserver/gameserver.h
index 5bf196b6..5ea2c718 100644
--- a/src/net/gameserver/gameserver.h
+++ b/src/net/gameserver/gameserver.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_GAMESERVER_GAMESERVER_H
diff --git a/src/net/gameserver/internal.cpp b/src/net/gameserver/internal.cpp
index 328b4863..6b6ba081 100644
--- a/src/net/gameserver/internal.cpp
+++ b/src/net/gameserver/internal.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "internal.h"
diff --git a/src/net/gameserver/internal.h b/src/net/gameserver/internal.h
index 567e15d2..df9787fe 100644
--- a/src/net/gameserver/internal.h
+++ b/src/net/gameserver/internal.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_GAMESERVER_INTERNAL_H
diff --git a/src/net/gameserver/player.cpp b/src/net/gameserver/player.cpp
index cd85447c..95c13ec2 100644
--- a/src/net/gameserver/player.cpp
+++ b/src/net/gameserver/player.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "player.h"
diff --git a/src/net/gameserver/player.h b/src/net/gameserver/player.h
index 75e28270..9e68ced9 100644
--- a/src/net/gameserver/player.h
+++ b/src/net/gameserver/player.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_GAMESERVER_PLAYER_H
diff --git a/src/net/guildhandler.cpp b/src/net/guildhandler.cpp
index f6677cd8..cf886ab3 100644
--- a/src/net/guildhandler.cpp
+++ b/src/net/guildhandler.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <iostream>
diff --git a/src/net/guildhandler.h b/src/net/guildhandler.h
index 01ad428b..4eb2da0b 100644
--- a/src/net/guildhandler.h
+++ b/src/net/guildhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_GUILDHANDLER_H
diff --git a/src/net/internal.cpp b/src/net/internal.cpp
index 358aa143..4cb88a4e 100644
--- a/src/net/internal.cpp
+++ b/src/net/internal.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "internal.h"
diff --git a/src/net/internal.h b/src/net/internal.h
index e1ef648a..1e411605 100644
--- a/src/net/internal.h
+++ b/src/net/internal.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_INTERNAL_H
diff --git a/src/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp
index dde6a954..41032f13 100644
--- a/src/net/inventoryhandler.cpp
+++ b/src/net/inventoryhandler.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "inventoryhandler.h"
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index 4190bf83..1326ea71 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_INVENTORYHANDLER_H
diff --git a/src/net/itemhandler.cpp b/src/net/itemhandler.cpp
index ea65bc3b..af06084f 100644
--- a/src/net/itemhandler.cpp
+++ b/src/net/itemhandler.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "itemhandler.h"
diff --git a/src/net/itemhandler.h b/src/net/itemhandler.h
index 5ffcb134..e3005a6f 100644
--- a/src/net/itemhandler.h
+++ b/src/net/itemhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_ITEMHANDLER_H
diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp
index 6840d90c..f1898fb5 100644
--- a/src/net/loginhandler.cpp
+++ b/src/net/loginhandler.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "loginhandler.h"
diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h
index 5bac079c..f557c97b 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_LOGINHANDLER_H
diff --git a/src/net/logouthandler.cpp b/src/net/logouthandler.cpp
index fb27540f..6dea4c83 100644
--- a/src/net/logouthandler.cpp
+++ b/src/net/logouthandler.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "logouthandler.h"
diff --git a/src/net/logouthandler.h b/src/net/logouthandler.h
index fa906234..369eaa80 100644
--- a/src/net/logouthandler.h
+++ b/src/net/logouthandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_LOGOUTHANDLER_H
diff --git a/src/net/messagehandler.cpp b/src/net/messagehandler.cpp
index b6074690..973c5555 100644
--- a/src/net/messagehandler.cpp
+++ b/src/net/messagehandler.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "messagehandler.h"
diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h
index a5fc81b3..74226aa5 100644
--- a/src/net/messagehandler.h
+++ b/src/net/messagehandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_MESSAGEHANDLER_H
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index b5d5b97a..57c268e7 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "messagein.h"
diff --git a/src/net/messagein.h b/src/net/messagein.h
index 3cc45a23..444699c8 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMWSERV_MESSAGEIN_H_
diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp
index 10f1b1d4..b08332b6 100644
--- a/src/net/messageout.cpp
+++ b/src/net/messageout.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <cstring>
diff --git a/src/net/messageout.h b/src/net/messageout.h
index 032db190..4eadda5f 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMWSERV_MESSAGEOUT_H_
diff --git a/src/net/network.cpp b/src/net/network.cpp
index 7cf4bf49..a4ea3def 100644
--- a/src/net/network.cpp
+++ b/src/net/network.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "network.h"
diff --git a/src/net/network.h b/src/net/network.h
index 42590adf..13576e79 100644
--- a/src/net/network.h
+++ b/src/net/network.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_NETWORK_H
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 4b08ed8d..30507537 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "npchandler.h"
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index 0cb40f64..5560787e 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_NPCHANDLER_H
diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp
index 7a9768fa..60c51821 100644
--- a/src/net/partyhandler.cpp
+++ b/src/net/partyhandler.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <iostream>
diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h
index dda78d94..b4257c34 100644
--- a/src/net/partyhandler.h
+++ b/src/net/partyhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_PARTYHANDLER_H
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 3c0a1835..ad271f15 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "playerhandler.h"
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index 9b6c9e01..9c5f87cc 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_PLAYERHANDLER_H
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 2ed414a8..5dfa78da 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_PROTOCOL_
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index d75350bc..5d93016f 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "tradehandler.h"
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index 33dddf05..1a0fa695 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NET_TRADEHANDLER_H
diff --git a/src/npc.cpp b/src/npc.cpp
index a7302e0d..5665ad95 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "npc.h"
diff --git a/src/npc.h b/src/npc.h
index 561ad9f0..60f9e6d8 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NPC_H
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index 67248100..48b10a1f 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "main.h"
diff --git a/src/openglgraphics.h b/src/openglgraphics.h
index e6d4850b..ea30e019 100644
--- a/src/openglgraphics.h
+++ b/src/openglgraphics.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_OPENGLGRAPHICS_H
diff --git a/src/particle.cpp b/src/particle.cpp
index c59d2c03..8a15a132 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
diff --git a/src/particle.h b/src/particle.h
index 7b46a641..4a11c4cb 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _PARTICLE_H
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index cd80fb58..d368237c 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "particleemitter.h"
diff --git a/src/particleemitter.h b/src/particleemitter.h
index c237c1ba..4dc2f6fb 100644
--- a/src/particleemitter.h
+++ b/src/particleemitter.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _PARTICLEEMITTER_H
diff --git a/src/player.cpp b/src/player.cpp
index 97c60789..648b330a 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "player.h"
diff --git a/src/player.h b/src/player.h
index 7e86b1e1..068e3cf5 100644
--- a/src/player.h
+++ b/src/player.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_PLAYER_H
diff --git a/src/position.cpp b/src/position.cpp
index 334079bb..cc39a1af 100644
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "position.h"
diff --git a/src/position.h b/src/position.h
index d1aa2ee6..7beb3ef7 100644
--- a/src/position.h
+++ b/src/position.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: being.h 4570 2008-09-04 20:59:34Z b_lindeijer $
  */
 
 #ifndef TMW_POSITION_H
diff --git a/src/properties.h b/src/properties.h
index 93148bdf..2eafeeca 100644
--- a/src/properties.h
+++ b/src/properties.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_PROPERTIES_H_
diff --git a/src/resources/action.cpp b/src/resources/action.cpp
index 6b3c2f52..ffbbffb2 100644
--- a/src/resources/action.cpp
+++ b/src/resources/action.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "action.h"
diff --git a/src/resources/action.h b/src/resources/action.h
index 8d5e8d11..09eb066e 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_ACTION_H
diff --git a/src/resources/ambientoverlay.cpp b/src/resources/ambientoverlay.cpp
index 058b6083..9eee57f0 100644
--- a/src/resources/ambientoverlay.cpp
+++ b/src/resources/ambientoverlay.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "ambientoverlay.h"
diff --git a/src/resources/ambientoverlay.h b/src/resources/ambientoverlay.h
index a939cbb4..56c70066 100644
--- a/src/resources/ambientoverlay.h
+++ b/src/resources/ambientoverlay.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_RESOURCES_AMBIENTOVERLAY_H_
diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp
index de96525c..d2794e61 100644
--- a/src/resources/animation.cpp
+++ b/src/resources/animation.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "animation.h"
diff --git a/src/resources/animation.h b/src/resources/animation.h
index aad93cda..8dfe8614 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_ANIMATION_H
diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp
index 32d8d9f4..c85105c5 100644
--- a/src/resources/buddylist.cpp
+++ b/src/resources/buddylist.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
diff --git a/src/resources/buddylist.h b/src/resources/buddylist.h
index 3791a03a..6a3de8c4 100644
--- a/src/resources/buddylist.h
+++ b/src/resources/buddylist.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_BUDDYLIST_H
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index a43b1204..3be105d8 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
diff --git a/src/resources/dye.h b/src/resources/dye.h
index a11e3365..528a1d91 100644
--- a/src/resources/dye.h
+++ b/src/resources/dye.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_DYE_H
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index d0dae462..77d77f96 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <SDL_image.h>
diff --git a/src/resources/image.h b/src/resources/image.h
index 52f286f8..3677696f 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_IMAGE_H
diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp
index 6ec5fe8f..29458ba3 100644
--- a/src/resources/imageloader.cpp
+++ b/src/resources/imageloader.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <cassert>
diff --git a/src/resources/imageloader.h b/src/resources/imageloader.h
index f41f6472..7979fd2f 100644
--- a/src/resources/imageloader.h
+++ b/src/resources/imageloader.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_IMAGELOADER_H
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index ba612103..1c0f9373 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "imageset.h"
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index fa1840ec..58b7a8ea 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_IMAGESET_H
diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp
index 7cfa16b4..d6d8a6c2 100644
--- a/src/resources/imagewriter.cpp
+++ b/src/resources/imagewriter.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "imagewriter.h"
diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h
index 205e4584..632e2ae4 100644
--- a/src/resources/imagewriter.h
+++ b/src/resources/imagewriter.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <iosfwd>
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 306c0e5a..01688619 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <cassert>
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index df7e7be9..20756a52 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_ITEM_MANAGER_H
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 4322db8d..cc7a6afc 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "iteminfo.h"
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 5b500dcf..7cc3ba15 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_ITEMINFO_H_
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 33616c0a..cec74717 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "mapreader.h"
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index 60056358..0142eb45 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_MAPREADER_H_
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index f531a41d..1d198a96 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h
index 46a33b06..f1d69e72 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/monsterdb.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_MONSTER_DB_H
diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp
index 263810de..bac9c35f 100644
--- a/src/resources/monsterinfo.cpp
+++ b/src/resources/monsterinfo.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "monsterinfo.h"
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index f34a3ea9..f13c2f7c 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_MONSTERINFO_H_
diff --git a/src/resources/music.cpp b/src/resources/music.cpp
index 161d8b01..2386aa43 100644
--- a/src/resources/music.cpp
+++ b/src/resources/music.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "music.h"
diff --git a/src/resources/music.h b/src/resources/music.h
index 72e76295..d50150b8 100644
--- a/src/resources/music.h
+++ b/src/resources/music.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_MUSIC_H
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index bc1c920e..5cd6d20d 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "npcdb.h"
diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h
index 2abf959b..00b4f99b 100644
--- a/src/resources/npcdb.h
+++ b/src/resources/npcdb.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_NPC_DB_H
diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp
index 8f21f5d2..449caf55 100644
--- a/src/resources/resource.cpp
+++ b/src/resources/resource.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <cassert>
diff --git a/src/resources/resource.h b/src/resources/resource.h
index 5b9a5eb8..e85e3147 100644
--- a/src/resources/resource.h
+++ b/src/resources/resource.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_RESOURCE_H
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 9c109257..8ee64452 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <cassert>
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index da85e2f9..66813a9c 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_RESOURCE_MANAGER_H
diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp
index ec9bc65c..e21fd2b0 100644
--- a/src/resources/soundeffect.cpp
+++ b/src/resources/soundeffect.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "soundeffect.h"
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index 866c53ec..c3ff6668 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_SOUND_EFFECT_H
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index dcfee165..5aea55fa 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <set>
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index e9946a7a..56b9a713 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_SPRITEDEF_H
diff --git a/src/serverinfo.h b/src/serverinfo.h
index b317b87b..6522da61 100644
--- a/src/serverinfo.h
+++ b/src/serverinfo.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_SERVERINFO_
diff --git a/src/shopitem.cpp b/src/shopitem.cpp
index ed5d30a9..9888f829 100644
--- a/src/shopitem.cpp
+++ b/src/shopitem.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "shopitem.h"
diff --git a/src/shopitem.h b/src/shopitem.h
index 6e7606ac..05a0a67d 100644
--- a/src/shopitem.h
+++ b/src/shopitem.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _SHOPITEM_H_
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index f425d3c1..e8c26df1 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "simpleanimation.h"
diff --git a/src/simpleanimation.h b/src/simpleanimation.h
index 561c540d..577268a8 100644
--- a/src/simpleanimation.h
+++ b/src/simpleanimation.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_SIMPLEANIMAION_H
diff --git a/src/sound.cpp b/src/sound.cpp
index 0a20d3f2..888dcc31 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "sound.h"
diff --git a/src/sound.h b/src/sound.h
index ebcd6442..0c2af74b 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_SOUND_H
diff --git a/src/sprite.h b/src/sprite.h
index 89780519..0e0a95db 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_SPRITE_H_
diff --git a/src/textparticle.cpp b/src/textparticle.cpp
index 89466006..308c043d 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "textparticle.h"
diff --git a/src/textparticle.h b/src/textparticle.h
index 34badb57..3a0ba674 100644
--- a/src/textparticle.h
+++ b/src/textparticle.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TEXTPARTICLE_H
diff --git a/src/tileset.h b/src/tileset.h
index 625fac1b..fb855831 100644
--- a/src/tileset.h
+++ b/src/tileset.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_TILESET_H_
diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp
index 9a8f6356..8cea60f9 100644
--- a/src/utils/base64.cpp
+++ b/src/utils/base64.cpp
@@ -26,7 +26,6 @@
    | Author: Jim Winstead (jimw@php.net)                                  |
    +----------------------------------------------------------------------+
    */
-/* $Id$ */
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/utils/base64.h b/src/utils/base64.h
index ff20ac53..c802207b 100644
--- a/src/utils/base64.h
+++ b/src/utils/base64.h
@@ -26,7 +26,6 @@
    | Author: Jim Winstead (jimw@php.net)                                  |
    +----------------------------------------------------------------------+
  */
-/* $Id$ */
 
 #ifndef _TMW_BASE64_H
 #define _TMW_BASE64_H
diff --git a/src/utils/dtor.h b/src/utils/dtor.h
index 516fd916..9aa92c84 100644
--- a/src/utils/dtor.h
+++ b/src/utils/dtor.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_UTILS_DTOR_H
diff --git a/src/utils/fastsqrt.h b/src/utils/fastsqrt.h
index b7b036e9..78768149 100644
--- a/src/utils/fastsqrt.h
+++ b/src/utils/fastsqrt.h
@@ -5,8 +5,6 @@
  * http://www.math.purdue.edu/~clomont/Math/Papers/2003/InvSqrt.pdf
  *
  * Unfortunately the original creator of this function seems to be unknown.
- *
- * $Id$
  */
 
 float fastInvSqrt(float x)
diff --git a/src/utils/gettext.h b/src/utils/gettext.h
index 72533850..0cd9114b 100644
--- a/src/utils/gettext.h
+++ b/src/utils/gettext.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_UTILS_GETTEXT_H
diff --git a/src/utils/minmax.h b/src/utils/minmax.h
index 353c60e7..7e3d84f2 100644
--- a/src/utils/minmax.h
+++ b/src/utils/minmax.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <cstdlib>
diff --git a/src/utils/sha256.cpp b/src/utils/sha256.cpp
index 209d4f96..82d1fc5c 100644
--- a/src/utils/sha256.cpp
+++ b/src/utils/sha256.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 /*       +------------------------------------+
diff --git a/src/utils/sha256.h b/src/utils/sha256.h
index c03efc0c..66152caf 100644
--- a/src/utils/sha256.h
+++ b/src/utils/sha256.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_UTILS_SHA256_H_
diff --git a/src/utils/strprintf.cpp b/src/utils/strprintf.cpp
index 26313fe9..c8a8a247 100644
--- a/src/utils/strprintf.cpp
+++ b/src/utils/strprintf.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_UTILS_TOSTRING_H
diff --git a/src/utils/strprintf.h b/src/utils/strprintf.h
index a1fb0f13..382ab6e0 100644
--- a/src/utils/strprintf.h
+++ b/src/utils/strprintf.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_UTILS_STRPRINTF_H
diff --git a/src/utils/tostring.h b/src/utils/tostring.h
index 95b8985f..d2dd941a 100644
--- a/src/utils/tostring.h
+++ b/src/utils/tostring.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_UTILS_TOSTRING_H
diff --git a/src/utils/trim.h b/src/utils/trim.h
index fec99100..a7c40ca2 100644
--- a/src/utils/trim.h
+++ b/src/utils/trim.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_UTILS_TRIM_H_
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 98b474cb..47f1bd04 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "xml.h"
diff --git a/src/utils/xml.h b/src/utils/xml.h
index 5473b2ca..5a5c756b 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_XML_H
diff --git a/src/vector.cpp b/src/vector.cpp
index 88092c9b..7d5f055a 100644
--- a/src/vector.cpp
+++ b/src/vector.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: vector.h 4592 2008-09-07 20:38:52Z b_lindeijer $
  */
 
 #include "vector.h"
diff --git a/src/vector.h b/src/vector.h
index 7251eff0..f32b201a 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_VECTOR_H_
diff --git a/tools/dyecmd/src/dye.cpp b/tools/dyecmd/src/dye.cpp
index 73912a96..c93f46c8 100644
--- a/tools/dyecmd/src/dye.cpp
+++ b/tools/dyecmd/src/dye.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
diff --git a/tools/dyecmd/src/dye.h b/tools/dyecmd/src/dye.h
index a11e3365..528a1d91 100644
--- a/tools/dyecmd/src/dye.h
+++ b/tools/dyecmd/src/dye.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_DYE_H
diff --git a/tools/dyecmd/src/dyecmd.cpp b/tools/dyecmd/src/dyecmd.cpp
index 7254e287..8938aea5 100644
--- a/tools/dyecmd/src/dyecmd.cpp
+++ b/tools/dyecmd/src/dyecmd.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <iostream>
diff --git a/tools/dyecmd/src/imagewriter.cpp b/tools/dyecmd/src/imagewriter.cpp
index 36c139b9..9b4b10dc 100644
--- a/tools/dyecmd/src/imagewriter.cpp
+++ b/tools/dyecmd/src/imagewriter.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "imagewriter.h"
diff --git a/tools/dyecmd/src/imagewriter.h b/tools/dyecmd/src/imagewriter.h
index 205e4584..632e2ae4 100644
--- a/tools/dyecmd/src/imagewriter.h
+++ b/tools/dyecmd/src/imagewriter.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <iosfwd>
diff --git a/tools/tmxcopy/base64.cpp b/tools/tmxcopy/base64.cpp
index 9a8f6356..8cea60f9 100644
--- a/tools/tmxcopy/base64.cpp
+++ b/tools/tmxcopy/base64.cpp
@@ -26,7 +26,6 @@
    | Author: Jim Winstead (jimw@php.net)                                  |
    +----------------------------------------------------------------------+
    */
-/* $Id$ */
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/tools/tmxcopy/base64.h b/tools/tmxcopy/base64.h
index ff20ac53..c802207b 100644
--- a/tools/tmxcopy/base64.h
+++ b/tools/tmxcopy/base64.h
@@ -26,7 +26,6 @@
    | Author: Jim Winstead (jimw@php.net)                                  |
    +----------------------------------------------------------------------+
  */
-/* $Id$ */
 
 #ifndef _TMW_BASE64_H
 #define _TMW_BASE64_H
diff --git a/tools/tmxcopy/tostring.h b/tools/tmxcopy/tostring.h
index 95b8985f..d2dd941a 100644
--- a/tools/tmxcopy/tostring.h
+++ b/tools/tmxcopy/tostring.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_UTILS_TOSTRING_H
diff --git a/tools/tmxcopy/xmlutils.cpp b/tools/tmxcopy/xmlutils.cpp
index 47bff51a..8b1b62cf 100644
--- a/tools/tmxcopy/xmlutils.cpp
+++ b/tools/tmxcopy/xmlutils.cpp
@@ -17,7 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #include "xmlutils.h"
diff --git a/tools/tmxcopy/xmlutils.h b/tools/tmxcopy/xmlutils.h
index 32d1a960..60e8f3cd 100644
--- a/tools/tmxcopy/xmlutils.h
+++ b/tools/tmxcopy/xmlutils.h
@@ -17,7 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #ifndef _XMLUTILS_H
-- 
cgit v1.2.3-70-g09d2


From d87d926d52721f6d8bd766025b8c1944a3366ca9 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 16 Nov 2008 23:25:14 +0100
Subject: Whitespace and indentation fixes

---
 src/effectmanager.h         |  7 ++-----
 src/gui/inventorywindow.cpp |  5 -----
 src/gui/inventorywindow.h   |  5 -----
 src/gui/itempopup.cpp       | 44 ++++++++++++++++++++++----------------------
 src/gui/itempopup.h         | 26 ++++++++++++--------------
 src/gui/speechbubble.cpp    |  8 ++++----
 src/gui/speechbubble.h      | 15 +++++++--------
 src/gui/viewport.cpp        |  4 ++--
 8 files changed, 49 insertions(+), 65 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/src/effectmanager.h b/src/effectmanager.h
index 1ae82caf..4b349471 100644
--- a/src/effectmanager.h
+++ b/src/effectmanager.h
@@ -27,24 +27,21 @@
 
 class EffectManager
 {
-
-    public: 
+    public:
         struct EffectDescription {
              int id;
              std::string GFX;
              std::string SFX;
         };
 
-        
         EffectManager();
-        
         ~EffectManager();
 
         /**
          * Triggers a effect with the id, at x,y
          * returns true if ID exists
          */
-	bool trigger(int id, int x = 0, int y = 0);
+        bool trigger(int id, int x = 0, int y = 0);
 
    private:
         std::list<EffectDescription> mEffects;
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 82b36aef..0fda7945 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -83,7 +83,6 @@ InventoryWindow::InventoryWindow():
     layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState("Inventory");
-
 }
 
 void InventoryWindow::logic()
@@ -212,7 +211,3 @@ void InventoryWindow::keyReleased(gcn::KeyEvent &event)
             mSplit = false;
     }
 }
-InventoryWindow::~InventoryWindow()
-{
-
-}
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index a7130b65..ad1c8f38 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -82,11 +82,6 @@ class InventoryWindow : public Window,
          */
         void valueChanged(const gcn::SelectionEvent &event);
 
-		/**
-		 * Tracks when the mouse exits the window
-		 */
-		~InventoryWindow();
-
     private:
         void updateButtons();    /**< Updates button states. */
 
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index 02d35570..3f2df2d6 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -37,8 +37,8 @@ ItemPopup::ItemPopup()
 {
 
     setResizable(false);
-	setTitleBarHeight(0);
-	loadSkin("graphics/gui/gui.xml");
+    setTitleBarHeight(0);
+    loadSkin("graphics/gui/gui.xml");
 
     // Item Name
     mItemName = new gcn::Label("Label");
@@ -54,31 +54,31 @@ ItemPopup::ItemPopup()
     mItemDescScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     mItemDescScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     mItemDescScroll->setDimension(gcn::Rectangle(0, 0, 196, 14));
-	mItemDescScroll->setOpaque(false);
-	mItemDescScroll->setPosition(2, 15);
+    mItemDescScroll->setOpaque(false);
+    mItemDescScroll->setPosition(2, 15);
 
     // Item Effect
-	mItemEffect = new TextBox();
-	mItemEffect->setEditable(false);
-	mItemEffectScroll = new ScrollArea(mItemEffect);
+    mItemEffect = new TextBox();
+    mItemEffect->setEditable(false);
+    mItemEffectScroll = new ScrollArea(mItemEffect);
 
-	mItemEffectScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mItemEffectScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     mItemEffectScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-	mItemEffectScroll->setDimension(gcn::Rectangle(0, 0, 196, 14));
-	mItemEffectScroll->setOpaque(false);
-	mItemEffectScroll->setPosition(2, 35);
+    mItemEffectScroll->setDimension(gcn::Rectangle(0, 0, 196, 14));
+    mItemEffectScroll->setOpaque(false);
+    mItemEffectScroll->setPosition(2, 35);
 
-	add(mItemName);
-	add(mItemDescScroll);
-	add(mItemEffectScroll);
+    add(mItemName);
+    add(mItemDescScroll);
+    add(mItemEffectScroll);
 
-	setLocationRelativeTo(getParent());
+    setLocationRelativeTo(getParent());
 
     // LEEOR / TODO: This causes an exception error.
     //moveToBottom(getParent());
 
     mItemDesc->setTextWrapped( "" );
-	mItemEffect->setTextWrapped( "" );
+    mItemEffect->setTextWrapped( "" );
 }
 
 void ItemPopup::setItem(Item *item)
@@ -87,11 +87,11 @@ void ItemPopup::setItem(Item *item)
     ItemInfo const *info = item ? &item->getInfo() : NULL;
 
     mItemName->setCaption(info->getName());
-	mItemDesc->setTextWrapped( info->getDescription() );
-	mItemEffect->setTextWrapped( info->getEffect() );
+    mItemDesc->setTextWrapped( info->getDescription() );
+    mItemEffect->setTextWrapped( info->getEffect() );
 
     int numRowsDesc = mItemDesc->getNumberOfRows();
-	int numRowsEffect = mItemEffect->getNumberOfRows();
+    int numRowsEffect = mItemEffect->getNumberOfRows();
 
     if(info->getEffect() == "")
     {
@@ -102,10 +102,10 @@ void ItemPopup::setItem(Item *item)
 
     mItemDescScroll->setDimension(gcn::Rectangle(2, 0, 196, numRowsDesc * 14));
 
-	mItemEffectScroll->setDimension(gcn::Rectangle(2, 0, 196, numRowsEffect * 14));
+    mItemEffectScroll->setDimension(gcn::Rectangle(2, 0, 196, numRowsEffect * 14));
 
-	mItemDescScroll->setPosition(2, 20);
-	mItemEffectScroll->setPosition(2, (numRowsDesc * 15) + 25);
+    mItemDescScroll->setPosition(2, 20);
+    mItemEffectScroll->setPosition(2, (numRowsDesc * 15) + 25);
 }
 
 unsigned int ItemPopup::getNumRows()
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index cb55296c..dba9903d 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -30,21 +30,19 @@
 #include "../item.h"
 
 class ItemPopup : public Window
-	{
+{
     public:
+        ItemPopup();
 
-		ItemPopup();
-
-		void setItem(Item *item);
-		unsigned int getNumRows();
+        void setItem(Item *item);
+        unsigned int getNumRows();
 
     private:
-		gcn::Label *mItemName;
-		TextBox *mItemDesc;
-		TextBox *mItemEffect;
-		ScrollArea *mItemDescScroll;
-		ScrollArea *mItemEffectScroll;
-
-	};
-
-#endif
+        gcn::Label *mItemName;
+        TextBox *mItemDesc;
+        TextBox *mItemEffect;
+        ScrollArea *mItemDescScroll;
+        ScrollArea *mItemEffectScroll;
+};
+
+#endif // _LOM_ITEMPOPUP_H__
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index d3ef7bbe..4168134a 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -29,19 +29,19 @@ SpeechBubble::SpeechBubble()
 {
     mSpeechBox = new TextBox();
     mSpeechBox->setEditable(false);
-	mSpeechBox->setOpaque(false);
+    mSpeechBox->setOpaque(false);
 
     mSpeechArea = new ScrollArea(mSpeechBox);
 
     // Height == Top Graphic (14px) + 1 Row of Text (15px) + Bottom Graphic (17px)
     setContentSize(135, 46);
-	setTitleBarHeight(0);
-	loadSkin("graphics/gui/speechbubble.xml");
+    setTitleBarHeight(0);
+    loadSkin("graphics/gui/speechbubble.xml");
 
     mSpeechArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     mSpeechArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     mSpeechArea->setDimension(gcn::Rectangle(4, 15, 130, 28));
-	mSpeechArea->setOpaque(false);
+    mSpeechArea->setOpaque(false);
 
     add(mSpeechArea);
 
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
index ed69a8d2..aac6e3d7 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -30,16 +30,15 @@
 class SpeechBubble : public Window
 {
     public:
+        SpeechBubble();
 
-	SpeechBubble();
-
-	void setText(const std::string mText);
-	void setLocation(int x, int y);
-	unsigned int getNumRows();
+        void setText(const std::string mText);
+        void setLocation(int x, int y);
+        unsigned int getNumRows();
 
     private:
-	TextBox *mSpeechBox;
-	ScrollArea *mSpeechArea;
+        TextBox *mSpeechBox;
+        ScrollArea *mSpeechArea;
 };
 
-#endif
+#endif // _LOM_SPEECHBUBBLE_H__
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 1795836d..a6092c7a 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -296,9 +296,9 @@ void Viewport::drawTargetCursor(Graphics *graphics)
         Being::TargetCursorSize cursorSize = target->getTargetCursorSize();
         Image* targetCursor;
         if (rangeX > attackRange || rangeY > attackRange)
-	    targetCursor = mTargetCursorOutRange[cursorSize]->getCurrentImage();
+            targetCursor = mTargetCursorOutRange[cursorSize]->getCurrentImage();
         else
-	    targetCursor = mTargetCursorInRange[cursorSize]->getCurrentImage();
+            targetCursor = mTargetCursorInRange[cursorSize]->getCurrentImage();
 
         // Draw the target cursor at the correct position
         int posX = target->getPixelX() -
-- 
cgit v1.2.3-70-g09d2


From 3dba40474d5b1525e8723139ae7be7576967feea Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 14 Dec 2008 21:57:38 +0100
Subject: Tweaked some configuration defaults

Scrolling is now a bit less lazy and the scroll radius is 0. In my
opinion this is a better default.

Framerate limiter is now off by default, since it makes the game appear
a bit choppy. It's basically only useful for laptops anyway, and not too
hard to find.

(cherry picked from eAthena branch,
 commit c56bc78b5f5676784265dff8ed5334884e8dcc39)

Conflicts:

	src/main.cpp
---
 src/gui/setup_video.cpp | 14 +++++++-------
 src/gui/viewport.cpp    |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index d9d6f34a..bac342a0 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -106,8 +106,8 @@ Setup_Video::Setup_Video():
     mCustomCursorEnabled(config.getValue("customcursor", 1)),
     mVisibleNamesEnabled(config.getValue("visiblenames", 1)),
     mOpacity(config.getValue("guialpha", 0.8)),
-    mFps((int)config.getValue("fpslimit", 60)),
-    mModeListModel(new ModeListModel()),
+    mFps((int) config.getValue("fpslimit", 0)),
+    mModeListModel(new ModeListModel),
     mModeList(new ListBox(mModeListModel)),
     mFsCheckBox(new CheckBox(_("Full screen"), mFullScreenEnabled)),
     mOpenGLCheckBox(new CheckBox(_("OpenGL"), mOpenGLEnabled)),
@@ -116,13 +116,13 @@ Setup_Video::Setup_Video():
     mAlphaSlider(new Slider(0.2, 1.0)),
     mFpsCheckBox(new CheckBox(_("FPS Limit:"))),
     mFpsSlider(new Slider(10, 200)),
-    mFpsField(new TextField()),
-    mOriginalScrollLaziness((int) config.getValue("ScrollLaziness", 32)),
+    mFpsField(new TextField),
+    mOriginalScrollLaziness((int) config.getValue("ScrollLaziness", 16)),
     mScrollLazinessSlider(new Slider(1, 64)),
-    mScrollLazinessField(new TextField()),
-    mOriginalScrollRadius((int) config.getValue("ScrollRadius", 32)),
+    mScrollLazinessField(new TextField),
+    mOriginalScrollRadius((int) config.getValue("ScrollRadius", 0)),
     mScrollRadiusSlider(new Slider(0, 128)),
-    mScrollRadiusField(new TextField()),
+    mScrollRadiusField(new TextField),
     mOverlayDetail((int) config.getValue("OverlayDetail", 2)),
     mOverlayDetailSlider(new Slider(0, 2)),
     mOverlayDetailField(new gcn::Label(""))
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index a6092c7a..a746fb03 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -61,8 +61,8 @@ Viewport::Viewport():
     setOpaque(false);
     addMouseListener(this);
 
-    mScrollLaziness = (int) config.getValue("ScrollLaziness", 32);
-    mScrollRadius = (int) config.getValue("ScrollRadius", 32);
+    mScrollLaziness = (int) config.getValue("ScrollLaziness", 16);
+    mScrollRadius = (int) config.getValue("ScrollRadius", 0);
     mScrollCenterOffsetX = (int) config.getValue("ScrollCenterOffsetX", 0);
     mScrollCenterOffsetY = (int) config.getValue("ScrollCenterOffsetY", 0);
     mVisibleNames = config.getValue("visiblenames", 1);
-- 
cgit v1.2.3-70-g09d2