From aff167beefadc32add4b44626cc2f1cbef800c7b Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 30 Jul 2006 14:33:28 +0000
Subject: Updated TMW to be compatible with Guichan 0.5.0 (merged from
 guichan-0.5.0 branch).

---
 src/gui/status.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gui/status.h')

diff --git a/src/gui/status.h b/src/gui/status.h
index 52ece323..6b963d24 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);
+        void action(const std::string& eventId, gcn::Widget* widget);
 
         /**
          * Draw this window
-- 
cgit v1.2.3-70-g09d2


From c79bf8c82f0a38b574b83be2484eb347852cd833 Mon Sep 17 00:00:00 2001
From: Eugenio Favalli <elvenprogrammer@gmail.com>
Date: Mon, 14 Aug 2006 08:36:16 +0000
Subject: Completed porting of character creation/deletion, fixed some issues
 with network code.

---
 ChangeLog                     |  12 +++
 src/being.cpp                 |   2 +-
 src/being.h                   |   4 +-
 src/gui/char_select.cpp       |  42 ++++----
 src/gui/char_select.h         |   1 -
 src/gui/playerbox.cpp         |   3 +-
 src/gui/playerbox.h           |   8 +-
 src/gui/status.cpp            |  12 +--
 src/gui/status.h              |   2 +-
 src/localplayer.cpp           |   1 +
 src/localplayer.h             |   2 +-
 src/main.cpp                  |  39 ++++----
 src/net/buysellhandler.cpp    |   2 +-
 src/net/charserverhandler.cpp | 216 ++++++++++++++++++------------------------
 src/net/loginhandler.cpp      |  19 +---
 src/net/loginhandler.h        |   3 -
 src/net/messageout.cpp        |   4 +-
 src/net/messageout.h          |   4 +-
 src/net/network.cpp           |   8 +-
 src/net/network.h             |   5 +-
 src/net/playerhandler.cpp     |   2 +-
 src/net/protocol.h            |  14 ++-
 22 files changed, 191 insertions(+), 214 deletions(-)

(limited to 'src/gui/status.h')

diff --git a/ChangeLog b/ChangeLog
index 5e958852..3d6a947f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-08-14  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* src/being.cpp, src/being.h, src/gui/char_select.cpp,
+	src/gui/char_select.h, src/gui/playerbox.cpp, src/gui/playerbox.h,
+	src/gui/status.cpp, src/gui/status.h, src/localplayer.cpp,
+	src/localplayer.h, src/main.cpp, src/net/buysellhandler.cpp,
+	src/net/charserverhandler.cpp, src/net/loginhandler.cpp,
+	src/net/loginhandler.h, src/net/messageout.cpp, src/net/messageout.h,
+	src/net/network.cpp, src/net/network.h, src/net/playerhandler.cpp,
+	src/net/protocol.h: Completed porting of character creation/deletion,
+	fixed some issues with network code.	
+
 2006-08-14  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/player.cpp: Verify the gender to prevent crashing when something
diff --git a/src/being.cpp b/src/being.cpp
index 1ca8929a..7755d4e5 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -46,6 +46,7 @@ PATH_NODE::PATH_NODE(Uint16 iX, Uint16 iY):
 }
 
 Being::Being(Uint32 id, Uint16 job, Map *map):
+    mSex(2),
     mJob(job),
     mX(0), mY(0), mDirection(DOWN),
     mAction(0),
@@ -58,7 +59,6 @@ Being::Being(Uint32 id, Uint16 job, Map *map):
     mWalkSpeed(150),
     mMap(NULL),
     mHairStyle(0), mHairColor(0),
-    mSex(2),
     mSpeechTime(0),
     mDamageTime(0),
     mShowSpeech(false), mShowDamage(false)
diff --git a/src/being.h b/src/being.h
index 0735efe9..055ea0d4 100644
--- a/src/being.h
+++ b/src/being.h
@@ -98,6 +98,8 @@ class Being : public Sprite
         static const char UP = 4;
         static const char RIGHT = 8;
 
+        std::string mName;      /**< Name of character */
+        Uint8 mSex;             /**< Character's gender */
         Uint16 mJob;            /**< Job (player job, npc, monster, ) */
         Uint16 mX, mY;          /**< Tile coordinates */
         Uint8 mDirection;       /**< Facing direction */
@@ -358,14 +360,12 @@ class Being : public Sprite
         Uint16 mWeapon;                 /**< Weapon picture id */
         Uint16 mWalkSpeed;              /**< Walking speed */
         Map *mMap;                      /**< Map on which this being resides */
-        std::string mName;              /**< Name of character */
         SpriteIterator mSpriteIterator;
 
         Path mPath;
         std::string mSpeech;
         std::string mDamage;
         Uint16 mHairStyle, mHairColor;
-        Uint8 mSex;
         Uint32 mSpeechTime;
         Uint32 mDamageTime;
         bool mShowSpeech, mShowDamage;
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 75887b99..775eea24 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -38,6 +38,8 @@
 #include "../main.h"
 
 #include "../net/messageout.h"
+#include "../net/network.h"
+#include "../net/protocol.h"
 
 #include "../utils/tostring.h"
 
