From f6f031fa4db6fa0ccd6e0b433f61479e9fd85477 Mon Sep 17 00:00:00 2001
From: Roderic Morris <roderic@ccs.neu.edu>
Date: Tue, 10 Jun 2008 00:45:21 +0000
Subject: add commandhandler class and fix / add some commands

---
 src/commandhandler.cpp | 189 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 189 insertions(+)
 create mode 100644 src/commandhandler.cpp

(limited to 'src/commandhandler.cpp')

diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
new file mode 100644
index 00000000..07184f66
--- /dev/null
+++ b/src/commandhandler.cpp
@@ -0,0 +1,189 @@
+/*
+ *  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$
+ */
+ 
+ 
+#include "commandhandler.h"
+#include "channelmanager.h"
+#include "channel.h"
+#include "game.h"
+#include "gui/chat.h"
+#include "net/chatserver/chatserver.h"
+#include "net/gameserver/player.h"
+
+void CommandHandler::handleCommand(const std::string &command)
+{
+    std::string::size_type pos = command.find(' ');
+    std::string type(command, 0, pos);
+    std::string args(command, pos == std::string::npos ? command.size() : pos + 1);
+
+    if (type == "announce")
+    {
+        handleAnnounce(args);
+    }
+    else if (type == "help")
+    {
+        handleHelp();
+    }
+    else if (type == "where")
+    {
+        handleWhere();
+    }
+    else if (type == "who")
+    {
+        handleWho();
+    }
+    else if (type == "msg")
+    {
+        handleMsg(args);
+    }
+    else if (type == "channel")
+    {
+        handleChannel(args);
+    }
+    else if (type == "join")
+    {
+        handleJoin(args);
+    }
+    else if (type == "listchannels")
+    {
+        handleListChannels();
+    }
+    else if (type == "listusers")
+    {
+        handleListUsers();
+    }
+    else if (type == "quit")
+    {
+        handleQuit();
+    }
+    else if (type == "admin")
+    {
+        Net::GameServer::Player::say("/" + args);
+    }
+    else if (type == "clear")
+    {
+        handleClear();
+    }
+    else
+    {
+        chatWindow->chatLog("Unknown command");
+    }
+}
+
+void CommandHandler::handleAnnounce(const std::string &args)
+{
+    Net::ChatServer::announce(args);
+}
+
+void CommandHandler::handleHelp()
+{
+    chatWindow->chatLog("-- Help --");
+    chatWindow->chatLog("/help > Display this help.");
+    chatWindow->chatLog("/announce > Global announcement (GM only)");
+    chatWindow->chatLog("/where > Display map name");
+    chatWindow->chatLog("/who > Display number of online users");
+    chatWindow->chatLog("/msg > Send a private message to a user");
+    chatWindow->chatLog("/listchannels > Display all public channels");
+    chatWindow->chatLog("/listusers > Lists the users in the current channel");
+    chatWindow->chatLog("/channel > Register a new channel");
+    chatWindow->chatLog("/join > Join an already registered channel");
+    chatWindow->chatLog("/quit > Leave a channel");
+    chatWindow->chatLog("/admin > Send a command to the server (GM only)");
+    chatWindow->chatLog("/clear > Clears this window");
+}
+
+void CommandHandler::handleWhere()
+{
+    chatWindow->chatLog(map_path, BY_SERVER);
+}
+
+void CommandHandler::handleWho()
+{
+    
+}
+
+void CommandHandler::handleMsg(const std::string &args)
+{
+    std::string::size_type pos = args.find(' ');
+    std::string recipient(args, 0, pos);
+    std::string text(args, pos+1);
+    Net::ChatServer::privMsg(recipient, text);
+}
+
+void CommandHandler::handleChannel(const std::string &args)
+{
+    std::string::size_type pos = args.find(" ");
+    std::string name(args, 0, pos);
+    std::string password;
+    std::string announcement;
+    if(pos == std::string::npos)
+    {
+        password = std::string();
+        announcement = std::string();
+    }
+    else
+    {
+        password = std::string(args, pos + 1, args.find(" ", pos + 1) - pos - 1);
+        pos = args.find("\"");
+        announcement = std::string(args, pos == std::string::npos ? args.size() :
+                           pos + 1, args.size() - pos - 2);
+    }
+    chatWindow->chatLog("Requesting to register channel " + name);
+    Net::ChatServer::registerChannel(name, announcement, password);
+}
+
+void CommandHandler::handleJoin(const std::string &args)
+{
+    std::string::size_type pos = args.find(' ');
+    std::string name(args, 0, pos);
+    std::string password(args, pos+1);
+    chatWindow->chatLog("Requesting to join channel " + name);
+    Net::ChatServer::enterChannel(name, password);
+}
+
+void CommandHandler::handleListChannels()
+{
+    Net::ChatServer::getChannelList();
+}
+
+void CommandHandler::handleListUsers()
+{
+    Net::ChatServer::getUserList(chatWindow->getFocused());
+}
+
+void CommandHandler::handleQuit()
+{
+    if (Channel *channel = channelManager->findByName(chatWindow->getFocused()))
+    {
+        Net::ChatServer::quitChannel(channel->getId());
+    }
+    else
+    {
+        chatWindow->chatLog("Unable to quit this channel", BY_CHANNEL);
+    }
+}
+
+void CommandHandler::handleClear()
+{
+    chatWindow->clearTab(chatWindow->getFocused());
+}
-- 
cgit v1.2.3-70-g09d2


From a34a4692200eaf5b3ec8a7de75699a46aefd8b98 Mon Sep 17 00:00:00 2001
From: Roderic Morris <roderic@ccs.neu.edu>
Date: Wed, 25 Jun 2008 21:12:44 +0000
Subject: handle topic changes and guild events

---
 ChangeLog                         |  8 ++++++++
 src/commandhandler.cpp            | 17 +++++++++++++++++
 src/commandhandler.h              |  6 ++++++
 src/net/chathandler.cpp           |  8 +++++++-
 src/net/chatserver/chatserver.cpp | 14 ++++++++++++--
 src/net/chatserver/chatserver.h   |  4 +++-
 src/net/guildhandler.cpp          | 33 +++++++++++++++++++++++++++------
 src/net/protocol.h                | 24 +++++++++++++++++-------
 8 files changed, 97 insertions(+), 17 deletions(-)

(limited to 'src/commandhandler.cpp')

diff --git a/ChangeLog b/ChangeLog
index 47d0b364..6f0988da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-25  Roderic Morris  <roderic@ccs.neu.edu>
+
+	* src/commandhandler.cpp, src/commandhandler.h, src/net/chathandler.cpp,
+	src/net/chatserver/chatserver.cpp, src/net/chatserver/chatserver.h:
+	Handle setting channel topics.
+	* src/net/guildhandler.cpp, src/net/protocol.h: Handle guild list update
+	events, and update protocol definitions.
+
 2008-06-14  Roderic Morris  <roderic@ccs.neu.edu>
 
 	* src/gui/viewport.cpp, data/graphics/images/CMakeLists.txt,
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 07184f66..465f572d 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -76,6 +76,10 @@ void CommandHandler::handleCommand(const std::string &command)
     {
         handleQuit();
     }
+    else if (type == "topic")
+    {
+        handleTopic(args);
+    }
     else if (type == "admin")
     {
         Net::GameServer::Player::say("/" + args);
@@ -107,6 +111,7 @@ void CommandHandler::handleHelp()
     chatWindow->chatLog("/listusers > Lists the users in the current channel");
     chatWindow->chatLog("/channel > Register a new channel");
     chatWindow->chatLog("/join > Join an already registered channel");
+    chatWindow->chatLog("/topic > Set the topic of the current channel");
     chatWindow->chatLog("/quit > Leave a channel");
     chatWindow->chatLog("/admin > Send a command to the server (GM only)");
     chatWindow->chatLog("/clear > Clears this window");
@@ -171,6 +176,18 @@ void CommandHandler::handleListUsers()
     Net::ChatServer::getUserList(chatWindow->getFocused());
 }
 
+void CommandHandler::handleTopic(const std::string &args)
+{
+    if (Channel *channel = channelManager->findByName(chatWindow->getFocused()))
+    {
+        Net::ChatServer::setChannelTopic(channel->getId(), args);
+    }
+    else
+    {
+        chatWindow->chatLog("Unable to set this channel's topic", BY_CHANNEL);
+    }
+}
+
 void CommandHandler::handleQuit()
 {
     if (Channel *channel = channelManager->findByName(chatWindow->getFocused()))
diff --git a/src/commandhandler.h b/src/commandhandler.h
index b409c5f5..c415ba4f 100644
--- a/src/commandhandler.h
+++ b/src/commandhandler.h
@@ -93,6 +93,11 @@ class CommandHandler
          */
         void handleListUsers();
         
+        /**
+         * Handle a topic command.
+         */
+        void handleTopic(const std::string &args);
+
         /**
          * Handle a quit command.
          */
@@ -102,6 +107,7 @@ class CommandHandler
          * Handle a clear command.
          */
         void handleClear();
+
 };
 
 extern CommandHandler *commandHandler;
diff --git a/src/net/chathandler.cpp b/src/net/chathandler.cpp
index ac91c553..ce4a91da 100644
--- a/src/net/chathandler.cpp
+++ b/src/net/chathandler.cpp
@@ -144,6 +144,8 @@ void ChatHandler::handleRegisterChannelResponse(MessageIn &msg)
                                                channelName, 
                                                channelAnnouncement));
         chatWindow->createNewChannelTab(channelName);
+        chatWindow->chatLog("Topic: " + channelAnnouncement, BY_CHANNEL, channelName);
+        
     }
     else
     {
@@ -168,7 +170,7 @@ void ChatHandler::handleEnterChannelResponse(MessageIn &msg)
         Channel *channel = new Channel(channelId, channelName, announcement);
         channelManager->addChannel(channel);
         chatWindow->createNewChannelTab(channelName);
-        chatWindow->chatLog("Announcement: " + announcement, BY_CHANNEL, channelName);
+        chatWindow->chatLog("Topic: " + announcement, BY_CHANNEL, channelName);
         
         std::string user;
         chatWindow->chatLog("Players in this channel:", BY_CHANNEL, channelName);
@@ -276,6 +278,10 @@ void ChatHandler::handleChannelEvent(MessageIn &msg)
             case CHAT_EVENT_LEAVING_PLAYER:
                 line += " left the channel.";
                 break;
+
+            case CHAT_EVENT_TOPIC_CHANGE:
+                line = "Topic: " + line;
+                break;
         
             default:
                 line = "Unknown channel event.";
diff --git a/src/net/chatserver/chatserver.cpp b/src/net/chatserver/chatserver.cpp
index fbf7355f..c6df7c83 100644
--- a/src/net/chatserver/chatserver.cpp
+++ b/src/net/chatserver/chatserver.cpp
@@ -81,11 +81,11 @@ void Net::ChatServer::privMsg(const std::string &recipient,
 }
 
 void Net::ChatServer::registerChannel(const std::string &name,
-        const std::string &announcement, const std::string &password)
+        const std::string &topic, const std::string &password)
 {
     MessageOut msg(PCMSG_REGISTER_CHANNEL);
     msg.writeString(name);
-    msg.writeString(announcement);
+    msg.writeString(topic);
     msg.writeString(password);
 
     connection->send(msg);
@@ -125,3 +125,13 @@ void Net::ChatServer::getUserList(const std::string &channel)
 
     connection->send(msg);
 }
+
+void Net::ChatServer::setChannelTopic(short channel, const std::string &topic)
+{
+    MessageOut msg(PCMSG_TOPIC_CHANGE);
+
+    msg.writeInt16(channel);
+    msg.writeString(topic);
+
+    connection->send(msg);
+}
diff --git a/src/net/chatserver/chatserver.h b/src/net/chatserver/chatserver.h
index 411d5e7b..dac19e88 100644
--- a/src/net/chatserver/chatserver.h
+++ b/src/net/chatserver/chatserver.h
@@ -43,7 +43,7 @@ namespace Net
         void privMsg(const std::string &recipient, const std::string &text);
 
         void registerChannel(const std::string &name,
-                const std::string &announcement, const std::string &password);
+                const std::string &topic, const std::string &password);
 
         void enterChannel(const std::string &channel, const std::string &password);
 
@@ -53,6 +53,8 @@ namespace Net
 
         void getUserList(const std::string &channel);
 
+        void setChannelTopic(short channel, const std::string &topic);
+
     }
 }
 
diff --git a/src/net/guildhandler.cpp b/src/net/guildhandler.cpp
index 97453c39..151abe03 100644
--- a/src/net/guildhandler.cpp
+++ b/src/net/guildhandler.cpp
@@ -94,6 +94,7 @@ void GuildHandler::handleMessage(MessageIn &msg)
             if(msg.readInt8() == ERRMSG_OK)
             {
                 std::string guildMember;
+                bool online;
                 std::string guildName;
                 Guild *guild;
 
@@ -108,16 +109,15 @@ void GuildHandler::handleMessage(MessageIn &msg)
                 while(msg.getUnreadLength())
                 {
                     guildMember = msg.readString();
+                    online = msg.readInt8();
                     if(guildMember != "")
                     {
                         guild->addMember(guildMember);
-                        guildWindow->setOnline(guildName, guildMember, false);
+                        guildWindow->setOnline(guildName, guildMember, online);
                     }
                 }
 
                 guildWindow->updateTab();
-
-                //Net::ChatServer::getUserList(guildName);
             }
         } break;
 
