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

GameLogic - Pre merge with Netowkr

This commit is contained in:
dean11 2013-12-16 09:50:23 +01:00
parent 34d79d1207
commit 7cda07507a
4 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Code/Game/DanBiasServer/ServerObjects/Lobby/MainLobby.cpp
View File

@ -18,17 +18,16 @@ namespace DanBias
void MainLobby::Frame() void MainLobby::Frame()
{ {
if(!this->box.IsEmpty()) ParseEvents();
{
NetEvent &e = this->box.Fetch();
ParseEvent(e);
}
} }
//////// Private //////// Private
void MainLobby::ParseEvent(NetEvent& e) void MainLobby::ParseEvents()
{ {
static const short i = MAXSHORT; if(!this->box.IsEmpty())
{
NetEvent &e = this->box.Fetch();
if(e.protocol[0].type != Oyster::Network::NetAttributeType_Short) return; if(e.protocol[0].type != Oyster::Network::NetAttributeType_Short) return;
short f = e.protocol[0].value.netShort; short f = e.protocol[0].value.netShort;
@ -36,8 +35,10 @@ namespace DanBias
switch (f) switch (f)
{ {
default: default:
break; break;
} }
} }
}
}//End namespace DanBias }//End namespace DanBias

2
Code/Game/DanBiasServer/ServerObjects/Lobby/MainLobby.h
View File

@ -15,7 +15,7 @@ namespace DanBias
void Frame(); void Frame();
private: private:
void ParseEvent(NetEvent& e); void ParseEvents();
}; };
}//End namespace DanBias }//End namespace DanBias

12
Code/Game/GameProtocols/ProtocolIdentificationID.h
View File

@ -7,14 +7,14 @@
/* THERE CAN ABSOLUTLEY NOT BE TWO DEFINITIONS WITH THE SAME ID!! */ /* THERE CAN ABSOLUTLEY NOT BE TWO DEFINITIONS WITH THE SAME ID!! */
#define protocol_PlayerNavigation 0 #define protocol_Gamplay_PlayerNavigation 0
#define protocol_PlayerPosition 1 #define protocol_Gamplay_PlayerPosition 1
#define protocol_ObjectPosition 2 #define protocol_Gamplay_ObjectPosition 2
#define protocol_Lobby_Msg 60 #define protocol_Lobby_Msg 100
#define protocol_General_Disconnect 100 #define protocol_General_Disconnect 200
#define protocol_General_Ping 101 #define protocol_General_Ping 201
#define PROTOCOL_TEST 1000 #define PROTOCOL_TEST 1000

2
Code/Misc/PostBox/PostBox.h
View File

@ -54,7 +54,7 @@ namespace Oyster
template <class T> template <class T>
bool PostBox<T>::IsEmpty() bool PostBox<T>::IsEmpty()
{ {
return !messages.IsEmpty(); return messages.IsEmpty();
} }
} }