Merge commit 'v1.1.11.27' into strippedstripped1.1.11.27

Conflicts:
	data/Makefile.am

50 files changed, 37 insertions, 265 deletions

diff --git a/src/net/charhandler.h b/src/net/charhandler.h
index 72a81684c..848354e96 100644
--- a/src/net/charhandler.h
+++ b/src/net/charhandler.h
@@ -90,6 +90,8 @@ class CharHandler
 
         virtual unsigned int maxSprite() const = 0;
 
+        virtual void clear() = 0;
+
     protected:
         CharHandler() :
             mSelectedCharacter(0),
diff --git a/src/net/download.h b/src/net/download.h
index 12c0c07d7..8339dee30 100644
--- a/src/net/download.h
+++ b/src/net/download.h
@@ -28,12 +28,6 @@
 #include <stdio.h>
 #include <string>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 enum DownloadStatus
 {
     DOWNLOAD_STATUS_CANCELLED = -3,
diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h
index 2e311881f..5d1b7aa14 100644
--- a/src/net/ea/adminhandler.h
+++ b/src/net/ea/adminhandler.h
@@ -26,12 +26,6 @@
 #include "net/adminhandler.h"
 #include "net/net.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 5c3c694b3..1c2983137 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -215,10 +215,10 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, bool visible)
             int maxHP = msg.readInt32();
             if (hp && maxHP)
             {
+                dstBeing->setMaxHP(maxHP);
                 int oldHP = dstBeing->getHP();
                 if (!oldHP || oldHP > hp)
                     dstBeing->setHP(hp);
-                dstBeing->setMaxHP(maxHP);
             }
         }
         else
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index f3769943d..f47385a61 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -26,12 +26,6 @@
 #include "net/beinghandler.h"
 #include "net/net.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index 0c01959f2..63e267584 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -33,8 +33,11 @@
 #include "net/ea/loginhandler.h"
 #include "net/ea/eaprotocol.h"
 
+#include "utils/dtor.h"
 #include "utils/gettext.h"
 
+#include "resources/chardb.h"
+
 #include "debug.h"
 
 extern Net::CharHandler *charHandler;
@@ -70,7 +73,17 @@ void CharServerHandler::setCharCreateDialog(CharCreateDialog *window)
     const Token &token =
         static_cast<LoginHandler*>(Net::getLoginHandler())->getToken();
 
-    mCharCreateDialog->setAttributes(attributes, 30, 1, 9);
+    int minStat = CharDB::getMinStat();
+    if (!minStat)
+        minStat = 1;
+    int maxStat = CharDB::getMaxStat();
+    if (!maxStat)
+        maxStat = 9;
+    int sumStat = CharDB::getSumStat();
+    if (!sumStat)
+        sumStat = 30;
+
+    mCharCreateDialog->setAttributes(attributes, sumStat, minStat, maxStat);
     mCharCreateDialog->setFixedGender(true, token.sex);
 }
 
@@ -172,4 +185,10 @@ void CharServerHandler::processCharDeleteFailed(Net::MessageIn &msg A_UNUSED)
     new OkDialog(_("Error"), _("Failed to delete character."));
 }
 
+void CharServerHandler::clear()
+{
+    delete_all(mCharacters);
+    mCharacters.clear();
+}
+
 } // namespace Ea
diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h
index bd39781cd..bacde67b6 100644
--- a/src/net/ea/charserverhandler.h
+++ b/src/net/ea/charserverhandler.h
@@ -28,12 +28,6 @@
 #include "net/net.h"
 #include "net/serverinfo.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class LoginData;
 
 namespace Ea
@@ -78,6 +72,8 @@ class CharServerHandler : public Net::CharHandler
 
         virtual void processCharDeleteFailed(Net::MessageIn &msg);
 
