summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/generalhandler.cpp6
-rw-r--r--src/net/tmwa/generalhandler.h2
-rw-r--r--src/net/tmwa/skillhandler.cpp (renamed from src/net/tmwa/specialhandler.cpp)22
-rw-r--r--src/net/tmwa/skillhandler.h (renamed from src/net/tmwa/specialhandler.h)10
4 files changed, 20 insertions, 20 deletions
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index dc1ae6aba..c366efc9d 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -53,7 +53,7 @@
#include "net/tmwa/playerhandler.h"
#include "net/tmwa/protocol.h"
#include "net/tmwa/tradehandler.h"
-#include "net/tmwa/specialhandler.h"
+#include "net/tmwa/skillhandler.h"
#include "net/tmwa/questhandler.h"
#include "net/tmwa/gui/guildtab.h"
@@ -88,7 +88,7 @@ GeneralHandler::GeneralHandler() :
mNpcHandler(new NpcHandler),
mPartyHandler(new PartyHandler),
mPlayerHandler(new PlayerHandler),
- mSpecialHandler(new SpecialHandler),
+ mSkillHandler(new SkillHandler),
mTradeHandler(new TradeHandler),
mQuestHandler(new QuestHandler)
{
@@ -187,7 +187,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());
mNetwork->registerHandler(mQuestHandler.get());
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index f404d939e..2fcc625d1 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -74,7 +74,7 @@ class GeneralHandler final : public MessageHandler, public Net::GeneralHandler,
MessageHandlerPtr mNpcHandler;
MessageHandlerPtr mPartyHandler;
MessageHandlerPtr mPlayerHandler;
- MessageHandlerPtr mSpecialHandler;
+ MessageHandlerPtr mSkillHandler;
MessageHandlerPtr mTradeHandler;
MessageHandlerPtr mQuestHandler;
};
diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/skillhandler.cpp
index 51f447282..72ab4b6ec 100644
--- a/src/net/tmwa/specialhandler.cpp
+++ b/src/net/tmwa/skillhandler.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "net/tmwa/specialhandler.h"
+#include "net/tmwa/skillhandler.h"
#include "logger.h"
@@ -28,14 +28,14 @@
#include "debug.h"
-extern Net::SpecialHandler *specialHandler;
+extern Net::SkillHandler *skillHandler;
namespace TmwAthena
{
-SpecialHandler::SpecialHandler() :
+SkillHandler::SkillHandler() :
MessageHandler(),
- Ea::SpecialHandler()
+ Ea::SkillHandler()
{
static const uint16_t _messages[] =
{
@@ -45,12 +45,12 @@ SpecialHandler::SpecialHandler() :
0
};
handledMessages = _messages;
- specialHandler = this;
+ skillHandler = this;
}
-void SpecialHandler::handleMessage(Net::MessageIn &msg)
+void SkillHandler::handleMessage(Net::MessageIn &msg)
{
- BLOCK_START("SpecialHandler::handleMessage")
+ BLOCK_START("SkillHandler::handleMessage")
switch (msg.getId())
{
case SMSG_PLAYER_SKILLS:
@@ -68,10 +68,10 @@ void SpecialHandler::handleMessage(Net::MessageIn &msg)
default:
break;
}
- BLOCK_END("SpecialHandler::handleMessage")
+ BLOCK_END("SkillHandler::handleMessage")
}
-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));
@@ -79,7 +79,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));
@@ -88,7 +88,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/tmwa/specialhandler.h b/src/net/tmwa/skillhandler.h
index 5a72e59b7..a7db40a2d 100644
--- a/src/net/tmwa/specialhandler.h
+++ b/src/net/tmwa/skillhandler.h
@@ -24,21 +24,21 @@
#define NET_TA_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/tmwa/messagehandler.h"
namespace TmwAthena
{
-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);