Began reworking the network code

This commit devides SerialPacket into a series of different structures, all decended from a common base class. Using a union was not a good idea.
2014-06-04 20:46:05 +10:00
parent 0a03535ecb
commit da60fa8f94
17 changed files with 505 additions and 201 deletions
@@ -1,188 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef SERIALPACKET_HPP_
-#define SERIALPACKET_HPP_
-
-#include "vector2.hpp"
-#include "region.hpp"
-#include "statistics.hpp"
-#include "combat_data.hpp"
-
-#include "SDL/SDL_net.h"
-
-#define NETWORK_VERSION 20140601
-#define PACKET_STRING_SIZE 100
-
-//TODO: would it be possible to serialize structures directly?
-union SerialPacket {
-	//types of packets
-	enum class Type {
-		//default: there is something wrong
-		NONE = 0,
-
-		//keep alive
-		PING,
-		PONG,
-
-		//searching for a server to join
-		BROADCAST_REQUEST,
-		BROADCAST_RESPONSE,
-		BROADCAST_REJECTION,
-
-		//try to join the server
-		JOIN_REQUEST,
-		JOIN_RESPONSE,
-		JOIN_REJECTION,
-
-		//mass update
-		SYNCHRONIZE,
-
-		//disconnect from the server
-		DISCONNECT,
-
-		//shut down the server
-		SHUTDOWN,
-
-		//map data
-		REGION_REQUEST,
-		REGION_CONTENT,
-		REGION_REJECTION,
-
-		//combat data
-		COMBAT_NEW,
-		COMBAT_DELETE,
-		COMBAT_UPDATE,
-
-		COMBAT_ENTER_REQUEST,
-		COMBAT_ENTER_RESPONSE,
-
-		COMBAT_EXIT_REQUEST,
-		COMBAT_EXIT_RESPONSE,
-
-		//TODO: COMBAT info
-
-		COMBAT_REJECTION,
-
-		//character data
-		CHARACTER_NEW,
-		CHARACTER_DELETE,
-		CHARACTER_UPDATE,
-
-		CHARACTER_STATS_REQUEST,
-		CHARACTER_STATS_RESPONSE,
-
-		CHARACTER_REJECTION,
-
-		//enemy data
-		ENEMY_NEW,
-		ENEMY_DELETE,
-		ENEMY_UPDATE,
-
-		ENEMY_STATS_REQUEST,
-		ENEMY_STATS_RESPONSE,
-
-		ENEMY_REJECTION,
-
-		//more packet types go here
-
-		//not used
-		LAST,
-	};
-
-	//metadata on the packet itself
-	struct Metadata {
-		Type type;
-		IPaddress srcAddress;
-	}meta;
-
-	//info about the server
-	struct ServerInformation {
-		Metadata meta;
-		int networkVersion;
-		char name[PACKET_STRING_SIZE];
-		int playerCount;
-	}serverInfo;
-
-	//info about the client
-	struct ClientInformation {
-		Metadata meta;
-		int clientIndex;
-		int accountIndex;
-		int characterIndex;
-		char username[PACKET_STRING_SIZE];
-		//TODO: password
-		char handle[PACKET_STRING_SIZE];
-		char avatar[PACKET_STRING_SIZE];
-	}clientInfo;
-
-	//info about a region
-	struct RegionInformation {
-		Metadata meta;
-		int mapIndex;
-		int x, y;
-		Region* region;
-	}regionInfo;
-
-	//info about a combat scenario
-	struct CombatInformation {
-		Metadata meta;
-		int combatIndex;
-		int difficulty;
-		CombatData::Terrain terrainType;
-		int characterArray[COMBAT_MAX_CHARACTER_COUNT];
-		int enemyArray[COMBAT_MAX_ENEMY_COUNT];
-		int mapIndex;
-		Vector2 origin;
-		//TODO: rewards
-	}combatInfo;
-
-	//info about a character
-	struct CharacterInformation {
-		Metadata meta;
-		int clientIndex;
-		int accountIndex;
-		int characterIndex;
-		char handle[PACKET_STRING_SIZE];
-		char avatar[PACKET_STRING_SIZE];
-		int mapIndex;
-		Vector2 origin;
-		Vector2 motion;
-		Statistics stats;
-	}characterInfo;
-
-	//info about an enemy
-	struct EnemyInformation {
-		Metadata meta;
-		char handle[PACKET_STRING_SIZE];
-		char avatar[PACKET_STRING_SIZE];
-		Statistics stats;
-		//TODO: rewards
-	}enemyInfo;
-
-	//defaults
-	SerialPacket() {
-		meta.type = Type::NONE;
-		meta.srcAddress = {0,0};
-	}
-};
-
-#endif