+        virtual void clear();
+
     protected:
         virtual void readPlayerData(Net::MessageIn &msg,
                                     Net::Character *character,
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index cff9bf589..d39e6788a 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -30,12 +30,6 @@
 
 #include <queue>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h
index 6d8b88bd4..511efe357 100644
--- a/src/net/ea/gamehandler.h
+++ b/src/net/ea/gamehandler.h
@@ -29,12 +29,6 @@
 #include "net/messagein.h"
 #include "net/net.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h
index 06edb2e89..5b090ec41 100644
--- a/src/net/ea/guildhandler.h
+++ b/src/net/ea/guildhandler.h
@@ -27,12 +27,6 @@
 
 #include "net/ea/gui/guildtab.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index d99e34fc6..6db6b18ed 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -38,12 +38,6 @@
 #include <vector>
 #include <queue>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index 06c47ad5d..62ace31c8 100644
--- a/src/net/ea/loginhandler.h
+++ b/src/net/ea/loginhandler.h
@@ -31,12 +31,6 @@
 
 #include <string>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class LoginData;
 
 namespace Ea
diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h
index 44c1c5fb3..3e68c2321 100644
--- a/src/net/ea/npchandler.h
+++ b/src/net/ea/npchandler.h
@@ -29,12 +29,6 @@
 
 #include <map>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class NpcDialog;
 
 namespace Ea
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index 5fa0df29b..8373cb1c4 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -225,6 +225,7 @@ void PartyHandler::processPartySettings(Net::MessageIn &msg)
             return;
 
         Ea::partyTab = new PartyTab();
+        Ea::partyTab->loadFromLogFile("#Party");
     }
 
     // These seem to indicate the sharing mode for exp and items
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index 6ba0d0b82..596fda4f7 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -29,12 +29,6 @@
 
 #include "party.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index 57bcbdcd5..ceb4aba0b 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -27,12 +27,6 @@
 #include "net/net.h"
 #include "net/playerhandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/ea/specialhandler.h b/src/net/ea/specialhandler.h
index 06e8f8893..47b412f3e 100644
--- a/src/net/ea/specialhandler.h
+++ b/src/net/ea/specialhandler.h
@@ -27,12 +27,6 @@
 #include "net/net.h"
 #include "net/specialhandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h
index 2a27f8c31..6d623f60d 100644
--- a/src/net/ea/tradehandler.h
+++ b/src/net/ea/tradehandler.h
@@ -27,12 +27,6 @@
 #include "net/net.h"
 #include "net/tradehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/manaserv/adminhandler.cpp b/src/net/manaserv/adminhandler.cpp
index a8860d73b..a7bcf6355 100644
--- a/src/net/manaserv/adminhandler.cpp
+++ b/src/net/manaserv/adminhandler.cpp
@@ -26,6 +26,8 @@
 #include "net/manaserv/messageout.h"
 #include "net/manaserv/protocol.h"
 
+#include "debug.h"
+
 extern Net::AdminHandler *adminHandler;
 
 namespace ManaServ
diff --git a/src/net/manaserv/adminhandler.h b/src/net/manaserv/adminhandler.h
index 17d296bd6..5a71db35e 100644
--- a/src/net/manaserv/adminhandler.h
+++ b/src/net/manaserv/adminhandler.h
@@ -26,12 +26,6 @@
 #include "net/adminhandler.h"
 #include "string"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/beinghandler.h b/src/net/manaserv/beinghandler.h
index 512d3e58f..59797f8f5 100644
--- a/src/net/manaserv/beinghandler.h
+++ b/src/net/manaserv/beinghandler.h
@@ -30,12 +30,6 @@
 #include "vector.h"
 #include "map.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/buysellhandler.h b/src/net/manaserv/buysellhandler.h
index b38fdd9e7..e1a9c91e5 100644
--- a/src/net/manaserv/buysellhandler.h
+++ b/src/net/manaserv/buysellhandler.h
@@ -27,12 +27,6 @@
 
 #include "net/buysellhandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/chathandler.h b/src/net/manaserv/chathandler.h
