Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved packets into their own namespace

Browse Source
This commit is contained in:
Kayne Ruse
2013-06-24 10:27:43 +10:00
parent 9608761cd5
commit 56375d64b6
11 changed files with 85 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/in_world.cpp
+11 -11
View File
@@ -135,18 +135,18 @@ void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
//Utilities
//-------------------------
int InWorld::HandlePacket(Packet p) {
int InWorld::HandlePacket(Packet::Packet p) {
switch(p.meta.type) {
case PacketType::NONE:
case Packet::Type::NONE:
//DO NOTHING
return 0;
break;
case PacketType::PING:
case Packet::Type::PING:
//quick pong
p.meta.type = PacketType::PONG;
netUtil->Send(&p.meta.address, &p, sizeof(Packet));
p.meta.type = Packet::Type::PONG;
netUtil->Send(&p.meta.address, &p, sizeof(Packet::Packet));
break;
case PacketType::PONG:
case Packet::Type::PONG:
//
break;
// case PacketType::BROADCAST_REQUEST:
@@ -161,7 +161,7 @@ int InWorld::HandlePacket(Packet p) {
// case PacketType::JOIN_RESPONSE:
// //
// break;
case PacketType::DISCONNECT:
case Packet::Type::DISCONNECT:
HandleDisconnection(p.disconnect);
break;
// case PacketType::SYNCHRONIZE:
@@ -184,10 +184,10 @@ int InWorld::HandlePacket(Packet p) {
void InWorld::Disconnect() {
//disconnect
Packet p;
p.meta.type = PacketType::DISCONNECT;
Packet::Packet p;
p.meta.type = Packet::Type::DISCONNECT;
p.disconnect.clientIndex = infoMgr->GetClientIndex();
netUtil->Send(GAME_CHANNEL, reinterpret_cast<void*>(&p), sizeof(Packet));
netUtil->Send(GAME_CHANNEL, reinterpret_cast<void*>(&p), sizeof(Packet::Packet));
netUtil->Unbind(GAME_CHANNEL);
endQueueThread();
@@ -201,7 +201,7 @@ void InWorld::ExitGame() {
cout << "The game session has ended" << endl;
}
void InWorld::HandleDisconnection(::Disconnect& disconnect) {
void InWorld::HandleDisconnection(Packet::Disconnect& disconnect) {
Disconnect();
SetNextScene(SceneList::MAINMENU);
cout << "You have been disconnected" << endl;