From 347b5465660fa4f3d6b8253f64d6d722b8e971dc Mon Sep 17 00:00:00 2001 From: Dennis Andersen Date: Wed, 18 Dec 2013 08:44:10 +0100 Subject: [PATCH] GameLogic - some minor fixes --- Code/Game/DanBiasServer/ServerObjects/ClientObject.cpp | 2 +- Code/Game/DanBiasServer/ServerObjects/ClientObject.h | 2 +- Code/Game/DanBiasServer/ServerObjects/Lobby/MainLobby.cpp | 4 ++-- Code/Game/DanBiasServer/ServerObjects/Lobby/MainLobby.h | 2 ++ Code/Game/DanBiasServer/ServerObjects/NetworkSession.cpp | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Code/Game/DanBiasServer/ServerObjects/ClientObject.cpp b/Code/Game/DanBiasServer/ServerObjects/ClientObject.cpp index c8a259ad..a06bde05 100644 --- a/Code/Game/DanBiasServer/ServerObjects/ClientObject.cpp +++ b/Code/Game/DanBiasServer/ServerObjects/ClientObject.cpp @@ -13,7 +13,7 @@ ClientObject::~ClientObject() this->client->Disconnect(); } -void ClientObject::SetPostbox(Oyster::PostBox* box) +void ClientObject::SetPostbox(Oyster::IPostBox* box) { this->box = box; } diff --git a/Code/Game/DanBiasServer/ServerObjects/ClientObject.h b/Code/Game/DanBiasServer/ServerObjects/ClientObject.h index f44e70d0..77b45edb 100644 --- a/Code/Game/DanBiasServer/ServerObjects/ClientObject.h +++ b/Code/Game/DanBiasServer/ServerObjects/ClientObject.h @@ -16,7 +16,7 @@ namespace DanBias ClientObject(Oyster::Network::NetworkClient* client); ~ClientObject(); - void SetPostbox(Oyster::PostBox* box); + void SetPostbox(Oyster::IPostBox* box); GameLogic::Player* Logic_Object(); Oyster::Network::NetworkClient* NetClient_Object(); diff --git a/Code/Game/DanBiasServer/ServerObjects/Lobby/MainLobby.cpp b/Code/Game/DanBiasServer/ServerObjects/Lobby/MainLobby.cpp index 97033790..eb64513b 100644 --- a/Code/Game/DanBiasServer/ServerObjects/Lobby/MainLobby.cpp +++ b/Code/Game/DanBiasServer/ServerObjects/Lobby/MainLobby.cpp @@ -24,9 +24,9 @@ namespace DanBias //////// Private void MainLobby::ParseEvents() { - if(!this->box.IsEmpty()) + if(!this->box->IsEmpty()) { - NetEvent &e = this->box.Fetch(); + NetEvent &e = this->box->Fetch(); if(e.protocol[0].type != Oyster::Network::NetAttributeType_Short) return; diff --git a/Code/Game/DanBiasServer/ServerObjects/Lobby/MainLobby.h b/Code/Game/DanBiasServer/ServerObjects/Lobby/MainLobby.h index c78f70e2..89e0db4a 100644 --- a/Code/Game/DanBiasServer/ServerObjects/Lobby/MainLobby.h +++ b/Code/Game/DanBiasServer/ServerObjects/Lobby/MainLobby.h @@ -17,6 +17,8 @@ namespace DanBias private: void ParseEvents(); + private: + //NetworkSession * }; }//End namespace DanBias #endif // !DANBIASGAME_GAMELOBBY_H diff --git a/Code/Game/DanBiasServer/ServerObjects/NetworkSession.cpp b/Code/Game/DanBiasServer/ServerObjects/NetworkSession.cpp index 32def107..392ab4fb 100644 --- a/Code/Game/DanBiasServer/ServerObjects/NetworkSession.cpp +++ b/Code/Game/DanBiasServer/ServerObjects/NetworkSession.cpp @@ -30,11 +30,11 @@ namespace DanBias if(k == -1) { this->clients.push_back(client); - this->clients[this->clients.size() - 1]->SetPostbox(&this->box); + this->clients[this->clients.size() - 1]->SetPostbox(this->box); } else { - this->clients[k]->SetPostbox(&this->box); + this->clients[k]->SetPostbox(this->box); } ClientListLock.unlock();