Remove undescore from variables and defines.

24 files changed, 81 insertions, 81 deletions

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