@@ -126,12 +126,33 @@ void GuildHandler::handleMessage(MessageIn &msg)
             logger->log("Received CPMSG_GUILD_UPDATE_LIST");
             short guildId = msg.readInt16();
             std::string guildMember = msg.readString();
+            char eventId = msg.readInt8();
 
             Guild *guild = player_node->getGuild(guildId);
             if (guild)
             {
-                guild->addMember(guildMember);
-                guildWindow->setOnline(guild->getName(), guildMember, true);
+                switch(eventId)
+                {
+                    case GUILD_EVENT_NEW_PLAYER:
+                        guild->addMember(guildMember);
+                        guildWindow->setOnline(guild->getName(), guildMember, true);
+                        break;
+                    
+                    case GUILD_EVENT_LEAVING_PLAYER:
+                        guild->removeMember(guildMember);
+                        break;
+                        
+                    case GUILD_EVENT_ONLINE_PLAYER:
+                        guildWindow->setOnline(guild->getName(), guildMember, true);
+                        break;
+                        
+                    case GUILD_EVENT_OFFLINE_PLAYER:
+                        guildWindow->setOnline(guild->getName(), guildMember, false);
+                        break;
+                        
+                    default:
+                        logger->log("Invalid guild event");
+                }
             }
             guildWindow->updateTab();
 
@@ -195,5 +216,5 @@ void GuildHandler::joinedGuild(MessageIn &msg)
     Channel *channel = new Channel(channelId, guildName, announcement);
     channelManager->addChannel(channel);
     chatWindow->createNewChannelTab(guildName);
-    chatWindow->chatLog("Announcement: " + announcement, BY_CHANNEL, guildName);
+    chatWindow->chatLog("Topic: " + announcement, BY_CHANNEL, guildName);
 }
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 3d3f47cf..76a8ffab 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -137,8 +137,8 @@ enum {
     PCMSG_GUILD_ACCEPT                  = 0x0354, // W id
     CPMSG_GUILD_ACCEPT_RESPONSE         = 0x0355, // B error, W guild, B rights, W channel
     PCMSG_GUILD_GET_MEMBERS             = 0x0356, // W id
-    CPMSG_GUILD_GET_MEMBERS_RESPONSE    = 0x0357, // S names
-    CPMSG_GUILD_UPDATE_LIST             = 0x0358, // W id, S name
+    CPMSG_GUILD_GET_MEMBERS_RESPONSE    = 0x0357, // S names, B online
+    CPMSG_GUILD_UPDATE_LIST             = 0x0358, // W id, S name, B event
     PCMSG_GUILD_QUIT                    = 0x0360, // W id
     CPMSG_GUILD_QUIT_RESPONSE           = 0x0361, // B error
 
@@ -163,17 +163,18 @@ enum {
     PCMSG_ANNOUNCE                 = 0x0411, // S text
     PCMSG_PRIVMSG                  = 0x0412, // S user, S text
     // -- Channeling
-    PCMSG_REGISTER_CHANNEL            = 0x0420, // S name, S announcement, S password
-    CPMSG_REGISTER_CHANNEL_RESPONSE   = 0x0421, // B error, W id, S name, S announcement
-    CPMSG_CHANNEL_EVENT               = 0x0430, // W channel, B event, S user
+    PCMSG_REGISTER_CHANNEL            = 0x0420, // S name, S topic, S password
+    CPMSG_REGISTER_CHANNEL_RESPONSE   = 0x0421, // B error, W id, S name, S topic
+    CPMSG_CHANNEL_EVENT               = 0x0430, // W channel, B event, S info
     PCMSG_ENTER_CHANNEL               = 0x0440, // S channel, S password
-    CPMSG_ENTER_CHANNEL_RESPONSE      = 0x0441, // B error, W id, S name, S announcement, S userlist
+    CPMSG_ENTER_CHANNEL_RESPONSE      = 0x0441, // B error, W id, S name, S topic, S userlist
     PCMSG_QUIT_CHANNEL                = 0x0443, // W channel id
     CPMSG_QUIT_CHANNEL_RESPONSE       = 0x0444, // B error, W channel id
     PCMSG_LIST_CHANNELS               = 0x0445, // -
     CPMSG_LIST_CHANNELS_RESPONSE      = 0x0446, // S names, W number of users
     PCMSG_LIST_CHANNELUSERS           = 0x0460, // S channel
     CPMSG_LIST_CHANNELUSERS_RESPONSE  = 0x0461, // S channel, S users
+    PCMSG_TOPIC_CHANGE                = 0x0462, // W channel id, S topic
 
     XXMSG_INVALID = 0x7FFF
 };
@@ -261,7 +262,16 @@ enum {
 // Chat channels event values
 enum {
     CHAT_EVENT_NEW_PLAYER = 0,
-    CHAT_EVENT_LEAVING_PLAYER
+    CHAT_EVENT_LEAVING_PLAYER,
+    CHAT_EVENT_TOPIC_CHANGE
+};
+
+// Guild member event values
+enum {
+    GUILD_EVENT_NEW_PLAYER = 0,
+    GUILD_EVENT_LEAVING_PLAYER,
+    GUILD_EVENT_ONLINE_PLAYER,
+    GUILD_EVENT_OFFLINE_PLAYER
 };
 
 #endif
-- 
cgit v1.2.3-70-g09d2


From 183bc340bd3e062a4c6df4d66cc2843582bcec94 Mon Sep 17 00:00:00 2001
From: David Athay <ko2fan@gmail.com>
Date: Mon, 7 Jul 2008 12:53:24 +0000
Subject: Added help for each command based on mantis bug #359, thanks to
 Scraggy

---
 ChangeLog              |   5 +++
 src/commandhandler.cpp | 117 ++++++++++++++++++++++++++++++++++++++++---------
 src/commandhandler.h   |  30 ++++++-------
 3 files changed, 116 insertions(+), 36 deletions(-)

(limited to 'src/commandhandler.cpp')

diff --git a/ChangeLog b/ChangeLog
index 65d7ef84..2200e328 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-07  David Athay  <ko2fan@gmail.com>
+
+	* src/commandhandler.hpp, src/commandhandler.cpp: Added help for each 
+	command based on mantis bug #359, thanks to Scraggy.
+
 2008-07-05  David Athay  <ko2fan@gmail.com>
 
 	* src/game.cpp, src/gui/gui.cpp: Allow foreign keyboards to use alt key
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 465f572d..7e20deff 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -20,8 +20,8 @@
  *
  *  $Id$
  */
- 
- 
+
+
 #include "commandhandler.h"
 #include "channelmanager.h"
 #include "channel.h"
@@ -42,7 +42,7 @@ void CommandHandler::handleCommand(const std::string &command)
     }
     else if (type == "help")
     {
-        handleHelp();
+        handleHelp(args);
     }
     else if (type == "where")
     {
@@ -56,19 +56,21 @@ void CommandHandler::handleCommand(const std::string &command)
     {
         handleMsg(args);
     }
+    /*
     else if (type == "channel")
     {
         handleChannel(args);
     }
+    */
     else if (type == "join")
     {
         handleJoin(args);
     }
-    else if (type == "listchannels")
+    else if (type == "list")
     {
         handleListChannels();
     }
-    else if (type == "listusers")
+    else if (type == "users")
     {
         handleListUsers();
     }
@@ -99,22 +101,95 @@ void CommandHandler::handleAnnounce(const std::string &args)
     Net::ChatServer::announce(args);
 }
 
-void CommandHandler::handleHelp()
+void CommandHandler::handleHelp(const std::string &args)
 {
-    chatWindow->chatLog("-- Help --");
-    chatWindow->chatLog("/help > Display this help.");
-    chatWindow->chatLog("/announce > Global announcement (GM only)");
-    chatWindow->chatLog("/where > Display map name");
-    chatWindow->chatLog("/who > Display number of online users");
-    chatWindow->chatLog("/msg > Send a private message to a user");
-    chatWindow->chatLog("/listchannels > Display all public channels");
-    chatWindow->chatLog("/listusers > Lists the users in the current channel");
-    chatWindow->chatLog("/channel > Register a new channel");
-    chatWindow->chatLog("/join > Join an already registered channel");
-    chatWindow->chatLog("/topic > Set the topic of the current channel");
-    chatWindow->chatLog("/quit > Leave a channel");
-    chatWindow->chatLog("/admin > Send a command to the server (GM only)");
-    chatWindow->chatLog("/clear > Clears this window");
+    chatWindow->chatLog("-- Help --", BY_SERVER);
+    if (args == "")
+    {
+        chatWindow->chatLog("-- Help --");
+        chatWindow->chatLog("/help > Display this help.");
+        chatWindow->chatLog("/announce > Global announcement (GM only)");
+        chatWindow->chatLog("/where > Display map name");
+        chatWindow->chatLog("/who > Display number of online users");
+        chatWindow->chatLog("/msg > Send a private message to a user");
+        chatWindow->chatLog("/list > Display all public channels");
+        chatWindow->chatLog("/users > Lists the users in the current channel");
+//        chatWindow->chatLog("/channel > Register a new channel");
+        chatWindow->chatLog("/join > Join an already registered channel");
+        chatWindow->chatLog("/topic > Set the topic of the current channel");
+        chatWindow->chatLog("/quit > Leave a channel");
+        chatWindow->chatLog("/admin > Send a command to the server (GM only)");
+        chatWindow->chatLog("/clear > Clears this window");
+        chatWindow->chatLog("For more information, type /help <command>");
+    }
+    else if (args == "admin")
+    {
+        chatWindow->chatLog("Command: /admin <command>");
+        chatWindow->chatLog("*** only available to a GM ***");
+        chatWindow->chatLog("This command sends an admin command to the server.");
+    }
+    else if (args == "announce")
+    {
+        chatWindow->chatLog("Command: /announce <msg>");
+        chatWindow->chatLog("*** only available to a GM ***");
+        chatWindow->chatLog("This command sends the message <msg> to "
+                            "all players currently online.");
+    }
+    else if (args == "clear")
+    {
+        chatWindow->chatLog("Command: /clear");
+        chatWindow->chatLog("This command clears the chat log of previous chat.");
+    }
+    else if (args == "help")
+    {
+        chatWindow->chatLog("Command: /help");
+        chatWindow->chatLog("This command displays a list of all commands available.");
+        chatWindow->chatLog("Command: /help <command>");
+        chatWindow->chatLog("This command displays help on <command>.");
+    }
+    else if (args == "join")
+    {
+        chatWindow->chatLog("Command: /join <channel>");
+        chatWindow->chatLog("This command makes you enter <channel>.");
+    }
+    else if (args == "list")
+    {
+        chatWindow->chatLog("Command: /list");
+        chatWindow->chatLog("This command shows a list of all channels.");
+    }
+    else if (args == "msg")
+    {
+        chatWindow->chatLog("Command: /msg <nick> <message>");
+        chatWindow->chatLog("This command sends the text <message> to <nick>.");
+        chatWindow->chatLog("If the <nick> has spaces in it, enclose it in "
+                            "double quotes (\").");
+    }
+    else if (args == "topic")
+    {
+        chatWindow->chatLog("Command: /topic <message>");
+        chatWindow->chatLog("This command sets the topic to <message>.");
+    }
+    else if (args == "users")
+    {
+        chatWindow->chatLog("Command: /users <channel>");
+        chatWindow->chatLog("This command shows the users in <channel>.");
+    }
+    else if (args == "where")
+    {
+        chatWindow->chatLog("Command: /where");
+        chatWindow->chatLog("This command displays the name of the current map.");
+    }
+    else if (args == "who")
+    {
+        chatWindow->chatLog("Command: /who");
+        chatWindow->chatLog("This command displays the number of players currently "
+                            "online.");
+    }
+    else
+    {
+        chatWindow->chatLog("Unknown command.");
+        chatWindow->chatLog("Type /help for a list of commands.");
+    }
 }
 
 void CommandHandler::handleWhere()
@@ -124,7 +199,7 @@ void CommandHandler::handleWhere()
 
 void CommandHandler::handleWho()
 {
-    
+
 }
 
 void CommandHandler::handleMsg(const std::string &args)
diff --git a/src/commandhandler.h b/src/commandhandler.h
index c415ba4f..ef6da33d 100644
--- a/src/commandhandler.h
+++ b/src/commandhandler.h
@@ -20,7 +20,7 @@
  *
  *  $Id$
  */
- 
+
 #ifndef _TMW_COMMANDHANDLER_H
 #define _TMW_COMMANDHANDLER_H
 
@@ -36,63 +36,63 @@ class CommandHandler
          * Constructor
          */
         CommandHandler() {}
-        
+
         /**
          * Destructor
          */
         ~CommandHandler() {}
-        
+
         /**
          * Parse and handle the given command.
          */
         void handleCommand(const std::string &command);
-    
+
     private:
         /**
          * Handle an announce command.
          */
         void handleAnnounce(const std::string &args);
-        
+
         /**
          * Handle a help command.
          */
-        void handleHelp();
-        
+        void handleHelp(const std::string &args);
+
         /**
          * Handle a where command.
          */
         void handleWhere();
-        
+
         /**
          * Handle a who command.
          */
         void handleWho();
-        
+
         /**
          * Handle a msg command.
          */
         void handleMsg(const std::string &args);
-        
+
         /**
          * Handle a channel command.
          */
         void handleChannel(const std::string &args);
-        
+
         /**
          * Handle a join command.
          */
         void handleJoin(const std::string &args);
-        
+
         /**
          * Handle a listchannels command.
          */
         void handleListChannels();
-        
+
         /**
          * Handle a listusers command.
          */
         void handleListUsers();
-        
+
         /**
          * Handle a topic command.
          */
@@ -102,7 +102,7 @@ class CommandHandler
          * Handle a quit command.
          */
         void handleQuit();
-        
+
         /**
          * Handle a clear command.
          */
-- 
cgit v1.2.3-70-g09d2


From 9bf9b2c706290b61af0f66f11ff1b3cd37d72904 Mon Sep 17 00:00:00 2001
From: David Athay <ko2fan@gmail.com>
Date: Mon, 7 Jul 2008 14:34:40 +0000
Subject: Added /party command.

---
 ChangeLog              |  2 ++
 src/commandhandler.cpp | 21 +++++++++++++++++++++
 src/commandhandler.h   |  5 +++++
 src/gui/popupmenu.cpp  |  2 +-
 src/localplayer.cpp    |  4 ++--
 src/localplayer.h      |  2 +-
 6 files changed, 32 insertions(+), 4 deletions(-)

(limited to 'src/commandhandler.cpp')

diff --git a/ChangeLog b/ChangeLog
index 2200e328..9dee8ee7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* src/commandhandler.hpp, src/commandhandler.cpp: Added help for each 
 	command based on mantis bug #359, thanks to Scraggy.
+	* src/localplayer.cpp, src/commandhandler.cpp, src/gui/popupmenu.cpp,
+	src/commandhandler.h, src/localplayer.h: Added /party command.
 
 2008-07-05  David Athay  <ko2fan@gmail.com>
 
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 7e20deff..1dadc236 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -26,6 +26,7 @@
 #include "channelmanager.h"
 #include "channel.h"
 #include "game.h"
+#include "localplayer.h"
 #include "gui/chat.h"
 #include "net/chatserver/chatserver.h"
 #include "net/gameserver/player.h"
@@ -90,6 +91,10 @@ void CommandHandler::handleCommand(const std::string &command)
     {
         handleClear();
     }
+    else if (type == "party")
+    {
+        handleParty(args);
+    }
     else
     {
         chatWindow->chatLog("Unknown command");
@@ -120,6 +125,7 @@ void CommandHandler::handleHelp(const std::string &args)
         chatWindow->chatLog("/quit > Leave a channel");
         chatWindow->chatLog("/admin > Send a command to the server (GM only)");
         chatWindow->chatLog("/clear > Clears this window");
+        chatWindow->chatLog("/party > Invite a user to party");
         chatWindow->chatLog("For more information, type /help <command>");
     }
     else if (args == "admin")
@@ -164,6 +170,13 @@ void CommandHandler::handleHelp(const std::string &args)
         chatWindow->chatLog("If the <nick> has spaces in it, enclose it in "
                             "double quotes (\").");
     }
