From af0c242bf6a09b0e45ddfd04214bcc76925debbb Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 24 Aug 2015 17:05:42 +0300 Subject: Rename battleground receive handler into battlegroundrecv. --- src/CMakeLists.txt | 4 +- src/Makefile.am | 4 +- src/net/eathena/battleground.cpp | 89 --------------------------------- src/net/eathena/battleground.h | 44 ---------------- src/net/eathena/battlegroundhandler.cpp | 18 +++---- src/net/eathena/battlegroundrecv.cpp | 89 +++++++++++++++++++++++++++++++++ src/net/eathena/battlegroundrecv.h | 44 ++++++++++++++++ 7 files changed, 146 insertions(+), 146 deletions(-) delete mode 100644 src/net/eathena/battleground.cpp delete mode 100644 src/net/eathena/battleground.h create mode 100644 src/net/eathena/battlegroundrecv.cpp create mode 100644 src/net/eathena/battlegroundrecv.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3711df197..4439abada 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1530,8 +1530,8 @@ SET(SRCS_EATHENA net/eathena/bankrecv.h net/eathena/bankhandler.cpp net/eathena/bankhandler.h - net/eathena/battleground.cpp - net/eathena/battleground.h + net/eathena/battlegroundrecv.cpp + net/eathena/battlegroundrecv.h net/eathena/battlegroundhandler.cpp net/eathena/battlegroundhandler.h net/eathena/cashshophandler.cpp diff --git a/src/Makefile.am b/src/Makefile.am index ee6e18fd9..66217fd05 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1376,8 +1376,8 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \ net/eathena/bankrecv.h \ net/eathena/bankhandler.cpp \ net/eathena/bankhandler.h \ - net/eathena/battleground.cpp \ - net/eathena/battleground.h \ + net/eathena/battlegroundrecv.cpp \ + net/eathena/battlegroundrecv.h \ net/eathena/battlegroundhandler.cpp \ net/eathena/battlegroundhandler.h \ net/eathena/cashshophandler.cpp \ diff --git a/src/net/eathena/battleground.cpp b/src/net/eathena/battleground.cpp deleted file mode 100644 index 730b19f24..000000000 --- a/src/net/eathena/battleground.cpp +++ /dev/null @@ -1,89 +0,0 @@ -/* - * 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 . - */ - -#include "net/eathena/battleground.h" - -#include "logger.h" - -#include "debug.h" - -namespace EAthena -{ - -void BattleGround::processBattleEmblem(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - msg.readBeingId("account id"); - msg.readString(24, "name"); - msg.readInt16("camp"); -} - -void BattleGround::processBattleUpdateScore(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - msg.readInt16("camp a points"); - msg.readInt16("camp b points"); -} - -void BattleGround::processBattleUpdateCoords(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - msg.readBeingId("account id"); - msg.readString(24, "name"); - msg.readInt16("class"); - msg.readInt16("x"); - msg.readInt16("y"); -} - -void BattleGround::processBattlePlay(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - msg.readString(24, "battle ground name"); -} - -void BattleGround::processBattleQueueAck(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - msg.readUInt8("type"); - msg.readString(24, "bg name"); -} - -void BattleGround::processBattleBegins(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - msg.readString(24, "bg name"); - msg.readString(24, "game name"); -} - -void BattleGround::processBattleNoticeDelete(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - msg.readUInt8("type"); - msg.readString(24, "bg name"); -} - -void BattleGround::processBattleJoined(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - msg.readString(24, "name"); - msg.readInt32("position"); -} - -} // namespace EAthena diff --git a/src/net/eathena/battleground.h b/src/net/eathena/battleground.h deleted file mode 100644 index 1653abe0a..000000000 --- a/src/net/eathena/battleground.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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 . - */ - -#ifndef NET_EATHENA_BATTLEGROUND_H -#define NET_EATHENA_BATTLEGROUND_H - -#ifdef EATHENA_SUPPORT - -#include "net/eathena/messagehandler.h" - -namespace EAthena -{ - namespace BattleGround - { - void processBattleEmblem(Net::MessageIn &msg); - void processBattleUpdateScore(Net::MessageIn &msg); - void processBattleUpdateCoords(Net::MessageIn &msg); - void processBattlePlay(Net::MessageIn &msg); - void processBattleQueueAck(Net::MessageIn &msg); - void processBattleBegins(Net::MessageIn &msg); - void processBattleNoticeDelete(Net::MessageIn &msg); - void processBattleJoined(Net::MessageIn &msg); - } // namespace BattleGround -} // namespace EAthena - -#endif // EATHENA_SUPPORT -#endif // NET_EATHENA_BATTLEGROUND_H diff --git a/src/net/eathena/battlegroundhandler.cpp b/src/net/eathena/battlegroundhandler.cpp index daa7a1bb2..536c8c850 100644 --- a/src/net/eathena/battlegroundhandler.cpp +++ b/src/net/eathena/battlegroundhandler.cpp @@ -22,7 +22,7 @@ #include "logger.h" -#include "net/eathena/battleground.h" +#include "net/eathena/battlegroundrecv.h" #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" @@ -57,35 +57,35 @@ void BattleGroundHandler::handleMessage(Net::MessageIn &msg) switch (msg.getId()) { case SMSG_BATTLE_EMBLEM: - BattleGround::processBattleEmblem(msg); + BattleGroundRecv::processBattleEmblem(msg); break; case SMSG_BATTLE_UPDATE_SCORE: - BattleGround::processBattleUpdateScore(msg); + BattleGroundRecv::processBattleUpdateScore(msg); break; case SMSG_BATTLE_UPDATE_COORDS: - BattleGround::processBattleUpdateCoords(msg); + BattleGroundRecv::processBattleUpdateCoords(msg); break; case SMSG_BATTLE_PLAY: - BattleGround::processBattlePlay(msg); + BattleGroundRecv::processBattlePlay(msg); break; case SMSG_BATTLE_QUEUE_ACK: - BattleGround::processBattleQueueAck(msg); + BattleGroundRecv::processBattleQueueAck(msg); break; case SMSG_BATTLE_BEGINS: - BattleGround::processBattleBegins(msg); + BattleGroundRecv::processBattleBegins(msg); break; case SMSG_BATTLE_NOTICE_DELETE: - BattleGround::processBattleNoticeDelete(msg); + BattleGroundRecv::processBattleNoticeDelete(msg); break; case SMSG_BATTLE_JOINED: - BattleGround::processBattleJoined(msg); + BattleGroundRecv::processBattleJoined(msg); break; default: diff --git a/src/net/eathena/battlegroundrecv.cpp b/src/net/eathena/battlegroundrecv.cpp new file mode 100644 index 000000000..afda89171 --- /dev/null +++ b/src/net/eathena/battlegroundrecv.cpp @@ -0,0 +1,89 @@ +/* + * 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 . + */ + +#include "net/eathena/battlegroundrecv.h" + +#include "logger.h" + +#include "debug.h" + +namespace EAthena +{ + +void BattleGroundRecv::processBattleEmblem(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + msg.readBeingId("account id"); + msg.readString(24, "name"); + msg.readInt16("camp"); +} + +void BattleGroundRecv::processBattleUpdateScore(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + msg.readInt16("camp a points"); + msg.readInt16("camp b points"); +} + +void BattleGroundRecv::processBattleUpdateCoords(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + msg.readBeingId("account id"); + msg.readString(24, "name"); + msg.readInt16("class"); + msg.readInt16("x"); + msg.readInt16("y"); +} + +void BattleGroundRecv::processBattlePlay(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + msg.readString(24, "battle ground name"); +} + +void BattleGroundRecv::processBattleQueueAck(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + msg.readUInt8("type"); + msg.readString(24, "bg name"); +} + +void BattleGroundRecv::processBattleBegins(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + msg.readString(24, "bg name"); + msg.readString(24, "game name"); +} + +void BattleGroundRecv::processBattleNoticeDelete(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + msg.readUInt8("type"); + msg.readString(24, "bg name"); +} + +void BattleGroundRecv::processBattleJoined(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + msg.readString(24, "name"); + msg.readInt32("position"); +} + +} // namespace EAthena diff --git a/src/net/eathena/battlegroundrecv.h b/src/net/eathena/battlegroundrecv.h new file mode 100644 index 000000000..43c0e7fe1 --- /dev/null +++ b/src/net/eathena/battlegroundrecv.h @@ -0,0 +1,44 @@ +/* + * 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 . + */ + +#ifndef NET_EATHENA_BATTLEGROUND_H +#define NET_EATHENA_BATTLEGROUND_H + +#ifdef EATHENA_SUPPORT + +#include "net/eathena/messagehandler.h" + +namespace EAthena +{ + namespace BattleGroundRecv + { + void processBattleEmblem(Net::MessageIn &msg); + void processBattleUpdateScore(Net::MessageIn &msg); + void processBattleUpdateCoords(Net::MessageIn &msg); + void processBattlePlay(Net::MessageIn &msg); + void processBattleQueueAck(Net::MessageIn &msg); + void processBattleBegins(Net::MessageIn &msg); + void processBattleNoticeDelete(Net::MessageIn &msg); + void processBattleJoined(Net::MessageIn &msg); + } // namespace BattleGround +} // namespace EAthena + +#endif // EATHENA_SUPPORT +#endif // NET_EATHENA_BATTLEGROUND_H -- cgit v1.2.3-70-g09d2