GameLogic - Pre merge with Netowkr

Code/Game/DanBiasServer/ServerObjects/Lobby/MainLobby.cpp

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

Code/Game/DanBiasServer/ServerObjects/Lobby/MainLobby.h

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

Code/Game/GameProtocols/ProtocolIdentificationID.h

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

Code/Misc/PostBox/PostBox.h

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