+    else if (args == "party")
+    {
+        chatWindow->chatLog("Command: /party <nick>");
+        chatWindow->chatLog("This command invites <nick> to party with you.");
+        chatWindow->chatLog("If the <nick> has spaces in it, enclose it in "
+                            "double quotes (\").");
+    }
     else if (args == "topic")
     {
         chatWindow->chatLog("Command: /topic <message>");
@@ -279,3 +292,11 @@ void CommandHandler::handleClear()
 {
     chatWindow->clearTab(chatWindow->getFocused());
 }
+
+void CommandHandler::handleParty(const std::string &args)
+{
+    if (args != "")
+    {
+        player_node->inviteToParty(args);
+    }
+}
diff --git a/src/commandhandler.h b/src/commandhandler.h
index ef6da33d..5c019450 100644
--- a/src/commandhandler.h
+++ b/src/commandhandler.h
@@ -108,6 +108,11 @@ class CommandHandler
          */
         void handleClear();
 
+        /**
+         * Handle a party command.
+         */
+        void handleParty(const std::string &args);
+
 };
 
 extern CommandHandler *commandHandler;
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 01f48ccc..2888382b 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -150,7 +150,7 @@ void PopupMenu::handleLink(const std::string& link)
     // Add player to your party
     else if (link == "party")
     {
-        player_node->inviteToParty(mBeing);
+        player_node->inviteToParty(mBeing->getName());
     }
 
     /*
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index dbcb1d42..00ea6a49 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -149,9 +149,9 @@ void LocalPlayer::inviteToGuild(Being *being)
     }
 }
 
-void LocalPlayer::inviteToParty(Being *being)
+void LocalPlayer::inviteToParty(const std::string &name)
 {
-    Net::ChatServer::Party::invitePlayer(being->getName());
+    Net::ChatServer::Party::invitePlayer(name);
 }
 
 void LocalPlayer::clearInventory()
diff --git a/src/localplayer.h b/src/localplayer.h
index 64dec1b2..0b4b66ed 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -162,7 +162,7 @@ class LocalPlayer : public Player
         /**
          * Invite a player to join their party
          */
-        void inviteToParty(Being *being);
+        void inviteToParty(const std::string &name);
 
         void clearInventory();
         void setInvItem(int index, int id, int amount);
-- 
cgit v1.2.3-70-g09d2


From e91747e5025d5e37b2b856e30d6fb5da6968364c Mon Sep 17 00:00:00 2001
From: Roderic Morris <roderic@ccs.neu.edu>
Date: Mon, 7 Jul 2008 16:59:55 +0000
Subject: get rid of channel registering related code

---
 ChangeLog                         |  6 ++++++
 src/commandhandler.cpp            | 38 ++++++++------------------------------
 src/commandhandler.h              |  5 -----
 src/net/chathandler.cpp           | 34 ----------------------------------
 src/net/chathandler.h             |  5 -----
 src/net/chatserver/chatserver.cpp | 11 -----------
 src/net/chatserver/chatserver.h   |  3 ---
 src/net/protocol.h                |  2 --
 8 files changed, 14 insertions(+), 90 deletions(-)

(limited to 'src/commandhandler.cpp')

diff --git a/ChangeLog b/ChangeLog
index 9dee8ee7..1da6e966 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-07  Roderic Morris  <roderic@ccs.neu.edu>
+
+	* src/net/chathandler.cpp, src/net/chathandler.h, src/commandhandler.h,
+	src/commandhandler.cpp, src/net/protocol.h, src/net/chatserver/chatserver.cpp,
+	src/net/chatserver/chatserver.h: Get rid of channel registering related code.
+
 2008-07-07  David Athay  <ko2fan@gmail.com>
 
 	* src/commandhandler.hpp, src/commandhandler.cpp: Added help for each 
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 1dadc236..8f0aa907 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -57,12 +57,6 @@ void CommandHandler::handleCommand(const std::string &command)
     {
         handleMsg(args);
     }
