Remove undescore from variables and defines.

60 files changed, 205 insertions, 205 deletions

diff --git a/src/net/download.cpp b/src/net/download.cpp
index 59f6edd9c..c93f33c21 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -168,7 +168,7 @@ char *Download::getError()
 }
 
 int Download::downloadProgress(void *clientp, double dltotal, double dlnow,
-                               double ultotal _UNUSED_, double ulnow _UNUSED_)
+                               double ultotal A_UNUSED, double ulnow A_UNUSED)
 {
     Download *d = reinterpret_cast<Download*>(clientp);
     if (!d)
diff --git a/src/net/download.h b/src/net/download.h
index 71bb41cee..12c0c07d7 100644
--- a/src/net/download.h
+++ b/src/net/download.h
@@ -29,9 +29,9 @@
 #include <string>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 enum DownloadStatus
diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp
index 3554a9d9e..5440d14d0 100644
--- a/src/net/ea/adminhandler.cpp
+++ b/src/net/ea/adminhandler.cpp
@@ -37,7 +37,7 @@ void AdminHandler::kick(const std::string &name)
     Net::getChatHandler()->talk("@kick " + name);
 }
 
-void AdminHandler::ban(int playerId _UNUSED_)
+void AdminHandler::ban(int playerId A_UNUSED)
 {
     // Not supported
 }
@@ -47,7 +47,7 @@ void AdminHandler::ban(const std::string &name)
     Net::getChatHandler()->talk("@ban " + name);
 }
 
-void AdminHandler::unban(int playerId _UNUSED_)
+void AdminHandler::unban(int playerId A_UNUSED)
 {
     // Not supported
 }
@@ -57,8 +57,8 @@ void AdminHandler::unban(const std::string &name)
     Net::getChatHandler()->talk("@unban " + name);
 }
 
-void AdminHandler::mute(int playerId _UNUSED_, int type _UNUSED_,
-                        int limit _UNUSED_)
+void AdminHandler::mute(int playerId A_UNUSED, int type A_UNUSED,
+                        int limit A_UNUSED)
 {
     return; // Still looking into this
 }
diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h
index 67b5cdc11..6f77c0e18 100644
--- a/src/net/ea/adminhandler.h
+++ b/src/net/ea/adminhandler.h
@@ -27,9 +27,9 @@
 #include "net/net.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace Ea
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 2da19ad36..c6606fda8 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -717,7 +717,7 @@ void BeingHandler::processPlayerStop(Net::MessageIn &msg)
     }
 }
 
