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;
client/in_world.hpp
+3 -3
View File
@@ -26,7 +26,7 @@
#include "utilities.hpp"
#include "defines.hpp"
#include "singleton.hpp"
#include "packet_type.hpp"
#include "packet.hpp"
#include "network_queue.hpp"
#include "information_manager.hpp"
@@ -62,10 +62,10 @@ protected:
void KeyUp(SDL_KeyboardEvent const&);
//Utilities
int HandlePacket(Packet p);
int HandlePacket(Packet::Packet p);
void Disconnect();
void ExitGame();
void HandleDisconnection(::Disconnect&);
void HandleDisconnection(Packet::Disconnect&);
//services
ConfigUtility* configUtil = Singleton<ConfigUtility>::Get();
client/lobby.cpp
+16 -16
View File
@@ -155,30 +155,30 @@ void Lobby::KeyUp(SDL_KeyboardEvent const& key) {
//Utilities
//-------------------------
int Lobby::HandlePacket(Packet p) {
int Lobby::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:
// //
// break;
case PacketType::BROADCAST_RESPONSE:
case Packet::Type::BROADCAST_RESPONSE:
PushServer(p.broadcastResponse);
break;
// case PacketType::JOIN_REQUEST:
// //
// break;
case PacketType::JOIN_RESPONSE:
case Packet::Type::JOIN_RESPONSE:
BeginGame(p.joinResponse);
break;
// case PacketType::DISCONNECT:
@@ -203,13 +203,13 @@ int Lobby::HandlePacket(Packet p) {
}
void Lobby::BroadcastNetwork() {
Packet p;
p.meta.type = PacketType::BROADCAST_REQUEST;
netUtil->Send("255.255.255.255", configUtil->Int("server.port"), &p, sizeof(Packet));
Packet::Packet p;
p.meta.type = Packet::Type::BROADCAST_REQUEST;
netUtil->Send("255.255.255.255", configUtil->Int("server.port"), &p, sizeof(Packet::Packet));
serverList.clear();
}
void Lobby::PushServer(BroadcastResponse& bcast) {
void Lobby::PushServer(Packet::BroadcastResponse& bcast) {
ServerEntry entry;
entry.name = bcast.name;
entry.address = bcast.meta.address;
@@ -221,12 +221,12 @@ void Lobby::ConnectToServer(ServerEntry* server) {
if (!server) {
throw(runtime_error("No server received"));
}
Packet p;
p.meta.type = PacketType::JOIN_REQUEST;
netUtil->Send(&server->address, reinterpret_cast<void*>(&p), sizeof(Packet));
Packet::Packet p;
p.meta.type = Packet::Type::JOIN_REQUEST;
netUtil->Send(&server->address, reinterpret_cast<void*>(&p), sizeof(Packet::Packet));
}
void Lobby::BeginGame(JoinResponse& response) {
void Lobby::BeginGame(Packet::JoinResponse& response) {
//should be downloading the resources here as well
infoMgr->SetClientIndex(response.clientIndex);
netUtil->Bind(&response.meta.address, GAME_CHANNEL);
client/lobby.hpp
+4 -4
View File
@@ -29,7 +29,7 @@
#include "singleton.hpp"
#include "server_entry.hpp"
#include "packet_type.hpp"
#include "packet.hpp"
#include "network_queue.hpp"
#include "information_manager.hpp"
@@ -63,11 +63,11 @@ protected:
void KeyUp(SDL_KeyboardEvent const&);
//utilities
int HandlePacket(Packet p);
int HandlePacket(Packet::Packet p);
void BroadcastNetwork();
void PushServer(BroadcastResponse&);
void PushServer(Packet::BroadcastResponse&);
void ConnectToServer(ServerEntry*);
void BeginGame(JoinResponse&);
void BeginGame(Packet::JoinResponse&);
//services
ConfigUtility* configUtil = Singleton<ConfigUtility>::Get();
client/scene_manager.cpp
+1 -1
View File
@@ -89,7 +89,7 @@ void SceneManager::Init() {
flags);
//initiate the remaining singletons
netUtil->Open(0, sizeof(Packet));
netUtil->Open(0, sizeof(Packet::Packet));
}
void SceneManager::Proc() {
client/scene_manager.hpp
+1 -1
View File
@@ -25,7 +25,7 @@
#include "scene_list.hpp"
#include "base_scene.hpp"
#include "singleton.hpp"
#include "packet_type.hpp"
#include "packet.hpp"
#include "information_manager.hpp"
#include "config_utility.hpp"