-    /*
-    else if (type == "channel")
-    {
-        handleChannel(args);
-    }
-    */
     else if (type == "join")
     {
         handleJoin(args);
@@ -119,8 +113,7 @@ void CommandHandler::handleHelp(const std::string &args)
         chatWindow->chatLog("/msg > Send a private message to a user");
         chatWindow->chatLog("/list > Display all public channels");
         chatWindow->chatLog("/users > Lists the users in the current channel");
-//        chatWindow->chatLog("/channel > Register a new channel");
-        chatWindow->chatLog("/join > Join an already registered channel");
+        chatWindow->chatLog("/join > Join or create a channel");
         chatWindow->chatLog("/topic > Set the topic of the current channel");
         chatWindow->chatLog("/quit > Leave a channel");
         chatWindow->chatLog("/admin > Send a command to the server (GM only)");
@@ -157,6 +150,7 @@ void CommandHandler::handleHelp(const std::string &args)
     {
         chatWindow->chatLog("Command: /join <channel>");
         chatWindow->chatLog("This command makes you enter <channel>.");
+        chatWindow->chatLog("If <channel> doesn't exist, it's created.");
     }
     else if (args == "list")
     {
@@ -177,6 +171,12 @@ void CommandHandler::handleHelp(const std::string &args)
         chatWindow->chatLog("If the <nick> has spaces in it, enclose it in "
                             "double quotes (\").");
     }
+    else if (args == "quit")
+    {
+        chatWindow->chatLog("Command: /quit");
+        chatWindow->chatLog("This command leaves the current channel.");
+        chatWindow->chatLog("If you're the last person in the channel, it will be deleted.");
+    }
     else if (args == "topic")
     {
         chatWindow->chatLog("Command: /topic <message>");
@@ -223,28 +223,6 @@ void CommandHandler::handleMsg(const std::string &args)
     Net::ChatServer::privMsg(recipient, text);
 }
 
-void CommandHandler::handleChannel(const std::string &args)
-{
-    std::string::size_type pos = args.find(" ");
-    std::string name(args, 0, pos);
-    std::string password;
-    std::string announcement;
-    if(pos == std::string::npos)
-    {
-        password = std::string();
-        announcement = std::string();
-    }
-    else
-    {
-        password = std::string(args, pos + 1, args.find(" ", pos + 1) - pos - 1);
-        pos = args.find("\"");
-        announcement = std::string(args, pos == std::string::npos ? args.size() :
-                           pos + 1, args.size() - pos - 2);
-    }
-    chatWindow->chatLog("Requesting to register channel " + name);
-    Net::ChatServer::registerChannel(name, announcement, password);
-}
-
 void CommandHandler::handleJoin(const std::string &args)
 {
     std::string::size_type pos = args.find(' ');
diff --git a/src/commandhandler.h b/src/commandhandler.h
index 5c019450..0e8d9dd7 100644
--- a/src/commandhandler.h
+++ b/src/commandhandler.h
@@ -73,11 +73,6 @@ class CommandHandler
          */
         void handleMsg(const std::string &args);
 
-        /**
-         * Handle a channel command.
-         */
-        void handleChannel(const std::string &args);
-
         /**
          * Handle a join command.
          */
diff --git a/src/net/chathandler.cpp b/src/net/chathandler.cpp
index ce4a91da..43ca5a71 100644
--- a/src/net/chathandler.cpp
+++ b/src/net/chathandler.cpp
@@ -47,7 +47,6 @@ ChatHandler::ChatHandler()
 {
     static const Uint16 _messages[] = {
         GPMSG_SAY,
-        CPMSG_REGISTER_CHANNEL_RESPONSE,
         CPMSG_ENTER_CHANNEL_RESPONSE,
         CPMSG_LIST_CHANNELS_RESPONSE,
         CPMSG_PUBMSG,
@@ -69,10 +68,6 @@ void ChatHandler::handleMessage(MessageIn &msg)
             handleGameChatMessage(msg);
             break;
             
-        case CPMSG_REGISTER_CHANNEL_RESPONSE:
-            handleRegisterChannelResponse(msg);
-            break;
-            
         case CPMSG_ENTER_CHANNEL_RESPONSE:
             handleEnterChannelResponse(msg);
             break;
@@ -131,35 +126,6 @@ void ChatHandler::handleGameChatMessage(MessageIn &msg)
     }
 }
 
-void ChatHandler::handleRegisterChannelResponse(MessageIn &msg)
-{
-    char error = msg.readInt8();
-    if(error == ERRMSG_OK)
-    {
-        short channelId = msg.readInt16();
-        std::string channelName = msg.readString();
-        std::string channelAnnouncement = msg.readString();
-        chatWindow->chatLog("Registered Channel " + channelName);
-        channelManager->addChannel(new Channel(channelId, 
-                                               channelName, 
-                                               channelAnnouncement));
-        chatWindow->createNewChannelTab(channelName);
-        chatWindow->chatLog("Topic: " + channelAnnouncement, BY_CHANNEL, channelName);
-        
-    }
-    else
-    {
-        if (error == ERRMSG_INVALID_ARGUMENT)
-        {
-            chatWindow->chatLog("Error registering channel - Invalid Channel Name given", BY_SERVER);
-        }
-        else
-        {
-            chatWindow->chatLog("Error registering channel", BY_SERVER);
-        }
-    }
-}
-
 void ChatHandler::handleEnterChannelResponse(MessageIn &msg)
 {
     if(msg.readInt8() == ERRMSG_OK)
diff --git a/src/net/chathandler.h b/src/net/chathandler.h
index 874998d9..7ca4d50d 100644
--- a/src/net/chathandler.h
+++ b/src/net/chathandler.h
@@ -42,11 +42,6 @@ class ChatHandler : public MessageHandler
          */
         void handleGameChatMessage(MessageIn &msg);
         
-        /**
-         * Handle channel registration responses.
-         */
-        void handleRegisterChannelResponse(MessageIn &msg);
-        
         /**
          * Handle channel entry responses.
          */
diff --git a/src/net/chatserver/chatserver.cpp b/src/net/chatserver/chatserver.cpp
index c6df7c83..a2dbefbb 100644
--- a/src/net/chatserver/chatserver.cpp
+++ b/src/net/chatserver/chatserver.cpp
@@ -80,17 +80,6 @@ void Net::ChatServer::privMsg(const std::string &recipient,
     connection->send(msg);
 }
 
-void Net::ChatServer::registerChannel(const std::string &name,
-        const std::string &topic, const std::string &password)
-{
-    MessageOut msg(PCMSG_REGISTER_CHANNEL);
-    msg.writeString(name);
-    msg.writeString(topic);
-    msg.writeString(password);
-
-    connection->send(msg);
-}
-
 void Net::ChatServer::enterChannel(const std::string &channel, const std::string &password)
 {
     MessageOut msg(PCMSG_ENTER_CHANNEL);
diff --git a/src/net/chatserver/chatserver.h b/src/net/chatserver/chatserver.h
index dac19e88..56ad46ca 100644
--- a/src/net/chatserver/chatserver.h
+++ b/src/net/chatserver/chatserver.h
@@ -42,9 +42,6 @@ namespace Net
 
         void privMsg(const std::string &recipient, const std::string &text);
 
-        void registerChannel(const std::string &name,
-                const std::string &topic, const std::string &password);
-
         void enterChannel(const std::string &channel, const std::string &password);
 
         void quitChannel(short channel);
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 76a8ffab..89713591 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -163,8 +163,6 @@ enum {
     PCMSG_ANNOUNCE                 = 0x0411, // S text
     PCMSG_PRIVMSG                  = 0x0412, // S user, S text
     // -- Channeling
-    PCMSG_REGISTER_CHANNEL            = 0x0420, // S name, S topic, S password
-    CPMSG_REGISTER_CHANNEL_RESPONSE   = 0x0421, // B error, W id, S name, S topic
     CPMSG_CHANNEL_EVENT               = 0x0430, // W channel, B event, S info
     PCMSG_ENTER_CHANNEL               = 0x0440, // S channel, S password
     CPMSG_ENTER_CHANNEL_RESPONSE      = 0x0441, // B error, W id, S name, S topic, S userlist
-- 
cgit v1.2.3-70-g09d2


From 993b43e87e2d53e8ae8ea31c43f04a19613a6d09 Mon Sep 17 00:00:00 2001
From: David Athay <ko2fan@gmail.com>
Date: Mon, 14 Jul 2008 16:52:59 +0000
Subject: Added admin commands to /help and added registration of party handler

---
 ChangeLog              |  5 +++++
 src/commandhandler.cpp | 11 ++++++++++-
 src/game.cpp           |  3 +++
 src/game.h             |  1 +
 4 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'src/commandhandler.cpp')

diff --git a/ChangeLog b/ChangeLog
index 1da6e966..eee2a19d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-14  David Athay  <ko2fan@gmail.com>
+
+	* src/game.cpp, src/commandhandler.cpp, src/game.h: Added admin commands
+	to /help. Added registering party handler.
+
 2008-07-07  Roderic Morris  <roderic@ccs.neu.edu>
 
 	* src/net/chathandler.cpp, src/net/chathandler.h, src/commandhandler.h,
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 8f0aa907..8e6003f9 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -102,7 +102,6 @@ void CommandHandler::handleAnnounce(const std::string &args)
 
 void CommandHandler::handleHelp(const std::string &args)
 {
-    chatWindow->chatLog("-- Help --", BY_SERVER);
     if (args == "")
     {
         chatWindow->chatLog("-- Help --");
@@ -126,6 +125,16 @@ void CommandHandler::handleHelp(const std::string &args)
         chatWindow->chatLog("Command: /admin <command>");
         chatWindow->chatLog("*** only available to a GM ***");
         chatWindow->chatLog("This command sends an admin command to the server.");
+        chatWindow->chatLog("<command> can be:");
+        chatWindow->chatLog("reload <db>");
+        chatWindow->chatLog("warp <name> <map> <x> <y>");
+        chatWindow->chatLog("item <name> <id> <quantity>");
+        chatWindow->chatLog("drop <id> <quantity>");
+        chatWindow->chatLog("money <name> <quantity>");
+        chatWindow->chatLog("spawn <id> <quantity>");
+        chatWindow->chatLog("goto <name>");
+        chatWindow->chatLog("recall <name>");
+        chatWindow->chatLog("ban <name> <duration>");
     }
     else if (args == "announce")
     {
diff --git a/src/game.cpp b/src/game.cpp
index dcc2ba0a..f0209b73 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -81,6 +81,7 @@
 #include "net/itemhandler.h"
 #include "net/network.h"
 #include "net/npchandler.h"
+#include "net/partyhandler.h"
 #include "net/playerhandler.h"
 #include "net/tradehandler.h"
 
@@ -269,6 +270,7 @@ Game::Game():
     mInventoryHandler(new InventoryHandler()),
     mItemHandler(new ItemHandler()),
     mNpcHandler(new NPCHandler()),
+    mPartyHandler(new PartyHandler()),
     mPlayerHandler(new PlayerHandler()),
     mTradeHandler(new TradeHandler()),
     mLogicCounterId(0), mSecondsCounterId(0)
@@ -313,6 +315,7 @@ Game::Game():
     Net::registerHandler(mInventoryHandler.get());
     Net::registerHandler(mItemHandler.get());
     Net::registerHandler(mNpcHandler.get());
+    Net::registerHandler(mPartyHandler.get());
     Net::registerHandler(mPlayerHandler.get());
     Net::registerHandler(mTradeHandler.get());
 }
diff --git a/src/game.h b/src/game.h
index 28feae44..cdfe025b 100644
--- a/src/game.h
+++ b/src/game.h
@@ -67,6 +67,7 @@ class Game : public ConfigListener
         MessageHandlerPtr mInventoryHandler;
         MessageHandlerPtr mItemHandler;
         MessageHandlerPtr mNpcHandler;
+        MessageHandlerPtr mPartyHandler;
         MessageHandlerPtr mPlayerHandler;
         MessageHandlerPtr mTradeHandler;
 
-- 
cgit v1.2.3-70-g09d2


From b9d9ae443874efd4968a6efcf5ce050f213c497b Mon Sep 17 00:00:00 2001
From: David Athay <ko2fan@gmail.com>
Date: Wed, 13 Aug 2008 15:28:07 +0000
Subject: Added permission levels to guilds, and operator permissions to
 channels.

---
 ChangeLog                         |  9 +++++++
 src/commandhandler.cpp            | 51 ++++++++++++++++++++++++++++++++++++
 src/commandhandler.h              | 10 ++++++++
 src/gui/guildlistbox.cpp          |  4 +++
 src/net/chathandler.cpp           | 54 ++++++++++++++++++++++++++++++---------
 src/net/chatserver/chatserver.cpp | 22 ++++++++++++++++
 src/net/chatserver/chatserver.h   |  4 +++
 src/net/chatserver/guild.cpp      | 13 ++++++++++
 src/net/chatserver/guild.h        |  6 +++++
 src/net/guildhandler.cpp          | 22 ++++++++++++++++
 src/net/protocol.h                | 11 ++++++--
 11 files changed, 192 insertions(+), 14 deletions(-)

(limited to 'src/commandhandler.cpp')

diff --git a/ChangeLog b/ChangeLog
index aa702680..9164bdf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-13  David Athay  <ko2fan@gmail.com>
+
+	* src/commandhandler.cpp, src/gui/guildlistbox.cpp, 
+	src/commandhandler.h, src/net/guildhandler.cpp, src/net/protocol.h,
+	src/net/chathandler.cpp, src/net/chatserver/guild.cpp,
+	src/net/chatserver/chatserver.cpp, src/net/chatserver/guild.h,
+	src/net/chatserver/chatserver.h: Added permission levels to guilds, and
+	operator permissions to channels. 
+
 2008-08-12  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* INSTALL, autogen.sh: Removed autogen.sh and tell people in the
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 8e6003f9..7ec48f46 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -89,6 +89,10 @@ void CommandHandler::handleCommand(const std::string &command)
     {
         handleParty(args);
     }
+    else if (type == "op")
+    {
+        handleOp(args);
+    }
     else
     {
         chatWindow->chatLog("Unknown command");
@@ -161,6 +165,13 @@ void CommandHandler::handleHelp(const std::string &args)
         chatWindow->chatLog("This command makes you enter <channel>.");
         chatWindow->chatLog("If <channel> doesn't exist, it's created.");
     }
+    else if (args == "kick")
+    {
+        chatWindow->chatLog("Command: /kick <nick>");
+        chatWindow->chatLog("This command makes <nick> leave the channel.");
+        chatWindow->chatLog("If the <nick> has spaces in it, enclose it in "
+                            "double quotes (\").");
+    }
     else if (args == "list")
     {
         chatWindow->chatLog("Command: /list");
@@ -173,6 +184,15 @@ void CommandHandler::handleHelp(const std::string &args)
         chatWindow->chatLog("If the <nick> has spaces in it, enclose it in "
                             "double quotes (\").");
     }
+    else if (args == "op")
+    {
+        chatWindow->chatLog("Command: /op <nick>");
+        chatWindow->chatLog("This command makes <nick> a channel operator.");
+        chatWindow->chatLog("If the <nick> has spaces in it, enclose it in "
+                            "double quotes (\").");
+        chatWindow->chatLog("Channel operators can kick and op other users "
+                            "from the channel.");
+    }
     else if (args == "party")
     {
         chatWindow->chatLog("Command: /party <nick>");
@@ -287,3 +307,34 @@ void CommandHandler::handleParty(const std::string &args)
         player_node->inviteToParty(args);
     }
 }
+
+void CommandHandler::handleOp(const std::string &args)
+{
+    if (Channel *channel = channelManager->findByName(chatWindow->getFocused()))
+    {
+        // set the user mode 'o' to op a user
+        if (args != "")
+        {
+            Net::ChatServer::setUserMode(channel->getId(), args, 'o');
+        }
+    }
+    else
+    {
+        chatWindow->chatLog("Unable to set this user's mode", BY_CHANNEL);
+    }
+}
+
+void CommandHandler::handleKick(const std::string &args)
+{
+    if (Channel *channel = channelManager->findByName(chatWindow->getFocused()))
+    {
+        if (args != "")
+        {
+            Net::ChatServer::kickUser(channel->getId(), args);
+        }
+    }
+    else
+    {
+        chatWindow->chatLog("Unable to kick user", BY_CHANNEL);
+    }
+}
diff --git a/src/commandhandler.h b/src/commandhandler.h
index 0e8d9dd7..10a4376f 100644
--- a/src/commandhandler.h
+++ b/src/commandhandler.h
@@ -108,6 +108,16 @@ class CommandHandler
          */
         void handleParty(const std::string &args);
 
+        /**
+         * Handle a op command.
+         */
+        void handleOp(const std::string &args);
+
+        /**
+         * Handle a kick command.
+         */
+        void handleKick(const std::string &args);
+
 };
 
 extern CommandHandler *commandHandler;
diff --git a/src/gui/guildlistbox.cpp b/src/gui/guildlistbox.cpp
index 13c0ede7..659f1a63 100644
--- a/src/gui/guildlistbox.cpp
+++ b/src/gui/guildlistbox.cpp
@@ -111,6 +111,10 @@ void GuildListBox::mousePressed(gcn::MouseEvent &event)
         distributeActionEvent();
     }
     // TODO: Add guild functions, ie private messaging
+    if (event.getButton() == gcn::MouseEvent::RIGHT)
+    {
+        // Show context menu
+    }
 }
 
 void GuildListBox::setOnlineStatus(const std::string &user, bool online)
diff --git a/src/net/chathandler.cpp b/src/net/chathandler.cpp
index 43ca5a71..0cb59403 100644
--- a/src/net/chathandler.cpp
+++ b/src/net/chathandler.cpp
@@ -67,7 +67,7 @@ void ChatHandler::handleMessage(MessageIn &msg)
         case GPMSG_SAY:
             handleGameChatMessage(msg);
             break;
-            
+
         case CPMSG_ENTER_CHANNEL_RESPONSE:
             handleEnterChannelResponse(msg);
             break;
@@ -95,7 +95,7 @@ void ChatHandler::handleMessage(MessageIn &msg)
         case CPMSG_LIST_CHANNELUSERS_RESPONSE:
             handleListChannelUsersResponse(msg);
             break;
-        
+
         case CPMSG_CHANNEL_EVENT:
             handleChannelEvent(msg);
     }
