From e8f94fe7ca5e7e7838eaa84f1792b4b42b4bada3 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 29 Sep 2006 23:59:08 +0000
Subject: Merged trunk changes from revision 2618 to 2716 into the 0.1.0
 branch.

---
 src/gui/minimap.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index db6d4f15..69c5eb6e 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -76,10 +76,10 @@ void Minimap::draw(gcn::Graphics *graphics)
                 mMapImage, getPadding(), getTitleBarHeight());
     }
 
-    Beings *beings = beingManager->getAll();
+    Beings &beings = beingManager->getAll();
     BeingIterator bi;
 
-    for (bi = beings->begin(); bi != beings->end(); bi++)
+    for (bi = beings.begin(); bi != beings.end(); bi++)
     {
         Being *being = (*bi);
         int dotSize = 1;
-- 
cgit v1.2.3-70-g09d2


From d61fdaf1932724f86a68484c4a05195ca270646e Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@gmail.com>
Date: Fri, 27 Jul 2007 22:30:19 +0000
Subject: Removed useless yet costly dynamic casts.

---
 ChangeLog                      | 11 +++++++++++
 src/gui/browserbox.cpp         |  4 ++--
 src/gui/button.cpp             |  5 ++---
 src/gui/checkbox.cpp           |  6 ++----
 src/gui/equipmentwindow.cpp    |  6 +++---
 src/gui/gui.cpp                |  5 ++---
 src/gui/itemcontainer.cpp      |  9 +++------
 src/gui/minimap.cpp            |  4 ++--
 src/gui/playerbox.cpp          |  4 ++--
 src/gui/popupmenu.cpp          |  2 +-
 src/gui/progressbar.cpp        |  5 ++---
 src/gui/radiobutton.cpp        |  2 +-
 src/gui/scrollarea.cpp         | 16 ++++++++--------
 src/gui/slider.cpp             | 12 ++++++------
 src/gui/textfield.cpp          |  2 +-
 src/gui/widgets/dropdown.cpp   | 31 +++++--------------------------
 src/gui/widgets/resizegrip.cpp |  2 +-
 src/resources/image.cpp        |  2 +-
 18 files changed, 55 insertions(+), 73 deletions(-)

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

diff --git a/ChangeLog b/ChangeLog
index b27becc3..3e617d90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-07-25  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
+
+	* src/resources/image.cpp: Added support for subimages of subimages.
+	* src/gui/equipmentwindow.cpp, src/gui/button.cpp, src/gui/slider.cpp,
+	src/gui/widgets/resizegrip.cpp, src/gui/widgets/dropdown.cpp,
+	src/gui/progressbar.cpp, src/gui/browserbox.cpp, src/gui/gui.cpp,
+	src/gui/radiobutton.cpp, src/gui/textfield.cpp, src/gui/playerbox.cpp,
+	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
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 65fdde64..4a3f2f64 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -104,7 +104,7 @@ void BrowserBox::addRow(const std::string &row)
     std::string newRow;
     BROWSER_LINK bLink;
     int idx1, idx2, idx3;
-    gcn::ImageFont *font = dynamic_cast<gcn::ImageFont*>(getFont());
+    gcn::ImageFont *font = static_cast<gcn::ImageFont*>(getFont());
 
     // Use links and user defined colors
     if (mUseLinksAndUserColors)
@@ -294,7 +294,7 @@ BrowserBox::draw(gcn::Graphics *graphics)
     unsigned int i, j;
     int x = 0, y = 0;
     int wrappedLines = 0;
-    gcn::ImageFont *font = dynamic_cast<gcn::ImageFont*>(getFont());
+    gcn::ImageFont *font = static_cast<gcn::ImageFont*>(getFont());
 
     graphics->setColor(BLACK);
     for (i = 0; i < mTextRows.size(); i++)
diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index e607b66a..83d4657c 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -111,9 +111,8 @@ Button::draw(gcn::Graphics *graphics)
         mode = 0;
     }
 
-    dynamic_cast<Graphics*>(graphics)->drawImageRect(0, 0,
-                                                     getWidth(), getHeight(),
-                                                     button[mode]);
+    static_cast<Graphics*>(graphics)->
+        drawImageRect(0, 0, getWidth(), getHeight(), button[mode]);
 
     graphics->setColor(getForegroundColor());
 
diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp
index ec7eb578..fab4780c 100644
--- a/src/gui/checkbox.cpp
+++ b/src/gui/checkbox.cpp
@@ -66,7 +66,7 @@ CheckBox::~CheckBox()
 
 void CheckBox::drawBox(gcn::Graphics* graphics)
 {
-    Image *box = NULL;
+    Image *box;
 
     if (mMarked) {
         if (isEnabled()) {
@@ -80,7 +80,5 @@ void CheckBox::drawBox(gcn::Graphics* graphics)
         box = checkBoxDisabled;
     }
 
-    if (box != NULL) {
-        dynamic_cast<Graphics*>(graphics)->drawImage(box, 2, 2);
-    }
+    static_cast<Graphics*>(graphics)->drawImage(box, 2, 2);
 }
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index ec84491e..1ae887bc 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -65,8 +65,8 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
         }
 
         image = item->getInfo().getImage();
-        dynamic_cast<Graphics*>(graphics)->drawImage(
-                image, 36 * (i % 4) + 10, 36 * (i / 4) + 25);
+        static_cast<Graphics*>(graphics)->
+            drawImage(image, 36 * (i % 4) + 10, 36 * (i / 4) + 25);
     }
 
     graphics->drawRectangle(gcn::Rectangle(160, 25, 32, 32));
@@ -77,7 +77,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
 
     image = item->getInfo().getImage();
 
-    dynamic_cast<Graphics*>(graphics)->drawImage(image, 160, 25);
+    static_cast<Graphics*>(graphics)->drawImage(image, 160, 25);
     graphics->drawText(toString(item->getQuantity()), 170, 62,
             gcn::Graphics::CENTER);
 }
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index b9b15429..8f1cc7f4 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -213,9 +213,8 @@ Gui::draw()
     if ((SDL_GetAppState() & SDL_APPMOUSEFOCUS || button & SDL_BUTTON(1))
             && mCustomCursor)
     {
-        dynamic_cast<Graphics*>(mGraphics)->drawImage(mMouseCursor,
-                                                      mouseX - 5,
-                                                      mouseY - 2);
+        static_cast<Graphics*>(mGraphics)->
+            drawImage(mMouseCursor, mouseX - 5, mouseY - 2);
     }
 
     mGraphics->popClipArea();
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index a176f226..0e5bcce9 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -105,16 +105,13 @@ ItemContainer::draw(gcn::Graphics *graphics)
         // Draw selection image below selected item
         if (mSelectedItem == item)
         {
-            dynamic_cast<Graphics*>(graphics)->drawImage(
-                    mSelImg, itemX, itemY);
+            static_cast<Graphics*>(graphics)->drawImage(mSelImg, itemX, itemY);
         }
 
         // Draw item icon
-        Image* image;
-        if ((image = item->getInfo().getImage()) != NULL)
+        if (Image *image = item->getInfo().getImage())
         {
-            dynamic_cast<Graphics*>(graphics)->drawImage(
-                    image, itemX, itemY);
+            static_cast<Graphics*>(graphics)->drawImage(image, itemX, itemY);
         }
 
         // Draw item caption
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 69c5eb6e..2720225d 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -72,8 +72,8 @@ void Minimap::draw(gcn::Graphics *graphics)
 
     if (mMapImage != NULL)
     {
-        dynamic_cast<Graphics*>(graphics)->drawImage(
-                mMapImage, getPadding(), getTitleBarHeight());
+        static_cast<Graphics*>(graphics)->
+            drawImage(mMapImage, getPadding(), getTitleBarHeight());
     }
 
     Beings &beings = beingManager->getAll();
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index fad156f1..95366bee 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -80,7 +80,7 @@ PlayerBox::draw(gcn::Graphics *graphics)
     if (mPlayer)
     {
         // Draw character
-        mPlayer->draw(dynamic_cast<Graphics*>(graphics), 40, 42);
+        mPlayer->draw(static_cast<Graphics*>(graphics), 40, 42);
     }
 }
 
@@ -92,5 +92,5 @@ PlayerBox::drawBorder(gcn::Graphics *graphics)
     w = getWidth() + bs * 2;
     h = getHeight() + bs * 2;
 
-    dynamic_cast<Graphics*>(graphics)->drawImageRect(0, 0, w, h, background);
+    static_cast<Graphics*>(graphics)->drawImageRect(0, 0, w, h, background);
 }
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index c7c77ef4..cc764d35 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -124,7 +124,7 @@ void PopupMenu::handleLink(const std::string& link)
         mBeing->getType() == Being::NPC &&
         current_npc == 0)
     {
-        dynamic_cast<NPC*>(mBeing)->talk();
+        static_cast<NPC*>(mBeing)->talk();
     }
 
     // Trade action
diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index 2bdfc856..6d18b2f7 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -93,9 +93,8 @@ void ProgressBar::logic()
 void
 ProgressBar::draw(gcn::Graphics *graphics)
 {
-    dynamic_cast<Graphics*>(graphics)->drawImageRect(0, 0,
-            getWidth(), getHeight(),
-            mBorder);
+    static_cast<Graphics*>(graphics)->
+        drawImageRect(0, 0, getWidth(), getHeight(), mBorder);
 
     // The bar
     if (mProgress > 0)
diff --git a/src/gui/radiobutton.cpp b/src/gui/radiobutton.cpp
index bbebe48f..e318116a 100644
--- a/src/gui/radiobutton.cpp
+++ b/src/gui/radiobutton.cpp
@@ -80,6 +80,6 @@ void RadioButton::drawBox(gcn::Graphics* graphics)
     }
 
     if (box != NULL) {
-        dynamic_cast<Graphics*>(graphics)->drawImage(box, 2, 2);
+        static_cast<Graphics*>(graphics)->drawImage(box, 2, 2);
     }
 }
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index 903ec95d..816f94a8 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -228,8 +228,8 @@ void ScrollArea::drawBorder(gcn::Graphics *graphics)
     int h = getHeight() + bs * 2;
 
     if (mOpaque) {
-        dynamic_cast<Graphics*>(graphics)->drawImageRect(0, 0, w, h,
-                                                         background);
+        static_cast<Graphics*>(graphics)->
+            drawImageRect(0, 0, w, h, background);
     }
 }
 
@@ -269,8 +269,8 @@ void ScrollArea::drawButton(gcn::Graphics *graphics, BUTTON_DIR dir)
             break;
     }
 
-    dynamic_cast<Graphics*>(graphics)->drawImage(
-            buttons[dir][state], dim.x, dim.y);
+    static_cast<Graphics*>(graphics)->
+        drawImage(buttons[dir][state], dim.x, dim.y);
 }
 
 void ScrollArea::drawUpButton(gcn::Graphics *graphics)
@@ -313,14 +313,14 @@ void ScrollArea::drawVMarker(gcn::Graphics *graphics)
 {
     gcn::Rectangle dim = getVerticalMarkerDimension();
 
-    dynamic_cast<Graphics*>(graphics)->drawImageRect(
-            dim.x, dim.y, dim.width, dim.height, vMarker);
+    static_cast<Graphics*>(graphics)->
+        drawImageRect(dim.x, dim.y, dim.width, dim.height, vMarker);
 }
 
 void ScrollArea::drawHMarker(gcn::Graphics *graphics)
 {
     gcn::Rectangle dim = getHorizontalMarkerDimension();
 
-    dynamic_cast<Graphics*>(graphics)->drawImageRect(
-            dim.x, dim.y, dim.width, dim.height, vMarker);
+    static_cast<Graphics*>(graphics)->
+        drawImageRect(dim.x, dim.y, dim.width, dim.height, vMarker);
 }
diff --git a/src/gui/slider.cpp b/src/gui/slider.cpp
index 98efc409..f0170a1b 100644
--- a/src/gui/slider.cpp
+++ b/src/gui/slider.cpp
@@ -109,22 +109,22 @@ void Slider::draw(gcn::Graphics *graphics)
     int x = 0;
     int y = (h - hStart->getHeight()) / 2;
 
-    dynamic_cast<Graphics*>(graphics)->drawImage(hStart, x, y);
+    static_cast<Graphics*>(graphics)->drawImage(hStart, x, y);
 
     w -= hStart->getWidth() + hEnd->getWidth();
     x += hStart->getWidth();
 
-    dynamic_cast<Graphics*>(graphics)->drawImagePattern(
-            hMid, x, y, w, hMid->getHeight());
+    static_cast<Graphics*>(graphics)->
+        drawImagePattern(hMid, x, y, w, hMid->getHeight());
 
     x += w;
-    dynamic_cast<Graphics*>(graphics)->drawImage(hEnd, x, y);
+    static_cast<Graphics*>(graphics)->drawImage(hEnd, x, y);
 
     drawMarker(graphics);
 }
 
 void Slider::drawMarker(gcn::Graphics *graphics)
 {
-    dynamic_cast<Graphics*>(graphics)->drawImage(hGrip,
-            getMarkerPosition(), (getHeight() - hGrip->getHeight()) / 2);
+    static_cast<Graphics*>(graphics)->
+       drawImage(hGrip, getMarkerPosition(), (getHeight() - hGrip->getHeight()) / 2);
 }
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index adf41a9a..ce7f6d5f 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -98,5 +98,5 @@ void TextField::drawBorder(gcn::Graphics *graphics)
     w = getWidth() + bs * 2;
     h = getHeight() + bs * 2;
 
-    dynamic_cast<Graphics*>(graphics)->drawImageRect(0, 0, w, h, skin);
+    static_cast<Graphics*>(graphics)->drawImageRect(0, 0, w, h, skin);
 }
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 0bf0e673..1176ef2a 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -145,7 +145,7 @@ void DropDown::draw(gcn::Graphics* graphics)
         graphics->setColor(highlightColor);
         graphics->drawLine(0, h, getWidth(), h);
         graphics->setColor(shadowColor);
-        graphics->drawLine(0, h + 1,getWidth(),h + 1);
+        graphics->drawLine(0, h + 1, getWidth(), h + 1);
     }
 }
 
@@ -156,34 +156,13 @@ void DropDown::drawBorder(gcn::Graphics *graphics)
     w = getWidth() + bs * 2;
     h = getHeight() + bs * 2;
 
-    dynamic_cast<Graphics*>(graphics)->drawImageRect(0, 0, w, h, skin);
+    static_cast<Graphics*>(graphics)->drawImageRect(0, 0, w, h, skin);
 }
 
 void DropDown::drawButton(gcn::Graphics *graphics)
 {
+    int height = mDroppedDown ? mOldH : getHeight();
 
-    unsigned short state = 0;
-    unsigned short dir = 0;
-    gcn::Rectangle dim;
-
-    if (mPushed)
-        state = 1;
-
-    if (mDroppedDown)
-        dir = 1;
-
-    int height;
-        if (mDroppedDown)
-        {
-            height = mOldH;
-        }
-        else
-        {
-            height = getHeight();
-        }
-        int x = getWidth() - height;
-        int y = 0;
-
-    dynamic_cast<Graphics*>(graphics)->drawImage(
-            buttons[dir][state], x, y + 1);
+    static_cast<Graphics*>(graphics)->
+        drawImage(buttons[mDroppedDown][mPushed], getWidth() - height, 1);
 }
diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp
index 50a6fce4..6be50f2c 100644
--- a/src/gui/widgets/resizegrip.cpp
+++ b/src/gui/widgets/resizegrip.cpp
@@ -61,5 +61,5 @@ ResizeGrip::~ResizeGrip()
 void
 ResizeGrip::draw(gcn::Graphics *graphics)
 {
-    dynamic_cast<Graphics*>(graphics)->drawImage(gripImage, 0, 0);
+    static_cast<Graphics*>(graphics)->drawImage(gripImage, 0, 0);
 }
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 993b0a2b..ad280eeb 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -343,5 +343,5 @@ SubImage::~SubImage()
 
 Image *SubImage::getSubImage(int x, int y, int w, int h)
 {
-    return NULL;
+    return mParent->getSubImage(mBounds.x + x, mBounds.y + y, w, h);
 }
-- 
cgit v1.2.3-70-g09d2


From c09825097c0231c57f9ac416fae0003c5d68398c Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@gmail.com>
Date: Tue, 7 Aug 2007 07:54:13 +0000
Subject: Marked most of the GUI as translatable.

---
 ChangeLog                   | 13 +++++++
 po/Makevars                 |  4 +--
 src/gui/char_select.cpp     | 82 ++++++++++++++++++++++-----------------------
 src/gui/confirm_dialog.cpp  |  5 +--
 src/gui/connection.cpp      |  6 ++--
 src/gui/equipmentwindow.cpp |  5 ++-
 src/gui/item_amount.cpp     | 12 ++++---
 src/gui/login.cpp           | 16 +++++----
 src/gui/menuwindow.cpp      | 19 ++++++-----
 src/gui/minimap.cpp         |  5 +--
 src/gui/ministatus.cpp      |  3 +-
 src/gui/npc_text.cpp        |  6 ++--
 src/gui/npclistdialog.cpp   |  8 +++--
 src/gui/ok_dialog.cpp       |  3 +-
 src/gui/popupmenu.cpp       | 25 ++++++++------
 src/gui/quitdialog.cpp      | 16 +++++----
 src/gui/register.cpp        | 47 ++++++++++++++------------
 src/gui/serverdialog.cpp    | 13 +++----
 src/gui/setup.cpp           | 15 +++++----
 src/gui/setup_audio.cpp     |  8 +++--
 src/gui/setup_joystick.cpp  | 18 +++++-----
 src/gui/setup_video.cpp     | 37 ++++++++++----------
 src/main.cpp                |  5 +--
 23 files changed, 205 insertions(+), 166 deletions(-)

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