index 3ed7717ad..e93c2dd87 100644
--- a/src/net/manaserv/chathandler.h
+++ b/src/net/manaserv/chathandler.h
@@ -28,12 +28,6 @@
 
 #include "net/manaserv/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/gamehandler.h b/src/net/manaserv/gamehandler.h
index a38052205..323b2566a 100644
--- a/src/net/manaserv/gamehandler.h
+++ b/src/net/manaserv/gamehandler.h
@@ -28,12 +28,6 @@
 
 #include "net/manaserv/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/generalhandler.h b/src/net/manaserv/generalhandler.h
index ccdddbbe6..c6614707f 100644
--- a/src/net/manaserv/generalhandler.h
+++ b/src/net/manaserv/generalhandler.h
@@ -30,12 +30,6 @@
 
 #include "net/manaserv/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/guildhandler.h b/src/net/manaserv/guildhandler.h
index 023e60b08..6a8db27c8 100644
--- a/src/net/manaserv/guildhandler.h
+++ b/src/net/manaserv/guildhandler.h
@@ -27,12 +27,6 @@
 
 #include "net/manaserv/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
@@ -62,7 +56,7 @@ public:
 
     void memberList(int guildId);
 
-    void info(int guildId A_UNUSED);
+    void info(int guildId);
 
     void changeMemberPostion(GuildMember *member, int level);
 
diff --git a/src/net/manaserv/inventoryhandler.h b/src/net/manaserv/inventoryhandler.h
index fbe53d735..ba4535d79 100644
--- a/src/net/manaserv/inventoryhandler.h
+++ b/src/net/manaserv/inventoryhandler.h
@@ -29,12 +29,6 @@
 
 #include "net/manaserv/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/loginhandler.h b/src/net/manaserv/loginhandler.h
index e60f00d92..0e8f2a4e6 100644
--- a/src/net/manaserv/loginhandler.h
+++ b/src/net/manaserv/loginhandler.h
@@ -28,12 +28,6 @@
 
 #include "net/manaserv/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class LoginData;
 
 namespace ManaServ
diff --git a/src/net/manaserv/npchandler.h b/src/net/manaserv/npchandler.h
index f48e92ecb..f91858614 100644
--- a/src/net/manaserv/npchandler.h
+++ b/src/net/manaserv/npchandler.h
@@ -29,12 +29,6 @@
 
 #include <map>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class NpcDialog;
 
 namespace ManaServ
diff --git a/src/net/manaserv/partyhandler.h b/src/net/manaserv/partyhandler.h
index 89924c962..087936d72 100644
--- a/src/net/manaserv/partyhandler.h
+++ b/src/net/manaserv/partyhandler.h
@@ -27,16 +27,11 @@
 
 #include "net/manaserv/messagehandler.h"
 
+#include "localconsts.h"
 #include "party.h"
 
 #include <string>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/playerhandler.h b/src/net/manaserv/playerhandler.h
index f00fea42a..21bbac516 100644
--- a/src/net/manaserv/playerhandler.h
+++ b/src/net/manaserv/playerhandler.h
@@ -29,12 +29,6 @@
 
 #include <guichan/actionlistener.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/specialhandler.cpp b/src/net/manaserv/specialhandler.cpp
index de45c2144..85fe7271f 100644
--- a/src/net/manaserv/specialhandler.cpp
+++ b/src/net/manaserv/specialhandler.cpp
@@ -27,6 +27,8 @@
 #include "net/manaserv/messageout.h"
 #include "net/manaserv/protocol.h"
 
+#include "debug.h"
+
 extern Net::SpecialHandler *specialHandler;
 
 namespace ManaServ
diff --git a/src/net/manaserv/specialhandler.h b/src/net/manaserv/specialhandler.h
index e7931f8ea..ccbe59fd9 100644
--- a/src/net/manaserv/specialhandler.h
+++ b/src/net/manaserv/specialhandler.h
@@ -27,12 +27,6 @@
 
 #include "net/manaserv/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/tradehandler.cpp b/src/net/manaserv/tradehandler.cpp