@@ -105,15 +105,15 @@ void ChatHandler::handleGameChatMessage(MessageIn &msg)
 {
     short id = msg.readInt16();
     std::string chatMsg = msg.readString();
-    
+
     if (id == 0)
     {
         chatWindow->chatLog(chatMsg, BY_SERVER);
         return;
     }
-    
+
     Being *being = beingManager->findBeing(id);
-    
+
     if (being)
     {
         chatWindow->chatLog(being->getName() + " : " + chatMsg,
@@ -137,17 +137,23 @@ void ChatHandler::handleEnterChannelResponse(MessageIn &msg)
         channelManager->addChannel(channel);
         chatWindow->createNewChannelTab(channelName);
         chatWindow->chatLog("Topic: " + announcement, BY_CHANNEL, channelName);
-        
+
         std::string user;
+        std::string userModes;
         chatWindow->chatLog("Players in this channel:", BY_CHANNEL, channelName);
         while(msg.getUnreadLength())
         {
             user = msg.readString();
             if (user == "")
                 return;
+            userModes = msg.readString();
+            if (userModes.find('o') != std::string::npos)
+            {
+                user = "@" + user;
+            }
             chatWindow->chatLog(user, BY_CHANNEL, channelName);
         }
-        
+
     }
     else
     {
@@ -180,7 +186,7 @@ void ChatHandler::handlePrivateMessage(MessageIn &msg)
     if (!chatWindow->tabExists(userNick))
     {
         chatWindow->createNewChannelTab(userNick);
-                
+
     }
     chatWindow->chatLog(userNick + ": " + chatMsg, BY_OTHER, userNick);
 }
@@ -214,6 +220,7 @@ void ChatHandler::handleListChannelUsersResponse(MessageIn &msg)
 {
     std::string channel = msg.readString();
     std::string userNick;
+    std::string userModes;
     chatWindow->chatLog("Players in this channel:", BY_CHANNEL, channel);
     while(msg.getUnreadLength())
     {
@@ -222,6 +229,11 @@ void ChatHandler::handleListChannelUsersResponse(MessageIn &msg)
         {
             break;
         }
+        userModes = msg.readString();
+        if (userModes.find('o') != std::string::npos)
+        {
+            userNick = "@" + userNick;
+        }
         chatWindow->chatLog(userNick, BY_CHANNEL, channel);
     }
 }
@@ -232,7 +244,7 @@ void ChatHandler::handleChannelEvent(MessageIn &msg)
     char eventId = msg.readInt8();
     std::string line = msg.readString();
     Channel *channel = channelManager->findById(channelId);
-    
+
     if(channel)
     {
         switch(eventId)
@@ -240,7 +252,7 @@ void ChatHandler::handleChannelEvent(MessageIn &msg)
             case CHAT_EVENT_NEW_PLAYER:
                 line += " entered the channel.";
                 break;
-        
+
             case CHAT_EVENT_LEAVING_PLAYER:
                 line += " left the channel.";
                 break;
@@ -248,11 +260,29 @@ void ChatHandler::handleChannelEvent(MessageIn &msg)
             case CHAT_EVENT_TOPIC_CHANGE:
                 line = "Topic: " + line;
                 break;
-        
+
+            case CHAT_EVENT_MODE_CHANGE:
+            {
+                int first = line.find(":");
+                int second = line.find(":", first+1);
+                std::string user1 = line.substr(0, first);
+                std::string user2 = line.substr(first+1, second);
+                std::string mode = line.substr(second+1, line.length());
+                line = user1 + " has set mode " + mode + " on user " + user2;
+            } break;
+
+            case CHAT_EVENT_KICKED_PLAYER:
+            {
+                int first = line.find(":");
+                std::string user1 = line.substr(0, first);
+                std::string user2 = line.substr(first+1, line.length());
+                line = user1 + " has kicked " + user2;
+            } break;
+
             default:
                 line = "Unknown channel event.";
         }
-    
+
         chatWindow->chatLog(line, BY_CHANNEL, channel->getName());
     }
 }
diff --git a/src/net/chatserver/chatserver.cpp b/src/net/chatserver/chatserver.cpp
index a2dbefbb..f302a0ef 100644
--- a/src/net/chatserver/chatserver.cpp
+++ b/src/net/chatserver/chatserver.cpp
@@ -124,3 +124,25 @@ void Net::ChatServer::setChannelTopic(short channel, const std::string &topic)
 
     connection->send(msg);
 }
+
+void Net::ChatServer::setUserMode(short channel, const std::string &user,
+                                  unsigned char mode)
+{
+    MessageOut msg(PCMSG_USER_MODE);
+
+    msg.writeInt16(channel);
+    msg.writeString(user);
+    msg.writeInt8(mode);
+
+    connection->send(msg);
+}
+
+void Net::ChatServer::kickUser(short channel, const std::string &user)
+{
+    MessageOut msg(PCMSG_KICK_USER);
+
+    msg.writeInt16(channel);
+    msg.writeString(user);
+
+    connection->send(msg);
+}
diff --git a/src/net/chatserver/chatserver.h b/src/net/chatserver/chatserver.h
index 56ad46ca..10de1213 100644
--- a/src/net/chatserver/chatserver.h
+++ b/src/net/chatserver/chatserver.h
@@ -52,6 +52,10 @@ namespace Net
 
         void setChannelTopic(short channel, const std::string &topic);
 
+        void setUserMode(short channel, const std::string &user, unsigned char mode);
+
+        void kickUser(short channel, const std::string &user);
+
     }
 }
 
diff --git a/src/net/chatserver/guild.cpp b/src/net/chatserver/guild.cpp
index c1114065..fb400d5d 100644
--- a/src/net/chatserver/guild.cpp
+++ b/src/net/chatserver/guild.cpp
@@ -73,6 +73,19 @@ void Net::ChatServer::Guild::getGuildMembers(short guildId)
     Net::ChatServer::connection->send(msg);
 }
 
+void Net::ChatServer::Guild::promoteMember(const std::string &name,
+                                           short guildId, short level)
+{
+    logger->log("Sending PCMSG_GUILD_PROMOTE_MEMBER");
+    MessageOut msg(PCMSG_GUILD_PROMOTE_MEMBER);
+
+    msg.writeInt16(guildId);
+    msg.writeString(name);
+    msg.writeInt8(level);
+
+    Net::ChatServer::connection->send(msg);
+}
+
 void Net::ChatServer::Guild::quitGuild(short guildId)
 {
     logger->log("Sending PCMSG_GUILD_QUIT");
diff --git a/src/net/chatserver/guild.h b/src/net/chatserver/guild.h
index 5800c738..354ecd82 100644
--- a/src/net/chatserver/guild.h
+++ b/src/net/chatserver/guild.h
@@ -53,6 +53,12 @@ namespace Net
              */
             void getGuildMembers(short guildId);
 
+            /**
+             * Promote guild member
+             */
+            void promoteMember(const std::string &name, short guildId,
+                               short level);
+
             /**
              * Quit guild.
              */
diff --git a/src/net/guildhandler.cpp b/src/net/guildhandler.cpp
index 51393168..f6677cd8 100644
--- a/src/net/guildhandler.cpp
+++ b/src/net/guildhandler.cpp
@@ -65,8 +65,13 @@ void GuildHandler::handleMessage(MessageIn &msg)
             if(msg.readInt8() == ERRMSG_OK)
             {
                 // TODO - Acknowledge guild was created
+                chatWindow->chatLog("Guild created.");
                 joinedGuild(msg);
             }
+            else
+            {
+                chatWindow->chatLog("Error creating guild.");
+            }
         } break;
 
         case CPMSG_GUILD_INVITE_RESPONSE:
@@ -75,6 +80,7 @@ void GuildHandler::handleMessage(MessageIn &msg)
             if(msg.readInt8() == ERRMSG_OK)
             {
                 // TODO - Acknowledge invite was sent
+                chatWindow->chatLog("Invite sent.");
             }
         } break;
 
@@ -169,6 +175,22 @@ void GuildHandler::handleMessage(MessageIn &msg)
             guildWindow->openAcceptDialog(inviterName, guildName);
         } break;
 
+        case CPMSG_GUILD_PROMOTE_MEMBER_RESPONSE:
+        {
+            logger->log("Received CPMSG_GUILD_PROMOTE_MEMBER_RESPONSE");
+
+            if (msg.readInt8() == ERRMSG_OK)
+            {
+                // promotion succeeded
+                chatWindow->chatLog("Member was promoted successfully");
+            }
+            else
+            {
+                // promotion failed
+                chatWindow->chatLog("Failed to promote member");
+            }
+        }
+
         case CPMSG_GUILD_REJOIN:
         {
             logger->log("Received CPMSG_GUILD_REJOIN");
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 9213d329..bd4eaa17 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -142,6 +142,8 @@ enum {
     CPMSG_GUILD_UPDATE_LIST             = 0x0358, // W id, S name, B event
     PCMSG_GUILD_QUIT                    = 0x0360, // W id
     CPMSG_GUILD_QUIT_RESPONSE           = 0x0361, // B error
+    PCMSG_GUILD_PROMOTE_MEMBER          = 0x0365, // W guild, S name, B rights
+    CPMSG_GUILD_PROMOTE_MEMBER_RESPONSE = 0x0366, // B error
 
     CPMSG_GUILD_INVITED                 = 0x0370, // S char name, S  guild name, W id
     CPMSG_GUILD_REJOIN                  = 0x0371, // S name, W guild, W rights, W channel, S announce
@@ -172,8 +174,11 @@ enum {
     PCMSG_LIST_CHANNELS               = 0x0445, // -
     CPMSG_LIST_CHANNELS_RESPONSE      = 0x0446, // S names, W number of users
     PCMSG_LIST_CHANNELUSERS           = 0x0460, // S channel
-    CPMSG_LIST_CHANNELUSERS_RESPONSE  = 0x0461, // S channel, S users
+    CPMSG_LIST_CHANNELUSERS_RESPONSE  = 0x0461, // S channel, { S user, B mode }
     PCMSG_TOPIC_CHANGE                = 0x0462, // W channel id, S topic
+    // -- User mode
+    PCMSG_USER_MODE                   = 0x0465, // W channel id, S name, B mode
+    PCMSG_KICK_USER                   = 0x0466, // W channel id, S name
 
     XXMSG_INVALID = 0x7FFF
 };
@@ -262,7 +267,9 @@ enum {
 enum {
     CHAT_EVENT_NEW_PLAYER = 0,
     CHAT_EVENT_LEAVING_PLAYER,
-    CHAT_EVENT_TOPIC_CHANGE
+    CHAT_EVENT_TOPIC_CHANGE,
+    CHAT_EVENT_MODE_CHANGE,
+    CHAT_EVENT_KICKED_PLAYER
 };
 
 // Guild member event values
-- 
cgit v1.2.3-70-g09d2


From 438be47fa7078cd235bda7d2461024ddc222c026 Mon Sep 17 00:00:00 2001
From: David Athay <ko2fan@gmail.com>
Date: Wed, 15 Oct 2008 15:45:14 +0000
Subject: src/localplayer.cpp src/net/beinghandler.cpp src/net/protocol.h
 src/net/gameserver/player.h src/net/gameserver/player.cpp
 src/net/beinghandler.h ChangeLog tmw.cbp

---
 ChangeLog                     |  7 +++++++
 src/commandhandler.cpp        | 11 +++++++++++
 src/localplayer.cpp           |  2 +-
 src/net/beinghandler.cpp      | 10 ++++++++++
 src/net/beinghandler.h        |  1 +
 src/net/gameserver/player.cpp | 22 ++++++++++++++++++++++
 src/net/gameserver/player.h   |  3 +++
 src/net/protocol.h            |  8 ++++++++
 tmw.cbp                       |  4 ++++
 9 files changed, 67 insertions(+), 1 deletion(-)

(limited to 'src/commandhandler.cpp')

diff --git a/ChangeLog b/ChangeLog
index f5f95cb3..5d2417f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-15  David Athay  <ko2fan@gmail.com>
+
+	* src/localplayer.cpp, src/net/beinghandler.cpp, src/net/protocol.h, 
+	src/net/gameserver/player.h, src/net/gameserver/player.cpp, 
+	src/net/beinghandler.h, tmw.cbp: Added communicating change of 
+	direction to server.
+
 2008-10-10  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/gui/shop.cpp, src/gui/shop.h, src/resources/itemdb.cpp,
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 7ec48f46..58b8905d 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -93,6 +93,17 @@ void CommandHandler::handleCommand(const std::string &command)
     {
         handleOp(args);
     }
+    else if (type == "post")
+    {
+        std::string::size_type pos = args.find(' ');
+        std::string recipient(args, 0, pos);
+        std::string text(args, pos+1);
+        Net::GameServer::Player::sendLetter(recipient, text);
+    }
+    else if (type == "check")
+    {
+        Net::GameServer::Player::getLetters();
+    }
     else
     {
         chatWindow->chatLog("Unknown command");
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index f596a8d9..d272caaf 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -283,7 +283,7 @@ void LocalPlayer::walk(unsigned char dir)
     else if (dir)
     {
         // If the being can't move, just change direction
-        // TODO: Communicate this to the server (waiting on tmwserv)
+        Net::GameServer::Player::changeDir(dir);
         setDirection(dir);
     }
 }
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 7e37aa27..fc3c7d1e 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -55,6 +55,7 @@ BeingHandler::BeingHandler()
         GPMSG_BEINGS_DAMAGE,
         GPMSG_BEING_ACTION_CHANGE,
         GPMSG_BEING_LOOKS_CHANGE,
+        GPMSG_BEING_DIR_CHANGE,
         0
     };
     handledMessages = _messages;
@@ -85,6 +86,9 @@ void BeingHandler::handleMessage(MessageIn &msg)
         case GPMSG_BEING_LOOKS_CHANGE:
             handleBeingLooksChangeMessage(msg);
             break;
+        case GPMSG_BEING_DIR_CHANGE:
+            handleBeingDirChangeMessage(msg);
+            break;
     }
 }
 