diff --git a/ChangeLog b/ChangeLog
index cb5cb144..ef1c46c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-08-07  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
+
+	* 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, src/gui/quitdialog.cpp, src/gui/login.cpp,
+	src/gui/item_amount.cpp, src/gui/npclistdialog.cpp, src/gui/setup.cpp,
+	src/gui/char_select.cpp, src/gui/setup_audio.cpp, src/gui/npc_text.cpp,
+	src/gui/setup_video.cpp, src/gui/ministatus.cpp, src/gui/ok_dialog.cpp,
+	src/gui/confirm_dialog.cpp, src/gui/setup_joystick.cpp,
+	src/gui/serverdialog.cpp, src/gui/minimap.cpp, src/gui/popupmenu.cpp:
+	Marked as translatable.
+
 2007-08-06  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
 	* src/Makefile.am, src/utils/strprintf.h, src/utils/strprintf.cpp:
diff --git a/po/Makevars b/po/Makevars
index a72f85a3..76e72f50 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,9 +1,7 @@
 # Makefile variables for PO directory in any package using GNU gettext.
 
 # Usually the message domain is the same as the package name.
-#PACKAGE = $(PACKAGE_NAME)
-DOMAIN = $(PACKAGE)
-#VERSION = $(PACKAGE_VERSION)
+DOMAIN = tmw
 
 # These two variables depend on the location of this directory.
 subdir = po
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 128a803e..d752cdb3 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -45,6 +45,8 @@
 #include "../net/charserverhandler.h"
 #include "../net/messageout.h"
 
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
 #include "../utils/tostring.h"
 
 // Defined in main.cpp, used here for setting the char create dialog
@@ -63,8 +65,8 @@ class CharDeleteConfirm : public ConfirmDialog
 };
 
 CharDeleteConfirm::CharDeleteConfirm(CharSelectDialog *m):
-    ConfirmDialog("Confirm",
-                  "Are you sure you want to delete this character?", m),
+    ConfirmDialog(_("Confirm"),
+                  _("Are you sure you want to delete this character?"), m),
     master(m)
 {
 }
@@ -80,21 +82,21 @@ void CharDeleteConfirm::action(const gcn::ActionEvent &event)
 
 CharSelectDialog::CharSelectDialog(LockedArray<LocalPlayer*> *charInfo,
                                    LoginData *loginData):
-    Window("Select Character"),
+    Window(_("Select Character")),
     mCharInfo(charInfo), mCharSelected(false), mLoginData(loginData)
 {
 
-    mSelectButton = new Button("Ok", "ok", this);
-    mCancelButton = new Button("Cancel", "cancel", this);
-    mNewCharButton = new Button("New", "new", this);
-    mDelCharButton = new Button("Delete", "delete", this);
-    mPreviousButton = new Button("Previous", "previous", this);
-    mNextButton = new Button("Next", "next", this);
-    mUnRegisterButton = new Button("Unregister", "unregister", this);
-
-    mNameLabel = new gcn::Label("Name");
-    mLevelLabel = new gcn::Label("Level");
-    mMoneyLabel = new gcn::Label("Money");
+    mSelectButton = new Button(_("Ok"), "ok", this);
+    mCancelButton = new Button(_("Cancel"), "cancel", this);
+    mNewCharButton = new Button(_("New"), "new", this);
+    mDelCharButton = new Button(_("Delete"), "delete", this);
+    mPreviousButton = new Button(_("Previous"), "previous", this);
+    mNextButton = new Button(_("Next"), "next", this);
+    mUnRegisterButton = new Button(_("Unregister"), "unregister", this);
+
+    mNameLabel = new gcn::Label(strprintf(_("Name: %s"), ""));
+    mLevelLabel = new gcn::Label(strprintf(_("Level: %d"), 0));
+    mMoneyLabel = new gcn::Label(strprintf(_("Money: %d"), 0));
     mPlayerBox = new PlayerBox();
 
     int w = 195;
@@ -198,9 +200,9 @@ void CharSelectDialog::updatePlayerInfo()
 
     if (pi)
     {
-        mNameLabel->setCaption(pi->getName());
-        mLevelLabel->setCaption("Lvl: " + toString(pi->getLevel()));
-        mMoneyLabel->setCaption("Money: " + toString(pi->getMoney()));
+        mNameLabel->setCaption(strprintf(_("Name: %s"), pi->getName().c_str()));
+        mLevelLabel->setCaption(strprintf(_("Level: %d"), pi->getLevel()));
+        mMoneyLabel->setCaption(strprintf(_("Money: %d"), pi->getMoney()));
         if (!mCharSelected)
         {
             mNewCharButton->setEnabled(false);
@@ -209,9 +211,9 @@ void CharSelectDialog::updatePlayerInfo()
         }
     }
     else {
-        mNameLabel->setCaption("Name");
-        mLevelLabel->setCaption("Level");
-        mMoneyLabel->setCaption("Money");
+        mNameLabel->setCaption(strprintf(_("Name: %s"), ""));
+        mLevelLabel->setCaption(strprintf(_("Level: %d"), 0));
+        mMoneyLabel->setCaption(strprintf(_("Money: %d"), 0));
         mNewCharButton->setEnabled(true);
         mDelCharButton->setEnabled(false);
         mSelectButton->setEnabled(false);
@@ -259,30 +261,30 @@ std::string CharSelectDialog::getName()
 }
 
 CharCreateDialog::CharCreateDialog(Window *parent, int slot):
-    Window("Create Character", true, parent), mSlot(slot)
+    Window(_("Create Character"), true, parent), mSlot(slot)
 {
     mPlayer = new Player(0, 0, NULL);
     mPlayer->setHairStyle(rand() % NR_HAIR_STYLES);
     mPlayer->setHairColor(rand() % NR_HAIR_COLORS);
 
     mNameField = new TextField("");
-    mNameLabel = new gcn::Label("Name:");
+    mNameLabel = new gcn::Label(_("Name:"));
     mNextHairColorButton = new Button(">", "nextcolor", this);
     mPrevHairColorButton = new Button("<", "prevcolor", this);
-    mHairColorLabel = new gcn::Label("Hair Color:");
+    mHairColorLabel = new gcn::Label(_("Hair Color:"));
     mNextHairStyleButton = new Button(">", "nextstyle", this);
     mPrevHairStyleButton = new Button("<", "prevstyle", this);
-    mHairStyleLabel = new gcn::Label("Hair Style:");
-    mCreateButton = new Button("Create", "create", this);
-    mCancelButton = new Button("Cancel", "cancel", this);
+    mHairStyleLabel = new gcn::Label(_("Hair Style:"));
+    mCreateButton = new Button(_("Create"), "create", this);
+    mCancelButton = new Button(_("Cancel"), "cancel", this);
     mPlayerBox = new PlayerBox(mPlayer);
-    mAttributeLabel[0] = new gcn::Label("Strength:");
-    mAttributeLabel[1] = new gcn::Label("Agility:");
-    mAttributeLabel[2] = new gcn::Label("Dexterity:");
-    mAttributeLabel[3] = new gcn::Label("Vitality:");
-    mAttributeLabel[4] = new gcn::Label("Intelligence:");
-    mAttributeLabel[5] = new gcn::Label("Willpower:");
-    mAttributeLabel[6] = new gcn::Label("Charisma:");
+    mAttributeLabel[0] = new gcn::Label(_("Strength:"));
+    mAttributeLabel[1] = new gcn::Label(_("Agility:"));
+    mAttributeLabel[2] = new gcn::Label(_("Dexterity:"));
+    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++)
     {
         mAttributeLabel[i]->setWidth(70);
@@ -290,7 +292,7 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot):
         mAttributeValue[i] = new gcn::Label("1");
     };
 
-    mAttributesLeft = new gcn::Label("Please distribute # points");
+    mAttributesLeft = new gcn::Label(strprintf(_("Please distribute %d points"), 99));
 
     mNameField->setActionEventId("create");
 
@@ -382,8 +384,8 @@ CharCreateDialog::action(const gcn::ActionEvent &event)
             );
         }
         else {
-            new OkDialog("Error",
-                    "Your name needs to be at least 4 characters.", this);
+            new OkDialog(_("Error"),
+                    _("Your name needs to be at least 4 characters."), this);
         }
     }
     else if (event.getId() == "cancel") {
@@ -428,7 +430,7 @@ void CharCreateDialog::UpdateSliders()
     int pointsLeft = 70 - getDistributedPoints();
     if (pointsLeft == 0)
     {
-        mAttributesLeft->setCaption("Character stats OK");
+        mAttributesLeft->setCaption(_("Character stats OK"));
         mCreateButton->setEnabled(true);
     }
     else
@@ -436,13 +438,11 @@ void CharCreateDialog::UpdateSliders()
         mCreateButton->setEnabled(false);
         if (pointsLeft > 0)
         {
-            mAttributesLeft->setCaption(std::string("Please distribute " +
-                                        toString(pointsLeft) + " points"));
+            mAttributesLeft->setCaption(strprintf(_("Please distribute %d points"), pointsLeft));
         }
         else
         {
-            mAttributesLeft->setCaption(std::string("Please remove " +
-                                        toString(-pointsLeft) + " points"));
+            mAttributesLeft->setCaption(strprintf(_("Please remove %d points"), -pointsLeft));
         }
     }
 
diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp
index 0ff8be17..65ca27f7 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirm_dialog.cpp
@@ -27,14 +27,15 @@
 
 #include "button.h"
 