-void BeingHandler::processPlayerMoveToAttack(Net::MessageIn &msg _UNUSED_)
+void BeingHandler::processPlayerMoveToAttack(Net::MessageIn &msg A_UNUSED)
 {
     /*
       * This is an *advisory* message, telling the client that
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index e76cf7840..f3769943d 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -27,9 +27,9 @@
 #include "net/net.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace Ea
diff --git a/src/net/manaserv/adminhandler.cpp b/src/net/manaserv/adminhandler.cpp
index c4d4e06a2..72e7c7ca8 100644
--- a/src/net/manaserv/adminhandler.cpp
+++ b/src/net/manaserv/adminhandler.cpp
@@ -45,48 +45,48 @@ void AdminHandler::announce(const std::string &text)
     chatServerConnection->send(msg);
 }
 
-void AdminHandler::localAnnounce(const std::string &text _UNUSED_)
+void AdminHandler::localAnnounce(const std::string &text A_UNUSED)
 {
     // TODO
 }
 
-void AdminHandler::hide(bool hide _UNUSED_)
+void AdminHandler::hide(bool hide A_UNUSED)
 {
     // TODO
 }
 
-void AdminHandler::kick(int playerId _UNUSED_)
+void AdminHandler::kick(int playerId A_UNUSED)
 {
     // TODO
 }
 
-void AdminHandler::kick(const std::string &name _UNUSED_)
+void AdminHandler::kick(const std::string &name A_UNUSED)
 {
     // TODO
 }
 
-void AdminHandler::ban(int playerId _UNUSED_)
+void AdminHandler::ban(int playerId A_UNUSED)
 {
     // TODO
 }
 
-void AdminHandler::ban(const std::string &name _UNUSED_)
+void AdminHandler::ban(const std::string &name A_UNUSED)
 {
     // TODO
 }
 
-void AdminHandler::unban(int playerId _UNUSED_)
+void AdminHandler::unban(int playerId A_UNUSED)
 {
     // TODO
 }
 
-void AdminHandler::unban(const std::string &name _UNUSED_)
+void AdminHandler::unban(const std::string &name A_UNUSED)
 {
     // TODO
 }
 
-void AdminHandler::mute(int playerId _UNUSED_, int type _UNUSED_,
-                        int limit _UNUSED_)
+void AdminHandler::mute(int playerId A_UNUSED, int type A_UNUSED,
+                        int limit A_UNUSED)
 {
     // TODO
 }
diff --git a/src/net/manaserv/adminhandler.h b/src/net/manaserv/adminhandler.h
index 6f3d8146b..a91841085 100644
--- a/src/net/manaserv/adminhandler.h
+++ b/src/net/manaserv/adminhandler.h
@@ -26,9 +26,9 @@
 #include "net/adminhandler.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace ManaServ
diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index 578b947f2..23aae1f56 100644
--- a/src/net/manaserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -376,11 +376,11 @@ void BeingHandler::handleBeingDirChangeMessage(Net::MessageIn &msg)
     }
 }
 
-void BeingHandler::requestNameById(int id _UNUSED_)
+void BeingHandler::requestNameById(int id A_UNUSED)
 {
 }
 
-void BeingHandler::undress(Being *being _UNUSED_)
+void BeingHandler::undress(Being *being A_UNUSED)
 {
 }
 
diff --git a/src/net/manaserv/beinghandler.h b/src/net/manaserv/beinghandler.h
index 0a1e32f48..512d3e58f 100644
--- a/src/net/manaserv/beinghandler.h
+++ b/src/net/manaserv/beinghandler.h
@@ -31,9 +31,9 @@
 #include "map.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace ManaServ
diff --git a/src/net/manaserv/buysellhandler.cpp b/src/net/manaserv/buysellhandler.cpp
index 97ec36654..7cc0e70f2 100644
--- a/src/net/manaserv/buysellhandler.cpp
+++ b/src/net/manaserv/buysellhandler.cpp
@@ -107,26 +107,26 @@ void BuySellHandler::handleMessage(Net::MessageIn &msg)
     }
 }
 
-void BuySellHandler::requestSellList(std::string nick _UNUSED_)
+void BuySellHandler::requestSellList(std::string nick A_UNUSED)
 {
     // TODO
 }
 
-void BuySellHandler::requestBuyList(std::string nick _UNUSED_)
+void BuySellHandler::requestBuyList(std::string nick A_UNUSED)
 {
     // TODO
 }
 
-void BuySellHandler::sendBuyRequest(std::string nick _UNUSED_,
-                                    ShopItem* item _UNUSED_,
-                                    int amount _UNUSED_)
+void BuySellHandler::sendBuyRequest(std::string nick A_UNUSED,
+                                    ShopItem* item A_UNUSED,
+                                    int amount A_UNUSED)
 {
     // TODO
 }
 
-void BuySellHandler::sendSellRequest(std::string nick _UNUSED_,
-                                     ShopItem* item _UNUSED_,
-                                     int amount _UNUSED_)
+void BuySellHandler::sendSellRequest(std::string nick A_UNUSED,
+                                     ShopItem* item A_UNUSED,
+                                     int amount A_UNUSED)
 {
     // TODO
 }
diff --git a/src/net/manaserv/buysellhandler.h b/src/net/manaserv/buysellhandler.h
index f927b195a..b38fdd9e7 100644
--- a/src/net/manaserv/buysellhandler.h
+++ b/src/net/manaserv/buysellhandler.h
@@ -28,9 +28,9 @@
 #include "net/buysellhandler.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace ManaServ
diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp
index 9fc85be2d..85323b11a 100644
--- a/src/net/manaserv/chathandler.cpp
+++ b/src/net/manaserv/chathandler.cpp
@@ -384,7 +384,7 @@ void ChatHandler::talkRaw(const std::string &text)
     gameServerConnection->send(msg);
 }
 
-void ChatHandler::me(const std::string &text _UNUSED_)
+void ChatHandler::me(const std::string &text A_UNUSED)
 {
     // TODO
 }
@@ -466,7 +466,7 @@ void ChatHandler::who()
     chatServerConnection->send(msg);
 }
 
-void ChatHandler::sendRaw(const std::string &args _UNUSED_)
+void ChatHandler::sendRaw(const std::string &args A_UNUSED)
 {
 
 }
diff --git a/src/net/manaserv/chathandler.h b/src/net/manaserv/chathandler.h
index 7eb3f133f..5eb2a0ff4 100644
--- a/src/net/manaserv/chathandler.h
+++ b/src/net/manaserv/chathandler.h
@@ -29,9 +29,9 @@
 #include "net/manaserv/messagehandler.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace ManaServ
diff --git a/src/net/manaserv/gamehandler.cpp b/src/net/manaserv/gamehandler.cpp
index 97ea56eb1..21bd526d8 100644
--- a/src/net/manaserv/gamehandler.cpp
+++ b/src/net/manaserv/gamehandler.cpp
@@ -131,7 +131,7 @@ void GameHandler::quit(bool reconnectAccount)
     gameServerConnection->send(msg);
 }
 
-void GameHandler::ping(int tick _UNUSED_)
+void GameHandler::ping(int tick A_UNUSED)
 {
     // TODO
 }
diff --git a/src/net/manaserv/gamehandler.h b/src/net/manaserv/gamehandler.h
index 788d2dd8d..a38052205 100644
--- a/src/net/manaserv/gamehandler.h
+++ b/src/net/manaserv/gamehandler.h
@@ -29,9 +29,9 @@
 #include "net/manaserv/messagehandler.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace ManaServ
diff --git a/src/net/manaserv/generalhandler.h b/src/net/manaserv/generalhandler.h
index 17e45947a..90587eeb3 100644
--- a/src/net/manaserv/generalhandler.h
+++ b/src/net/manaserv/generalhandler.h
@@ -31,9 +31,9 @@
 #include "net/manaserv/messagehandler.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace ManaServ
diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp
index f074152d6..354b96762 100644
--- a/src/net/manaserv/guildhandler.cpp
+++ b/src/net/manaserv/guildhandler.cpp
@@ -286,7 +286,7 @@ void GuildHandler::invite(int guildId, Being *being)
     invite(guildId, being->getName());
 }
 
-void GuildHandler::inviteResponse(int guildId _UNUSED_, bool response _UNUSED_)
+void GuildHandler::inviteResponse(int guildId A_UNUSED, bool response A_UNUSED)
 {
     /*MessageOut msg(PCMSG_GUILD_ACCEPT);
     msg.writeString(name);
@@ -300,13 +300,13 @@ void GuildHandler::leave(int guildId)
     chatServerConnection->send(msg);
 }
 
-void GuildHandler::kick(GuildMember *member _UNUSED_,
-                        std::string reason _UNUSED_)
+void GuildHandler::kick(GuildMember *member A_UNUSED,
+                        std::string reason A_UNUSED)
 {
     // TODO
 }
 
-void GuildHandler::chat(int guildId _UNUSED_, const std::string &text _UNUSED_)
+void GuildHandler::chat(int guildId A_UNUSED, const std::string &text A_UNUSED)
 {
     // TODO
 }
@@ -318,13 +318,13 @@ void GuildHandler::memberList(int guildId)
     chatServerConnection->send(msg);
 }
 
-void GuildHandler::info(int guildId _UNUSED_)
+void GuildHandler::info(int guildId A_UNUSED)
 {
     // TODO
 }
 
-void GuildHandler::changeMemberPostion(GuildMember *member _UNUSED_,
-                                       int level _UNUSED_)
+void GuildHandler::changeMemberPostion(GuildMember *member A_UNUSED,
+                                       int level A_UNUSED)
 {
     /*MessageOut msg(PCMSG_GUILD_PROMOTE_MEMBER);
     msg.writeInt16(guildId);
@@ -333,27 +333,27 @@ void GuildHandler::changeMemberPostion(GuildMember *member _UNUSED_,
     chatServerConnection->send(msg);*/
 }
 
