summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/net/eathena/battlegroundhandler.cpp18
-rw-r--r--src/net/eathena/battlegroundrecv.cpp (renamed from src/net/eathena/battleground.cpp)18
-rw-r--r--src/net/eathena/battlegroundrecv.h (renamed from src/net/eathena/battleground.h)2
5 files changed, 23 insertions, 23 deletions
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/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/battleground.cpp b/src/net/eathena/battlegroundrecv.cpp
index 730b19f24..afda89171 100644
--- a/src/net/eathena/battleground.cpp
+++ b/src/net/eathena/battlegroundrecv.cpp
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "net/eathena/battleground.h"
+#include "net/eathena/battlegroundrecv.h"
#include "logger.h"
@@ -27,7 +27,7 @@
namespace EAthena
{
-void BattleGround::processBattleEmblem(Net::MessageIn &msg)
+void BattleGroundRecv::processBattleEmblem(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readBeingId("account id");
@@ -35,14 +35,14 @@ void BattleGround::processBattleEmblem(Net::MessageIn &msg)
msg.readInt16("camp");
}
-void BattleGround::processBattleUpdateScore(Net::MessageIn &msg)
+void BattleGroundRecv::processBattleUpdateScore(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readInt16("camp a points");
msg.readInt16("camp b points");
}
-void BattleGround::processBattleUpdateCoords(Net::MessageIn &msg)
+void BattleGroundRecv::processBattleUpdateCoords(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readBeingId("account id");
@@ -52,34 +52,34 @@ void BattleGround::processBattleUpdateCoords(Net::MessageIn &msg)
msg.readInt16("y");
}
-void BattleGround::processBattlePlay(Net::MessageIn &msg)
+void BattleGroundRecv::processBattlePlay(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readString(24, "battle ground name");
}
-void BattleGround::processBattleQueueAck(Net::MessageIn &msg)
+void BattleGroundRecv::processBattleQueueAck(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readUInt8("type");
msg.readString(24, "bg name");
}
-void BattleGround::processBattleBegins(Net::MessageIn &msg)
+void BattleGroundRecv::processBattleBegins(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readString(24, "bg name");
msg.readString(24, "game name");
}
-void BattleGround::processBattleNoticeDelete(Net::MessageIn &msg)
+void BattleGroundRecv::processBattleNoticeDelete(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readUInt8("type");
msg.readString(24, "bg name");
}
-void BattleGround::processBattleJoined(Net::MessageIn &msg)
+void BattleGroundRecv::processBattleJoined(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readString(24, "name");
diff --git a/src/net/eathena/battleground.h b/src/net/eathena/battlegroundrecv.h
index 1653abe0a..43c0e7fe1 100644
--- a/src/net/eathena/battleground.h
+++ b/src/net/eathena/battlegroundrecv.h
@@ -27,7 +27,7 @@
namespace EAthena
{
- namespace BattleGround
+ namespace BattleGroundRecv
{
void processBattleEmblem(Net::MessageIn &msg);
void processBattleUpdateScore(Net::MessageIn &msg);