summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/net/eathena/roulettehandler.cpp56
-rw-r--r--src/net/eathena/roulettehandler.h9
-rw-r--r--src/net/eathena/rouletterecv.cpp79
-rw-r--r--src/net/eathena/rouletterecv.h39
6 files changed, 127 insertions, 60 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e85b76512..e263d55ff 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1698,6 +1698,8 @@ SET(SRCS_EATHENA
net/eathena/questrecv.h
net/eathena/roulettehandler.cpp
net/eathena/roulettehandler.h
+ net/eathena/rouletterecv.cpp
+ net/eathena/rouletterecv.h
net/eathena/searchstorehandler.cpp
net/eathena/searchstorehandler.h
net/eathena/serverfeatures.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 108ccf831..68aa866ea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1544,6 +1544,8 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \
net/eathena/questrecv.h \
net/eathena/roulettehandler.cpp \
net/eathena/roulettehandler.h \
+ net/eathena/rouletterecv.cpp \
+ net/eathena/rouletterecv.h \
net/eathena/searchstorehandler.cpp \
net/eathena/searchstorehandler.h \
net/eathena/serverfeatures.cpp \
diff --git a/src/net/eathena/roulettehandler.cpp b/src/net/eathena/roulettehandler.cpp
index 09cc67db2..32420ca35 100644
--- a/src/net/eathena/roulettehandler.cpp
+++ b/src/net/eathena/roulettehandler.cpp
@@ -23,6 +23,7 @@
#include "logger.h"
#include "net/eathena/protocol.h"
+#include "net/eathena/rouletterecv.h"
#include "debug.h"
@@ -51,19 +52,19 @@ void RouletteHandler::handleMessage(Net::MessageIn &msg)
switch (msg.getId())
{
case SMSG_ROULETTE_INFO_ACK_TYPE:
- processRouletteInfoAckType(msg);
+ RouletteRecv::processRouletteInfoAckType(msg);
break;
case SMSG_ROULETTE_RECV_ITEM_ACK:
- processRouletteItemAck(msg);
+ RouletteRecv::processRouletteItemAck(msg);
break;
case SMSG_ROULETTE_GENERATE_ACK_TYPE:
- processRouletteGenerateAckType(msg);
+ RouletteRecv::processRouletteGenerateAckType(msg);
break;
case SMSG_ROULETTE_OPEN_ACK:
- processRouletteOpenAck(msg);
+ RouletteRecv::processRouletteOpenAck(msg);
break;
default:
@@ -71,51 +72,4 @@ void RouletteHandler::handleMessage(Net::MessageIn &msg)
}
}
-void RouletteHandler::processRouletteInfoAckType(Net::MessageIn &msg)
-{
- UNIMPLIMENTEDPACKET;
- const int count = (msg.readInt16("len") - 8) / 8;
- msg.readInt32("serial");
-
- for (int f = 0; f < count; f ++)
- {
- msg.readInt16("row");
- msg.readInt16("position");
- msg.readInt16("item id");
- msg.readInt16("count");
- }
-}
-
-void RouletteHandler::processRouletteItemAck(Net::MessageIn &msg)
-{
- UNIMPLIMENTEDPACKET;
- msg.readUInt8("result");
- msg.readInt16("item id");
-}
-
-void RouletteHandler::processRouletteGenerateAckType(Net::MessageIn &msg)
-{
- UNIMPLIMENTEDPACKET;
- msg.readUInt8("result");
- msg.readInt16("step");
- msg.readInt16("idx");
- msg.readInt16("item id");
- msg.readInt32("remain gold");
- msg.readInt32("remain silver");
- msg.readInt32("remain bronze");
-}
-
-void RouletteHandler::processRouletteOpenAck(Net::MessageIn &msg)
-{
- UNIMPLIMENTEDPACKET;
- msg.readUInt8("result");
- msg.readInt32("serial");
- msg.readUInt8("step");
- msg.readUInt8("idx");
- msg.readInt16("additional item id");
- msg.readInt32("gold point");
- msg.readInt32("silver point");
- msg.readInt32("bronze point");
-}
-
} // namespace EAthena
diff --git a/src/net/eathena/roulettehandler.h b/src/net/eathena/roulettehandler.h
index 965bcd322..8b69c002f 100644
--- a/src/net/eathena/roulettehandler.h
+++ b/src/net/eathena/roulettehandler.h
@@ -36,15 +36,6 @@ class RouletteHandler final : public MessageHandler,
A_DELETE_COPY(RouletteHandler)
void handleMessage(Net::MessageIn &msg) override final;
-
- protected:
- static void processRouletteInfoAckType(Net::MessageIn &msg);
-
- static void processRouletteItemAck(Net::MessageIn &msg);
-
- static void processRouletteGenerateAckType(Net::MessageIn &msg);
-
- static void processRouletteOpenAck(Net::MessageIn &msg);
};
} // namespace EAthena
diff --git a/src/net/eathena/rouletterecv.cpp b/src/net/eathena/rouletterecv.cpp
new file mode 100644
index 000000000..1363cdc47
--- /dev/null
+++ b/src/net/eathena/rouletterecv.cpp
@@ -0,0 +1,79 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2015 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/rouletterecv.h"
+
+#include "logger.h"
+
+#include "net/eathena/protocol.h"
+
+#include "debug.h"
+
+namespace EAthena
+{
+
+void RouletteRecv::processRouletteInfoAckType(Net::MessageIn &msg)
+{
+ UNIMPLIMENTEDPACKET;
+ const int count = (msg.readInt16("len") - 8) / 8;
+ msg.readInt32("serial");
+
+ for (int f = 0; f < count; f ++)
+ {
+ msg.readInt16("row");
+ msg.readInt16("position");
+ msg.readInt16("item id");
+ msg.readInt16("count");
+ }
+}
+
+void RouletteRecv::processRouletteItemAck(Net::MessageIn &msg)
+{
+ UNIMPLIMENTEDPACKET;
+ msg.readUInt8("result");
+ msg.readInt16("item id");
+}
+
+void RouletteRecv::processRouletteGenerateAckType(Net::MessageIn &msg)
+{
+ UNIMPLIMENTEDPACKET;
+ msg.readUInt8("result");
+ msg.readInt16("step");
+ msg.readInt16("idx");
+ msg.readInt16("item id");
+ msg.readInt32("remain gold");
+ msg.readInt32("remain silver");
+ msg.readInt32("remain bronze");
+}
+
+void RouletteRecv::processRouletteOpenAck(Net::MessageIn &msg)
+{
+ UNIMPLIMENTEDPACKET;
+ msg.readUInt8("result");
+ msg.readInt32("serial");
+ msg.readUInt8("step");
+ msg.readUInt8("idx");
+ msg.readInt16("additional item id");
+ msg.readInt32("gold point");
+ msg.readInt32("silver point");
+ msg.readInt32("bronze point");
+}
+
+} // namespace EAthena
diff --git a/src/net/eathena/rouletterecv.h b/src/net/eathena/rouletterecv.h
new file mode 100644
index 000000000..75b9cc6b2
--- /dev/null
+++ b/src/net/eathena/rouletterecv.h
@@ -0,0 +1,39 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2015 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_ROULETTERECV_H
+#define NET_EATHENA_ROULETTERECV_H
+
+#include "net/roulettehandler.h"
+
+#include "net/eathena/messagehandler.h"
+
+namespace EAthena
+{
+ namespace RouletteRecv
+ {
+ void processRouletteInfoAckType(Net::MessageIn &msg);
+ void processRouletteItemAck(Net::MessageIn &msg);
+ void processRouletteGenerateAckType(Net::MessageIn &msg);
+ void processRouletteOpenAck(Net::MessageIn &msg);
+ } // namespace RouletteRecv
+} // namespace EAthena
+
+#endif // NET_EATHENA_ROULETTERECV_H
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-16 10:05:35 +0000