-void GuildHandler::requestAlliance(int guildId _UNUSED_,
-                                   int otherGuildId _UNUSED_)
+void GuildHandler::requestAlliance(int guildId A_UNUSED,
+                                   int otherGuildId A_UNUSED)
 {
     // TODO
 }
 
-void GuildHandler::requestAllianceResponse(int guildId _UNUSED_,
-                                           int otherGuildId _UNUSED_,
-                                           bool response _UNUSED_)
+void GuildHandler::requestAllianceResponse(int guildId A_UNUSED,
+                                           int otherGuildId A_UNUSED,
+                                           bool response A_UNUSED)
 {
     // TODO
 }
 
-void GuildHandler::endAlliance(int guildId _UNUSED_, int otherGuildId _UNUSED_)
+void GuildHandler::endAlliance(int guildId A_UNUSED, int otherGuildId A_UNUSED)
 {
     // TODO
 }
 
-void GuildHandler::changeNotice(int guildId  _UNUSED_,
-                                std::string msg1 _UNUSED_,
-                                std::string msg2 _UNUSED_)
+void GuildHandler::changeNotice(int guildId  A_UNUSED,
+                                std::string msg1 A_UNUSED,
+                                std::string msg2 A_UNUSED)
 {
     // TODO
 }
diff --git a/src/net/manaserv/guildhandler.h b/src/net/manaserv/guildhandler.h
index 7bf3cbce5..11fc2dfdb 100644
--- a/src/net/manaserv/guildhandler.h
+++ b/src/net/manaserv/guildhandler.h
@@ -28,9 +28,9 @@
 #include "net/manaserv/messagehandler.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace ManaServ
@@ -62,7 +62,7 @@ public:
 
     void memberList(int guildId);
 
-    void info(int guildId _UNUSED_);
+    void info(int guildId A_UNUSED);
 
     void changeMemberPostion(GuildMember *member, int level);
 
diff --git a/src/net/manaserv/inventoryhandler.cpp b/src/net/manaserv/inventoryhandler.cpp
index 111eee944..75823be51 100644
--- a/src/net/manaserv/inventoryhandler.cpp
+++ b/src/net/manaserv/inventoryhandler.cpp
@@ -182,18 +182,18 @@ void InventoryHandler::moveItem(int oldIndex, int newIndex)
     gameServerConnection->send(msg);
 }
 
-void InventoryHandler::openStorage(int type _UNUSED_)
+void InventoryHandler::openStorage(int type A_UNUSED)
 {
     // TODO
 }
 
-void InventoryHandler::closeStorage(int type _UNUSED_)
+void InventoryHandler::closeStorage(int type A_UNUSED)
 {
     // TODO
 }
 
-void InventoryHandler::moveItem(int source _UNUSED_, int slot _UNUSED_,
-                                int amount _UNUSED_, int destination _UNUSED_)
+void InventoryHandler::moveItem(int source A_UNUSED, int slot A_UNUSED,
+                                int amount A_UNUSED, int destination A_UNUSED)
 {
     // TODO
 }
diff --git a/src/net/manaserv/inventoryhandler.h b/src/net/manaserv/inventoryhandler.h
index a4b91ca31..6b24699b0 100644
--- a/src/net/manaserv/inventoryhandler.h
+++ b/src/net/manaserv/inventoryhandler.h
@@ -30,9 +30,9 @@
 #include "net/manaserv/messagehandler.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace ManaServ
diff --git a/src/net/manaserv/loginhandler.cpp b/src/net/manaserv/loginhandler.cpp
index d9b36d461..e6109ca28 100644
--- a/src/net/manaserv/loginhandler.cpp
+++ b/src/net/manaserv/loginhandler.cpp
@@ -437,7 +437,7 @@ void LoginHandler::changePassword(const std::string &username,
     accountServerConnection->send(msg);
 }
 
-void LoginHandler::chooseServer(unsigned int server _UNUSED_)
+void LoginHandler::chooseServer(unsigned int server A_UNUSED)
 {
     // TODO
 }
diff --git a/src/net/manaserv/loginhandler.h b/src/net/manaserv/loginhandler.h
index a13bbb33e..e60f00d92 100644
--- a/src/net/manaserv/loginhandler.h
+++ b/src/net/manaserv/loginhandler.h
@@ -29,9 +29,9 @@
 #include "net/manaserv/messagehandler.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class LoginData;
