Bumped the network version

client/in_world.cpp

@@ -325,7 +325,7 @@ void InWorld::HandleCharacterNew(SerialPacket packet) {
 		localCharacter = &character;
 
 		//setup the camera
-		//TODO: can't change the screen size
+		//TODO: can't change the screen size?
 		camera.width = GetScreen()->w;
 		camera.height = GetScreen()->h;
 

common/network/serial_packet.hpp

@@ -28,73 +28,70 @@
 
 #include "SDL/SDL_net.h"
 
-#define NETWORK_VERSION 20140526
+#define NETWORK_VERSION 20140528
-
-//maximum string size; don't use std::string
 #define PACKET_STRING_SIZE 100
 
 union SerialPacket {
 	//types of packets
-	//TODO: read the value definitions
 	enum class Type {
 		//default: there is something wrong
 		NONE = 0,
 
 		//keep alive
-		PING,
+		PING = 1,
-		PONG,
+		PONG = 2,
 
 		//searching for a server to join
-		BROADCAST_REQUEST,
+		BROADCAST_REQUEST = 3,
-		BROADCAST_RESPONSE,
+		BROADCAST_RESPONSE = 4,
-		BROADCAST_REJECTION,
+		BROADCAST_REJECTION = 5,
 
 		//try to join the server
-		JOIN_REQUEST,
+		JOIN_REQUEST = 6,
-		JOIN_RESPONSE,
+		JOIN_RESPONSE = 7,
-		JOIN_REJECTION,
+		JOIN_REJECTION = 8,
 
 		//mass update
-		SYNCHRONIZE,
+		SYNCHRONIZE = 9,
 
 		//disconnect from the server
-		DISCONNECT,
+		DISCONNECT = 10,
 
 		//shut down the server
-		SHUTDOWN,
+		SHUTDOWN = 11,
 
 		//map data
-		REGION_REQUEST,
+		REGION_REQUEST = 12,
-		REGION_CONTENT,
+		REGION_CONTENT = 13,
-		REGION_REJECTION,
+		REGION_REJECTION = 14,
 
 		//combat data
-		COMBAT_ENTER,
+		COMBAT_ENTER = 15,
-		COMBAT_EXIT,
+		COMBAT_EXIT = 16,
 
-		COMBAT_UPDATE,
+		COMBAT_UPDATE = 17,
 
-		COMBAT_REJECTION,
+		COMBAT_REJECTION = 18,
 
 		//character data
-		CHARACTER_NEW,
+		CHARACTER_NEW = 19,
-		CHARACTER_DELETE,
+		CHARACTER_DELETE = 20,
-		CHARACTER_UPDATE,
+		CHARACTER_UPDATE = 21,
 
-		CHARACTER_STATS_REQUEST,
+		CHARACTER_STATS_REQUEST = 22,
-		CHARACTER_STATS_RESPONSE,
+		CHARACTER_STATS_RESPONSE = 23,
 
-		CHARACTER_REJECTION,
+		CHARACTER_REJECTION = 24,
 
 		//enemy data
-		ENEMY_NEW,
+		ENEMY_NEW = 25,
-		ENEMY_DELETE,
+		ENEMY_DELETE = 26,
-		ENEMY_UPDATE,
+		ENEMY_UPDATE = 27,
 
-		ENEMY_STATS_REQUEST,
+		ENEMY_STATS_REQUEST = 28,
-		ENEMY_STATS_RESPONSE,
+		ENEMY_STATS_RESPONSE = 29,
 
-		ENEMY_REJECTION,
+		ENEMY_REJECTION = 30,
 
 		//more packet types go here
 

todo.txt

@@ -1,10 +1,7 @@
 TODO: I need to keep the documentation up to date. Namely, the GDD is getting out of date.
-TODO: How many lookups is the map system using?
-TODO: Hook the serial packet to the network utility
 TODO: I completely forgot about status ailments
 TODO: Time delay for requesting region packets
 TODO: command line parameters overriding config.cfg settings
-TODO: inplementing SerialPacket in NetworkUtility
 
 --Battle System--