@@ -83,7 +85,6 @@ CharSelectDialog::CharSelectDialog(Network *network,
 
     mNameLabel = new gcn::Label("Name");
     mLevelLabel = new gcn::Label("Level");
-    mJobLevelLabel = new gcn::Label("Job Level");
     mMoneyLabel = new gcn::Label("Money");
     mPlayerBox = new PlayerBox(0);
 
@@ -93,7 +94,6 @@ CharSelectDialog::CharSelectDialog(Network *network,
     mPlayerBox->setDimension(gcn::Rectangle(5, 5, w - 10, 90));
     mNameLabel->setDimension(gcn::Rectangle(10, 100, 128, 16));
     mLevelLabel->setDimension(gcn::Rectangle(10, 116, 128, 16));
-    mJobLevelLabel->setDimension(gcn::Rectangle(10, 132, 128, 16));
     mMoneyLabel->setDimension(gcn::Rectangle(10, 148, 128, 16));
     mPreviousButton->setPosition(5, 170);
     mNextButton->setPosition(mPreviousButton->getWidth() + 10, 170);
@@ -117,7 +117,6 @@ CharSelectDialog::CharSelectDialog(Network *network,
     add(mNextButton);
     add(mNameLabel);
     add(mLevelLabel);
-    add(mJobLevelLabel);
     add(mMoneyLabel);
 
     mSelectButton->requestFocus();
@@ -177,8 +176,7 @@ void CharSelectDialog::updatePlayerInfo()
     if (pi) {
         mNameLabel->setCaption(pi->getName());
         mLevelLabel->setCaption("Lvl: " + toString(pi->mLevel));
-        mJobLevelLabel->setCaption("Job Lvl: " + toString(pi->mJobLevel));
-        mMoneyLabel->setCaption("Gold: " + toString(pi->mGp));
+        mMoneyLabel->setCaption("Money: " + toString(pi->mMoney));
         if (!mCharSelected)
         {
             mNewCharButton->setEnabled(false);
@@ -192,7 +190,6 @@ void CharSelectDialog::updatePlayerInfo()
     } else {
         mNameLabel->setCaption("Name");
         mLevelLabel->setCaption("Level");
-        mJobLevelLabel->setCaption("Job Level");
         mMoneyLabel->setCaption("Money");
         mNewCharButton->setEnabled(true);
         mDelCharButton->setEnabled(false);
@@ -207,10 +204,11 @@ void CharSelectDialog::updatePlayerInfo()
 void CharSelectDialog::attemptCharDelete()
 {
     // Request character deletion
-    MessageOut outMsg;
-    outMsg.writeShort(0x0068);
-    outMsg.writeLong(mCharInfo->getEntry()->mCharId);
-    outMsg.writeString("a@a.com", 40);
+    MessageOut msg;
+    msg.writeShort(PAMSG_CHAR_DELETE);
+    // TODO: Send the selected slot
+    msg.writeByte(0);
+    network->send(msg);
     mCharInfo->lock();
 }
 
@@ -326,15 +324,17 @@ void CharCreateDialog::attemptCharCreate()
 {
     // Send character infos
     MessageOut outMsg;
-    outMsg.writeShort(0x0067);
-    outMsg.writeString(getName(), 24);
-    outMsg.writeByte(5);
-    outMsg.writeByte(5);
-    outMsg.writeByte(5);
-    outMsg.writeByte(5);
-    outMsg.writeByte(5);
-    outMsg.writeByte(5);
-    outMsg.writeByte(mSlot);
-    outMsg.writeShort(mPlayerBox->mHairColor + 1);
-    outMsg.writeShort(mPlayerBox->mHairStyle + 1);
+    outMsg.writeShort(PAMSG_CHAR_CREATE);
+    outMsg.writeString(getName());
+    outMsg.writeByte(mPlayerBox->mHairStyle + 1);
+    outMsg.writeByte(mPlayerBox->mHairColor + 1);
+    // TODO: send selected sex
+    outMsg.writeByte(0); // Player sex
+    outMsg.writeShort(10); // STR
+    outMsg.writeShort(10); // AGI
+    outMsg.writeShort(10); // VIT
+    outMsg.writeShort(10); // INT
+    outMsg.writeShort(10); // DEX
+    outMsg.writeShort(10); // LUK
+    network->send(outMsg);
 }
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index 3bf9911e..e65f400d 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -69,7 +69,6 @@ class CharSelectDialog : public Window, public gcn::ActionListener
 
         gcn::Label *mNameLabel;
         gcn::Label *mLevelLabel;
-        gcn::Label *mJobLevelLabel;
         gcn::Label *mMoneyLabel;
 
         PlayerBox *mPlayerBox;
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index f0ed9b71..d8faff99 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -94,8 +94,7 @@ void PlayerBox::draw(gcn::Graphics *graphics)
             playerset[mSex]->get(0), 23, 12);
 
     // Draw his hair
-    if (mHairColor >= 0 && mHairStyle >= 0 &&
-            mHairColor < NR_HAIR_COLORS && mHairStyle < NR_HAIR_STYLES)
+    if (mHairColor < NR_HAIR_COLORS && mHairStyle < NR_HAIR_STYLES)
     {
         int hf = 9 * mHairColor;
         if (hf >= 0 && hf < (int)hairset[mHairStyle]->size()) {
diff --git a/src/gui/playerbox.h b/src/gui/playerbox.h
index 79f7c2aa..ec04eaf6 100644
--- a/src/gui/playerbox.h
+++ b/src/gui/playerbox.h
@@ -57,10 +57,10 @@ class PlayerBox : public gcn::ScrollArea
          */
         void drawBorder(gcn::Graphics *graphics);
 
-        int mHairColor;         /**< The hair color index */
-        int mHairStyle;         /**< The hair style index */
-        unsigned char mSex;     /**< Sex */
-        bool mShowPlayer;       /**< Wether to show the player or not */
+        unsigned char mHairColor;     /**< The hair color index */
+        unsigned char mHairStyle;     /**< The hair style index */
+        unsigned char mSex;           /**< Sex */
+        bool mShowPlayer;             /**< Wether to show the player or not */
 
     private:
         static int instances;
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index bf109460..2b61ed35 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -48,7 +48,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     // ----------------------
 
     mLvlLabel = new gcn::Label("Level:");
-    mGpLabel = new gcn::Label("Money:");
+    mMoneyLabel = new gcn::Label("Money:");
 
     mHpLabel = new gcn::Label("HP:");
     mHpBar = new ProgressBar(1.0f, 80, 15, 0, 171, 34);
@@ -71,7 +71,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
 
     mLvlLabel->setPosition(x, y);
     x += mLvlLabel->getWidth() + 40;
-    mGpLabel->setPosition(x, y);
+    mMoneyLabel->setPosition(x, y);
 
     y += mLvlLabel->getHeight() + 5; // Next Row
     x = 5;
@@ -100,7 +100,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     mJobValueLabel->setPosition(290, y);
 
     add(mLvlLabel);
-    add(mGpLabel);
+    add(mMoneyLabel);
     add(mHpLabel);
     add(mHpValueLabel);
     add(mMpLabel);
@@ -227,8 +227,8 @@ void StatusWindow::update()
     mLvlLabel->setCaption("Level: " + toString(mPlayer->mLevel));
     mLvlLabel->adjustSize();
 
-    mGpLabel->setCaption("Money: " + toString(mPlayer->mGp) + " GP");
-    mGpLabel->adjustSize();
+    mMoneyLabel->setCaption("Money: " + toString(mPlayer->mMoney) + " GP");
+    mMoneyLabel->adjustSize();
 
     mJobXpLabel->setCaption("Job: " + toString(mPlayer->mJobLevel));
     mJobXpLabel->adjustSize();
@@ -334,7 +334,7 @@ void StatusWindow::update()
     mStatsReflexPoints->adjustSize();
 
     // Update Second column widgets position
-    mGpLabel->setPosition(mLvlLabel->getX() + mLvlLabel->getWidth() + 20,
+    mMoneyLabel->setPosition(mLvlLabel->getX() + mLvlLabel->getWidth() + 20,
                          mLvlLabel->getY());
 
     mXpLabel->setPosition(
diff --git a/src/gui/status.h b/src/gui/status.h
index 6b963d24..fe2140e3 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -69,7 +69,7 @@ class StatusWindow : public Window, public gcn::ActionListener {
         /**
          * Status Part
          */
-        gcn::Label *mLvlLabel, *mGpLabel, *mHpLabel, *mHpValueLabel;
+        gcn::Label *mLvlLabel, *mMoneyLabel, *mHpLabel, *mHpValueLabel;
         gcn::Label *mMpLabel, *mMpValueLabel;
         gcn::Label *mXpLabel, *mXpValueLabel, *mJobXpLabel, *mJobValueLabel;
         ProgressBar *mHpBar, *mMpBar;
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 4a15cba3..83884b6f 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -38,6 +38,7 @@ LocalPlayer *player_node = NULL;
 
 LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map):
     Player(id, job, map),
+    mLevel(1),
     mInventory(new Inventory()),
     mTarget(NULL), mPickUpTarget(NULL),
     mTrading(false), mLastAction(-1)
diff --git a/src/localplayer.h b/src/localplayer.h
index 1f8c836f..fdef6ba1 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -127,7 +127,7 @@ class LocalPlayer : public Player
         Uint32 mJobLevel;
         Uint32 mXpForNextLevel, mJobXpForNextLevel;
         Uint16 mHp, mMaxHp, mMp, mMaxMp;
-        Uint32 mGp;
+        Uint32 mMoney;
 
         Uint32 mTotalWeight, mMaxWeight;
 
diff --git a/src/main.cpp b/src/main.cpp
index a4ef29ee..dc76846e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -407,21 +407,23 @@ LockedArray<LocalPlayer*> charInfo(MAX_SLOT + 1);
 MapLoginHandler mapLoginHandler;
 
 // TODO Find some nice place for these functions
-void accountLogin(Network *network, LoginData *loginData)
+void accountLogin(LoginData *loginData)
 {
     logger->log("Trying to connect to account server...");
     logger->log("Username is %s", loginData->username.c_str());
     network->connect(loginData->hostname, loginData->port);
     network->registerHandler(&loginHandler);
-    loginHandler.setCharInfo(&charInfo);
+    network->registerHandler(&charServerHandler);
     loginHandler.setLoginData(loginData);
+    charServerHandler.setLoginData(loginData);
+    charServerHandler.setCharInfo(&charInfo);
 
     // Send login infos
-    MessageOut *msg = new MessageOut();
-    msg->writeShort(PAMSG_LOGIN);
-    msg->writeLong(0); // client version
-    msg->writeString(loginData->username);
-    msg->writeString(loginData->password);
+    MessageOut msg;
+    msg.writeShort(PAMSG_LOGIN);
+    msg.writeLong(0); // client version
+    msg.writeString(loginData->username);
+    msg.writeString(loginData->password);
     network->send(msg);
 
     // Clear the password, avoids auto login when returning to login
@@ -436,22 +438,23 @@ void accountLogin(Network *network, LoginData *loginData)
     config.setValue("remember", loginData->remember);
 }
 
-void accountRegister(Network *network, LoginData *loginData)
+void accountRegister(LoginData *loginData)
 {
     logger->log("Trying to connect to account server...");
     logger->log("Username is %s", loginData->username.c_str());
     network->connect(loginData->hostname, loginData->port);
     network->registerHandler(&loginHandler);
-    loginHandler.setCharInfo(&charInfo);
     loginHandler.setLoginData(loginData);
+    charServerHandler.setLoginData(loginData);
+    charServerHandler.setCharInfo(&charInfo);
 
     // Send login infos
-    MessageOut *msg = new MessageOut();
-    msg->writeShort(PAMSG_REGISTER);
-    msg->writeLong(0); // client version
-    msg->writeString(loginData->username);
-    msg->writeString(loginData->password);
-    msg->writeString(loginData->email);
+    MessageOut msg;
+    msg.writeShort(PAMSG_REGISTER);
+    msg.writeLong(0); // client version
+    msg.writeString(loginData->username);
+    msg.writeString(loginData->password);
+    msg.writeString(loginData->email);
     network->send(msg);
 }
 
@@ -544,7 +547,7 @@ int main(int argc, char *argv[])
     {
         logger->error("An error occurred while initializing ENet.");
     }
-    Network *network = new Network();
+    network = new Network();
 
     SDL_Event event;
 
@@ -678,11 +681,11 @@ int main(int argc, char *argv[])
                     break;
 
                 case ACCOUNT_STATE:
-                    accountLogin(network, &loginData);
+                    accountLogin(&loginData);
                     break;
 
                 case REGISTER_ACCOUNT_STATE:
-                    accountRegister(network, &loginData);
+                    accountRegister(&loginData);
                     break;
 
                 default:
diff --git a/src/net/buysellhandler.cpp b/src/net/buysellhandler.cpp
index be636d94..3b5fc87d 100644
--- a/src/net/buysellhandler.cpp
+++ b/src/net/buysellhandler.cpp
@@ -72,7 +72,7 @@ void BuySellHandler::handleMessage(MessageIn *msg)
             msg->readShort();  // length
             n_items = (msg->getLength() - 4) / 11;
             buyDialog->reset();
-            buyDialog->setMoney(player_node->mGp);
+            buyDialog->setMoney(player_node->mMoney);
             buyDialog->setVisible(true);
 
             for (int k = 0; k < n_items; k++)
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 36a17acf..e41ca0f3 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -38,14 +38,9 @@
 CharServerHandler::CharServerHandler()
 {
     static const Uint16 _messages[] = {
-        0x006b,
-        0x006c,
-        0x006d,
-        0x006e,
-        0x006f,
-        0x0070,
-        0x0071,
-        0x0081,
+        APMSG_CHAR_CREATE_RESPONSE,
+        APMSG_CHAR_DELETE_RESPONSE,
+        APMSG_CHAR_INFO,
         0
     };
     handledMessages = _messages;
@@ -56,145 +51,114 @@ void CharServerHandler::handleMessage(MessageIn *msg)
     int slot;
     LocalPlayer *tempPlayer;
 
-    logger->log("CharServerHandler: Packet ID: %x, Length: %d",
-            msg->getId(), msg->getLength());
     switch (msg->getId())
     {
-        case 0x006b:
-            // Derive number of characters from message length
-            n_character = (msg->getLength() - 24) / 106;
-
-            for (int i = 0; i < n_character; i++)
+        case APMSG_CHAR_CREATE_RESPONSE:
+            int errMsg = msg->readByte();
+            // Character creation successful
+            if (errMsg == ERRMSG_OK)
             {
-                tempPlayer = readPlayerData(msg, slot);
-                mCharInfo->select(slot);
-                mCharInfo->setEntry(tempPlayer);
-                logger->log("CharServer: Player: %s (%d)",
-                        tempPlayer->getName().c_str(), slot);
             }
-
-            state = CHAR_SELECT_STATE;
+            // Character creation failed
+            else
+            {
+                std::string message = "";
+                switch (errMsg)
+                {
+                    case ERRMSG_NO_LOGIN:
+                        message = "Not logged in";
+                        break;
+                    case CREATE_TOO_MUCH_CHARACTERS:
+                        message = "No empty slot";
+                        break;
+                    case ERRMSG_INVALID_ARGUMENT:
+                        message = "Invalid name";
+                        break;
+                    case CREATE_EXISTS_NAME:
+                        message = "Character's name already exists";
+                        break;
+                    case CREATE_INVALID_HAIRSTYLE:
+                        message = "Invalid hairstyle";
+                        break;
+                    case CREATE_INVALID_HAIRCOLOR:
+                        message = "Invalid hair color";
+                        break;
+                    case CREATE_INVALID_GENDER:
+                        message = "Invalid gender";
+                        break;
+                    case CREATE_RAW_STATS_TOO_HIGH:
+                        message = "Character's stats are too high";
+                        break;
+                    case CREATE_RAW_STATS_TOO_LOW:
+                        message = "Character's stats are too low";
+                        break;
+                    case CREATE_RAW_STATS_INVALID_DIFF:
+                        message = "Character's stats difference is too high";
+                        break;
+                    case CREATE_RAW_STATS_EQUAL_TO_ZERO:
+                        message = "One stat is zero";
+                        break;
+                    default:
+                        message = "Unknown error";
+                        break;
+                }
+                new OkDialog("Error", message);
+            }
             break;
-
-        case 0x006c:
-            switch (msg->readByte()) {
-                case 0:
-                    errorMessage = "Access denied";
-                    break;
-                case 1:
-                    errorMessage = "Cannot use this ID";
-                    break;
-                default:
-                    errorMessage = "Unknown failure to select character";
-                    break;
+        case APMSG_CHAR_DELETE_RESPONSE:
+        {
+            int errMsg = msg->readByte();
+            // Character deletion successful
+            if (errMsg == ERRMSG_OK)
+            {
+                delete mCharInfo->getEntry();
+                mCharInfo->setEntry(0);
+                mCharInfo->unlock();
+                n_character--;
+                new OkDialog("Info", "Player deleted");
             }
-            mCharInfo->unlock();
+            // Character deletion failed
+            else
+            {
+                std::string message = "";
+                switch (errMsg)
+                {
+                    case ERRMSG_NO_LOGIN:
+                        message = "Not logged in";
+                        break;
+                    case ERRMSG_INVALID_ARGUMENT:
+                        message = "Selection out of range";
+                        break;
+                    default:
+                        message = "Unknown error";
+                }
+                mCharInfo->unlock();
+                new OkDialog("Error", message);
+            }
+        }
             break;
-
-        case 0x006d:
+        case APMSG_CHAR_INFO:
             tempPlayer = readPlayerData(msg, slot);
             mCharInfo->unlock();
             mCharInfo->select(slot);
             mCharInfo->setEntry(tempPlayer);
             n_character++;
             break;
-
-        case 0x006e:
-            new OkDialog("Error", "Failed to create character");
-            break;
-
-        case 0x006f:
-            delete mCharInfo->getEntry();
-            mCharInfo->setEntry(0);
-            mCharInfo->unlock();
-            n_character--;
-            new OkDialog("Info", "Player deleted");
-            break;
-
-        case 0x0070:
-            mCharInfo->unlock();
-            new OkDialog("Error", "Failed to delete character.");
-            break;
-
-        case 0x0071:
-            player_node = mCharInfo->getEntry();
-            map_path = msg->readString(16);
-            mLoginData->hostname = iptostring(msg->readLong());
-            mLoginData->port = msg->readShort();
-            mCharInfo->unlock();
-            mCharInfo->select(0);
-            // Clear unselected players infos
-            do
-            {
-                LocalPlayer *tmp = mCharInfo->getEntry();
-                if (tmp != player_node)
-                    delete tmp;
-                mCharInfo->next();
-            } while (mCharInfo->getPos());
-
-            state = CONNECTING_STATE;
-            break;
-
-        case 0x0081:
-            switch (msg->readByte()) {
-                case 1:
-                    errorMessage = "Map server offline";
-                    break;
-                case 3:
-                    errorMessage = "Speed hack detected";
-                    break;
-                case 8:
-                    errorMessage = "Duplicated login";
-                    break;
-                default:
-                    errorMessage = "Unkown error with 0x0081";
-                    break;
-            }
-            mCharInfo->unlock();
-            state = ERROR_STATE;
-            break;
     }
 }
 
 LocalPlayer* CharServerHandler::readPlayerData(MessageIn *msg, int &slot)
 {
     LocalPlayer *tempPlayer = new LocalPlayer(mLoginData->account_ID, 0, NULL);
-    tempPlayer->mCharId = msg->readLong();
-    tempPlayer->mTotalWeight = 0;
-    tempPlayer->mMaxWeight = 0;
-    tempPlayer->mLastAttackTime = 0;
-    tempPlayer->mXp = msg->readLong();
-    tempPlayer->mGp = msg->readLong();
-    tempPlayer->mJobXp = msg->readLong();
-    tempPlayer->mJobLevel = msg->readLong();
-    msg->readLong();                       // option
-    msg->readLong();                       // karma
-    msg->readLong();                       // manner
-    tempPlayer->mHp = msg->readShort();
-    tempPlayer->mMaxHp = msg->readShort();
-    tempPlayer->mMp = msg->readShort();
-    tempPlayer->mMaxMp = msg->readShort();
-    msg->readShort();                       // speed
-    msg->readShort();                       // class
-    tempPlayer->setHairStyle(msg->readShort());
-    Uint16 weapon = msg->readShort();
-    if (weapon == 11)
-        weapon = 2;
-    tempPlayer->setWeapon(weapon);
-    tempPlayer->mLevel = msg->readShort();
-    msg->readShort();                       // skill point
-    tempPlayer->setVisibleEquipment(3, msg->readShort()); // head bottom
-    msg->readShort();                       // shield
-    tempPlayer->setVisibleEquipment(4, msg->readShort()); // head option top
-    tempPlayer->setVisibleEquipment(5, msg->readShort()); // head option mid
-    tempPlayer->setHairColor(msg->readShort());
-    msg->readShort();                       // unknown
-    tempPlayer->setName(msg->readString(24));
+    slot = msg->readByte(); // character slot
+    tempPlayer->mName = msg->readString();
+    tempPlayer->mSex = msg->readByte();
+    tempPlayer->setHairStyle(msg->readByte());
+    tempPlayer->setHairColor(msg->readByte());
+    tempPlayer->mLevel = msg->readByte();
+    tempPlayer->mMoney = msg->readShort();
     for (int i = 0; i < 6; i++) {
         tempPlayer->mAttr[i] = msg->readByte();
     }
-    slot = msg->readByte(); // character slot
-    msg->readByte();                        // unknown
-
     return tempPlayer;
 }
diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp
index 324c33cd..27d8eed5 100644
--- a/src/net/loginhandler.cpp
+++ b/src/net/loginhandler.cpp
@@ -27,7 +27,6 @@
 #include "network.h"
 #include "protocol.h"
 
-#include "../localplayer.h"
 #include "../log.h"
 #include "../logindata.h"
 #include "../main.h"
@@ -52,21 +51,6 @@ void LoginHandler::handleMessage(MessageIn *msg)
             // Successful login
             if (errMsg == ERRMSG_OK)
             {
-                unsigned char charNumber = msg->readByte();
-                printf("Account has %i characters:\n", charNumber);
-                for (unsigned int i = 0; i < charNumber; i++) {
-                    // Create a temp empty player to show up in character
-                    // selection dialog
-                    LocalPlayer *temp = new LocalPlayer(0, 0, 0);
-                    temp->setName(msg->readString());
-                    temp->setSex(msg->readByte());
-                    temp->setHairStyle(msg->readByte());
-                    temp->setHairColor(msg->readByte());
-                    temp->mLevel = msg->readByte();
-                    temp->mGp = msg->readShort();
-                    mCharInfo->select(i);
-                    mCharInfo->setEntry(temp);
-                }
                 state = CHAR_SELECT_STATE;
             }
             // Login failed
@@ -102,7 +86,8 @@ void LoginHandler::handleMessage(MessageIn *msg)
                 state = ACCOUNT_STATE;
             }
             // Registration failed
-            else {
+            else
+            {
                 switch (errMsg) {
                     case REGISTER_INVALID_VERSION:
                     errorMessage = "Client has an insufficient version number to login.";
diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h
index 7d5d6f75..1b15b736 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.h
@@ -38,13 +38,10 @@ class LoginHandler : public MessageHandler
 
         void handleMessage(MessageIn *msg);
 
-        void setCharInfo(LockedArray<LocalPlayer*> *charInfo) { mCharInfo = charInfo; };
-
         void setLoginData(LoginData *loginData) { mLoginData = loginData; };
 
     protected:
         LoginData *mLoginData;
-        LockedArray<LocalPlayer*> *mCharInfo;
 };
 
 #endif
diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp
index 5e8a5d72..7f5fadcb 100644
--- a/src/net/messageout.cpp
+++ b/src/net/messageout.cpp
@@ -104,13 +104,13 @@ MessageOut::writeString(const std::string &string, int length)
 }
 
 char*
-MessageOut::getData()
+MessageOut::getData() const
 {
     return mData;
 }
 
 unsigned int
-MessageOut::getDataSize()
+MessageOut::getDataSize() const
 {
     return mDataSize;
 }
diff --git a/src/net/messageout.h b/src/net/messageout.h
index 8431d887..22754f60 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -55,12 +55,12 @@ class MessageOut
         /**
          * Returns the content of the message.
          */
-        char *getData();
+        char *getData() const;
 
         /**
          * Returns the length of the data.
          */
-        unsigned int getDataSize();
+        unsigned int getDataSize() const;
 
     private:
         /**
diff --git a/src/net/network.cpp b/src/net/network.cpp
index dcfbc8f1..39a632a2 100644
--- a/src/net/network.cpp
+++ b/src/net/network.cpp
@@ -29,6 +29,8 @@
 
 #include "../log.h"
 
+Network *network;
+
 Network::Network():
     mClient(0), mServer(0),
     mAddress(), mPort(0),
@@ -216,7 +218,7 @@ void Network::flush()
     }
 }
 
-void Network::send(MessageOut *msg)
+void Network::send(const MessageOut &msg)
 {
     if (mState == IDLE || mState == NET_ERROR)
     {
@@ -225,8 +227,8 @@ void Network::send(MessageOut *msg)
         return;
     }
 
-    ENetPacket *packet = enet_packet_create(msg->getData(),
-                                            msg->getDataSize(),
+    ENetPacket *packet = enet_packet_create(msg.getData(),
+                                            msg.getDataSize(),
                                             ENET_PACKET_FLAG_RELIABLE);
     mOutgoingPackets.push(packet);
 }
diff --git a/src/net/network.h b/src/net/network.h
index 50ee9af7..f91c926b 100644
--- a/src/net/network.h
+++ b/src/net/network.h
@@ -59,7 +59,7 @@ class Network
         void dispatchMessages();
         void flush();
 
-        void send(MessageOut *msg);
+        void send(const MessageOut &msg);
 
         enum State {
             IDLE,
@@ -96,4 +96,7 @@ class Network
 /** Convert an address from int format to string */
 char *iptostring(int address);
 
+// TODO: remove this global, just a temp solution.
+extern Network *network;
+
 #endif
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index c70eada3..d8ff81f4 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -177,7 +177,7 @@ void PlayerHandler::handleMessage(MessageIn *msg)
                     player_node->mJobXp = msg->readLong();
                     break;
                 case 0x0014:
-                    player_node->mGp = msg->readLong();
+                    player_node->mMoney = msg->readLong();
                     break;
                 case 0x0016:
                     player_node->mXpForNextLevel = msg->readLong();
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 6db3762e..528b2fd5 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -128,7 +128,7 @@ enum {
     APMSG_CHAR_CREATE_RESPONSE     = 0x0021, // B error
     PAMSG_CHAR_DELETE              = 0x0022, // B index
     APMSG_CHAR_DELETE_RESPONSE     = 0x0023, // B error
-    PAMSG_CHAR_LIST                = 0x0024, // -
+    APMSG_CHAR_INFO                = 0x0024, // B index, S name, B gender, B hair style, B hair color, B level, W money, W*6 stats, S mapname, W*2 position
     APMSG_CHAR_LIST_RESPONSE       = 0x0025, // B number, { B index, S name, B gender, B hair style, B hair color, B level, W money, W*6 stats, S mapname, W*2 position }*
     PAMSG_CHAR_SELECT              = 0x0026, // B index
     APMSG_CHAR_SELECT_RESPONSE     = 0x0027, // B error, S mapname, W*2 position
@@ -207,6 +207,18 @@ enum {
     REGISTER_EXISTS_EMAIL               // there already is an account with this email address
 };
 
+// Character creation specific return values
+enum {
+    CREATE_INVALID_HAIRSTYLE = 0x40,
+    CREATE_INVALID_HAIRCOLOR,
+    CREATE_INVALID_GENDER,
+    CREATE_RAW_STATS_TOO_HIGH,
+    CREATE_RAW_STATS_TOO_LOW,
+    CREATE_RAW_STATS_INVALID_DIFF,
+    CREATE_RAW_STATS_EQUAL_TO_ZERO,
+    CREATE_EXISTS_NAME,
+    CREATE_TOO_MUCH_CHARACTERS
+};
 
 /** Encodes coords and direction in 3 bytes data */
 void set_coordinates(char *data, unsigned short x, unsigned short y, unsigned char direction);
-- 
cgit v1.2.3-70-g09d2


From 3fe5d486bf33d4658ab75b49fe878a9a0394d835 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 7 Jan 2007 00:23:22 +0000
Subject: Synchronized player attributes with wiki Attributes page and removed
 Job XP.

---
 ChangeLog          |  6 ++++
 src/gui/status.cpp | 85 +++++++++++++++++++++---------------------------------
 src/gui/status.h   | 12 ++++----
 src/localplayer.h  | 11 ++++---
 src/main.cpp       | 18 +++++-------
 5 files changed, 58 insertions(+), 74 deletions(-)

(limited to 'src/gui/status.h')

diff --git a/ChangeLog b/ChangeLog
index a48d7149..2770bfca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-07  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* 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-05  Björn Steinbrink  <B.Steinbrink@gmx.de>
 
 	* src/CMakeLists.txt, data/graphics/sprites/CMakeLists.txt: Fixed
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index b53e0942..bba9f045 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -40,7 +40,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     setWindowName("Status");
     setResizable(true);
     setDefaultSize((windowContainer->getWidth() - 365) / 2,
-                   (windowContainer->getHeight() - 255) / 2, 365, 255);
+                   (windowContainer->getHeight() - 255) / 2, 365, 280);
     loadWindowState();
 
     // ----------------------
@@ -62,10 +62,6 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     mMpBar = new ProgressBar(1.0f, 80, 15, 26, 102, 230);
     mMpValueLabel = new gcn::Label("");
 
-    mJobXpLabel = new gcn::Label("Job:");
-    mJobXpBar = new ProgressBar(1.0f, 60, 15, 220, 135, 203);
-    mJobValueLabel = new gcn::Label("");
-
     int y = 3;
     int x = 5;
 
@@ -95,10 +91,6 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     x += mMpBar->getWidth() + 5;
     mMpValueLabel->setPosition(x, y);
 
-    mJobXpLabel->setPosition(175, y);
-    mJobXpBar->setPosition(225, y);
-    mJobValueLabel->setPosition(290, y);
-
     add(mLvlLabel);
     add(mMoneyLabel);
     add(mHpLabel);
@@ -107,12 +99,9 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     add(mMpValueLabel);
     add(mXpLabel);
     add(mXpValueLabel);
-    add(mJobXpLabel);
-    add(mJobValueLabel);
     add(mHpBar);
     add(mMpBar);
     add(mXpBar);
-    add(mJobXpBar);
 
     // ----------------------
     // Stats Part
@@ -141,7 +130,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     mStatsReflexPoints = new gcn::Label("% Reflex:");
 
     // New labels
-    for (int i = 0; i < 6; i++) {
+    for (int i = 0; i < 7; i++) {
         mStatsLabel[i] = new gcn::Label();
         mStatsDisplayLabel[i] = new gcn::Label();
         mPointsLabel[i] = new gcn::Label("0");
@@ -151,10 +140,11 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     // Set button events Id
     mStatsButton[0] = new Button("+", "STR", this);
     mStatsButton[1] = new Button("+", "AGI", this);
-    mStatsButton[2] = new Button("+", "VIT", this);
-    mStatsButton[3] = new Button("+", "INT", this);
-    mStatsButton[4] = new Button("+", "DEX", this);
-    mStatsButton[5] = new Button("+", "LUK", this);
+    mStatsButton[2] = new Button("+", "DEX", this);
+    mStatsButton[3] = new Button("+", "VIT", this);
+    mStatsButton[4] = new Button("+", "INT", this);
+    mStatsButton[5] = new Button("+", "WIL", this);
+    mStatsButton[6] = new Button("+", "CHR", this);
 
 
     // Set position
@@ -163,16 +153,17 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     int totalLabelY = mStatsTotalLabel->getY();
     mStatsCostLabel->setPosition(170, totalLabelY);
 
-    for (int i = 0; i < 6; i++)
+    for (int i = 0; i < 7; i++)
     {
-        mStatsLabel[i]->setPosition(5, mStatsTotalLabel->getY() + (i * 23) + 15);
+        mStatsLabel[i]->setPosition(5,
+                                    mStatsTotalLabel->getY() + (i * 23) + 15);
         mStatsDisplayLabel[i]->setPosition(115,
                                           totalLabelY + (i * 23) + 15);
         mStatsButton[i]->setPosition(145, totalLabelY + (i * 23) + 10);
         mPointsLabel[i]->setPosition(175, totalLabelY + (i * 23) + 15);
     }
 
-    mRemainingStatsPointsLabel->setPosition(5, mPointsLabel[5]->getY() + 25);
+    mRemainingStatsPointsLabel->setPosition(5, mPointsLabel[6]->getY() + 25);
 
     mStatsAttackLabel->setPosition(220, mStatsLabel[0]->getY());
     mStatsDefenseLabel->setPosition(220, mStatsLabel[1]->getY());
@@ -180,7 +171,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     mStatsMagicDefenseLabel->setPosition(220, mStatsLabel[3]->getY());
     mStatsAccuracyLabel->setPosition(220, mStatsLabel[4]->getY());
     mStatsEvadeLabel->setPosition(220, mStatsLabel[5]->getY());
-    mStatsReflexLabel->setPosition(220, mRemainingStatsPointsLabel->getY());
+    mStatsReflexLabel->setPosition(220, mStatsLabel[6]->getY());
 
     mStatsAttackPoints->setPosition(310, mStatsLabel[0]->getY());
     mStatsDefensePoints->setPosition(310, mStatsLabel[1]->getY());
@@ -188,13 +179,13 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     mStatsMagicDefensePoints->setPosition(310, mStatsLabel[3]->getY());
     mStatsAccuracyPoints->setPosition(310, mStatsLabel[4]->getY());
     mStatsEvadePoints->setPosition(310, mStatsLabel[5]->getY());
-    mStatsReflexPoints->setPosition(310, mRemainingStatsPointsLabel->getY());
+    mStatsReflexPoints->setPosition(310, mStatsLabel[6]->getY());
 
     // Assemble
     add(mStatsTitleLabel);
     add(mStatsTotalLabel);
     add(mStatsCostLabel);
-    for(int i = 0; i < 6; i++)
+    for(int i = 0; i < 7; i++)
     {
         add(mStatsLabel[i]);
         add(mStatsDisplayLabel[i]);
@@ -230,9 +221,6 @@ void StatusWindow::update()
     mMoneyLabel->setCaption("Money: " + toString(mPlayer->mMoney) + " GP");
     mMoneyLabel->adjustSize();
 
-    mJobXpLabel->setCaption("Job: " + toString(mPlayer->mJobLevel));
-    mJobXpLabel->adjustSize();
-
     mHpValueLabel->setCaption(toString(mPlayer->mHp) +
             "/" + toString(mPlayer->mMaxHp));
     mHpValueLabel->adjustSize();
@@ -245,10 +233,6 @@ void StatusWindow::update()
             "/" + toString(mPlayer->mXpForNextLevel));
     mXpValueLabel->adjustSize();
 
-    mJobValueLabel->setCaption(toString(mPlayer->mJobXp) +
-            "/" + toString(mPlayer->mJobXpForNextLevel));
-    mJobValueLabel->adjustSize();
-
     // HP Bar coloration
     if (mPlayer->mHp < int(mPlayer->mMaxHp / 3))
     {
@@ -267,27 +251,26 @@ void StatusWindow::update()
     // mMpBar->setProgress((float)mPlayer->mp / (float)mPlayer->maxMp);
 
     mXpBar->setProgress(
-            (float)mPlayer->mXp / (float)mPlayer->mXpForNextLevel);
-    mJobXpBar->setProgress(
-            (float)mPlayer->mJobXp / (float)mPlayer->mJobXpForNextLevel);
+            (float) mPlayer->mXp / (float) mPlayer->mXpForNextLevel);
 
     // Stats Part
     // ----------
-    static const std::string attrNames[6] = {
+    const std::string attrNames[7] = {
         "Strength",
         "Agility",
+        "Dexterity",
         "Vitality",
         "Intelligence",
-        "Dexterity",
-        "Luck"
+        "Willpower",
+        "Charisma"
     };
     int statusPoints = mPlayer->mStatsPointsToAttribute;
 
     // Update labels
-    for (int i = 0; i < 6; i++) {
+    for (int i = 0; i < 7; i++) {
         mStatsLabel[i]->setCaption(attrNames[i]);
-        mStatsDisplayLabel[i]->setCaption(toString((int)mPlayer->mAttr[i]));
-        mPointsLabel[i]->setCaption(toString((int)mPlayer->mAttrUp[i]));
+        mStatsDisplayLabel[i]->setCaption(toString((int) mPlayer->mAttr[i]));
+        mPointsLabel[i]->setCaption(toString((int) mPlayer->mAttrUp[i]));
 
         mStatsLabel[i]->adjustSize();
         mStatsDisplayLabel[i]->adjustSize();
@@ -346,12 +329,6 @@ void StatusWindow::update()
     mXpValueLabel->setPosition(
             mXpBar->getX() + mXpBar->getWidth() + 5,
             mXpLabel->getY());
-
-    mJobXpLabel->setPosition(mXpLabel->getX(), mMpLabel->getY());
-    mJobXpBar->setPosition(
-            mXpBar->getX() + mXpBar->getWidth() - mJobXpBar->getWidth(),
-            mJobXpLabel->getY());
-    mJobValueLabel->setPosition(290, mJobXpLabel->getY());
 }
 
 void StatusWindow::draw(gcn::Graphics *g)
@@ -370,25 +347,29 @@ void StatusWindow::action(const std::string &eventId, gcn::Widget *widget)
         {
             mPlayer->raiseAttribute(LocalPlayer::STR);
         }
-        if (eventId == "AGI")
+        else if (eventId == "AGI")
         {
             mPlayer->raiseAttribute(LocalPlayer::AGI);
         }
-        if (eventId == "VIT")
+        else if (eventId == "DEX")
+        {
+            mPlayer->raiseAttribute(LocalPlayer::DEX);
+        }
+        else if (eventId == "VIT")
         {
             mPlayer->raiseAttribute(LocalPlayer::VIT);
         }
-        if (eventId == "INT")
+        else if (eventId == "INT")
         {
             mPlayer->raiseAttribute(LocalPlayer::INT);
         }
-        if (eventId == "DEX")
+        else if (eventId == "WIL")
         {
-            mPlayer->raiseAttribute(LocalPlayer::DEX);
+            mPlayer->raiseAttribute(LocalPlayer::WIL);
         }
-        if (eventId == "LUK")
+        else if (eventId == "CHR")
         {
-            mPlayer->raiseAttribute(LocalPlayer::LUK);
+            mPlayer->raiseAttribute(LocalPlayer::CHR);
         }
     }
 }
diff --git a/src/gui/status.h b/src/gui/status.h
index fe2140e3..43dfe8c2 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -71,9 +71,9 @@ class StatusWindow : public Window, public gcn::ActionListener {
          */
         gcn::Label *mLvlLabel, *mMoneyLabel, *mHpLabel, *mHpValueLabel;
         gcn::Label *mMpLabel, *mMpValueLabel;
-        gcn::Label *mXpLabel, *mXpValueLabel, *mJobXpLabel, *mJobValueLabel;
+        gcn::Label *mXpLabel, *mXpValueLabel;
         ProgressBar *mHpBar, *mMpBar;
-        ProgressBar *mXpBar, *mJobXpBar;
+        ProgressBar *mXpBar;
 
         /**
          * Derived Statistics captions
@@ -91,15 +91,15 @@ class StatusWindow : public Window, public gcn::ActionListener {
         /**
          * Stats captions.
          */
-        gcn::Label *mStatsLabel[6];
-        gcn::Label *mPointsLabel[6];
-        gcn::Label *mStatsDisplayLabel[6];
+        gcn::Label *mStatsLabel[7];
+        gcn::Label *mPointsLabel[7];
+        gcn::Label *mStatsDisplayLabel[7];
         gcn::Label *mRemainingStatsPointsLabel;
 
         /**
          * Stats buttons.
          */
-        gcn::Button *mStatsButton[6];
+        gcn::Button *mStatsButton[7];
 };
 
 extern StatusWindow *statusWindow;
diff --git a/src/localplayer.h b/src/localplayer.h
index 765b7cca..980b1aff 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -39,7 +39,7 @@ class LocalPlayer : public Player
 {
     public:
         enum Attribute {
-            STR = 0, AGI, VIT, INT, DEX, LUK
+            STR = 0, AGI, DEX, VIT, INT, WIL, CHR
         };
 
         /**
@@ -137,17 +137,16 @@ class LocalPlayer : public Player
 
         Uint32 mCharId;
 
-        Uint32 mXp, mJobXp;
+        Uint32 mXp;
         Uint16 mLevel;
-        Uint32 mJobLevel;
-        Uint32 mXpForNextLevel, mJobXpForNextLevel;
+        Uint32 mXpForNextLevel;
         Uint16 mHp, mMaxHp, mMp, mMaxMp;
         Uint32 mMoney;
 
         Uint32 mTotalWeight, mMaxWeight;
 
-        Uint8 mAttr[6];
-        Uint8 mAttrUp[6];
+        Uint8 mAttr[7];
+        Uint8 mAttrUp[7];
 
         Sint16 ATK, MATK, DEF, MDEF, HIT, FLEE;
         Sint16 ATK_BONUS, MATK_BONUS, DEF_BONUS, MDEF_BONUS, FLEE_BONUS;
diff --git a/src/main.cpp b/src/main.cpp
index 8163cde3..b9eeaeb5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -218,7 +218,7 @@ void initConfiguration(const Options &options)
 /**
  * Do all initialization stuff.
  */
-void init_engine()
+void initEngine()
 {
     // Initialize SDL
     logger->log("Initializing SDL...");
@@ -273,11 +273,11 @@ void init_engine()
     graphics = new Graphics();
 #endif
 
-    int width = (int)config.getValue("screenwidth", defaultScreenWidth);
-    int height = (int)config.getValue("screenheight", defaultScreenHeight);
+    int width = (int) config.getValue("screenwidth", defaultScreenWidth);
+    int height = (int) config.getValue("screenheight", defaultScreenHeight);
     int bpp = 0;
-    bool fullscreen = ((int)config.getValue("screen", 0) == 1);
-    bool hwaccel = ((int)config.getValue("hwaccel", 0) == 1);
+    bool fullscreen = ((int) config.getValue("screen", 0) == 1);
+    bool hwaccel = ((int) config.getValue("hwaccel", 0) == 1);
 
     // Try to set the desired video mode
     if (!graphics->setVideoMode(width, height, bpp, fullscreen, hwaccel))
@@ -511,16 +511,14 @@ int main(int argc, char *argv[])
     logger->setLogFile(homeDir + std::string("/tmw.log"));
     logger->setLogToStandardOut(config.getValue("logToStandardOut", 0));
 
-    initXML();
-    initConfiguration(options);
-
-
     // Log the tmw version
 #ifdef PACKAGE_VERSION
     logger->log("The Mana World v%s", PACKAGE_VERSION);
 #endif
 
-    init_engine();
+    initXML();
+    initConfiguration(options);
+    initEngine();
 
     Window *currentDialog = NULL;
     Image *login_wallpaper = NULL;
-- 
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/status.h')

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 346bb6d670d630d65f8c35125831c75d031aac7f Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Thu, 22 Mar 2007 23:10:27 +0000
Subject: Redesigned the localplayer class to use getters and setters instead
 of direct access to the member variables. Implemented communication of
 attributes between server and client.

---
 ChangeLog                     |  14 ++-
 src/gui/char_select.cpp       |   4 +-
 src/gui/inventorywindow.cpp   |   4 +-
 src/gui/ministatus.cpp        |  54 ++----------
 src/gui/ministatus.h          |   4 -
 src/gui/skill.cpp             |  33 +-------
 src/gui/skill.h               |   3 -
 src/gui/status.cpp            |  95 ++++++---------------
 src/gui/status.h              |   8 +-
 src/localplayer.cpp           |  61 +++-----------
 src/localplayer.h             | 128 ++++++++++++++++++++++++----
 src/net/buysellhandler.cpp    |   4 +-
 src/net/charserverhandler.cpp |   8 +-
 src/net/playerhandler.cpp     | 192 +++++-------------------------------------
 src/net/protocol.h            |   1 +
 15 files changed, 206 insertions(+), 407 deletions(-)

(limited to 'src/gui/status.h')

diff --git a/ChangeLog b/ChangeLog
index 0f5ffbf8..fa6ae372 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,16 @@
-2007-03-20  Philipp Sehmisch  <tmw@crushnet.org>
+2007-03-23  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* 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.
+
+2007-03-20  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/gui/char_select.cpp, src/gui/char_select.h,
 	src/net/charserverhandler.cpp, src/net/protocol.h: Implemented a GUI for
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index bd348c88..09ce5b87 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -194,8 +194,8 @@ void CharSelectDialog::updatePlayerInfo()
     if (pi)
     {
         mNameLabel->setCaption(pi->getName());
-        mLevelLabel->setCaption("Lvl: " + toString(pi->mLevel));
-        mMoneyLabel->setCaption("Money: " + toString(pi->mMoney));
+        mLevelLabel->setCaption("Lvl: " + toString(pi->getLevel()));
+        mMoneyLabel->setCaption("Money: " + toString(pi->getMoney()));
         if (!mCharSelected)
         {
             mNewCharButton->setEnabled(false);
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index e533c16c..44d042a6 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -94,8 +94,8 @@ void InventoryWindow::logic()
 
     // Update weight information
     mWeightLabel->setCaption(
-            "Total Weight: " + toString(player_node->mTotalWeight) + " - "
-            "Maximum Weight: " + toString(player_node->mMaxWeight));
+            "Total Weight: " + toString(player_node->getTotalWeight()) + " - "
+            "Maximum Weight: " + toString(player_node->getMaxWeight()));
     mWeightLabel->adjustSize();
 }
 
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 932b1f22..9a4c2273 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -43,51 +43,32 @@ MiniStatusWindow::MiniStatusWindow():
     setTitleBarHeight(0);
 
     mHpBar = new ProgressBar(1.0f, 100, 20, 0, 171, 34);
-    mMpBar = new ProgressBar(1.0f, 100, 20, 26, 102, 230);
-    mXpBar = new ProgressBar(1.0f, 100, 20, 143, 192, 211);
     mHpLabel = new gcn::Label("");
-    mMpLabel = new gcn::Label("");
-    mXpLabel = new gcn::Label("");
 
     mHpBar->setPosition(0, 3);
-    mMpBar->setPosition(mHpBar->getWidth() + 3, 3);
-    mXpBar->setPosition(mMpBar->getX() + mMpBar->getWidth() + 3, 3);
 
     mHpLabel->setDimension(mHpBar->getDimension());
-    mMpLabel->setDimension(mMpBar->getDimension());
-    mXpLabel->setDimension(mXpBar->getDimension());
 
     mHpLabel->setForegroundColor(gcn::Color(255, 255, 255));
-    mMpLabel->setForegroundColor(gcn::Color(255, 255, 255));
-    mXpLabel->setForegroundColor(gcn::Color(255, 255, 255));
 
     mHpLabel->setFont(speechFont);
-    mMpLabel->setFont(speechFont);
-    mXpLabel->setFont(speechFont);
 
     mHpLabel->setAlignment(gcn::Graphics::CENTER);
-    mMpLabel->setAlignment(gcn::Graphics::CENTER);
-    mXpLabel->setAlignment(gcn::Graphics::CENTER);
 
     add(mHpBar);
-    add(mMpBar);
-    add(mXpBar);
     add(mHpLabel);
-    add(mMpLabel);
-    add(mXpLabel);
-
-    setDefaultSize(0, 0, mXpBar->getX() + mXpBar->getWidth(),
-                   mXpBar->getY() + mXpBar->getHeight());
 }
 
 void MiniStatusWindow::update()
 {
     // HP Bar coloration
-    if (player_node->mHp < int(player_node->mMaxHp / 3))
+    int maxHp = player_node->getMaxHP();
+    int hp = player_node->getHP();
+    if (hp < int(maxHp / 3))
     {
         mHpBar->setColor(223, 32, 32); // Red
     }
-    else if (player_node->mHp < int((player_node->mMaxHp / 3) * 2))
+    else if (hp < int((maxHp / 3) * 2))
     {
         mHpBar->setColor(230, 171, 34); // Orange
     }
@@ -96,33 +77,10 @@ void MiniStatusWindow::update()
         mHpBar->setColor(0, 171, 34); // Green
     }
 
-    mHpBar->setProgress((float) player_node->mHp / player_node->mMaxHp);
-    // mMpBar->setProgress((float) player_node->mMp / player_node->mMaxMp);
-    mXpBar->setProgress((float) player_node->mXp / player_node->mXpForNextLevel);
+    mHpBar->setProgress((float) hp / maxHp);
 
     // Update labels
-    mHpLabel->setCaption(toString(player_node->mHp));
-    mMpLabel->setCaption(toString(player_node->mMp));
-
-    std::stringstream updatedText;
-    updatedText << (int) (
-            (float) player_node->mXp /
-            player_node->mXpForNextLevel * 100) << "%";
-
-    // Displays the number of monsters to next lvl
-    // (disabled for now but interesting idea)
-    /*
-    if(config.getValue("xpBarMonsterCounterExp", 0)!=0)
-    {
-        updatedText << " | "
-            << (int)(((float)player_node->mXpForNextLevel - (float)player_node->mXp)
-             / (float)config.getValue("xpBarMonsterCounterExp", 0))
-            << " "
-            << config.getValue("xpBarMonsterCounterName", "Monsters") <<" left...";
-    }
-    */
-
-    mXpLabel->setCaption(updatedText.str());
+    mHpLabel->setCaption(toString(hp));
 }
 
 void MiniStatusWindow::draw(gcn::Graphics *graphics)
diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h
index 718fe140..1192bc1e 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatus.h
@@ -60,11 +60,7 @@ class MiniStatusWindow : public Window
          * Mini Status Bars
          */
         ProgressBar *mHpBar;
-        ProgressBar *mMpBar;
-        ProgressBar *mXpBar;
         gcn::Label *mHpLabel;
-        gcn::Label *mMpLabel;
-        gcn::Label *mXpLabel;
 };
 
 #endif
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 1b00a732..c9babda2 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -68,28 +68,17 @@ SkillDialog::SkillDialog():
 
     mSkillListBox = new ListBox(this);
     ScrollArea *skillScrollArea = new ScrollArea(mSkillListBox);
-    mPointsLabel = new gcn::Label("Skill Points:");
-    mIncButton = new Button("Up", "inc", this);
-    mUseButton = new Button("Use", "use", this);
-    mUseButton->setEnabled(false);
     mCloseButton = new Button("Close", "close", this);
 
     mSkillListBox->setActionEventId("skill");
 
     skillScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     skillScrollArea->setDimension(gcn::Rectangle(5, 5, 230, 180));
-    mPointsLabel->setDimension(gcn::Rectangle(8, 190, 200, 16));
-    mIncButton->setPosition(skillScrollArea->getX(), 210);
-    mUseButton->setPosition(mIncButton->getX() + mIncButton->getWidth() + 5,
-        210);
     mCloseButton->setPosition(
         skillScrollArea->getX() + skillScrollArea->getWidth() - mCloseButton->getWidth(),
         210);
 
     add(skillScrollArea);
-    add(mPointsLabel);
-    add(mIncButton);
-    add(mUseButton);
     add(mCloseButton);
 
     mSkillListBox->addActionListener(this);
@@ -105,20 +94,8 @@ SkillDialog::~SkillDialog()
 
 void SkillDialog::action(const gcn::ActionEvent &event)
 {
-    if (event.getId() == "inc")
-    {
-        // Increment skill
-        int selectedSkill = mSkillListBox->getSelected();
-        if (selectedSkill >= 0)
-        {
-            player_node->raiseSkill(mSkillList[selectedSkill]->id);
-        }
-    }
-    else if (event.getId() == "skill")
+    if (event.getId() == "skill")
     {
-        mIncButton->setEnabled(
-                mSkillListBox->getSelected() > -1 &&
-                player_node->mSkillPoint > 0);
     }
     else if (event.getId() == "close")
     {
@@ -128,14 +105,6 @@ void SkillDialog::action(const gcn::ActionEvent &event)
 
 void SkillDialog::update()
 {
-    if (mPointsLabel != NULL) {
-        char tmp[128];
-        sprintf(tmp, "Skill points: %i", player_node->mSkillPoint);
-        mPointsLabel->setCaption(tmp);
-    }
-
-    mIncButton->setEnabled(mSkillListBox->getSelected() > -1 &&
-            player_node->mSkillPoint > 0);
 }
 
 int SkillDialog::getNumberOfElements()
diff --git a/src/gui/skill.h b/src/gui/skill.h
index ed1257b0..b8794e35 100644
--- a/src/gui/skill.h
+++ b/src/gui/skill.h
@@ -71,9 +71,6 @@ class SkillDialog : public Window, public gcn::ActionListener,
 
     private:
         gcn::ListBox *mSkillListBox;
-        gcn::Label *mPointsLabel;
-        gcn::Button *mIncButton;
-        gcn::Button *mUseButton;
         gcn::Button *mCloseButton;
 
         std::vector<SKILL*> mSkillList;
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 9c60752d..c7cb80c3 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -54,14 +54,6 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     mHpBar = new ProgressBar(1.0f, 80, 15, 0, 171, 34);
     mHpValueLabel = new gcn::Label("");
 
-    mXpLabel = new gcn::Label("Exp:");
-    mXpBar = new ProgressBar(1.0f, 80, 15, 143, 192, 211);
-    mXpValueLabel = new gcn::Label("");
-
-    mMpLabel = new gcn::Label("MP:");
-    mMpBar = new ProgressBar(1.0f, 80, 15, 26, 102, 230);
-    mMpValueLabel = new gcn::Label("");
-
     int y = 3;
     int x = 5;
 
@@ -78,30 +70,14 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     x += mHpBar->getWidth() + 5;
     mHpValueLabel->setPosition(x, y);
 
-    mXpLabel->setPosition(175, y);
-    mXpBar->setPosition(205, y);
-    mXpValueLabel->setPosition(290, y);
-
     y += mHpLabel->getHeight() + 5; // Next Row
     x = 5;
 
-    mMpLabel->setPosition(x, y);
-    x += mMpLabel->getWidth() + 5;
-    mMpBar->setPosition(x, y);
-    x += mMpBar->getWidth() + 5;
-    mMpValueLabel->setPosition(x, y);
-
     add(mLvlLabel);
     add(mMoneyLabel);
     add(mHpLabel);
     add(mHpValueLabel);
-    add(mMpLabel);
-    add(mMpValueLabel);
-    add(mXpLabel);
-    add(mXpValueLabel);
     add(mHpBar);
-    add(mMpBar);
-    add(mXpBar);
 
     // ----------------------
     // Stats Part
@@ -113,6 +89,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     gcn::Label *mStatsCostLabel = new gcn::Label("Cost");
 
     // Derived Stats
+/*
     mStatsAttackLabel = new gcn::Label("Attack:");
     mStatsDefenseLabel= new gcn::Label("Defense:");
     mStatsMagicAttackLabel = new gcn::Label("M.Attack:");
@@ -128,7 +105,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     mStatsAccuracyPoints = new gcn::Label("% Accuracy:");
     mStatsEvadePoints = new gcn::Label("% Evade:");
     mStatsReflexPoints = new gcn::Label("% Reflex:");
-
+*/
     // New labels
     for (int i = 0; i < 7; i++) {
         mStatsLabel[i] = new gcn::Label();
@@ -148,7 +125,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
 
 
     // Set position
-    mStatsTitleLabel->setPosition(mMpLabel->getX(), mMpLabel->getY() + 23 );
+    mStatsTitleLabel->setPosition(mHpLabel->getX(), mHpLabel->getY() + 23 );
     mStatsTotalLabel->setPosition(110, mStatsTitleLabel->getY() + 15);
     int totalLabelY = mStatsTotalLabel->getY();
     mStatsCostLabel->setPosition(170, totalLabelY);
@@ -157,14 +134,14 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     {
         mStatsLabel[i]->setPosition(5,
                                     mStatsTotalLabel->getY() + (i * 23) + 15);
-        mStatsDisplayLabel[i]->setPosition(115,
+        mStatsDisplayLabel[i]->setPosition(85,
                                           totalLabelY + (i * 23) + 15);
         mStatsButton[i]->setPosition(145, totalLabelY + (i * 23) + 10);
-        mPointsLabel[i]->setPosition(175, totalLabelY + (i * 23) + 15);
+        mPointsLabel[i]->setPosition(165, totalLabelY + (i * 23) + 15);
     }
 
     mRemainingStatsPointsLabel->setPosition(5, mPointsLabel[6]->getY() + 25);
-
+/*
     mStatsAttackLabel->setPosition(220, mStatsLabel[0]->getY());
     mStatsDefenseLabel->setPosition(220, mStatsLabel[1]->getY());
     mStatsMagicAttackLabel->setPosition(220, mStatsLabel[2]->getY());
@@ -180,7 +157,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     mStatsAccuracyPoints->setPosition(310, mStatsLabel[4]->getY());
     mStatsEvadePoints->setPosition(310, mStatsLabel[5]->getY());
     mStatsReflexPoints->setPosition(310, mStatsLabel[6]->getY());
-
+*/
     // Assemble
     add(mStatsTitleLabel);
     add(mStatsTotalLabel);
@@ -191,7 +168,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
         add(mStatsDisplayLabel[i]);
         add(mStatsButton[i]);
         add(mPointsLabel[i]);
-    }
+    }/*
     add(mStatsAttackLabel);
     add(mStatsDefenseLabel);
     add(mStatsMagicAttackLabel);
@@ -206,7 +183,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     add(mStatsMagicDefensePoints);
     add(mStatsAccuracyPoints);
     add(mStatsEvadePoints);
-    add(mStatsReflexPoints);
+    add(mStatsReflexPoints);*/
 
     add(mRemainingStatsPointsLabel);
 }
@@ -215,30 +192,25 @@ void StatusWindow::update()
 {
     // Status Part
     // -----------
-    mLvlLabel->setCaption("Level: " + toString(mPlayer->mLevel));
+    mLvlLabel->setCaption("Level: " + toString(mPlayer->getLevel()));
     mLvlLabel->adjustSize();
 
-    mMoneyLabel->setCaption("Money: " + toString(mPlayer->mMoney) + " GP");
+    mMoneyLabel->setCaption("Money: " + toString(mPlayer->getMoney()) + " GP");
     mMoneyLabel->adjustSize();
 
-    mHpValueLabel->setCaption(toString(mPlayer->mHp) +
-            "/" + toString(mPlayer->mMaxHp));
-    mHpValueLabel->adjustSize();
-
-    mMpValueLabel->setCaption(toString(mPlayer->mMp) +
-            "/" + toString(mPlayer->mMaxMp));
-    mMpValueLabel->adjustSize();
+    int hp = mPlayer->getHP();
+    int maxHp = mPlayer->getMaxHP();
 
-    mXpValueLabel->setCaption(toString(mPlayer->mXp) +
-            "/" + toString(mPlayer->mXpForNextLevel));
-    mXpValueLabel->adjustSize();
+    mHpValueLabel->setCaption(toString(hp) +
+            " / " + toString(maxHp));
+    mHpValueLabel->adjustSize();
 
     // HP Bar coloration
-    if (mPlayer->mHp < int(mPlayer->mMaxHp / 3))
+    if (hp < int(maxHp / 3))
     {
         mHpBar->setColor(223, 32, 32); // Red
     }
-    else if (mPlayer->mHp < int((mPlayer->mMaxHp / 3) * 2))
+    else if (hp < int((maxHp / 3) * 2))
     {
         mHpBar->setColor(230, 171, 34); // Orange
     }
@@ -247,11 +219,7 @@ void StatusWindow::update()
         mHpBar->setColor(0, 171, 34); // Green
     }
 
-    mHpBar->setProgress((float)mPlayer->mHp / (float)mPlayer->mMaxHp);
-    // mMpBar->setProgress((float)mPlayer->mp / (float)mPlayer->maxMp);
-
-    mXpBar->setProgress(
-            (float) mPlayer->mXp / (float) mPlayer->mXpForNextLevel);
+    mHpBar->setProgress((float)hp / maxHp);
 
     // Stats Part
     // ----------
@@ -264,24 +232,26 @@ void StatusWindow::update()
         "Willpower",
         "Charisma"
     };
-    int statusPoints = mPlayer->mStatsPointsToAttribute;
+    int statusPoints = mPlayer->getAttributeIncreasePoints();
 
     // Update labels
     for (int i = 0; i < 7; i++) {
         mStatsLabel[i]->setCaption(attrNames[i]);
-        mStatsDisplayLabel[i]->setCaption(toString((int) mPlayer->mAttr[i]));
-        mPointsLabel[i]->setCaption(toString((int) mPlayer->mAttrUp[i]));
+        mStatsDisplayLabel[i]->setCaption(
+                toString(mPlayer->getAttributeEffective(i)) +
+                " / " +
+                toString(mPlayer->getAttributeBase(i))
+            );
 
         mStatsLabel[i]->adjustSize();
         mStatsDisplayLabel[i]->adjustSize();
-        mPointsLabel[i]->adjustSize();
 
-        mStatsButton[i]->setEnabled(mPlayer->mAttrUp[i] <= statusPoints);
+        mStatsButton[i]->setEnabled(statusPoints);
     }
     mRemainingStatsPointsLabel->setCaption("Remaining Status Points: " +
             toString(statusPoints));
     mRemainingStatsPointsLabel->adjustSize();
-
+/*
     // Derived Stats Points
 
     // Attack TODO: Count equipped Weapons and items attack bonuses
@@ -315,20 +285,11 @@ void StatusWindow::update()
     // Reflex %
     mStatsReflexPoints->setCaption(toString(mPlayer->DEX / 4)); // + counter
     mStatsReflexPoints->adjustSize();
-
+*/
     // Update Second column widgets position
     mMoneyLabel->setPosition(mLvlLabel->getX() + mLvlLabel->getWidth() + 20,
                          mLvlLabel->getY());
 
-    mXpLabel->setPosition(
-            mHpValueLabel->getX() + mHpValueLabel->getWidth() + 10,
-            mHpLabel->getY());
-    mXpBar->setPosition(
-            mXpLabel->getX() + mXpLabel->getWidth() + 5,
-            mXpLabel->getY());
-    mXpValueLabel->setPosition(
-            mXpBar->getX() + mXpBar->getWidth() + 5,
-            mXpLabel->getY());
 }
 
 void StatusWindow::draw(gcn::Graphics *g)
diff --git a/src/gui/status.h b/src/gui/status.h
index 37f8a648..40d25a2a 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -70,14 +70,12 @@ class StatusWindow : public Window, public gcn::ActionListener {
          * Status Part
          */
         gcn::Label *mLvlLabel, *mMoneyLabel, *mHpLabel, *mHpValueLabel;
-        gcn::Label *mMpLabel, *mMpValueLabel;
-        gcn::Label *mXpLabel, *mXpValueLabel;
-        ProgressBar *mHpBar, *mMpBar;
-        ProgressBar *mXpBar;
+        ProgressBar *mHpBar;
 
         /**
          * Derived Statistics captions
          */
+/*
         gcn::Label *mStatsAttackLabel, *mStatsDefenseLabel;
         gcn::Label *mStatsMagicAttackLabel, *mStatsMagicDefenseLabel;
         gcn::Label *mStatsAccuracyLabel, *mStatsEvadeLabel;
@@ -87,7 +85,7 @@ class StatusWindow : public Window, public gcn::ActionListener {
         gcn::Label *mStatsMagicAttackPoints, *mStatsMagicDefensePoints;
         gcn::Label *mStatsAccuracyPoints, *mStatsEvadePoints;
         gcn::Label *mStatsReflexPoints;
-
+*/
         /**
          * Stats captions.
          */
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 16d5b191..7f595ef1 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -38,10 +38,13 @@ LocalPlayer *player_node = NULL;
 
 LocalPlayer::LocalPlayer():
     Player(65535, 0, NULL),
-    mLevel(1),
     mInventory(new Inventory()),
+    mAttributeBase(NB_BASE_ATTRIBUTES, 0),
+    mAttributeEffective(NB_BASE_ATTRIBUTES, 0),
+    mLevel(1),
     mTarget(NULL), mPickUpTarget(NULL),
-    mTrading(false), mLastAction(-1)
+    mTrading(false),
+    mLastAction(-1)
 {
 }
 
@@ -235,54 +238,6 @@ void LocalPlayer::setWalkingDir(int dir)
     }
 }
 
-void LocalPlayer::raiseAttribute(Attribute attr)
-{
-    // XXX Convert for new server
-    /*
-    MessageOut outMsg(CMSG_STAT_UPDATE_REQUEST);
-
-    switch (attr)
-    {
-        case STR:
-            outMsg.writeShort(0x000d);
-            break;
-
-        case AGI:
-            outMsg.writeShort(0x000e);
-            break;
-
-        case VIT:
-            outMsg.writeShort(0x000f);
-            break;
-
-        case INT:
-            outMsg.writeShort(0x0010);
-            break;
-
-        case DEX:
-            outMsg.writeShort(0x0011);
-            break;
-
-        case LUK:
-            outMsg.writeShort(0x0012);
-            break;
-    }
-    outMsg.writeByte(1);
-    */
-}
-
-void LocalPlayer::raiseSkill(Uint16 skillId)
-{
-    if (mSkillPoint <= 0)
-        return;
-
-    // XXX Convert for new server
-    /*
-    MessageOut outMsg(CMSG_SKILL_LEVELUP_REQUEST);
-    outMsg.writeShort(skillId);
-    */
-}
-
 void LocalPlayer::toggleSit()
 {
     if (mLastAction != -1)
@@ -375,3 +330,9 @@ void LocalPlayer::revive()
     outMsg.writeByte(0);
     */
 }
+
+void LocalPlayer::raiseAttribute(size_t attr)
+{
+    mAttributeBase.at(attr)++;
+    // TODO: Inform the server about our desire to raise the attribute
+}
diff --git a/src/localplayer.h b/src/localplayer.h
index 9ce67d13..299cf85a 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -35,6 +35,68 @@ class FloorItem;
 class Inventory;
 class Item;
 
+/**
+ * Stats every being needs
+ */
+enum BeingStats
+{
+    BASE_ATTR_STRENGTH = 0,    // Basic attributes
+    BASE_ATTR_AGILITY,
+    BASE_ATTR_DEXTERITY,
+    BASE_ATTR_VITALITY,
+    BASE_ATTR_INTELLIGENCE,
+    BASE_ATTR_WILLPOWER,
+    BASE_ATTR_CHARISMA,
+    NB_BASE_ATTRIBUTES,
+
+    ATTR_EFF_STRENGTH = NB_BASE_ATTRIBUTES,    // modified basic attributes
+    ATTR_EFF_AGILITY,
+    ATTR_EFF_DEXTERITY,
+    ATTR_EFF_VITALITY,
+    ATTR_EFF_INTELLIGENCE,
+    ATTR_EFF_WILLPOWER,
+    ATTR_EFF_CHARISMA,
+    NB_EFFECTIVE_ATTRIBUTES,
+
+    DERIVED_ATTR_HP_MAXIMUM = NB_EFFECTIVE_ATTRIBUTES,    // Computed stats
+    DERIVED_ATTR_PHYSICAL_ATTACK_MINIMUM,
+    DERIVED_ATTR_PHYSICAL_ATTACK_FLUCTUATION,
+    DERIVED_ATTR_PHYSICAL_DEFENCE,
+    // add new computed statistics when they are needed
+    NB_ATTRIBUTES_BEING
+};
+
+/**
+ * Player character specific stats
+ */
+enum CharacterStats
+{
+    CHAR_SKILL_WEAPON_UNARMED = NB_ATTRIBUTES_BEING,
+    CHAR_SKILL_WEAPON_SWORD,
+    CHAR_SKILL_WEAPON_AXE,
+    CHAR_SKILL_WEAPON_POLEARM,
+    CHAR_SKILL_WEAPON_JAVELIN,
+    CHAR_SKILL_WEAPON_WHIP,
+    CHAR_SKILL_WEAPON_DAGGER,
+    CHAR_SKILL_WEAPON_STAFF,
+    CHAR_SKILL_WEAPON_BOW,
+    CHAR_SKILL_WEAPON_CROSSBOW,
+    CHAR_SKILL_WEAPON_THROWN,
+    NB_CHAR_WEAPONSKILLS,
+
+    CHAR_SKILL_MAGIC_IAMJUSTAPLACEHOLDER = NB_CHAR_WEAPONSKILLS,
+    NB_CHAR_MAGICSKILLS,
+
+    CHAR_SKILL_CRAFT_IAMJUSTAPLACEHOLDER = NB_CHAR_MAGICSKILLS,
+    NB_CHAR_CRAFTSKILLS,
+
+    CHAR_SKILL_IAMJUSTAPLACEHOLDER = NB_CHAR_CRAFTSKILLS,
+    NB_CHAR_OTHERSKILLS,
+
+    NB_ATTRIBUTES_CHAR = NB_CHAR_OTHERSKILLS
+};
+
+
 /**
  * The local player character.
  */
@@ -138,32 +200,57 @@ class LocalPlayer : public Player
          */
         void setWalkingDir(int dir);
 
-        void raiseAttribute(Attribute attr);
-        void raiseSkill(Uint16 skillId);
+        void raiseAttribute(size_t attr);
 
         void toggleSit();
         void emote(Uint8 emotion);
 
         void revive();
 
-        Uint32 mCharId;
+        int getHP() const
+        { return mHP; }
 
-        Uint32 mXp;
-        Uint16 mLevel;
-        Uint32 mXpForNextLevel;
-        Uint16 mHp, mMaxHp, mMp, mMaxMp;
-        Uint32 mMoney;
+        int getMaxHP() const
+        { return mMaxHP; }
 
-        Uint32 mTotalWeight, mMaxWeight;
+        void setHP(int value)
+        { mHP = value; }
 
-        Uint8 mAttr[7];
-        Uint8 mAttrUp[7];
+        void setMaxHP(int value)
+        { mMaxHP = value; }
 
-        Sint16 ATK, MATK, DEF, MDEF, HIT, FLEE;
-        Sint16 ATK_BONUS, MATK_BONUS, DEF_BONUS, MDEF_BONUS, FLEE_BONUS;
+        int getLevel() const
+        { return mLevel; }
 
-        Uint16 mStatPoint, mSkillPoint;
-        Uint16 mStatsPointsToAttribute;
+        void setLevel(int value)
+        { mLevel = value; }
+
+        int getMoney() const
+        { return mMoney; }
+
+        void setMoney(int value)
+        { mMoney = value; }
+
+        int getTotalWeight() const
+        { return mTotalWeight; }
+
+        int getMaxWeight() const
+        { return mMaxWeight; }
+
+        int getAttributeBase(size_t num) const
+        { return mAttributeBase.at(num); }
+
+        void setAttributeBase(size_t num, int value)
+        { mAttributeBase.at(num) = value; }
+
+        int getAttributeEffective(size_t num) const
+        { return mAttributeEffective.at(num); }
+
+        void setAttributeEffective(size_t num, int value)
+        { mAttributeEffective.at(num) = value; }
+
+        int getAttributeIncreasePoints() const
+        { return mAttributeIncreasePoints; }
 
         float mLastAttackTime; /**< Used to synchronize the charge dialog */
 
@@ -172,6 +259,17 @@ class LocalPlayer : public Player
     protected:
         void walk(unsigned char dir);
 
+        // Character status:
+        std::vector<int> mAttributeBase;
+        std::vector<int> mAttributeEffective;
+        int mAttributeIncreasePoints;
+        int mLevel;
+        int mMoney;
+        int mTotalWeight;
+        int mMaxWeight;
+        int mHP;
+        int mMaxHP;
+
         Being *mTarget;
         FloorItem *mPickUpTarget;
 
diff --git a/src/net/buysellhandler.cpp b/src/net/buysellhandler.cpp
index 473a706c..45dfb9ad 100644
--- a/src/net/buysellhandler.cpp
+++ b/src/net/buysellhandler.cpp
@@ -72,7 +72,7 @@ void BuySellHandler::handleMessage(MessageIn &msg)
             msg.readShort();  // length
             n_items = (msg.getLength() - 4) / 11;
             buyDialog->reset();
-            buyDialog->setMoney(player_node->mMoney);
+            buyDialog->setMoney(player_node->getMoney());
             buyDialog->setVisible(true);
 
             for (int k = 0; k < n_items; k++)
@@ -89,7 +89,7 @@ void BuySellHandler::handleMessage(MessageIn &msg)
             msg.readShort();  // length
             n_items = (msg.getLength() - 4) / 10;
             if (n_items > 0) {
-                sellDialog->setMoney(player_node->mMoney);
+                sellDialog->setMoney(player_node->getMoney());
                 sellDialog->reset();
                 sellDialog->setVisible(true);
 
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index ebc11bb3..34fc188d 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -202,10 +202,10 @@ CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
     tempPlayer->setSex(msg.readByte());
     tempPlayer->setHairStyle(msg.readByte());
     tempPlayer->setHairColor(msg.readByte());
-    tempPlayer->mLevel = msg.readByte();
-    tempPlayer->mMoney = msg.readShort();
-    for (int i = 0; i < 6; i++) {
-        tempPlayer->mAttr[i] = msg.readByte();
+    tempPlayer->setLevel(msg.readByte());
+    tempPlayer->setMoney(msg.readLong());
+    for (int i = 0; i < 7; i++) {
+        tempPlayer->setAttributeBase(i, msg.readByte());
     }
     return tempPlayer;
 }
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 327edea3..335c2eb1 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -96,6 +96,7 @@ PlayerHandler::PlayerHandler()
         //SMSG_PLAYER_ARROW_MESSAGE,
         GPMSG_PLAYER_MAP_CHANGE,
         GPMSG_PLAYER_SERVER_CHANGE,
+        GPMSG_PLAYER_ATTRIBUTE_UPDATE,
         0
     };
     handledMessages = _messages;
@@ -117,187 +118,34 @@ void PlayerHandler::handleMessage(MessageIn &msg)
             logger->log("Changing server to %s:%d", address.c_str(), port);
         } break;
 
-        /*
-        case SMSG_PLAYER_STAT_UPDATE_1:
+        case GPMSG_PLAYER_ATTRIBUTE_UPDATE:
+        {
+            logger->log("ATTRIBUTE UPDATE:");
+            while (msg.getUnreadLength())
             {
-                Sint16 type = msg.readShort();
-                Uint32 value = msg.readLong();
+                int stat = msg.readShort();
+                int value = msg.readShort();
+                logger->log("%d set to %d", stat, value);
 
-                switch (type)
+                if (stat < NB_BASE_ATTRIBUTES)
                 {
-                    //case 0x0000:
-                    //    player_node->setWalkSpeed(msg.readLong());
-                    //    break;
-                    case 0x0005: player_node->mHp = value; break;
-                    case 0x0006: player_node->mMaxHp = value; break;
-                    case 0x0007: player_node->mMp = value; break;
-                    case 0x0008: player_node->mMaxMp = value; break;
-                    case 0x000b: player_node->mLevel = value; break;
-                    case 0x000c:
-                                 player_node->mSkillPoint = value;
-                                 skillDialog->update();
-                                 break;
-                    case 0x0018:
-                                 if (value >= player_node->mMaxWeight / 2 &&
-                                         player_node->mTotalWeight <
-                                         player_node->mMaxWeight / 2)
-                                 {
-                                     weightNotice = new OkDialog("Message",
-                                             "You are carrying more then half "
-                                             "your weight. You are unable to "
-                                             "regain health.");
-                                     weightNotice->addActionListener(
-                                             &weightListener);
-                                 }
-                                 player_node->mTotalWeight = value;
-                                 break;
-                    case 0x0019: player_node->mMaxWeight = value; break;
-                    case 0x0037: player_node->mJobLevel = value; break;
-                    case 0x0009:
-                                 player_node->mStatsPointsToAttribute = value;
-                                 break;
-                    case 0x0029: player_node->ATK = value; break;
-                    case 0x002b: player_node->MATK = value; break;
-                    case 0x002d: player_node->DEF = value; break;
-                    case 0x002f: player_node->MDEF = value; break;
-                    case 0x0031: player_node->HIT = value; break;
-                    case 0x0032: player_node->FLEE = value; break;
-                    case 0x0035: player_node->mAttackSpeed = value; break;
+                    player_node->setAttributeBase(stat, value);
                 }
-
-                if (player_node->mHp == 0 && deathNotice == NULL)
+                else if (stat < NB_EFFECTIVE_ATTRIBUTES)
                 {
-                    deathNotice = new OkDialog("Message",
-                            "You're now dead, press ok to restart");
-                    deathNotice->addActionListener(&deathListener);
-                    player_node->setAction(Being::DEAD);
+                    player_node->setAttributeEffective(stat - NB_BASE_ATTRIBUTES, value);
                 }
-            }
-            break;
-
-        case SMSG_PLAYER_STAT_UPDATE_2:
-            switch (msg.readShort()) {
-                case 0x0001:
-                    player_node->mXp = msg.readLong();
-                    break;
-                case 0x0002:
-                    player_node->mJobXp = msg.readLong();
-                    break;
-                case 0x0014:
-                    player_node->mMoney = msg.readLong();
-                    break;
-                case 0x0016:
-                    player_node->mXpForNextLevel = msg.readLong();
-                    break;
-                case 0x0017:
-                    player_node->mJobXpForNextLevel = msg.readLong();
-                    break;
-            }
-            break;
-
-        case SMSG_PLAYER_STAT_UPDATE_3:
-            {
-                Sint32 type = msg.readLong();
-                Sint32 base = msg.readLong();
-                Sint32 bonus = msg.readLong();
-                Sint32 total = base + bonus;
-
-                switch (type) {
-                    case 0x000d: player_node->mAttr[LocalPlayer::STR] = total;
-                                 break;
-                    case 0x000e: player_node->mAttr[LocalPlayer::AGI] = total;
-                                 break;
-                    case 0x000f: player_node->mAttr[LocalPlayer::VIT] = total;
-                                 break;
-                    case 0x0010: player_node->mAttr[LocalPlayer::INT] = total;
-                                 break;
-                    case 0x0011: player_node->mAttr[LocalPlayer::DEX] = total;
-                                 break;
-                    case 0x0012: player_node->mAttr[LocalPlayer::LUK] = total;
-                                 break;
+                else if (stat == DERIVED_ATTR_HP_MAXIMUM)
+                {
+                    player_node->setMaxHP(value);
                 }
-            }
-            break;
-
-        case SMSG_PLAYER_STAT_UPDATE_4:
-            {
-                Sint16 type = msg.readShort();
-                Sint8 fail = msg.readByte();
-                Sint8 value = msg.readByte();
-
-                if (fail != 1)
-                    break;
-
-                switch (type) {
-                    case 0x000d: player_node->mAttr[LocalPlayer::STR] = value;
-                                 break;
-                    case 0x000e: player_node->mAttr[LocalPlayer::AGI] = value;
-                                 break;
-                    case 0x000f: player_node->mAttr[LocalPlayer::VIT] = value;
-                                 break;
-                    case 0x0010: player_node->mAttr[LocalPlayer::INT] = value;
-                                 break;
-                    case 0x0011: player_node->mAttr[LocalPlayer::DEX] = value;
-                                 break;
-                    case 0x0012: player_node->mAttr[LocalPlayer::LUK] = value;
-                                 break;
+                else
+                {
+                    logger->log("Warning: server wants to update unknown attribute %d to %d", stat, value);
                 }
             }
-            break;
-
-            // Updates stats and status points
-        case SMSG_PLAYER_STAT_UPDATE_5:
-            player_node->mStatsPointsToAttribute = msg.readShort();
-            player_node->mAttr[LocalPlayer::STR] = msg.readByte();
-            player_node->mAttrUp[LocalPlayer::STR] = msg.readByte();
-            player_node->mAttr[LocalPlayer::AGI] = msg.readByte();
-            player_node->mAttrUp[LocalPlayer::AGI] = msg.readByte();
-            player_node->mAttr[LocalPlayer::VIT] = msg.readByte();
-            player_node->mAttrUp[LocalPlayer::VIT] = msg.readByte();
-            player_node->mAttr[LocalPlayer::INT] = msg.readByte();
-            player_node->mAttrUp[LocalPlayer::INT] = msg.readByte();
-            player_node->mAttr[LocalPlayer::DEX] = msg.readByte();
-            player_node->mAttrUp[LocalPlayer::DEX] = msg.readByte();
-            player_node->mAttr[LocalPlayer::LUK] = msg.readByte();
-            player_node->mAttrUp[LocalPlayer::LUK] = msg.readByte();
-            player_node->ATK       = msg.readShort();  // ATK
-            player_node->ATK_BONUS  = msg.readShort();  // ATK bonus
-            player_node->MATK      = msg.readShort();  // MATK max
-            player_node->MATK_BONUS = msg.readShort();  // MATK min
-            player_node->DEF       = msg.readShort();  // DEF
-            player_node->DEF_BONUS  = msg.readShort();  // DEF bonus
-            player_node->MDEF      = msg.readShort();  // MDEF
-            player_node->MDEF_BONUS = msg.readShort();  // MDEF bonus
-            player_node->HIT       = msg.readShort();  // HIT
-            player_node->FLEE      = msg.readShort();  // FLEE
-            player_node->FLEE_BONUS = msg.readShort();  // FLEE bonus
-            msg.readShort();  // critical
-            msg.readShort();  // unknown
-            break;
-
-        case SMSG_PLAYER_STAT_UPDATE_6:
-            switch (msg.readShort()) {
-                case 0x0020:
-                    player_node->mAttrUp[LocalPlayer::STR] = msg.readByte();
-                    break;
-                case 0x0021:
-                    player_node->mAttrUp[LocalPlayer::AGI] = msg.readByte();
-                    break;
-                case 0x0022:
-                    player_node->mAttrUp[LocalPlayer::VIT] = msg.readByte();
-                    break;
-                case 0x0023:
-                    player_node->mAttrUp[LocalPlayer::INT] = msg.readByte();
-                    break;
-                case 0x0024:
-                    player_node->mAttrUp[LocalPlayer::DEX] = msg.readByte();
-                    break;
-                case 0x0025:
-                    player_node->mAttrUp[LocalPlayer::LUK] = msg.readByte();
-                    break;
-            }
-            break;
-
+        } break;
+        /*
         case SMSG_PLAYER_ARROW_MESSAGE:
             {
                 Sint16 type = msg.readShort();
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 980e841a..a9ee0e5b 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -160,6 +160,7 @@ enum {
     PGMSG_EQUIP                    = 0x0112, // B slot
     GPMSG_INVENTORY                = 0x0120, // { B slot, W item id [, B amount] }*
     GPMSG_INVENTORY_FULL           = 0x0121, // { B slot, W item id [, B amount] }*
+    GPMSG_PLAYER_ATTRIBUTE_UPDATE  = 0x0130, // { W attribute, W value }*
     GPMSG_BEING_ENTER              = 0x0200, // B type, W being id, B action, W*2 position
                                              // player: S name, B hair style, B hair color, B gender
                                              // monster: W type id
-- 
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/status.h')

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 1f2b8d3d4c36c3cf30187633e4cf5bb5d0012e7c Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Tue, 18 Dec 2007 01:27:27 +0000
Subject: Updated attribute system to the latest design decisions (removed
 charisma, kept agility in)

---
 ChangeLog                         |  9 +++++++++
 src/gui/char_select.cpp           | 16 +++++++---------
 src/gui/char_select.h             |  8 ++++----
 src/gui/status.cpp                | 17 ++++++-----------
 src/gui/status.h                  |  8 ++++----
 src/localplayer.h                 |  1 -
 src/net/accountserver/account.cpp |  3 +--
 src/net/accountserver/account.h   |  2 +-
 src/net/beinghandler.cpp          |  1 +
 9 files changed, 33 insertions(+), 32 deletions(-)

(limited to 'src/gui/status.h')

diff --git a/ChangeLog b/ChangeLog
index 1e259291..aca00a69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-18  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/gui/char_select.cpp, src/gui/char_select.h,
+	src/gui/status.cpp, src/gui/status.h, src/localplayer.h,
+	src/net/accountserver/account.cpp,
+	src/net/accountserver/account.h, src/net/beinghandler.cpp:
+	Updated attribute system to the latest design decisions
+	(removed charisma, kept agility in)
+
 2007-12-09  Björn Steinbrink  <B.Steinbrink@gmx.de>
 
 	* src/CMakeLists.txt: Add missing source files.
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index ccdf20c8..96140bb5 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -264,8 +264,7 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot):
     mAttributeLabel[3] = new gcn::Label(_("Vitality:"));
     mAttributeLabel[4] = new gcn::Label(_("Intelligence:"));
     mAttributeLabel[5] = new gcn::Label(_("Willpower:"));
-    mAttributeLabel[6] = new gcn::Label(_("Charisma:"));
-    for (int i=0; i<7; i++)
+    for (int i=0; i<6; i++)
     {
         mAttributeLabel[i]->setWidth(70);
         mAttributeSlider[i] = new Slider(1, 20);
@@ -289,7 +288,7 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot):
     mPrevHairStyleButton->setPosition(90, 64);
     mNextHairStyleButton->setPosition(165, 64);
     mHairStyleLabel->setPosition(5, 70);
-    for (int i=0; i<7; i++)
+    for (int i=0; i<6; i++)
     {
         mAttributeSlider[i]->setValue(10);
         mAttributeSlider[i]->setDimension(gcn::Rectangle(   75, 140 + i*20,
@@ -319,7 +318,7 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot):
     add(mNextHairStyleButton);
     add(mPrevHairStyleButton);
     add(mHairStyleLabel);
-    for (int i=0; i<7; i++)
+    for (int i=0; i<6; i++)
     {
         add(mAttributeSlider[i]);
         add(mAttributeValue[i]);
@@ -359,8 +358,7 @@ CharCreateDialog::action(const gcn::ActionEvent &event)
                     (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[5]->getValue()  // WILL
             );
         }
         else {
@@ -398,7 +396,7 @@ CharCreateDialog::getName()
 
 void CharCreateDialog::UpdateSliders()
 {
-    for (int i = 0; i < 7; i++)
+    for (int i = 0; i < 6; i++)
     {
         // Update captions
         mAttributeValue[i]->setCaption(
@@ -407,7 +405,7 @@ void CharCreateDialog::UpdateSliders()
     }
 
     // Update distributed points
-    int pointsLeft = 70 - getDistributedPoints();
+    int pointsLeft = 60 - getDistributedPoints();
     if (pointsLeft == 0)
     {
         mAttributesLeft->setCaption(_("Character stats OK"));
@@ -439,7 +437,7 @@ int CharCreateDialog::getDistributedPoints()
 {
     int points = 0;
 
-    for (int i = 0; i < 7; i++)
+    for (int i = 0; i < 6; i++)
     {
         points += (int) mAttributeSlider[i]->getValue();
     }
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index 5d0b42fa..f2d6cbc4 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -140,9 +140,9 @@ class CharCreateDialog : public Window, public gcn::ActionListener
         gcn::Button *mPrevHairStyleButton;
         gcn::Label *mHairStyleLabel;
 
-        gcn::Slider *mAttributeSlider[7];
-        gcn::Label *mAttributeLabel[7];
-        gcn::Label *mAttributeValue[7];
+        gcn::Slider *mAttributeSlider[6];
+        gcn::Label *mAttributeLabel[6];
+        gcn::Label *mAttributeValue[6];
         gcn::Label *mAttributesLeft;
 
         gcn::Button *mCreateButton;
@@ -153,7 +153,7 @@ class CharCreateDialog : public Window, public gcn::ActionListener
 
         int mSlot;
 
-        static const int mMaxPoints = 70;
+        static const int mMaxPoints = 60;
         int mUsedPoints;
 };
 
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 323a6b16..b0a92665 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -108,7 +108,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     mStatsReflexPoints = new gcn::Label("% Reflex:");
 */
     // New labels
-    for (int i = 0; i < 7; i++) {
+    for (int i = 0; i < 6; i++) {
         mStatsLabel[i] = new gcn::Label();
         mStatsDisplayLabel[i] = new gcn::Label();
         mPointsLabel[i] = new gcn::Label("0");
@@ -131,7 +131,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     int totalLabelY = mStatsTotalLabel->getY();
     mStatsCostLabel->setPosition(170, totalLabelY);
 
-    for (int i = 0; i < 7; i++)
+    for (int i = 0; i < 6; i++)
     {
         mStatsLabel[i]->setPosition(5,
                                     mStatsTotalLabel->getY() + (i * 23) + 15);
@@ -163,7 +163,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     add(mStatsTitleLabel);
     add(mStatsTotalLabel);
     add(mStatsCostLabel);
-    for(int i = 0; i < 7; i++)
+    for(int i = 0; i < 6; i++)
     {
         add(mStatsLabel[i]);
         add(mStatsDisplayLabel[i]);
@@ -224,19 +224,18 @@ void StatusWindow::update()
 
     // Stats Part
     // ----------
-    const std::string attrNames[7] = {
+    const std::string attrNames[6] = {
         "Strength",
         "Agility",
         "Dexterity",
         "Vitality",
         "Intelligence",
-        "Willpower",
-        "Charisma"
+        "Willpower"
     };
     int statusPoints = mPlayer->getAttributeIncreasePoints();
 
     // Update labels
-    for (int i = 0; i < 7; i++)
+    for (int i = 0; i < 6; i++)
     {
         mStatsLabel[i]->setCaption(attrNames[i]);
         mStatsDisplayLabel[i]->setCaption(
@@ -331,9 +330,5 @@ void StatusWindow::action(const gcn::ActionEvent &event)
         {
             mPlayer->raiseAttribute(LocalPlayer::WIL);
         }
-        else if (eventId == "CHR")
-        {
-            mPlayer->raiseAttribute(LocalPlayer::CHR);
-        }
     }
 }
diff --git a/src/gui/status.h b/src/gui/status.h
index 62cd8805..f3475263 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -90,15 +90,15 @@ class StatusWindow : public Window, public gcn::ActionListener
         /**
          * Stats captions.
          */
-        gcn::Label *mStatsLabel[7];
-        gcn::Label *mPointsLabel[7];
-        gcn::Label *mStatsDisplayLabel[7];
+        gcn::Label *mStatsLabel[6];
+        gcn::Label *mPointsLabel[6];
+        gcn::Label *mStatsDisplayLabel[6];
         gcn::Label *mRemainingStatsPointsLabel;
 
         /**
          * Stats buttons.
          */
-        gcn::Button *mStatsButton[7];
+        gcn::Button *mStatsButton[6];
 };
 
 extern StatusWindow *statusWindow;
diff --git a/src/localplayer.h b/src/localplayer.h
index ddf5878e..b72438da 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -76,7 +76,6 @@ enum
     CHAR_ATTR_VITALITY,
     CHAR_ATTR_INTELLIGENCE,
     CHAR_ATTR_WILLPOWER,
-    CHAR_ATTR_CHARISMA,
     CHAR_ATTR_END,
     CHAR_ATTR_NB = CHAR_ATTR_END - CHAR_ATTR_BEGIN,
 
diff --git a/src/net/accountserver/account.cpp b/src/net/accountserver/account.cpp
index f0778b1d..9f3bfe5c 100644
--- a/src/net/accountserver/account.cpp
+++ b/src/net/accountserver/account.cpp
@@ -32,7 +32,7 @@
 void Net::AccountServer::Account::createCharacter(
         const std::string &name, char hairStyle, char hairColor, char gender,
         short strength, short agility, short vitality,
-        short intelligence, short dexterity, short willpower, short charisma)
+        short intelligence, short dexterity, short willpower)
 {
     MessageOut msg(PAMSG_CHAR_CREATE);
 
@@ -46,7 +46,6 @@ void Net::AccountServer::Account::createCharacter(
     msg.writeInt16(intelligence);
     msg.writeInt16(dexterity);
     msg.writeInt16(willpower);
-    msg.writeInt16(charisma);
 
     Net::AccountServer::connection->send(msg);
 }
diff --git a/src/net/accountserver/account.h b/src/net/accountserver/account.h
index 8af75eb9..6a8c4e08 100644
--- a/src/net/accountserver/account.h
+++ b/src/net/accountserver/account.h
@@ -35,7 +35,7 @@ namespace Net
             void createCharacter(const std::string &name,
                     char hairStyle, char hairColor, char gender,
                     short strength, short agility, short vitality,
-                    short intelligence, short dexterity, short willpower, short charisma);
+                    short intelligence, short dexterity, short willpower);
 
             void deleteCharacter(char slot);
 
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index a9f992af..37c02dc3 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -101,6 +101,7 @@ void BeingHandler::handleMessage(MessageIn &msg)
             handleBeingLooksChangeMessage(msg);
             break;
 
+
         /*
         case SMSG_BEING_VISIBLE:
         case SMSG_BEING_MOVE:
-- 
cgit v1.2.3-70-g09d2


From 5ff0cd265460ef3fcc30f663094dc2c99b9926e9 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Mon, 28 Jan 2008 07:57:49 +0000
Subject: Added weapon skill system and leveling system.

---
 ChangeLog                     |  19 ++++++
 src/CMakeLists.txt            |   2 -
 src/Makefile.am               |   2 -
 src/game.cpp                  |   3 -
 src/game.h                    |   1 -
 src/gui/skill.cpp             | 125 ++++++++++++-------------------------
 src/gui/skill.h               |  21 ++-----
 src/gui/status.cpp            | 139 ++++++++++++++++++++++++++----------------
 src/gui/status.h              |   7 ++-
 src/localplayer.cpp           |  66 +++++++++++++++-----
 src/localplayer.h             |  88 +++++++++++++++++---------
 src/net/charserverhandler.cpp |   4 +-
 src/net/gameserver/player.cpp |  14 +++++
 src/net/gameserver/player.h   |   2 +
 src/net/playerhandler.cpp     | 128 ++++++++++++++++++++++++++++++++++++++
 src/net/protocol.h            |  16 ++++-
 src/net/skillhandler.cpp      |  93 ----------------------------
 src/net/skillhandler.h        |  37 -----------
 src/particle.cpp              |   6 +-
 src/particle.h                |   4 +-
 src/resources/itemdb.cpp      |   6 +-
 src/resources/iteminfo.cpp    |   2 +-
 src/resources/iteminfo.h      |  23 +++----
 23 files changed, 448 insertions(+), 360 deletions(-)
 delete mode 100644 src/net/skillhandler.cpp
 delete mode 100644 src/net/skillhandler.h

(limited to 'src/gui/status.h')

diff --git a/ChangeLog b/ChangeLog
index 9286fb40..83b8ffac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2007-01-28  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/game.cpp, src/game.h, src/net/skillhandler.cpp,
+	src/net/skillhandler.h, src/Makefile.am, src/CMakeLists.txt:
+	Removed skill handler (relict from eAthena)
+	* src/gui/skill.cpp, src/gui/skill.h: Implemented provisorical
+	dialog for viewing skill experience and skill levels.
+	* src/gui/status.cpp, src/gui/status.h: Implemented raising and
+	correcting of attributes in the character status GUI.
+	* src/localplayer.cpp, src/localplayer.h,
+	src/net/charserverhandler.cpp, src/net/gameserver/player.cpp,
+	src/net/gameserver/player.h, src/net/playerhandler.cpp,
+	src/net/protocol.h: Implemented netcode for skill system and
+	attribute increase system.
+	* src/resources/itemdp.cpp, src/resources/iteminfo.cpp,
+	src/resources/iteminfo.h: Updated skill palette to the latest
+	design decisions.
+	* data/items.xml: Fixed a few messed up slot numbers.
+
 2008-01-26  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/gui/truetypefont.cpp: Image alpha should also be set to 1, in
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a6606c33..4d774f1b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -226,8 +226,6 @@ SET(SRCS
     net/playerhandler.cpp
     net/playerhandler.h
     net/protocol.h
-    net/skillhandler.cpp
-    net/skillhandler.h
     net/tradehandler.cpp
     net/tradehandler.h
     net/accountserver/account.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 31c17edb..a3a7bc1b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -178,8 +178,6 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      net/playerhandler.cpp \
 	      net/playerhandler.h \
 	      net/protocol.h \
-	      net/skillhandler.cpp \
-	      net/skillhandler.h \
 	      net/tradehandler.cpp \
 	      net/tradehandler.h \
 	      net/accountserver/account.cpp \
diff --git a/src/game.cpp b/src/game.cpp
index 4bf42a2d..1ad99268 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -77,7 +77,6 @@
 #include "net/network.h"
 #include "net/npchandler.h"
 #include "net/playerhandler.h"
-#include "net/skillhandler.h"
 #include "net/tradehandler.h"
 
 #include "resources/imagewriter.h"
@@ -236,7 +235,6 @@ Game::Game():
     mItemHandler(new ItemHandler()),
     mNpcHandler(new NPCHandler()),
     mPlayerHandler(new PlayerHandler()),
-    mSkillHandler(new SkillHandler()),
     mTradeHandler(new TradeHandler()),
     mLogicCounterId(0), mSecondsCounterId(0)
 {
@@ -279,7 +277,6 @@ Game::Game():
     Net::registerHandler(mItemHandler.get());
     Net::registerHandler(mNpcHandler.get());
     Net::registerHandler(mPlayerHandler.get());
-    Net::registerHandler(mSkillHandler.get());
     Net::registerHandler(mTradeHandler.get());
 }
 
diff --git a/src/game.h b/src/game.h
index d1b438bd..fc7e33df 100644
--- a/src/game.h
+++ b/src/game.h
@@ -67,7 +67,6 @@ class Game : public ConfigListener
         MessageHandlerPtr mItemHandler;
         MessageHandlerPtr mNpcHandler;
         MessageHandlerPtr mPlayerHandler;
-        MessageHandlerPtr mSkillHandler;
         MessageHandlerPtr mTradeHandler;
 
         SDL_TimerID mLogicCounterId;
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index c553863f..8c47c4ad 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -24,6 +24,7 @@
 #include <algorithm>
 
 #include <guichan/widgets/label.hpp>
+#include <guichan/widgets/container.hpp>
 
 #include "skill.h"
 
@@ -35,32 +36,8 @@
 #include "../localplayer.h"
 
 #include "../utils/dtor.h"
-
-const char *skill_db[] = {
-    // 0-99
-    "", "Basic", "Sword", "Two hand", "HP regeneration", "Bash", "Provoke", "Magnum", "Endure", "MP regeneration",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "MAX weight", "Discount", "Overcharge", "",
-    "Identify", "", "", "", "", "", "", "", "Double", "Miss",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    // 100-199
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "First aid", "Play as dead", "Moving recovery", "Fatal blow", "Auto berserk", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-};
-
+#include "../utils/toString.h"
+#include "../utils/gettext.h"
 
 SkillDialog::SkillDialog():
     Window("Skills")
@@ -68,25 +45,32 @@ SkillDialog::SkillDialog():
     setCloseButton(true);
     setDefaultSize(windowContainer->getWidth() - 255, 25, 240, 240);
 
-    mSkillListBox = new ListBox(this);
-    ScrollArea *skillScrollArea = new ScrollArea(mSkillListBox);
-
-    mSkillListBox->setActionEventId("skill");
-
-    skillScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    skillScrollArea->setDimension(gcn::Rectangle(5, 5, 230, 180));
+    mSkillNameLabels.resize(CHAR_SKILL_NB);
+    mSkillLevelLabels.resize(CHAR_SKILL_NB);
+    mSkillExpLabels.resize(CHAR_SKILL_NB);
 
-    add(skillScrollArea);
+    for (int a=0; a < CHAR_SKILL_NB; a++)
+    {
+        mSkillNameLabels.at(a) = new gcn::Label("");
+        mSkillNameLabels.at(a)->setPosition(1, a*10);
+        add(mSkillNameLabels.at(a));
+        mSkillLevelLabels.at(a) = new gcn::Label("");
+        mSkillLevelLabels.at(a)->setPosition(75, a*10);
+        add(mSkillLevelLabels.at(a));
+        mSkillExpLabels.at(a) = new gcn::Label("");
+        mSkillExpLabels.at(a)->setPosition(150, a*10);
+        add(mSkillExpLabels.at(a));
+    }
 
-    mSkillListBox->addActionListener(this);
+    update();
 
     setLocationRelativeTo(getParent());
-    loadWindowState("Skills");
+    loadWindowState(_("Skills"));
 }
 
 SkillDialog::~SkillDialog()
 {
-    cleanList();
+
 }
 
 void SkillDialog::action(const gcn::ActionEvent &event)
@@ -100,60 +84,29 @@ void SkillDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-void SkillDialog::update()
+void SkillDialog::draw(gcn::Graphics *g)
 {
-}
+    update();
 
-int SkillDialog::getNumberOfElements()
-{
-    return mSkillList.size();
+    Window::draw(g);
 }
 
-std::string SkillDialog::getElementAt(int i)
+void SkillDialog::update()
 {
-    if (i >= 0 && i < (int)mSkillList.size())
+    for (int a = 0; a < CHAR_SKILL_NB; a++)
     {
-        char tmp[128];
-        sprintf(tmp, "%s    Lv: %i    Sp: %i",
-                skill_db[mSkillList[i]->id],
-                mSkillList[i]->lv,
-                mSkillList[i]->sp);
-        return tmp;
+        int baseLevel = player_node->getAttributeBase(a + CHAR_SKILL_BEGIN);
+        int effLevel = player_node->getAttributeEffective(a + CHAR_SKILL_BEGIN);
+        std::string skillLevel("Lvl:" + toString(effLevel) + " / " + toString(baseLevel));
+
+        std::pair<int, int> exp = player_node->getExperience(a);
+        std::string sExp (toString(exp.first) + " / " + toString(exp.second));
+
+        mSkillNameLabels.at(a)->setCaption("Skill" + toString(a));
+        mSkillNameLabels.at(a)->adjustSize();
+        mSkillLevelLabels.at(a)->setCaption(skillLevel);
+        mSkillLevelLabels.at(a)->adjustSize();
+        mSkillExpLabels.at(a)->setCaption(sExp);
+        mSkillExpLabels.at(a)->adjustSize();
     }
-    return "";
-}
-
-bool SkillDialog::hasSkill(int id)
-{
-    for (unsigned int i = 0; i < mSkillList.size(); i++) {
-        if (mSkillList[i]->id == id) {
-            return true;
-        }
-    }
-    return false;
-}
-
-void SkillDialog::addSkill(int id, int lvl, int mp)
-{
-    SKILL *tmp = new SKILL();
-    tmp->id = id;
-    tmp->lv = lvl;
-    tmp->sp = mp;
-    mSkillList.push_back(tmp);
-}
-
-void SkillDialog::setSkill(int id, int lvl, int mp)
-{
-    for (unsigned int i = 0; i < mSkillList.size(); i++) {
-        if (mSkillList[i]->id == id) {
-            mSkillList[i]->lv = lvl;
-            mSkillList[i]->sp = mp;
-        }
-    }
-}
-
-void SkillDialog::cleanList()
-{
-    for_each(mSkillList.begin(), mSkillList.end(), make_dtor(mSkillList));
-    mSkillList.clear();
 }
diff --git a/src/gui/skill.h b/src/gui/skill.h
index f1a14d50..55d94d82 100644
--- a/src/gui/skill.h
+++ b/src/gui/skill.h
@@ -33,18 +33,13 @@
 
 #include "../guichanfwd.h"
 
-struct SKILL {
-    short id;      /**< Index into "skill_db" array */
-    short lv, sp;
-};
 
 /**
  * The skill dialog.
  *
  * \ingroup Interface
  */
-class SkillDialog : public Window, public gcn::ActionListener,
-                    public gcn::ListModel
+class SkillDialog : public Window, public gcn::ActionListener
 {
     public:
         /**
@@ -61,18 +56,14 @@ class SkillDialog : public Window, public gcn::ActionListener,
 
         void update();
 
-        int getNumberOfElements();
-        std::string getElementAt(int);
+        void setExp(int id, int exp);
 
-        bool hasSkill(int id);
-        void addSkill(int id, int lv, int sp);
-        void setSkill(int id, int lv, int sp);
-        void cleanList();
+        void draw(gcn::Graphics *g);
 
     private:
-        gcn::ListBox *mSkillListBox;
-
-        std::vector<SKILL*> mSkillList;
+        std::vector<gcn::Label *> mSkillNameLabels;
+        std::vector<gcn::Label *> mSkillLevelLabels;
+        std::vector<gcn::Label *> mSkillExpLabels;
 };
 
 extern SkillDialog *skillDialog;
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index b0a92665..b9ebfecf 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -87,7 +87,6 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     // Static Labels
     gcn::Label *mStatsTitleLabel = new gcn::Label("Stats");
     gcn::Label *mStatsTotalLabel = new gcn::Label("Total");
-    gcn::Label *mStatsCostLabel = new gcn::Label("Cost");
 
     // Derived Stats
 /*
@@ -111,37 +110,44 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     for (int i = 0; i < 6; i++) {
         mStatsLabel[i] = new gcn::Label();
         mStatsDisplayLabel[i] = new gcn::Label();
-        mPointsLabel[i] = new gcn::Label("0");
     }
-    mRemainingStatsPointsLabel = new gcn::Label();
+    mCharacterPointsLabel = new gcn::Label();
+    mCorrectionPointsLabel = new gcn::Label();
 
     // Set button events Id
-    mStatsButton[0] = new Button("+", "STR", this);
-    mStatsButton[1] = new Button("+", "AGI", this);
-    mStatsButton[2] = new Button("+", "DEX", this);
-    mStatsButton[3] = new Button("+", "VIT", this);
-    mStatsButton[4] = new Button("+", "INT", this);
-    mStatsButton[5] = new Button("+", "WIL", this);
-    mStatsButton[6] = new Button("+", "CHR", this);
+    mStatsPlus[0] = new Button("+", "STR+", this);
+    mStatsPlus[1] = new Button("+", "AGI+", this);
+    mStatsPlus[2] = new Button("+", "DEX+", this);
+    mStatsPlus[3] = new Button("+", "VIT+", this);
+    mStatsPlus[4] = new Button("+", "INT+", this);
+    mStatsPlus[5] = new Button("+", "WIL+", this);
+
+    mStatsMinus[0] = new Button("-", "STR-", this);
+    mStatsMinus[1] = new Button("-", "AGI-", this);
+    mStatsMinus[2] = new Button("-", "DEX-", this);
+    mStatsMinus[3] = new Button("-", "VIT-", this);
+    mStatsMinus[4] = new Button("-", "INT-", this);
+    mStatsMinus[5] = new Button("-", "WIL-", this);
+
 
 
     // Set position
     mStatsTitleLabel->setPosition(mHpLabel->getX(), mHpLabel->getY() + 23 );
     mStatsTotalLabel->setPosition(110, mStatsTitleLabel->getY() + 15);
     int totalLabelY = mStatsTotalLabel->getY();
-    mStatsCostLabel->setPosition(170, totalLabelY);
 
     for (int i = 0; i < 6; i++)
     {
         mStatsLabel[i]->setPosition(5,
                                     mStatsTotalLabel->getY() + (i * 23) + 15);
-        mStatsDisplayLabel[i]->setPosition(85,
+        mStatsMinus[i]->setPosition(85, totalLabelY + (i * 23) + 15);
+        mStatsDisplayLabel[i]->setPosition(125,
                                           totalLabelY + (i * 23) + 15);
-        mStatsButton[i]->setPosition(145, totalLabelY + (i * 23) + 10);
-        mPointsLabel[i]->setPosition(165, totalLabelY + (i * 23) + 15);
+        mStatsPlus[i]->setPosition(185, totalLabelY + (i * 23) + 15);
     }
 
-    mRemainingStatsPointsLabel->setPosition(5, mPointsLabel[6]->getY() + 25);
+    mCharacterPointsLabel->setPosition(5, mStatsDisplayLabel[5]->getY() + 25);
+    mCorrectionPointsLabel->setPosition(5, mStatsDisplayLabel[5]->getY() + 35);
 /*
     mStatsAttackLabel->setPosition(220, mStatsLabel[0]->getY());
     mStatsDefenseLabel->setPosition(220, mStatsLabel[1]->getY());
@@ -162,13 +168,12 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     // Assemble
     add(mStatsTitleLabel);
     add(mStatsTotalLabel);
-    add(mStatsCostLabel);
     for(int i = 0; i < 6; i++)
     {
         add(mStatsLabel[i]);
         add(mStatsDisplayLabel[i]);
-        add(mStatsButton[i]);
-        add(mPointsLabel[i]);
+        add(mStatsPlus[i]);
+        add(mStatsMinus[i]);
     }/*
     add(mStatsAttackLabel);
     add(mStatsDefenseLabel);
@@ -186,14 +191,19 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     add(mStatsEvadePoints);
     add(mStatsReflexPoints);*/
 
-    add(mRemainingStatsPointsLabel);
+    add(mCharacterPointsLabel);
+    add(mCorrectionPointsLabel);
 }
 
 void StatusWindow::update()
 {
     // Status Part
     // -----------
-    mLvlLabel->setCaption("Level: " + toString(mPlayer->getLevel()));
+    mLvlLabel->setCaption(  "Level: " +
+                            toString(mPlayer->getLevel()) +
+                            " (" +
+                            toString(mPlayer->getLevelProgress()) +
+                            "%)");
     mLvlLabel->adjustSize();
 
     mMoneyLabel->setCaption("Money: " + toString(mPlayer->getMoney()) + " GP");
@@ -232,8 +242,8 @@ void StatusWindow::update()
         "Intelligence",
         "Willpower"
     };
-    int statusPoints = mPlayer->getAttributeIncreasePoints();
-
+    int characterPoints = mPlayer->getCharacterPoints();
+    int correctionPoints = mPlayer->getCorrectionPoints();
     // Update labels
     for (int i = 0; i < 6; i++)
     {
@@ -246,11 +256,16 @@ void StatusWindow::update()
         mStatsLabel[i]->adjustSize();
         mStatsDisplayLabel[i]->adjustSize();
 
-        mStatsButton[i]->setEnabled(statusPoints);
+        mStatsPlus[i]->setEnabled(characterPoints);
+        mStatsMinus[i]->setEnabled(correctionPoints);
     }
-    mRemainingStatsPointsLabel->setCaption("Remaining Status Points: " +
-            toString(statusPoints));
-    mRemainingStatsPointsLabel->adjustSize();
+    mCharacterPointsLabel->setCaption("Character Points: " +
+            toString(characterPoints));
+    mCharacterPointsLabel->adjustSize();
+
+    mCorrectionPointsLabel->setCaption("Correction Points: " +
+            toString(correctionPoints));
+    mCorrectionPointsLabel->adjustSize();
 /*
     // Derived Stats Points
 
@@ -304,31 +319,53 @@ void StatusWindow::action(const gcn::ActionEvent &event)
     const std::string &eventId = event.getId();
 
     // Stats Part
-    if (eventId.length() == 3)
+    if (eventId == "STR+")
+    {
+        mPlayer->raiseAttribute(LocalPlayer::STR);
+    }
+    else if (eventId == "AGI+")
+    {
+        mPlayer->raiseAttribute(LocalPlayer::AGI);
+    }
+    else if (eventId == "DEX+")
+    {
+        mPlayer->raiseAttribute(LocalPlayer::DEX);
+    }
+    else if (eventId == "VIT+")
+    {
+        mPlayer->raiseAttribute(LocalPlayer::VIT);
+    }
+    else if (eventId == "INT+")
+    {
+        mPlayer->raiseAttribute(LocalPlayer::INT);
+    }
+    else if (eventId == "WIL+")
+    {
+        mPlayer->raiseAttribute(LocalPlayer::WIL);
+    }
+
+    else if (eventId == "STR-")
+    {
+        mPlayer->lowerAttribute(LocalPlayer::STR);
+    }
+    else if (eventId == "AGI-")
+    {
+        mPlayer->lowerAttribute(LocalPlayer::AGI);
+    }
+    else if (eventId == "DEX-")
+    {
+        mPlayer->lowerAttribute(LocalPlayer::DEX);
+    }
+    else if (eventId == "VIT-")
+    {
+        mPlayer->lowerAttribute(LocalPlayer::VIT);
+    }
+    else if (eventId == "INT-")
+    {
+        mPlayer->lowerAttribute(LocalPlayer::INT);
+    }
+    else if (eventId == "WIL-")
     {
-        if (eventId == "STR")
-        {
-            mPlayer->raiseAttribute(LocalPlayer::STR);
-        }
-        else if (eventId == "AGI")
-        {
-            mPlayer->raiseAttribute(LocalPlayer::AGI);
-        }
-        else if (eventId == "DEX")
-        {
-            mPlayer->raiseAttribute(LocalPlayer::DEX);
-        }
-        else if (eventId == "VIT")
-        {
-            mPlayer->raiseAttribute(LocalPlayer::VIT);
-        }
-        else if (eventId == "INT")
-        {
-            mPlayer->raiseAttribute(LocalPlayer::INT);
-        }
-        else if (eventId == "WIL")
-        {
-            mPlayer->raiseAttribute(LocalPlayer::WIL);
-        }
+        mPlayer->lowerAttribute(LocalPlayer::WIL);
     }
 }
diff --git a/src/gui/status.h b/src/gui/status.h
index f3475263..6e613495 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -91,14 +91,15 @@ class StatusWindow : public Window, public gcn::ActionListener
          * Stats captions.
          */
         gcn::Label *mStatsLabel[6];
-        gcn::Label *mPointsLabel[6];
         gcn::Label *mStatsDisplayLabel[6];
-        gcn::Label *mRemainingStatsPointsLabel;
+        gcn::Label *mCharacterPointsLabel;
+        gcn::Label *mCorrectionPointsLabel;
 
         /**
          * Stats buttons.
          */
-        gcn::Button *mStatsButton[6];
+        gcn::Button *mStatsPlus[6];
+        gcn::Button *mStatsMinus[6];
 };
 
 extern StatusWindow *statusWindow;
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index d01b613e..12de3de4 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -49,17 +49,21 @@ LocalPlayer::LocalPlayer():
     mAttackRange(0),
     mInventory(new Inventory),
     mEquipment(new Equipment),
-    mAttributeBase(NB_CHARACTER_ATTRIBUTES, 0),
-    mAttributeEffective(NB_CHARACTER_ATTRIBUTES, 0),
-    mAttributeIncreasePoints(0),
-    mLevel(1), mMoney(0),
+    mAttributeBase(NB_CHARACTER_ATTRIBUTES, -1),
+    mAttributeEffective(NB_CHARACTER_ATTRIBUTES, -1),
+    mExpCurrent(CHAR_SKILL_NB, -1),
+    mExpNext(CHAR_SKILL_NB, -1),
+    mCharacterPoints(-1),
+    mCorrectionPoints(-1),
+    mLevel(1), mLevelProgress(0),
+    mMoney(0),
     mTotalWeight(1), mMaxWeight(1),
     mHP(1), mMaxHP(1),
-    mXp(0),
     mTarget(NULL), mPickUpTarget(NULL),
     mTrading(false),
     mLastAction(-1), mWalkingDir(0),
-    mDestX(0), mDestY(0)
+    mDestX(0), mDestY(0),
+    mExpMessageTime(0)
 {
 }
 
@@ -74,6 +78,21 @@ void LocalPlayer::logic()
         mLastAction = -1;
     }
 
+    // Show XP messages
+    if(!mExpMessages.empty())
+    {
+        if (mExpMessageTime == 0)
+        {
+            particleEngine->addTextRiseFadeOutEffect(mExpMessages.front(),
+                                                     0, 128, 255,
+                                                     speechFont,
+                                                     mPx + 16, mPy - 16);
+            mExpMessages.pop_front();
+            mExpMessageTime = 30;
+        }
+        mExpMessageTime--;
+    }
+
     Being::logic();
 }
 
@@ -326,7 +345,6 @@ void LocalPlayer::attack()
     else {
         sound.playSfx("sfx/fist-swish.ogg");
     }
-
     Net::GameServer::Player::attack(getSpriteDirection());
 }
 
@@ -346,19 +364,35 @@ void LocalPlayer::revive()
 
 void LocalPlayer::raiseAttribute(size_t attr)
 {
+    // we assume that the server allows the change. When not we will undo it later.
+    mCharacterPoints--;
     mAttributeBase.at(attr)++;
-    // TODO: Inform the server about our desire to raise the attribute
+    Net::GameServer::Player::raiseAttribute(attr + CHAR_ATTR_BEGIN);
 }
 
-void LocalPlayer::setXp(int xp)
+void LocalPlayer::lowerAttribute(size_t attr)
 {
-    if (mMap && xp > mXp)
-    {
-        const std::string text = toString(xp - mXp) + " xp";
+    // we assume that the server allows the change. When not we will undo it later.
+    mCorrectionPoints--;
+    mCharacterPoints++;
+    mAttributeBase.at(attr)--;
+    Net::GameServer::Player::lowerAttribute(attr + CHAR_ATTR_BEGIN);
+}
 
-        // Show XP number
-        particleEngine->addTextRiseFadeOutEffect(text, hitYellowFont,
-                                                 mPx + 16, mPy - 16);
+void LocalPlayer::setExperience(int skill, int current, int next)
+{
+    int diff = current - mExpCurrent.at(skill);
+    if (mMap && mExpCurrent.at(skill) != -1 && diff > 0)
+    {
+        const std::string text = toString(diff) + " xp skill" + toString(skill);
+        mExpMessages.push_back(text);
     }
-    mXp = xp;
+
+    mExpCurrent.at(skill) = current;
+    mExpNext.at(skill) = next;
+}
+
+std::pair<int, int> LocalPlayer::getExperience(int skill)
+{
+    return std::pair<int, int> (mExpCurrent.at(skill), mExpNext.at(skill));
 }
diff --git a/src/localplayer.h b/src/localplayer.h
index 9deb2475..fca6f993 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -82,30 +82,39 @@ enum
     CHAR_ATTR_END,
     CHAR_ATTR_NB = CHAR_ATTR_END - CHAR_ATTR_BEGIN,
 
-    CHAR_SKILL_WEAPON_BEGIN = CHAR_ATTR_END,
+    CHAR_SKILL_BEGIN = CHAR_ATTR_END,
+
+    CHAR_SKILL_WEAPON_BEGIN = CHAR_SKILL_BEGIN,
     CHAR_SKILL_WEAPON_NONE = CHAR_SKILL_WEAPON_BEGIN,
     CHAR_SKILL_WEAPON_KNIFE,
     CHAR_SKILL_WEAPON_SWORD,
-    CHAR_SKILL_WEAPON_SPEAR,
-    CHAR_SKILL_WEAPON_JAVELIN,
-    CHAR_SKILL_WEAPON_ROD,
+    CHAR_SKILL_WEAPON_POLEARM,
     CHAR_SKILL_WEAPON_STAFF,
     CHAR_SKILL_WEAPON_WHIP,
-    CHAR_SKILL_WEAPON_PROJECTILE,
-    CHAR_SKILL_WEAPON_BOOMERANG,
     CHAR_SKILL_WEAPON_BOW,
-    CHAR_SKILL_WEAPON_SICKLE,
-    CHAR_SKILL_WEAPON_CROSSBOW,
-    CHAR_SKILL_WEAPON_STICK,
-    CHAR_SKILL_WEAPON_HAMMER,
+    CHAR_SKILL_WEAPON_SHOOTING,
+    CHAR_SKILL_WEAPON_MACE,
     CHAR_SKILL_WEAPON_AXE,
-    CHAR_SKILL_WEAPON_HAND_PROJECTILE,
+    CHAR_SKILL_WEAPON_THROWN,
     CHAR_SKILL_WEAPON_END,
     CHAR_SKILL_WEAPON_NB = CHAR_SKILL_WEAPON_END - CHAR_SKILL_WEAPON_BEGIN,
 
-    // Magic skills should follow.
+    CHAR_SKILL_MAGIC_BEGIN = CHAR_SKILL_WEAPON_END,
+    CHAR_SKILL_MAGIC_IAMJUSTAPLACEHOLDER = CHAR_SKILL_MAGIC_BEGIN,
+    // add magic skills here
+    CHAR_SKILL_MAGIC_END,
+    CHAR_SKILL_MAGIC_NB = CHAR_SKILL_MAGIC_END - CHAR_SKILL_MAGIC_BEGIN,
+
+    CHAR_SKILL_CRAFT_BEGIN = CHAR_SKILL_MAGIC_END,
+    CHAR_SKILL_CRAFT_IAMJUSTAPLACEHOLDER = CHAR_SKILL_CRAFT_BEGIN,
+    // add crafting skills here
+    CHAR_SKILL_CRAFT_END,
+    CHAR_SKILL_CRAFT_NB = CHAR_SKILL_CRAFT_END - CHAR_SKILL_CRAFT_BEGIN,
+
+    CHAR_SKILL_END = CHAR_SKILL_CRAFT_END,
+    CHAR_SKILL_NB = CHAR_SKILL_END - CHAR_SKILL_BEGIN,
 
-    NB_CHARACTER_ATTRIBUTES = CHAR_SKILL_WEAPON_END
+    NB_CHARACTER_ATTRIBUTES = CHAR_SKILL_END
 };
 
 
@@ -235,8 +244,16 @@ class LocalPlayer : public Player
          */
         void setWalkingDir(int dir);
 
+        /**
+         * Uses a character point to raise an attribute
+         */
         void raiseAttribute(size_t attr);
 
+        /**
+         * Uses a correction point to lower an attribute
+         */
+        void lowerAttribute(size_t attr);
+
         void toggleSit();
         void emote(Uint8 emotion);
 
@@ -245,17 +262,6 @@ 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
@@ -275,6 +281,12 @@ class LocalPlayer : public Player
         void setLevel(int value)
         { mLevel = value; }
 
+        void setLevelProgress(int percent)
+        { mLevelProgress = percent; }
+
+        int getLevelProgress() const
+        { return mLevelProgress; }
+
         int getMoney() const
         { return mMoney; }
 
@@ -299,8 +311,21 @@ class LocalPlayer : public Player
         void setAttributeEffective(int num, int value)
         { mAttributeEffective[num] = value; }
 
-        int getAttributeIncreasePoints() const
-        { return mAttributeIncreasePoints; }
+        int getCharacterPoints() const
+        { return mCharacterPoints; }
+
+        void setCharacterPoints(int n)
+        { mCharacterPoints = n; }
+
+        int getCorrectionPoints() const
+        { return mCorrectionPoints; }
+
+        void setCorrectionPoints(int n)
+        { mCorrectionPoints = n; }
+
+        void setExperience(int skill, int current, int next);
+
+        std::pair<int, int> getExperience(int skill);
 
         float mLastAttackTime; /**< Used to synchronize the charge dialog */
 
@@ -313,14 +338,17 @@ class LocalPlayer : public Player
         // Character status:
         std::vector<int> mAttributeBase;
         std::vector<int> mAttributeEffective;
-        int mAttributeIncreasePoints;
+        std::vector<int> mExpCurrent;
+        std::vector<int> mExpNext;
+        int mCharacterPoints;
+        int mCorrectionPoints;
         int mLevel;
+        int mLevelProgress;
         int mMoney;
         int mTotalWeight;
         int mMaxWeight;
         int mHP;
         int mMaxHP;
-        int mXp;            /**< Experience points. */
 
         Being *mTarget;
         FloorItem *mPickUpTarget;
@@ -330,6 +358,10 @@ 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. */
+
+        std::list<std::string> mExpMessages; /**< Queued exp messages*/
+        int mExpMessageTime;
+
 };
 
 extern LocalPlayer *player_node;
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index bbfa82a4..c83b68f1 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -215,7 +215,9 @@ LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
     tempPlayer->setGender(msg.readInt8());
     int hs = msg.readInt8(), hc = msg.readInt8();
     tempPlayer->setHairStyle(hs, hc);
-    tempPlayer->setLevel(msg.readInt8());
+    tempPlayer->setLevel(msg.readInt16());
+    tempPlayer->setCharacterPoints(msg.readInt16());
+    tempPlayer->setCorrectionPoints(msg.readInt16());
     tempPlayer->setMoney(msg.readInt32());
 
     for (int i = 0; i < 7; i++)
diff --git a/src/net/gameserver/player.cpp b/src/net/gameserver/player.cpp
index bb3567d3..67edc7ad 100644
--- a/src/net/gameserver/player.cpp
+++ b/src/net/gameserver/player.cpp
@@ -154,3 +154,17 @@ void Net::GameServer::Player::tradeWithNPC(int item, int amount)
     msg.writeInt16(amount);
     Net::GameServer::connection->send(msg);
 }
+
+void Net::GameServer::Player::raiseAttribute(int attribute)
+{
+    MessageOut msg(PGMSG_RAISE_ATTRIBUTE);
+    msg.writeInt8(attribute);
+    Net::GameServer::connection->send(msg);
+}
+
+void Net::GameServer::Player::lowerAttribute(int attribute)
+{
+    MessageOut msg(PGMSG_LOWER_ATTRIBUTE);
+    msg.writeInt8(attribute);
+    Net::GameServer::connection->send(msg);
+}
diff --git a/src/net/gameserver/player.h b/src/net/gameserver/player.h
index b5f3e6d7..7ebb2830 100644
--- a/src/net/gameserver/player.h
+++ b/src/net/gameserver/player.h
@@ -51,6 +51,8 @@ namespace Net
             void tradeItem(int slot, int amount);
             void tradeMoney(int amount);
             void tradeWithNPC(int item, int amount);
+            void raiseAttribute(int attribute);
+            void lowerAttribute(int attribute);
         }
     }
 }
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index f6f7a8fa..951d6d4e 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -29,6 +29,7 @@
 #include "../engine.h"
 #include "../localplayer.h"
 #include "../log.h"