diff --git a/src/net/manaserv/npchandler.cpp b/src/net/manaserv/npchandler.cpp
index 2c389bc7d..efd2ab2bc 100644
--- a/src/net/manaserv/npchandler.cpp
+++ b/src/net/manaserv/npchandler.cpp
@@ -185,7 +185,7 @@ void NpcHandler::stringInput(int npcId, const std::string &value)
     gameServerConnection->send(msg);
 }
 
-void NpcHandler::sendLetter(int npcId _UNUSED_, const std::string &recipient,
+void NpcHandler::sendLetter(int npcId A_UNUSED, const std::string &recipient,
                             const std::string &text)
 {
     MessageOut msg(PGMSG_NPC_POST_SEND);
@@ -194,23 +194,23 @@ void NpcHandler::sendLetter(int npcId _UNUSED_, const std::string &recipient,
     gameServerConnection->send(msg);
 }
 
-void NpcHandler::startShopping(int beingId _UNUSED_)
+void NpcHandler::startShopping(int beingId A_UNUSED)
 {
     // TODO
 }
 
-void NpcHandler::buy(int beingId _UNUSED_)
+void NpcHandler::buy(int beingId A_UNUSED)
 {
     // TODO
 }
 
-void NpcHandler::sell(int beingId _UNUSED_)
+void NpcHandler::sell(int beingId A_UNUSED)
 {
     // TODO
 }
 
-void NpcHandler::buyItem(int beingId _UNUSED_, int itemId,
-                         unsigned char color _UNUSED_, int amount)
+void NpcHandler::buyItem(int beingId A_UNUSED, int itemId,
+                         unsigned char color A_UNUSED, int amount)
 {
     MessageOut msg(PGMSG_NPC_BUYSELL);
     msg.writeInt16(itemId);
@@ -218,7 +218,7 @@ void NpcHandler::buyItem(int beingId _UNUSED_, int itemId,
     gameServerConnection->send(msg);
 }
 
-void NpcHandler::sellItem(int beingId _UNUSED_, int itemId, int amount)
+void NpcHandler::sellItem(int beingId A_UNUSED, int itemId, int amount)
 {
     MessageOut msg(PGMSG_NPC_BUYSELL);
     msg.writeInt16(itemId);
@@ -226,7 +226,7 @@ void NpcHandler::sellItem(int beingId _UNUSED_, int itemId, int amount)
     gameServerConnection->send(msg);
 }
 
-void NpcHandler::endShopping(int beingId _UNUSED_)
+void NpcHandler::endShopping(int beingId A_UNUSED)
 {
     // TODO
 }
diff --git a/src/net/manaserv/npchandler.h b/src/net/manaserv/npchandler.h
index 6ecfb4e97..f48e92ecb 100644
--- a/src/net/manaserv/npchandler.h
+++ b/src/net/manaserv/npchandler.h
@@ -30,9 +30,9 @@
 #include <map>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class NpcDialog;
diff --git a/src/net/manaserv/partyhandler.cpp b/src/net/manaserv/partyhandler.cpp
index 1c0fdb14f..b3d69e826 100644
--- a/src/net/manaserv/partyhandler.cpp
+++ b/src/net/manaserv/partyhandler.cpp
@@ -130,12 +130,12 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
     }
 }
 
-void PartyHandler::create(const std::string &name _UNUSED_)
+void PartyHandler::create(const std::string &name A_UNUSED)
 {
     // TODO
 }
 
-void PartyHandler::join(int partyId _UNUSED_)
+void PartyHandler::join(int partyId A_UNUSED)
 {
     // TODO
 }
@@ -171,17 +171,17 @@ void PartyHandler::leave()
     chatServerConnection->send(msg);
 }
 
-void PartyHandler::kick(Being *being _UNUSED_)
+void PartyHandler::kick(Being *being A_UNUSED)
 {
     // TODO
 }
 
-void PartyHandler::kick(const std::string &name _UNUSED_)
+void PartyHandler::kick(const std::string &name A_UNUSED)
 {
     // TODO
 }
 
-void PartyHandler::chat(const std::string &text _UNUSED_)
+void PartyHandler::chat(const std::string &text A_UNUSED)
 {
     // TODO
 }
diff --git a/src/net/manaserv/partyhandler.h b/src/net/manaserv/partyhandler.h
index cbdfc5e9f..45cc39e05 100644
--- a/src/net/manaserv/partyhandler.h
+++ b/src/net/manaserv/partyhandler.h
@@ -32,9 +32,9 @@
 #include <string>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace ManaServ
@@ -69,11 +69,11 @@ public:
 
     PartyShare getShareExperience() { return PARTY_SHARE_NO; }
 
-    void setShareExperience(PartyShare share _UNUSED_) {}
+    void setShareExperience(PartyShare share A_UNUSED) {}
 
     PartyShare getShareItems() { return PARTY_SHARE_NO; }
 
-    void setShareItems(PartyShare share _UNUSED_) {}
+    void setShareItems(PartyShare share A_UNUSED) {}
 private:
     Party *mParty;
 };
diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index 54d6dc7de..5ac058b7e 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -60,7 +60,7 @@ extern Net::PlayerHandler *playerHandler;
 namespace ManaServ
 {
 
-void RespawnRequestListener::action(const gcn::ActionEvent &event _UNUSED_)
+void RespawnRequestListener::action(const gcn::ActionEvent &event A_UNUSED)
 {
     Net::getPlayerHandler()->respawn();
 
@@ -328,7 +328,7 @@ void PlayerHandler::handleMapChangeMessage(Net::MessageIn &msg)
     viewport->scrollBy(scrollOffsetX, scrollOffsetY);
 }
 
-void PlayerHandler::attack(int id, bool keep _UNUSED_)
+void PlayerHandler::attack(int id, bool keep A_UNUSED)
 {
     MessageOut msg(PGMSG_ATTACK);
     msg.writeInt16(id);
@@ -340,7 +340,7 @@ void PlayerHandler::stopAttack()
 
 }
 
-void PlayerHandler::emote(Uint8 emoteId _UNUSED_)
+void PlayerHandler::emote(Uint8 emoteId A_UNUSED)
 {
     // TODO
 }
@@ -359,7 +359,7 @@ void PlayerHandler::decreaseAttribute(int attr)
     gameServerConnection->send(msg);
 }
 