@@ -319,3 +323,9 @@ void BeingHandler::handleBeingLooksChangeMessage(MessageIn &msg)
     handleLooks(static_cast< Player * >(being), msg);
 }
 
+void BeingHandler::handleBeingDirChangeMessage(MessageIn &msg)
+{
+    Being *being = beingManager->findBeing(msg.readInt16());
+    if (!being) return;
+    being->setDirection(msg.readInt8());
+}
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index d2a332a8..8ac07017 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -41,6 +41,7 @@ class BeingHandler : public MessageHandler
         void handleBeingsDamageMessage(MessageIn &msg);
         void handleBeingActionChangeMessage(MessageIn &msg);
         void handleBeingLooksChangeMessage(MessageIn &msg);
+        void handleBeingDirChangeMessage(MessageIn &msg);
 };
 
 #endif
diff --git a/src/net/gameserver/player.cpp b/src/net/gameserver/player.cpp
index d8050d2b..28fd954a 100644
--- a/src/net/gameserver/player.cpp
+++ b/src/net/gameserver/player.cpp
@@ -160,6 +160,21 @@ void Net::GameServer::Player::tradeWithNPC(int item, int amount)
     Net::GameServer::connection->send(msg);
 }
 
+void Net::GameServer::Player::sendLetter(const std::string &player,
+                                         const std::string &text)
+{
+    MessageOut msg(PGMSG_SEND_POST);
+    msg.writeString(player);
+    msg.writeString(text);
+    Net::GameServer::connection->send(msg);
+}
+
+void Net::GameServer::Player::getLetters()
+{
+    MessageOut msg(PGMSG_GET_POST);
+    Net::GameServer::connection->send(msg);
+}
+
 void Net::GameServer::Player::raiseAttribute(int attribute)
 {
     MessageOut msg(PGMSG_RAISE_ATTRIBUTE);
@@ -179,3 +194,10 @@ void Net::GameServer::Player::respawn()
     MessageOut msg(PGMSG_RESPAWN);
     Net::GameServer::connection->send(msg);
 }
+
+void Net::GameServer::Player::changeDir(unsigned char dir)
+{
+    MessageOut msg(PGMSG_DIRECTION_CHANGE);
+    msg.writeInt8(dir);
+    Net::GameServer::connection->send(msg);
+}
diff --git a/src/net/gameserver/player.h b/src/net/gameserver/player.h
index eea15c2b..fa8c1376 100644
--- a/src/net/gameserver/player.h
+++ b/src/net/gameserver/player.h
@@ -59,10 +59,13 @@ namespace Net
             void tradeItem(int slot, int amount);
             void tradeMoney(int amount);
             void tradeWithNPC(int item, int amount);
+            void sendLetter(const std::string &player, const std::string &text);
+            void getLetters();
             void raiseAttribute(int attribute);
             void lowerAttribute(int attribute);
             void respawn();
             static RespawnRequestListener respawnListener;
+            void changeDir(unsigned char dir);
         }
     }
 }
