Simplified the packet system

libs/common/network_queue.cpp

@@ -32,7 +32,7 @@
 static SDL_sem* lock = SDL_CreateSemaphore(1);
 static SDL_Thread* queueThread = nullptr;
 
-static std::deque<Packet::Packet> queue;
+static std::deque<Packet> queue;
 
 static bool running = false;
 
@@ -41,8 +41,8 @@ static int networkQueue(void*) {
 	while(running) {
 		SDL_SemWait(lock);
 		while(netUtil->Receive()) {
-			Packet::Packet p;
-			memcpy(&p, netUtil->GetInData(), sizeof(Packet::Packet));
+			Packet p;
+			memcpy(&p, netUtil->GetInData(), sizeof(Packet));
 			p.meta.address = netUtil->GetInPacket()->address;
 			queue.push_back(p);
 		}
@@ -80,19 +80,19 @@ void killQueueThread() {
 	queueThread = nullptr;
 }
 
-Packet::Packet peekNetworkPacket() {
+Packet peekNetworkPacket() {
 	SDL_SemWait(lock);
-	Packet::Packet p;
+	Packet p;
 	if (queue.size() > 0) {
-		Packet::Packet p = queue[0];
+		Packet p = queue[0];
 	}
 	SDL_SemPost(lock);
 	return p;
 }
 
-Packet::Packet popNetworkPacket() {
+Packet popNetworkPacket() {
 	SDL_SemWait(lock);
-	Packet::Packet p;
+	Packet p;
 	if (queue.size() > 0) {
 		p = queue[0];
 		queue.pop_front();

libs/common/network_queue.hpp

@@ -27,8 +27,8 @@
 void beginQueueThread();
 void endQueueThread();
 void killQueueThread();
-Packet::Packet peekNetworkPacket();
-Packet::Packet popNetworkPacket();
+Packet peekNetworkPacket();
+Packet popNetworkPacket();
 void flushNetworkQueue();
 
 #endif

libs/common/packet.hpp

@@ -30,114 +30,61 @@
 
 #pragma pack(push, 0)
 
-namespace Packet {
-
-enum class Type {
-	NONE = 0,
-
-	PING = 1,
-	PONG = 2,
-	BROADCAST_REQUEST = 3,
-	BROADCAST_RESPONSE = 4,
-	JOIN_REQUEST = 5,
-	JOIN_RESPONSE = 6,
-	DISCONNECT = 7,
-
-	SYNCHRONIZE = 8,
-
-	PLAYER_NEW = 9,
-	PLAYER_DELETE = 10,
-	PLAYER_UPDATE = 11,
-};
-
-struct Metadata {
-	Type type;
-	IPaddress address;
-};
-
-struct Ping {
-	Metadata meta;
-};
-
-struct Pong {
-	Metadata meta;
-};
-
-struct BroadcastRequest {
-	Metadata meta;
-};
-
-struct BroadcastResponse {
-	Metadata meta;
-	char name[PACKET_STRING_SIZE];
-	//TODO: version
-};
-
-struct JoinRequest {
-	Metadata meta;
-};
-
-struct JoinResponse {
-	Metadata meta;
-	int clientIndex;
-	//resource list
-};
-
-struct Disconnect {
-	Metadata meta;
-	int clientIndex;
-};
-
-struct Synchronize {
-	Metadata meta;
-	int clientIndex;
-};
-
-struct PlayerData {
-	Metadata meta;
-	int playerIndex;
-	int clientIndex;
-	char handle[PACKET_STRING_SIZE];
-	char avatar[PACKET_STRING_SIZE];
-	Vector2 position;
-	Vector2 motion;
-	//TODO Playerdata
-};
-
-struct PlayerDelete {
-	Metadata meta;
-	int playerIndex;
-	int clientIndex;
-};
-
 union Packet {
+	//the type of packet being sent
+	enum class Type {
+		NONE = 0,
+
+		PING = 1,
+		PONG = 2,
+		BROADCAST_REQUEST = 3,
+		BROADCAST_RESPONSE = 4,
+		JOIN_REQUEST = 5,
+		JOIN_RESPONSE = 6,
+		DISCONNECT = 7,
+
+		SYNCHRONIZE = 8,
+
+		PLAYER_NEW = 9,
+		PLAYER_DELETE = 10,
+		PLAYER_UPDATE = 11,
+	};
+
+	//metadata on the packet itself
+	struct Metadata {
+		Type type;
+		IPaddress address;
+		int clientIndex;
+	}meta;
+
+	//information about the server
+	struct ServerInformation {
+		Metadata meta;
+		//TODO: version info
+		char name[PACKET_STRING_SIZE];
+		//TODO: player count
+	}serverInfo;
+
+	//information about a specific player
+	struct PlayerInformation {
+		Metadata meta;
+		int index;
+		char handle[PACKET_STRING_SIZE];
+		char avatar[PACKET_STRING_SIZE];
+		Vector2 position;
+		Vector2 motion;
+		//TODO Playerdata
+	}playerInfo;
+
+	//zero the packet
 	Packet() {
 		meta.type = Type::NONE;
 		meta.address.host = 0;
 		meta.address.port = 0;
+		meta.clientIndex = -1;
 	};
-	Metadata meta;
-
-	Ping ping;
-	Pong pong;
-	BroadcastRequest broadcastRequest;
-	BroadcastResponse broadcastResponse;
-	JoinRequest joinRequest;
-	JoinResponse joinResponse;
-	Disconnect disconnect;
-
-	Synchronize synchronize;
-
-	PlayerData playerData;
-	PlayerDelete playerDelete;
-
-#ifdef DEBUG
-	char buffer[1024];
-#endif
 };
 
-} //namespace Packet
-
 #pragma pack(pop)
 
 #endif