Fixed shoddy packet typing

This commit is contained in:
Kayne Ruse
2014-09-03 00:45:08 +10:00
parent 5536bf366d
commit d50cf5b91e
7 changed files with 18 additions and 18 deletions
+2 -2
View File
@@ -61,10 +61,10 @@ private:
void HandlePacket(SerialPacket* const);
//basic connections
void HandleBroadcastRequest(SerialPacket* const);
void HandleBroadcastRequest(ServerPacket* const);
void HandleJoinRequest(ClientPacket* const);
void HandleDisconnect(ClientPacket* const);
void HandleShutdown(SerialPacket* const);
void HandleShutdown(ClientPacket* const);
//map management
void HandleRegionRequest(RegionPacket* const);
+2 -2
View File
@@ -179,7 +179,7 @@ void ServerApplication::HandlePacket(SerialPacket* const argPacket) {
switch(argPacket->type) {
//basic connections
case SerialPacketType::BROADCAST_REQUEST:
HandleBroadcastRequest(static_cast<SerialPacket*>(argPacket));
HandleBroadcastRequest(static_cast<ServerPacket*>(argPacket));
break;
case SerialPacketType::JOIN_REQUEST:
HandleJoinRequest(static_cast<ClientPacket*>(argPacket));
@@ -188,7 +188,7 @@ void ServerApplication::HandlePacket(SerialPacket* const argPacket) {
HandleDisconnect(static_cast<ClientPacket*>(argPacket));
break;
case SerialPacketType::SHUTDOWN:
HandleShutdown(static_cast<SerialPacket*>(argPacket));
HandleShutdown(static_cast<ClientPacket*>(argPacket));
break;
//map management
+3 -3
View File
@@ -27,7 +27,7 @@
//basic connections
//-------------------------
void ServerApplication::HandleBroadcastRequest(SerialPacket* const argPacket) {
void ServerApplication::HandleBroadcastRequest(ServerPacket* const argPacket) {
//send the server's data
ServerPacket newPacket;
@@ -102,7 +102,7 @@ void ServerApplication::HandleDisconnect(ClientPacket* const argPacket) {
std::cout << "Disconnection, " << clientMap.size() << " clients and " << accountMgr.GetContainer()->size() << " accounts total" << std::endl;
}
void ServerApplication::HandleShutdown(SerialPacket* const argPacket) {
void ServerApplication::HandleShutdown(ClientPacket* const argPacket) {
//TODO: authenticate who is shutting the server down
/*Pseudocode:
if sender's account -> admin is not true then
@@ -115,7 +115,7 @@ void ServerApplication::HandleShutdown(SerialPacket* const argPacket) {
running = false;
//disconnect all clients
SerialPacket newPacket;
ClientPacket newPacket;
newPacket.type = SerialPacketType::DISCONNECT;
PumpPacket(&newPacket);