Rename specialhandler to skillhandler.

4 files changed, 18 insertions, 18 deletions

diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index 5ac27b5cc..c656b944d 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -53,7 +53,7 @@
 #include "net/eathena/playerhandler.h"
 #include "net/eathena/protocol.h"
 #include "net/eathena/tradehandler.h"
-#include "net/eathena/specialhandler.h"
+#include "net/eathena/skillhandler.h"
 
 #include "net/eathena/gui/guildtab.h"
 #include "net/eathena/gui/partytab.h"
@@ -87,7 +87,7 @@ GeneralHandler::GeneralHandler() :
     mNpcHandler(new NpcHandler),
     mPartyHandler(new PartyHandler),
     mPlayerHandler(new PlayerHandler),
-    mSpecialHandler(new SpecialHandler),
+    mSkillHandler(new SkillHandler),
     mTradeHandler(new TradeHandler)
 {
     static const uint16_t _messages[] =
@@ -183,7 +183,7 @@ void GeneralHandler::load()
     mNetwork->registerHandler(mLoginHandler.get());
     mNetwork->registerHandler(mNpcHandler.get());
     mNetwork->registerHandler(mPlayerHandler.get());
-    mNetwork->registerHandler(mSpecialHandler.get());
+    mNetwork->registerHandler(mSkillHandler.get());
     mNetwork->registerHandler(mTradeHandler.get());
     mNetwork->registerHandler(mPartyHandler.get());
 }
diff --git a/src/net/eathena/generalhandler.h b/src/net/eathena/generalhandler.h
index 23b9cf66b..58c0d1e2e 100644
--- a/src/net/eathena/generalhandler.h
+++ b/src/net/eathena/generalhandler.h
@@ -77,7 +77,7 @@ class GeneralHandler final : public MessageHandler,
         MessageHandlerPtr mNpcHandler;
         MessageHandlerPtr mPartyHandler;
         MessageHandlerPtr mPlayerHandler;
-        MessageHandlerPtr mSpecialHandler;
+        MessageHandlerPtr mSkillHandler;
         MessageHandlerPtr mTradeHandler;
 };
 
diff --git a/src/net/eathena/specialhandler.cpp b/src/net/eathena/skillhandler.cpp
index e30dc6024..a36ba7435 100644
--- a/src/net/eathena/specialhandler.cpp
+++ b/src/net/eathena/skillhandler.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "net/eathena/specialhandler.h"
+#include "net/eathena/skillhandler.h"
 
 #include "logger.h"
 
@@ -28,14 +28,14 @@
 
 #include "debug.h"
 
-extern Net::SpecialHandler *specialHandler;
+extern Net::SkillHandler *skillHandler;
 
 namespace EAthena
 {
 
-SpecialHandler::SpecialHandler() :
+SkillHandler::SkillHandler() :
     MessageHandler(),
-    Ea::SpecialHandler()
+    Ea::SkillHandler()
 {
     static const uint16_t _messages[] =
     {
@@ -45,10 +45,10 @@ SpecialHandler::SpecialHandler() :
         0
     };
     handledMessages = _messages;
-    specialHandler = this;
+    skillHandler = this;
 }
 
-void SpecialHandler::handleMessage(Net::MessageIn &msg)
+void SkillHandler::handleMessage(Net::MessageIn &msg)
 {
     switch (msg.getId())
     {
@@ -69,7 +69,7 @@ void SpecialHandler::handleMessage(Net::MessageIn &msg)
     }
 }
 
-void SpecialHandler::useBeing(int id, int level, int beingId)
+void SkillHandler::useBeing(int id, int level, int beingId)
 {
     MessageOut outMsg(CMSG_SKILL_USE_BEING);
     outMsg.writeInt16(static_cast<int16_t>(id));
@@ -77,7 +77,7 @@ void SpecialHandler::useBeing(int id, int level, int beingId)
     outMsg.writeInt32(beingId);
 }
 
-void SpecialHandler::usePos(int id, int level, int x, int y)
+void SkillHandler::usePos(int id, int level, int x, int y)
 {
     MessageOut outMsg(CMSG_SKILL_USE_POSITION);
     outMsg.writeInt16(static_cast<int16_t>(level));
@@ -86,7 +86,7 @@ void SpecialHandler::usePos(int id, int level, int x, int y)
     outMsg.writeInt16(static_cast<int16_t>(y));
 }
 
-void SpecialHandler::useMap(int id, const std::string &map)
+void SkillHandler::useMap(int id, const std::string &map)
 {
     MessageOut outMsg(CMSG_SKILL_USE_MAP);
     outMsg.writeInt16(static_cast<int16_t>(id));
diff --git a/src/net/eathena/specialhandler.h b/src/net/eathena/skillhandler.h
index 8e77a8439..be2025da7 100644
--- a/src/net/eathena/specialhandler.h
+++ b/src/net/eathena/skillhandler.h
@@ -24,21 +24,21 @@
 #define NET_EATHENA_SKILLHANDLER_H
 
 #include "net/net.h"
-#include "net/specialhandler.h"
+#include "net/skillhandler.h"
 
-#include "net/ea/specialhandler.h"
+#include "net/ea/skillhandler.h"
 
 #include "net/eathena/messagehandler.h"
 
 namespace EAthena
 {
 
-class SpecialHandler final : public MessageHandler, public Ea::SpecialHandler
+class SkillHandler final : public MessageHandler, public Ea::SkillHandler
 {
     public:
-        SpecialHandler();
+        SkillHandler();
 
-        A_DELETE_COPY(SpecialHandler)
+        A_DELETE_COPY(SkillHandler)
 
         void handleMessage(Net::MessageIn &msg);