diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-08-24 15:01:08 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-08-24 16:13:51 +0300 |
commit | df44755b11b98f313e79c79fb04a5726fa990ff8 (patch) | |
tree | eaf086effd4ae91da30ba12595481d44c2f27fd5 | |
parent | 10de3936d6da2fa17565d36715ea5af81727a5c8 (diff) | |
download | manaplus-df44755b11b98f313e79c79fb04a5726fa990ff8.tar.gz manaplus-df44755b11b98f313e79c79fb04a5726fa990ff8.tar.bz2 manaplus-df44755b11b98f313e79c79fb04a5726fa990ff8.tar.xz manaplus-df44755b11b98f313e79c79fb04a5726fa990ff8.zip |
Rename admin receive handler into adminrecv.
-rw-r--r-- | src/CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/Makefile.am | 8 | ||||
-rw-r--r-- | src/net/ea/adminrecv.cpp (renamed from src/net/ea/admin.cpp) | 4 | ||||
-rw-r--r-- | src/net/ea/adminrecv.h (renamed from src/net/ea/admin.h) | 2 | ||||
-rw-r--r-- | src/net/eathena/adminhandler.cpp | 12 | ||||
-rw-r--r-- | src/net/eathena/adminrecv.cpp (renamed from src/net/eathena/admin.cpp) | 8 | ||||
-rw-r--r-- | src/net/eathena/adminrecv.h (renamed from src/net/eathena/admin.h) | 2 | ||||
-rw-r--r-- | src/net/tmwa/adminhandler.cpp | 4 |
8 files changed, 24 insertions, 24 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8a2e4879c..f4d3a0eaa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1339,8 +1339,8 @@ SET(DYE_CMD_SRCS ) SET(SRCS_EVOL - net/ea/admin.cpp - net/ea/admin.h + net/ea/adminrecv.cpp + net/ea/adminrecv.h net/ea/adminhandler.cpp net/ea/adminhandler.h net/ea/beingnet.cpp @@ -1518,8 +1518,8 @@ SET(SRCS_EATHENA net/roulettehandler.h net/searchstorehandler.h net/vendinghandler.h - net/eathena/admin.cpp - net/eathena/admin.h + net/eathena/adminrecv.cpp + net/eathena/adminrecv.h net/eathena/adminhandler.cpp net/eathena/adminhandler.h net/eathena/auction.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 2ce4d5b80..1a55783ed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1181,8 +1181,8 @@ manaplus_SOURCES += main.cpp \ net/packetdefine.h \ net/packetlimiter.cpp \ net/packetlimiter.h \ - net/ea/admin.cpp \ - net/ea/admin.h \ + net/ea/adminrecv.cpp \ + net/ea/adminrecv.h \ net/ea/adminhandler.cpp \ net/ea/adminhandler.h \ net/ea/beingnet.cpp \ @@ -1364,8 +1364,8 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \ net/roulettehandler.h \ net/searchstorehandler.h \ net/vendinghandler.h \ - net/eathena/admin.cpp \ - net/eathena/admin.h \ + net/eathena/adminrecv.cpp \ + net/eathena/adminrecv.h \ net/eathena/adminhandler.cpp \ net/eathena/adminhandler.h \ net/eathena/auction.cpp \ diff --git a/src/net/ea/admin.cpp b/src/net/ea/adminrecv.cpp index fb6973c6e..be9345b68 100644 --- a/src/net/ea/admin.cpp +++ b/src/net/ea/adminrecv.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "net/ea/admin.h" +#include "net/ea/adminrecv.h" #include "notifymanager.h" @@ -33,7 +33,7 @@ namespace Ea { -void Admin::processKickAck(Net::MessageIn &msg) +void AdminRecv::processKickAck(Net::MessageIn &msg) { if (msg.readInt32("flag") == 0) NotifyManager::notify(NotifyTypes::KICK_FAIL); diff --git a/src/net/ea/admin.h b/src/net/ea/adminrecv.h index c9beea3cb..47da05c59 100644 --- a/src/net/ea/admin.h +++ b/src/net/ea/adminrecv.h @@ -32,7 +32,7 @@ namespace Net namespace Ea { - namespace Admin + namespace AdminRecv { void processKickAck(Net::MessageIn &msg); } // namespace Admin diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp index e44d66c60..6a938a478 100644 --- a/src/net/eathena/adminhandler.cpp +++ b/src/net/eathena/adminhandler.cpp @@ -26,9 +26,9 @@ #include "being/being.h" -#include "net/ea/admin.h" +#include "net/ea/adminrecv.h" -#include "net/eathena/admin.h" +#include "net/eathena/adminrecv.h" #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" @@ -62,16 +62,16 @@ void AdminHandler::handleMessage(Net::MessageIn &msg) switch (msg.getId()) { case SMSG_ADMIN_KICK_ACK: - Ea::Admin::processKickAck(msg); + Ea::AdminRecv::processKickAck(msg); break; case SMSG_ADMIN_GET_LOGIN_ACK: - Admin::processAdminGetLoginAck(msg); + AdminRecv::processAdminGetLoginAck(msg); break; case SMSG_ADMIN_SET_TILE_TYPE: - Admin::processSetTileType(msg); + AdminRecv::processSetTileType(msg); break; case SMSG_ADMIN_ACCOUNT_STATS: - Admin::processAccountStats(msg); + AdminRecv::processAccountStats(msg); break; default: break; diff --git a/src/net/eathena/admin.cpp b/src/net/eathena/adminrecv.cpp index 1a8fdd7c3..e88843c79 100644 --- a/src/net/eathena/admin.cpp +++ b/src/net/eathena/adminrecv.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "net/eathena/admin.h" +#include "net/eathena/adminrecv.h" #include "logger.h" @@ -32,14 +32,14 @@ namespace EAthena { -void Admin::processAdminGetLoginAck(Net::MessageIn &msg) +void AdminRecv::processAdminGetLoginAck(Net::MessageIn &msg) { UNIMPLIMENTEDPACKET; msg.readBeingId("account id"); msg.readString(24, "login"); } -void Admin::processSetTileType(Net::MessageIn &msg) +void AdminRecv::processSetTileType(Net::MessageIn &msg) { UNIMPLIMENTEDPACKET; // +++ here need set collision tile for map @@ -49,7 +49,7 @@ void Admin::processSetTileType(Net::MessageIn &msg) msg.readString(16, "map name"); } -void Admin::processAccountStats(Net::MessageIn &msg) +void AdminRecv::processAccountStats(Net::MessageIn &msg) { UNIMPLIMENTEDPACKET; // +++ need show in other players stats window, nick in mStatsName diff --git a/src/net/eathena/admin.h b/src/net/eathena/adminrecv.h index 85fc8e546..5be80e996 100644 --- a/src/net/eathena/admin.h +++ b/src/net/eathena/adminrecv.h @@ -25,7 +25,7 @@ namespace EAthena { - namespace Admin + namespace AdminRecv { void processAdminGetLoginAck(Net::MessageIn &msg); void processSetTileType(Net::MessageIn &msg); diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp index 1d378a77b..834a29c43 100644 --- a/src/net/tmwa/adminhandler.cpp +++ b/src/net/tmwa/adminhandler.cpp @@ -26,7 +26,7 @@ #include "net/chathandler.h" -#include "net/ea/admin.h" +#include "net/ea/adminrecv.h" #include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" @@ -59,7 +59,7 @@ void AdminHandler::handleMessage(Net::MessageIn &msg) switch (msg.getId()) { case SMSG_ADMIN_KICK_ACK: - Ea::Admin::processKickAck(msg); + Ea::AdminRecv::processKickAck(msg); break; default: |