-void PlayerHandler::increaseSkill(unsigned short skillId _UNUSED_)
+void PlayerHandler::increaseSkill(unsigned short skillId A_UNUSED)
 {
     // Not used atm
 }
@@ -406,13 +406,13 @@ void PlayerHandler::respawn()
     gameServerConnection->send(msg);
 }
 
-void PlayerHandler::ignorePlayer(const std::string &player _UNUSED_,
-                                 bool ignore _UNUSED_)
+void PlayerHandler::ignorePlayer(const std::string &player A_UNUSED,
+                                 bool ignore A_UNUSED)
 {
     // TODO
 }
 
-void PlayerHandler::ignoreAll(bool ignore _UNUSED_)
+void PlayerHandler::ignoreAll(bool ignore A_UNUSED)
 {
     // TODO
 }
diff --git a/src/net/manaserv/playerhandler.h b/src/net/manaserv/playerhandler.h
index 79909d31c..2460877ec 100644
--- a/src/net/manaserv/playerhandler.h
+++ b/src/net/manaserv/playerhandler.h
@@ -30,9 +30,9 @@
 #include <guichan/actionlistener.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace ManaServ
diff --git a/src/net/manaserv/specialhandler.cpp b/src/net/manaserv/specialhandler.cpp
index 7dfcbb9cc..4f99368bc 100644
--- a/src/net/manaserv/specialhandler.cpp
+++ b/src/net/manaserv/specialhandler.cpp
@@ -39,7 +39,7 @@ SpecialHandler::SpecialHandler()
     specialHandler = this;
 }
 
-void SpecialHandler::handleMessage(Net::MessageIn &msg _UNUSED_)
+void SpecialHandler::handleMessage(Net::MessageIn &msg A_UNUSED)
 {
     // TODO
 }
@@ -51,19 +51,19 @@ void SpecialHandler::use(int id)
     gameServerConnection->send(msg);
 }
 
-void SpecialHandler::use(int id _UNUSED_, int level _UNUSED_,
-                         int beingId _UNUSED_)
+void SpecialHandler::use(int id A_UNUSED, int level A_UNUSED,
+                         int beingId A_UNUSED)
 {
     // TODO
 }
 
-void SpecialHandler::use(int id _UNUSED_, int level _UNUSED_, int x _UNUSED_,
-                         int y _UNUSED_)
+void SpecialHandler::use(int id A_UNUSED, int level A_UNUSED, int x _UNUSED_,
+                         int y A_UNUSED)
 {
     // TODO
 }
 
-void SpecialHandler::use(int id _UNUSED_, const std::string &map _UNUSED_)
+void SpecialHandler::use(int id A_UNUSED, const std::string &map A_UNUSED)
 {
     // TODO
 }
diff --git a/src/net/manaserv/specialhandler.h b/src/net/manaserv/specialhandler.h
index cc3368e96..e7931f8ea 100644
--- a/src/net/manaserv/specialhandler.h
+++ b/src/net/manaserv/specialhandler.h
@@ -28,9 +28,9 @@
 #include "net/manaserv/messagehandler.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace ManaServ
diff --git a/src/net/manaserv/tradehandler.cpp b/src/net/manaserv/tradehandler.cpp
index 5c91b5457..be38e4019 100644
--- a/src/net/manaserv/tradehandler.cpp
+++ b/src/net/manaserv/tradehandler.cpp
@@ -205,7 +205,7 @@ void TradeHandler::addItem(Item *item, int amount)
     item->increaseQuantity(-amount);
 }
 
-void TradeHandler::removeItem(int slotNum _UNUSED_, int amount _UNUSED_)
+void TradeHandler::removeItem(int slotNum A_UNUSED, int amount A_UNUSED)
 {
     // TODO
 }
diff --git a/src/net/manaserv/tradehandler.h b/src/net/manaserv/tradehandler.h
index 10f8fc9e8..35c260a8e 100644
--- a/src/net/manaserv/tradehandler.h
+++ b/src/net/manaserv/tradehandler.h
@@ -28,9 +28,9 @@
 #include "net/manaserv/messagehandler.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace ManaServ
diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp
index 24edb4079..3cdcb42e0 100644
--- a/src/net/messageout.cpp
+++ b/src/net/messageout.cpp
@@ -36,7 +36,7 @@
 namespace Net
 {
 
-MessageOut::MessageOut(short id _UNUSED_):
+MessageOut::MessageOut(short id A_UNUSED):
     mData(0),
     mDataSize(0),
     mPos(0)
diff --git a/src/net/messageout.h b/src/net/messageout.h
index 433fb73a2..3da92ab28 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -28,9 +28,9 @@
 #include <iosfwd>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace Net
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index cbd16bd39..a0d996dbf 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -89,7 +89,7 @@ void AdminHandler::localAnnounce(const std::string &text)
     outMsg.writeString(text, static_cast<int>(text.length()));
 }
 
