summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-08 00:53:50 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-08 00:53:50 +0300
commitb165b310ed35a078d6b3b479a4810bce884da1c2 (patch)
tree2dd5448157e59c09a8af37c27203ad621f4d0a8b
parent08c3c35325813bf897686464dfffeaa0d339f3f7 (diff)
downloadmanaplus-b165b310ed35a078d6b3b479a4810bce884da1c2.tar.gz
manaplus-b165b310ed35a078d6b3b479a4810bce884da1c2.tar.bz2
manaplus-b165b310ed35a078d6b3b479a4810bce884da1c2.tar.xz
manaplus-b165b310ed35a078d6b3b479a4810bce884da1c2.zip
eathena: add pethandler.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/net/eathena/generalhandler.cpp3
-rw-r--r--src/net/eathena/generalhandler.h1
-rw-r--r--src/net/eathena/pethandler.cpp77
-rw-r--r--src/net/eathena/pethandler.h58
6 files changed, 143 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4c9482795..c569a3335 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1355,6 +1355,8 @@ SET(SRCS_EATHENA
net/eathena/packets.h
net/eathena/partyhandler.cpp
net/eathena/partyhandler.h
+ net/eathena/pethandler.cpp
+ net/eathena/pethandler.h
net/eathena/playerhandler.cpp
net/eathena/playerhandler.h
net/eathena/protocol.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a45d810c..61a992e03 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1285,6 +1285,8 @@ manaplus_SOURCES += net/eathena/adminhandler.cpp \
net/eathena/packets.h \
net/eathena/partyhandler.cpp \
net/eathena/partyhandler.h \
+ net/eathena/pethandler.cpp \
+ net/eathena/pethandler.h \
net/eathena/playerhandler.cpp \
net/eathena/playerhandler.h \
net/eathena/protocol.h \
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index 0a838c248..fb248c80c 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -52,6 +52,7 @@
#include "net/eathena/network.h"
#include "net/eathena/npchandler.h"
#include "net/eathena/partyhandler.h"
+#include "net/eathena/pethandler.h"
#include "net/eathena/playerhandler.h"
#include "net/eathena/protocol.h"
#include "net/eathena/serverfeatures.h"
@@ -88,6 +89,7 @@ GeneralHandler::GeneralHandler() :
mLoginHandler(new LoginHandler),
mNpcHandler(new NpcHandler),
mPartyHandler(new PartyHandler),
+ mPetHandler(new PetHandler),
mPlayerHandler(new PlayerHandler),
mSkillHandler(new SkillHandler),
mTradeHandler(new TradeHandler),
@@ -188,6 +190,7 @@ void GeneralHandler::load()
mNetwork->registerHandler(mSkillHandler.get());
mNetwork->registerHandler(mTradeHandler.get());
mNetwork->registerHandler(mPartyHandler.get());
+ mNetwork->registerHandler(mPetHandler.get());
mNetwork->registerHandler(mQuestHandler.get());
}
diff --git a/src/net/eathena/generalhandler.h b/src/net/eathena/generalhandler.h
index edce8330e..0a3dc5c17 100644
--- a/src/net/eathena/generalhandler.h
+++ b/src/net/eathena/generalhandler.h
@@ -73,6 +73,7 @@ class GeneralHandler final : public MessageHandler,
MessageHandlerPtr mLoginHandler;
MessageHandlerPtr mNpcHandler;
MessageHandlerPtr mPartyHandler;
+ MessageHandlerPtr mPetHandler;
MessageHandlerPtr mPlayerHandler;
MessageHandlerPtr mSkillHandler;
MessageHandlerPtr mTradeHandler;
diff --git a/src/net/eathena/pethandler.cpp b/src/net/eathena/pethandler.cpp
new file mode 100644
index 000000000..f96176c38
--- /dev/null
+++ b/src/net/eathena/pethandler.cpp
@@ -0,0 +1,77 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2013-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "net/eathena/pethandler.h"
+
+#include "gui/chatconsts.h"
+
+#include "net/net.h"
+
+#include "net/chathandler.h"
+
+#include "debug.h"
+
+extern Net::PetHandler *petHandler;
+
+namespace EAthena
+{
+
+PetHandler::PetHandler() :
+ MessageHandler(),
+ mRandCounter(1000)
+{
+ static const uint16_t _messages[] =
+ {
+ 0
+ };
+ handledMessages = _messages;
+ petHandler = this;
+}
+
+void PetHandler::handleMessage(Net::MessageIn &msg A_UNUSED)
+{
+ BLOCK_START("PetHandler::handleMessage")
+ BLOCK_END("PetHandler::handleMessage")
+}
+
+void PetHandler::move(const Being *const being A_UNUSED,
+ const int petId A_UNUSED,
+ const int x1 A_UNUSED, const int y1 A_UNUSED,
+ const int x2 A_UNUSED, const int y2 A_UNUSED) const
+{
+}
+
+void PetHandler::spawn(const Being *const being A_UNUSED,
+ const int petId A_UNUSED,
+ const int x A_UNUSED, const int y A_UNUSED) const
+{
+}
+
+void PetHandler::emote(const uint8_t emoteId, const int petId A_UNUSED)
+{
+ mRandCounter ++;
+ if (mRandCounter > 10000)
+ mRandCounter = 1000;
+
+ Net::getChatHandler()->talk(strprintf("\302\202\302e%dz%d",
+ static_cast<int>(emoteId), mRandCounter), GENERAL_CHANNEL);
+}
+
+} // namespace EAthena
diff --git a/src/net/eathena/pethandler.h b/src/net/eathena/pethandler.h
new file mode 100644
index 000000000..7ddb7422b
--- /dev/null
+++ b/src/net/eathena/pethandler.h
@@ -0,0 +1,58 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2013-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_EATHENA_PETHANDLER_H
+#define NET_EATHENA_PETHANDLER_H
+
+#include "net/eathena/messagehandler.h"
+
+#include "net/pethandler.h"
+
+namespace EAthena
+{
+
+class PetHandler final : public MessageHandler, public Net::PetHandler
+{
+ public:
+ PetHandler();
+
+ A_DELETE_COPY(PetHandler)
+
+ void handleMessage(Net::MessageIn &msg) override final;
+
+ void move(const Being *const being,
+ const int petId,
+ const int x1, const int y1,
+ const int x2, const int y2) const override final;
+
+ void spawn(const Being *const being,
+ const int petId,
+ const int x, const int y) const override final;
+
+ void emote(const uint8_t emoteId,
+ const int petId) override final;
+
+ protected:
+ int mRandCounter;
+};
+
+} // namespace EAthena
+
+#endif // NET_EATHENA_PETHANDLER_H