+#include "../utils/gettext.h"
 
 ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg,
         Window *parent):
     Window(title, true, parent)
 {
     gcn::Label *textLabel = new gcn::Label(msg);
-    gcn::Button *yesButton = new Button("Yes", "yes", this);
-    gcn::Button *noButton = new Button("No", "no", this);
+    gcn::Button *yesButton = new Button(_("Yes"), "yes", this);
+    gcn::Button *noButton = new Button(_("No"), "no", this);
 
     int w = textLabel->getWidth() + 20;
     int inWidth = yesButton->getWidth() + noButton->getWidth() + 5;
diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index 3627689a..17b397ba 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.cpp
@@ -32,6 +32,8 @@
 
 #include "../main.h"
 
+#include "../utils/gettext.h"
+
 namespace {
     struct ConnectionActionListener : public gcn::ActionListener
     {
@@ -54,10 +56,10 @@ ConnectionDialog::ConnectionDialog(unsigned char previousState):
     ConnectionActionListener *connectionListener =
         new ConnectionActionListener(previousState);
 
-    Button *cancelButton = new Button("Cancel", "cancelButton",
+    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...");
+    gcn::Label *label = new gcn::Label(_("Connecting..."));
 
     cancelButton->setPosition(5, 100 - 5 - cancelButton->getHeight());
     mProgressBar->setPosition(5, cancelButton->getY() - 25);
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 27c97ea0..2ee57cd9 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -31,12 +31,11 @@
 #include "../resources/iteminfo.h"
 #include "../resources/resourcemanager.h"
 
-#include "../utils/tostring.h"
+#include "../utils/gettext.h"
 
 EquipmentWindow::EquipmentWindow(Equipment *equipment):
-    Window("Equipment"), mEquipment(equipment)
+    Window(_("Equipment")), mEquipment(equipment)
 {
-    setWindowName("Equipment");
     setDefaultSize(5, 230, 200, 120);
     loadWindowState();
 }
diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp
index f72462f9..2e3ac4ad 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.cpp
@@ -31,8 +31,10 @@
 #include "../item.h"
 #include "../localplayer.h"
 
+#include "../utils/gettext.h"
+
 ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
-    Window("Select amount of items to drop.", true, parent),
+    Window("", true, parent),
     mItem(item)
 {
     // New labels
@@ -41,8 +43,8 @@ ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
     // New buttons
     Button *minusButton = new Button("-", "Minus", this);
     Button *plusButton = new Button("+", "Plus", this);
-    Button *okButton = new Button("Okay", "Drop", this);
-    Button *cancelButton = new Button("Cancel", "Cancel", this);
+    Button *okButton = new Button(_("Ok"), "Drop", this);
+    Button *cancelButton = new Button(_("Cancel"), "Cancel", this);
     mItemAmountSlide = new Slider(1.0, mItem->getQuantity());
 
     mItemAmountTextBox->setRange(1, mItem->getQuantity());
@@ -74,11 +76,11 @@ ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
 
     switch (usage) {
         case AMOUNT_TRADE_ADD:
-            setCaption("Select amount of items to trade.");
+            setCaption(_("Select amount of items to trade."));
             okButton->setActionEventId("AddTrade");
             break;
         case AMOUNT_ITEM_DROP:
-            setCaption("Select amount of items to drop.");
+            setCaption(_("Select amount of items to drop."));
             okButton->setActionEventId("Drop");
             break;
         default:
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 15ec6314..fccfc05a 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -36,17 +36,19 @@
 #include "passwordfield.h"
 #include "textfield.h"
 
+#include "../utils/gettext.h"
+
 LoginDialog::LoginDialog(LoginData *loginData):
-    Window("Login"), mLoginData(loginData)
+    Window(_("Login")), mLoginData(loginData)
 {
-    gcn::Label *userLabel = new gcn::Label("Name:");
-    gcn::Label *passLabel = new gcn::Label("Password:");
+    gcn::Label *userLabel = new gcn::Label(_("Name:"));
+    gcn::Label *passLabel = new gcn::Label(_("Password:"));
     mUserField = new TextField(mLoginData->username);
     mPassField = new PasswordField(mLoginData->password);
-    mKeepCheck = new CheckBox("Keep", mLoginData->remember);
-    mOkButton = new Button("OK", "ok", this);
-    mCancelButton = new Button("Cancel", "cancel", this);
-    mRegisterButton = new Button("Register", "register", this);
+    mKeepCheck = new CheckBox(_("Keep"), mLoginData->remember);
+    mOkButton = new Button(_("Ok"), "ok", this);
+    mCancelButton = new Button(_("Cancel"), "cancel", this);
+    mRegisterButton = new Button(_("Register"), "register", this);
 
     const int width = 220;
     const int height = 100;
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index 943cc6f0..bfa2f1f2 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -30,6 +30,8 @@
 #include "button.h"
 #include "windowcontainer.h"
 
+#include "../utils/gettext.h"
+
 extern Window *setupWindow;
 extern Window *inventoryWindow;
 extern Window *equipmentWindow;
@@ -47,28 +49,27 @@ namespace {
 }
 
 MenuWindow::MenuWindow():
-    Window("")
+    Window()
 {
     setResizable(false);
-    setWindowName("Menu");
     setMovable(false);
     setTitleBarHeight(0);
 
     // Buttons
-    const char *buttonNames[] =
+    static char const *buttonNames[] =
     {
-        "Status",
-        "Equipment",
-        "Inventory",
-        "Skills",
-        "Setup",
+        N_("Status"),
+        N_("Equipment"),
+        N_("Inventory"),
+        N_("Skills"),
+        N_("Setup"),
         0
     };
     int x = 0, y = 3, h = 0;
 
     for (const char **curBtn = buttonNames; *curBtn; curBtn++)
     {
-        gcn::Button *btn = new Button(*curBtn, *curBtn, &listener);
+        gcn::Button *btn = new Button(gettext(*curBtn), *curBtn, &listener);
         btn->setPosition(x, y);
         add(btn);
         x += btn->getWidth() + 3;
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 2720225d..03a37e29 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -29,11 +29,12 @@
 
 #include "../resources/image.h"
 
+#include "../utils/gettext.h"
+
 Minimap::Minimap():
-    Window("Map"),
+    Window(_("MiniMap")),
     mMapImage(NULL)
 {
-    setWindowName("MiniMap");
     setDefaultSize(5, 25, 100, 100);
     loadWindowState();
 }
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 9a4c2273..3742be64 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -35,9 +35,8 @@
 #include "../utils/tostring.h"
 
 MiniStatusWindow::MiniStatusWindow():
-    Window("")
+    Window()
 {
-    setWindowName("MiniStatus");
     setResizable(false);
     setMovable(false);
     setTitleBarHeight(0);
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 2dd223bd..023307a7 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -31,13 +31,15 @@
 
 #include "../npc.h"
 
+#include "../utils/gettext.h"
+
 NpcTextDialog::NpcTextDialog():
-    Window("NPC")
+    Window(_("NPC"))
 {
     mTextBox = new TextBox();
     mTextBox->setEditable(false);
     gcn::ScrollArea *scrollArea = new ScrollArea(mTextBox);
-    Button *okButton = new Button("OK", "ok", this);
+    Button *okButton = new Button(_("Ok"), "ok", this);
 
     setContentSize(260, 175);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 1bcdc8ff..487bdf60 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -31,13 +31,15 @@
 
 #include "../npc.h"
 
+#include "../utils/gettext.h"
+
 NpcListDialog::NpcListDialog():
-    Window("NPC")
+    Window(_("NPC"))
 {
     mItemList = new ListBox(this);
     ScrollArea *scrollArea = new ScrollArea(mItemList);
-    Button *okButton = new Button("OK", "ok", this);
-    Button *cancelButton = new Button("Cancel", "cancel", this);
+    Button *okButton = new Button(_("Ok"), "ok", this);
+    Button *cancelButton = new Button(_("Cancel"), "cancel", this);
 
     setContentSize(260, 175);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index ca9d2a7b..37d66353 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -27,13 +27,14 @@
 
 #include "button.h"
 
+#include "../utils/gettext.h"
 
 OkDialog::OkDialog(const std::string &title, const std::string &msg,
         Window *parent):
     Window(title, true, parent)
 {
     gcn::Label *textLabel = new gcn::Label(msg);
-    gcn::Button *okButton = new Button("Ok", "ok", this);
+    gcn::Button *okButton = new Button(_("Ok"), "ok", this);
 
     int w = textLabel->getWidth() + 20;
     int h = textLabel->getHeight() + 25 + okButton->getHeight();
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index f308bbfd..9b1ce409 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -42,6 +42,9 @@
 #include "../resources/iteminfo.h"
 #include "../resources/itemdb.h"
 
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
+
 extern std::string tradePartnerName;
 
 PopupMenu::PopupMenu():
@@ -74,9 +77,9 @@ void PopupMenu::showPopup(int x, int y, Being *being)
                 // Players can be traded with. Later also attack, follow and
                 // add as buddy will be options in this menu.
                 const std::string &name = mBeing->getName();
-                mBrowserBox->addRow("@@trade|Trade With " + name + "@@");
+                mBrowserBox->addRow(strprintf(_("@@trade|Trade With %s@@"), name.c_str()));
 
-                mBrowserBox->addRow("@@attack|Attack " + name + "@@");
+                mBrowserBox->addRow(strprintf(_("@@attack|Attack %s@@"), name.c_str()));
                 //mBrowserBox->addRow("@@follow|Follow " + name + "@@");
                 //mBrowserBox->addRow("@@buddy|Add " + name + " to Buddy List@@");
             }
@@ -85,7 +88,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
         case Being::NPC:
             // NPCs can be talked to (single option, candidate for removal
             // unless more options would be added)
-            mBrowserBox->addRow("@@talk|Talk To NPC@@");
+            mBrowserBox->addRow(_("@@talk|Talk To NPC@@"));
             break;
 
         default:
@@ -95,7 +98,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
 
     //browserBox->addRow("@@look|Look To@@");
     mBrowserBox->addRow("##3---");
-    mBrowserBox->addRow("@@cancel|Cancel@@");
+    mBrowserBox->addRow(_("@@cancel|Cancel@@"));
 
     showPopup(x, y);
 }
@@ -107,11 +110,11 @@ void PopupMenu::showPopup(int x, int y, FloorItem *floorItem)
 
     // Floor item can be picked up (single option, candidate for removal)
     std::string name = ItemDB::get(mFloorItem->getItemId()).getName();
-    mBrowserBox->addRow("@@pickup|Pick Up " + name + "@@");
+    mBrowserBox->addRow(strprintf(_("@@pickup|Pick Up %s@@"), name.c_str()));
 
     //browserBox->addRow("@@look|Look To@@");
     mBrowserBox->addRow("##3---");
-    mBrowserBox->addRow("@@cancel|Cancel@@");
+    mBrowserBox->addRow(_("@@cancel|Cancel@@"));
 
     showPopup(x, y);
 }
@@ -214,15 +217,15 @@ void PopupMenu::showPopup(int x, int y, Item *item)
 
     if (item->isEquipment())
     {
-        mBrowserBox->addRow("@@use|Equip@@");
+        mBrowserBox->addRow(_("@@use|Equip@@"));
     }
     else
-        mBrowserBox->addRow("@@use|Use@@");
+        mBrowserBox->addRow(_("@@use|Use@@"));
 
-    mBrowserBox->addRow("@@drop|Drop@@");
-    mBrowserBox->addRow("@@description|Description@@");
+    mBrowserBox->addRow(_("@@drop|Drop@@"));
+    mBrowserBox->addRow(_("@@description|Description@@"));
     mBrowserBox->addRow("##3---");
-    mBrowserBox->addRow("@@cancel|Cancel@@");
+    mBrowserBox->addRow(_("@@cancel|Cancel@@"));
 
     showPopup(x, y);
 }
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index 97be5f46..42c08080 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -31,16 +31,18 @@
 #include "button.h"
 #include "radiobutton.h"
 
+#include "../utils/gettext.h"
+
 QuitDialog::QuitDialog(bool* quitGame, QuitDialog** pointerToMe):
-    Window("Quit", true, NULL), mQuitGame(quitGame), mMyPointer(pointerToMe)
+    Window(_("Quit"), true, NULL), mQuitGame(quitGame), mMyPointer(pointerToMe)
 {
 
-    mLogoutQuit = new RadioButton("Quit", "quitdialog");
-    mForceQuit = new RadioButton("Quit", "quitdialog");
-    mSwitchAccountServer = new RadioButton("Switch server", "quitdialog");
-    mSwitchCharacter = new RadioButton("Switch character", "quitdialog");
-    mOkButton = new Button("OK", "ok", this);
-    mCancelButton = new Button("Cancel", "cancel", this);
+    mLogoutQuit = new RadioButton(_("Quit"), "quitdialog");
+    mForceQuit = new RadioButton(_("Quit"), "quitdialog");
+    mSwitchAccountServer = new RadioButton(_("Switch server"), "quitdialog");
+    mSwitchCharacter = new RadioButton(_("Switch character"), "quitdialog");
+    mOkButton = new Button(_("Ok"), "ok", this);
+    mCancelButton = new Button(_("Cancel"), "cancel", this);
 
     setContentSize(200, 91);
 
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index c8e01a6c..7e236a7d 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -41,6 +41,9 @@
 #include "textfield.h"
 #include "ok_dialog.h"
 
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
+
 void
 WrongDataNoticeListener::setTarget(gcn::TextField *textField)
 {
@@ -57,20 +60,20 @@ WrongDataNoticeListener::action(const gcn::ActionEvent &event)
 }
 
 RegisterDialog::RegisterDialog(LoginData *loginData):
-    Window("Register"),
+    Window(_("Register")),
     mWrongDataNoticeListener(new WrongDataNoticeListener()),
     mLoginData(loginData)
 {
-    gcn::Label *userLabel = new gcn::Label("Name:");
-    gcn::Label *passwordLabel = new gcn::Label("Password:");
-    gcn::Label *confirmLabel = new gcn::Label("Confirm:");
-    gcn::Label *emailLabel = new gcn::Label("Email:");
+    gcn::Label *userLabel = new gcn::Label(_("Name:"));
+    gcn::Label *passwordLabel = new gcn::Label(_("Password:"));
+    gcn::Label *confirmLabel = new gcn::Label(_("Confirm:"));
+    gcn::Label *emailLabel = new gcn::Label(_("Email:"));
     mUserField = new TextField(loginData->username);
     mPasswordField = new PasswordField(loginData->password);
     mConfirmField = new PasswordField();
     mEmailField = new TextField();
-    mRegisterButton = new Button("Register", "register", this);
-    mCancelButton = new Button("Cancel", "cancel", this);
+    mRegisterButton = new Button(_("Register"), "register", this);
+    mCancelButton = new Button(_("Cancel"), "cancel", this);
 
     const int width = 220;
     const int height = 130;
@@ -155,45 +158,45 @@ RegisterDialog::action(const gcn::ActionEvent &event)
         const std::string user = mUserField->getText();
         logger->log("RegisterDialog::register Username is %s", user.c_str());
 
-        std::stringstream errorMsg;
+        std::string errorMsg;
         int error = 0;
 
         if (user.length() < LEN_MIN_USERNAME)
         {
             // Name too short
-            errorMsg << "The username needs to be at least "
-                     << LEN_MIN_USERNAME
-                     << " characters long.";
+            errorMsg = strprintf
+                (_("The username needs to be at least %d characters long."),
+                 LEN_MIN_USERNAME);
             error = 1;
         }
         else if (user.length() > LEN_MAX_USERNAME - 1 )
         {
             // Name too long
-            errorMsg << "The username needs to be less than "
-                     << LEN_MAX_USERNAME
-                     << " characters long.";
+            errorMsg = strprintf
+                (_("The username needs to be less than %d characters long."),
+                 LEN_MAX_USERNAME);
             error = 1;
         }
         else if (mPasswordField->getText().length() < LEN_MIN_PASSWORD)
         {
             // Pass too short
-            errorMsg << "The password needs to be at least "
-                     << LEN_MIN_PASSWORD
-                     << " characters long.";
+            errorMsg = strprintf
+                (_("The password needs to be at least %d characters long."),
+                 LEN_MIN_PASSWORD);
             error = 2;
         }
         else if (mPasswordField->getText().length() > LEN_MAX_PASSWORD - 1 )
         {
             // Pass too long
-            errorMsg << "The password needs to be less than "
-                     << LEN_MAX_PASSWORD
-                     << " characters long.";
+            errorMsg = strprintf
+                (_("The password needs to be less than %d characters long."),
+                 LEN_MAX_PASSWORD);
             error = 2;
         }
         else if (mPasswordField->getText() != mConfirmField->getText())
         {
             // Password does not match with the confirmation one
-            errorMsg << "Passwords do not match.";
+            errorMsg = _("Passwords do not match.");
             error = 2;
         }
 
@@ -214,7 +217,7 @@ RegisterDialog::action(const gcn::ActionEvent &event)
                 mWrongDataNoticeListener->setTarget(this->mPasswordField);
             }
 
-            OkDialog *dlg = new OkDialog("Error", errorMsg.str());
+            OkDialog *dlg = new OkDialog(_("Error"), errorMsg);
             dlg->addActionListener(mWrongDataNoticeListener);
         }
         else
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index b47ce749..2eada7ad 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -39,6 +39,7 @@
 #include "../logindata.h"
 #include "../main.h"
 
+#include "../utils/gettext.h"
 #include "../utils/tostring.h"
 
 const short MAX_SERVERLIST = 5;
@@ -98,10 +99,10 @@ void ServersListModel::addElement(Server server)
 }
 
 ServerDialog::ServerDialog(LoginData *loginData):
-    Window("Choose your Mana World Server"), mLoginData(loginData)
+    Window(_("Choose your Mana World Server")), mLoginData(loginData)
 {
-    gcn::Label *serverLabel = new gcn::Label("Server:");
-    gcn::Label *portLabel = new gcn::Label("Port:");
+    gcn::Label *serverLabel = new gcn::Label(_("Server:"));
+    gcn::Label *portLabel = new gcn::Label(_("Port:"));
     mServerNameField = new TextField(mLoginData->hostname);
     mPortField = new TextField(toString(mLoginData->port));
 
@@ -134,8 +135,8 @@ ServerDialog::ServerDialog(LoginData *loginData):
     mDropDownListener = new DropDownListener(mServerNameField, mPortField,
             mMostUsedServersListModel, mMostUsedServersListBox);
 
-    mOkButton = new Button("OK", "ok", this);
-    mCancelButton = new Button("Cancel", "cancel", this);
+    mOkButton = new Button(_("Ok"), "ok", this);
+    mCancelButton = new Button(_("Cancel"), "cancel", this);
 
     setContentSize(200, 100);
 
@@ -201,7 +202,7 @@ ServerDialog::action(const gcn::ActionEvent &event)
         // Check login
         if (mServerNameField->getText().empty() || mPortField->getText().empty())
         {
-            OkDialog *dlg = new OkDialog("Error", "Enter the chosen server.");
+            OkDialog *dlg = new OkDialog(_("Error"), "Enter the chosen server.");
             dlg->addActionListener(mDropDownListener);
         }
         else
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 3add3a18..3ea19059 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -30,6 +30,7 @@
 #include "tabbedcontainer.h"
 
 #include "../utils/dtor.h"
+#include "../utils/gettext.h"
 
 extern Window *statusWindow;
 extern Window *minimap;
@@ -40,18 +41,18 @@ extern Window *helpWindow;
 extern Window *skillDialog;
 
 Setup::Setup():
-    Window("Setup")
+    Window(_("Setup"))
 {
     int width = 230;
     int height = 245;
     setContentSize(width, height);
 
-    const char *buttonNames[] = {
-        "Apply", "Cancel", "Reset Windows", 0
+    static char const *buttonNames[] = {
+        N_("Apply"), N_("Cancel"), N_("Reset Windows"), 0
     };
     int x = width;
     for (const char **curBtn = buttonNames; *curBtn; ++curBtn) {
-        Button *btn = new Button(*curBtn, *curBtn, this);
+        Button *btn = new Button(gettext(*curBtn), *curBtn, this);
         x -= btn->getWidth() + 5;
         btn->setPosition(x, height - btn->getHeight() - 5);
         add(btn);
@@ -64,15 +65,15 @@ Setup::Setup():
     SetupTab *tab;
 
     tab = new Setup_Video();
-    panel->addTab(tab, "Video");
+    panel->addTab(tab, _("Video"));
     mTabs.push_back(tab);
 
     tab = new Setup_Audio();
-    panel->addTab(tab, "Audio");
+    panel->addTab(tab, _("Audio"));
     mTabs.push_back(tab);
 
     tab = new Setup_Joystick();
-    panel->addTab(tab, "Joystick");
+    panel->addTab(tab, _("Joystick"));
     mTabs.push_back(tab);
 
     add(panel);
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index e5aadf80..89c21e2b 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -33,18 +33,20 @@
 #include "../log.h"
 #include "../sound.h"
 
+#include "../utils/gettext.h"
+
 Setup_Audio::Setup_Audio():
     mMusicVolume((int)config.getValue("musicVolume", 60)),
     mSfxVolume((int)config.getValue("sfxVolume", 100)),
     mSoundEnabled(config.getValue("sound", 0)),
-    mSoundCheckBox(new CheckBox("Sound", mSoundEnabled)),
+    mSoundCheckBox(new CheckBox(_("Sound"), mSoundEnabled)),
     mSfxSlider(new Slider(0, 128)),
     mMusicSlider(new Slider(0, 128))
 {
     setOpaque(false);
 
-    gcn::Label *sfxLabel = new gcn::Label("Sfx volume");
-    gcn::Label *musicLabel = new gcn::Label("Music volume");
+    gcn::Label *sfxLabel = new gcn::Label(_("Sfx volume"));
+    gcn::Label *musicLabel = new gcn::Label(_("Music volume"));
 
     mSfxSlider->setActionEventId("sfx");
     mMusicSlider->setActionEventId("music");
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 56f411d7..59cfefa4 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -30,12 +30,14 @@
 #include "../configuration.h"
 #include "../joystick.h"
 
+#include "../utils/gettext.h"
+
 extern Joystick *joystick;
 
 Setup_Joystick::Setup_Joystick():
-    mCalibrateLabel(new gcn::Label("Press the button to start calibration")),
-    mCalibrateButton(new Button("Calibrate", "calibrate", this)),
-    mJoystickEnabled(new CheckBox("Enable joystick"))
+    mCalibrateLabel(new gcn::Label(_("Press the button to start calibration"))),
+    mCalibrateButton(new Button(_("Calibrate"), "calibrate", this)),
+    mJoystickEnabled(new CheckBox(_("Enable joystick")))
 {
     setOpaque(false);
     mJoystickEnabled->setPosition(10, 10);
@@ -65,13 +67,13 @@ void Setup_Joystick::action(const gcn::ActionEvent &event)
     else
     {
         if (joystick->isCalibrating()) {
-            mCalibrateButton->setCaption("Calibrate");
-            mCalibrateLabel->setCaption(
-                    "Press the button to start calibration");
+            mCalibrateButton->setCaption(_("Calibrate"));
+            mCalibrateLabel->setCaption
+                (_("Press the button to start calibration"));
             joystick->finishCalibration();
         } else {
-            mCalibrateButton->setCaption("Stop");
-            mCalibrateLabel->setCaption("Rotate the stick");
+            mCalibrateButton->setCaption(_("Stop"));
+            mCalibrateLabel->setCaption(_("Rotate the stick"));
             joystick->startCalibration();
         }
     }
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index cd1507a7..ee46396b 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -44,6 +44,7 @@
 #include "../log.h"
 #include "../main.h"
 
+#include "../utils/gettext.h"
 #include "../utils/tostring.h"
 
 extern Graphics *graphics;
@@ -109,11 +110,11 @@ Setup_Video::Setup_Video():
     mFps((int)config.getValue("fpslimit", 60)),
     mModeListModel(new ModeListModel()),
     mModeList(new ListBox(mModeListModel)),
-    mFsCheckBox(new CheckBox("Full screen", mFullScreenEnabled)),
-    mOpenGLCheckBox(new CheckBox("OpenGL", mOpenGLEnabled)),
-    mCustomCursorCheckBox(new CheckBox("Custom cursor", mCustomCursorEnabled)),
+    mFsCheckBox(new CheckBox(_("Full screen"), mFullScreenEnabled)),
+    mOpenGLCheckBox(new CheckBox(_("OpenGL"), mOpenGLEnabled)),
+    mCustomCursorCheckBox(new CheckBox(_("Custom cursor"), mCustomCursorEnabled)),
     mAlphaSlider(new Slider(0.2, 1.0)),
-    mFpsCheckBox(new CheckBox("FPS Limit: ")),
+    mFpsCheckBox(new CheckBox(_("FPS Limit:"))),
     mFpsSlider(new Slider(10, 200)),
     mFpsField(new TextField()),
     mOriginalScrollLaziness((int) config.getValue("ScrollLaziness", 32)),
@@ -129,7 +130,7 @@ Setup_Video::Setup_Video():
     setOpaque(false);
 
     ScrollArea *scrollArea = new ScrollArea(mModeList);
-    gcn::Label *alphaLabel = new gcn::Label("Gui opacity");
+    gcn::Label *alphaLabel = new gcn::Label(_("Gui opacity"));
 
     mModeList->setEnabled(false);
 #ifndef USE_OPENGL
@@ -182,7 +183,7 @@ Setup_Video::Setup_Video():
     mOverlayDetailField->addKeyListener(this);
 
     mScrollRadiusSlider->setDimension(gcn::Rectangle(10, 120, 75, 10));
-    gcn::Label *scrollRadiusLabel = new gcn::Label("Scroll radius");
+    gcn::Label *scrollRadiusLabel = new gcn::Label(_("Scroll radius"));
     scrollRadiusLabel->setPosition(90, 120);
     mScrollRadiusField->setPosition(180, 120);
     mScrollRadiusField->setWidth(30);
@@ -190,7 +191,7 @@ Setup_Video::Setup_Video():
     mScrollRadiusSlider->setValue(mOriginalScrollRadius);
 
     mScrollLazinessSlider->setDimension(gcn::Rectangle(10, 140, 75, 10));
-    gcn::Label *scrollLazinessLabel = new gcn::Label("Scroll laziness");
+    gcn::Label *scrollLazinessLabel = new gcn::Label(_("Scroll laziness"));
     scrollLazinessLabel->setPosition(90, 140);
     mScrollLazinessField->setPosition(180, 140);
     mScrollLazinessField->setWidth(30);
@@ -198,20 +199,20 @@ Setup_Video::Setup_Video():
     mScrollLazinessSlider->setValue(mOriginalScrollLaziness);
 
     mOverlayDetailSlider->setDimension(gcn::Rectangle(10, 160, 75, 10));
-    gcn::Label *overlayDetailLabel = new gcn::Label("Ambient FX");
+    gcn::Label *overlayDetailLabel = new gcn::Label(_("Ambient FX"));
     overlayDetailLabel->setPosition(90, 160);
     mOverlayDetailField->setPosition(180, 160);
     mOverlayDetailField->setWidth(30);
     switch (mOverlayDetail)
     {
         case 0:
-            mOverlayDetailField->setCaption("off");
+            mOverlayDetailField->setCaption(_("off"));
             break;
         case 1:
-            mOverlayDetailField->setCaption("low");
+            mOverlayDetailField->setCaption(_("low"));
             break;
         case 2:
-            mOverlayDetailField->setCaption("high");
+            mOverlayDetailField->setCaption(_("high"));
             break;
     }
     mOverlayDetailSlider->setValue(mOverlayDetail);
@@ -264,8 +265,8 @@ void Setup_Video::apply()
                 }
             }
         } else {
-            new OkDialog("Switching to full screen",
-                    "Restart needed for changes to take effect.");
+            new OkDialog(_("Switching to full screen"),
+                    _("Restart needed for changes to take effect."));
         }
         config.setValue("screen", fullscreen ? 1 : 0);
     }
@@ -276,8 +277,8 @@ void Setup_Video::apply()
         config.setValue("opengl", mOpenGLCheckBox->isMarked() ? 1 : 0);
 
         // OpenGL can currently only be changed by restarting, notify user.
-        new OkDialog("Changing OpenGL",
-                "Applying change to OpenGL requires restart.");
+        new OkDialog(_("Changing OpenGL"),
+                _("Applying change to OpenGL requires restart."));
     }
 
     // FPS change
@@ -365,13 +366,13 @@ void Setup_Video::action(const gcn::ActionEvent &event)
         switch (val)
         {
             case 0:
-                mOverlayDetailField->setCaption("off");
+                mOverlayDetailField->setCaption(_("off"));
                 break;
             case 1:
-                mOverlayDetailField->setCaption("low");
+                mOverlayDetailField->setCaption(_("low"));
                 break;
             case 2:
-                mOverlayDetailField->setCaption("high");
+                mOverlayDetailField->setCaption(_("high"));
                 break;
         }
         config.setValue("OverlayDetail", val);
diff --git a/src/main.cpp b/src/main.cpp
index bde0877e..9a51f2e4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -669,8 +669,9 @@ int main(int argc, char *argv[])
 
 #if ENABLE_NLS
     setlocale(LC_MESSAGES, "");
-    bindtextdomain(PACKAGE, LOCALEDIR);
-    textdomain(PACKAGE);
+    bindtextdomain("tmw", LOCALEDIR);
+    bind_textdomain_codeset("tmw", "UTF-8");
+    textdomain("tmw");
 #endif
 
     // Initialize PhysicsFS
-- 
cgit v1.2.3-70-g09d2


From b2b13c21091b516b57b4bf3c91a313f019bf3579 Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@gmail.com>
Date: Tue, 7 Aug 2007 17:03:55 +0000
Subject: Fixed my breakage of persistent window dimensions. Cleaned a few
 things along the way.

---
 ChangeLog                   |  7 +++++++
 src/gui/chat.cpp            |  6 +++---
 src/gui/debugwindow.cpp     |  4 +---
 src/gui/equipmentwindow.cpp |  2 +-
 src/gui/help.cpp            |  1 -
 src/gui/inventorywindow.cpp | 26 +++-----------------------
 src/gui/inventorywindow.h   | 10 ++--------
 src/gui/minimap.cpp         |  2 +-
 src/gui/popupmenu.cpp       |  1 -
 src/gui/skill.cpp           |  3 +--
 src/gui/status.cpp          |  3 +--
 src/gui/trade.cpp           |  1 -
 src/gui/window.cpp          | 30 ++++++++++++++++--------------
 src/gui/window.h            | 39 ++++++++++++++++-----------------------
 14 files changed, 52 insertions(+), 83 deletions(-)

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

diff --git a/ChangeLog b/ChangeLog
index ef1c46c4..8764dde4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,13 @@
 	src/gui/confirm_dialog.cpp, src/gui/setup_joystick.cpp,
 	src/gui/serverdialog.cpp, src/gui/minimap.cpp, src/gui/popupmenu.cpp:
 	Marked as translatable.
+	* src/gui/trade.cpp, src/gui/equipmentwindow.cpp, src/gui/window.cpp,
+	src/gui/inventorywindow.h, src/gui/chat.cpp, src/gui/debugwindow.cpp,
+	src/gui/skill.cpp, src/gui/help.cpp, src/gui/inventorywindow.cpp,
+	src/gui/window.h, src/gui/status.cpp, src/gui/popupmenu.cpp,
+	src/gui/minimap.cpp: Fixed window dimensions not being restored at
+	start time. Cleaned resizing notification. Improved access control on
+	window members.
 
 2007-08-06  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 48df9efe..b5a0ec13 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -46,16 +46,16 @@
 #include "../utils/dtor.h"
 
 ChatWindow::ChatWindow():
-    Window(""),
+    Window(),
     mTmpVisible(false)
 {
-    setWindowName("Chat");
     mItems = 0;
     mItemsKeep = 20;
 
     setResizable(true);
     setDefaultSize(0, (windowContainer->getHeight() - 123), 600, 100);
-    loadWindowState();
+    setTitleBarHeight(0);
+    loadWindowState("Chat");
 
     mChatInput = new ChatInput();
     mChatInput->setActionEventId("chatinput");
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index ebf7d974..11ad37c2 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -41,11 +41,9 @@
 DebugWindow::DebugWindow():
     Window("Debug")
 {
-    setWindowName("Debug");
-
     setResizable(true);
     setDefaultSize(0, 0, 400, 100);
-    loadWindowState();
+    loadWindowState("Debug");
 
     mFPSLabel = new gcn::Label("[0 FPS]");
     mFPSLabel->setPosition(0,0);
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 2ee57cd9..0ffba5a2 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -37,7 +37,7 @@ EquipmentWindow::EquipmentWindow(Equipment *equipment):
     Window(_("Equipment")), mEquipment(equipment)
 {
     setDefaultSize(5, 230, 200, 120);
-    loadWindowState();
+    loadWindowState("Equipment");
 }
 
 EquipmentWindow::~EquipmentWindow()
diff --git a/src/gui/help.cpp b/src/gui/help.cpp
index 0b010253..87de1e2f 100644
--- a/src/gui/help.cpp
+++ b/src/gui/help.cpp
@@ -33,7 +33,6 @@ HelpWindow::HelpWindow():
     Window("Help")
 {
     setContentSize(455, 350);
-    setWindowName("Help");
 
     mBrowserBox = new BrowserBox();
     mBrowserBox->setOpaque(false);
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 2822faaa..7b199be4 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -81,7 +81,8 @@ InventoryWindow::InventoryWindow():
 
     mUseButton->setSize(48, mUseButton->getHeight());
 
-    loadWindowState();
+    loadWindowState("Inventory");
+    updateContentSize();
 }
 
 void InventoryWindow::logic()
@@ -157,17 +158,7 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
     }
 }
 
-void InventoryWindow::mouseDragged(gcn::MouseEvent &event)
-{
-    int tmpWidth = getWidth(), tmpHeight = getHeight();
-    Window::mouseDragged(event);
-    if (getWidth() != tmpWidth || getHeight() != tmpHeight)
-    {
-        updateWidgets();
-    }
-}
-
-void InventoryWindow::updateWidgets()
+void InventoryWindow::updateContentSize()
 {
     gcn::Rectangle area = getChildrenArea();
     int width = area.width;
@@ -213,14 +204,3 @@ Item* InventoryWindow::getItem()
     return mItems->getItem();
 }
 
-void InventoryWindow::loadWindowState()
-{
-    Window::loadWindowState();
-    updateWidgets();
-}
-
-void InventoryWindow::resetToDefaultSize()
-{
-    Window::resetToDefaultSize();
-    updateWidgets();
-}
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 5ee89fef..b153bb39 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -59,14 +59,8 @@ class InventoryWindow : public Window, gcn::ActionListener, SelectionListener
 
         void mouseClicked(gcn::MouseEvent &event);
 
-        void mouseDragged(gcn::MouseEvent &event);
-
         Item* getItem();
 
-        void loadWindowState();
-
-        void resetToDefaultSize();
-
         /**
          * Updates labels to currently selected item.
          *
@@ -74,11 +68,11 @@ class InventoryWindow : public Window, gcn::ActionListener, SelectionListener
          */
         void selectionChanged(const SelectionEvent &event);
 
+        void updateContentSize();    /**< Updates widgets size/position. */
+
     private:
         void updateButtons();    /**< Updates button states. */
 
-        void updateWidgets();    /**< Updates widgets size/position. */
-
         ItemContainer *mItems;
 
         gcn::Button *mUseButton, *mDropButton;
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 03a37e29..89e7eadd 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -36,7 +36,7 @@ Minimap::Minimap():
     mMapImage(NULL)
 {
     setDefaultSize(5, 25, 100, 100);
-    loadWindowState();
+    loadWindowState("MiniMap");
 }
 
 Minimap::~Minimap()
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 9b1ce409..65162d35 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -55,7 +55,6 @@ PopupMenu::PopupMenu():
 {
     setResizable(false);
     setTitleBarHeight(0);
-    mShowTitle = false;
 
     mBrowserBox = new BrowserBox();
     mBrowserBox->setPosition(4, 4);
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index c9babda2..884b3744 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -63,7 +63,6 @@ const char *skill_db[] = {
 SkillDialog::SkillDialog():
     Window("Skills")
 {
-    setWindowName("Skills");
     setDefaultSize(windowContainer->getWidth() - 255, 25, 240, 240);
 
     mSkillListBox = new ListBox(this);
@@ -84,7 +83,7 @@ SkillDialog::SkillDialog():
     mSkillListBox->addActionListener(this);
 
     setLocationRelativeTo(getParent());
-    loadWindowState();
+    loadWindowState("Skills");
 }
 
 SkillDialog::~SkillDialog()
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index c7cb80c3..8be019dd 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -37,11 +37,10 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     Window(player->getName()),
     mPlayer(player)
 {
-    setWindowName("Status");
     setResizable(true);
     setDefaultSize((windowContainer->getWidth() - 365) / 2,
                    (windowContainer->getHeight() - 255) / 2, 365, 280);
-    loadWindowState();
+    loadWindowState("Status");
 
     // ----------------------
     // Status Part
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 337bd7ea..724f6d5b 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -50,7 +50,6 @@ TradeWindow::TradeWindow():
     mMyInventory(new Inventory()),
     mPartnerInventory(new Inventory())
 {
-    setWindowName("Trade");
     setDefaultSize(115, 197, 332, 209);
 
     mAddButton = new Button("Add", "add", this);
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 5c39c04e..3e6e1bac 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -58,8 +58,6 @@ Window::Window(const std::string& caption, bool modal, Window *parent):
     gcn::Window(caption),
     mGrip(0),
     mParent(parent),
-    mWindowName("window"),
-    mShowTitle(true),
     mModal(modal),
     mResizable(false),
     mMouseResize(0),
@@ -122,16 +120,19 @@ Window::Window(const std::string& caption, bool modal, Window *parent):
 Window::~Window()
 {
     logger->log("Window::~Window(\"%s\")", getCaption().c_str());
-    const std::string &name = mWindowName;
 
-    // Saving X, Y and Width and Height for resizables in the config
-    config.setValue(name + "WinX", getX());
-    config.setValue(name + "WinY", getY());
-
-    if (mResizable)
+    std::string const &name = mConfigName;
+    if (!name.empty())
     {
-        config.setValue(name + "WinWidth", getWidth());
-        config.setValue(name + "WinHeight", getHeight());
+        // Saving X, Y and Width and Height for resizables in the config
+        config.setValue(name + "WinX", getX());
+        config.setValue(name + "WinY", getY());
+
+        if (mResizable)
+        {
+            config.setValue(name + "WinWidth", getWidth());
+            config.setValue(name + "WinHeight", getHeight());
+        }
     }
 
     instances--;
@@ -170,7 +171,7 @@ void Window::draw(gcn::Graphics *graphics)
     g->drawImageRect(0, 0, getWidth(), getHeight(), border);
 
     // Draw title
-    if (mShowTitle)
+    if (getTitleBarHeight())
     {
         graphics->setFont(getFont());
         graphics->drawText(getCaption(), 7, 5, gcn::Graphics::LEFT);
@@ -428,13 +429,13 @@ void Window::mouseDragged(gcn::MouseEvent &event)
         setDimension(newDim);
         const gcn::Rectangle area = getChildrenArea();
         mChrome->setSize(area.width, area.height);
+        updateContentSize();
     }
 }
 
-void
-Window::loadWindowState()
+void Window::loadWindowState(std::string const &name)
 {
-    const std::string &name = mWindowName;
+    mConfigName = name;
 
     setPosition((int) config.getValue(name + "WinX", getX()),
                 (int) config.getValue(name + "WinY", getY()));
@@ -465,4 +466,5 @@ void Window::resetToDefaultSize()
 {
     setPosition(mDefaultX, mDefaultY);
     setContentSize(mDefaultWidth, mDefaultHeight);
+    updateContentSize();
 }
diff --git a/src/gui/window.h b/src/gui/window.h
index 03248908..1ba23fb2 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -98,6 +98,12 @@ class Window : public gcn::Window
          */
         void setContentSize(int width, int height);
 
+        /**
+         * Called when either the user or resetToDefaultSize resizes the
+         * windows, so that the windows can manage its widgets.
+         */
+        virtual void updateContentSize() {}
+
         /**
          * Sets the width of this window.
          */
@@ -192,40 +198,28 @@ class Window : public gcn::Window
          */
         void mouseDragged(gcn::MouseEvent &event);
 
-        /**
-         * Sets the name of the window. This is not the window title.
-         */
-        void
-        setWindowName(const std::string &name) { mWindowName = name; }
-
-        /**
-         * Returns the name of the window. This is not the window title.
-         */
-        const std::string&
-        getWindowName() { return mWindowName; }
-
         /**
          * Read the x, y, and width and height for resizables in the config
-         * based on the name of the window.
+         * based on the given string.
          * That function let the values set with set{X, Y, Height, width}()
          * if no config value is found.
          * Don't forget to set these default values and resizable before
          * calling this function.
          */
-        virtual void loadWindowState();
+        void loadWindowState(std::string const &);
 
         /**
          * Set the default win pos and size.
          * (which can be different of the actual ones.)
          */
-        virtual void setDefaultSize(int defaultX, int defaultY,
-                                    int defaultWidth, int defaultHeight);
+        void setDefaultSize(int defaultX, int defaultY,
+                            int defaultWidth, int defaultHeight);
 
         /**
          * Reset the win pos and size to default.
          * Don't forget to set defaults first.
          */
-        virtual void resetToDefaultSize();
+        void resetToDefaultSize();
 
         enum ResizeHandles
         {
@@ -235,12 +229,14 @@ class Window : public gcn::Window
             LEFT   = 0x08
         };
 
-    protected:
+        /** The window container windows add themselves to. */
+        static WindowContainer *windowContainer;
+
+    private:
         GCContainer *mChrome;      /**< Contained container */
         ResizeGrip *mGrip;         /**< Resize grip */
         Window *mParent;           /**< The parent window */
-        std::string mWindowName;   /**< Name of the window */
-        bool mShowTitle;           /**< Window has a title bar */
+        std::string mConfigName;   /**< Name used for saving window-related data */
         bool mModal;               /**< Window is modal */
         bool mResizable;           /**< Window can be resized */
         int mMouseResize;          /**< Window is being resized */
@@ -254,9 +250,6 @@ class Window : public gcn::Window
         int mDefaultWidth;         /**< Default window width */
         int mDefaultHeight;        /**< Default window height */
 
-        /** The window container windows add themselves to. */
-        static WindowContainer *windowContainer;
-
         /**
          * The config listener that listens to changes relevant to all windows.
          */
-- 
cgit v1.2.3-70-g09d2


From 5c9aa34fe5f9e9c8df8afda66a231e359dc797e3 Mon Sep 17 00:00:00 2001
From: Eugenio Favalli <elvenprogrammer@gmail.com>
Date: Mon, 10 Sep 2007 20:06:33 +0000
Subject: Fixed minimap coordinates and improved look.

---
 ChangeLog           | 1 +
 src/gui/minimap.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

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

diff --git a/ChangeLog b/ChangeLog
index 4f822e23..059a806f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
 	support for True Type Fonts.
 	* po/it.po, po/LINGUAS, po/pl.po: Added Polish translation and fixed
 	Italian one.
+	* src/gui/minimap.cpp: Fixed minimap coordinates and improved look.
 
 2007-09-08  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 89e7eadd..a8e9dafd 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -83,12 +83,12 @@ void Minimap::draw(gcn::Graphics *graphics)
     for (bi = beings.begin(); bi != beings.end(); bi++)
     {
         Being *being = (*bi);
-        int dotSize = 1;
+        int dotSize = 2;
 
         switch (being->getType()) {
             case Being::LOCALPLAYER:
                 dotSize = 3;
-                graphics->setColor(gcn::Color(209, 52, 61));
+                graphics->setColor(gcn::Color(61, 209, 52));
                 break;
 
             case Being::PLAYER:
@@ -106,8 +106,8 @@ void Minimap::draw(gcn::Graphics *graphics)
         int offset = (dotSize - 1) / 2;
 
         graphics->fillRectangle(gcn::Rectangle(
-                    being->mX / 2 + getPadding() - offset,
-                    being->mY / 2 + getTitleBarHeight() - offset,
+                    being->mX / 64 + getPadding() - offset,
+                    being->mY / 64 + getTitleBarHeight() - offset,
                     dotSize, dotSize));
     }
 }
-- 
cgit v1.2.3-70-g09d2


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

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

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

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


From 1ace3a1cec2ea8490af5af0b7d131394543fea11 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 13 Apr 2008 11:41:23 +0000
Subject: Merged revisions 3915-3939,3941-3953 via svnmerge from
 https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0

........
  r3915 | crush_tmw | 2008-02-23 18:18:34 +0100 (za, 23 feb 2008) | 1 line

  Assorted content updates by QOAL.
........
  r3920 | crush_tmw | 2008-02-26 02:23:15 +0100 (di, 26 feb 2008) | 1 line

  Fixed some monster traps on southwest woodland.
........
  r3923 | umperio | 2008-02-26 22:35:37 +0100 (di, 26 feb 2008) | 1 line

  Keep minimap status. Based on a patch by Knivey.
........
  r3924 | umperio | 2008-02-26 22:47:07 +0100 (di, 26 feb 2008) | 1 line

  Added Modanung's mud tileset and applyed to some houses in Tulimshar.
........
  r3938 | crush_tmw | 2008-03-02 00:32:44 +0100 (zo, 02 mrt 2008) | 1 line

  fixed transparency issue.
........
  r3952 | umperio | 2008-03-07 10:47:40 +0100 (vr, 07 mrt 2008) | 1 line

  Added new items by Black Don, new xml definitions by Peavey.
........
  r3953 | umperio | 2008-03-07 12:13:20 +0100 (vr, 07 mrt 2008) | 1 line

  Corrected names.
........
---
 ChangeLog           | 61 ++++++++++++++++++++++++++++++++++++++++++++++-------
 src/gui/minimap.cpp |  5 -----
 2 files changed, 53 insertions(+), 13 deletions(-)

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

diff --git a/ChangeLog b/ChangeLog
index 5e311418..4c12aa32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2008-04-12  Yohann Ferreira <bertram@cegetel.net>
+2008-04-12  Yohann Ferreira  <bertram@cegetel.net>
 
 	* src/CMakeLists.txt: Fixed a compilation error using Cmake.
 
@@ -134,6 +134,27 @@
 	data/graphics/sprites/scorpion.xml: Gave the tail attack of the
 	scorpion a custom animation and a particle effect.
 
+2008-03-07  Eugenio Favalli  <elvenprogrammer@themanaworld.org>
+
+	* data/equipment.xml, data/graphics/items/armor-legs-chaps.png,
+	data/graphics/items/armour-head-cowboyblack.png,
+	data/graphics/items/armour-head-cowboywhite.png,
+	data/graphics/items/generic-snakeskin.png,
+	data/graphics/sprites/head-cowboyblack.png,
+	data/graphics/sprites/head-cowboyblack.xml,
+	data/graphics/sprites/head-cowboywhite.png,
+	data/graphics/sprites/head-cowboywhite.xml,
+	data/graphics/sprites/leg-chaps-female.png,
+	data/graphics/sprites/leg-chaps-female.xml,
+	data/graphics/sprites/leg-chaps-male.png,
+	data/graphics/sprites/leg-chaps-male.xml,
+	data/graphics/sprites/monster-snake.png,
+	data/graphics/sprites/monster-snake.xml,
+	data/graphics/sprites/npcs.png, data/items.xml, data/monsters.xml:
+	Added new items by Black Don, new xml definitions by Peavey.
+	* data/graphics/items/armor-head-cowboyblack.png,
+	data/graphics/items/armor-head-cowboywhite.png: Corrected names.
+
 2008-03-06  David Athay  <ko2fan@gmail.com>
 
 	* src/net/guildhandler.cpp, src/net/guildhandler.hpp: Fixed
@@ -141,11 +162,11 @@
 
 2008-03-05  David Athay  <ko2fan@gmail.com>
 
-	* src/game.cpp, src/gui/guildwindow.cpp: Fixed key presses during
-	text dialog in guild window and changed license to standard GPL.
+	* src/game.cpp, src/gui/guildwindow.cpp: Fixed key presses during text
+	dialog in guild window and changed license to standard GPL.
 	* src/localplayer.cpp, src/localplayer.h, src/player.cpp,
-	src/player.h, src/gui/guildwindow.cpp, src/net/guildhandler.cpp:
-	Fixed guild creation.
+	src/player.h, src/gui/guildwindow.cpp, src/net/guildhandler.cpp: Fixed
+	guild creation.
 
 2008-03-04  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
@@ -164,8 +185,13 @@
 	* src/gui/skill.cpp, src/gui/skill.h: Skill gui beautifications by
 	roderic.
 	* src/localplayer.cpp: Made skill names translateable.
-	* data/graphics/sprites/monster-maggot.xml: Made maggot attack animation
-	finite.
+	* data/graphics/sprites/monster-maggot.xml: Made maggot attack
+	animation finite.
+
+2008-03-02  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/sprites/leg-jeans-female.png: Fixed transparency
+	issue.
 
 2008-03-01  Philipp Sehmisch  <tmw@crushnet.org>
 
@@ -185,6 +211,17 @@
 	file names.
 	* po/it.po: Some fixes by Shaili.
 
+2008-02-26  Eugenio Favalli  <elvenprogrammer@themanaworld.org>
+
+	* src/gui/minimap.cpp: Keep minimap status. Based on a patch by Knivey.
+	* data/graphics/tiles/tulimshar1.png, data/maps/new_3-1.tmx: Added
+	Modanung's mud tileset and applied to some houses in Tulimshar.
+
+2008-02-26  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/maps/new_14-1.tmx: Fixed some monster traps on
+	southwest woodland.
+
 2008-02-24  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/gui/skill.cpp, src/gui/skill.h: Optical enhancements based on
@@ -194,6 +231,14 @@
 
 2008-02-23  Philipp Sehmisch  <tmw@crushnet.org>
 
+	* data/graphics/items/generic-ironore.png, data/items.xml:
+	Implemented iron ore item.
+	* data/maps/new_10-1.tmx, data/maps/new_11-1.tmx,
+	data/maps/new_12-1.tmx, data/maps/new_21-1.tmx: Map fixes by
+	QOAL.
+	* data/graphics/sprites/head-mask.xml,
+	data/graphics/sprites/head-warlordhelm.xml:
+	Animaton fixes by QOAL.
 	* data/monsters.xml: Added a 2nd attack to the scorpion to test new
 	monster AI.
 
@@ -217,7 +262,7 @@
 	* data/monsters.xml: Added attack properties to scorpions.
 	* src/gui/gui.cpp: Showing a visible error message to the user when
 	the font file can't be found.
-	
+
 2008-02-19  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* data/maps/new_22-1.tmx: Map fixes at snake dungeon by QOAL.
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index f78447cd..d205338f 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -59,13 +59,8 @@ void Minimap::setMapImage(Image *img)
 
     if (mMapImage)
     {
-        setVisible(true);
         mMapImage->setAlpha(0.7);
     }
-    else
-    {
-        setVisible(false);
-    }
 }
 
 void Minimap::draw(gcn::Graphics *graphics)
-- 
cgit v1.2.3-70-g09d2


From d3ccf6a0b97ce4189eef4fde606cf5b5f93fac14 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Tue, 1 Jul 2008 14:51:23 +0000
Subject: Ported some GUI improvements from Legend of Mazeroth (GUI skinning
 via XML files, item descriptions on mouse-over, map names in minimap window,
 speech bubbles)

---
 ChangeLog                           |  15 +++
 data/graphics/gui/default.png       | Bin 0 -> 1395 bytes
 data/graphics/gui/gui.xml           |  18 +++
 data/graphics/gui/speech_bubble.png | Bin 0 -> 2031 bytes
 data/graphics/gui/speechbubble.xml  |  18 +++
 src/being.cpp                       |  69 +++++-----
 src/being.h                         |  15 ++-
 src/engine.cpp                      |  11 ++
 src/gui/inventorywindow.cpp         |  60 ++++-----
 src/gui/inventorywindow.h           |   9 +-
 src/gui/itemcontainer.cpp           |  41 +++++-
 src/gui/itemcontainer.h             |   8 ++
 src/gui/itempopup.cpp               | 116 ++++++++++++++++
 src/gui/itempopup.h                 |  53 ++++++++
 src/gui/login.cpp                   |  21 ++-
 src/gui/minimap.cpp                 |  19 ++-
 src/gui/speechbubble.cpp            |  73 ++++++++++
 src/gui/speechbubble.h              |  47 +++++++
 src/gui/window.cpp                  | 257 +++++++++++++++++++++++++++++++-----
 src/gui/window.h                    |  10 +-
 20 files changed, 721 insertions(+), 139 deletions(-)
 create mode 100644 data/graphics/gui/default.png
 create mode 100644 data/graphics/gui/gui.xml
 create mode 100644 data/graphics/gui/speech_bubble.png
 create mode 100644 data/graphics/gui/speechbubble.xml
 create mode 100644 src/gui/itempopup.cpp
 create mode 100644 src/gui/itempopup.h
 create mode 100644 src/gui/speechbubble.cpp
 create mode 100644 src/gui/speechbubble.h

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

diff --git a/ChangeLog b/ChangeLog
index 0ef6e636..5720df66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-07-01  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/gui/window.cpp, data/gui/window.hpp, data/graphics/gui/default.png,
+	data/graphics/gui/gui.xml, data/graphics/gui/speech_bubble.png,
+	data/graphics/gui/speechbubble.xml: Added skinning support to GUI (ported from
+	Legend of Mazzeroth)
+	* src/being.cpp, src/gui/speechbubble.cpp, src/gui/speechbubble.hpp: Speech is
+	now rendered in a speech bubble (ported from Legend of Mazzeroth).
+	* src/engine.cpp: "mapname" property of map files is now used as headline of the
+	minimap window (ported from Legend of Mazzeroth).
+	* src/gui/inventorywindow.cpp, src/gui/inventorywindow.hpp,
+	src/gui/itemcontainer.cpp, src/gui/itemcontainer.h: Item descriptions are now
+	shown in a separate GUI window when the mouse cursor hovers over them
+	(ported from Legend of Mazzeroth).
+
 2008-06-27  Roderic Morris  <roderic@ccs.neu.edu>
 
 	* src/gui/skill.cpp, src/gui/skill.h, src/localplayer.cpp:
diff --git a/data/graphics/gui/default.png b/data/graphics/gui/default.png
new file mode 100644
index 00000000..4c312487
Binary files /dev/null and b/data/graphics/gui/default.png differ
diff --git a/data/graphics/gui/gui.xml b/data/graphics/gui/gui.xml
new file mode 100644
index 00000000..fe62528e
--- /dev/null
+++ b/data/graphics/gui/gui.xml
@@ -0,0 +1,18 @@
+<skinset name="Default" image="default.png">
+    <widget type="Window">
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="4" height="4" />
+		<part type="top-edge" xpos="4" ypos="0" width="3" height="4" />
+		<part type="top-right-corner" xpos="7" ypos="0" width="4" height="4" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="4" width="4" height="10" />
+		<part type="bg-quad" xpos="11" ypos="0" width="32" height="32" />
+		<part type="right-edge" xpos="7" ypos="4" width="4" height="10" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="15" width="4" height="4" />
+		<part type="bottom-edge" xpos="4" ypos="15" width="3" height="4" />
+		<part type="bottom-right-corner" xpos="7" ypos="15" width="4" height="4" />
+	</widget>
+</skinset>
\ No newline at end of file
diff --git a/data/graphics/gui/speech_bubble.png b/data/graphics/gui/speech_bubble.png
new file mode 100644
index 00000000..3e678099
Binary files /dev/null and b/data/graphics/gui/speech_bubble.png differ
diff --git a/data/graphics/gui/speechbubble.xml b/data/graphics/gui/speechbubble.xml
new file mode 100644
index 00000000..1b11ea85
--- /dev/null
+++ b/data/graphics/gui/speechbubble.xml
@@ -0,0 +1,18 @@
+<skinset name="SpeechBubble" image="speech_bubble.png">
+    <widget type="Window">
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="14" height="14" />
+		<part type="top-edge" xpos="15" ypos="0" width="1" height="14" />
+		<part type="top-right-corner" xpos="17" ypos="0" width="17" height="14" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="15" width="14" height="1" />
+		<part type="bg-quad" xpos="34" ypos="0" width="32" height="32" />
+		<part type="right-edge" xpos="17" ypos="15" width="17" height="1" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="17" width="14" height="17" />
+		<part type="bottom-edge" xpos="15" ypos="17" width="1" height="17" />
+		<part type="bottom-right-corner" xpos="17" ypos="17" width="17" height="17" />
+	</widget>
+</skinset>
\ No newline at end of file
diff --git a/src/being.cpp b/src/being.cpp
index b984708e..5fa18337 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -39,6 +39,7 @@
 #include "resources/iteminfo.h"
 
 #include "gui/gui.h"
+#include "gui/speechbubble.h"
 
 #include "utils/dtor.h"
 #include "utils/tostring.h"
@@ -67,12 +68,15 @@ Being::Being(int id, int job, Map *map):
 {
     setMap(map);
 
+    mSpeechBubble = new SpeechBubble();
+
     if (instances == 0)
     {
         // Load the emotion set
         ResourceManager *rm = ResourceManager::getInstance();
         emotionSet = rm->getImageSet("graphics/sprites/emotions.png", 30, 32);
-        if (!emotionSet) logger->error("Unable to load emotions!");
+        if (!emotionSet)
+            logger->error("Unable to load emotions!");
     }
 
     instances++;
@@ -253,20 +257,17 @@ void Being::adjustCourse(Uint16 srcX, Uint16 srcY)
     }
 }
 
-void
-Being::setDestination(Uint16 destX, Uint16 destY)
+void Being::setDestination(Uint16 destX, Uint16 destY)
 {
     adjustCourse(mX, mY, destX, destY);
 }
 
-void
-Being::clearPath()
+void Being::clearPath()
 {
     mPath.clear();
 }
 
-void
-Being::setPath(const Path &path, int mod)
+void Being::setPath(const Path &path, int mod)
 {
     mPath = path;
     mSpeedModifier = mod >= 512 ? (mod <= 2048 ? mod : 2048) : 512; // TODO: tune bounds
@@ -296,23 +297,20 @@ Being::setPath(const Path &path, int mod)
     }
 }
 
-void
-Being::setSprite(int slot, int id, const std::string &color)
+void Being::setSprite(int slot, int id, const std::string &color)
 {
     assert(slot >= BASE_SPRITE && slot < VECTOREND_SPRITE);
     mSpriteIDs[slot] = id;
     mSpriteColors[slot] = color;
 }
 
-void
-Being::setSpeech(const std::string &text, Uint32 time)
+void Being::setSpeech(const std::string &text, Uint32 time)
 {
     mSpeech = text;
     mSpeechTime = 500;
 }
 
-void
-Being::takeDamage(int amount)
+void Being::takeDamage(int amount)
 {
     gcn::Font *font;
     std::string damage = amount ? toString(amount) : "miss";
@@ -343,14 +341,12 @@ Being::takeDamage(int amount)
                                         mPx + 16, mPy + 16);
 }
 
-void
-Being::handleAttack()
+void Being::handleAttack()
 {
     setAction(Being::ATTACK);
 }
 
-void
-Being::setMap(Map *map)
+void Being::setMap(Map *map)
 {
 
     // Remove sprite from potential previous map
@@ -373,8 +369,7 @@ Being::setMap(Map *map)
     mChildParticleEffects.clear();
 }
 
-void
-Being::controlParticle(Particle *particle)
+void Being::controlParticle(Particle *particle)
 {
     if (particle)
     {
@@ -384,8 +379,7 @@ Being::controlParticle(Particle *particle)
     }
 }
 
-void
-Being::setAction(Action action, int attackType)
+void Being::setAction(Action action, int attackType)
 {
     SpriteAction currentAction = ACTION_INVALID;
     switch (action)
@@ -439,8 +433,7 @@ Being::setAction(Action action, int attackType)
 }
 
 
-void
-Being::setDirection(Uint8 direction)
+void Being::setDirection(Uint8 direction)
 {
     if (mDirection == direction)
         return;
@@ -477,8 +470,7 @@ Being::setDirection(Uint8 direction)
     }
 }
 
-void
-Being::nextStep()
+void Being::nextStep()
 {
     if (mPath.empty())
     {
@@ -513,8 +505,7 @@ Being::nextStep()
                 mSpeedModifier / (32 * 1024);
 }
 
-void
-Being::logic()
+void Being::logic()
 {
     // Determine whether the being should take another step
     if (mAction == WALK && get_elapsed_time(mWalkTime) >= mStepTime)
@@ -563,8 +554,7 @@ Being::logic()
     }
 }
 
-void
-Being::draw(Graphics *graphics, int offsetX, int offsetY) const
+void Being::draw(Graphics *graphics, int offsetX, int offsetY) const
 {
     int px = mPx + offsetX;
     int py = mPy + offsetY;
@@ -578,8 +568,7 @@ Being::draw(Graphics *graphics, int offsetX, int offsetY) const
     }
 }
 
-void
-Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
+void Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
 {
     if (!mEmotion)
         return;
@@ -588,12 +577,11 @@ Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
     const int py = mPy + offsetY - 60;
     const int emotionIndex = mEmotion - 1;
 
-    if (emotionIndex >= 0 && emotionIndex < (int) emotionSet->size())
+    if ( emotionIndex >= 0 && emotionIndex < (int) emotionSet->size() )
         graphics->drawImage(emotionSet->get(emotionIndex), px, py);
 }
 
-void
-Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
+void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
 {
     int px = mPx + offsetX;
     int py = mPy + offsetY;
@@ -601,14 +589,17 @@ Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
     // Draw speech above this being
     if (mSpeechTime > 0)
     {
-        graphics->setFont(speechFont);
-        graphics->setColor(gcn::Color(255, 255, 255));
-        graphics->drawText(mSpeech, px + 18, py - 60, gcn::Graphics::CENTER);
+        mSpeechBubble->setPosition(px - 50, py - 80 - (mSpeechBubble->getNumRows()*14) );
+        mSpeechBubble->setText( mSpeech );
+        mSpeechBubble->setVisible(true);
+    }
+    else if (mSpeechTime == 0)
+    {
+        mSpeechBubble->setVisible(false);
     }
 }
 
-Being::Type
-Being::getType() const
+Being::Type Being::getType() const
 {
     return UNKNOWN;
 }
diff --git a/src/being.h b/src/being.h
index f4cdc743..9d04f383 100644
--- a/src/being.h
+++ b/src/being.h
@@ -44,6 +44,7 @@ class Map;
 class Graphics;
 class ImageSet;
 class Particle;
+class SpeechBubble;
 
 /**
  * A position along a being's path.
@@ -115,10 +116,10 @@ class Being : public Sprite
         Uint16 mX, mY;          /**< Pixel coordinates of tile center */
         Uint8 mEmotion;         /**< Currently showing emotion */
         Uint8 mEmotionTime;     /**< Time until emotion disappears */
-        Uint16 mAttackSpeed;          /**< Attack speed */
+        Uint16 mAttackSpeed;    /**< Attack speed */
         Uint16 mWalkTime;
-        Action mAction;                 /**< Action the being is performing */
-        Uint16 mJob;                    /**< Job (player job, npc, monster, ) */
+        Action mAction;         /**< Action the being is performing */
+        Uint16 mJob;            /**< Job (player job, npc, monster, creature ) */
 
         /**
          * Constructor.
@@ -209,7 +210,7 @@ class Being : public Sprite
          * Draws the speech text above the being.
          */
         void
-        drawSpeech(Graphics *graphics, int offsetX, int offsetY);
+        drawSpeech(Graphics* graphics, int offsetX, int offsetY);
 
         /**
          * Draws the emotion picture above the being.
@@ -389,8 +390,10 @@ class Being : public Sprite
         std::list<Particle *> mChildParticleEffects;
 
     private:
-        int
-        getOffset(int step) const;
+        int getOffset(int step) const;
+
+        // Speech Bubble components
+        SpeechBubble *mSpeechBubble;
 
         Sint16 mStepX, mStepY;
         Uint16 mStepTime;
diff --git a/src/engine.cpp b/src/engine.cpp
index b38ca0a8..e4b25c02 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -91,6 +91,17 @@ void Engine::changeMap(const std::string &mapPath)
     if (newMap->hasProperty("minimap"))
     {
         mapImage = resman->getImage(newMap->getProperty("minimap"));
+
+        // Set the title for the Minimap
+        if (newMap->hasProperty("mapname"))
+        {
+            minimap->setCaption(newMap->getProperty("mapname"));
+        }
+        else
+        {
+            minimap->setCaption("Unknown");
+            logger->log("WARNING: Map file '%s' defines a minimap image but does not define a 'mapname' property", map_path.c_str());
+        }
     }
     minimap->setMapImage(mapImage);
     beingManager->setMap(newMap);
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index bd224cf0..2127442a 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -29,11 +29,13 @@
 
 #include <guichan/widgets/label.hpp>
 #include <guichan/widgets/checkbox.hpp>
+#include <guichan/widgets/textbox.hpp>
 
 #include "button.h"
 #include "gui.h"
 #include "item_amount.h"
 #include "itemcontainer.h"
+#include "itempopup.h"
 #include "scrollarea.h"
 #include "sdlinput.h"
 #include "viewport.h"
@@ -53,12 +55,14 @@ InventoryWindow::InventoryWindow():
     Window(_("Inventory")),
     mSplit(false)
 {
-    setResizable(true);
+    setResizable(false);
     setCloseButton(true);
-    setMinWidth(240);
-    setMinHeight(172);
+    // LEEOR/TODO: Since this window is not resizable, do we really need to set these
+    // values or can we drop them?
+    setMinWidth(375);
+    setMinHeight(283);
     // If you adjust these defaults, don't forget to adjust the trade window's.
-    setDefaultSize(115, 25, 368, 326);
+    setDefaultSize(115, 25, 375, 283);
     addKeyListener(this);
 
     mUseButton = new Button(_("Use"), "use", this);
@@ -70,28 +74,18 @@ InventoryWindow::InventoryWindow():
 
     mInvenScroll = new ScrollArea(mItems);
 
-    mItemNameLabel = new gcn::Label(strprintf(_("Name: %s"), ""));
-    mItemDescriptionLabel = new gcn::Label(
-        strprintf(_("Description: %s"), ""));
-    mItemEffectLabel = new gcn::Label(strprintf(_("Effect: %s"), ""));
-    mWeightLabel = new gcn::Label(
-        strprintf(_("Total Weight: %d - Maximum Weight: %d"), 0, 0));
-
-    place(0, 0, mWeightLabel, 4);
-    place(0, 1, mInvenScroll, 4).setPadding(3);
-    place(0, 2, mItemNameLabel, 4);
-    place(0, 3, mItemDescriptionLabel, 4);
-    place(0, 4, mItemEffectLabel, 4);
-    place(0, 5, mUseButton);
-    place(1, 5, mDropButton);
-    place(2, 5, mSplitButton);
+    place(0, 0, mInvenScroll, 100).setPadding(3);
+    place(0, 1, mUseButton);
+    place(1, 1, mDropButton);
+    place(2, 1, mSplitButton);
     Layout &layout = getLayout();
     layout.setColWidth(0, 48);
     layout.setColWidth(1, 48);
     layout.setColWidth(2, 48);
-    layout.setRowHeight(1, Layout::AUTO_SET);
+    layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState("Inventory");
+
 }
 
 void InventoryWindow::logic()
@@ -103,9 +97,7 @@ void InventoryWindow::logic()
     updateButtons();
 
     // Update weight information
-    mWeightLabel->setCaption(
-        strprintf(_("Total Weight: %d - Maximum Weight: %d"),
-        player_node->getTotalWeight(), player_node->getMaxWeight()));
+    // mWeightLabel->setCaption(strprintf(_("Total Weight: %d - Maximum Weight: %d"), player_node->getTotalWeight(), player_node->getMaxWeight()));
 }
 
 void InventoryWindow::action(const gcn::ActionEvent &event)
@@ -147,21 +139,13 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
 void InventoryWindow::valueChanged(const gcn::SelectionEvent &event)
 {
     Item *item = mItems->getItem();
-    ItemInfo const *info = item ? &item->getInfo() : NULL;
-
-    mItemNameLabel->setCaption(strprintf(_("Name: %s"),
-        info ? info->getName().c_str() : ""));
-    mItemEffectLabel->setCaption(strprintf(_("Effect: %s"),
-        info ? info->getEffect().c_str() : ""));
-    mItemDescriptionLabel->setCaption(strprintf(_("Description: %s"),
-        info ? info->getDescription().c_str() : ""));
 
     if (mSplit)
     {
-        if (item && !item->isEquipment() && item->getQuantity() > 1) {
+        if (item && !item->isEquipment() && item->getQuantity() > 1)
+        {
             mSplit = false;
-            new ItemAmountWindow(AMOUNT_ITEM_SPLIT, this, item,
-                (item->getQuantity() - 1));
+            new ItemAmountWindow(AMOUNT_ITEM_SPLIT, this, item, (item->getQuantity() - 1));
         }
     }
 }
@@ -174,9 +158,9 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
     {
         Item *item = mItems->getItem();
 
-        if (!item) {
+        if (!item)
             return;
-        }
+
         /* Convert relative to the window coordinates to absolute screen
          * coordinates.
          */
@@ -230,3 +214,7 @@ void InventoryWindow::keyReleased(gcn::KeyEvent &event)
             mSplit = false;
     }
 }
+InventoryWindow::~InventoryWindow()
+{
+
+}
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 01fb118c..f9ff8ea2 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -84,6 +84,11 @@ class InventoryWindow : public Window,
          */
         void valueChanged(const gcn::SelectionEvent &event);
 
+		/**
+		 * Tracks when the mouse exits the window
+		 */
+		~InventoryWindow();
+
     private:
         void updateButtons();    /**< Updates button states. */
 
@@ -93,10 +98,6 @@ class InventoryWindow : public Window,
         gcn::Button *mUseButton, *mDropButton, *mSplitButton;
 
         gcn::ScrollArea *mInvenScroll;         /**< Inventory Scroll Area. */
-        gcn::Label *mItemNameLabel;
-        gcn::Label *mItemDescriptionLabel;
-        gcn::Label *mItemEffectLabel;
-        gcn::Label *mWeightLabel;
 
         bool mSplit;
 };
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index eddb6011..4c528a16 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -65,6 +65,7 @@ ItemContainer::ItemContainer(Inventory *inventory,
     mSelectionStatus(SEL_NONE),
     mSwapItems(false)
 {
+    mItemPopup = new ItemPopup();
     setFocusable(true);
 
     ResourceManager *resman = ResourceManager::getInstance();
@@ -281,14 +282,46 @@ void ItemContainer::mouseReleased(gcn::MouseEvent &event)
     mSelectionStatus = SEL_NONE;
 }
 
-int
-ItemContainer::getSlotIndex(const int posX, const int posY) const
+
+// Show ItemTooltip
+void ItemContainer::mouseMoved(gcn::MouseEvent &event)
+{
+    Item *item = mInventory->getItem( getSlotIndex(event.getX(), event.getY() ) );
+
+    if( item )
+    {
+        mItemPopup->setPosition(getParent()->getParent()->getX() + getParent()->getParent()->getWidth(), getParent()->getParent()->getY());
+
+        mItemPopup->setItem(item);
+
+        mItemPopup->setVisible(true);
+    }
+    else
+    {
+        mItemPopup->setVisible(false);
+    }
+}
+
+
+// Show ItemTooltip
+void ItemContainer::mouseEntered(gcn::MouseEvent &event)
+{
+
+}
+
+
+// Hide ItemTooltip
+void ItemContainer::mouseExited(gcn::MouseEvent &event)
+{
+    mItemPopup->setVisible(false);
+}
+
+int ItemContainer::getSlotIndex(const int posX, const int posY) const
 {
     if (getDimension().isPointInRect(posX, posY))
     {
         // Takes into account, boxes are overlapping each other.
-        return (posY / (BOX_HEIGHT - 1)) * mGridColumns +
-                    (posX / (BOX_WIDTH - 1));
+        return (posY / (BOX_HEIGHT - 1)) * mGridColumns + (posX / (BOX_WIDTH - 1));
     }
     return Inventory::NO_SLOT_INDEX;
 }
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index fad59171..9ae5c9c2 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -29,6 +29,8 @@
 
 #include <guichan/widget.hpp>
 
+#include "itempopup.h"
+
 #include <list>
 
 class Image;
@@ -133,6 +135,10 @@ class ItemContainer : public gcn::Widget,
          */
         void keyAction();
 
+        void mouseEntered(gcn::MouseEvent &event);
+        void mouseExited(gcn::MouseEvent &event);
+        void mouseMoved(gcn::MouseEvent &event);
+
         /**
          * Moves the highlight in the direction specified.
          *
@@ -167,6 +173,8 @@ class ItemContainer : public gcn::Widget,
         bool mSwapItems;
         int mDragPosX, mDragPosY;
 
+        ItemPopup *mItemPopup;
+
         typedef std::list<gcn::SelectionListener*> SelectionListenerList;
         typedef SelectionListenerList::iterator SelectionListenerIterator;
 
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
new file mode 100644
index 00000000..cf719f9f
--- /dev/null
+++ b/src/gui/itempopup.cpp
@@ -0,0 +1,116 @@
+/*
+ *  The Legend of Mazzeroth
+ *  Copyright (C) 2008, The Legend of Mazzeroth Development Team
+ *
+ *  This file is part of The Legend of Mazzeroth based on original code
+ *  from The Mana World.
+ *
+ *  The Legend of Mazzeroth 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 Legend of Mazzeroth 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 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"
+#include <guichan/widgets/label.hpp>
+#include "widgets/layout.h"
+
+#include "gui.h"
+
+#include "../resources/image.h"
+#include "../resources/resourcemanager.h"
+#include "../resources/iteminfo.h"
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
+
+
+ItemPopup::ItemPopup()
+{
+
+    setResizable(false);
+	setTitleBarHeight(0);
+	loadSkin("graphics/gui/gui.xml");
+
+    // Item Name
+    mItemName = new gcn::Label("Label");
+    mItemName->setFont(gui->getFont());
+    mItemName->setPosition(2, 2);
+    mItemName->setWidth(getWidth() - 4);
+
+    // Item Description
+    mItemDesc = new TextBox();
+    mItemDesc->setEditable(false);
+    mItemDescScroll = new ScrollArea(mItemDesc);
+
+    mItemDescScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mItemDescScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mItemDescScroll->setDimension(gcn::Rectangle(0, 0, 196, 14));
+	mItemDescScroll->setOpaque(false);
+	mItemDescScroll->setPosition(2, 15);
+
+    // Item Effect
+	mItemEffect = new TextBox();
+	mItemEffect->setEditable(false);
+	mItemEffectScroll = new ScrollArea(mItemEffect);
+
+	mItemEffectScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mItemEffectScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+	mItemEffectScroll->setDimension(gcn::Rectangle(0, 0, 196, 14));
+	mItemEffectScroll->setOpaque(false);
+	mItemEffectScroll->setPosition(2, 35);
+
+	add(mItemName);
+	add(mItemDescScroll);
+	add(mItemEffectScroll);
+
+	setLocationRelativeTo(getParent());
+
+    // LEEOR / TODO: This causes an exception error.
+    //moveToBottom(getParent());
+
+    mItemDesc->setTextWrapped( "" );
+	mItemEffect->setTextWrapped( "" );
+}
+
+void ItemPopup::setItem(Item *item)
+{
+
+    ItemInfo const *info = item ? &item->getInfo() : NULL;
+
+    mItemName->setCaption(info->getName());
+	mItemDesc->setTextWrapped( info->getDescription() );
+	mItemEffect->setTextWrapped( info->getEffect() );
+
+    int numRowsDesc = mItemDesc->getNumberOfRows();
+	int numRowsEffect = mItemEffect->getNumberOfRows();
+
+    if(info->getEffect() == "")
+    {
+        setContentSize(200, (numRowsDesc * 14) + 30);
+    } else {
+        setContentSize(200, (numRowsDesc * 14) + (numRowsEffect*14) + 30);
+    }
+
+    mItemDescScroll->setDimension(gcn::Rectangle(2, 0, 196, numRowsDesc * 14));
+
+	mItemEffectScroll->setDimension(gcn::Rectangle(2, 0, 196, numRowsEffect * 14));
+
+	mItemDescScroll->setPosition(2, 20);
+	mItemEffectScroll->setPosition(2, (numRowsDesc * 15) + 25);
+}
+
+unsigned int ItemPopup::getNumRows()
+{
+    return mItemDesc->getNumberOfRows(), mItemEffect->getNumberOfRows();
+}
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
new file mode 100644
index 00000000..499b2e0a
--- /dev/null
+++ b/src/gui/itempopup.h
@@ -0,0 +1,53 @@
+/*
+*
+ *  The Legend of Mazzeroth
+ *  Copyright (C) 2008, The Legend of Mazzeroth Development Team
+ *
+ *  This file is part of The Legend of Mazzeroth based on original code
+ *  from The Mana World.
+ *
+ *  The Legend of Mazzeroth 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 Legend of Mazzeroth 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 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__
+#define _LOM_ITEMPOPUP_H__
+
+#include "textbox.h"
+#include "scrollarea.h"
+#include "window.h"
+
+#include "../item.h"
+
+class ItemPopup : public Window
+	{
+    public:
+
+		ItemPopup();
+
+		void setItem(Item *item);
+		unsigned int getNumRows();
+
+    private:
+		gcn::Label *mItemName;
+		TextBox *mItemDesc;
+		TextBox *mItemEffect;
+		ScrollArea *mItemDescScroll;
+		ScrollArea *mItemEffectScroll;
+
+	};
+
+#endif
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index f1b32d48..72d7ee51 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -40,14 +40,13 @@
 
 #include "../utils/gettext.h"
 
-LoginDialog::LoginDialog(LoginData *loginData):
-    Window(_("Login")), mLoginData(loginData)
+LoginDialog::LoginDialog(LoginData *loginData) : Window(_("Login")), mLoginData(loginData)
 {
     gcn::Label *userLabel = new gcn::Label(_("Name:"));
     gcn::Label *passLabel = new gcn::Label(_("Password:"));
     mUserField = new TextField(mLoginData->username);
     mPassField = new PasswordField(mLoginData->password);
-    mKeepCheck = new CheckBox(_("Keep"), mLoginData->remember);
+    mKeepCheck = new CheckBox(_("Remember Username"), mLoginData->remember);
     mOkButton = new Button(_("Ok"), "ok", this);
     mCancelButton = new Button(_("Cancel"), "cancel", this);
     mRegisterButton = new Button(_("Register"), "register", this);
@@ -74,9 +73,12 @@ LoginDialog::LoginDialog(LoginData *loginData):
     setLocationRelativeTo(getParent());
     setVisible(true);
 
-    if (mUserField->getText().empty()) {
+    if (mUserField->getText().empty())
+    {
         mUserField->requestFocus();
-    } else {
+    }
+    else
+    {
         mPassField->requestFocus();
     }
 
@@ -87,8 +89,7 @@ LoginDialog::~LoginDialog()
 {
 }
 
-void
-LoginDialog::action(const gcn::ActionEvent &event)
+void LoginDialog::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "ok" && canSubmit())
     {
@@ -116,14 +117,12 @@ LoginDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-void
-LoginDialog::keyPressed(gcn::KeyEvent &keyEvent)
+void LoginDialog::keyPressed(gcn::KeyEvent &keyEvent)
 {
     mOkButton->setEnabled(canSubmit());
 }
 
-bool
-LoginDialog::canSubmit()
+bool LoginDialog::canSubmit()
 {
     return !mUserField->getText().empty() &&
            !mPassField->getText().empty() &&
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index d205338f..4e5664d6 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -36,8 +36,11 @@ Minimap::Minimap():
     Window(_("MiniMap")),
     mMapImage(NULL)
 {
-    setDefaultSize(5, 25, 100, 100);
+    setDefaultSize(0, 0, 100, 100);
     loadWindowState("MiniMap");
+    // LEEOR: The Window class needs to modified to accept
+    // setAlignment calls.
+    setAlignment(gcn::Graphics::CENTER);
 }
 
 Minimap::~Minimap()
@@ -60,7 +63,14 @@ void Minimap::setMapImage(Image *img)
     if (mMapImage)
     {
         mMapImage->setAlpha(0.7);
+        setSize( mMapImage->getWidth() + 6, mMapImage->getHeight() + 23 );
+        setVisible(true);
     }
+    else
+    {
+        setVisible(false);
+    }
+
 }
 
 void Minimap::draw(gcn::Graphics *graphics)
@@ -69,8 +79,7 @@ void Minimap::draw(gcn::Graphics *graphics)
 
     if (mMapImage != NULL)
     {
-        static_cast<Graphics*>(graphics)->
-            drawImage(mMapImage, getPadding(), getTitleBarHeight());
+        static_cast<Graphics*>(graphics)->drawImage(mMapImage, getPadding(), getTitleBarHeight());
     }
 
     Beings &beings = beingManager->getAll();
@@ -92,6 +101,10 @@ void Minimap::draw(gcn::Graphics *graphics)
                 graphics->setColor(gcn::Color(61, 52, 209));
                 break;
 
+            case Being::NPC:
+                graphics->setColor(gcn::Color(255, 255, 0));
+                break;
+
             case Being::MONSTER:
                 graphics->setColor(gcn::Color(209, 52, 61));
                 break;
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
new file mode 100644
index 00000000..815238b9
--- /dev/null
+++ b/src/gui/speechbubble.cpp
@@ -0,0 +1,73 @@
+/*
+ *  The Legend of Mazzeroth
+ *  Copyright (C) 2008, The Legend of Mazzeroth Development Team
+ *
+ *  This file is part of The Legend of Mazzeroth based on original code
+ *  from The Mana World.
+ *
+ *  The Legend of Mazzeroth 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 Legend of Mazzeroth 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 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"
+
+#include "../resources/image.h"
+#include "../resources/resourcemanager.h"
+
+SpeechBubble::SpeechBubble()
+{
+    mSpeechBox = new TextBox();
+    mSpeechBox->setEditable(false);
+	mSpeechBox->setOpaque(false);
+
+    mSpeechArea = new ScrollArea(mSpeechBox);
+
+    // Height == Top Graphic (14px) + 1 Row of Text (15px) + Bottom Graphic (17px)
+    setContentSize(135, 46);
+	setTitleBarHeight(0);
+	loadSkin("graphics/gui/speechbubble.xml");
+
+    mSpeechArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mSpeechArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mSpeechArea->setDimension(gcn::Rectangle(4, 15, 130, 28));
+	mSpeechArea->setOpaque(false);
+
+    add(mSpeechArea);
+
+    setLocationRelativeTo(getParent());
+
+    // LEEOR / TODO: This causes an exception error.
+    //moveToBottom(getParent());
+
+    mSpeechBox->setTextWrapped( "" );
+}
+
+void SpeechBubble::setText(const std::string mText)
+{
+    mSpeechBox->setTextWrapped( mText );
+
+    int numRows = mSpeechBox->getNumberOfRows();
+
+    // 31 == speechbubble Top + Bottom graphic pixel heights
+    // 15 == height of each line of text (based on font heights)
+    setContentSize(135, 31 + (numRows * 15) );
+    mSpeechArea->setDimension(gcn::Rectangle(4, 15, 130, (31 + (numRows * 14)) - 18 ));
+}
+
+unsigned int SpeechBubble::getNumRows()
+{
+    return mSpeechBox->getNumberOfRows();
+}
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
new file mode 100644
index 00000000..c4ca9109
--- /dev/null
+++ b/src/gui/speechbubble.h
@@ -0,0 +1,47 @@
+/*
+ *  The Legend of Mazzeroth
+ *  Copyright (C) 2008, The Legend of Mazzeroth Development Team
+ *
+ *  This file is part of The Legend of Mazzeroth based on original code
+ *  from The Mana World.
+ *
+ *  The Legend of Mazzeroth 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 Legend of Mazzeroth 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 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__
+#define _LOM_SPEECHBUBBLE_H__
+
+#include "textbox.h"
+#include "scrollarea.h"
+#include "window.h"
+
+class SpeechBubble : public Window
+{
+    public:
+
+	SpeechBubble();
+
+	void setText(const std::string mText);
+	void setLocation(int x, int y);
+	unsigned int getNumRows();
+
+    private:
+	TextBox *mSpeechBox;
+	ScrollArea *mSpeechArea;
+};
+
+#endif
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 75288eb5..1e5dff50 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -28,6 +28,8 @@
 #include <guichan/exception.hpp>
 #include <guichan/widgets/icon.hpp>
 
+#include <libxml/tree.h>
+
 #include "window.h"
 
 #include "gui.h"
@@ -45,21 +47,31 @@
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
 
+#include "../utils/xml.h"
+
 ConfigListener *Window::windowConfigListener = 0;
 WindowContainer *Window::windowContainer = 0;
 int Window::instances = 0;
 int Window::mouseResize = 0;
-ImageRect Window::border;
 Image *Window::closeImage = NULL;
+bool mLoaded = false;
+bool Window::mAlphaChanged = false;
 
 class WindowConfigListener : public ConfigListener
 {
+    /*
     void optionChanged(const std::string &)
     {
         for_each(Window::border.grid, Window::border.grid + 9,
                 std::bind2nd(std::mem_fun(&Image::setAlpha),
                     config.getValue("guialpha", 0.8)));
     }
+    */
+
+    void optionChanged(const std::string &)
+    {
+        Window::mAlphaChanged = true;
+    }
 };
 
 Window::Window(const std::string& caption, bool modal, Window *parent):
@@ -77,32 +89,20 @@ Window::Window(const std::string& caption, bool modal, Window *parent):
 {
     logger->log("Window::Window(\"%s\")", caption.c_str());
 
-    if (!windowContainer) {
-        throw GCN_EXCEPTION("Window::Window. no windowContainer set");
+    if (!windowContainer)
+    {
+        throw GCN_EXCEPTION("Window::Window(): no windowContainer set");
     }
 
-    if (instances == 0)
-    {
-        // Load static resources
-        ResourceManager *resman = ResourceManager::getInstance();
-        Image *dBorders = resman->getImage("graphics/gui/vscroll_grey.png");
-        border.grid[0] = dBorders->getSubImage(0, 0, 4, 4);
-        border.grid[1] = dBorders->getSubImage(4, 0, 3, 4);
-        border.grid[2] = dBorders->getSubImage(7, 0, 4, 4);
-        border.grid[3] = dBorders->getSubImage(0, 4, 4, 10);
-        border.grid[4] = resman->getImage("graphics/gui/bg_quad_dis.png");
-        border.grid[5] = dBorders->getSubImage(7, 4, 4, 10);
-        border.grid[6] = dBorders->getSubImage(0, 15, 4, 4);
-        border.grid[7] = dBorders->getSubImage(4, 15, 3, 4);
-        border.grid[8] = dBorders->getSubImage(7, 15, 4, 4);
-        dBorders->decRef();
-        closeImage = resman->getImage("graphics/gui/close_button.png");
-
-        windowConfigListener = new WindowConfigListener();
+    loadSkin("graphics/gui/gui.xml");
+
+    //if (instances == 0)
+    //{
+        //WindowConfigListener = new WindowConfigListener();
         // Send GUI alpha changed for initialization
-        windowConfigListener->optionChanged("guialpha");
-        config.addListener("guialpha", windowConfigListener);
-    }
+        //windowConfigListener->optionChanged("guialpha");
+        //config.addListener("guialpha", windowConfigListener);
+    //}
 
     instances++;
 
@@ -110,6 +110,8 @@ Window::Window(const std::string& caption, bool modal, Window *parent):
     setPadding(3);
     setTitleBarHeight(20);
 
+    setGuiAlpha();
+
     // Add this window to the window container
     windowContainer->add(this);
 
@@ -127,7 +129,7 @@ Window::Window(const std::string& caption, bool modal, Window *parent):
 
 Window::~Window()
 {
-    logger->log("Window::~Window(\"%s\")", getCaption().c_str());
+    logger->log("UNLOAD: Window::~Window(\"%s\")", getCaption().c_str());
 
     std::string const &name = mConfigName;
     if (!name.empty())
@@ -161,17 +163,15 @@ Window::~Window()
         windowConfigListener = NULL;
 
         // Clean up static resources
-        delete border.grid[0];
-        delete border.grid[1];
-        delete border.grid[2];
-        delete border.grid[3];
-        border.grid[4]->decRef();
-        delete border.grid[5];
-        delete border.grid[6];
-        delete border.grid[7];
-        delete border.grid[8];
         closeImage->decRef();
     }
+
+    // Clean up Border images.
+    for( int i = 0; i < 9; i++ )
+    {
+        border[i] = NULL;
+    }
+    delete border;
 }
 
 void Window::setWindowContainer(WindowContainer *wc)
@@ -181,9 +181,15 @@ void Window::setWindowContainer(WindowContainer *wc)
 
 void Window::draw(gcn::Graphics *graphics)
 {
+    if(mAlphaChanged)
+        setGuiAlpha();
+
+
     Graphics *g = static_cast<Graphics*>(graphics);
 
-    g->drawImageRect(0, 0, getWidth(), getHeight(), border);
+    //g->drawImageRect(0, 0, getWidth(), getHeight(), border);
+
+    g->drawImageRect(0, 0, getWidth(), getHeight(), border[0], border[2], border[6], border[8], border[1], border[5], border[7], border[3], border[4]);
 
     // Draw title
     if (getTitleBarHeight())
@@ -557,3 +563,184 @@ void Window::reflowLayout(int w, int h)
     mLayout = NULL;
     setContentSize(w, h);
 }
+
+void Window::setGuiAlpha()
+{
+    //logger->log("Window::setGuiAlpha: Alpha Value %f", config.getValue("guialpha", 0.8));
+    for(int i = 0; i < 9; i++)
+    {
+        //logger->log("Window::setGuiAlpha: Border Image (%i)", i);
+        border[i]->setAlpha(config.getValue("guialpha", 0.8));
+    }
+
+    mAlphaChanged = false;
+}
+
+void Window::loadSkin(const std::string filename)
+{
+	const std::string windowId = Window::getId();
+
+	ResourceManager *resman = ResourceManager::getInstance();
+
+    logger->log("Loading Window Skin '%s'.", filename.c_str());
+	logger->log("Loading Window ID '%d'.", windowId.c_str());
+
+
+    if(filename == "")
+        logger->error("Window::loadSkin(): Invalid File Name.");
+
+    // TODO:
+    // If there is an error loading the specified file, we should try to revert
+    // to a 'default' skin file. Only if the 'default' skin file can't be loaded
+    // should we have a terminating error.
+    XML::Document doc(filename);
+    xmlNodePtr rootNode = doc.rootNode();
+
+    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "skinset"))
+    {
+        logger->error("Widget Skinning error");
+    }
+
+    std::string skinSetImage;
+    skinSetImage = XML::getProperty(rootNode, "image", "");
+    Image *dBorders = NULL;
+    if(skinSetImage != "")
+    {
+        logger->log("Window::loadSkin(): <skinset> defines '%s' as a skin image.", skinSetImage.c_str());
+        dBorders = resman->getImage("graphics/gui/" + skinSetImage);//"graphics/gui/speech_bubble.png");
+    }
+    else
+    {
+        logger->error("Window::loadSkin(): Skinset does not define an image!");
+    }
+
+    //iterate <widget>'s
+    for_each_xml_child_node(widgetNode, rootNode)
+    {
+        if (!xmlStrEqual(widgetNode->name, BAD_CAST "widget"))
+            continue;
+
+        std::string widgetType;
+        widgetType = XML::getProperty(widgetNode, "type", "unknown");
+        if (widgetType == "Window")
+        {
+            // Itarate through <part>'s
+            // LEEOR / TODO:
+            // We need to make provisions to load in a CloseButton image. For now it
+            // can just be hard-coded.
+            for_each_xml_child_node(partNode, widgetNode)
+            {
+                if (!xmlStrEqual(partNode->name, BAD_CAST "part"))
+                {
+                    continue;
+                }
+
+                std::string partType;
+                partType = XML::getProperty(partNode, "type", "unknown");
+                // TOP ROW
+                if(partType == "top-left-corner")
+                {
+                    const int xPos = XML::getProperty(partNode, "xpos", 0);
+                    const int yPos = XML::getProperty(partNode, "ypos", 0);
+                    const int width = XML::getProperty(partNode, "width", 1);
+                    const int height = XML::getProperty(partNode, "height", 1);
+
+                    border[0] = dBorders->getSubImage(xPos, yPos, width, height);
+                }
+                else if(partType == "top-edge")
+                {
+                    const int xPos = XML::getProperty(partNode, "xpos", 0);
+                    const int yPos = XML::getProperty(partNode, "ypos", 0);
+                    const int width = XML::getProperty(partNode, "width", 1);
+                    const int height = XML::getProperty(partNode, "height", 1);
+
+                    border[1] = dBorders->getSubImage(xPos, yPos, width, height);
+                }
+                else if(partType == "top-right-corner")
+                {
+                    const int xPos = XML::getProperty(partNode, "xpos", 0);
+                    const int yPos = XML::getProperty(partNode, "ypos", 0);
+                    const int width = XML::getProperty(partNode, "width", 1);
+                    const int height = XML::getProperty(partNode, "height", 1);
+
+                    border[2] = dBorders->getSubImage(xPos, yPos, width, height);
+                }
+
+                // MIDDLE ROW
+                else if(partType == "left-edge")
+                {
+                    const int xPos = XML::getProperty(partNode, "xpos", 0);
+                    const int yPos = XML::getProperty(partNode, "ypos", 0);
+                    const int width = XML::getProperty(partNode, "width", 1);
+                    const int height = XML::getProperty(partNode, "height", 1);
+
+                    border[3] = dBorders->getSubImage(xPos, yPos, width, height);
+                }
+                else if(partType == "bg-quad")
+                {
+                    const int xPos = XML::getProperty(partNode, "xpos", 0);
+                    const int yPos = XML::getProperty(partNode, "ypos", 0);
+                    const int width = XML::getProperty(partNode, "width", 1);
+                    const int height = XML::getProperty(partNode, "height", 1);
+
+                    border[4] = dBorders->getSubImage(xPos, yPos, width, height);
+                }
+                else if(partType == "right-edge")
+                {
+                    const int xPos = XML::getProperty(partNode, "xpos", 0);
+                    const int yPos = XML::getProperty(partNode, "ypos", 0);
+                    const int width = XML::getProperty(partNode, "width", 1);
+                    const int height = XML::getProperty(partNode, "height", 1);
+
+                    border[5] = dBorders->getSubImage(xPos, yPos, width, height);
+                }
+
+                // BOTTOM ROW
+                else if(partType == "bottom-left-corner")
+                {
+                    const int xPos = XML::getProperty(partNode, "xpos", 0);
+                    const int yPos = XML::getProperty(partNode, "ypos", 0);
+                    const int width = XML::getProperty(partNode, "width", 1);
+                    const int height = XML::getProperty(partNode, "height", 1);
+
+                    border[6] = dBorders->getSubImage(xPos, yPos, width, height);
+                }
+                else if(partType == "bottom-edge")
+                {
+                    const int xPos = XML::getProperty(partNode, "xpos", 0);
+                    const int yPos = XML::getProperty(partNode, "ypos", 0);
+                    const int width = XML::getProperty(partNode, "width", 1);
+                    const int height = XML::getProperty(partNode, "height", 1);
+
+                    border[7] = dBorders->getSubImage(xPos, yPos, width, height);
+                }
+                else if(partType == "bottom-right-corner")
+                {
+                    const int xPos = XML::getProperty(partNode, "xpos", 0);
+                    const int yPos = XML::getProperty(partNode, "ypos", 0);
+                    const int width = XML::getProperty(partNode, "width", 1);
+                    const int height = XML::getProperty(partNode, "height", 1);
+
+                    border[8] = dBorders->getSubImage(xPos, yPos, width, height);
+                }
+
+                // Part is of an uknown type.
+                else
+                {
+                    logger->log("Window::loadSkin(): Unknown Part Type '%s'", partType.c_str());
+                }
+            }
+        }
+        // Widget is of an uknown type.
+        else
+        {
+            logger->log("Window::loadSkin(): Unknown Widget Type '%s'", widgetType.c_str());
+        }
+    }
+    dBorders->decRef();
+
+    logger->log("Finished loading Window Skin.");
+
+    // Hard-coded for now until we update the above code to look for window buttons.
+    closeImage = resman->getImage("graphics/gui/close_button.png");
+}
diff --git a/src/gui/window.h b/src/gui/window.h
index 9f5969f0..5c81ba6d 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -251,6 +251,11 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         ContainerPlacer getPlacer(int x, int y);
 
+		/**
+		 * Loads a window skin
+		 */
+        void Window::loadSkin(const std::string filename);
+
     private:
         /**
          * Determines if the mouse is in a resize area and returns appropriate
@@ -285,7 +290,10 @@ class Window : public gcn::Window, gcn::WidgetListener
 
         static int mouseResize;    /**< Active resize handles */
         static int instances;      /**< Number of Window instances */
-        static ImageRect border;   /**< The window border and background */
+
+        void setGuiAlpha();
+        static bool mAlphaChanged;
+        Image *border[9];
         static Image *closeImage;  /**< Close Button Image */
 
         /**
-- 
cgit v1.2.3-70-g09d2


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

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

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

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


From 3d85803d9a43c779f522a936df068a24ca6f7f2d Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sat, 1 Nov 2008 14:38:59 +0000
Subject: Merged revisions 4110-4111,4116 via svnmerge from
 https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0

........
  r4110 | peaveydk | 2008-04-17 00:57:49 +0200 (Thu, 17 Apr 2008) | 1 line

  Fix shop list not to scroll to top when selling. Redo of revision 3801 due to changes in guichan 0.8.0.
........
  r4111 | peaveydk | 2008-04-17 02:08:28 +0200 (Thu, 17 Apr 2008) | 1 line

  fixes for r4110, have to account for index value and add 1 to get the right scroll position.
........
  r4116 | peaveydk | 2008-04-17 14:48:43 +0200 (Thu, 17 Apr 2008) | 1 line

  Draw NPCs in yellow on minimap and skip drawing of warps. Based on idea by leeor_net.
........
---
 ChangeLog           | 7 +++++++
 src/gui/minimap.cpp | 7 ++++---
 src/gui/sell.cpp    | 5 +++++
 3 files changed, 16 insertions(+), 3 deletions(-)

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

diff --git a/ChangeLog b/ChangeLog
index 16d50f6b..d7e5d07b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -586,6 +586,13 @@
 	src/net/chatserver/party.h, src/localplayer.h: Added basic party
 	support.
 
+2008-04-17  Dennis Friis  <peavey@placid.dk>
+
+	* src/gui/sell.cpp: Fix shop list not to scroll to top when selling.
+	Redo of revision 3801 due to changes in guichan 0.8.0.
+	* src/gui/minimap.cpp: Draw NPCs in yellow on minimap and skip drawing
+	of warps. Based on idea by leeor_net.
+
 2008-04-17  Yohann Ferreira <bertram@cegetel.net>
 
 	* src/gui/progressbar.h, src/gui/progressbar.cpp: Added smooth
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index ca6f4fd7..5f768609 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -77,9 +77,10 @@ void Minimap::draw(gcn::Graphics *graphics)
 {
     Window::draw(graphics);
 
-    if (mMapImage != NULL)
+    if (mMapImage)
     {
-        static_cast<Graphics*>(graphics)->drawImage(mMapImage, getPadding(), getTitleBarHeight());
+        static_cast<Graphics*>(graphics)->drawImage(
+                mMapImage, getPadding(), getTitleBarHeight());
     }
 
     Beings &beings = beingManager->getAll();
@@ -110,7 +111,7 @@ void Minimap::draw(gcn::Graphics *graphics)
                 break;
 
             default:
-                break;
+                continue;
         }
 
         const int offset = (dotSize - 1) / 2;
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index e101ad39..37626155 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -171,6 +171,11 @@ void SellDialog::action(const gcn::ActionEvent &event)
             mShopItemList->setSelected(-1);
             mShopItems->getShop()->erase(
                     mShopItems->getShop()->begin() + selectedItem);
+
+            gcn::Rectangle scroll;
+            scroll.y = mShopItemList->getRowHeight() * (selectedItem + 1);
+            scroll.height = mShopItemList->getRowHeight();
+            mShopItemList->showPart(scroll);
         }
         else
         {
-- 
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/minimap.cpp')

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


From 291a1d63d407a46d3ad9152bbddc6e3d9a93b413 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sat, 13 Dec 2008 16:33:04 +0100
Subject: Center large minimaps on player

Based on a patch by QOAL.

(cherry picked from eAthena client)

Conflicts:

	src/gui/minimap.cpp
---
 src/gui/minimap.cpp | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

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

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 501530f1..02d20d8e 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -44,49 +44,50 @@ Minimap::Minimap():
 Minimap::~Minimap()
 {
     if (mMapImage)
-    {
         mMapImage->decRef();
-    }
 }
 
 void Minimap::setMapImage(Image *img)
 {
     if (mMapImage)
-    {
         mMapImage->decRef();
-    }
 
     mMapImage = img;
 
-    if (mMapImage)
-    {
+    if (mMapImage) {
         mMapImage->setAlpha(0.7);
-        setSize( mMapImage->getWidth() + 6, mMapImage->getHeight() + 23 );
-        setVisible(true);
+        setContentSize(mMapImage->getWidth(), mMapImage->getHeight());
     }
-    else
-    {
-        setVisible(false);
-    }
-
 }
 
 void Minimap::draw(gcn::Graphics *graphics)
 {
     Window::draw(graphics);
 
+    const gcn::Rectangle a = getChildrenArea();
+
+    int mapOriginX = a.x;
+    int mapOriginY = a.y;
+
     if (mMapImage)
     {
-        static_cast<Graphics*>(graphics)->drawImage(
-                mMapImage, getPadding(), getTitleBarHeight());
+        if (mMapImage->getWidth() > a.width ||
+            mMapImage->getHeight() > a.height)
+        {
+            const Vector &pos = player_node->getPosition();
+            mapOriginX += (a.width - (int) (pos.x / 32)) / 2;
+            mapOriginY += (a.height - (int) (pos.y / 32)) / 2;
+        }
+        static_cast<Graphics*>(graphics)->
+            drawImage(mMapImage, mapOriginX, mapOriginY);
     }
 
-    Beings &beings = beingManager->getAll();
-    BeingIterator bi;
+    const Beings &beings = beingManager->getAll();
+    Beings::const_iterator bi;
 
     for (bi = beings.begin(); bi != beings.end(); bi++)
     {
-        Being *being = (*bi);
+        const Being *being = (*bi);
         int dotSize = 2;
 
         switch (being->getType()) {
@@ -116,8 +117,8 @@ void Minimap::draw(gcn::Graphics *graphics)
         const Vector &pos = being->getPosition();
 
         graphics->fillRectangle(gcn::Rectangle(
-                    (int) pos.x / 64 + getPadding() - offset,
-                    (int) pos.y / 64 + getTitleBarHeight() - offset,
+                    (int) pos.x / 64 + mapOriginX - offset,
+                    (int) pos.x / 64 + mapOriginY - offset,
                     dotSize, dotSize));
     }
 }
-- 
cgit v1.2.3-70-g09d2


From fcc90586d1d1631c31b2799fdaf410af1b073cf0 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Wed, 17 Dec 2008 22:13:24 +0100
Subject: Reintroduced window name property

Still used in the eAthena client and it seems saner to me to have it.
---
 src/gui/buy.cpp                |  3 ++-
 src/gui/chat.cpp               |  3 ++-
 src/gui/debugwindow.cpp        |  3 ++-
 src/gui/equipmentwindow.cpp    |  3 ++-
 src/gui/guildwindow.cpp        |  3 ++-
 src/gui/help.cpp               |  1 +
 src/gui/inventorywindow.cpp    |  3 ++-
 src/gui/itemshortcutwindow.cpp |  3 ++-
 src/gui/login.cpp              |  7 ++-----
 src/gui/magic.cpp              |  3 ++-
 src/gui/minimap.cpp            |  5 +++--
 src/gui/ministatus.cpp         |  3 +--
 src/gui/partywindow.cpp        |  3 ++-
 src/gui/sell.cpp               |  3 ++-
 src/gui/skill.cpp              |  3 ++-
 src/gui/status.cpp             |  5 +++--
 src/gui/trade.cpp              |  3 ++-
 src/gui/window.cpp             |  7 ++++---
 src/gui/window.h               | 17 +++++++++++++----
 19 files changed, 51 insertions(+), 30 deletions(-)

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

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index a948b136..008c7bb9 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -40,6 +40,7 @@ BuyDialog::BuyDialog():
     Window(_("Buy")),
     mMoney(0), mAmountItems(0), mMaxItems(0)
 {
+    setWindowName("Buy");
     setResizable(true);
     setMinWidth(260);
     setMinHeight(230);
@@ -85,7 +86,7 @@ BuyDialog::BuyDialog():
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
 
-    loadWindowState("Buy");
+    loadWindowState();
     setLocationRelativeTo(getParent());
 }
 
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 5bd661d6..888dd27d 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -52,6 +52,7 @@ ChatWindow::ChatWindow():
     Window("Chat"),
     mTmpVisible(false)
 {
+    setWindowName("Chat");
     setResizable(true);
     setDefaultSize(0, windowContainer->getHeight() - 123, 600, 123);
     setOpaque(false);
@@ -88,7 +89,7 @@ ChatWindow::ChatWindow():
     mChatInput->addKeyListener(this);
     mCurHist = mHistory.end();
 
-    loadWindowState("Chat");
+    loadWindowState();
 }
 
 ChatWindow::~ChatWindow()
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index d92c3575..36e4c8e1 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -39,10 +39,11 @@
 DebugWindow::DebugWindow():
     Window("Debug")
 {
+    setWindowName("Debug");
     setResizable(true);
     setCloseButton(true);
     setDefaultSize(0, 0, 400, 100);
-    loadWindowState("Debug");
+    loadWindowState();
 
     mFPSLabel = new gcn::Label("[0 FPS]");
     mFPSLabel->setPosition(0,0);
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 57f0899b..6848b4d8 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -56,9 +56,10 @@ EquipmentWindow::EquipmentWindow(Equipment *equipment):
     mBackground(NULL),
     mSelected(-1)
 {
+    setWindowName("Equipment");
     setCloseButton(true);
     setDefaultSize(5, 195, 216, 260);
-    loadWindowState("Equipment");
+    loadWindowState();
 
     mUnequip = new Button(_("Unequip"), "unequip", this);
     gcn::Rectangle const &area = getChildrenArea();
diff --git a/src/gui/guildwindow.cpp b/src/gui/guildwindow.cpp
index ae9684df..0596c75e 100644
--- a/src/gui/guildwindow.cpp
+++ b/src/gui/guildwindow.cpp
@@ -49,6 +49,7 @@ GuildWindow::GuildWindow():
     Window(_("Guild")),
     mFocus(false)
 {
+    setWindowName("Guild");
     setCaption(_("Guild"));
     setResizable(false);
     setCloseButton(true);
@@ -73,7 +74,7 @@ GuildWindow::GuildWindow():
     layout.setColWidth(0, 48);
     layout.setColWidth(1, 65);
 
-    loadWindowState("Guild");
+    loadWindowState();
 }
 
 GuildWindow::~GuildWindow()
diff --git a/src/gui/help.cpp b/src/gui/help.cpp
index ffe9c02d..290679b9 100644
--- a/src/gui/help.cpp
+++ b/src/gui/help.cpp
@@ -31,6 +31,7 @@ HelpWindow::HelpWindow():
     Window("Help")
 {
     setContentSize(455, 350);
+    setWindowName("Help");
 
     mBrowserBox = new BrowserBox();
     mBrowserBox->setOpaque(false);
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 92b635d8..1e3c4084 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -53,6 +53,7 @@ InventoryWindow::InventoryWindow():
     Window(_("Inventory")),
     mSplit(false)
 {
+    setWindowName("Inventory");
     setResizable(false);
     setCloseButton(true);
     // LEEOR/TODO: Since this window is not resizable, do we really need to set these
@@ -82,7 +83,7 @@ InventoryWindow::InventoryWindow():
     layout.setColWidth(2, 48);
     layout.setRowHeight(0, Layout::AUTO_SET);
 
-    loadWindowState("Inventory");
+    loadWindowState();
 }
 
 void InventoryWindow::logic()
diff --git a/src/gui/itemshortcutwindow.cpp b/src/gui/itemshortcutwindow.cpp
index 1a71b11e..e21f421b 100644
--- a/src/gui/itemshortcutwindow.cpp
+++ b/src/gui/itemshortcutwindow.cpp
@@ -28,6 +28,7 @@ static const int SCROLL_PADDING = 0;
 
 ItemShortcutWindow::ItemShortcutWindow()
 {
+    setWindowName("ItemShortcut");
     // no title presented, title bar is padding so window can be moved.
     gcn::Window::setTitleBarHeight(gcn::Window::getPadding());
     setShowTitle(false);
@@ -49,7 +50,7 @@ ItemShortcutWindow::ItemShortcutWindow()
 
     add(mScrollArea);
 
-    loadWindowState("ItemShortcut");
+    loadWindowState();
 }
 
 ItemShortcutWindow::~ItemShortcutWindow()
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 24c55e37..b4289984 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -71,12 +71,9 @@ LoginDialog::LoginDialog(LoginData *loginData) : Window(_("Login")), mLoginData(
     setLocationRelativeTo(getParent());
     setVisible(true);
 
-    if (mUserField->getText().empty())
-    {
+    if (mUserField->getText().empty()) {
         mUserField->requestFocus();
-    }
-    else
-    {
+    } else {
         mPassField->requestFocus();
     }
 
diff --git a/src/gui/magic.cpp b/src/gui/magic.cpp
index ad63f914..2c81321b 100644
--- a/src/gui/magic.cpp
+++ b/src/gui/magic.cpp
@@ -35,6 +35,7 @@
 MagicDialog::MagicDialog():
     Window(_("Magic"))
 {
+    setWindowName("Magic");
     setCloseButton(true);
     setDefaultSize(255, 30, 175, 225);
 
@@ -53,7 +54,7 @@ MagicDialog::MagicDialog():
     update();
 
     setLocationRelativeTo(getParent());
-    loadWindowState(_("Magic"));
+    loadWindowState();
 }
 
 MagicDialog::~MagicDialog()
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 02d20d8e..f7749755 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -34,8 +34,9 @@ Minimap::Minimap():
     Window(_("MiniMap")),
     mMapImage(NULL)
 {
-    setDefaultSize(0, 0, 100, 100);
-    loadWindowState("MiniMap");
+    setWindowName("MiniMap");
+    setDefaultSize(5, 25, 100, 100);
+    loadWindowState();
     // LEEOR: The Window class needs to modified to accept
     // setAlignment calls.
     setAlignment(gcn::Graphics::CENTER);
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 424c3558..86e5a8f1 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -32,8 +32,7 @@
 
 #include "../utils/tostring.h"
 
-MiniStatusWindow::MiniStatusWindow():
-    Window()
+MiniStatusWindow::MiniStatusWindow()
 {
     setResizable(false);
     setMovable(false);
diff --git a/src/gui/partywindow.cpp b/src/gui/partywindow.cpp
index 262e3b2e..c4a1c780 100644
--- a/src/gui/partywindow.cpp
+++ b/src/gui/partywindow.cpp
@@ -29,6 +29,7 @@
 
 PartyWindow::PartyWindow() : Window(_("Party"))
 {
+    setWindowName("Party");
     setVisible(false);
     setResizable(false);
     setCaption(_("Party"));
@@ -37,7 +38,7 @@ PartyWindow::PartyWindow() : Window(_("Party"))
     setMinHeight(200);
     setDefaultSize(620, 300, 110, 200);
 
-    loadWindowState("Party");
+    loadWindowState();
 }
 
 PartyWindow::~PartyWindow()
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 30e78368..24391458 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -44,6 +44,7 @@ SellDialog::SellDialog():
     Window(_("Sell")),
     mMaxItems(0), mAmountItems(0)
 {
+    setWindowName("Sell");
     setResizable(true);
     setMinWidth(260);
     setMinHeight(230);
@@ -90,7 +91,7 @@ SellDialog::SellDialog():
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
 
-    loadWindowState("Sell");
+    loadWindowState();
     setLocationRelativeTo(getParent());
 }
 
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 2eecca55..6d747641 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -43,6 +43,7 @@
 SkillDialog::SkillDialog():
     Window(_("Skills"))
 {
+    setWindowName("Skills");
     setCloseButton(true);
     setDefaultSize(windowContainer->getWidth() - 280, 30, 275, 425);
 
@@ -69,7 +70,7 @@ SkillDialog::SkillDialog():
     update();
 
     setLocationRelativeTo(getParent());
-    loadWindowState(_("Skills"));
+    loadWindowState();
 }
 
 SkillDialog::~SkillDialog()
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 43f81135..283a771b 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -36,11 +36,12 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     Window(player->getName()),
     mPlayer(player)
 {
+    setWindowName("Status");
     setResizable(true);
     setCloseButton(true);
     setDefaultSize((windowContainer->getWidth() - 365) / 2,
-                   (windowContainer->getHeight() - 255) / 2, 365, 280);
-    loadWindowState("Status");
+                   (windowContainer->getHeight() - 255) / 2, 365, 275);
+    loadWindowState();
 
     // ----------------------
     // Status Part
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 38064f48..7d5051c7 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -53,6 +53,7 @@ TradeWindow::TradeWindow():
     mPartnerInventory(new Inventory),
     mStatus(PREPARING)
 {
+    setWindowName("Trade");
     setResizable(true);
     setDefaultSize(115, 197, 332, 209);
 
@@ -102,7 +103,7 @@ TradeWindow::TradeWindow():
     layout.setColWidth(0, Layout::AUTO_SET);
     layout.setColWidth(1, Layout::AUTO_SET);
 
-    loadWindowState("Trade");
+    loadWindowState();
 }
 
 TradeWindow::~TradeWindow()
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 9dc70189..c40f8a25 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -129,7 +129,7 @@ Window::~Window()
 {
     logger->log("UNLOAD: Window::~Window(\"%s\")", getCaption().c_str());
 
-    const std::string &name = mConfigName;
+    const std::string &name = mWindowName;
     if (!name.empty())
     {
         // Saving X, Y and Width and Height for resizables in the config
@@ -466,9 +466,10 @@ void Window::mouseDragged(gcn::MouseEvent &event)
     }
 }
 
-void Window::loadWindowState(const std::string &name)
+void Window::loadWindowState()
 {
-    mConfigName = name;
+    const std::string &name = mWindowName;
+    assert(!name.empty());
 
     setPosition((int) config.getValue(name + "WinX", mDefaultX),
                 (int) config.getValue(name + "WinY", mDefaultY));
diff --git a/src/gui/window.h b/src/gui/window.h
index 493bce37..6f49e062 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -153,8 +153,7 @@ class Window : public gcn::Window, gcn::WidgetListener
          *
          * @return The parent window or <code>NULL</code> if there is none.
          */
-        Window*
-        getParentWindow() { return mParent; }
+        Window *getParentWindow() { return mParent; }
 
         /**
          * Schedule this window for deletion. It will be deleted at the start
@@ -191,6 +190,16 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         void mouseExited(gcn::MouseEvent &event);
 
+        /**
+         * Sets the name of the window. This is not the window title.
+         */
+        void setWindowName(const std::string &name) { mWindowName = name; }
+
+        /**
+         * Returns the name of the window. This is not the window title.
+         */
+        const std::string &getWindowName() { return mWindowName; }
+
         /**
          * Reads the position (and the size for resizable windows) in the
          * configuration based on the given string.
@@ -198,7 +207,7 @@ class Window : public gcn::Window, gcn::WidgetListener
          * Don't forget to set these default values and resizable before
          * calling this function.
          */
-        void loadWindowState(const std::string &);
+        void loadWindowState();
 
         /**
          * Set the default win pos and size.
@@ -267,7 +276,7 @@ class Window : public gcn::Window, gcn::WidgetListener
         ResizeGrip *mGrip;         /**< Resize grip */
         Window *mParent;           /**< The parent window */
         Layout *mLayout;           /**< Layout handler */
-        std::string mConfigName;   /**< Name used for saving window-related data */
+        std::string mWindowName;   /**< Name of the window */
         bool mShowTitle;           /**< Window has a title bar */
         bool mModal;               /**< Window is modal */
         bool mCloseButton;         /**< Window has a close button */
-- 
cgit v1.2.3-70-g09d2