+#include "../particle.h"
 #include "../npc.h"
 
 #include "../gui/buy.h"
@@ -90,6 +91,11 @@ PlayerHandler::PlayerHandler()
         GPMSG_PLAYER_MAP_CHANGE,
         GPMSG_PLAYER_SERVER_CHANGE,
         GPMSG_PLAYER_ATTRIBUTE_CHANGE,
+        GPMSG_PLAYER_EXP_CHANGE,
+        GPMSG_LEVELUP,
+        GPMSG_LEVEL_PROGRESS,
+        GPMSG_RAISE_ATTRIBUTE_RESPONSE,
+        GPMSG_LOWER_ATTRIBUTE_RESPONSE,
         0
     };
     handledMessages = _messages;
@@ -128,6 +134,14 @@ void PlayerHandler::handleMessage(MessageIn &msg)
                 }
                 else if (stat < NB_CHARACTER_ATTRIBUTES)
                 {
+                    if (stat >= CHAR_SKILL_BEGIN && stat < CHAR_SKILL_END
+                        && player_node->getAttributeBase(stat) < base
+                        && player_node->getAttributeBase(stat) > -1)
+                    {
+                        Particle* effect = particleEngine->addEffect("graphics/particles/skillup.particle.xml", 0, 0);
+                        player_node->controlParticle(effect);
+                    }
+
                     player_node->setAttributeBase(stat, base);
                     player_node->setAttributeEffective(stat, value);
                 }
