NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'GameLogic' of https://github.com/dean11/Danbias into Network

This commit is contained in:
Pontus Fransson 2013-12-16 09:11:18 +01:00
parent 3a752f6b95 34d79d1207
commit 0c6badb749
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Code/Game/DanBiasServer/ServerObjects/ClientObject.cpp
View File

@ -13,7 +13,7 @@ ClientObject::~ClientObject()
this->client.Disconnect(); this->client.Disconnect();
} }
void ClientObject::SetPostbox(Oyster::PostBox<NetworkSession::ClientEvent>* box) void ClientObject::SetPostbox(Oyster::PostBox<NetworkSession::NetEvent>* box)
{ {
this->box = box; this->box = box;
} }
@ -30,7 +30,7 @@ void ClientObject::ProtocolRecievedCallback(Oyster::Network::CustomNetProtocol&
{ {
if(!this->box) return; if(!this->box) return;
NetworkSession::ClientEvent _event; NetworkSession::NetEvent _event;
_event.protocol = protocol; _event.protocol = protocol;
_event.reciever = this; _event.reciever = this;

4
Code/Game/DanBiasServer/ServerObjects/ClientObject.h
View File

@ -16,7 +16,7 @@ namespace DanBias
ClientObject(const Oyster::Network::NetworkClient& client); ClientObject(const Oyster::Network::NetworkClient& client);
~ClientObject(); ~ClientObject();
void SetPostbox(Oyster::PostBox<NetworkSession::ClientEvent>* box); void SetPostbox(Oyster::PostBox<NetworkSession::NetEvent>* box);
GameLogic::Player* Logic_Object(); GameLogic::Player* Logic_Object();
Oyster::Network::NetworkClient* NetClient_Object(); Oyster::Network::NetworkClient* NetClient_Object();
@ -27,7 +27,7 @@ namespace DanBias
private: private:
GameLogic::Player logicPlayer; GameLogic::Player logicPlayer;
Oyster::Network::NetworkClient client; Oyster::Network::NetworkClient client;
Oyster::IPostBox<DanBias::NetworkSession::ClientEvent>* box; Oyster::IPostBox<DanBias::NetworkSession::NetEvent>* box;
}; };
}//End namespace DanBias }//End namespace DanBias