Renamed specials to abilities

To match mana/manaserv@9ff69160ea1c3c64ea7012cd70a3b50ff4373264.

13 files changed, 51 insertions, 51 deletions

diff --git a/src/net/specialhandler.h b/src/net/abilityhandler.h
index df09087d..6e3526bb 100644
--- a/src/net/specialhandler.h
+++ b/src/net/abilityhandler.h
@@ -25,10 +25,10 @@
 
 namespace Net {
 
-class SpecialHandler
+class AbilityHandler
 {
     public:
-        virtual ~SpecialHandler () {}
+        virtual ~AbilityHandler () {}
 
         virtual void use(int id) = 0;
 
diff --git a/src/net/manaserv/specialhandler.cpp b/src/net/manaserv/abilityhandler.cpp
index 0a477ff8..b5ce9d2e 100644
--- a/src/net/manaserv/specialhandler.cpp
+++ b/src/net/manaserv/abilityhandler.cpp
@@ -19,55 +19,55 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "net/manaserv/specialhandler.h"
+#include "net/manaserv/abilityhandler.h"
 
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/messageout.h"
 #include "net/manaserv/manaserv_protocol.h"
 
-extern Net::SpecialHandler *specialHandler;
+extern Net::AbilityHandler *abilityHandler;
 
 namespace ManaServ {
 
 extern Connection *gameServerConnection;
 
-SpecialHandler::SpecialHandler()
+AbilityHandler::AbilityHandler()
 {
-    specialHandler = this;
+    abilityHandler = this;
 }
 
-void SpecialHandler::handleMessage(MessageIn &msg)
+void AbilityHandler::handleMessage(MessageIn &msg)
 {
     // TODO
 }
 
-void SpecialHandler::use(int id)
+void AbilityHandler::use(int id)
 {
-    MessageOut msg(PGMSG_USE_SPECIAL_ON_BEING);
+    MessageOut msg(PGMSG_USE_ABILITY_ON_BEING);
     msg.writeInt8(id);
     msg.writeInt16(0);
     gameServerConnection->send(msg);
 }
 
-void SpecialHandler::use(int id, int level, int beingId)
+void AbilityHandler::use(int id, int level, int beingId)
 {
-    MessageOut msg(PGMSG_USE_SPECIAL_ON_BEING);
+    MessageOut msg(PGMSG_USE_ABILITY_ON_BEING);
     msg.writeInt8(id);
     msg.writeInt16(beingId);
     gameServerConnection->send(msg);
 }
 
-void SpecialHandler::use(int id, int level, int x, int y)
+void AbilityHandler::use(int id, int level, int x, int y)
 {
-    MessageOut msg(PGMSG_USE_SPECIAL_ON_POINT);
+    MessageOut msg(PGMSG_USE_ABILITY_ON_POINT);
     msg.writeInt8(id);
     msg.writeInt16(x);
     msg.writeInt16(y);
     gameServerConnection->send(msg);
 }
 
-void SpecialHandler::use(int id, const std::string &map)
+void AbilityHandler::use(int id, const std::string &map)
 {
     // TODO
 }
diff --git a/src/net/manaserv/specialhandler.h b/src/net/manaserv/abilityhandler.h
index 45793b62..69ab9c2b 100644
--- a/src/net/manaserv/specialhandler.h
+++ b/src/net/manaserv/abilityhandler.h
@@ -21,16 +21,16 @@
 
 #pragma once
 
-#include "net/specialhandler.h"
+#include "net/abilityhandler.h"
 
 #include "net/manaserv/messagehandler.h"
 
 namespace ManaServ {
 
-class SpecialHandler final : public MessageHandler, public Net::SpecialHandler
+class AbilityHandler final : public MessageHandler, public Net::AbilityHandler
 {
     public:
-        SpecialHandler();
+        AbilityHandler();
 
         void handleMessage(MessageIn &msg) override;
 
diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp
index 0692ee82..1e443c66 100644
--- a/src/net/manaserv/generalhandler.cpp
+++ b/src/net/manaserv/generalhandler.cpp
@@ -42,7 +42,7 @@
 #include "net/manaserv/npchandler.h"
 #include "net/manaserv/partyhandler.h"
 #include "net/manaserv/playerhandler.h"
-#include "net/manaserv/specialhandler.h"
+#include "net/manaserv/abilityhandler.h"
 #include "net/manaserv/tradehandler.h"
 
 #include "resources/attributes.h"
@@ -76,7 +76,7 @@ GeneralHandler::GeneralHandler():
         mPartyHandler(new PartyHandler),
         mPlayerHandler(new PlayerHandler),
         mTradeHandler(new TradeHandler),
-        mSpecialHandler(new SpecialHandler)
+        mAbilityHandler(new AbilityHandler)
 {
     initialize();
 
diff --git a/src/net/manaserv/generalhandler.h b/src/net/manaserv/generalhandler.h
index b9eb9df0..865bbd0d 100644
--- a/src/net/manaserv/generalhandler.h
+++ b/src/net/manaserv/generalhandler.h
@@ -63,7 +63,7 @@ class GeneralHandler : public Net::GeneralHandler, public EventListener
         MessageHandlerPtr mPartyHandler;
         MessageHandlerPtr mPlayerHandler;
         MessageHandlerPtr mTradeHandler;
-        MessageHandlerPtr mSpecialHandler;
+        MessageHandlerPtr mAbilityHandler;
 };
 
 } // namespace ManaServ
diff --git a/src/net/manaserv/manaserv_protocol.h b/src/net/manaserv/manaserv_protocol.h
index b30bf20b..01632215 100644
--- a/src/net/manaserv/manaserv_protocol.h
+++ b/src/net/manaserv/manaserv_protocol.h
@@ -25,7 +25,7 @@ namespace ManaServ {
 
 enum {
     PROTOCOL_VERSION = 3,
-    SUPPORTED_DB_VERSION = 21
+    SUPPORTED_DB_VERSION = 22
 };
 
 /**
@@ -138,9 +138,9 @@ enum {
     GPMSG_ITEMS                    = 0x0281, // { W item id, W*2 position }*
     PGMSG_ATTACK                   = 0x0290, // W being id
     GPMSG_BEING_ATTACK             = 0x0291, // W being id, B direction, B attack Id
-    PGMSG_USE_SPECIAL_ON_BEING     = 0x0292, // B specialID, W being id
-    GPMSG_SPECIAL_STATUS           = 0x0293, // { B specialID, D current, D max, D recharge }
-    PGMSG_USE_SPECIAL_ON_POINT     = 0x0294, // B specialID, W*2 position
+    PGMSG_USE_ABILITY_ON_BEING     = 0x0292, // B abilityID, W being id
+    GPMSG_ABILITY_STATUS           = 0x0293, // { B abilityID, D current, D max, D recharge }
+    PGMSG_USE_ABILITY_ON_POINT     = 0x0294, // B abilityID, W*2 position
     PGMSG_SAY                      = 0x02A0, // S text
     GPMSG_SAY                      = 0x02A1, // W being id, S text
     GPMSG_NPC_CHOICE               = 0x02B0, // W being id, { S text }*
diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index bf5694c6..335546be 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -75,7 +75,7 @@ PlayerHandler::PlayerHandler()
         GPMSG_LEVEL_PROGRESS,
         GPMSG_RAISE_ATTRIBUTE_RESPONSE,
         GPMSG_LOWER_ATTRIBUTE_RESPONSE,
-        GPMSG_SPECIAL_STATUS,
+        GPMSG_ABILITY_STATUS,
         0
     };
     handledMessages = _messages;
@@ -243,17 +243,17 @@ void PlayerHandler::handleMessage(MessageIn &msg)
 
         } break;
 
-        case GPMSG_SPECIAL_STATUS :
+        case GPMSG_ABILITY_STATUS:
         {
-            PlayerInfo::clearSpecialStatus();
+            PlayerInfo::clearAbilityStatus();
             while (msg.getUnreadLength())
             {
-                // { B specialID, L current, L max, L recharge }
+                // { B abilityID, L current, L max, L recharge }
                 int id = msg.readInt8();
                 int current = msg.readInt32();
                 int max = msg.readInt32();
                 int recharge = msg.readInt32();
-                PlayerInfo::setSpecialStatus(id, current, max, recharge);
+                PlayerInfo::setAbilityStatus(id, current, max, recharge);
             }
         } break;
         /*
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 3a389db2..93003280 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -34,7 +34,7 @@
 #include "net/npchandler.h"
 #include "net/partyhandler.h"
 #include "net/playerhandler.h"
-#include "net/specialhandler.h"
+#include "net/abilityhandler.h"
 #include "net/tradehandler.h"
 
 #include "net/tmwa/generalhandler.h"
@@ -54,7 +54,7 @@ Net::GuildHandler *guildHandler = nullptr;
 Net::NpcHandler *npcHandler = nullptr;
 Net::PartyHandler *partyHandler = nullptr;
 Net::PlayerHandler *playerHandler = nullptr;
-Net::SpecialHandler *specialHandler = nullptr;
+Net::AbilityHandler *abilityHandler = nullptr;
 Net::TradeHandler *tradeHandler = nullptr;
 
 Net::AdminHandler *Net::getAdminHandler()
@@ -112,9 +112,9 @@ Net::PlayerHandler *Net::getPlayerHandler()
     return playerHandler;
 }
 
-Net::SpecialHandler *Net::getSpecialHandler()
+Net::AbilityHandler *Net::getAbilityHandler()
 {
-    return specialHandler;
+    return abilityHandler;
 }
 
 Net::TradeHandler *Net::getTradeHandler()
diff --git a/src/net/net.h b/src/net/net.h
index 216c2048..ced0f7ba 100644
--- a/src/net/net.h
+++ b/src/net/net.h
@@ -44,7 +44,7 @@ class LoginHandler;
 class NpcHandler;
 class PartyHandler;
 class PlayerHandler;
-class SpecialHandler;
+class AbilityHandler;
 class TradeHandler;
 
 AdminHandler *getAdminHandler();
@@ -58,7 +58,7 @@ LoginHandler *getLoginHandler();
 NpcHandler *getNpcHandler();
 PartyHandler *getPartyHandler();
 PlayerHandler *getPlayerHandler();
-SpecialHandler *getSpecialHandler();
+AbilityHandler *getAbilityHandler();
 TradeHandler *getTradeHandler();
 
 ServerType getNetworkType();
diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/abilityhandler.cpp
index 2e22b00a..e221039c 100644
--- a/src/net/tmwa/specialhandler.cpp
+++ b/src/net/tmwa/abilityhandler.cpp
@@ -19,7 +19,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "net/tmwa/specialhandler.h"
+#include "net/tmwa/abilityhandler.h"
 
 #include "event.h"
 #include "log.h"
@@ -64,11 +64,11 @@
 /** should always be zero if failed */
 #define SKILL_FAILED      0x00
 
-extern Net::SpecialHandler *specialHandler;
+extern Net::AbilityHandler *abilityHandler;
 
 namespace TmwAthena {
 
-SpecialHandler::SpecialHandler()
+AbilityHandler::AbilityHandler()
 {
     static const Uint16 _messages[] = {
         SMSG_PLAYER_SKILLS,
@@ -77,10 +77,10 @@ SpecialHandler::SpecialHandler()
         0
     };
     handledMessages = _messages;
-    specialHandler = this;
+    abilityHandler = this;
 }
 
-void SpecialHandler::handleMessage(MessageIn &msg)
+void AbilityHandler::handleMessage(MessageIn &msg)
 {
     int skillCount;
     int skillId;
@@ -219,19 +219,19 @@ void SpecialHandler::handleMessage(MessageIn &msg)
     }
 }
 
-void SpecialHandler::use(int id)
+void AbilityHandler::use(int id)
 {
 }
 
-void SpecialHandler::use(int id, int level, int beingId)
+void AbilityHandler::use(int id, int level, int beingId)
 {
 }
 
-void SpecialHandler::use(int id, int level, int x, int y)
+void AbilityHandler::use(int id, int level, int x, int y)
 {
 }
 
-void SpecialHandler::use(int id, const std::string &map)
+void AbilityHandler::use(int id, const std::string &map)
 {
 }
 
diff --git a/src/net/tmwa/specialhandler.h b/src/net/tmwa/abilityhandler.h
index 2448b7e0..822ed737 100644
--- a/src/net/tmwa/specialhandler.h
+++ b/src/net/tmwa/abilityhandler.h
@@ -22,16 +22,16 @@
 #pragma once
 
 #include "net/net.h"
-#include "net/specialhandler.h"
+#include "net/abilityhandler.h"
 
 #include "net/tmwa/messagehandler.h"
 
 namespace TmwAthena {
 
-class SpecialHandler final : public MessageHandler, public Net::SpecialHandler
+class AbilityHandler final : public MessageHandler, public Net::AbilityHandler
 {
     public:
-        SpecialHandler();
+        AbilityHandler();
 
         void handleMessage(MessageIn &msg) override;
 
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index e1b1a9ea..2a8afb4e 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -49,7 +49,7 @@
 #include "net/tmwa/playerhandler.h"
 #include "net/tmwa/protocol.h"
 #include "net/tmwa/tradehandler.h"
-#include "net/tmwa/specialhandler.h"
+#include "net/tmwa/abilityhandler.h"
 
 #include "net/tmwa/gui/guildtab.h"
 #include "net/tmwa/gui/partytab.h"
@@ -84,7 +84,7 @@ GeneralHandler::GeneralHandler():
     mNpcHandler(new NpcHandler),
     mPartyHandler(new PartyHandler),
     mPlayerHandler(new PlayerHandler),
-    mSpecialHandler(new SpecialHandler),
+    mAbilityHandler(new AbilityHandler),
     mTradeHandler(new TradeHandler)
 {
     static const Uint16 _messages[] = {
@@ -169,7 +169,7 @@ void GeneralHandler::load()
     mNetwork->registerHandler(mLoginHandler.get());
     mNetwork->registerHandler(mNpcHandler.get());
     mNetwork->registerHandler(mPlayerHandler.get());
-    mNetwork->registerHandler(mSpecialHandler.get());
+    mNetwork->registerHandler(mAbilityHandler.get());
     mNetwork->registerHandler(mTradeHandler.get());
     mNetwork->registerHandler(mPartyHandler.get());
 }
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 26c6fe27..529c1661 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -66,7 +66,7 @@ class GeneralHandler final : public MessageHandler, public Net::GeneralHandler,
         MessageHandlerPtr mNpcHandler;
         MessageHandlerPtr mPartyHandler;
         MessageHandlerPtr mPlayerHandler;
-        MessageHandlerPtr mSpecialHandler;
+        MessageHandlerPtr mAbilityHandler;
         MessageHandlerPtr mTradeHandler;
 };