-void AdminHandler::hide(bool hide _UNUSED_)
+void AdminHandler::hide(bool hide A_UNUSED)
 {
     MessageOut outMsg(CMSG_ADMIN_HIDE);
     outMsg.writeInt32(0); //unused
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index 6c60398fc..79f41dece 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -31,9 +31,9 @@
 #include "net/tmwa/messagehandler.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace TmwAthena
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index defe7925a..0a28a9a8c 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -409,7 +409,7 @@ void CharServerHandler::chooseCharacter(Net::Character *character)
 }
 
 void CharServerHandler::newCharacter(const std::string &name, int slot,
-                                     bool gender _UNUSED_, int hairstyle,
+                                     bool gender A_UNUSED, int hairstyle,
                                      int hairColor, unsigned char race,
                                      const std::vector<int> &stats)
 {
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index 7e843ffec..62ff2b4de 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -30,9 +30,9 @@
 #include "net/tmwa/token.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class LoginData;
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index b4ae395c3..c9862cd53 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -395,43 +395,43 @@ void ChatHandler::channelList()
     SERVER_NOTICE(_("Channels are not supported!"))
 }
 
-void ChatHandler::enterChannel(const std::string &channel _UNUSED_,
-                               const std::string &password _UNUSED_)
+void ChatHandler::enterChannel(const std::string &channel A_UNUSED,
+                               const std::string &password A_UNUSED)
 {
     SERVER_NOTICE(_("Channels are not supported!"))
 }
 
-void ChatHandler::quitChannel(int channelId _UNUSED_)
+void ChatHandler::quitChannel(int channelId A_UNUSED)
 {
     SERVER_NOTICE(_("Channels are not supported!"))
 }
 
-void ChatHandler::sendToChannel(int channelId _UNUSED_,
-                                const std::string &text _UNUSED_)
+void ChatHandler::sendToChannel(int channelId A_UNUSED,
+                                const std::string &text A_UNUSED)
 {
     SERVER_NOTICE(_("Channels are not supported!"))
 }
 
-void ChatHandler::userList(const std::string &channel _UNUSED_)
+void ChatHandler::userList(const std::string &channel A_UNUSED)
 {
     SERVER_NOTICE(_("Channels are not supported!"))
 }
 
-void ChatHandler::setChannelTopic(int channelId _UNUSED_,
-                                  const std::string &text _UNUSED_)
+void ChatHandler::setChannelTopic(int channelId A_UNUSED,
+                                  const std::string &text A_UNUSED)
 {
     SERVER_NOTICE(_("Channels are not supported!"))
 }
 
-void ChatHandler::setUserMode(int channelId _UNUSED_,
-                              const std::string &name _UNUSED_,
-                              int mode _UNUSED_)
+void ChatHandler::setUserMode(int channelId A_UNUSED,
+                              const std::string &name A_UNUSED,
+                              int mode A_UNUSED)
 {
     SERVER_NOTICE(_("Channels are not supported!"))
 }
 
-void ChatHandler::kickUser(int channelId _UNUSED_,
-                           const std::string &name _UNUSED_)
+void ChatHandler::kickUser(int channelId A_UNUSED,
+                           const std::string &name A_UNUSED)
 {
     SERVER_NOTICE(_("Channels are not supported!"))
 }
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index 1a48b0cd6..c1b1f26fa 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -31,9 +31,9 @@
 #include <queue>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace TmwAthena
diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h
index fbb623409..d6004054c 100644
--- a/src/net/tmwa/gamehandler.h
+++ b/src/net/tmwa/gamehandler.h
@@ -33,9 +33,9 @@
 #include "net/tmwa/token.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace TmwAthena
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index bccde03cb..27186fcc8 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -31,9 +31,9 @@
 #include "net/tmwa/messagehandler.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace TmwAthena
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index b70059baa..b6c230643 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -638,8 +638,8 @@ void GuildHandler::create(const std::string &name)
     msg.writeString(name, 24);
 }
 
-void GuildHandler::invite(int guildId _UNUSED_,
-                          const std::string &name _UNUSED_)
+void GuildHandler::invite(int guildId A_UNUSED,
+                          const std::string &name A_UNUSED)
 {
     if (!actorSpriteManager)
         return;
@@ -654,7 +654,7 @@ void GuildHandler::invite(int guildId _UNUSED_,
     }
 }
 
-void GuildHandler::invite(int guildId _UNUSED_, Being *being)
+void GuildHandler::invite(int guildId A_UNUSED, Being *being)
 {
     if (!being)
         return;
@@ -698,7 +698,7 @@ void GuildHandler::kick(GuildMember *member, std::string reason)
     msg.writeString(reason, 40); // Message
 }
 
-void GuildHandler::chat(int guildId _UNUSED_, const std::string &text)
+void GuildHandler::chat(int guildId A_UNUSED, const std::string &text)
 {
     if (!player_node)
         return;
@@ -709,7 +709,7 @@ void GuildHandler::chat(int guildId _UNUSED_, const std::string &text)
     msg.writeString(str, static_cast<int>(str.length()));
 }
 
-void GuildHandler::memberList(int guildId _UNUSED_)
+void GuildHandler::memberList(int guildId A_UNUSED)
 {
     // TODO four types of info requests:
     // 0 = basic info + alliance info
@@ -722,7 +722,7 @@ void GuildHandler::memberList(int guildId _UNUSED_)
     msg.writeInt32(1); // Request member list
 }
 
-void GuildHandler::info(int guildId _UNUSED_)
+void GuildHandler::info(int guildId A_UNUSED)
 {
     // TODO four types of info requests:
     // 0 = basic info + alliance info
@@ -748,20 +748,20 @@ void GuildHandler::changeMemberPostion(GuildMember *member, int level)
     msg.writeInt32(level); // pos
 }
 
