From de902d2d3d49072ffa42e696858ab12c65a4bec3 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <ratstail91@yahoo.com.au>
Date: Wed, 28 May 2014 23:39:31 +1000
Subject: [PATCH] Bumped the network version

---
 client/in_world.cpp              |  2 +-
 common/network/serial_packet.hpp | 65 +++++++++++++++-----------------
 todo.txt                         |  3 --
 3 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/client/in_world.cpp b/client/in_world.cpp
index 0caddff..f0348bd 100644
--- a/client/in_world.cpp
+++ b/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;
 
diff --git a/common/network/serial_packet.hpp b/common/network/serial_packet.hpp
index 8b648a8..27de13b 100644
--- a/common/network/serial_packet.hpp
+++ b/common/network/serial_packet.hpp
@@ -28,73 +28,70 @@
 
 #include "SDL/SDL_net.h"
 
-#define NETWORK_VERSION 20140526
-
-//maximum string size; don't use std::string
+#define NETWORK_VERSION 20140528
 #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,
-		PONG,
+		PING = 1,
+		PONG = 2,
 
 		//searching for a server to join
-		BROADCAST_REQUEST,
-		BROADCAST_RESPONSE,
-		BROADCAST_REJECTION,
+		BROADCAST_REQUEST = 3,
+		BROADCAST_RESPONSE = 4,
+		BROADCAST_REJECTION = 5,
 
 		//try to join the server
-		JOIN_REQUEST,
-		JOIN_RESPONSE,
-		JOIN_REJECTION,
+		JOIN_REQUEST = 6,
+		JOIN_RESPONSE = 7,
+		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_CONTENT,
-		REGION_REJECTION,
+		REGION_REQUEST = 12,
+		REGION_CONTENT = 13,
+		REGION_REJECTION = 14,
 
 		//combat data
-		COMBAT_ENTER,
-		COMBAT_EXIT,
+		COMBAT_ENTER = 15,
+		COMBAT_EXIT = 16,
 
-		COMBAT_UPDATE,
+		COMBAT_UPDATE = 17,
 
-		COMBAT_REJECTION,
+		COMBAT_REJECTION = 18,
 
 		//character data
-		CHARACTER_NEW,
-		CHARACTER_DELETE,
-		CHARACTER_UPDATE,
+		CHARACTER_NEW = 19,
+		CHARACTER_DELETE = 20,
+		CHARACTER_UPDATE = 21,
 
-		CHARACTER_STATS_REQUEST,
-		CHARACTER_STATS_RESPONSE,
+		CHARACTER_STATS_REQUEST = 22,
+		CHARACTER_STATS_RESPONSE = 23,
 
-		CHARACTER_REJECTION,
+		CHARACTER_REJECTION = 24,
 
 		//enemy data
-		ENEMY_NEW,
-		ENEMY_DELETE,
-		ENEMY_UPDATE,
+		ENEMY_NEW = 25,
+		ENEMY_DELETE = 26,
+		ENEMY_UPDATE = 27,
 
-		ENEMY_STATS_REQUEST,
-		ENEMY_STATS_RESPONSE,
+		ENEMY_STATS_REQUEST = 28,
+		ENEMY_STATS_RESPONSE = 29,
 
-		ENEMY_REJECTION,
+		ENEMY_REJECTION = 30,
 
 		//more packet types go here
 
diff --git a/todo.txt b/todo.txt
index 61ceec5..f03386a 100644
--- a/todo.txt
+++ b/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--