@@ -138,6 +152,120 @@ void PlayerHandler::handleMessage(MessageIn &msg)
                 }
             }
         } break;
+
+        case GPMSG_PLAYER_EXP_CHANGE:
+        {
+            logger->log("EXP Update");
+            while (msg.getUnreadLength())
+            {
+                int skill = msg.readInt8();
+                int current = msg.readInt32();
+                int next = msg.readInt32();
+
+                if (skill < CHAR_SKILL_NB)
+                {
+                    player_node->setExperience(skill, current, next);
+                }
+                else
+                {
+                    logger->log("Warning: server wants to update experience of unknown "
+                                "skill  %d to %d / %d", skill, current, next);
+                }
+            }
+        } break;
+
+        case GPMSG_LEVELUP:
+        {
+            player_node->setLevel(msg.readInt16());
+            player_node->setCharacterPoints(msg.readInt16());
+            player_node->setCorrectionPoints(msg.readInt16());
+            Particle* effect = particleEngine->addEffect("graphics/particles/levelup.particle.xml", 0, 0);
+            player_node->controlParticle(effect);
+        } break;
+
+
+        case GPMSG_LEVEL_PROGRESS:
+        {
+            logger->log("Level Progress Update");
+            player_node->setLevelProgress(msg.readInt8());
+        } break;
+
+
+        case GPMSG_RAISE_ATTRIBUTE_RESPONSE:
+        {
+            int errCode = msg.readInt8();
+            int attrNum = msg.readInt8() - CHAR_ATTR_BEGIN;
+            switch (errCode)
+            {
+                case ATTRIBMOD_OK:
+                {
+                    // feel(acknowledgment);
+                } break;
+                case ATTRIBMOD_INVALID_ATTRIBUTE:
+                {
+                    logger->log("Warning: Server denied increase of attribute %d (unknown attribute) ", attrNum);
+                } break;
+                case ATTRIBMOD_NO_POINTS_LEFT:
+                {
+                    // when the server says "you got no points" it
+                    // has to be correct. The server is always right!
+                    // undo attribute change and set points to 0
+                    logger->log("Warning: Server denied increase of attribute %d (no points left) ", attrNum);
+                    int attrValue = player_node->getAttributeBase(attrNum) - 1;
+                    player_node->setCharacterPoints(0);
+                    player_node->setAttributeBase(attrNum, attrValue);
+                } break;
+                case ATTRIBMOD_DENIED:
+                {
+                    // undo attribute change
+                    logger->log("Warning: Server denied increase of attribute %d (reason unknown) ", attrNum);
+                    int points = player_node->getCharacterPoints() - 1;
+                    player_node->setCharacterPoints(points);
+                    int attrValue = player_node->getAttributeBase(attrNum) - 1;
+                    player_node->setAttributeBase(attrNum, attrValue);
+                } break;
+            }
+        } break;
+
+        case GPMSG_LOWER_ATTRIBUTE_RESPONSE:
+        {
+            int errCode = msg.readInt8();
+            int attrNum = msg.readInt8() - CHAR_ATTR_BEGIN;
+            switch (errCode)
+            {
+                case ATTRIBMOD_OK:
+                {
+                    // feel(acknowledgment);
+                } break;
+                case ATTRIBMOD_INVALID_ATTRIBUTE:
+                {
+                    logger->log("Warning: Server denied reduction of attribute %d (unknown attribute) ", attrNum);
+                } break;
+                case ATTRIBMOD_NO_POINTS_LEFT:
+                {
+                    // when the server says "you got no points" it
+                    // has to be correct. The server is always right!
+                    // undo attribute change and set points to 0
+                    logger->log("Warning: Server denied reduction of attribute %d (no points left) ", attrNum);
+                    int attrValue = player_node->getAttributeBase(attrNum) + 1;
+                    player_node->setCorrectionPoints(0);
+                    player_node->setAttributeBase(attrNum, attrValue);
+                    break;
+                } break;
+                case ATTRIBMOD_DENIED:
+                {
+                    // undo attribute change
+                    logger->log("Warning: Server denied reduction of attribute %d (reason unknown) ", attrNum);
+                    int charaPoints = player_node->getCharacterPoints() - 1;
+                    player_node->setCharacterPoints(charaPoints);
+                    int correctPoints = player_node->getCharacterPoints() + 1;
+                    player_node->setCorrectionPoints(correctPoints);
+                    int attrValue = player_node->getAttributeBase(attrNum) + 1;
+                    player_node->setAttributeBase(attrNum, attrValue);
+                } break;
+            }
+
+        } break;
         /*
         case SMSG_PLAYER_ARROW_MESSAGE:
             {
diff --git a/src/net/protocol.h b/src/net/protocol.h
index d8b9fcb2..e6f5869b 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -49,7 +49,7 @@ enum {
     APMSG_CHAR_CREATE_RESPONSE     = 0x0021, // B error
     PAMSG_CHAR_DELETE              = 0x0022, // B index
     APMSG_CHAR_DELETE_RESPONSE     = 0x0023, // B error
-    APMSG_CHAR_INFO                = 0x0024, // B index, S name, B gender, B hair style, B hair color, B level, W money, W*6 stats
+    APMSG_CHAR_INFO                = 0x0024, // B index, S name, B gender, B hair style, B hair color, W level, W character points, W correction points, D money, W*6 stats
     PAMSG_CHAR_SELECT              = 0x0026, // B index
     APMSG_CHAR_SELECT_RESPONSE     = 0x0027, // B error, B*32 token, S game address, W game port, S chat address, W chat port
     PAMSG_EMAIL_CHANGE             = 0x0030, // S email
@@ -83,6 +83,13 @@ enum {
     GPMSG_INVENTORY                = 0x0120, // { B slot, W item id [, B amount] }*
     GPMSG_INVENTORY_FULL           = 0x0121, // { B slot, W item id [, B amount] }*
     GPMSG_PLAYER_ATTRIBUTE_CHANGE  = 0x0130, // { B attribute, W base value, W modified value }*
+    GPMSG_PLAYER_EXP_CHANGE        = 0x0140, // { B skill, D exp got, D exp needed }*
+    GPMSG_LEVELUP                  = 0x0150, // W new level
+    GPMSG_LEVEL_PROGRESS           = 0x0151, // B percent completed to next levelup
+    PGMSG_RAISE_ATTRIBUTE          = 0x0160, // B attribute
+    GPMSG_RAISE_ATTRIBUTE_RESPONSE = 0x0161, // B error, B attribute
+    PGMSG_LOWER_ATTRIBUTE          = 0x0170, // B attribute
+    GPMSG_LOWER_ATTRIBUTE_RESPONSE = 0x0171, // B error, B attribute
     GPMSG_BEING_ENTER              = 0x0200, // B type, W being id, B action, W*2 position
                                              // player: S name, B hair style, B hair color, B gender, B item bitmask, { W item id }*
                                              // monster: W type id
@@ -183,6 +190,13 @@ enum {
     CREATE_TOO_MUCH_CHARACTERS
 };
 
+// Character attribute modification specific return value
+enum AttribmodResponseCode {
+    ATTRIBMOD_OK = ERRMSG_OK,
+    ATTRIBMOD_INVALID_ATTRIBUTE = 0x40,
+    ATTRIBMOD_NO_POINTS_LEFT,
+    ATTRIBMOD_DENIED
+};
 // Object type enumeration
 enum {
     // A simple item
diff --git a/src/net/skillhandler.cpp b/src/net/skillhandler.cpp
deleted file mode 100644
index 8a19fe45..00000000
--- a/src/net/skillhandler.cpp
+++ /dev/null
@@ -1,93 +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 "skillhandler.h"
-
-#include "messagein.h"
-#include "protocol.h"
-
-#include "../log.h"
-
-#include "../gui/chat.h"
-#include "../gui/skill.h"
-
-SkillHandler::SkillHandler()
-{
-    static const Uint16 _messages[] = {
-        0
-    };
-    handledMessages = _messages;
-}
-
-void SkillHandler::handleMessage(MessageIn &msg)
-{
-    switch (msg.getId())
-    {
-#if 0
-        case SMSG_PLAYER_SKILLS:
-            msg.readInt16();  // length
-            skillCount = (msg.getLength() - 4) / 37;
-            skillDialog->cleanList();
-
-            for (int k = 0; k < skillCount; k++)
-            {
-                Sint16 skillId = msg.readInt16();
-                msg.readInt16();  // target type
-                msg.readInt16();  // unknown
-                Sint16 level = msg.readInt16();
-                Sint16 sp = msg.readInt16();
-                msg.readInt16();  // range
-                std::string skillName = msg.readString(24);
-                Sint8 up = msg.readInt8();
-
-                if (level != 0 || up != 0)
-                {
-                    if (skillDialog->hasSkill(skillId)) {
-                        skillDialog->setSkill(skillId, level, sp);
-                    }
-                    else {
-                        skillDialog->addSkill(skillId, level, sp);
-                    }
-                }
-            }
-            break;
-
-        case SMSG_SKILL_FAILED:
-            // Action failed (ex. sit because you have not reached the
-            // right level)
-            CHATSKILL action;
-            action.skill   = msg.readInt16();
-            action.bskill  = msg.readInt16();
-            action.unused  = msg.readInt16(); // unknown
-            action.success = msg.readInt8();
-            action.reason  = msg.readInt8();
-            if (action.success != SKILL_FAILED &&
-                action.bskill == BSKILL_EMOTE)
-            {
-                logger->log("Action: %d/%d", action.bskill, action.success);
-            }
-            chatWindow->chatLog(action);
-            break;
-#endif
-    }
-}
diff --git a/src/net/skillhandler.h b/src/net/skillhandler.h
deleted file mode 100644
index 8c0653d4..00000000
--- a/src/net/skillhandler.h
+++ /dev/null
@@ -1,37 +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_NET_SKILLHANDLER_H
-#define _TMW_NET_SKILLHANDLER_H
-
-#include "messagehandler.h"
-
-class SkillHandler : public MessageHandler
-{
-    public:
-        SkillHandler();
-
-        void handleMessage(MessageIn &msg);
-};
-
-#endif
diff --git a/src/particle.cpp b/src/particle.cpp
index 93fc7893..dac8c62e 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -329,10 +329,12 @@ Particle::addTextSplashEffect(const std::string &text,
 }
 
 Particle*
-Particle::addTextRiseFadeOutEffect(const std::string &text, gcn::Font *font,
+Particle::addTextRiseFadeOutEffect(const std::string &text,
+                                   int colorR, int colorG, int colorB,
+                                   gcn::Font *font,
                                    int x, int y)
 {
-    Particle *newParticle = new TextParticle(mMap, text, 255, 255, 255, font);
+    Particle *newParticle = new TextParticle(mMap, text, colorR, colorG, colorB, font);
     newParticle->setPosition(x, y, 0);
     newParticle->setVelocity(0.0f, 0.0f, 0.5f);
     newParticle->setGravity(0.0015f);
diff --git a/src/particle.h b/src/particle.h
index 045ab9b9..0dd34065 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -123,7 +123,9 @@ class Particle : public Sprite
          * Creates a standalone text particle.
          */
         Particle*