-void GuildHandler::requestAlliance(int guildId _UNUSED_,
-                                   int otherGuildId _UNUSED_)
+void GuildHandler::requestAlliance(int guildId A_UNUSED,
+                                   int otherGuildId A_UNUSED)
 {
     // TODO
 }
 
-void GuildHandler::requestAllianceResponse(int guildId _UNUSED_,
-                                           int otherGuildId _UNUSED_,
-                                           bool response _UNUSED_)
+void GuildHandler::requestAllianceResponse(int guildId A_UNUSED,
+                                           int otherGuildId A_UNUSED,
+                                           bool response A_UNUSED)
 {
     // TODO
 }
 
-void GuildHandler::endAlliance(int guildId _UNUSED_, int otherGuildId _UNUSED_)
+void GuildHandler::endAlliance(int guildId A_UNUSED, int otherGuildId A_UNUSED)
 {
     // TODO
 }
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index 3171932c9..f429213a0 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -27,9 +27,9 @@
 #include "net/tmwa/messagehandler.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace TmwAthena
@@ -60,7 +60,7 @@ class GuildHandler : public Net::GuildHandler, public MessageHandler
 
         void memberList(int guildId);
 
-        void info(int guildId _UNUSED_);
+        void info(int guildId A_UNUSED);
 
         void changeMemberPostion(GuildMember *member, int level);
 
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index cc4ecabbd..734c8403e 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -618,28 +618,28 @@ void InventoryHandler::dropItem(const Item *item, int amount)
     outMsg.writeInt16(static_cast<Sint16>(amount));
 }
 
-bool InventoryHandler::canSplit(const Item *item _UNUSED_)
+bool InventoryHandler::canSplit(const Item *item A_UNUSED)
 {
     return false;
 }
 
-void InventoryHandler::splitItem(const Item *item _UNUSED_,
-                                 int amount _UNUSED_)
+void InventoryHandler::splitItem(const Item *item A_UNUSED,
+                                 int amount A_UNUSED)
 {
     // Not implemented for eAthena (possible?)
 }
 
-void InventoryHandler::moveItem(int oldIndex _UNUSED_, int newIndex _UNUSED_)
+void InventoryHandler::moveItem(int oldIndex A_UNUSED, int newIndex A_UNUSED)
 {
     // Not implemented for eAthena (possible?)
 }
 
-void InventoryHandler::openStorage(int type _UNUSED_)
+void InventoryHandler::openStorage(int type A_UNUSED)
 {
     // Doesn't apply to eAthena, since opening happens through NPCs?
 }
 
-void InventoryHandler::closeStorage(int type _UNUSED_)
+void InventoryHandler::closeStorage(int type A_UNUSED)
 {
     MessageOut outMsg(CMSG_CLOSE_STORAGE);
 }
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index 4bc45cdb3..5866f9077 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -40,9 +40,9 @@
 #include <queue>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace TmwAthena
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index b1af0900d..c7ec0984c 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -291,12 +291,12 @@ void LoginHandler::logout()
     // TODO
 }
 
-void LoginHandler::changeEmail(const std::string &email _UNUSED_)
+void LoginHandler::changeEmail(const std::string &email A_UNUSED)
 {
     // TODO
 }
 
-void LoginHandler::changePassword(const std::string &username _UNUSED_,
+void LoginHandler::changePassword(const std::string &username A_UNUSED,
                                   const std::string &oldPassword,
                                   const std::string &newPassword)
 {
@@ -331,8 +331,8 @@ void LoginHandler::registerAccount(LoginData *loginData)
     sendLoginRegister(username, loginData->password);
 }
 
-void LoginHandler::unregisterAccount(const std::string &username _UNUSED_,
-                                     const std::string &password _UNUSED_)
+void LoginHandler::unregisterAccount(const std::string &username A_UNUSED,
+                                     const std::string &password A_UNUSED)
 {
     // TODO
 }
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index 615e42107..8c6b48cc2 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -31,9 +31,9 @@
 #include <string>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class LoginData;
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index eb347db44..69b4b880a 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -197,14 +197,14 @@ void NpcHandler::stringInput(int npcId, const std::string &value)
     outMsg.writeInt8(0); // Prevent problems with string reading
 }
 
-void NpcHandler::sendLetter(int npcId _UNUSED_,
-                            const std::string &recipient _UNUSED_,
-                            const std::string &text _UNUSED_)
+void NpcHandler::sendLetter(int npcId A_UNUSED,
+                            const std::string &recipient A_UNUSED,
+                            const std::string &text A_UNUSED)
 {
     // TODO
 }
 
-void NpcHandler::startShopping(int beingId _UNUSED_)
+void NpcHandler::startShopping(int beingId A_UNUSED)
 {
     // TODO
 }
@@ -223,7 +223,7 @@ void NpcHandler::sell(int beingId)
     outMsg.writeInt8(1); // Sell
 }
 
-void NpcHandler::buyItem(int beingId _UNUSED_, int itemId,
+void NpcHandler::buyItem(int beingId A_UNUSED, int itemId,
                          unsigned char color, int amount)
 {
     MessageOut outMsg(CMSG_NPC_BUY_REQUEST);
@@ -243,7 +243,7 @@ void NpcHandler::buyItem(int beingId _UNUSED_, int itemId,
     }
 }
 
-void NpcHandler::sellItem(int beingId _UNUSED_, int itemId, int amount)
+void NpcHandler::sellItem(int beingId A_UNUSED, int itemId, int amount)
 {
     MessageOut outMsg(CMSG_NPC_SELL_REQUEST);
     outMsg.writeInt16(8); // One item (length of packet)
@@ -251,7 +251,7 @@ void NpcHandler::sellItem(int beingId _UNUSED_, int itemId, int amount)
     outMsg.writeInt16(static_cast<Sint16>(amount));
 }
 
-void NpcHandler::endShopping(int beingId _UNUSED_)
+void NpcHandler::endShopping(int beingId A_UNUSED)
 {
     // TODO
 }
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index 83d8e7981..1b4455854 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -31,9 +31,9 @@
 #include <map>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class NpcDialog;
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index eb99c2299..f057b6f5f 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -463,7 +463,7 @@ void PartyHandler::create(const std::string &name)
     outMsg.writeString(name.substr(0, 23), 24);
 }
 