diff --git a/src/net/protocol.h b/src/net/protocol.h
index bd4eaa17..f766d2da 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -99,6 +99,8 @@ enum {
     PGMSG_WALK                     = 0x0260, // W*2 destination
     PGMSG_ACTION_CHANGE            = 0x0270, // B Action
     GPMSG_BEING_ACTION_CHANGE      = 0x0271, // W being id, B action
+    PGMSG_DIRECTION_CHANGE         = 0x0272, // B Direction
+    GPMSG_BEING_DIR_CHANGE         = 0x0273, // W being id, B direction
     GPMSG_BEINGS_MOVE              = 0x0280, // { W being id, B flags [, C position, B speed] [, W*2 destination] }*
     GPMSG_ITEMS                    = 0x0281, // { W item id, W*2 position }*
     PGMSG_ATTACK                   = 0x0290, // B direction
@@ -180,6 +182,12 @@ enum {
     PCMSG_USER_MODE                   = 0x0465, // W channel id, S name, B mode
     PCMSG_KICK_USER                   = 0x0466, // W channel id, S name
 
+    // Post
+    PGMSG_SEND_POST                 = 0x04A0, // S player, S letter, { W attachment id }
+    GPMSG_SEND_POST_RESPONSE        = 0x04A1, // B error
+    PGMSG_GET_POST                  = 0x04A2, //
+    GPMSG_GET_POST_RESPONSE         = 0x04A3, // { L sender id, S letter, { W attachment id } }
+
     XXMSG_INVALID = 0x7FFF
 };
 
diff --git a/tmw.cbp b/tmw.cbp
index d3381da3..a6d2f7df 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -217,6 +217,8 @@
 		<Unit filename="src/gui/help.h">
 			<Option target="default" />
 		</Unit>
+		<Unit filename="src/gui/icon.cpp" />
+		<Unit filename="src/gui/icon.h" />
 		<Unit filename="src/gui/inttextbox.cpp" />
 		<Unit filename="src/gui/inttextbox.h">
 			<Option target="default" />
@@ -621,6 +623,8 @@
 		<Unit filename="src/player.h">
 			<Option target="default" />
 		</Unit>
+		<Unit filename="src/position.cpp" />
+		<Unit filename="src/position.h" />
 		<Unit filename="src/properties.h">
 			<Option target="default" />
 		</Unit>
-- 
cgit v1.2.3-70-g09d2


From 01511ddb3a81eec835073bc4f30a6707ae552002 Mon Sep 17 00:00:00 2001
From: David Athay <ko2fan@gmail.com>
Date: Tue, 21 Oct 2008 13:15:29 +0000
Subject: Fixed up some of the postal system stuff for testing it.

---
 ChangeLog               |  6 ++++
 src/commandhandler.cpp  | 13 ++++++++
 src/game.cpp            |  3 ++
 src/game.h              |  1 +
 src/net/posthandler.cpp | 80 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/net/posthandler.h   | 37 +++++++++++++++++++++++
 src/net/protocol.h      |  2 +-
 7 files changed, 141 insertions(+), 1 deletion(-)
 create mode 100644 src/net/posthandler.cpp
 create mode 100644 src/net/posthandler.h

(limited to 'src/commandhandler.cpp')

diff --git a/ChangeLog b/ChangeLog
index 5d2417f3..686f8983 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-21  David Athay  <ko2fan@gmail.com>
+
+	* src/game.cpp, src/commandhandler.cpp, src/net/posthandler.h, 
+	src/net/posthandler.cpp, src/net/protocol.h, src/game.h: Fixed some of
+	the test stuff for the postal system. 
+
 2008-10-15  David Athay  <ko2fan@gmail.com>
 
 	* src/localplayer.cpp, src/net/beinghandler.cpp, src/net/protocol.h, 
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 58b8905d..66f746f3 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -96,8 +96,21 @@ void CommandHandler::handleCommand(const std::string &command)
     else if (type == "post")
     {
         std::string::size_type pos = args.find(' ');
+        if (pos == std::string::npos)
+        {
+            chatWindow->chatLog("Please include the user and message");
+            return;
+        }
         std::string recipient(args, 0, pos);
+        if (recipient == "")
+        {
+            chatWindow->chatLog("Invalid user");
+        }
         std::string text(args, pos+1);
+        if (text == "")
+        {
+            chatWindow->chatLog("Invalid message");
+        }
         Net::GameServer::Player::sendLetter(recipient, text);
     }
     else if (type == "check")
diff --git a/src/game.cpp b/src/game.cpp
index fb434be2..fc16e1ea 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -82,6 +82,7 @@
 #include "net/network.h"
 #include "net/npchandler.h"
 #include "net/partyhandler.h"
+#include "net/posthandler.h"
 #include "net/playerhandler.h"
 #include "net/tradehandler.h"
 
@@ -272,6 +273,7 @@ Game::Game():
     mNpcHandler(new NPCHandler()),
     mPartyHandler(new PartyHandler()),
     mPlayerHandler(new PlayerHandler()),
+    mPostHandler(new PostHandler()),
     mTradeHandler(new TradeHandler()),
     mLogicCounterId(0), mSecondsCounterId(0)
 {
@@ -317,6 +319,7 @@ Game::Game():
     Net::registerHandler(mNpcHandler.get());
     Net::registerHandler(mPartyHandler.get());
     Net::registerHandler(mPlayerHandler.get());
+    Net::registerHandler(mPostHandler.get());
     Net::registerHandler(mTradeHandler.get());
 }
 
diff --git a/src/game.h b/src/game.h
index cdfe025b..78c5dc80 100644
--- a/src/game.h
+++ b/src/game.h
@@ -69,6 +69,7 @@ class Game : public ConfigListener
         MessageHandlerPtr mNpcHandler;
         MessageHandlerPtr mPartyHandler;
         MessageHandlerPtr mPlayerHandler;
+        MessageHandlerPtr mPostHandler;
         MessageHandlerPtr mTradeHandler;
 
         SDL_TimerID mLogicCounterId;
diff --git a/src/net/posthandler.cpp b/src/net/posthandler.cpp
new file mode 100644
index 00000000..673d8611
--- /dev/null
+++ b/src/net/posthandler.cpp
@@ -0,0 +1,80 @@
+/*
+ *  The Mana World
+ *  Copyright 2009 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 "posthandler.h"
+
+#include <string>
+#include <sstream>
+
+#include "messagein.h"
+#include "protocol.h"
+
+#include "../gui/chat.h"
+
+PostHandler::PostHandler()
+{
+    static const Uint16 _messages[] = {
+        GPMSG_SEND_POST_RESPONSE,
+        GPMSG_GET_POST_RESPONSE,
+        0
+    };
+    handledMessages = _messages;
+}
+
+void PostHandler::handleMessage(MessageIn &msg)
+{
+    switch (msg.getId())
+    {
+        case GPMSG_SEND_POST_RESPONSE:
+        {
+            if (msg.readInt8() == ERRMSG_OK)
+            {
+                chatWindow->chatLog("Post sent successfully");
+            }
+            else
+            {
+                chatWindow->chatLog("Unable to send post");
+            }
+        } break;
+
+        case GPMSG_GET_POST_RESPONSE:
+        {
+            std::stringstream str;
+            // get the name of the sender
+            std::string sender = msg.readString();
+
+            if (sender == "")
+            {
+                chatWindow->chatLog("No post found");
+                break;
+            }
+
+            // get the message
+            std::string letter = msg.readString();
+
+            // put message together
+            str << "Message from " << sender << " says: " << letter;
+            chatWindow->chatLog(str.str());
+        } break;
+    }
+}
diff --git a/src/net/posthandler.h b/src/net/posthandler.h
new file mode 100644
index 00000000..d46b8bce
--- /dev/null
+++ b/src/net/posthandler.h
@@ -0,0 +1,37 @@
+/*
+ *  The Mana World
+ *  Copyright 2009 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_NET_POSTHANDLER_H
+#define _TMW_NET_POSTHANDLER_H
+
+#include "messagehandler.h"
+
+class PostHandler : public MessageHandler
+{
+public:
+    PostHandler();
+
+    void handleMessage(MessageIn &msg);
+};
+
+#endif
diff --git a/src/net/protocol.h b/src/net/protocol.h
index f766d2da..ad1eebdb 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -186,7 +186,7 @@ enum {
     PGMSG_SEND_POST                 = 0x04A0, // S player, S letter, { W attachment id }
     GPMSG_SEND_POST_RESPONSE        = 0x04A1, // B error
     PGMSG_GET_POST                  = 0x04A2, //
-    GPMSG_GET_POST_RESPONSE         = 0x04A3, // { L sender id, S letter, { W attachment id } }
+    GPMSG_GET_POST_RESPONSE         = 0x04A3, // { S sender name, S letter, { W attachment id } }
 
     XXMSG_INVALID = 0x7FFF
 };
-- 
cgit v1.2.3-70-g09d2


From 6d426d55fed55f2c01bdafca348cc8bbb06ee063 Mon Sep 17 00:00:00 2001
From: Roderic Morris <roderic@ccs.neu.edu>
Date: Sun, 26 Oct 2008 00:27:34 +0000
Subject: get rid of /admin commands

---
 ChangeLog              |  9 +++++++--
 src/commandhandler.cpp | 21 ---------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

(limited to 'src/commandhandler.cpp')

diff --git a/ChangeLog b/ChangeLog
index 8225ff6a..938fd1db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-25  Roderic Morris  <roderic@ccs.neu.edu>
+
+	* src/commandhandler.cpp: get rid of /admin commands (they're now
+	@ commands).
+
 2008-10-25  Chuck Miller  <shadowmil@gmail.com>
 
 	* src/localplayer.h,src/localplayer.cpp,src/game.cpp: Played around
@@ -5,7 +10,7 @@
 	better.
 
 2008-10-24  Chuck Miller  <shadowmil@gmail.com>
-	
+
 	* src/resources/iteminfo.h,src/resources/itemdb.cpp: Added attack
 	range to item's info
 	* src/localplayer.h,src/localplayer.cpp: Changed the getAttackRange
@@ -22,7 +27,7 @@
 	set
 
 2008-10-23  Chuck Miller  <shadowmil@gmail.com>
-	
+
 	* src/beingmanager.cpp: Fixed a bug causing targets not to work, and
 	added code that sets player_node's target to null if it gets deleted
 	* src/gui/viewport.cpp: Changed some values to make targets show
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 66f746f3..2475457a 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -77,10 +77,6 @@ void CommandHandler::handleCommand(const std::string &command)
     {
         handleTopic(args);
     }
-    else if (type == "admin")
-    {
-        Net::GameServer::Player::say("/" + args);
-    }
     else if (type == "clear")
     {
         handleClear();
@@ -143,27 +139,10 @@ void CommandHandler::handleHelp(const std::string &args)
         chatWindow->chatLog("/join > Join or create a channel");
         chatWindow->chatLog("/topic > Set the topic of the current channel");
         chatWindow->chatLog("/quit > Leave a channel");
-        chatWindow->chatLog("/admin > Send a command to the server (GM only)");
         chatWindow->chatLog("/clear > Clears this window");
         chatWindow->chatLog("/party > Invite a user to party");
         chatWindow->chatLog("For more information, type /help <command>");
     }
-    else if (args == "admin")
-    {
-        chatWindow->chatLog("Command: /admin <command>");
-        chatWindow->chatLog("*** only available to a GM ***");
-        chatWindow->chatLog("This command sends an admin command to the server.");
-        chatWindow->chatLog("<command> can be:");
-        chatWindow->chatLog("reload <db>");
-        chatWindow->chatLog("warp <name> <map> <x> <y>");
-        chatWindow->chatLog("item <name> <id> <quantity>");
-        chatWindow->chatLog("drop <id> <quantity>");
-        chatWindow->chatLog("money <name> <quantity>");
-        chatWindow->chatLog("spawn <id> <quantity>");
-        chatWindow->chatLog("goto <name>");
-        chatWindow->chatLog("recall <name>");
-        chatWindow->chatLog("ban <name> <duration>");
-    }
     else if (args == "announce")
     {
         chatWindow->chatLog("Command: /announce <msg>");
-- 
cgit v1.2.3-70-g09d2


From 5f61725a58daf1418548791d70ef6ec8fd58aa41 Mon Sep 17 00:00:00 2001
From: David Athay <ko2fan@gmail.com>
Date: Mon, 27 Oct 2008 16:15:59 +0000
Subject: Removed /check command.

---
 src/commandhandler.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/commandhandler.cpp')

diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 2475457a..f142af36 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -109,10 +109,6 @@ void CommandHandler::handleCommand(const std::string &command)
         }
         Net::GameServer::Player::sendLetter(recipient, text);
     }
-    else if (type == "check")
-    {
-        Net::GameServer::Player::getLetters();
-    }
     else
     {
         chatWindow->chatLog("Unknown command");
-- 
cgit v1.2.3-70-g09d2


From 2e7a4d66bd9ce5077b7a0062aff856d669e05b97 Mon Sep 17 00:00:00 2001
From: David Athay <ko2fan@gmail.com>
Date: Thu, 6 Nov 2008 16:02:12 +0000
Subject: Added interface for sending post.

---
 ChangeLog                     |   8 ++++
 src/CMakeLists.txt            |   4 +-
 src/Makefile.am               |   4 +-
 src/commandhandler.cpp        |  20 ---------
 src/game.cpp                  |  27 ++++++++---
 src/gui/npcpostdialog.cpp     | 101 ++++++++++++++++++++++++++++++++++++++++++
 src/gui/npcpostdialog.h       |  56 +++++++++++++++++++++++
 src/net/gameserver/player.cpp |   8 +---
 src/net/gameserver/player.h   |   1 -
 src/net/npchandler.cpp        |  10 +++++
 src/net/posthandler.cpp       |  80 ---------------------------------
 src/net/posthandler.h         |  37 ----------------
 src/net/protocol.h            |   9 ++--
 tmw.cbp                       |   6 +++
 14 files changed, 211 insertions(+), 160 deletions(-)
 create mode 100644 src/gui/npcpostdialog.cpp
 create mode 100644 src/gui/npcpostdialog.h
 delete mode 100644 src/net/posthandler.cpp
 delete mode 100644 src/net/posthandler.h

(limited to 'src/commandhandler.cpp')

diff --git a/ChangeLog b/ChangeLog
index 245cc590..80ff0e6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-06  David Athay  <ko2fan@gmail.com>
+
+	*  src/game.cpp, src/commandhandler.cpp, src/gui/npcpostdialog.cpp,
+	src/gui/npcpostdialog.h, src/CMakeLists.txt, src/net/posthandler.h,
+	src/net/protocol.h, src/net/npchandler.cpp, src/net/gameserver/player.h,
+	src/net/gameserver/player.cpp, src/net/posthandler.cpp, src/Makefile.am,
+	tmw.cbp: Added interface for sending post.
+
 2008-11-02  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/gui/viewport.cpp: Fixed right-clicking on NPCs.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dc190f25..20e615a4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -140,6 +140,8 @@ SET(SRCS
     gui/newskill.h
     gui/npclistdialog.cpp
     gui/npclistdialog.h
+    gui/npcpostdialog.cpp
+    gui/npcpostdialog.h
     gui/npc_text.cpp
     gui/npc_text.h
     gui/ok_dialog.cpp
@@ -249,8 +251,6 @@ SET(SRCS
     net/partyhandler.h
     net/playerhandler.cpp
     net/playerhandler.h
-    net/posthandler.cpp
-    net/posthandler.h
     net/protocol.h
     net/tradehandler.cpp
     net/tradehandler.h
diff --git a/src/Makefile.am b/src/Makefile.am
index de028f8e..aca42e7e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -92,6 +92,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/newskill.h \
 	      gui/npclistdialog.cpp \
 	      gui/npclistdialog.h \
+              gui/npcpostdialog.cpp \
+              gui/npcpostdialog.h \
 	      gui/npc_text.cpp \
 	      gui/npc_text.h \
 	      gui/ok_dialog.cpp \
@@ -201,8 +203,6 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      net/partyhandler.h \
 	      net/playerhandler.cpp \
 	      net/playerhandler.h \
-	      net/posthandler.cpp \
-	      net/posthandler.h \
 	      net/protocol.h \
 	      net/tradehandler.cpp \
 	      net/tradehandler.h \
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index f142af36..5c7b5e52 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -89,26 +89,6 @@ void CommandHandler::handleCommand(const std::string &command)
     {
         handleOp(args);
     }
-    else if (type == "post")
-    {
-        std::string::size_type pos = args.find(' ');
-        if (pos == std::string::npos)
-        {
-            chatWindow->chatLog("Please include the user and message");
-            return;
-        }
-        std::string recipient(args, 0, pos);
-        if (recipient == "")
-        {
-            chatWindow->chatLog("Invalid user");
-        }
-        std::string text(args, pos+1);
-        if (text == "")
-        {
-            chatWindow->chatLog("Invalid message");
-        }
-        Net::GameServer::Player::sendLetter(recipient, text);
-    }
     else
     {
         chatWindow->chatLog("Unknown command");
diff --git a/src/game.cpp b/src/game.cpp
index 690cf727..421c8aac 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -63,6 +63,7 @@
 #include "gui/minimap.h"
 #include "gui/ministatus.h"
 #include "gui/npclistdialog.h"
+#include "gui/npcpostdialog.h"
 #include "gui/npc_text.h"
 #include "gui/ok_dialog.h"
 #include "gui/partywindow.h"
@@ -84,7 +85,6 @@
 #include "net/network.h"
 #include "net/npchandler.h"
 #include "net/partyhandler.h"
-#include "net/posthandler.h"
 #include "net/playerhandler.h"
 #include "net/tradehandler.h"
 #include "net/effecthandler.h"
@@ -118,6 +118,7 @@ BuySellDialog *buySellDialog;
 InventoryWindow *inventoryWindow;
 NpcListDialog *npcListDialog;
 NpcTextDialog *npcTextDialog;
+NpcPostDialog *npcPostDialog;
 SkillDialog *skillDialog;
 MagicDialog *magicDialog;
 //NewSkillDialog *newSkillWindow;
@@ -205,6 +206,7 @@ void createGuiWindows()
     inventoryWindow = new InventoryWindow();
     npcTextDialog = new NpcTextDialog();
     npcListDialog = new NpcListDialog();
+    npcPostDialog = new NpcPostDialog();
     skillDialog = new SkillDialog();
     magicDialog = new MagicDialog();
     //newSkillWindow = new NewSkillDialog();
@@ -254,6 +256,7 @@ void destroyGuiWindows()
     delete inventoryWindow;
     delete npcListDialog;
     delete npcTextDialog;
+    delete npcPostDialog;
     delete skillDialog;
     delete magicDialog;
     delete setupWindow;
@@ -280,7 +283,6 @@ Game::Game():
     mNpcHandler(new NPCHandler()),
     mPartyHandler(new PartyHandler()),
     mPlayerHandler(new PlayerHandler()),
-    mPostHandler(new PostHandler()),
     mTradeHandler(new TradeHandler()),
     mEffectHandler(new EffectHandler()),
     mLogicCounterId(0), mSecondsCounterId(0)
@@ -328,7 +330,6 @@ Game::Game():
     Net::registerHandler(mNpcHandler.get());
     Net::registerHandler(mPartyHandler.get());
     Net::registerHandler(mPlayerHandler.get());
-    Net::registerHandler(mPostHandler.get());
     Net::registerHandler(mTradeHandler.get());
     Net::registerHandler(mEffectHandler.get());
 }
@@ -498,6 +499,22 @@ void Game::handleInput()
                 keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
                 return;
             }
+
+            // send straight to gui for certain windows
+            if (npcPostDialog->isVisible())
+            {
+                try
+                {
+                    guiInput->pushInput(event);
+                }
+                catch (gcn::Exception e)
+                {
+                    const char* err = e.getMessage().c_str();
+                    logger->log("Warning: guichan input exception: %s", err);
+                }
+                return;
+            }
+
             switch (event.key.keysym.sym)
             {
                 case SDLK_F1:
@@ -535,8 +552,8 @@ void Game::handleInput()
                     }
 
                     // Don not focus chat input when quit dialog is active
-		    if(quitDialog != NULL && quitDialog->isVisible())
-			break;
+                    if(quitDialog != NULL && quitDialog->isVisible())
+                        break;
 
                     // Close the Browser if opened
                     if (helpWindow->isVisible())
diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp
new file mode 100644
index 00000000..b50154a8
--- /dev/null
+++ b/src/gui/npcpostdialog.cpp
@@ -0,0 +1,101 @@
+/*
+ *  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$
+ */
+
+#include "npcpostdialog.h"
+#include "textfield.h"
+#include "button.h"
+#include "scrollarea.h"
+#include "chat.h"
+
+#include "../net/gameserver/player.h"
+#include "../utils/gettext.h"
+
+#include <guichan/widgets/label.hpp>
+
+NpcPostDialog::NpcPostDialog():
+    Window(_("NPC"))
+{
+    setContentSize(400, 180);
+
+    // create text field for receiver
+    gcn::Label *senderText = new gcn::Label("To:");
+    senderText->setPosition(5, 5);
+    mSender = new TextField();
+    mSender->setPosition(senderText->getWidth() + 5, 5);
+    mSender->setWidth(65);
+
+    // create button for sending
+    Button *sendButton = new Button(_("Send"), "send", this);
+    sendButton->setPosition(400-sendButton->getWidth(),
+                            170-sendButton->getHeight());
+    Button *cancelButton = new Button(_("Cancel"), "cancel", this);
+    cancelButton->setPosition(sendButton->getX() - (cancelButton->getWidth() + 2),
+                              sendButton->getY());
+
+    // create textfield for letter
+    mText = new TextField();
+    mText->setHeight(400 - (mSender->getHeight() + sendButton->getHeight()));
+
+    // create scroll box for letter text
+    ScrollArea *scrollArea = new ScrollArea(mText);
+    scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    scrollArea->setDimension(gcn::Rectangle(
+                5, mSender->getHeight() + 5,
+                380, 140 - (mSender->getHeight() + sendButton->getHeight())));
+
+    add(senderText);
+    add(mSender);
+    add(scrollArea);
+    add(sendButton);
+    add(cancelButton);
+
+    setLocationRelativeTo(getParent());
+}
+
+void NpcPostDialog::action(const gcn::ActionEvent &event)
+{
+    if (event.getId() == "send")
+    {
+        if (mSender->getText().empty() || mText->getText().empty())
+        {
+            chatWindow->chatLog("Failed to send as sender or letter invalid");
+        }
+        else
+        {
+            Net::GameServer::Player::sendLetter(mSender->getText(), mText->getText());
+        }
+        setVisible(false);
+        clear();
+    }
+    else if (event.getId() == "cancel")
+    {
+        setVisible(false);
+        clear();
+    }
+}
+
+void NpcPostDialog::clear()
+{
+    mSender->setText("");
+    mText->setText("");
+}
diff --git a/src/gui/npcpostdialog.h b/src/gui/npcpostdialog.h
new file mode 100644
index 00000000..33a3a8f7
--- /dev/null
+++ b/src/gui/npcpostdialog.h
@@ -0,0 +1,56 @@
+/*
+ *  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$
+ */
+
+#ifndef _TMW_GUI_NPCPOSTDIALOG_H
+#define _TMW_GUI_NPCPOSTDIALOG_H
+
+#include <guichan/actionlistener.hpp>
+
+#include "window.h"
+
+class TextField;
+
+class NpcPostDialog : public Window, public gcn::ActionListener
+{
+public:
+    /**
+     * Constructor
+     */
+    NpcPostDialog();
+
+    /**
+     * Called when receiving actions from the widgets.
+     */
+    void action(const gcn::ActionEvent &event);
+
+    /**
+     * Clear the contents of the dialog
+     */
+    void clear();
+
+private:
+    TextField *mText;
+    TextField *mSender;
+};
+
+#endif
diff --git a/src/net/gameserver/player.cpp b/src/net/gameserver/player.cpp
index 79ada480..cd85447c 100644
--- a/src/net/gameserver/player.cpp
+++ b/src/net/gameserver/player.cpp
@@ -170,18 +170,12 @@ void Net::GameServer::Player::tradeWithNPC(int item, int amount)
 void Net::GameServer::Player::sendLetter(const std::string &player,
                                          const std::string &text)
 {
-    MessageOut msg(PGMSG_SEND_POST);
+    MessageOut msg(PGMSG_NPC_POST_SEND);
     msg.writeString(player);
     msg.writeString(text);
     Net::GameServer::connection->send(msg);
 }
 
-void Net::GameServer::Player::getLetters()
-{
-    MessageOut msg(PGMSG_GET_POST);
-    Net::GameServer::connection->send(msg);
-}
-
 void Net::GameServer::Player::raiseAttribute(int attribute)
 {
     MessageOut msg(PGMSG_RAISE_ATTRIBUTE);
diff --git a/src/net/gameserver/player.h b/src/net/gameserver/player.h
index 3eba8a13..75e28270 100644
--- a/src/net/gameserver/player.h
+++ b/src/net/gameserver/player.h
@@ -61,7 +61,6 @@ namespace Net
             void tradeMoney(int amount);
             void tradeWithNPC(int item, int amount);
             void sendLetter(const std::string &player, const std::string &text);
-            void getLetters();
             void raiseAttribute(int attribute);
             void lowerAttribute(int attribute);
             void respawn();
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 58c2c9ed..4b08ed8d 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -30,15 +30,18 @@
 #include "../npc.h"
 
 #include "../gui/npclistdialog.h"
+#include "../gui/npcpostdialog.h"
 #include "../gui/npc_text.h"
 
 extern NpcListDialog *npcListDialog;
 extern NpcTextDialog *npcTextDialog;
+extern NpcPostDialog *npcPostDialog;
 
 NPCHandler::NPCHandler()
 {
     static const Uint16 _messages[] = {
         GPMSG_NPC_CHOICE,
+        GPMSG_NPC_POST,
         GPMSG_NPC_MESSAGE,
         GPMSG_NPC_ERROR,
         0
@@ -67,12 +70,19 @@ void NPCHandler::handleMessage(MessageIn &msg)
             npcListDialog->setVisible(true);
             break;
 
+        case GPMSG_NPC_POST:
+            npcTextDialog->setVisible(false);
+            npcPostDialog->clear();
+            npcPostDialog->setVisible(true);
+            break;
+
         case GPMSG_NPC_ERROR:
             current_npc = NULL;
         case GPMSG_NPC_MESSAGE:
             npcTextDialog->addText(msg.readString(msg.getUnreadLength()));
             npcListDialog->setVisible(false);
             npcTextDialog->setVisible(true);
+            npcPostDialog->setVisible(false);
             break;
     }
 }
diff --git a/src/net/posthandler.cpp b/src/net/posthandler.cpp
deleted file mode 100644
index 673d8611..00000000
--- a/src/net/posthandler.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2009 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 "posthandler.h"
-
-#include <string>
-#include <sstream>
-
-#include "messagein.h"
-#include "protocol.h"
-
-#include "../gui/chat.h"
-
-PostHandler::PostHandler()
-{
-    static const Uint16 _messages[] = {
-        GPMSG_SEND_POST_RESPONSE,
-        GPMSG_GET_POST_RESPONSE,
-        0
-    };
-    handledMessages = _messages;
-}
-
-void PostHandler::handleMessage(MessageIn &msg)
-{
-    switch (msg.getId())
-    {
-        case GPMSG_SEND_POST_RESPONSE:
-        {
-            if (msg.readInt8() == ERRMSG_OK)
-            {
-                chatWindow->chatLog("Post sent successfully");
-            }
-            else
-            {
-                chatWindow->chatLog("Unable to send post");
-            }
-        } break;
-
-        case GPMSG_GET_POST_RESPONSE:
-        {
-            std::stringstream str;
-            // get the name of the sender
-            std::string sender = msg.readString();
-
-            if (sender == "")
-            {
-                chatWindow->chatLog("No post found");
-                break;
-            }
-
-            // get the message
-            std::string letter = msg.readString();
-
-            // put message together
-            str << "Message from " << sender << " says: " << letter;
-            chatWindow->chatLog(str.str());
-        } break;
-    }
-}
diff --git a/src/net/posthandler.h b/src/net/posthandler.h
deleted file mode 100644
index d46b8bce..00000000
--- a/src/net/posthandler.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2009 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#ifndef _TMW_NET_POSTHANDLER_H
-#define _TMW_NET_POSTHANDLER_H
-
-#include "messagehandler.h"
-
-class PostHandler : public MessageHandler
-{
-public:
-    PostHandler();
-
-    void handleMessage(MessageIn &msg);
-};
-
-#endif
diff --git a/src/net/protocol.h b/src/net/protocol.h
index bbc7d2d2..c0bffb50 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -117,6 +117,9 @@ enum {
     GPMSG_NPC_SELL                 = 0x02B6, // W being id, { W item id, W amount, W cost }*
     PGMSG_NPC_BUYSELL              = 0x02B7, // W item id, W amount
     GPMSG_NPC_ERROR                = 0x02B8, // B error
+    GPMSG_NPC_POST                 = 0x02D0, // W being id
+    PGMSG_NPC_POST_SEND            = 0x02D1, // S name, S text, W item id
+    GPMSG_NPC_POST_GET             = 0x02D2, // W being id, { S name, S text, W item id }
     PGMSG_TRADE_REQUEST            = 0x02C0, // W being id
     GPMSG_TRADE_REQUEST            = 0x02C1, // W being id
     GPMSG_TRADE_START              = 0x02C2, // -
@@ -184,12 +187,6 @@ enum {
     PCMSG_USER_MODE                   = 0x0465, // W channel id, S name, B mode
     PCMSG_KICK_USER                   = 0x0466, // W channel id, S name
 
-    // Post
-    PGMSG_SEND_POST                 = 0x04A0, // S player, S letter, { W attachment id }
-    GPMSG_SEND_POST_RESPONSE        = 0x04A1, // B error
-    PGMSG_GET_POST                  = 0x04A2, //
-    GPMSG_GET_POST_RESPONSE         = 0x04A3, // { S sender name, S letter, { W attachment id } }
-
     XXMSG_INVALID = 0x7FFF
 };
 
diff --git a/tmw.cbp b/tmw.cbp
index dd5df92b..9af35d94 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -109,6 +109,8 @@
 		<Unit filename="src/configuration.h">
 			<Option target="default" />
 		</Unit>
+		<Unit filename="src/effectmanager.cpp" />
+		<Unit filename="src/effectmanager.h" />
 		<Unit filename="src/engine.cpp" />
 		<Unit filename="src/engine.h">
 			<Option target="default" />
@@ -280,6 +282,8 @@
 		<Unit filename="src/gui/npclistdialog.h">
 			<Option target="default" />
 		</Unit>
+		<Unit filename="src/gui/npcpostdialog.cpp" />
+		<Unit filename="src/gui/npcpostdialog.h" />
 		<Unit filename="src/gui/ok_dialog.cpp" />
 		<Unit filename="src/gui/ok_dialog.h">
 			<Option target="default" />
@@ -538,6 +542,8 @@
 		<Unit filename="src/net/connection.h">
 			<Option target="default" />
 		</Unit>
+		<Unit filename="src/net/effecthandler.cpp" />
+		<Unit filename="src/net/effecthandler.h" />
 		<Unit filename="src/net/gameserver/gameserver.cpp" />
 		<Unit filename="src/net/gameserver/gameserver.h">
 			<Option target="default" />
-- 
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/commandhandler.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 1a769276ce68285040bffd63bd1c01495ce411a7 Mon Sep 17 00:00:00 2001
From: David Athay <ko2fan@gmail.com>
Date: Wed, 28 Jan 2009 11:47:05 +0000
Subject: Added channel highlighting upon activity. Added /kick command to get
 rid of users from a channel

---
 src/being.h             |  4 ++--
 src/commandhandler.cpp  |  6 ++++++
 src/gui/chat.cpp        |  1 +
 src/gui/widgets/tab.cpp | 31 +++++++++++++++++++++++--------
 src/gui/widgets/tab.h   |  7 +++++++
 5 files changed, 39 insertions(+), 10 deletions(-)

(limited to 'src/commandhandler.cpp')

diff --git a/src/being.h b/src/being.h
index 0591777e..cd317859 100644
--- a/src/being.h
+++ b/src/being.h
@@ -412,8 +412,8 @@ class Being : public Sprite
 
     private:
 
-        static const int Being::DEFAULT_WIDTH = 32;
-        static const int Being::DEFAULT_HEIGHT = 32;
+        static const int DEFAULT_WIDTH = 32;
+        static const int DEFAULT_HEIGHT = 32;
 
         // Speech Bubble components
         SpeechBubble *mSpeechBubble;
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 4b1a0225..0f4d0f2f 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -87,6 +87,10 @@ void CommandHandler::handleCommand(const std::string &command)
     {
         handleOp(args);
     }
+    else if (type == "kick")
+    {
+        handleKick(args);
+    }
     else
     {
         chatWindow->chatLog("Unknown command");
@@ -115,6 +119,8 @@ void CommandHandler::handleHelp(const std::string &args)
         chatWindow->chatLog("/quit > Leave a channel");
         chatWindow->chatLog("/clear > Clears this window");
         chatWindow->chatLog("/party > Invite a user to party");
+        chatWindow->chatLog("/op > Make a user a channel operator");
+        chatWindow->chatLog("/kick > Kick a user from the channel");
         chatWindow->chatLog("For more information, type /help <command>");
     }
     else if (args == "announce")
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 1cf64c74..3d1b5643 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -411,6 +411,7 @@ void ChatWindow::sendToChannel(short channelId,
     {
         std::string channelName = channel->getName();
         chatLog(user + ": " + msg, user == player_node->getName() ? BY_PLAYER : BY_OTHER, channelName);
+        mChatTabs->getTab(channelName)->setHighlighted(true);
     }
 }
 
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index c53ac85c..b09bc5b3 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -21,8 +21,9 @@
 
 #include <algorithm>
 
-#include "tab.h"
+#include <guichan/widgets/label.hpp>
 
+#include "tab.h"
 #include "tabbedarea.h"
 
 #include "../../graphics.h"
@@ -79,6 +80,7 @@ Tab::~Tab()
 void Tab::init()
 {
     setFrameSize(0);
+    mHighlighted = false;
 
     if (mInstances == 0)
     {
@@ -109,18 +111,26 @@ void Tab::init()
 
 void Tab::draw(gcn::Graphics *graphics)
 {
-    int mode;
+    int mode = TAB_STANDARD;
 
     // check which type of tab to draw
-    if (mTabbedArea && mTabbedArea->isTabSelected(this))
-    {
-        mode = TAB_SELECTED;
-    }
-    else
+    if (mTabbedArea)
     {
-        mode = TAB_STANDARD;
+        if(mTabbedArea->isTabSelected(this))
+        {
+            mode = TAB_SELECTED;
+            // if tab is selected, it doesnt need to highlight activity
+            mLabel->setForegroundColor(gcn::Color(0, 0, 0));
+            mHighlighted = false;
+        }
+        else if (mHighlighted)
+        {
+            mode = TAB_HIGHLIGHTED;
+            mLabel->setForegroundColor(gcn::Color(255, 0, 0));
+        }
     }
 
+
     // draw tab
     static_cast<Graphics*>(graphics)->
         drawImageRect(0, 0, getWidth(), getHeight(), tabImg[mode]);
@@ -128,3 +138,8 @@ void Tab::draw(gcn::Graphics *graphics)
     // draw label
     drawChildren(graphics);
 }
+
+void Tab::setHighlighted(bool high)
+{
+    mHighlighted = high;
+}
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
index 42964b0f..65cc3fa0 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.h
@@ -47,12 +47,19 @@ class Tab : public gcn::Tab
          */
         void draw(gcn::Graphics *graphics);
 
+        /**
+         * Set tab highlighted
+         */
+        void setHighlighted(bool high);
+
     private:
         /** Load images if no other instances exist yet */
         void init();
 
         static ImageRect tabImg[4];    /**< Tab state graphics */
         static int mInstances;         /**< Number of tab instances */
+
+        bool mHighlighted;
 };
 
 #endif
-- 
cgit v1.2.3-70-g09d2