-        addTextRiseFadeOutEffect(const std::string &text, gcn::Font *font,
+        addTextRiseFadeOutEffect(const std::string &text,
+                                 int colorR, int colorG, int colorB,
+                                 gcn::Font *font,
                                  int x, int y);
 
         /**
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index c03e42a2..5f6846ba 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -79,16 +79,14 @@ WeaponType weaponTypeFromString (std::string name, int id = 0)
     if      (name=="knife")      return WPNTYPE_KNIFE;
     else if (name=="sword")      return WPNTYPE_SWORD;
     else if (name=="polearm")    return WPNTYPE_POLEARM;
-    else if (name=="javelin")    return WPNTYPE_JAVELIN;
     else if (name=="staff")      return WPNTYPE_STAFF;
     else if (name=="whip")       return WPNTYPE_WHIP;
-    else if (name=="boomerang")  return WPNTYPE_BOOMERANG;
     else if (name=="bow")        return WPNTYPE_BOW;
-    else if (name=="sickle")     return WPNTYPE_SICKLE;
-    else if (name=="crossbow")   return WPNTYPE_CROSSBOW;
+    else if (name=="shooting")   return WPNTYPE_SHOOTING;
     else if (name=="mace")       return WPNTYPE_MACE;
     else if (name=="axe")        return WPNTYPE_AXE;
     else if (name=="thrown")     return WPNTYPE_THROWN;
+
     else return WPNTYPE_NONE;
 }
 
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index ade7f685..ad4c9797 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -60,7 +60,7 @@ void ItemInfo::setWeaponType(int type)
         case WPNTYPE_BOW:
             mAttackType = ACTION_ATTACK_BOW;
             break;
-        case WPNTYPE_SICKLE:
+        case WPNTYPE_POLEARM:
             mAttackType = ACTION_ATTACK_SWING;
             break;
         default:
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index c637b010..90675a17 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -62,19 +62,16 @@ enum ItemType
 enum WeaponType
 {
     WPNTYPE_NONE = 0,
-    WPNTYPE_KNIFE,//        1
-    WPNTYPE_SWORD,//        2
-    WPNTYPE_POLEARM,//      3
-    WPNTYPE_JAVELIN,//      4
-    WPNTYPE_STAFF,//        5
-    WPNTYPE_WHIP,//         6
-    WPNTYPE_BOOMERANG,//    7
-    WPNTYPE_BOW,//          8
-    WPNTYPE_SICKLE,//       9
-    WPNTYPE_CROSSBOW,//    10
-    WPNTYPE_MACE,//        11
-    WPNTYPE_AXE,//         12
-    WPNTYPE_THROWN//       13
+    WPNTYPE_KNIFE,
+    WPNTYPE_SWORD,
+    WPNTYPE_POLEARM,
+    WPNTYPE_STAFF,
+    WPNTYPE_WHIP,
+    WPNTYPE_BOW,
+    WPNTYPE_SHOOTING,
+    WPNTYPE_MACE,
+    WPNTYPE_AXE,
+    WPNTYPE_THROWN
 };
 
 /**
-- 
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/status.h')

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