-void PartyHandler::join(int partyId _UNUSED_)
+void PartyHandler::join(int partyId A_UNUSED)
 {
     // TODO?
 }
@@ -490,7 +490,7 @@ void PartyHandler::invite(const std::string &name)
     }
 }
 
-void PartyHandler::inviteResponse(const std::string &inviter _UNUSED_,
+void PartyHandler::inviteResponse(const std::string &inviter A_UNUSED,
                                   bool accept)
 {
     if (player_node)
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index 572824ed1..b2e08d12d 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -29,9 +29,9 @@
 #include "party.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace TmwAthena
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index e0f3e5c29..62027cdd4 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -64,7 +64,7 @@ namespace
      */
     struct WeightListener : public gcn::ActionListener
     {
-        void action(const gcn::ActionEvent &event _UNUSED_)
+        void action(const gcn::ActionEvent &event A_UNUSED)
         {
             weightNotice = NULL;
         }
@@ -75,7 +75,7 @@ namespace
      */
     struct DeathListener : public gcn::ActionListener
     {
-        void action(const gcn::ActionEvent &event _UNUSED_)
+        void action(const gcn::ActionEvent &event A_UNUSED)
         {
             Net::getPlayerHandler()->respawn();
             deathNotice = NULL;
@@ -675,7 +675,7 @@ void PlayerHandler::increaseAttribute(int attr)
     }
 }
 
-void PlayerHandler::decreaseAttribute(int attr _UNUSED_)
+void PlayerHandler::decreaseAttribute(int attr A_UNUSED)
 {
     // Supported by eA?
 }
@@ -748,13 +748,13 @@ void PlayerHandler::respawn()
     outMsg.writeInt8(0);
 }
 
-void PlayerHandler::ignorePlayer(const std::string &player _UNUSED_,
-                                 bool ignore _UNUSED_)
+void PlayerHandler::ignorePlayer(const std::string &player A_UNUSED,
+                                 bool ignore A_UNUSED)
 {
     // TODO
 }
 
-void PlayerHandler::ignoreAll(bool ignore _UNUSED_)
+void PlayerHandler::ignoreAll(bool ignore A_UNUSED)
 {
     // TODO
 }
diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h
index f77bd11b8..d4e232ecf 100644
--- a/src/net/tmwa/playerhandler.h
+++ b/src/net/tmwa/playerhandler.h
@@ -29,9 +29,9 @@
 #include "net/tmwa/messagehandler.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace TmwAthena
diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/specialhandler.cpp
index 1e6249a51..a2a2f3fb2 100644
--- a/src/net/tmwa/specialhandler.cpp
+++ b/src/net/tmwa/specialhandler.cpp
@@ -257,7 +257,7 @@ void SpecialHandler::handleMessage(Net::MessageIn &msg)
     }
 }
 
-void SpecialHandler::use(int id _UNUSED_)
+void SpecialHandler::use(int id A_UNUSED)
 {
     // TODO
 }
diff --git a/src/net/tmwa/specialhandler.h b/src/net/tmwa/specialhandler.h
index 9bee8b83b..6f1e53aa0 100644
--- a/src/net/tmwa/specialhandler.h
+++ b/src/net/tmwa/specialhandler.h
@@ -29,9 +29,9 @@
 #include "net/tmwa/messagehandler.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace TmwAthena
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index f7d6787d0..e1bff1634 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -332,7 +332,7 @@ void TradeHandler::addItem(Item *item, int amount)
     outMsg.writeInt32(amount);
 }
 
-void TradeHandler::removeItem(int slotNum _UNUSED_, int amount _UNUSED_)
+void TradeHandler::removeItem(int slotNum A_UNUSED, int amount A_UNUSED)
 {
     // TODO
 }
diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h
index 064f1f618..89f8d8a3a 100644
--- a/src/net/tmwa/tradehandler.h
+++ b/src/net/tmwa/tradehandler.h
@@ -29,9 +29,9 @@
 #include "net/tmwa/messagehandler.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace TmwAthena
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index eab9d2aaf..837c53eeb 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -28,9 +28,9 @@
 #include <iosfwd>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 namespace Net
@@ -38,20 +38,20 @@ namespace Net
 class TradeHandler
 {
     public:
-        virtual void request(Being *being _UNUSED_)
+        virtual void request(Being *being A_UNUSED)
         { }
 //        virtual ~TradeHandler() {}
 
-        virtual void respond(bool accept _UNUSED_)
+        virtual void respond(bool accept A_UNUSED)
         { }
 
-        virtual void addItem(Item *item _UNUSED_, int amount _UNUSED_)
+        virtual void addItem(Item *item A_UNUSED, int amount A_UNUSED)
         { }
 
-        virtual void removeItem(int slotNum _UNUSED_, int amount _UNUSED_)
+        virtual void removeItem(int slotNum A_UNUSED, int amount A_UNUSED)
         { }
 
-        virtual void setMoney(int amount _UNUSED_)
+        virtual void setMoney(int amount A_UNUSED)
         { }
 
         virtual void confirm()