index be38e4019..383da9fe6 100644
--- a/src/net/manaserv/tradehandler.cpp
+++ b/src/net/manaserv/tradehandler.cpp
@@ -100,9 +100,9 @@ TradeHandler::TradeHandler():
     tradeHandler = this;
 }
 
-void TradeHandler::setAcceptTradeRequests(bool acceptTradeRequests)
+void TradeHandler::setAcceptTradeRequests(bool acceptRequests)
 {
-    mAcceptTradeRequests = acceptTradeRequests;
+    mAcceptTradeRequests = acceptRequests;
     if (mAcceptTradeRequests)
         SERVER_NOTICE(_("Accepting incoming trade requests."))
     else
diff --git a/src/net/manaserv/tradehandler.h b/src/net/manaserv/tradehandler.h
index 35c260a8e..2ca542f78 100644
--- a/src/net/manaserv/tradehandler.h
+++ b/src/net/manaserv/tradehandler.h
@@ -27,12 +27,6 @@
 
 #include "net/manaserv/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
@@ -56,7 +50,7 @@ class TradeHandler : public MessageHandler, public Net::TradeHandler
          * requests are automatically denied. When true, a popup will ask the
          * player whether he wants to trade.
          */
-        void setAcceptTradeRequests(bool acceptTradeRequests);
+        void setAcceptTradeRequests(bool acceptRequests);
 
         void request(Being *being);
 
diff --git a/src/net/messageout.h b/src/net/messageout.h
index 4445bbbe8..a169bfe2d 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -27,12 +27,6 @@
 
 #include <iosfwd>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Net
 {
 
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index 53fd4831f..d81e2421a 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index 4bd3153e8..f1256e409 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -33,12 +33,6 @@
 
 #include "net/ea/token.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class LoginData;
 
 namespace TmwAthena
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index 197ba12b3..9a88b7478 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h
index 6824ee672..ddb381058 100644
--- a/src/net/tmwa/gamehandler.h
+++ b/src/net/tmwa/gamehandler.h
@@ -31,12 +31,6 @@
 
 #include "net/ea/gamehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 9ab8d64b4..e0f29fd1d 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index d8a1cc9e7..d8d291bdd 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
@@ -64,7 +58,7 @@ class GuildHandler : public Ea::GuildHandler, public MessageHandler
 
         void memberList(int guildId);
 
-        void info(int guildId A_UNUSED);
+        void info(int guildId);
 
         void changeMemberPostion(GuildMember *member, int level);
 
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index 989ced27a..d924e8713 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -31,12 +31,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index 1e73d3c99..c13c882a7 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -33,12 +33,6 @@
 
 #include <string>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class LoginData;
 
 namespace TmwAthena
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index 624f64cbc..548346205 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -32,12 +32,6 @@
 
 #include <map>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class NpcDialog;
 
 namespace TmwAthena
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index 209ea5047..4d727a986 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -30,12 +30,6 @@
 
 #include "party.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h
index 4fd108e94..bf8e861ff 100644
--- a/src/net/tmwa/playerhandler.h
+++ b/src/net/tmwa/playerhandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/specialhandler.h b/src/net/tmwa/specialhandler.h
index 21c1b9026..50bf31c0b 100644
--- a/src/net/tmwa/specialhandler.h
+++ b/src/net/tmwa/specialhandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h
index 85c153743..3a4c8c1fc 100644
--- a/src/net/tmwa/tradehandler.h
+++ b/src/net/tmwa/tradehandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index f099efe53..57219e675 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -27,11 +27,7 @@
 
 #include <iosfwd>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
+#include "localconsts.h"
 
 namespace Net
 {
@@ -43,7 +39,6 @@ class TradeHandler
 
         virtual void request(Being *being A_UNUSED)
         { }
-//        virtual ~TradeHandler() {}
 
         virtual void respond(bool accept A_UNUSED)
         { }