Merge branch 'develop', Major API expansion

client/base_scene.cpp

@@ -75,10 +75,10 @@ SceneList BaseScene::GetNextScene() const {
 //Frame loop
 //-------------------------
 
-void BaseScene::RunFrame() {
+void BaseScene::RunFrame(double delta) {
 	FrameStart();
 	HandleEvents();
-	Update();
+	Update(delta);
 	FrameEnd();
 }
 
@@ -86,7 +86,6 @@ void BaseScene::RenderFrame() {
 	SDL_FillRect(screen, 0, 0);
 	Render(screen);
 	SDL_Flip(screen);
-	SDL_Delay(10);
 }
 
 //-------------------------

client/base_scene.hpp

@@ -40,13 +40,13 @@ public:
 	SceneList GetNextScene() const;
 
 	//Frame loop
-	virtual void RunFrame();
+	virtual void RunFrame(double delta);
 	virtual void RenderFrame();
 
 protected:
 	virtual void FrameStart() {}
 	virtual void HandleEvents();
-	virtual void Update() {}
+	virtual void Update(double delta) {}
 	virtual void FrameEnd() {}
 	virtual void Render(SDL_Surface* const screen) {}
 

client/character.hpp

@@ -1,95 +0,0 @@
-/* Copyright: (c) Kayne Ruse 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 CHARACTER_HPP_
-#define CHARACTER_HPP_
-
-//components
-#include "character_defines.hpp"
-#include "vector2.hpp"
-#include "bounding_box.hpp"
-#include "statistics.hpp"
-
-//graphics
-#include "sprite_sheet.hpp"
-
-//std namespace
-#include <string>
-#include <cmath>
-
-class Character {
-public:
-	Character() = default;
-	~Character() = default;
-
-	void Update();
-
-	//graphics
-	void DrawTo(SDL_Surface* const, int camX, int camY);
-	void CorrectSprite();
-	SpriteSheet* GetSprite() { return &sprite; }
-
-	//gameplay
-	Statistics* GetStats() { return &stats; }
-
-	//accessors and mutators
-
-	//metadata
-	int SetOwner(int i) { return owner = i; }
-	int GetOwner() { return owner; }
-	std::string SetHandle(std::string s) { return handle = s; }
-	std::string GetHandle() const { return handle; }
-	std::string SetAvatar(std::string s) { return avatar = s; }
-	std::string GetAvatar() const { return avatar; }
-
-	//position
-	Vector2 SetOrigin(Vector2 v) { return origin = v; }
-	Vector2 GetOrigin() const { return origin; }
-	Vector2 SetMotion(Vector2 v) { return motion = v; }
-	Vector2 GetMotion() const { return motion; }
-	BoundingBox SetBounds(BoundingBox b) { return bounds = b; }
-	BoundingBox GetBounds() { return bounds; }
-
-private:
-	//graphics
-	SpriteSheet sprite;
-
-	//base statistics
-	Statistics stats;
-
-	//TODO: gameplay components: equipment, items, buffs, debuffs
-
-	//metadata
-	int owner;
-	std::string handle;
-	std::string avatar;
-
-	//position
-	Vector2 origin = {0.0,0.0};
-	Vector2 motion = {0.0,0.0};
-	BoundingBox bounds;
-};
-
-//tmp
-#include <map>
-typedef std::map<int, Character> CharacterMap;
-
-#endif

client/clean_up.cpp

@@ -22,7 +22,6 @@
 #include "clean_up.hpp"
 
 #include "channels.hpp"
-#include "config_utility.hpp"
 
 #include <stdexcept>
 
@@ -31,18 +30,24 @@
 //-------------------------
 
 CleanUp::CleanUp(
+	ConfigUtility* const argConfig,
+	UDPNetworkUtility* const argNetwork,
 	int* const argClientIndex,
 	int* const argAccountIndex,
 	int* const argCharacterIndex,
-	CharacterMap* argCharacterMap
+	std::map<int, CombatData>* argCombatMap,
+	std::map<int, CharacterData>* argCharacterMap,
+	std::map<int, EnemyData>* argEnemyMap
 	):
+	config(*argConfig),
+	network(*argNetwork),
 	clientIndex(*argClientIndex),
 	accountIndex(*argAccountIndex),
 	characterIndex(*argCharacterIndex),
-	characterMap(*argCharacterMap)
+	combatMap(*argCombatMap),
+	characterMap(*argCharacterMap),
+	enemyMap(*argEnemyMap)
 {
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-
 	//setup the utility objects
 	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
@@ -64,9 +69,9 @@ CleanUp::CleanUp(
 	clientIndex = -1;
 	accountIndex = -1;
 	characterIndex = -1;
-//	combatMap.clear();
+	combatMap.clear();
 	characterMap.clear();
-//	enemyMap.clear();
+	enemyMap.clear();
 
 	//auto return
 	startTick = std::chrono::steady_clock::now();
@@ -80,15 +85,22 @@ CleanUp::~CleanUp() {
 //Frame loop
 //-------------------------
 
-void CleanUp::Update() {
+void CleanUp::Update(double delta) {
 	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(10)) {
-		SetNextScene(SceneList::MAINMENU);
+		QuitEvent();
 	}
 
 	//BUGFIX: Eat incoming packets
 	while(network.Receive());
 }
 
+void CleanUp::RenderFrame() {
+	SDL_FillRect(GetScreen(), 0, 0);
+	Render(GetScreen());
+	SDL_Flip(GetScreen());
+	fps.Calculate();
+}
+
 void CleanUp::Render(SDL_Surface* const screen) {
 	backButton.DrawTo(screen);
 	font.DrawStringTo("You have been disconnected.", screen, 50, 30);
@@ -117,11 +129,7 @@ void CleanUp::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 }
 
 void CleanUp::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
+	//
-		case SDLK_ESCAPE:
-			SetNextScene(SceneList::MAINMENU);
-		break;
-	}
 }
 
 void CleanUp::KeyUp(SDL_KeyboardEvent const& key) {

client/clean_up.hpp

@@ -30,8 +30,15 @@
 #include "raster_font.hpp"
 #include "button.hpp"
 
+//common
+#include "config_utility.hpp"
+#include "frame_rate.hpp"
+
+#include "combat_data.hpp"
+#include "character_data.hpp"
+#include "enemy_data.hpp"
+
 //client
-#include "character.hpp"
 #include "base_scene.hpp"
 
 //std namespace
@@ -41,16 +48,21 @@ class CleanUp : public BaseScene {
 public:
 	//Public access members
 	CleanUp(
+		ConfigUtility* const argConfig,
+		UDPNetworkUtility* const argNetwork,
 		int* const argClientIndex,
 		int* const argAccountIndex,
 		int* const argCharacterIndex,
-		CharacterMap* argCharacterMap
+		std::map<int, CombatData>* argCombatMap,
+		std::map<int, CharacterData>* argCharacterMap,
+		std::map<int, EnemyData>* argEnemyMap
 	);
 	~CleanUp();
 
 protected:
 	//Frame loop
-	void Update();
+	void Update(double delta);
+	void RenderFrame();
 	void Render(SDL_Surface* const);
 
 	//Event handlers
@@ -62,11 +74,14 @@ protected:
 	void KeyUp(SDL_KeyboardEvent const&);
 
 	//shared parameters
-	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
+	ConfigUtility& config;
+	UDPNetworkUtility& network;
 	int& clientIndex;
 	int& accountIndex;
 	int& characterIndex;
-	CharacterMap& characterMap;
+	std::map<int, CombatData>& combatMap;
+	std::map<int, CharacterData>& characterMap;
+	std::map<int, EnemyData>& enemyMap;
 
 	//graphics
 	Image image;
@@ -74,6 +89,7 @@ protected:
 
 	//UI
 	Button backButton;
+	FrameRate fps;
 
 	//auto return
 	std::chrono::steady_clock::time_point startTick;

client/client_application.cpp

@@ -21,11 +21,10 @@
 */
 #include "client_application.hpp"
 
-#include "config_utility.hpp"
+#include "serial.hpp"
 
 #include <stdexcept>
 #include <chrono>
-#include <iostream>
 
 //-------------------------
 //Scene headers
@@ -37,7 +36,7 @@
 #include "options_menu.hpp"
 #include "lobby_menu.hpp"
 #include "in_world.hpp"
-//#include "in_combat.hpp"
+#include "in_combat.hpp"
 #include "clean_up.hpp"
 
 //-------------------------
@@ -45,72 +44,24 @@
 //-------------------------
 
 void ClientApplication::Init(int argc, char** argv) {
-	std::cout << "Beginning " << argv[0] << std::endl;
-
 	//load the prerequisites
-	ConfigUtility& config = ConfigUtility::GetSingleton();
 	config.Load("rsc\\config.cfg");
 
-	//-------------------------
-	//Initialize the APIs
-	//-------------------------
-
 	//initialize SDL
 	if (SDL_Init(SDL_INIT_VIDEO)) {
 		throw(std::runtime_error("Failed to initialize SDL"));
 	}
-	std::cout << "Initialized SDL" << std::endl;
-
-	//initialize SDL_net
-	if (SDLNet_Init()) {
-		throw(std::runtime_error("Failed to initialize SDL_net"));
-	}
-	UDPNetworkUtility::GetSingleton().Open(0);
-	std::cout << "Initialized SDL_net" << std::endl;
-
-	//-------------------------
-	//Setup the screen
-	//-------------------------
-
 	int w = config.Int("client.screen.w");
 	int h = config.Int("client.screen.h");
 	int f = config.Bool("client.screen.f") ? SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_FULLSCREEN : SDL_HWSURFACE|SDL_DOUBLEBUF;
 
 	BaseScene::SetScreen(w ? w : 800, h ? h : 600, 0, f);
-	std::cout << "Initialized the screen" << std::endl;
 
-	//-------------------------
+	//initialize SDL_net
-	//debug output
+	if (SDLNet_Init()) {
-	//-------------------------
+		throw(std::runtime_error("Failed to initialize SDL_net"));
-
+	}
-	//TODO: enable/disable these with a switch
+	network.Open(0);
-#define DEBUG_OUTPUT_VAR(x) std::cout << "\t" << #x << ": " << x << std::endl;
-
-	std::cout << "Internal sizes:" << std::endl;
-
-	DEBUG_OUTPUT_VAR(sizeof(Region::type_t));
-	DEBUG_OUTPUT_VAR(sizeof(Region));
-	DEBUG_OUTPUT_VAR(REGION_WIDTH);
-	DEBUG_OUTPUT_VAR(REGION_HEIGHT);
-	DEBUG_OUTPUT_VAR(REGION_DEPTH);
-	DEBUG_OUTPUT_VAR(REGION_TILE_FOOTPRINT);
-	DEBUG_OUTPUT_VAR(REGION_SOLID_FOOTPRINT);
-	DEBUG_OUTPUT_VAR(PACKET_BUFFER_SIZE);
-	DEBUG_OUTPUT_VAR(MAX_PACKET_SIZE);
-
-#undef DEBUG_OUTPUT_VAR
-
-	//-------------------------
-	//finalize the startup
-	//-------------------------
-
-	std::cout << "Startup completed successfully" << std::endl;
-
-	//-------------------------
-	//debugging
-	//-------------------------
-
-	//...
 }
 
 void ClientApplication::Proc() {
@@ -119,6 +70,7 @@ void ClientApplication::Proc() {
 	//prepare the time system
 	typedef std::chrono::steady_clock Clock;
 
+	std::chrono::duration<int, std::milli> delta(16);
 	Clock::time_point simTime = Clock::now();
 	Clock::time_point realTime;
 
@@ -136,9 +88,8 @@ void ClientApplication::Proc() {
 		//simulate game time
 		while (simTime < realTime) {
 			//call each user defined function
-			activeScene->RunFrame();
+			activeScene->RunFrame(double(delta.count()) / std::chrono::duration<int, std::milli>::period::den);
-			//~60 FPS
+			simTime += delta;
-			simTime += std::chrono::duration<int, std::milli>(16);
 		}
 
 		//draw the game to the screen
@@ -149,11 +100,9 @@ void ClientApplication::Proc() {
 }
 
 void ClientApplication::Quit() {
-	std::cout << "Shutting down" << std::endl;
+	network.Close();
-	UDPNetworkUtility::GetSingleton().Close();
 	SDLNet_Quit();
 	SDL_Quit();
-	std::cout << "Clean exit" << std::endl;
 }
 
 //-------------------------
@@ -166,25 +115,25 @@ void ClientApplication::LoadScene(SceneList sceneIndex) {
 		//add scene creation calls here
 		case SceneList::FIRST:
 		case SceneList::SPLASHSCREEN:
-			activeScene = new SplashScreen();
+			activeScene = new SplashScreen(&config);
 		break;
 		case SceneList::MAINMENU:
-			activeScene = new MainMenu();
+			activeScene = new MainMenu(&config);
 		break;
 		case SceneList::OPTIONSMENU:
-			activeScene = new OptionsMenu();
+			activeScene = new OptionsMenu(&config);
 		break;
 		case SceneList::LOBBYMENU:
-			activeScene = new LobbyMenu(&clientIndex, &accountIndex);
+			activeScene = new LobbyMenu(&config, &network, &clientIndex, &accountIndex);
 		break;
 		case SceneList::INWORLD:
-			activeScene = new InWorld(&clientIndex, &accountIndex, &characterIndex, &characterMap);
+			activeScene = new InWorld(&config, &network, &clientIndex, &accountIndex, &characterIndex, &combatMap, &characterMap);
+		break;
+		case SceneList::INCOMBAT:
+			activeScene = new InCombat(&config, &network, &clientIndex, &accountIndex, &characterIndex, &combatMap, &characterMap, &enemyMap);
 		break;
-//		case SceneList::INCOMBAT:
-//			activeScene = new InCombat(&clientIndex, &accountIndex, &characterIndex, &characterMap);
-//		break;
 		case SceneList::CLEANUP:
-			activeScene = new CleanUp(&clientIndex, &accountIndex, &characterIndex, &characterMap);
+			activeScene = new CleanUp(&config, &network, &clientIndex, &accountIndex, &characterIndex, &combatMap, &characterMap, &enemyMap);
 		break;
 		default:
 			throw(std::logic_error("Failed to recognize the scene index"));

client/client_application.hpp

@@ -25,26 +25,24 @@
 #include "scene_list.hpp"
 #include "base_scene.hpp"
 
+#include "config_utility.hpp"
 #include "udp_network_utility.hpp"
-#include "character.hpp"
+#include "character_data.hpp"
-
+#include "combat_data.hpp"
-#include "singleton.hpp"
+#include "enemy_data.hpp"
 
 #include <map>
 
-class ClientApplication: public Singleton<ClientApplication> {
+class ClientApplication {
 public:
-	//public methods
+	ClientApplication() = default;
+	~ClientApplication() = default;
+
 	void Init(int argc, char** argv);
 	void Proc();
 	void Quit();
 
 private:
-	friend Singleton<ClientApplication>;
-
-	ClientApplication() = default;
-	~ClientApplication() = default;
-
 	//Private access members
 	void LoadScene(SceneList sceneIndex);
 	void UnloadScene();
@@ -52,11 +50,15 @@ private:
 	BaseScene* activeScene = nullptr;
 
 	//shared parameters
+	ConfigUtility config;
+	UDPNetworkUtility network;
 	int clientIndex = -1;
 	int accountIndex = -1;
 	int characterIndex = -1;
 
-	CharacterMap characterMap;
+	std::map<int, CombatData> combatMap;
+	std::map<int, CharacterData> characterMap;
+	std::map<int, EnemyData> enemyMap;
 };
 
 #endif

client/in_combat.cpp

@@ -0,0 +1,225 @@
+/* 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.
+*/
+#include "in_combat.hpp"
+
+#include "channels.hpp"
+#include "utility.hpp"
+
+#include <stdexcept>
+
+//-------------------------
+//Public access members
+//-------------------------
+
+InCombat::InCombat(
+	ConfigUtility* const argConfig,
+	UDPNetworkUtility* const argNetwork,
+	int* const argClientIndex,
+	int* const argAccountIndex,
+	int* const argCharacterIndex,
+	std::map<int, CombatData>* argCombatMap,
+	std::map<int, CharacterData>* argCharacterMap,
+	std::map<int, EnemyData>* argEnemyMap
+	):
+	config(*argConfig),
+	network(*argNetwork),
+	clientIndex(*argClientIndex),
+	accountIndex(*argAccountIndex),
+	characterIndex(*argCharacterIndex),
+	combatMap(*argCombatMap),
+	characterMap(*argCharacterMap),
+	enemyMap(*argEnemyMap)
+{
+/*	//setup the utility objects
+	buttonImage.LoadSurface(config["dir.interface"] + "button_menu.bmp");
+	buttonImage.SetClipH(buttonImage.GetClipH()/3);
+	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+
+	//pass the utility objects
+	backButton.SetImage(&buttonImage);
+	backButton.SetFont(&font);
+
+	//set the button positions
+	backButton.SetX(50);
+	backButton.SetY(50 + buttonImage.GetClipH() * 0);
+
+	//set the button texts
+	backButton.SetText("Back");
+
+	//request a sync
+	RequestSynchronize();
+*/
+	//debug
+	//
+}
+
+InCombat::~InCombat() {
+	//
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void InCombat::FrameStart() {
+	//
+}
+
+void InCombat::Update(double delta) {
+	//suck in and process all waiting packets
+	SerialPacket* packetBuffer = static_cast<SerialPacket*>(malloc(MAX_PACKET_SIZE));
+	while(network.Receive(packetBuffer)) {
+		HandlePacket(packetBuffer);
+	}
+	free(static_cast<void*>(packetBuffer));
+
+	//TODO: more
+}
+
+void InCombat::FrameEnd() {
+	//
+}
+
+void InCombat::RenderFrame() {
+	SDL_FillRect(GetScreen(), 0, 0);
+	Render(GetScreen());
+	SDL_Flip(GetScreen());
+	fps.Calculate();
+}
+
+void InCombat::Render(SDL_Surface* const screen) {
+	//TODO: draw the background
+
+	//TODO: draw the characters
+
+	//TODO: draw the enemies
+
+	//TODO: draw the UI
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void InCombat::QuitEvent() {
+	//exit the game AND the server
+	RequestDisconnect();
+	SetNextScene(SceneList::QUIT);
+}
+
+void InCombat::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	//
+}
+
+void InCombat::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	//
+}
+
+void InCombat::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	//
+}
+
+void InCombat::KeyDown(SDL_KeyboardEvent const& key) {
+	//
+}
+
+void InCombat::KeyUp(SDL_KeyboardEvent const& key) {
+	//
+}
+
+//-------------------------
+//Network handlers
+//-------------------------
+
+void InCombat::HandlePacket(SerialPacket* const argPacket) {
+	switch(argPacket->type) {
+		case SerialPacketType::DISCONNECT:
+			HandleDisconnect(argPacket);
+		break;
+		//handle errors
+		default:
+			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in InCombat: " + to_string_custom(static_cast<int>(argPacket->type)) ));
+		break;
+	}
+}
+
+void InCombat::HandleDisconnect(SerialPacket* const) {
+	SetNextScene(SceneList::CLEANUP);
+}
+
+//TODO: more network handlers
+
+//-------------------------
+//Server control
+//-------------------------
+
+void InCombat::RequestSynchronize() {
+	ClientPacket newPacket;
+
+	//request a sync
+	newPacket.type = SerialPacketType::SYNCHRONIZE;
+	newPacket.clientIndex = clientIndex;
+	newPacket.accountIndex = accountIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InCombat::SendPlayerUpdate() {
+	CharacterPacket newPacket;
+
+	//pack the packet
+	newPacket.type = SerialPacketType::CHARACTER_UPDATE;
+
+	newPacket.characterIndex = characterIndex;
+	//handle, avatar
+	newPacket.accountIndex = accountIndex;
+//	newPacket.roomIndex = localCharacter->roomIndex;
+//	newPacket.origin = localCharacter->origin;
+//	newPacket.motion = localCharacter->motion;
+//	newPacket.stats = localCharacter->stats;
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InCombat::RequestDisconnect() {
+	ClientPacket newPacket;
+
+	//send a disconnect request
+	newPacket.type = SerialPacketType::DISCONNECT;
+	newPacket.clientIndex = clientIndex;
+	newPacket.accountIndex = accountIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InCombat::RequestShutdown() {
+	ClientPacket newPacket;
+
+	//send a shutdown request
+	newPacket.type = SerialPacketType::SHUTDOWN;
+	newPacket.clientIndex = clientIndex;
+	newPacket.accountIndex = accountIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}

client/in_combat.hpp

@@ -0,0 +1,105 @@
+/* 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 INCOMBAT_HPP_
+#define INCOMBAT_HPP_
+
+//network
+#include "udp_network_utility.hpp"
+
+//graphics
+#include "image.hpp"
+#include "raster_font.hpp"
+#include "button.hpp"
+
+//common
+#include "config_utility.hpp"
+#include "frame_rate.hpp"
+
+#include "combat_data.hpp"
+#include "character_data.hpp"
+#include "enemy_data.hpp"
+
+//client
+#include "base_scene.hpp"
+
+class InCombat : public BaseScene {
+public:
+	//Public access members
+	InCombat(
+		ConfigUtility* const argConfig,
+		UDPNetworkUtility* const argNetwork,
+		int* const argClientIndex,
+		int* const argAccountIndex,
+		int* const argCharacterIndex,
+		std::map<int, CombatData>* argCombatMap,
+		std::map<int, CharacterData>* argCharacterMap,
+		std::map<int, EnemyData>* argEnemyMap
+	);
+	~InCombat();
+
+protected:
+	//Frame loop
+	void FrameStart();
+	void Update(double delta);
+	void FrameEnd();
+	void RenderFrame();
+	void Render(SDL_Surface* const);
+
+	//Event handlers
+	void QuitEvent();
+	void MouseMotion(SDL_MouseMotionEvent const&);
+	void MouseButtonDown(SDL_MouseButtonEvent const&);
+	void MouseButtonUp(SDL_MouseButtonEvent const&);
+	void KeyDown(SDL_KeyboardEvent const&);
+	void KeyUp(SDL_KeyboardEvent const&);
+
+	//Network handlers
+	void HandlePacket(SerialPacket* const);
+	void HandleDisconnect(SerialPacket* const);
+	//TODO: more network handlers
+
+	//Server control
+	void RequestSynchronize();
+	void SendPlayerUpdate();
+	void RequestDisconnect();
+	void RequestShutdown();
+	//TODO: more
+
+	//shared parameters
+	ConfigUtility& config;
+	UDPNetworkUtility& network;
+	int& clientIndex;
+	int& accountIndex;
+	int& characterIndex;
+	std::map<int, CombatData>& combatMap;
+	std::map<int, CharacterData>& characterMap;
+	std::map<int, EnemyData>& enemyMap;
+
+	//graphics
+	//TODO: graphics
+
+	//UI
+	//TODO: UI
+	FrameRate fps;
+};
+
+#endif

client/in_world.cpp

@@ -23,30 +23,32 @@
 
 #include "channels.hpp"
 #include "utility.hpp"
-#include "config_utility.hpp"
 
-#include <stdexcept>
 #include <algorithm>
 #include <cmath>
-#include <iostream>
+#include <stdexcept>
 
 //-------------------------
 //Public access members
 //-------------------------
 
 InWorld::InWorld(
+	ConfigUtility* const argConfig,
+	UDPNetworkUtility* const argNetwork,
 	int* const argClientIndex,
 	int* const argAccountIndex,
 	int* const argCharacterIndex,
-	CharacterMap* argCharacterMap
+	std::map<int, CombatData>* argCombatMap,
+	std::map<int, CharacterData>* argCharacterMap
 	):
+	config(*argConfig),
+	network(*argNetwork),
 	clientIndex(*argClientIndex),
 	accountIndex(*argAccountIndex),
 	characterIndex(*argCharacterIndex),
+	combatMap(*argCombatMap),
 	characterMap(*argCharacterMap)
 {
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-
 	//setup the utility objects
 	buttonImage.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	buttonImage.SetClipH(buttonImage.GetClipH()/3);
@@ -70,8 +72,7 @@ InWorld::InWorld(
 
 	//load the tilesheet
 	//TODO: add the tilesheet to the map system?
-	//TODO: Tile size and tile sheet should be loaded elsewhere
+	tileSheet.Load(config["dir.tilesets"] + "terrain.bmp", 12, 15);
-	tileSheet.Load(config["dir.tilesets"] + "terrain.bmp", 32, 32);
 
 	//request a sync
 	RequestSynchronize();
@@ -92,54 +93,27 @@ void InWorld::FrameStart() {
 	//
 }
 
-void InWorld::Update() {
+void InWorld::Update(double delta) {
 	//suck in and process all waiting packets
-	SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]);
+	SerialPacket* packetBuffer = static_cast<SerialPacket*>(malloc(MAX_PACKET_SIZE));
 	while(network.Receive(packetBuffer)) {
 		HandlePacket(packetBuffer);
 	}
-	delete reinterpret_cast<char*>(packetBuffer);
+	free(static_cast<void*>(packetBuffer));
 
 	//update the characters
 	for (auto& it : characterMap) {
-		it.second.Update();
+		it.second.Update(delta);
+	}
+
+	//update the camera
+	if(localCharacter) {
+		camera.x = localCharacter->origin.x - camera.marginX;
+		camera.y = localCharacter->origin.y - camera.marginY;
 	}
 
 	//check the map
 	UpdateMap();
-
-	//skip the rest
-	if (!localCharacter) {
-		return;
-	}
-
-	//check for collisions with the map
-	BoundingBox wallBounds = {0, 0, tileSheet.GetTileW(), tileSheet.GetTileH()};
-	const int xCount = localCharacter->GetBounds().w / wallBounds.w + 1;
-	const int yCount = localCharacter->GetBounds().h / wallBounds.h + 1;
-
-	for (int i = -1; i <= xCount; ++i) {
-		for (int j = -1; j <= yCount; ++j) {
-			//set the wall's position
-			wallBounds.x = wallBounds.w * i + snapToBase((double)wallBounds.w, localCharacter->GetOrigin().x);
-			wallBounds.y = wallBounds.h * j + snapToBase((double)wallBounds.h, localCharacter->GetOrigin().y);
-
-			if (!regionPager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
-				continue;
-			}
-
-			if ((localCharacter->GetOrigin() + localCharacter->GetBounds()).CheckOverlap(wallBounds)) {
-				localCharacter->SetOrigin(localCharacter->GetOrigin() - (localCharacter->GetMotion()));
-				localCharacter->SetMotion({0,0});
-				localCharacter->CorrectSprite();
-				SendPlayerUpdate();
-			}
-		}
-	}
-
-	//update the camera
-	camera.x = localCharacter->GetOrigin().x - camera.marginX;
-	camera.y = localCharacter->GetOrigin().y - camera.marginY;
 }
 
 void InWorld::FrameEnd() {
@@ -201,67 +175,77 @@ void InWorld::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 }
 
 void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
-	if (!localCharacter) {
-		return;
-	}
-
-	//hotkeys
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			RequestDisconnect();
-		break;
-	}
-
-	//player movement
-	Vector2 motion = localCharacter->GetMotion();
 	switch(key.keysym.sym) {
+		//player movement
 		case SDLK_LEFT:
-			motion.x -= CHARACTER_WALKING_SPEED;
+			if (localCharacter) {
+				localCharacter->motion.x -= CHARACTER_WALKING_SPEED;
+				localCharacter->CorrectSprite();
+				SendPlayerUpdate();
+			}
 		break;
+
 		case SDLK_RIGHT:
-			motion.x += CHARACTER_WALKING_SPEED;
+			if (localCharacter) {
+				localCharacter->motion.x += CHARACTER_WALKING_SPEED;
+				localCharacter->CorrectSprite();
+				SendPlayerUpdate();
+			}
 		break;
+
 		case SDLK_UP:
-			motion.y -= CHARACTER_WALKING_SPEED;
+			if (localCharacter) {
+				localCharacter->motion.y -= CHARACTER_WALKING_SPEED;
+				localCharacter->CorrectSprite();
+				SendPlayerUpdate();
+			}
 		break;
+
 		case SDLK_DOWN:
-			motion.y += CHARACTER_WALKING_SPEED;
+			if (localCharacter) {
+				localCharacter->motion.y += CHARACTER_WALKING_SPEED;
+				localCharacter->CorrectSprite();
+				SendPlayerUpdate();
+			}
 		break;
-		default:
-			return;
 	}
-	localCharacter->SetMotion(motion);
-	localCharacter->CorrectSprite();
-	SendPlayerUpdate();
 }
 
 void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
-	if (!localCharacter) {
-		return;
-	}
-
-	//player movement
-	Vector2 motion = localCharacter->GetMotion();
 	switch(key.keysym.sym) {
-		//NOTE: The use of min/max here are to prevent awkward movements
+		//player movement
 		case SDLK_LEFT:
-			motion.x = std::min(motion.x + CHARACTER_WALKING_SPEED, 0.0);
+			if (localCharacter) {
+				localCharacter->motion.x += CHARACTER_WALKING_SPEED;
+				localCharacter->CorrectSprite();
+				SendPlayerUpdate();
+			}
 		break;
+
 		case SDLK_RIGHT:
-			motion.x = std::max(motion.x - CHARACTER_WALKING_SPEED, 0.0);
+			if (localCharacter) {
+				localCharacter->motion.x -= CHARACTER_WALKING_SPEED;
+				localCharacter->CorrectSprite();
+				SendPlayerUpdate();
+			}
 		break;
+
 		case SDLK_UP:
-			motion.y = std::min(motion.y + CHARACTER_WALKING_SPEED, 0.0);
+			if (localCharacter) {
+				localCharacter->motion.y += CHARACTER_WALKING_SPEED;
+				localCharacter->CorrectSprite();
+				SendPlayerUpdate();
+			}
 		break;
+
 		case SDLK_DOWN:
-			motion.y = std::max(motion.y - CHARACTER_WALKING_SPEED, 0.0);
+			if (localCharacter) {
+				localCharacter->motion.y -= CHARACTER_WALKING_SPEED;
+				localCharacter->CorrectSprite();
+				SendPlayerUpdate();
+			}
 		break;
-		default:
-			return;
 	}
-	localCharacter->SetMotion(motion);
-	localCharacter->CorrectSprite();
-	SendPlayerUpdate();
 }
 
 //-------------------------
@@ -269,7 +253,7 @@ void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
 //-------------------------
 
 void InWorld::HandlePacket(SerialPacket* const argPacket) {
-	switch(argPacket->GetType()) {
+	switch(argPacket->type) {
 		case SerialPacketType::DISCONNECT:
 			HandleDisconnect(argPacket);
 		break;
@@ -287,7 +271,7 @@ void InWorld::HandlePacket(SerialPacket* const argPacket) {
 		break;
 		//handle errors
 		default:
-			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in InWorld: " + to_string_custom(static_cast<int>(argPacket->GetType())) ));
+			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in InWorld: " + to_string_custom(static_cast<int>(argPacket->type)) ));
 		break;
 	}
 }
@@ -297,86 +281,75 @@ void InWorld::HandleDisconnect(SerialPacket* const argPacket) {
 }
 
 void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
-	if (characterMap.find(argPacket->GetCharacterIndex()) != characterMap.end()) {
+	if (characterMap.find(argPacket->characterIndex) != characterMap.end()) {
 		throw(std::runtime_error("Cannot create duplicate characters"));
 	}
 
 	//create the character object
-	Character& newCharacter = characterMap[argPacket->GetCharacterIndex()];
+	CharacterData& character = characterMap[argPacket->characterIndex];
 
-	//fill out the character's members
+	//set the members
-	newCharacter.SetHandle(argPacket->GetHandle());
+	character.handle = argPacket->handle;
-	newCharacter.SetAvatar(argPacket->GetAvatar());
+	character.avatar = argPacket->avatar;
+	character.sprite.LoadSurface(config["dir.sprites"] + character.avatar, 4, 4);
+	character.roomIndex = argPacket->roomIndex;
+	character.origin = argPacket->origin;
+	character.motion = argPacket->motion;
+	character.stats = argPacket->stats;
 
-	newCharacter.GetSprite()->LoadSurface(ConfigUtility::GetSingleton()["dir.sprites"] + newCharacter.GetAvatar(), 4, 4);
+	character.CorrectSprite();
-
-	newCharacter.SetOrigin(argPacket->GetOrigin());
-	newCharacter.SetMotion(argPacket->GetMotion());
-	newCharacter.SetBounds({
-		CHARACTER_BOUNDS_X,
-		CHARACTER_BOUNDS_Y,
-		CHARACTER_BOUNDS_WIDTH,
-		CHARACTER_BOUNDS_HEIGHT
-	});
-
-	*newCharacter.GetStats() = *argPacket->GetStatistics();
-
-	//bookkeeping code
-	newCharacter.CorrectSprite();
 
 	//catch this client's player object
-	if (argPacket->GetAccountIndex() == accountIndex && !localCharacter) {
+	if (argPacket->accountIndex == accountIndex && !localCharacter) {
-		characterIndex = argPacket->GetCharacterIndex();
+		characterIndex = argPacket->characterIndex;
-		localCharacter = &newCharacter;
+		localCharacter = &character;
 
 		//setup the camera
-		//TODO: move this?
 		camera.width = GetScreen()->w;
 		camera.height = GetScreen()->h;
 
 		//center on the player's character
-		camera.marginX = (GetScreen()->w / 2 - localCharacter->GetSprite()->GetImage()->GetClipW() / 2);
+		camera.marginX = (GetScreen()->w / 2 - localCharacter->sprite.GetImage()->GetClipW() / 2);
-		camera.marginY = (GetScreen()->h / 2 - localCharacter->GetSprite()->GetImage()->GetClipH() / 2);
+		camera.marginY = (GetScreen()->h / 2 - localCharacter->sprite.GetImage()->GetClipH() / 2);
 	}
 }
 
 void InWorld::HandleCharacterDelete(CharacterPacket* const argPacket) {
 	//TODO: authenticate when own character is being deleted (linked to a TODO in the server)
-
 	//catch this client's player object
-	if (argPacket->GetCharacterIndex() == characterIndex) {
+	if (argPacket->characterIndex == characterIndex) {
 		characterIndex = -1;
 		localCharacter = nullptr;
 	}
 
-	characterMap.erase(argPacket->GetCharacterIndex());
+	characterMap.erase(argPacket->characterIndex);
 }
 
 void InWorld::HandleCharacterUpdate(CharacterPacket* const argPacket) {
-	if (characterMap.find(argPacket->GetCharacterIndex()) == characterMap.end()) {
+	if (characterMap.find(argPacket->characterIndex) == characterMap.end()) {
-		std::cout << "Warning: HandleCharacterUpdate() is passing to HandleCharacterNew()" << std::endl;
 		HandleCharacterNew(argPacket);
 		return;
 	}
 
-	Character& character = characterMap[argPacket->GetCharacterIndex()];
+	CharacterData& character = characterMap[argPacket->characterIndex];
 
 	//other characters moving
-	if (argPacket->GetCharacterIndex() != characterIndex) {
+	if (argPacket->characterIndex != characterIndex) {
-		character.SetOrigin(argPacket->GetOrigin());
+		character.roomIndex = argPacket->roomIndex;
-		character.SetMotion(argPacket->GetMotion());
+		character.origin = argPacket->origin;
+		character.motion = argPacket->motion;
 		character.CorrectSprite();
 	}
 }
 
 void InWorld::HandleRegionContent(RegionPacket* const argPacket) {
 	//replace existing regions
-	regionPager.UnloadRegion(argPacket->GetX(), argPacket->GetY());
+	regionPager.UnloadRegion(argPacket->x, argPacket->y);
-	regionPager.PushRegion(argPacket->GetRegion());
+	regionPager.PushRegion(argPacket->region);
 
 	//clean up after the serial code
-	delete argPacket->GetRegion();
+	delete argPacket->region;
-	argPacket->SetRegion(nullptr);
+	argPacket->region = nullptr;
 }
 
 //-------------------------
@@ -387,11 +360,9 @@ void InWorld::RequestSynchronize() {
 	ClientPacket newPacket;
 
 	//request a sync
-	newPacket.SetType(SerialPacketType::SYNCHRONIZE);
+	newPacket.type = SerialPacketType::SYNCHRONIZE;
-	newPacket.SetClientIndex(clientIndex);
+	newPacket.clientIndex = clientIndex;
-	newPacket.SetAccountIndex(accountIndex);
+	newPacket.accountIndex = accountIndex;
-
-	//TODO: location, range for sync request
 
 	network.SendTo(Channels::SERVER, &newPacket);
 }
@@ -400,15 +371,15 @@ void InWorld::SendPlayerUpdate() {
 	CharacterPacket newPacket;
 
 	//pack the packet
-	newPacket.SetType(SerialPacketType::CHARACTER_UPDATE);
+	newPacket.type = SerialPacketType::CHARACTER_UPDATE;
 
-	newPacket.SetCharacterIndex(characterIndex);
+	newPacket.characterIndex = characterIndex;
-	//NOTE: omitting the handle and avatar here
+	//handle, avatar
-	newPacket.SetAccountIndex(accountIndex);
+	newPacket.accountIndex = accountIndex;
-	newPacket.SetRoomIndex(0); //TODO: room index
+	newPacket.roomIndex = localCharacter->roomIndex;
-	newPacket.SetOrigin(localCharacter->GetOrigin());
+	newPacket.origin = localCharacter->origin;
-	newPacket.SetMotion(localCharacter->GetMotion());
+	newPacket.motion = localCharacter->motion;
-	*newPacket.GetStatistics() = *localCharacter->GetStats();
+	newPacket.stats = localCharacter->stats;
 
 	//TODO: gameplay components: equipment, items, buffs, debuffs
 
@@ -419,9 +390,9 @@ void InWorld::RequestDisconnect() {
 	ClientPacket newPacket;
 
 	//send a disconnect request
-	newPacket.SetType(SerialPacketType::DISCONNECT);
+	newPacket.type = SerialPacketType::DISCONNECT;
-	newPacket.SetClientIndex(clientIndex);
+	newPacket.clientIndex = clientIndex;
-	newPacket.SetAccountIndex(accountIndex);
+	newPacket.accountIndex = accountIndex;
 
 	network.SendTo(Channels::SERVER, &newPacket);
 }
@@ -430,9 +401,9 @@ void InWorld::RequestShutDown() {
 	ClientPacket newPacket;
 
 	//send a shutdown request
-	newPacket.SetType(SerialPacketType::SHUTDOWN);
+	newPacket.type = SerialPacketType::SHUTDOWN;
-	newPacket.SetClientIndex(clientIndex);
+	newPacket.clientIndex = clientIndex;
-	newPacket.SetAccountIndex(accountIndex);
+	newPacket.accountIndex = accountIndex;
 
 	network.SendTo(Channels::SERVER, &newPacket);
 }
@@ -441,10 +412,10 @@ void InWorld::RequestRegion(int roomIndex, int x, int y) {
 	RegionPacket packet;
 
 	//pack the region's data
-	packet.SetType(SerialPacketType::REGION_REQUEST);
+	packet.type = SerialPacketType::REGION_REQUEST;
-	packet.SetRoomIndex(roomIndex);
+	packet.roomIndex = roomIndex;
-	packet.SetX(x);
+	packet.x = x;
-	packet.SetY(y);
+	packet.y = y;
 
 	network.SendTo(Channels::SERVER, &packet);
 }
@@ -464,7 +435,7 @@ void InWorld::UpdateMap() {
 
 	//prune distant regions
 	for (std::list<Region>::iterator it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); /* EMPTY */) {
-		//check if the region is outside of this area
+		//check if the region is outside off this area
 		if (it->GetX() < xStart || it->GetX() > xEnd || it->GetY() < yStart || it->GetY() > yEnd) {
 
 			//clunky, but the alternative was time consuming

client/in_world.hpp

@@ -35,9 +35,11 @@
 #include "tile_sheet.hpp"
 
 //common
+#include "config_utility.hpp"
 #include "frame_rate.hpp"
 
-#include "character.hpp"
+#include "combat_data.hpp"
+#include "character_data.hpp"
 
 //client
 #include "base_scene.hpp"
@@ -49,17 +51,20 @@ class InWorld : public BaseScene {
 public:
 	//Public access members
 	InWorld(
+		ConfigUtility* const argConfig,
+		UDPNetworkUtility* const argNetwork,
 		int* const argClientIndex,
 		int* const argAccountIndex,
 		int* const argCharacterIndex,
-		CharacterMap* argCharacterMap
+		std::map<int, CombatData>* argCombatMap,
+		std::map<int, CharacterData>* argCharacterMap
 	);
 	~InWorld();
 
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update();
+	void Update(double delta);
 	void FrameEnd();
 	void RenderFrame();
 	void Render(SDL_Surface* const);
@@ -91,11 +96,13 @@ protected:
 	void UpdateMap();
 
 	//shared parameters
-	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
+	ConfigUtility& config;
+	UDPNetworkUtility& network;
 	int& clientIndex;
 	int& accountIndex;
 	int& characterIndex;
-	CharacterMap& characterMap;
+	std::map<int, CombatData>& combatMap;
+	std::map<int, CharacterData>& characterMap;
 
 	//graphics
 	Image buttonImage;
@@ -117,7 +124,7 @@ protected:
 	FrameRate fps;
 
 	//game
-	Character* localCharacter = nullptr;
+	CharacterData* localCharacter = nullptr;
 };
 
 #endif

client/lobby_menu.cpp

@@ -30,7 +30,14 @@
 //Public access members
 //-------------------------
 
-LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
+LobbyMenu::LobbyMenu(
+	ConfigUtility* const argConfig,
+	UDPNetworkUtility* const argNetwork,
+	int* const argClientIndex,
+	int* const argAccountIndex
+	):
+	config(*argConfig),
+	network(*argNetwork),
 	clientIndex(*argClientIndex),
 	accountIndex(*argAccountIndex)
 {
@@ -65,9 +72,6 @@ LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
 
 	//BUGFIX: Eat incoming packets
 	while(network.Receive());
-
-	//Initial broadcast
-	SendBroadcastRequest();
 }
 
 LobbyMenu::~LobbyMenu() {
@@ -82,13 +86,13 @@ void LobbyMenu::FrameStart() {
 	//
 }
 
-void LobbyMenu::Update() {
+void LobbyMenu::Update(double delta) {
 	//suck in and process all waiting packets
-	SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]);
+	SerialPacket* packetBuffer = static_cast<SerialPacket*>(malloc(MAX_PACKET_SIZE));
 	while(network.Receive(packetBuffer)) {
 		HandlePacket(packetBuffer);
 	}
-	delete reinterpret_cast<char*>(packetBuffer);
+	free(static_cast<void*>(packetBuffer));
 }
 
 void LobbyMenu::FrameEnd() {
@@ -107,10 +111,7 @@ void LobbyMenu::Render(SDL_Surface* const screen) {
 	for (int i = 0; i < serverInfo.size(); i++) {
 		//draw the selected server's highlight
 		if (selection == &serverInfo[i]) {
-			SDL_Rect r = {
+			SDL_Rect r = listBox;
-				(Sint16)listBox.x, (Sint16)listBox.y,
-				(Uint16)listBox.w, (Uint16)listBox.h
-			};
 			r.y += i * listBox.h;
 			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 255, 127, 39));
 		}
@@ -148,19 +149,39 @@ void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 
 void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 	if (search.MouseButtonUp(button) == Button::State::HOVER) {
-		SendBroadcastRequest();
+		//broadcast to the network, or a specific server
+		SerialPacket packet;
+		packet.type = SerialPacketType::BROADCAST_REQUEST;
+		network.SendTo(config["server.host"].c_str(), config.Int("server.port"), &packet);
+
+		//reset the server list
+		serverInfo.clear();
+		selection = nullptr;
 	}
+
 	else if (join.MouseButtonUp(button) == Button::State::HOVER && selection != nullptr && selection->compatible) {
-		SendJoinRequest();
+		//pack the packet
+		ClientPacket packet;
+		packet.type = SerialPacketType::JOIN_REQUEST;
+		strncpy(packet.username, config["client.username"].c_str(), PACKET_STRING_SIZE);
+
+		//join the selected server
+		network.SendTo(&selection->address, &packet);
+		selection = nullptr;
 	}
+
 	else if (back.MouseButtonUp(button) == Button::State::HOVER) {
 		SetNextScene(SceneList::MAINMENU);
 	}
 
-	//has the user selected a server on the list?
+	else if (
-	BoundingBox tmpBox = listBox;
+		//has the user selected a server on the list?
-	tmpBox.h *= serverInfo.size();
+		//TODO: replace with regular collision checker
-	if (tmpBox.CheckOverlap({button.x, button.y})) {
+		button.x > listBox.x &&
+		button.x < listBox.x + listBox.w &&
+		button.y > listBox.y &&
+		button.y < listBox.y + listBox.h * serverInfo.size()
+		) {
 		selection = &serverInfo[(button.y - listBox.y)/listBox.h];
 	}
 	else {
@@ -169,11 +190,7 @@ void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 }
 
 void LobbyMenu::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
+	//
-		case SDLK_ESCAPE:
-			SetNextScene(SceneList::MAINMENU);
-		break;
-	}
 }
 
 void LobbyMenu::KeyUp(SDL_KeyboardEvent const& key) {
@@ -185,7 +202,7 @@ void LobbyMenu::KeyUp(SDL_KeyboardEvent const& key) {
 //-------------------------
 
 void LobbyMenu::HandlePacket(SerialPacket* const argPacket) {
-		switch(argPacket->GetType()) {
+		switch(argPacket->type) {
 		case SerialPacketType::BROADCAST_RESPONSE:
 			HandleBroadcastResponse(static_cast<ServerPacket*>(argPacket));
 		break;
@@ -194,7 +211,7 @@ void LobbyMenu::HandlePacket(SerialPacket* const argPacket) {
 		break;
 		//handle errors
 		default:
-			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in LobbyMenu: " + to_string_custom(static_cast<int>(argPacket->GetType())) ));
+			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in LobbyMenu: " + to_string_custom(static_cast<int>(argPacket->type)) ));
 		break;
 	}
 }
@@ -202,10 +219,10 @@ void LobbyMenu::HandlePacket(SerialPacket* const argPacket) {
 void LobbyMenu::HandleBroadcastResponse(ServerPacket* const argPacket) {
 	//extract the data
 	ServerInformation server;
-	server.address = argPacket->GetAddress();
+	server.address = argPacket->srcAddress;
-	server.name = argPacket->GetName();
+	server.name = argPacket->name;
-	server.playerCount = argPacket->GetPlayerCount();
+	server.playerCount = argPacket->playerCount;
-	server.version = argPacket->GetVersion();
+	server.version = argPacket->version;
 
 	//Checking compatibility
 	server.compatible = server.version == NETWORK_VERSION;
@@ -215,42 +232,16 @@ void LobbyMenu::HandleBroadcastResponse(ServerPacket* const argPacket) {
 }
 
 void LobbyMenu::HandleJoinResponse(ClientPacket* const argPacket) {
-	clientIndex = argPacket->GetClientIndex();
+	clientIndex = argPacket->clientIndex;
-	accountIndex = argPacket->GetAccountIndex();
+	accountIndex = argPacket->accountIndex;
-	network.Bind(argPacket->GetAddressPtr(), Channels::SERVER);
+	network.Bind(&argPacket->srcAddress, Channels::SERVER);
 	SetNextScene(SceneList::INWORLD);
 
 	//send this player's character info
 	CharacterPacket newPacket;
-	newPacket.SetType(SerialPacketType::CHARACTER_NEW);
+	newPacket.type = SerialPacketType::CHARACTER_NEW;
-	newPacket.SetHandle(config["client.handle"].c_str());
+	strncpy(newPacket.handle, config["client.handle"].c_str(), PACKET_STRING_SIZE);
-	newPacket.SetAvatar(config["client.avatar"].c_str());
+	strncpy(newPacket.avatar, config["client.avatar"].c_str(), PACKET_STRING_SIZE);
-	newPacket.SetAccountIndex(accountIndex);
+	newPacket.accountIndex = accountIndex;
 	network.SendTo(Channels::SERVER, &newPacket);
-}
+}
-
-//-------------------------
-//server control
-//-------------------------
-
-void LobbyMenu::SendBroadcastRequest() {
-	//broadcast to the network, or a specific server
-		ServerPacket packet;
-		packet.SetType(SerialPacketType::BROADCAST_REQUEST);
-		network.SendTo(config["server.host"].c_str(), config.Int("server.port"), &packet);
-
-		//reset the server list
-		serverInfo.clear();
-		selection = nullptr;
-}
-
-void LobbyMenu::SendJoinRequest() {
-	//pack the packet
-		ClientPacket packet;
-		packet.SetType(SerialPacketType::JOIN_REQUEST);
-		packet.SetUsername(config["client.username"].c_str());
-
-		//join the selected server
-		network.SendTo(&selection->address, &packet);
-		selection = nullptr;
-}

client/lobby_menu.hpp

@@ -26,7 +26,6 @@
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
-#include "bounding_box.hpp"
 
 //utilities
 #include "config_utility.hpp"
@@ -41,13 +40,18 @@
 class LobbyMenu : public BaseScene {
 public:
 	//Public access members
-	LobbyMenu(int* const argClientIndex, int* const argAccountIndex);
+	LobbyMenu(
+		ConfigUtility* const argConfig,
+		UDPNetworkUtility* const argNetwork,
+		int* const argClientIndex,
+		int* const argAccountIndex
+	);
 	~LobbyMenu();
 
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update();
+	void Update(double delta);
 	void FrameEnd();
 	void Render(SDL_Surface* const);
 
@@ -63,13 +67,9 @@ protected:
 	void HandleBroadcastResponse(ServerPacket* const);
 	void HandleJoinResponse(ClientPacket* const);
 
-	//server control
-	void SendBroadcastRequest();
-	void SendJoinRequest();
-
 	//shared parameters
-	ConfigUtility& config = ConfigUtility::GetSingleton();
+	ConfigUtility& config;
-	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
+	UDPNetworkUtility& network;
 	int& clientIndex;
 	int& accountIndex;
 
@@ -91,9 +91,9 @@ protected:
 
 	std::vector<ServerInformation> serverInfo;
 
-	//NOTE: a terrible hack
+	//a terrible hack, forgive me
 	//I'd love a proper gui system for this
-	BoundingBox listBox;
+	SDL_Rect listBox;
 	ServerInformation* selection = nullptr;
 };
 

client/main.cpp

@@ -21,38 +21,23 @@
 */
 #include "client_application.hpp"
 
-//singletons
-#include "config_utility.hpp"
-#include "udp_network_utility.hpp"
-
 #include <stdexcept>
 #include <iostream>
 
 using namespace std;
 
 int main(int argc, char** argv) {
+	cout << "Beginning client" << endl;
 	try {
-		//create the singletons
+		ClientApplication app;
-		ConfigUtility::Create();
-		UDPNetworkUtility::Create();
-
-		//call the server's routines
-		ClientApplication::Create();
-		ClientApplication& app = ClientApplication::GetSingleton();
-
 		app.Init(argc, argv);
 		app.Proc();
 		app.Quit();
-
-		ClientApplication::Delete();
-
-		//delete the singletons
-		ConfigUtility::Delete();
-		UDPNetworkUtility::Delete();
 	}
 	catch(exception& e) {
 		cerr << "Fatal exception thrown: " << e.what() << endl;
 		return 1;
 	}
+	cout << "Clean exit" << endl;
 	return 0;
-}
+}

client/main_menu.cpp

@@ -21,15 +21,13 @@
 */
 #include "main_menu.hpp"
 
-#include "config_utility.hpp"
-
 //-------------------------
 //Public access members
 //-------------------------
 
-MainMenu::MainMenu() {
+MainMenu::MainMenu(ConfigUtility* const argConfig):
-	ConfigUtility& config = ConfigUtility::GetSingleton();
+	config(*argConfig)
-
+{
 	//setup the utility objects
 	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
@@ -72,7 +70,7 @@ void MainMenu::FrameStart() {
 	//
 }
 
-void MainMenu::Update() {
+void MainMenu::Update(double delta) {
 	//
 }
 
@@ -103,7 +101,6 @@ void MainMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 }
 
 void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	//TODO: Buttons should only register as "selected" when the left button is used
 	if (startButton.MouseButtonUp(button) == Button::State::HOVER) {
 		SetNextScene(SceneList::LOBBYMENU);
 	}

client/main_menu.hpp

@@ -24,6 +24,7 @@
 
 #include "base_scene.hpp"
 
+#include "config_utility.hpp"
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
@@ -31,13 +32,13 @@
 class MainMenu : public BaseScene {
 public:
 	//Public access members
-	MainMenu();
+	MainMenu(ConfigUtility* const);
 	~MainMenu();
 
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update();
+	void Update(double delta);
 	void FrameEnd();
 	void Render(SDL_Surface* const);
 
@@ -48,6 +49,9 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
+	//shared parameters
+	ConfigUtility& config;
+
 	//members
 	Image image;
 	RasterFont font;

client/makefile

@@ -1,7 +1,7 @@
 #config
-INCLUDES+=. scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
+INCLUDES+=. ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet ../common/network/serial ../common/ui ../common/utilities
-LIBS+=client.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
+LIBS+=../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) -DGRAPHICS
 
 #source
 CXXSRC=$(wildcard *.cpp)
@@ -16,7 +16,6 @@ OUT=$(addprefix $(OUTDIR)/,client)
 
 #targets
 all: $(OBJ) $(OUT)
-	$(MAKE) -C scenes
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)

client/options_menu.cpp

@@ -21,15 +21,13 @@
 */
 #include "options_menu.hpp"
 
-#include "config_utility.hpp"
-
 //-------------------------
 //Public access members
 //-------------------------
 
-OptionsMenu::OptionsMenu() {
+OptionsMenu::OptionsMenu(ConfigUtility* const argConfig):
-	ConfigUtility& config = ConfigUtility::GetSingleton();
+	config(*argConfig)
-
+{
 	//setup the utility objects
 	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
@@ -59,7 +57,7 @@ void OptionsMenu::FrameStart() {
 	//
 }
 
-void OptionsMenu::Update() {
+void OptionsMenu::Update(double delta) {
 	//
 }
 
@@ -92,11 +90,7 @@ void OptionsMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 }
 
 void OptionsMenu::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
+	//
-		case SDLK_ESCAPE:
-			SetNextScene(SceneList::MAINMENU);
-		break;
-	}
 }
 
 void OptionsMenu::KeyUp(SDL_KeyboardEvent const& key) {

client/options_menu.hpp

@@ -24,6 +24,7 @@
 
 #include "base_scene.hpp"
 
+#include "config_utility.hpp"
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
@@ -32,13 +33,13 @@
 class OptionsMenu : public BaseScene {
 public:
 	//Public access members
-	OptionsMenu();
+	OptionsMenu(ConfigUtility* const);
 	~OptionsMenu();
 
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update();
+	void Update(double delta);
 	void FrameEnd();
 	void Render(SDL_Surface* const);
 
@@ -49,6 +50,9 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
+	//shared parameters
+	ConfigUtility& config;
+
 	//members
 	Image image;
 	RasterFont font;

client/splash_screen.cpp

@@ -21,14 +21,14 @@
 */
 #include "splash_screen.hpp"
 
-#include "config_utility.hpp"
-
 //-------------------------
 //Public access members
 //-------------------------
 
-SplashScreen::SplashScreen() {
+SplashScreen::SplashScreen(ConfigUtility* const argConfig):
-	logo.LoadSurface(ConfigUtility::GetSingleton()["dir.logos"] + "krstudios.bmp");
+	config(*argConfig)
+{
+	logo.LoadSurface(config["dir.logos"] + "krstudios.bmp");
 	startTick = std::chrono::steady_clock::now();
 }
 
@@ -40,7 +40,7 @@ SplashScreen::~SplashScreen() {
 //Frame loop
 //-------------------------
 
-void SplashScreen::Update() {
+void SplashScreen::Update(double delta) {
 	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(1)) {
 		SetNextScene(SceneList::MAINMENU);
 	}

client/splash_screen.hpp

@@ -24,6 +24,7 @@
 
 #include "base_scene.hpp"
 
+#include "config_utility.hpp"
 #include "image.hpp"
 
 #include <chrono>
@@ -31,14 +32,17 @@
 class SplashScreen : public BaseScene {
 public:
 	//Public access members
-	SplashScreen();
+	SplashScreen(ConfigUtility* const);
 	~SplashScreen();
 
 protected:
 	//Frame loop
-	void Update();
+	void Update(double delta);
 	void Render(SDL_Surface* const);
 
+	//shared parameters
+	ConfigUtility& config;
+
 	//members
 	std::chrono::steady_clock::time_point startTick;
 	Image logo;

common/gameplay/character_data.cpp

@@ -19,23 +19,27 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "character.hpp"
+#include "character_data.hpp"
 
-void Character::Update() {
+void CharacterData::Update(double delta) {
 	if (motion.x && motion.y) {
-		origin += motion * CHARACTER_WALKING_MOD;
+		origin += motion * delta * CHARACTER_WALKING_MOD;
 	}
 	else if (motion != 0) {
-		origin += motion;
+		origin += motion * delta;
 	}
-	sprite.Update(0.016);
+#ifdef GRAPHICS
+	sprite.Update(delta);
+#endif
 }
 
-void Character::DrawTo(SDL_Surface* const dest, int camX, int camY) {
+#ifdef GRAPHICS
+
+void CharacterData::DrawTo(SDL_Surface* const dest, int camX, int camY) {
 	sprite.DrawTo(dest, origin.x - camX, origin.y - camY);
 }
 
-void Character::CorrectSprite() {
+void CharacterData::CorrectSprite() {
 	//NOTE: These must correspond to the sprite sheet in use
 	if (motion.y > 0) {
 		sprite.SetYIndex(0);
@@ -59,3 +63,5 @@ void Character::CorrectSprite() {
 		sprite.SetXIndex(0);
 	}
 }
+
+#endif

common/gameplay/character_data.hpp

@@ -22,50 +22,54 @@
 #ifndef CHARACTERDATA_HPP_
 #define CHARACTERDATA_HPP_
 
-//components
-#include "character_defines.hpp"
 #include "vector2.hpp"
 #include "statistics.hpp"
 
+//graphics
+#ifdef GRAPHICS
+ #include "sprite_sheet.hpp"
+#endif
+
 //std namespace
 #include <string>
 #include <cmath>
 
-class CharacterData {
+//the speeds that the characters move
-public:
+constexpr double CHARACTER_WALKING_SPEED = 140.0;
-	CharacterData() = default;
+constexpr double CHARACTER_WALKING_MOD = 1.0/sqrt(2.0);
-	~CharacterData() = default;
 
-	//location and movement
+struct CharacterData {
-	int SetRoomIndex(int i) { return roomIndex = i; }
+	//metadata
-	Vector2 SetOrigin(Vector2 v) { return origin = v; }
+	int owner;
-	Vector2 SetMotion(Vector2 v) { return motion = v; }
+	std::string handle;
-
+	std::string avatar;
-	int GetRoomIndex() { return roomIndex; }
-	Vector2 GetOrigin() { return origin; }
-	Vector2 GetMotion() { return motion; }
-
-	//accessors and mutators
-	Statistics* GetBaseStats() { return &baseStats; }
-
-	//database stuff
-	int GetOwner() { return owner; }
-	std::string GetHandle() { return handle; }
-	std::string GetAvatar() { return avatar; }
-
-private:
-	friend class CharacterManager;
 
 	//world position
 	int roomIndex = 0;
 	Vector2 origin = {0.0,0.0};
 	Vector2 motion = {0.0,0.0};
+	Vector2 bounds = {0.0,0.0};
 
-	Statistics baseStats;
+	//base statistics
+	Statistics stats;
 
-	int owner;
+	//TODO: gameplay components: equipment, items, buffs, debuffs
-	std::string handle;
+
-	std::string avatar;
+	//methods
+	void Update(double delta);
+#ifdef GRAPHICS
+	void DrawTo(SDL_Surface* const, int camX, int camY);
+	void CorrectSprite();
+#endif
+
+	//active gameplay members
+	//NOTE: these are lost when unloaded
+#ifdef GRAPHICS
+	SpriteSheet sprite;
+#endif
+	bool inCombat = false;
+	int atbGauge = 0;
+	//TODO: stored command
 };
 
 #endif

common/gameplay/combat_data.hpp

@@ -0,0 +1,70 @@
+/* Copyright: (c) Kayne Ruse 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 COMBATDATA_HPP_
+#define COMBATDATA_HPP_
+
+#include "vector2.hpp"
+
+//gameplay members
+#include "character_data.hpp"
+#include "enemy_data.hpp"
+
+//graphics
+#ifdef GRAPHICS
+ #include "sprite_sheet.hpp"
+#endif
+
+//std namespace
+#include <chrono>
+#include <array>
+#include <utility>
+
+#define COMBAT_MAX_CHARACTERS 12
+#define COMBAT_MAX_ENEMIES 12
+
+struct CombatData {
+	enum class Terrain {
+		//TODO: types of combat terrains
+		NONE = 0,
+		GRASSLANDS,
+	};
+
+	typedef std::chrono::steady_clock Clock;
+
+	std::array<CharacterData, COMBAT_MAX_CHARACTERS> characterArray;
+	std::array<EnemyData, COMBAT_MAX_ENEMIES> enemyArray;
+
+	//world interaction
+	int mapIndex = 0;
+	Vector2 origin = {0.0,0.0};
+	Vector2 bounds = {0.0,0.0};
+
+	//time interval
+	Clock::time_point lastTick = Clock::now();
+
+	//graphics
+#ifdef GRAPHICS
+	SpriteSheet sprite;
+#endif
+};
+
+#endif

common/gameplay/enemy_data.hpp

@@ -19,36 +19,39 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef TIMER_HPP_
+#ifndef ENEMYDATA_HPP_
-#define TIMER_HPP_
+#define ENEMYDATA_HPP_
 
-#include <chrono>
+#include "vector2.hpp"
+#include "statistics.hpp"
+
+//graphics
+#ifdef GRAPHICS
+ #include "sprite_sheet.hpp"
+#endif
+
+//std namespace
 #include <string>
-#include <ostream>
 
-class Timer {
+struct EnemyData {
-public:
+	//metadata
-	typedef std::chrono::high_resolution_clock Clock;
+	std::string handle;
+	std::string avatar;
 
-	Timer();
+	//gameplay
-	Timer(std::string s);
+	Statistics stats;
-	~Timer() = default;
 
-	inline void Start();
+	//TODO: gameplay components: equipment, items, buffs, debuffs, rewards
-	inline void Stop();
 
-	//accessors and mutators
+	//active gameplay members
-	Clock::duration GetTime() { return timeSpan; }
+	//NOTE: these are lost when unloaded
-
+#ifdef GRAPHICS
-	std::string SetName(std::string s) { return name = s; }
+	SpriteSheet sprite;
-	std::string GetName() { return name; }
+	Vector2 origin = {0.0,0.0};
-
+	Vector2 bounds = {0.0,0.0};
-private:
+#endif
-	std::string name;
+	int tableIndex;
-	Clock::time_point start;
+	int atbGauge = 0;
-	Clock::duration timeSpan;
 };
 
-std::ostream& operator<<(std::ostream& os, Timer& t);
-
 #endif

common/gameplay/makefile

@@ -1,7 +1,7 @@
 #config
-INCLUDES+=.
+INCLUDES+=. ../utilities ../graphics
 LIBS+=
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) -DGRAPHICS
 
 #source
 CXXSRC=$(wildcard *.cpp)

common/gameplay/sanity_check.cpp

@@ -0,0 +1,31 @@
+/* Copyright: (c) Kayne Ruse 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.
+*/
+#include "character_data.hpp"
+#include "combat_data.hpp"
+#include "enemy_data.hpp"
+#include "statistics.hpp"
+
+/* DOCS: Sanity check, read more
+ * Since most/all of the files in this directory are header files, I've created
+ * this source file as a "sanity check", to ensure that the above header files
+ * are written correctly via make.
+*/

common/graphics/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=.
+INCLUDES+=. ../map
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 

common/graphics/tile_sheet.cpp

@@ -21,24 +21,24 @@
 */
 #include "tile_sheet.hpp"
 
-void TileSheet::Load(std::string fname, int tileWidth, int tileHeight) {
+void TileSheet::Load(std::string fname, int xc, int yc) {
+	XCount = xc;
+	YCount = yc;
 	image.LoadSurface(fname);
-	image.SetClipW(tileWidth);
+	image.SetClipW(image.GetClipW()/XCount);
-	image.SetClipH(tileHeight);
+	image.SetClipH(image.GetClipH()/YCount);
-	xCount = image.GetSurface()->w / image.GetClipW();
-	yCount = image.GetSurface()->h / image.GetClipH();
 }
 
 void TileSheet::Unload() {
 	image.FreeSurface();
-	xCount = yCount = 0;
+	XCount = YCount = 0;
 }
 
-void TileSheet::DrawTileTo(SDL_Surface* const dest, int x, int y, Region::type_t tile) {
+void TileSheet::DrawTo(SDL_Surface* const dest, int x, int y, Region::type_t tile) {
 	//0 is invisible
 	if (tile == 0) return;
-	image.SetClipX((tile-1) % xCount * image.GetClipW());
+	image.SetClipX((tile-1) % XCount * image.GetClipW());
-	image.SetClipY((tile-1) / xCount * image.GetClipH());
+	image.SetClipY((tile-1) / XCount * image.GetClipH());
 	image.DrawTo(dest, x, y);
 }
 
@@ -50,8 +50,8 @@ void TileSheet::DrawRegionTo(SDL_Surface* const dest, Region* const region, int
 				tile = region->GetTile(i, j, k);
 				//0 is invisible
 				if (tile == 0) continue;
-				image.SetClipX((tile-1) % xCount * image.GetClipW());
+				image.SetClipX((tile-1) % XCount * image.GetClipW());
-				image.SetClipY((tile-1) / xCount * image.GetClipH());
+				image.SetClipY((tile-1) / XCount * image.GetClipH());
 				image.DrawTo(dest,
 					(region->GetX() + i) * image.GetClipW() - camX,
 					(region->GetY() + j) * image.GetClipH() - camY);

common/graphics/tile_sheet.hpp

@@ -31,24 +31,24 @@
 class TileSheet {
 public:
 	TileSheet() = default;
-	TileSheet(std::string f, int w, int h) { Load(f, w, h); }
+	TileSheet(std::string f, int x, int y) { Load(f, x, y); }
 	~TileSheet() = default;
 
-	void Load(std::string fname, int tileWidth, int tileHeight);
+	void Load(std::string fname, int XCount, int YCount);
 	void Unload();
 
-	void DrawTileTo(SDL_Surface* const dest, int x, int y, Region::type_t tile);
+	void DrawTo(SDL_Surface* const dest, int x, int y, Region::type_t tile);
 	void DrawRegionTo(SDL_Surface* const dest, Region* const region, int camX, int camY);
 
 	//accessors
 	Image* GetImage() { return ℑ }
-	int GetXCount() { return xCount; }
+	int GetXCount() { return XCount; }
-	int GetYCount() { return yCount; }
+	int GetYCount() { return YCount; }
 	int GetTileW() { return image.GetClipW(); }
 	int GetTileH() { return image.GetClipH(); }
 private:
 	Image image;
-	int xCount = 0, yCount = 0;
+	int XCount = 0, YCount = 0;
 };
 
 #endif

common/makefile

@@ -1,5 +1,4 @@
 all:
-	$(MAKE) -C debugging
 	$(MAKE) -C gameplay
 	$(MAKE) -C graphics
 	$(MAKE) -C map

common/map/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../graphics ../utilities
+INCLUDES+=. ../utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 

common/map/region.cpp

@@ -21,13 +21,10 @@
 */
 #include "region.hpp"
 
-#include <stdexcept>
+#include "utility.hpp"
-#include <cmath>
-#include <cstring>
 
-int snapToBase(int base, int x) {
+#include <stdexcept>
-	return floor((double)x / base) * base;
+#include <cstring>
-}
 
 Region::Region(int argX, int argY): x(argX), y(argY) {
 	if (x != snapToBase(REGION_WIDTH, x) || y != snapToBase(REGION_HEIGHT, y)) {
@@ -38,7 +35,6 @@ Region::Region(int argX, int argY): x(argX), y(argY) {
 
 Region::Region(Region const& rhs): x(rhs.x), y(rhs.y) {
 	memcpy(tiles, rhs.tiles, REGION_WIDTH*REGION_HEIGHT*REGION_DEPTH*sizeof(type_t));
-	solid = rhs.solid;
 }
 
 Region::type_t Region::SetTile(int x, int y, int z, type_t v) {
@@ -48,11 +44,3 @@ Region::type_t Region::SetTile(int x, int y, int z, type_t v) {
 Region::type_t Region::GetTile(int x, int y, int z) {
 	return tiles[x][y][z];
 }
-
-bool Region::SetSolid(int x, int y, bool b) {
-	return solid[x * REGION_WIDTH + y] = b;
-}
-
-bool Region::GetSolid(int x, int y) {
-	return solid[x * REGION_WIDTH + y];
-}

common/map/region.hpp

@@ -22,16 +22,10 @@
 #ifndef REGION_HPP_
 #define REGION_HPP_
 
-#include <bitset>
-
-//the region's storage format
 constexpr int REGION_WIDTH = 20;
 constexpr int REGION_HEIGHT = 20;
 constexpr int REGION_DEPTH = 3;
 
-//utility function
-int snapToBase(int base, int x);
-
 class Region {
 public:
 	typedef unsigned char type_t;
@@ -44,20 +38,14 @@ public:
 	type_t SetTile(int x, int y, int z, type_t v);
 	type_t GetTile(int x, int y, int z);
 
-	bool SetSolid(int x, int y, bool b);
-	bool GetSolid(int x, int y);
-
 	//accessors
 	int GetX() const { return x; }
 	int GetY() const { return y; }
-
-	std::bitset<REGION_WIDTH*REGION_HEIGHT>* GetSolidBitset() { return &solid; }
 private:
 	const int x;
 	const int y;
 
 	type_t tiles[REGION_WIDTH][REGION_HEIGHT][REGION_DEPTH];
-	std::bitset<REGION_WIDTH*REGION_HEIGHT> solid;
 };
 
 #endif

common/map/region_api.cpp

@@ -37,20 +37,6 @@ static int getTile(lua_State* L) {
 	return 1;
 }
 
-static int setSolid(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	bool ret = region->SetSolid(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_toboolean(L, 4));
-	lua_pushboolean(L, ret);
-	return 1;
-}
-
-static int getSolid(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	bool ret = region->GetSolid(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1);
-	lua_pushboolean(L, ret);
-	return 1;
-}
-
 static int getX(lua_State* L) {
 	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
 	lua_pushinteger(L, region->GetX());
@@ -78,16 +64,39 @@ static int getDepth(lua_State* L) {
 	return 1;
 }
 
+static int onLoad(lua_State* L) {
+	//TODO: onLoad()
+	lua_pushboolean(L, false);
+	return 1;
+}
+
+static int onSave(lua_State* L) {
+	//TODO: onSave()
+	return 0;
+}
+
+static int onCreate(lua_State* L) {
+	//TODO: onCreate()
+	return 0;
+}
+
+static int onUnload(lua_State* L) {
+	//TODO: onUnload()
+	return 0;
+}
+
 static const luaL_Reg regionLib[] = {
 	{"SetTile",setTile},
 	{"GetTile",getTile},
-	{"SetSolid",setSolid},
-	{"GetSolid",getSolid},
 	{"GetX",getX},
 	{"GetY",getY},
 	{"GetWidth",getWidth},
 	{"GetHeight",getHeight},
 	{"GetDepth",getDepth},
+	{"OnLoad",onLoad},
+	{"OnSave",onSave},
+	{"OnCreate",onCreate},
+	{"OnUnload",onUnload},
 	{nullptr, nullptr}
 };
 

common/map/region_pager_api.cpp

@@ -24,7 +24,10 @@
 #include "region_pager_lua.hpp"
 #include "region.hpp"
 
-//DOCS: These glue functions simply wrap RegionPagerLua's methods
+#include <stdexcept>
+#include <string>
+
+//DOCS: These functions are just wrappers for the RegionPagerLua class
 
 static int setTile(lua_State* L) {
 	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
@@ -40,20 +43,6 @@ static int getTile(lua_State* L) {
 	return 1;
 }
 
-static int setSolid(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	bool ret = pager->SetSolid(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_toboolean(L, 4));
-	lua_pushboolean(L, ret);
-	return 1;
-}
-
-static int getSolid(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	bool ret = pager->GetSolid(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	lua_pushboolean(L, ret);
-	return 1;
-}
-
 static int getRegion(lua_State* L) {
 	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
 	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
@@ -61,6 +50,20 @@ static int getRegion(lua_State* L) {
 	return 1;
 }
 
+static int setDirectory(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	std::string s = pager->SetDirectory(lua_tostring(L, 2));
+	lua_pushstring(L, s.c_str());
+	return 1;
+}
+
+static int getDirectory(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	std::string s = pager->GetDirectory();
+	lua_pushstring(L, s.c_str());
+	return 1;
+}
+
 static int loadRegion(lua_State* L) {
 	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
 	Region* region = pager->LoadRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
@@ -88,59 +91,20 @@ static int unloadRegion(lua_State* L) {
 	return 0;
 }
 
-static int setOnLoad(lua_State* L) {
+static const luaL_Reg pagerlib[] = {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetLoadReference());
-	pager->SetLoadReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
-static int setOnSave(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetSaveReference());
-	pager->SetSaveReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
-static int setOnCreate(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetCreateReference());
-	pager->SetCreateReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
-static int setOnUnload(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetUnloadReference());
-	pager->SetUnloadReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
-static const luaL_Reg regionPagerLib[] = {
-	//curry
 	{"SetTile", setTile},
 	{"GetTile", getTile},
-	{"SetSolid", setSolid},
-	{"GetSolid", getSolid},
-
-	//access and control
 	{"GetRegion", getRegion},
+	{"SetDirectory", setDirectory},
+	{"GetDirectory", getDirectory},
 	{"LoadRegion", loadRegion},
 	{"SaveRegion", saveRegion},
 	{"CreateRegion", createRegion},
 	{"UnloadRegion", unloadRegion},
-
-	//triggers
-	{"SetOnLoad",setOnLoad},
-	{"SetOnSave",setOnSave},
-	{"SetOnCreate",setOnCreate},
-	{"SetOnUnload",setOnUnload},
-
-	//sentinel
 	{nullptr, nullptr}
 };
 
 LUAMOD_API int openRegionPagerAPI(lua_State* L) {
-	luaL_newlib(L, regionPagerLib);
+	luaL_newlib(L, pagerlib);
 	return 1;
 }

common/map/region_pager_api.hpp

@@ -19,8 +19,8 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGIONPAGERAPI_HPP_
+#ifndef PAGERAPI_HPP_
-#define REGIONPAGERAPI_HPP_
+#define PAGERAPI_HPP_
 
 #include "lua/lua.hpp"
 

common/map/region_pager_base.cpp

@@ -21,6 +21,8 @@
 */
 #include "region_pager_base.hpp"
 
+#include "utility.hpp"
+
 #include <stdexcept>
 #include <algorithm>
 
@@ -34,20 +36,7 @@ Region::type_t RegionPagerBase::GetTile(int x, int y, int z) {
 	return ptr->GetTile(x - ptr->GetX(), y - ptr->GetY(), z);
 }
 
-bool RegionPagerBase::SetSolid(int x, int y, int b) {
-	Region* ptr = GetRegion(x, y);
-	return ptr->SetSolid(x - ptr->GetX(), y - ptr->GetY(), b);
-}
-
-bool RegionPagerBase::GetSolid(int x, int y) {
-	Region* ptr = GetRegion(x, y);
-	return ptr->GetSolid(x - ptr->GetX(), y - ptr->GetY());
-}
-
 Region* RegionPagerBase::GetRegion(int x, int y) {
-	x = snapToBase(REGION_WIDTH, x);
-	y = snapToBase(REGION_HEIGHT, y);
-
 	//get the region by various means
 	Region* ptr = nullptr;
 	ptr = FindRegion(x, y);
@@ -71,12 +60,12 @@ Region* RegionPagerBase::PushRegion(Region* const ptr) {
 }
 
 Region* RegionPagerBase::LoadRegion(int x, int y) {
-	//EMPTY, intended for override
+	//TODO: load the region if possible
 	return nullptr;
 }
 
 Region* RegionPagerBase::SaveRegion(int x, int y) {
-	//EMPTY, intended for override
+	//TODO: find & save the region
 	return nullptr;
 }
 
@@ -89,9 +78,8 @@ Region* RegionPagerBase::CreateRegion(int x, int y) {
 }
 
 void RegionPagerBase::UnloadRegion(int x, int y) {
-	regionList.remove_if([x, y](Region& region) -> bool {
+	//custom loop, not FindRegion()
-		return region.GetX() == x && region.GetY() == y;
+	regionList.remove_if([x, y](Region& region) -> bool { return region.GetX() == x && region.GetY() == y; });
-	});
 }
 
 void RegionPagerBase::UnloadAll() {

common/map/region_pager_base.hpp

@@ -35,10 +35,6 @@ public:
 	virtual Region::type_t SetTile(int x, int y, int z, Region::type_t v);
 	virtual Region::type_t GetTile(int x, int y, int z);
 
-	//solid manipulation
-	virtual bool SetSolid(int x, int y, int b);
-	virtual bool GetSolid(int x, int y);
-
 	//region manipulation
 	virtual Region* GetRegion(int x, int y);
 	virtual Region* FindRegion(int x, int y);

common/map/region_pager_lua.cpp

@@ -21,71 +21,49 @@
 */
 #include "region_pager_lua.hpp"
 
+#include "utility.hpp"
+
 #include <stdexcept>
 
 Region* RegionPagerLua::LoadRegion(int x, int y) {
-	//get the pager's function from the registry
+	//load the region if possible
-	lua_rawgeti(lua, LUA_REGISTRYINDEX, loadRef);
-
-	//check if this function is available
-	if (lua_isnil(lua, -1)) {
-		lua_pop(lua, 1);
-		return nullptr;
-	}
 
 	//something to work on
 	Region tmpRegion(x, y);
-	lua_pushlightuserdata(lua, &tmpRegion);
 
-	//call the funtion, 1 arg, 1 return
+	//API hook
-	if (lua_pcall(lua, 1, 1, 0) != LUA_OK) {
+	lua_getglobal(luaState, "Region");
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+	lua_getfield(luaState, -1, "OnLoad");
+	lua_pushlightuserdata(luaState, &tmpRegion);
+	lua_pushstring(luaState, directory.c_str());
+	if (lua_pcall(luaState, 2, 1, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
 	}
-
+	//success or failure
-	//check the return value, success or failure
+	if (!lua_toboolean(luaState, -1)) {
-	if (lua_toboolean(lua, -1)) {
+		lua_pop(luaState, 2);
-		lua_pop(lua, 1);
-		regionList.push_front(tmpRegion);
-		return &regionList.front();
-	}
-	else {
-		lua_pop(lua, 1);
 		return nullptr;
 	}
+	lua_pop(luaState, 2);
+	regionList.push_front(tmpRegion);
+	return &regionList.front();
 }
 
 Region* RegionPagerLua::SaveRegion(int x, int y) {
-	//get the pager's function from the registry
+	//find & save the region
-	lua_rawgeti(lua, LUA_REGISTRYINDEX, saveRef);
-
-	//check if this function is available
-	if (lua_isnil(lua, -1)) {
-		lua_pop(lua, 1);
-		return nullptr;
-	}
-
-	//find the specified region
 	Region* ptr = FindRegion(x, y);
-	if (!ptr) {
+	if (ptr) {
-		lua_pop(lua, 1);
+		//API hook
-		return nullptr;
+		lua_getglobal(luaState, "Region");
-	}
+		lua_getfield(luaState, -1, "OnSave");
-	lua_pushlightuserdata(lua, ptr);
+		lua_pushlightuserdata(luaState, ptr);
-
+		lua_pushstring(luaState, directory.c_str());
-	//call the function, 1 arg, 1 return
+		if (lua_pcall(luaState, 2, 0, 0) != LUA_OK) {
-	if (lua_pcall(lua, 1, 1, 0) != LUA_OK) {
+			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+		}
-	}
+		lua_pop(luaState, 1);
-
-	//check the return value, success or failure
-	if (lua_toboolean(lua, -1)) {
-		lua_pop(lua, 1);
-		return ptr;
-	}
-	else {
-		lua_pop(lua, 1);
-		return nullptr;
 	}
+	return ptr;
 }
 
 Region* RegionPagerLua::CreateRegion(int x, int y) {
@@ -93,87 +71,57 @@ Region* RegionPagerLua::CreateRegion(int x, int y) {
 		throw(std::logic_error("Cannot overwrite an existing region"));
 	}
 
-	//get the pager's function from the registry
-	lua_rawgeti(lua, LUA_REGISTRYINDEX, createRef);
-
-	//check if this function is available
-	if (lua_isnil(lua, -1)) {
-		lua_pop(lua, 1);
-		return nullptr;
-	}
-
 	//something to work on
 	Region tmpRegion(x, y);
-	lua_pushlightuserdata(lua, &tmpRegion);
 
-	//call the function, 1 arg, 0 return
+	//API hook
-	if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
+	lua_getglobal(luaState, "Region");
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+	lua_getfield(luaState, -1, "OnCreate");
+	lua_pushlightuserdata(luaState, &tmpRegion);
+	//TODO: parameters
+	if (lua_pcall(luaState, 1, 0, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
 	}
-
+	lua_pop(luaState, 1);
-	//return the new region
 	regionList.push_front(tmpRegion);
 	return &regionList.front();
 }
 
 void RegionPagerLua::UnloadRegion(int x, int y) {
-	//get the pager's function from the registry
+	lua_getglobal(luaState, "Region");
-	lua_rawgeti(lua, LUA_REGISTRYINDEX, unloadRef);
 
-	//check if this function is available
-	if (lua_isnil(lua, -1)) {
-		lua_pop(lua, 1);
-		return;
-	}
-
-	//run each region through this lambda
 	regionList.remove_if([&](Region& region) -> bool {
 		if (region.GetX() == x && region.GetY() == y) {
 
-			//push a copy of the function onto the stack with the region
+			//API hook
-			lua_pushvalue(lua, -1);
+			lua_getfield(luaState, -1, "OnUnload");
-			lua_pushlightuserdata(lua, &region);
+			lua_pushlightuserdata(luaState, &region);
-
+			lua_pushstring(luaState, directory.c_str());
-			//call the function, 1 arg, 0 return
+			if (lua_pcall(luaState, 2, 0, 0) != LUA_OK) {
-			if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
+				throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
-				throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
 			}
 
-			//signal to the container
 			return true;
 		}
-		//signal to the container
 		return false;
 	});
 
-	//pop the base copy of the function
+	lua_pop(luaState, 1);
-	lua_pop(lua, 1);
 }
 
 void RegionPagerLua::UnloadAll() {
-	//get the pager's function from the registry
+	lua_getglobal(luaState, "Region");
-	lua_rawgeti(lua, LUA_REGISTRYINDEX, unloadRef);
-
-	//check if this function is available
-	if (lua_isnil(lua, -1)) {
-		lua_pop(lua, 1);
-		return;
-	}
 
 	for (auto& it : regionList) {
-		//push a copy of the function onto the stack with the region
+		//API hook
-		lua_pushvalue(lua, -1);
+		lua_getfield(luaState, -1, "OnUnload");
-		lua_pushlightuserdata(lua, &it);
+		lua_pushlightuserdata(luaState, &it);
-
+		lua_pushstring(luaState, directory.c_str());
-		//call the function, 1 arg, 0 return
+		if (lua_pcall(luaState, 2, 0, 0) != LUA_OK) {
-		if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
+			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
-			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
 		}
 	}
 
-	//pop the base copy of the function
+	lua_pop(luaState, 1);
-	lua_pop(lua, 1);
-
-	//remove from memory
 	regionList.clear();
 }

common/map/region_pager_lua.hpp

@@ -42,27 +42,14 @@ public:
 	void UnloadAll() override;
 
 	//accessors & mutators
-	lua_State* SetLuaState(lua_State* L) { return lua = L; }
+	std::string SetDirectory(std::string s) { return directory = s; }
-	lua_State* GetLuaState() { return lua; }
+	std::string GetDirectory() { return directory; }
-
-	//utilities for the API
-	int SetLoadReference(int i) { return loadRef = i; }
-	int SetSaveReference(int i) { return saveRef = i; }
-	int SetCreateReference(int i) { return createRef = i; }
-	int SetUnloadReference(int i) { return unloadRef = i; }
-
-	int GetLoadReference() { return loadRef; }
-	int GetSaveReference() { return saveRef; }
-	int GetCreateReference() { return createRef; }
-	int GetUnloadReference() { return unloadRef; }
 
+	lua_State* SetLuaState(lua_State* L) { return luaState = L; }
+	lua_State* GetLuaState() { return luaState; }
 protected:
-	lua_State* lua = nullptr;
+	std::string directory;
-
+	lua_State* luaState = nullptr;
-	int loadRef = LUA_NOREF;
-	int saveRef = LUA_NOREF;
-	int createRef = LUA_NOREF;
-	int unloadRef = LUA_NOREF;
 };
 
 #endif

common/map/tile_sheet_api.cpp

@@ -1,75 +0,0 @@
-/* Copyright: (c) Kayne Ruse 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.
-*/
-#include "tile_sheet_api.hpp"
-
-#include "tile_sheet.hpp"
-
-static int load(lua_State* L) {
-	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
-	sheet->Load(lua_tostring(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4));
-	return 0;
-}
-
-static int unload(lua_State* L) {
-	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
-	sheet->Unload();
-	return 0;
-}
-
-static int getXCount(lua_State* L) {
-	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
-	lua_pushinteger(L, sheet->GetXCount());
-	return 1;
-}
-
-static int getYCount(lua_State* L) {
-	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
-	lua_pushinteger(L, sheet->GetYCount());
-	return 1;
-}
-
-static int getTileW(lua_State* L) {
-	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
-	lua_pushinteger(L, sheet->GetTileW());
-	return 1;
-}
-
-static int getTileH(lua_State* L) {
-	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
-	lua_pushinteger(L, sheet->GetTileH());
-	return 1;
-}
-
-static const luaL_Reg tileSheetLib[] = {
-	{"Load",load},
-	{"Unload",unload},
-	{"GetXCount",getXCount},
-	{"GetYCount",getYCount},
-	{"GetTileW",getTileW},
-	{"GetTileH",getTileH},
-	{nullptr, nullptr}
-};
-
-LUAMOD_API int openTileSheetAPI(lua_State* L) {
-	luaL_newlib(L, tileSheetLib);
-	return 1;
-}

common/network/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. packet_types ../gameplay ../map ../utilities
+INCLUDES+=. packet serial ../gameplay ../map ../utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
@@ -17,7 +17,8 @@ OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 #targets
 all: $(OBJ) $(OUT)
 	ar -crs $(OUT) $(OBJ)
-	$(MAKE) -C packet_types
+	$(MAKE) -C packet
+	$(MAKE) -C serial
 
 $(OBJ): | $(OBJDIR)
 

common/network/packet/character_packet.hpp

@@ -0,0 +1,50 @@
+/* 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 CHARACTERPACKET_HPP_
+#define CHARACTERPACKET_HPP_
+
+#include "serial_packet_base.hpp"
+
+#include "vector2.hpp"
+#include "statistics.hpp"
+
+struct CharacterPacket : SerialPacketBase {
+	//identify the character
+	int characterIndex;
+	char handle[PACKET_STRING_SIZE];
+	char avatar[PACKET_STRING_SIZE];
+
+	//the owner
+	int accountIndex;
+
+	//location
+	int roomIndex;
+	Vector2 origin;
+	Vector2 motion;
+
+	//gameplay
+	Statistics stats;
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs
+};
+
+#endif

common/network/packet/client_packet.hpp

@@ -0,0 +1,34 @@
+/* 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 CLIENTPACKET_HPP_
+#define CLIENTPACKET_HPP_
+
+#include "serial_packet_base.hpp"
+
+struct ClientPacket : SerialPacketBase {
+	int clientIndex;
+	int accountIndex;
+	char username[PACKET_STRING_SIZE];
+//	char password[PACKET_STRING_SIZE]; //hashed, not currently used
+};
+
+#endif

common/network/packet/combat_packet.hpp

@@ -0,0 +1,46 @@
+/* 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 COMBATPACKET_HPP_
+#define COMBATPACKET_HPP_
+
+#include "serial_packet_base.hpp"
+
+#include "combat_data.hpp"
+
+struct CombatPacket : SerialPacketBase {
+	//identify the combat instance
+	int combatIndex;
+	int difficulty;
+	CombatData::Terrain terrainType;
+
+	//combatants
+	int characterArray[COMBAT_MAX_CHARACTERS];
+	int enemyArray[COMBAT_MAX_ENEMIES];
+
+	//location
+	int mapIndex;
+	Vector2 origin;
+
+	//TODO: gameplay components: rewards
+};
+
+#endif

common/network/packet/enemy_packet.hpp

@@ -0,0 +1,39 @@
+/* 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 ENEMYPACKET_HPP_
+#define ENEMYPACKET_HPP_
+
+#include "serial_packet_base.hpp"
+
+struct EnemyPacket : SerialPacketBase {
+	//identify the enemy
+	int enemyIndex;
+	char handle[PACKET_STRING_SIZE];
+	char avatar[PACKET_STRING_SIZE];
+
+	//gameplay
+	Statistics stats;
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs, rewards
+};
+
+#endif

common/network/packet/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. .. ../../gameplay ../../map ../../utilities
+INCLUDES+=. ../../gameplay ../../map ../../utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 

common/network/packet/region_packet.hpp

@@ -0,0 +1,38 @@
+/* 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 REGIONPACKET_HPP_
+#define REGIONPACKET_HPP_
+
+#include "serial_packet_base.hpp"
+
+#include "region.hpp"
+
+struct RegionPacket : SerialPacketBase {
+	//location/identify the region
+	int roomIndex;
+	int x, y;
+
+	//the data
+	Region* region;
+};
+
+#endif

common/network/packet/sanity_check.cpp

@@ -0,0 +1,28 @@
+/* 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.
+*/
+#include "serial_packet.hpp"
+
+/* DOCS: Sanity check, read more
+ * Since most/all of the files in this directory are header files, I've created
+ * this source file as a "sanity check", to ensure that the above header files
+ * are written correctly via make.
+*/

common/network/packet/serial_packet.hpp

@@ -0,0 +1,44 @@
+/* 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 "character_packet.hpp"
+#include "client_packet.hpp"
+#include "combat_packet.hpp"
+#include "enemy_packet.hpp"
+#include "region_packet.hpp"
+#include "server_packet.hpp"
+
+//NOTE: SerialPacket is defined in serial_packet_base.hpp
+
+union MaxPacket {
+	CharacterPacket a;
+	ClientPacket b;
+	CombatPacket c;
+	EnemyPacket d;
+	RegionPacket e;
+	ServerPacket f;
+};
+constexpr int MAX_PACKET_SIZE = sizeof(MaxPacket);
+
+#endif

common/network/packet/serial_packet_base.hpp

@@ -22,32 +22,25 @@
 #ifndef SERIALPACKETBASE_HPP_
 #define SERIALPACKETBASE_HPP_
 
+#ifndef SERIALPACKET_HPP_
+ #error Cannot include this file without 'serial_packet.hpp'
+#endif
+
 #include "serial_packet_type.hpp"
 
 #include "SDL/SDL_net.h"
 
-//The packets use a char array for string storage
+constexpr int NETWORK_VERSION = 20140607;
 constexpr int PACKET_STRING_SIZE = 100;
 
-class SerialPacketBase {
+struct SerialPacketBase {
-public:
+	//members
-	SerialPacketType SetType(SerialPacketType t) { return type = t; }
-	SerialPacketType GetType() { return type; }
-
-	IPaddress GetAddress() { return srcAddress; }
-	IPaddress* GetAddressPtr() { return &srcAddress; }
-
-	SerialPacketBase() {};
-	virtual ~SerialPacketBase() {};
-
-	virtual void Serialize(void* buffer) = 0;
-	virtual void Deserialize(void* buffer) = 0;
-
-protected:
-	friend class UDPNetworkUtility;
-
 	SerialPacketType type;
 	IPaddress srcAddress;
+
+	virtual ~SerialPacketBase() {};
 };
 
+typedef SerialPacketBase SerialPacket;
+
 #endif

common/network/packet/serial_packet_type.hpp

@@ -0,0 +1,113 @@
+/* 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 SERIALPACKETTYPE_HPP_
+#define SERIALPACKETTYPE_HPP_
+
+/* Key for the comments:
+ * request => response
+*/
+
+enum class SerialPacketType {
+	//default: there is something wrong
+	NONE = 0,
+
+	//keep alive
+	//ping => pong
+	PING = 1,
+	PONG = 2,
+
+	//search for the server list
+	//none => server name, player count, version info (and source address)
+	BROADCAST_REQUEST = 3,
+	BROADCAST_RESPONSE = 4,
+
+	//try to join the server
+	//username, and password => client index, account index
+	JOIN_REQUEST = 5,
+	JOIN_RESPONSE = 6,
+	JOIN_REJECTION = 7,
+
+	//mass update of all surrounding content
+	//character.x, character.y => packet barrage
+	SYNCHRONIZE = 8,
+
+	//disconnect from the server
+	//autentication, account index => disconnect that account
+	DISCONNECT = 9,
+
+	//shut down the server
+	//autentication => disconnect, shutdown
+	SHUTDOWN = 10,
+
+	//map data
+	//room index, region.x, region.y => room index, region.x, region.y, region content
+	REGION_REQUEST = 11,
+	REGION_CONTENT = 12,
+
+	//combat data
+	//TODO: system incomplete
+	COMBAT_NEW = 13,
+	COMBAT_DELETE = 14,
+	COMBAT_UPDATE = 15,
+
+	COMBAT_ENTER_REQUEST = 16,
+	COMBAT_ENTER_RESPONSE = 17,
+
+	COMBAT_EXIT_REQUEST = 18,
+	COMBAT_EXIT_RESPONSE = 19,
+
+	//TODO: COMBAT info
+
+	COMBAT_REJECTION = 20,
+
+	//character data
+	//character data => etc.
+	CHARACTER_NEW = 21,
+	CHARACTER_DELETE = 22,
+	CHARACTER_UPDATE = 23,
+
+	//authentication, character index => character stats
+	CHARACTER_STATS_REQUEST= 24,
+	CHARACTER_STATS_RESPONSE = 25,
+
+	//character new => character rejection, disconnect?
+	CHARACTER_REJECTION = 26,
+
+	//enemy data
+	//enemy data => etc.
+	ENEMY_NEW = 27,
+	ENEMY_DELETE = 28,
+	ENEMY_UPDATE = 29,
+
+	ENEMY_STATS_REQUEST = 30,
+	ENEMY_STATS_RESPONSE = 31,
+
+	//enemy index => enemy doens't exist
+	ENEMY_REJECTION= 32,
+
+	//NOTE: more packet types go here
+
+	//not used
+	LAST
+};
+
+#endif

common/network/packet/server_packet.hpp

@@ -0,0 +1,34 @@
+/* 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 SERVERPACKET_HPP_
+#define SERVERPACKET_HPP_
+
+#include "serial_packet_base.hpp"
+
+struct ServerPacket : SerialPacketBase {
+	//identify the server
+	char name[PACKET_STRING_SIZE];
+	int playerCount;
+	int version;
+};
+
+#endif

common/network/packet_types/character_packet.cpp

@@ -1,72 +0,0 @@
-/* Copyright: (c) Kayne Ruse 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.
-*/
-#include "character_packet.hpp"
-
-#include "serial_utility.hpp"
-
-void CharacterPacket::Serialize(void* buffer) {
-	serializeCopy(&buffer, &type, sizeof(SerialPacketType));
-
-	//identify the character
-	serializeCopy(&buffer, &characterIndex, sizeof(int));
-	serializeCopy(&buffer, handle, PACKET_STRING_SIZE);
-	serializeCopy(&buffer, avatar, PACKET_STRING_SIZE);
-
-	//the owner
-	serializeCopy(&buffer, &accountIndex, sizeof(int));
-
-	//location
-	serializeCopy(&buffer, &roomIndex, sizeof(int));
-	serializeCopy(&buffer, &origin.x, sizeof(double));
-	serializeCopy(&buffer, &origin.y, sizeof(double));
-	serializeCopy(&buffer, &motion.x, sizeof(double));
-	serializeCopy(&buffer, &motion.y, sizeof(double));
-
-	//stats structure
-	serializeCopyStatistics(&buffer, &stats);
-
-	//TODO: gameplay components: equipment, items, buffs, debuffs
-}
-
-void CharacterPacket::Deserialize(void* buffer) {
-	deserializeCopy(&buffer, &type, sizeof(SerialPacketType));
-
-	//identify the character
-	deserializeCopy(&buffer, &characterIndex, sizeof(int));
-	deserializeCopy(&buffer, handle, PACKET_STRING_SIZE);
-	deserializeCopy(&buffer, avatar, PACKET_STRING_SIZE);
-
-	//the owner
-	deserializeCopy(&buffer, &accountIndex, sizeof(int));
-
-	//location
-	deserializeCopy(&buffer, &roomIndex, sizeof(int));
-	deserializeCopy(&buffer, &origin.x, sizeof(double));
-	deserializeCopy(&buffer, &origin.y, sizeof(double));
-	deserializeCopy(&buffer, &motion.x, sizeof(double));
-	deserializeCopy(&buffer, &motion.y, sizeof(double));
-
-	//stats structure
-	deserializeCopyStatistics(&buffer, &stats);
-
-	//TODO: gameplay components: equipment, items, buffs, debuffs
-}

common/network/packet_types/character_packet.hpp

@@ -1,87 +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 CHARACTERPACKET_HPP_
-#define CHARACTERPACKET_HPP_
-
-#include "serial_packet_base.hpp"
-
-#include "vector2.hpp"
-#include "statistics.hpp"
-
-#include <cstring>
-
-class CharacterPacket : public SerialPacketBase {
-public:
-	CharacterPacket() {}
-	~CharacterPacket() {}
-
-	//indentity
-	int SetCharacterIndex(int i) { return characterIndex = i; }
-	const char* SetHandle(const char* s)
-	{ return strncpy(handle, s, PACKET_STRING_SIZE); }
-	const char* SetAvatar(const char* s)
-	{ return strncpy(handle, s, PACKET_STRING_SIZE); }
-
-	int SetAccountIndex(int i) { return accountIndex = i; }
-
-	int GetCharacterIndex() { return characterIndex; }
-	const char* GetHandle() { return handle; }
-	const char* GetAvatar() { return avatar; }
-
-	int GetAccountIndex() { return accountIndex; }
-
-	//location
-	int SetRoomIndex(int i) { return roomIndex = i; }
-	Vector2 SetOrigin(Vector2 v) { return origin = v; }
-	Vector2 SetMotion(Vector2 v) { return motion = v; }
-
-	int GetRoomIndex() { return roomIndex; }
-	Vector2 GetOrigin() { return origin; }
-	Vector2 GetMotion() { return motion; }
-
-	//gameplay
-	Statistics* GetStatistics() { return &stats; }
-
-	virtual void Serialize(void* buffer) override;
-	virtual void Deserialize(void* buffer) override;
-
-private:
-	//identify the character
-	int characterIndex;
-	char handle[PACKET_STRING_SIZE+1];
-	char avatar[PACKET_STRING_SIZE+1];
-
-	//the owner
-	int accountIndex;
-
-	//location
-	int roomIndex;
-	Vector2 origin;
-	Vector2 motion;
-
-	//gameplay
-	Statistics stats;
-
-	//TODO: gameplay components: equipment, items, buffs, debuffs
-};
-
-#endif

common/network/packet_types/client_packet.hpp

@@ -1,54 +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 CLIENTPACKET_HPP_
-#define CLIENTPACKET_HPP_
-
-#include "serial_packet_base.hpp"
-
-#include <cstring>
-
-class ClientPacket : public SerialPacketBase {
-public:
-	ClientPacket() {}
-	~ClientPacket() {}
-
-	//accessors & mutators
-	int SetClientIndex(int i) { return clientIndex = i; }
-	int SetAccountIndex(int i) { return accountIndex = i; }
-	const char* SetUsername(const char* s)
-	{ return strncpy(username, s, PACKET_STRING_SIZE); }
-
-	int GetClientIndex() { return clientIndex; }
-	int GetAccountIndex() { return accountIndex; }
-	const char* GetUsername() { return username; }
-
-	virtual void Serialize(void* buffer) override;
-	virtual void Deserialize(void* buffer) override;
-
-private:
-	int clientIndex;
-	int accountIndex;
-	char username[PACKET_STRING_SIZE+1];
-//	char password[PACKET_STRING_SIZE]; //hashed, not currently used
-};
-
-#endif

common/network/packet_types/region_packet.cpp

@@ -1,79 +0,0 @@
-/* Copyright: (c) Kayne Ruse 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.
-*/
-#include "region_packet.hpp"
-
-#include "serial_utility.hpp"
-
-void RegionPacket::Serialize(void* buffer) {
-	serializeCopy(&buffer, &type, sizeof(SerialPacketType));
-
-	//format
-	serializeCopy(&buffer, &roomIndex, sizeof(int));
-	serializeCopy(&buffer, &x, sizeof(int));
-	serializeCopy(&buffer, &y, sizeof(int));
-
-	if (type != SerialPacketType::REGION_CONTENT) {
-		return;
-	}
-
-	//tiles
-	for (int i = 0; i < REGION_WIDTH; i++) {
-		for (int j = 0; j < REGION_HEIGHT; j++) {
-			for (int k = 0; k < REGION_DEPTH; k++) {
-				*reinterpret_cast<Region::type_t*>(buffer) = region->GetTile(i, j, k);
-				buffer = reinterpret_cast<char*>(buffer) + sizeof(Region::type_t);
-			}
-		}
-	}
-
-	//solids
-	serializeCopy(&buffer, region->GetSolidBitset(), REGION_SOLID_FOOTPRINT);
-}
-
-void RegionPacket::Deserialize(void* buffer) {
-	deserializeCopy(&buffer, &type, sizeof(SerialPacketType));
-
-	//format
-	deserializeCopy(&buffer, &roomIndex, sizeof(int));
-	deserializeCopy(&buffer, &x, sizeof(int));
-	deserializeCopy(&buffer, &y, sizeof(int));
-
-	if (type != SerialPacketType::REGION_CONTENT) {
-		return;
-	}
-
-	//an object to work on
-	region = new Region(x, y);
-
-	//tiles
-	for (int i = 0; i < REGION_WIDTH; i++) {
-		for (int j = 0; j < REGION_HEIGHT; j++) {
-			for (int k = 0; k < REGION_DEPTH; k++) {
-				region->SetTile(i, j, k, *reinterpret_cast<Region::type_t*>(buffer));
-				buffer = reinterpret_cast<char*>(buffer) + sizeof(Region::type_t);
-			}
-		}
-	}
-
-	//solids
-	deserializeCopy(&buffer, region->GetSolidBitset(), REGION_SOLID_FOOTPRINT);
-}

common/network/packet_types/region_packet.hpp

@@ -1,67 +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 REGIONPACKET_HPP_
-#define REGIONPACKET_HPP_
-
-#include "serial_packet_base.hpp"
-
-#include "region.hpp"
-
-#include <cmath>
-#include <cstring>
-
-//define the memory footprint for the region's members
-constexpr int REGION_TILE_FOOTPRINT = sizeof(Region::type_t) * REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH;
-constexpr int REGION_SOLID_FOOTPRINT = ceil(REGION_WIDTH * REGION_HEIGHT / 8.0);
-constexpr int REGION_METADATA_FOOTPRINT = sizeof(int) * 3;
-
-class RegionPacket : public SerialPacketBase {
-public:
-	RegionPacket() {}
-	~RegionPacket() {}
-
-	//location
-	int SetRoomIndex(int i) { return roomIndex = i; }
-	int SetX(int i) { return x = i; }
-	int SetY(int i) { return y = i; }
-
-	int GetRoomIndex() { return roomIndex; }
-	int GetX() { return x; }
-	int GetY() { return y; }
-
-	//the region itself
-	Region* SetRegion(Region* r) { return region = r; }
-	Region* GetRegion() { return region; }
-
-	virtual void Serialize(void* buffer) override;
-	virtual void Deserialize(void* buffer) override;
-
-private:
-	//location/identify the region
-	int roomIndex;
-	int x, y;
-
-	//the data
-	Region* region;
-};
-
-#endif

common/network/packet_types/server_packet.hpp

@@ -1,53 +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 SERVERPACKET_HPP_
-#define SERVERPACKET_HPP_
-
-#include "serial_packet_base.hpp"
-
-#include <cstring>
-
-class ServerPacket : public SerialPacketBase {
-public:
-	ServerPacket() {}
-	~ServerPacket() {}
-
-	const char* SetName(const char* s)
-	{ return strncpy(name, s, PACKET_STRING_SIZE); }
-	int SetPlayerCount(int i) { return playerCount = i; }
-	int SetVersion(int i) { return version = i; }
-
-	const char* GetName() { return name; }
-	int GetPlayerCount() { return playerCount; }
-	int GetVersion() { return version; }
-
-	virtual void Serialize(void* buffer) override;
-	virtual void Deserialize(void* buffer) override;
-
-private:
-	//identify the server
-	char name[PACKET_STRING_SIZE+1];
-	int playerCount;
-	int version;
-};
-
-#endif

common/network/serial/makefile

@@ -0,0 +1,37 @@
+#config
+INCLUDES+=. ../packet ../../gameplay ../../map ../../utilities
+LIBS+=
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
+
+#source
+CXXSRC=$(wildcard *.cpp)
+
+#objects
+OBJDIR=obj
+OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
+
+#output
+OUTDIR=../../..
+OUT=$(addprefix $(OUTDIR)/,libcommon.a)
+
+#targets
+all: $(OBJ) $(OUT)
+	ar -crs $(OUT) $(OBJ)
+
+$(OBJ): | $(OBJDIR)
+
+$(OUT): | $(OUTDIR)
+
+$(OBJDIR):
+	mkdir $(OBJDIR)
+
+$(OUTDIR):
+	mkdir $(OUTDIR)
+
+$(OBJDIR)/%.o: %.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ $<
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all

common/network/serial/serial.cpp

@@ -0,0 +1,182 @@
+/* Copyright: (c) Kayne Ruse 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.
+*/
+#include "serial.hpp"
+
+#include "serial_util.hpp"
+
+//simple type functions
+void serializeType(SerialPacketBase* packet, void* buffer) {
+	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+}
+
+void deserializeType(SerialPacketBase* packet, void* buffer) {
+	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+}
+
+//main switch functions
+void serializePacket(SerialPacketBase* packet, void* buffer) {
+	switch(packet->type) {
+		//no extra data
+		case SerialPacketType::NONE:
+		case SerialPacketType::PING:
+		case SerialPacketType::PONG:
+		case SerialPacketType::BROADCAST_REQUEST:
+
+		//all rejections
+		case SerialPacketType::JOIN_REJECTION:
+		case SerialPacketType::CHARACTER_REJECTION:
+		case SerialPacketType::ENEMY_REJECTION:
+		case SerialPacketType::COMBAT_REJECTION:
+
+			serializeType(packet, buffer);
+		break;
+
+		//character info
+		case SerialPacketType::CHARACTER_NEW:
+		case SerialPacketType::CHARACTER_DELETE:
+		case SerialPacketType::CHARACTER_UPDATE:
+		case SerialPacketType::CHARACTER_STATS_REQUEST:
+		case SerialPacketType::CHARACTER_STATS_RESPONSE:
+			serializeCharacter(static_cast<CharacterPacket*>(packet), buffer);
+		break;
+
+		//client info
+		case SerialPacketType::JOIN_REQUEST:
+		case SerialPacketType::JOIN_RESPONSE:
+		case SerialPacketType::SYNCHRONIZE:
+		case SerialPacketType::DISCONNECT:
+		case SerialPacketType::SHUTDOWN:
+			serializeClient(static_cast<ClientPacket*>(packet), buffer);
+		break;
+
+		//combat info
+		case SerialPacketType::COMBAT_NEW:
+		case SerialPacketType::COMBAT_DELETE:
+		case SerialPacketType::COMBAT_UPDATE:
+
+		case SerialPacketType::COMBAT_ENTER_REQUEST:
+		case SerialPacketType::COMBAT_ENTER_RESPONSE:
+		case SerialPacketType::COMBAT_EXIT_REQUEST:
+		case SerialPacketType::COMBAT_EXIT_RESPONSE:
+
+			serializeCombat(static_cast<CombatPacket*>(packet), buffer);
+		break;
+
+		//enemy info
+		case SerialPacketType::ENEMY_NEW:
+		case SerialPacketType::ENEMY_DELETE:
+		case SerialPacketType::ENEMY_UPDATE:
+		case SerialPacketType::ENEMY_STATS_REQUEST:
+		case SerialPacketType::ENEMY_STATS_RESPONSE:
+			serializeEnemy(static_cast<EnemyPacket*>(packet), buffer);
+		break;
+
+		//region info
+		case SerialPacketType::REGION_REQUEST:
+			serializeRegionFormat(static_cast<RegionPacket*>(packet), buffer);
+		break;
+
+		case SerialPacketType::REGION_CONTENT:
+			serializeRegionContent(static_cast<RegionPacket*>(packet), buffer);
+		break;
+
+		//server info
+		case SerialPacketType::BROADCAST_RESPONSE:
+			serializeServer(static_cast<ServerPacket*>(packet), buffer);
+		break;
+	}
+}
+
+void deserializePacket(SerialPacketBase* packet, void* buffer) {
+	//find the type, so that you can actually deserialize the packet!
+	deserializeType(packet, buffer);
+	switch(packet->type) {
+		//no extra data
+		case SerialPacketType::NONE:
+		case SerialPacketType::PING:
+		case SerialPacketType::PONG:
+		case SerialPacketType::BROADCAST_REQUEST:
+
+		//all rejections
+		case SerialPacketType::JOIN_REJECTION:
+		case SerialPacketType::CHARACTER_REJECTION:
+		case SerialPacketType::ENEMY_REJECTION:
+		case SerialPacketType::COMBAT_REJECTION:
+
+			//NOTHING
+		break;
+
+		//character info
+		case SerialPacketType::CHARACTER_NEW:
+		case SerialPacketType::CHARACTER_DELETE:
+		case SerialPacketType::CHARACTER_UPDATE:
+		case SerialPacketType::CHARACTER_STATS_REQUEST:
+		case SerialPacketType::CHARACTER_STATS_RESPONSE:
+			deserializeCharacter(static_cast<CharacterPacket*>(packet), buffer);
+		break;
+
+		//client info
+		case SerialPacketType::JOIN_REQUEST:
+		case SerialPacketType::JOIN_RESPONSE:
+		case SerialPacketType::SYNCHRONIZE:
+		case SerialPacketType::DISCONNECT:
+		case SerialPacketType::SHUTDOWN:
+			deserializeClient(static_cast<ClientPacket*>(packet), buffer);
+		break;
+
+		//combat info
+		case SerialPacketType::COMBAT_NEW:
+		case SerialPacketType::COMBAT_DELETE:
+		case SerialPacketType::COMBAT_UPDATE:
+
+		case SerialPacketType::COMBAT_ENTER_REQUEST:
+		case SerialPacketType::COMBAT_ENTER_RESPONSE:
+		case SerialPacketType::COMBAT_EXIT_REQUEST:
+		case SerialPacketType::COMBAT_EXIT_RESPONSE:
+
+			serializeCombat(static_cast<CombatPacket*>(packet), buffer);
+		break;
+
+		//enemy info
+		case SerialPacketType::ENEMY_NEW:
+		case SerialPacketType::ENEMY_DELETE:
+		case SerialPacketType::ENEMY_UPDATE:
+		case SerialPacketType::ENEMY_STATS_REQUEST:
+		case SerialPacketType::ENEMY_STATS_RESPONSE:
+			serializeEnemy(static_cast<EnemyPacket*>(packet), buffer);
+		break;
+
+		//region info
+		case SerialPacketType::REGION_REQUEST:
+			deserializeRegionFormat(static_cast<RegionPacket*>(packet), buffer);
+		break;
+
+		case SerialPacketType::REGION_CONTENT:
+			deserializeRegionContent(static_cast<RegionPacket*>(packet), buffer);
+		break;
+
+		//server info
+		case SerialPacketType::BROADCAST_RESPONSE:
+			deserializeServer(static_cast<ServerPacket*>(packet), buffer);
+		break;
+	}
+}

common/network/serial/serial.hpp

@@ -0,0 +1,65 @@
+/* Copyright: (c) Kayne Ruse 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 SERIALIZE_HPP_
+#define SERIALIZE_HPP_
+
+#include "serial_packet.hpp"
+
+#include "region.hpp"
+#include "statistics.hpp"
+
+//Primary interface functions
+void serializePacket(SerialPacketBase*, void* dest);
+void deserializePacket(SerialPacketBase*, void* src);
+
+void serializeType(SerialPacketBase*, void*);
+void deserializeType(SerialPacketBase*, void*);
+
+//utility functions, exposed
+void serializeCharacter(CharacterPacket*, void*);
+void serializeClient(ClientPacket*, void*);
+void serializeCombat(CombatPacket*, void*);
+void serializeEnemy(EnemyPacket*, void*);
+void serializeRegionFormat(RegionPacket*, void*);
+void serializeRegionContent(RegionPacket*, void*);
+void serializeServer(ServerPacket*, void*);
+void serializeStatistics(Statistics*, void*);
+
+void deserializeCharacter(CharacterPacket*, void*);
+void deserializeClient(ClientPacket*, void*);
+void deserializeCombat(CombatPacket*, void*);
+void deserializeEnemy(EnemyPacket*, void*);
+void deserializeRegionFormat(RegionPacket*, void*);
+void deserializeRegionContent(RegionPacket*, void*);
+void deserializeServer(ServerPacket*, void*);
+void deserializeStatistics(Statistics*, void*);
+
+/* DOCS: Keep the PACKET_BUFFER_SIZE up to date
+ * DOCS: REGION_CONTENT is currently the largest type of packet, read more
+ *  map content: REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH * sizoeof(region::type_t)
+ *  map format: sizeof(int) * 3
+ *  metadata: sizeof(SerialPacket::Type)
+*/
+
+constexpr int PACKET_BUFFER_SIZE = REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH * sizeof(Region::type_t) + sizeof(int) * 3 + sizeof(SerialPacketType);
+
+#endif

common/network/serial/serial_character.cpp

@@ -0,0 +1,74 @@
+/* Copyright: (c) Kayne Ruse 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.
+*/
+#include "serial.hpp"
+
+#include "serial_util.hpp"
+
+void serializeCharacter(CharacterPacket* packet, void* buffer) {
+	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the character
+	SERIALIZE(buffer, &packet->characterIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->handle, PACKET_STRING_SIZE);
+	SERIALIZE(buffer, &packet->avatar, PACKET_STRING_SIZE);
+
+	//the owner
+	SERIALIZE(buffer, &packet->accountIndex, sizeof(int));
+
+	//location
+	SERIALIZE(buffer, &packet->roomIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->origin.x, sizeof(double));
+	SERIALIZE(buffer, &packet->origin.y, sizeof(double));
+	SERIALIZE(buffer, &packet->motion.x, sizeof(double));
+	SERIALIZE(buffer, &packet->motion.y, sizeof(double));
+
+	//stats structure
+	serializeStatistics(&packet->stats, buffer);
+	buffer = reinterpret_cast<char*>(buffer) + sizeof(Statistics);
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs
+}
+
+void deserializeCharacter(CharacterPacket* packet, void* buffer) {
+	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the character
+	DESERIALIZE(buffer, &packet->characterIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->handle, PACKET_STRING_SIZE);
+	DESERIALIZE(buffer, &packet->avatar, PACKET_STRING_SIZE);
+
+	//the owner
+	DESERIALIZE(buffer, &packet->accountIndex, sizeof(int));
+
+	//location
+	DESERIALIZE(buffer, &packet->roomIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->origin.x, sizeof(double));
+	DESERIALIZE(buffer, &packet->origin.y, sizeof(double));
+	DESERIALIZE(buffer, &packet->motion.x, sizeof(double));
+	DESERIALIZE(buffer, &packet->motion.y, sizeof(double));
+
+	//stats structure
+	deserializeStatistics(&packet->stats, buffer);
+	buffer = reinterpret_cast<char*>(buffer) + sizeof(Statistics);
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs
+}

common/network/serial/serial_client.cpp

@@ -0,0 +1,42 @@
+/* Copyright: (c) Kayne Ruse 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.
+*/
+#include "serial.hpp"
+
+#include "serial_util.hpp"
+
+void serializeClient(ClientPacket* packet, void* buffer) {
+	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	SERIALIZE(buffer, &packet->clientIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->accountIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->username, PACKET_STRING_SIZE);
+//	SERIALIZE(buffer, &packet->password, PACKET_STRING_SIZE);
+}
+
+void deserializeClient(ClientPacket* packet, void* buffer) {
+	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	DESERIALIZE(buffer, &packet->clientIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->accountIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->username, PACKET_STRING_SIZE);
+//	DESERIALIZE(buffer, &packet->password, PACKET_STRING_SIZE);
+}

common/network/serial/serial_combat.cpp

@@ -0,0 +1,64 @@
+/* Copyright: (c) Kayne Ruse 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.
+*/
+#include "serial.hpp"
+
+#include "serial_util.hpp"
+
+void serializeCombat(CombatPacket* packet, void* buffer) {
+	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the combat instance
+	SERIALIZE(buffer, &packet->combatIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->difficulty, sizeof(int));
+	SERIALIZE(buffer, &packet->terrainType, sizeof(CombatData::Terrain));
+
+	//combatants
+	SERIALIZE(buffer, &packet->characterArray, sizeof(int) * COMBAT_MAX_CHARACTERS);
+	SERIALIZE(buffer, &packet->enemyArray, sizeof(int) * COMBAT_MAX_ENEMIES);
+
+	//location
+	SERIALIZE(buffer, &packet->mapIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->origin.x, sizeof(double));
+	SERIALIZE(buffer, &packet->origin.y, sizeof(double));
+
+	//TODO: gameplay components: rewards
+}
+
+void deserializeCombat(CombatPacket* packet, void* buffer) {
+	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the combat instance
+	DESERIALIZE(buffer, &packet->combatIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->difficulty, sizeof(int));
+	DESERIALIZE(buffer, &packet->terrainType, sizeof(CombatData::Terrain));
+
+	//combatants
+	DESERIALIZE(buffer, &packet->characterArray, sizeof(int) * COMBAT_MAX_CHARACTERS);
+	DESERIALIZE(buffer, &packet->enemyArray, sizeof(int) * COMBAT_MAX_ENEMIES);
+
+	//location
+	DESERIALIZE(buffer, &packet->mapIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->origin.x, sizeof(double));
+	DESERIALIZE(buffer, &packet->origin.y, sizeof(double));
+
+	//TODO: gameplay components: rewards
+}

common/network/serial/serial_enemy.cpp

@@ -0,0 +1,56 @@
+/* Copyright: (c) Kayne Ruse 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.
+*/
+#include "serial.hpp"
+
+#include "serial_util.hpp"
+
+void serializeEnemy(EnemyPacket* packet, void* buffer) {
+	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the enemy
+	SERIALIZE(buffer, &packet->enemyIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->handle, PACKET_STRING_SIZE);
+	SERIALIZE(buffer, &packet->avatar, PACKET_STRING_SIZE);
+
+	//gameplay
+
+	//stats structure
+	serializeStatistics(&packet->stats, buffer);
+	buffer = reinterpret_cast<char*>(buffer) + sizeof(Statistics);
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs, rewards
+}
+
+void deserializeEnemy(EnemyPacket* packet, void* buffer) {
+	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the enemy
+	DESERIALIZE(buffer, &packet->enemyIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->handle, PACKET_STRING_SIZE);
+	DESERIALIZE(buffer, &packet->avatar, PACKET_STRING_SIZE);
+
+	//stats structure
+	deserializeStatistics(&packet->stats, buffer);
+	buffer = reinterpret_cast<char*>(buffer) + sizeof(Statistics);
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs, rewards
+}

common/network/serial/serial_region.cpp

@@ -0,0 +1,83 @@
+/* Copyright: (c) Kayne Ruse 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.
+*/
+#include "serial.hpp"
+
+#include "serial_util.hpp"
+
+void serializeRegionFormat(RegionPacket* packet, void* buffer) {
+	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//format
+	SERIALIZE(buffer, &packet->roomIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->x, sizeof(int));
+	SERIALIZE(buffer, &packet->y, sizeof(int));
+}
+
+void serializeRegionContent(RegionPacket* packet, void* buffer) {
+	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//format
+	SERIALIZE(buffer, &packet->roomIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->x, sizeof(int));
+	SERIALIZE(buffer, &packet->y, sizeof(int));
+
+	//content
+	for (register int i = 0; i < REGION_WIDTH; i++) {
+		for (register int j = 0; j < REGION_HEIGHT; j++) {
+			for (register int k = 0; k < REGION_DEPTH; k++) {
+				*reinterpret_cast<Region::type_t*>(buffer) = packet->region->GetTile(i, j, k);
+				buffer = reinterpret_cast<char*>(buffer) + sizeof(Region::type_t);
+			}
+		}
+	}
+}
+
+void deserializeRegionFormat(RegionPacket* packet, void* buffer) {
+	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//format
+	DESERIALIZE(buffer, &packet->roomIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->x, sizeof(int));
+	DESERIALIZE(buffer, &packet->y, sizeof(int));
+}
+
+void deserializeRegionContent(RegionPacket* packet, void* buffer) {
+	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//format
+	DESERIALIZE(buffer, &packet->roomIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->x, sizeof(int));
+	DESERIALIZE(buffer, &packet->y, sizeof(int));
+
+	//an object to work on
+	packet->region = new Region(packet->x, packet->y);
+
+	//content
+	for (register int i = 0; i < REGION_WIDTH; i++) {
+		for (register int j = 0; j < REGION_HEIGHT; j++) {
+			for (register int k = 0; k < REGION_DEPTH; k++) {
+				packet->region->SetTile(i, j, k, *reinterpret_cast<Region::type_t*>(buffer));
+				buffer = reinterpret_cast<char*>(buffer) + sizeof(Region::type_t);
+			}
+		}
+	}
+}

common/network/serial/serial_server.cpp

@@ -19,24 +19,24 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "server_packet.hpp"
+#include "serial.hpp"
 
-#include "serial_utility.hpp"
+#include "serial_util.hpp"
 
-void ServerPacket::Serialize(void* buffer) {
+void serializeServer(ServerPacket* packet, void* buffer) {
-	serializeCopy(&buffer, &type, sizeof(SerialPacketType));
+	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
 
 	//identify the server
-	serializeCopy(&buffer, name, PACKET_STRING_SIZE);
+	SERIALIZE(buffer, &packet->name, PACKET_STRING_SIZE);
-	serializeCopy(&buffer, &playerCount, sizeof(int));
+	SERIALIZE(buffer, &packet->playerCount, sizeof(int));
-	serializeCopy(&buffer, &version, sizeof(int));
+	SERIALIZE(buffer, &packet->version, sizeof(int));
 }
 
-void ServerPacket::Deserialize(void* buffer) {
+void deserializeServer(ServerPacket* packet, void* buffer) {
-	deserializeCopy(&buffer, &type, sizeof(SerialPacketType));
+	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
 
 	//identify the server
-	deserializeCopy(&buffer, name, PACKET_STRING_SIZE);
+	DESERIALIZE(buffer, &packet->name, PACKET_STRING_SIZE);
-	deserializeCopy(&buffer, &playerCount, sizeof(int));
+	DESERIALIZE(buffer, &packet->playerCount, sizeof(int));
-	deserializeCopy(&buffer, &version, sizeof(int));
+	DESERIALIZE(buffer, &packet->version, sizeof(int));
 }

common/network/serial/serial_statistics.cpp

@@ -0,0 +1,65 @@
+/* Copyright: (c) Kayne Ruse 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.
+*/
+#include "serial.hpp"
+
+#include "serial_util.hpp"
+
+void serializeStatistics(Statistics* stats, void* buffer) {
+	//integers
+	SERIALIZE(buffer, &stats->level, sizeof(int));
+	SERIALIZE(buffer, &stats->exp, sizeof(int));
+	SERIALIZE(buffer, &stats->maxHP, sizeof(int));
+	SERIALIZE(buffer, &stats->health, sizeof(int));
+	SERIALIZE(buffer, &stats->maxMP, sizeof(int));
+	SERIALIZE(buffer, &stats->mana, sizeof(int));
+	SERIALIZE(buffer, &stats->attack, sizeof(int));
+	SERIALIZE(buffer, &stats->defence, sizeof(int));
+	SERIALIZE(buffer, &stats->intelligence, sizeof(int));
+	SERIALIZE(buffer, &stats->resistance, sizeof(int));
+	SERIALIZE(buffer, &stats->speed, sizeof(int));
+
+	//floats
+	SERIALIZE(buffer, &stats->accuracy, sizeof(float));
+	SERIALIZE(buffer, &stats->evasion, sizeof(float));
+	SERIALIZE(buffer, &stats->luck, sizeof(float));
+}
+
+
+void deserializeStatistics(Statistics* stats, void* buffer) {
+	//integers
+	DESERIALIZE(buffer, &stats->level, sizeof(int));
+	DESERIALIZE(buffer, &stats->exp, sizeof(int));
+	DESERIALIZE(buffer, &stats->maxHP, sizeof(int));
+	DESERIALIZE(buffer, &stats->health, sizeof(int));
+	DESERIALIZE(buffer, &stats->maxMP, sizeof(int));
+	DESERIALIZE(buffer, &stats->mana, sizeof(int));
+	DESERIALIZE(buffer, &stats->attack, sizeof(int));
+	DESERIALIZE(buffer, &stats->defence, sizeof(int));
+	DESERIALIZE(buffer, &stats->intelligence, sizeof(int));
+	DESERIALIZE(buffer, &stats->resistance, sizeof(int));
+	DESERIALIZE(buffer, &stats->speed, sizeof(int));
+
+	//floats
+	DESERIALIZE(buffer, &stats->accuracy, sizeof(float));
+	DESERIALIZE(buffer, &stats->evasion, sizeof(float));
+	DESERIALIZE(buffer, &stats->luck, sizeof(float));
+}

common/network/serial/serial_util.hpp

@@ -19,27 +19,13 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "timer.hpp"
+#ifndef SERIALIZEUTIL_HPP_
+#define SERIALIZEUTIL_HPP_
 
-Timer::Timer(): start(Timer::Clock::now()) {
+#include <cstring>
-	//
-}
 
-Timer::Timer(std::string s): name(s), start(Timer::Clock::now()) {
+//NOTE: The strange assignments here used in order to move the void* parameter
-	//
+#define SERIALIZE(buffer, data, size) memcpy(buffer, data, size); buffer = reinterpret_cast<char*>(buffer) + size;
-}
+#define DESERIALIZE(buffer, data, size) memcpy(data, buffer, size); buffer = reinterpret_cast<char*>(buffer) + size;
 
-void Timer::Start() {
+#endif
-	start = Clock::now();
-}
-
-void Timer::Stop() {
-	timeSpan = Clock::now() - start;
-}
-
-std::ostream& operator<<(std::ostream& os, Timer& t) {
-	os << t.GetName() << ": ";
-	os << std::chrono::duration_cast<std::chrono::milliseconds>(t.GetTime()).count();
-	os << "ms";
-	return os;
-}

common/network/serial_packet.hpp

@@ -1,67 +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_
-
-/* DOCS: serial_packet.hpp is used to define a number of required constants.
- * These are used extensively by the server and client
-*/
-
-#include "serial_packet_base.hpp"
-#include "character_packet.hpp"
-#include "client_packet.hpp"
-#include "region_packet.hpp"
-#include "server_packet.hpp"
-
-//SerialPacketBase is defined in serial_packet_base.hpp
-typedef SerialPacketBase SerialPacket;
-
-//DOCS: NETWORK_VERSION is used to discern compatible servers and clients
-constexpr int NETWORK_VERSION = 20140831;
-
-//_MaxPacket Should not be used
-union _MaxPacket {
-	CharacterPacket a;
-	ClientPacket b;
-	RegionPacket c;
-	ServerPacket d;
-};
-
-constexpr int MAX_PACKET_SIZE = sizeof(_MaxPacket);
-
-/* DOCS: PACKET_BUFFER_SIZE is the memory required to store serialized data
- * DOCS: SerialPacketType::REGION_CONTENT is currently the largest packet type
- * Serialized RegionPacket structure:
- *     SerialPacketType
- *     room index (int)
- *     X & Y position (int)
- *     tile data (3 layers)
- *     solid data (bitset)
-*/
-
-constexpr int PACKET_BUFFER_SIZE =
-	sizeof(SerialPacketType) +
-	REGION_METADATA_FOOTPRINT +
-	REGION_TILE_FOOTPRINT +
-	REGION_SOLID_FOOTPRINT;
-
-#endif

common/network/serial_packet_type.hpp

@@ -1,98 +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 SERIALPACKETTYPE_HPP_
-#define SERIALPACKETTYPE_HPP_
-
-/* DOCS: The headers indicate what packet type is used for each message
- * different messages under the same header will carry different amounts of
- * valid data, but it will still be carried in that packet's format.
-*/
-
-enum class SerialPacketType {
-	//default: there is something wrong
-	NONE = 0,
-
-	//-------------------------
-	//ServerPacket
-	//  name, player count, version
-	//-------------------------
-
-	//heartbeat
-	PING,
-	PONG,
-
-	//Used for finding available servers
-	BROADCAST_REQUEST,
-	BROADCAST_RESPONSE,
-
-	//-------------------------
-	//ClientPacket
-	//  client index, account index, character index
-	//-------------------------
-
-	//Connecting to a server as a client
-	JOIN_REQUEST,
-	JOIN_RESPONSE,
-	JOIN_REJECTION,
-
-	//client requests all information from the server
-	SYNCHRONIZE,
-
-	//disconnect from the server
-	DISCONNECT,
-
-	//shut down the server
-	SHUTDOWN,
-
-	//-------------------------
-	//RegionPacket
-	//  room index, x, y, raw data
-	//-------------------------
-
-	//map data
-	REGION_REQUEST,
-	REGION_CONTENT,
-
-	//-------------------------
-	//CharacterPacket
-	//  handle, avatar, character index, account index,
-	//  room index, origin, motion
-	//  statistics
-	//-------------------------
-
-	//controlling characters
-	CHARACTER_NEW,
-	CHARACTER_DELETE,
-	CHARACTER_UPDATE,
-
-	//authentication, character index => character stats
-	CHARACTER_STATS_REQUEST,
-	CHARACTER_STATS_RESPONSE,
-
-	//reject a character request
-	CHARACTER_REJECTION,
-
-	//not used
-	LAST
-};
-
-#endif

common/network/serial_utility.cpp

@@ -1,147 +0,0 @@
-/* Copyright: (c) Kayne Ruse 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.
-*/
-#include "serial_utility.hpp"
-
-#include "serial_packet_type.hpp"
-
-#include "server_packet.hpp"
-#include "client_packet.hpp"
-#include "region_packet.hpp"
-#include "character_packet.hpp"
-
-#include <cstring>
-
-void serializePacket(SerialPacketBase* packet, void* data) {
-	switch(packet->GetType()) {
-		case SerialPacketType::PING:
-		case SerialPacketType::PONG:
-		case SerialPacketType::BROADCAST_REQUEST:
-		case SerialPacketType::BROADCAST_RESPONSE:
-			static_cast<ServerPacket*>(packet)->Serialize(data);
-		break;
-		case SerialPacketType::JOIN_REQUEST:
-		case SerialPacketType::JOIN_RESPONSE:
-		case SerialPacketType::JOIN_REJECTION:
-		case SerialPacketType::SYNCHRONIZE:
-		case SerialPacketType::DISCONNECT:
-		case SerialPacketType::SHUTDOWN:
-			static_cast<ClientPacket*>(packet)->Serialize(data);
-		break;
-		case SerialPacketType::REGION_REQUEST:
-		case SerialPacketType::REGION_CONTENT:
-			static_cast<RegionPacket*>(packet)->Serialize(data);
-		break;
-		case SerialPacketType::CHARACTER_NEW:
-		case SerialPacketType::CHARACTER_DELETE:
-		case SerialPacketType::CHARACTER_UPDATE:
-		case SerialPacketType::CHARACTER_STATS_REQUEST:
-		case SerialPacketType::CHARACTER_STATS_RESPONSE:
-		case SerialPacketType::CHARACTER_REJECTION:
-			static_cast<CharacterPacket*>(packet)->Serialize(data);
-		break;
-	}
-}
-
-void deserializePacket(SerialPacketBase* packet, void* data) {
-	//get the type
-	SerialPacketType type;
-	memcpy(&type, data, sizeof(SerialPacketType));
-
-	switch(type) {
-		case SerialPacketType::PING:
-		case SerialPacketType::PONG:
-		case SerialPacketType::BROADCAST_REQUEST:
-		case SerialPacketType::BROADCAST_RESPONSE:
-			static_cast<ServerPacket*>(packet)->Deserialize(data);
-		break;
-		case SerialPacketType::JOIN_REQUEST:
-		case SerialPacketType::JOIN_RESPONSE:
-		case SerialPacketType::JOIN_REJECTION:
-		case SerialPacketType::SYNCHRONIZE:
-		case SerialPacketType::DISCONNECT:
-		case SerialPacketType::SHUTDOWN:
-			static_cast<ClientPacket*>(packet)->Deserialize(data);
-		break;
-		case SerialPacketType::REGION_REQUEST:
-		case SerialPacketType::REGION_CONTENT:
-			static_cast<RegionPacket*>(packet)->Deserialize(data);
-		break;
-		case SerialPacketType::CHARACTER_NEW:
-		case SerialPacketType::CHARACTER_DELETE:
-		case SerialPacketType::CHARACTER_UPDATE:
-		case SerialPacketType::CHARACTER_STATS_REQUEST:
-		case SerialPacketType::CHARACTER_STATS_RESPONSE:
-		case SerialPacketType::CHARACTER_REJECTION:
-			static_cast<CharacterPacket*>(packet)->Deserialize(data);
-		break;
-	}
-}
-
-void serializeCopy(void** bufferHead, void* data, int size) {
-	memcpy(*bufferHead, data, size);
-	(*bufferHead) = static_cast<void*>(static_cast<char*>(*bufferHead) + size);
-}
-
-void deserializeCopy(void** bufferHead, void* data, int size) {
-	memcpy(data, *bufferHead, size);
-	(*bufferHead) = static_cast<void*>(static_cast<char*>(*bufferHead) + size);
-}
-
-void serializeCopyStatistics(void** bufferHead, Statistics* stats) {
-	//integers
-	serializeCopy(bufferHead, &stats->level, sizeof(int));
-	serializeCopy(bufferHead, &stats->exp, sizeof(int));
-	serializeCopy(bufferHead, &stats->maxHP, sizeof(int));
-	serializeCopy(bufferHead, &stats->health, sizeof(int));
-	serializeCopy(bufferHead, &stats->maxMP, sizeof(int));
-	serializeCopy(bufferHead, &stats->mana, sizeof(int));
-	serializeCopy(bufferHead, &stats->attack, sizeof(int));
-	serializeCopy(bufferHead, &stats->defence, sizeof(int));
-	serializeCopy(bufferHead, &stats->intelligence, sizeof(int));
-	serializeCopy(bufferHead, &stats->resistance, sizeof(int));
-	serializeCopy(bufferHead, &stats->speed, sizeof(int));
-
-	//floats
-	serializeCopy(bufferHead, &stats->accuracy, sizeof(float));
-	serializeCopy(bufferHead, &stats->evasion, sizeof(float));
-	serializeCopy(bufferHead, &stats->luck, sizeof(float));
-}
-
-void deserializeCopyStatistics(void** bufferHead, Statistics* stats) {
-	//integers
-	deserializeCopy(bufferHead, &stats->level, sizeof(int));
-	deserializeCopy(bufferHead, &stats->exp, sizeof(int));
-	deserializeCopy(bufferHead, &stats->maxHP, sizeof(int));
-	deserializeCopy(bufferHead, &stats->health, sizeof(int));
-	deserializeCopy(bufferHead, &stats->maxMP, sizeof(int));
-	deserializeCopy(bufferHead, &stats->mana, sizeof(int));
-	deserializeCopy(bufferHead, &stats->attack, sizeof(int));
-	deserializeCopy(bufferHead, &stats->defence, sizeof(int));
-	deserializeCopy(bufferHead, &stats->intelligence, sizeof(int));
-	deserializeCopy(bufferHead, &stats->resistance, sizeof(int));
-	deserializeCopy(bufferHead, &stats->speed, sizeof(int));
-
-	//floats
-	deserializeCopy(bufferHead, &stats->accuracy, sizeof(float));
-	deserializeCopy(bufferHead, &stats->evasion, sizeof(float));
-	deserializeCopy(bufferHead, &stats->luck, sizeof(float));
-}

common/network/udp_network_utility.cpp

@@ -21,7 +21,7 @@
 */
 #include "udp_network_utility.hpp"
 
-#include "serial_utility.hpp"
+#include "serial.hpp"
 
 #include <stdexcept>
 
@@ -213,11 +213,8 @@ int UDPNetworkUtility::SendToAllChannels(SerialPacket* serialPacket) {
 int UDPNetworkUtility::Receive(SerialPacket* serialPacket) {
 	memset(packet->data, 0, packet->maxlen);
 	int ret = SDLNet_UDP_Recv(socket, packet);
-	if (ret > 0) {
+	deserializePacket(serialPacket, packet->data);
-		//BUG: This simply fails
+	serialPacket->srcAddress = packet->address;
-		deserializePacket(serialPacket, packet->data);
-		serialPacket->srcAddress = packet->address;
-	}
 
 	if (ret < 0) {
 		throw(std::runtime_error("Unknown network error occured"));

common/network/udp_network_utility.hpp

@@ -22,15 +22,15 @@
 #ifndef UDPNETWORKUTILITY_HPP_
 #define UDPNETWORKUTILITY_HPP_
 
-//common
-#include "serial_packet.hpp"
-#include "singleton.hpp"
-
-//APIs
 #include "SDL/SDL_net.h"
 
-class UDPNetworkUtility : public Singleton<UDPNetworkUtility> {
+#include "serial_packet.hpp"
+
+class UDPNetworkUtility {
 public:
+	UDPNetworkUtility() = default;
+	~UDPNetworkUtility() = default;
+
 	void Open(int port);
 	void Close();
 
@@ -65,11 +65,6 @@ public:
 		return socket;
 	}
 private:
-	friend Singleton<UDPNetworkUtility>;
-
-	UDPNetworkUtility() = default;
-	~UDPNetworkUtility() = default;
-
 	UDPsocket socket = nullptr;
 	UDPpacket* packet = nullptr;
 };

common/ui/menu_bar.hpp

@@ -36,7 +36,6 @@
  * This class needs a rewrite.
 */
 
-//TODO: This thing is fucking terrible, fix it and the button class
 class MenuBar {
 public:
 	MenuBar() = default;

common/utilities/bounding_box.hpp

@@ -1,78 +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 BOUNDINGBOX_HPP_
-#define BOUNDINGBOX_HPP_
-
-#include <type_traits>
-#include <algorithm>
-
-class BoundingBox {
-public:
-	//This is explicitly a POD
-	int x, y;
-	int w, h;
-
-	BoundingBox() = default;
-	BoundingBox(int i, int j): x(i), y(j), w(0), h(0) {};
-	BoundingBox(int i, int j, int k, int l): x(i), y(j), w(k), h(l) {};
-	~BoundingBox() = default;
-	BoundingBox& operator=(BoundingBox const&) = default;
-
-	int Size() {
-		return std::max(w*h,0);
-	}
-
-	bool CheckOverlap(BoundingBox rhs) {
-		return !(
-			x >= rhs.x + rhs.w ||
-			y >= rhs.y + rhs.h ||
-			rhs.x >= x + w ||
-			rhs.y >= y + h);
-	}
-
-	BoundingBox CalcOverlap(BoundingBox rhs) {
-		if (!CheckOverlap(rhs)) {
-			return {0, 0, 0, 0};
-		}
-		BoundingBox ret;
-		ret.x = std::max(x, rhs.x);
-		ret.y = std::max(y, rhs.y);
-		ret.w = std::min(x+w, rhs.x+rhs.w) - ret.x;
-		ret.h = std::min(y+h, rhs.y+rhs.h) - ret.y;
-		return ret;
-	}
-};
-
-//This is explicitly a POD
-static_assert(std::is_pod<BoundingBox>::value, "BoundingBox is not a POD");
-
-#include "vector2.hpp"
-
-//operators
-inline BoundingBox operator+(BoundingBox b, Vector2 v) {
-	return {b.x + (int)v.x, b.y + (int)v.y, b.w, b.h};
-}
-inline BoundingBox operator+(Vector2 v, BoundingBox b) {
-	return b + v;
-}
-
-#endif

common/utilities/check_bounds.cpp

@@ -0,0 +1,40 @@
+/* Copyright: (c) Kayne Ruse 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.
+*/
+#include "check_bounds.hpp"
+
+bool checkPoint(Vector2 const& origin, Vector2 const& bound, Vector2 const& point) {
+	return !(
+		point.x < origin.x ||
+		point.y < origin.y ||
+		point.x >= origin.x + bound.x ||
+		point.y >= origin.y + bound.y
+	);
+}
+
+bool checkOverlap(Vector2 const& originOne, Vector2 const& boundOne, Vector2 const& originTwo, Vector2 const& boundTwo) {
+	return !(
+		originOne.x >= originTwo.x + boundTwo.x ||
+		originOne.x + boundOne.x >= originTwo.x ||
+		originOne.y >= originTwo.y + boundTwo.y ||
+		originOne.y + boundOne.y >= originTwo.y
+	);
+}

common/utilities/check_bounds.hpp

@@ -0,0 +1,30 @@
+/* Copyright: (c) Kayne Ruse 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 CHECKBOUNDS_HPP_
+#define CHECKBOUNDS_HPP_
+
+#include "vector2.hpp"
+
+bool checkPoint(Vector2 const& origin, Vector2 const& bound, Vector2 const& point);
+bool checkOverlap(Vector2 const& originOne, Vector2 const& boundOne, Vector2 const& originTwo, Vector2 const& boundTwo);
+
+#endif

common/utilities/config_utility.cpp

@@ -25,37 +25,25 @@
 #include <fstream>
 #include <stdexcept>
 
-void ConfigUtility::Load(std::string fname) {
+using namespace std;
-	//clear the stored configuration
-	configMap.clear();
-	//pass to the recursive method
-	configMap = Read(fname);
-}
 
-ConfigUtility::table_t ConfigUtility::Read(std::string fname) {
+void ConfigUtility::Load(string fname) {
-	//read in and return this file's data
+	ifstream is(fname);
-	table_t retTable;
-	std::ifstream is(fname);
 
 	if (!is.is_open()) {
-		std::string msg;
+		throw(runtime_error("Failed to open config file"));
-		msg += "Failed to open a config file: ";
-		msg += fname;
-		throw(std::runtime_error(msg));
 	}
 
-	std::string key, val;
+	string key, val;
 
-	while(true) { //forever
+	for (;;) { //forever
 		//eat whitespace
-		while(isspace(is.peek())) {
+		while(isspace(is.peek()))
 			is.ignore();
-		}
 
 		//end of file
-		if (is.eof()) {
+		if (is.eof())
 			break;
-		}
 
 		//skip comment lines
 		if (is.peek() == '#') {
@@ -76,54 +64,41 @@ ConfigUtility::table_t ConfigUtility::Read(std::string fname) {
 		while(key.size() && isspace(*(key.end()-1))) key.erase(key.end() - 1);
 		while(val.size() && isspace(*(val.end()-1))) val.erase(val.end() - 1);
 
-		//disallow empty/wiped values
+		//allow empty/wiped values
 		if (key.size() == 0) {
 			continue;
 		}
 
 		//save the pair
-		retTable[key] = val;
+		table[key] = val;
 	}
 
 	is.close();
-
-	//load in any subordinate config files
-	//TODO: Possibility of nesting config levels?
-	if (retTable.find("config.next") != retTable.end()) {
-		table_t subTable = Read(retTable["config.next"]);
-		retTable.insert(subTable.begin(), subTable.end());
-	}
-
-	return retTable;
 }
 
-//-------------------------
-//Convert to a type
-//-------------------------
-
 std::string& ConfigUtility::String(std::string s) {
-	return configMap[s];
+	return table[s];
 }
 
 int ConfigUtility::Integer(std::string s) {
-	table_t::iterator it = configMap.find(s);
+	std::map<std::string, std::string>::iterator it = table.find(s);
-	if (it == configMap.end()) {
+	if (it == table.end()) {
 		return 0;
 	}
 	return atoi(it->second.c_str());
 }
 
 double ConfigUtility::Double(std::string s) {
-	table_t::iterator it = configMap.find(s);
+	std::map<std::string, std::string>::iterator it = table.find(s);
-	if (it == configMap.end()) {
+	if (it == table.end()) {
 		return 0.0;
 	}
 	return atof(it->second.c_str());
 }
 
 bool ConfigUtility::Boolean(std::string s) {
-	table_t::iterator it = configMap.find(s);
+	std::map<std::string, std::string>::iterator it = table.find(s);
-	if (it == configMap.end()) {
+	if (it == table.end()) {
 		return false;
 	}
 	return it->second == "true";

common/utilities/config_utility.hpp

@@ -22,13 +22,14 @@
 #ifndef CONFIGUTILITY_HPP_
 #define CONFIGUTILITY_HPP_
 
-#include "singleton.hpp"
-
 #include <map>
 #include <string>
 
-class ConfigUtility : public Singleton<ConfigUtility> {
+class ConfigUtility {
 public:
+	ConfigUtility() = default;
+	ConfigUtility(std::string s) { Load(s); }
+
 	void Load(std::string fname);
 
 	//convert to a type
@@ -38,21 +39,22 @@ public:
 	bool Boolean(std::string);
 
 	//shorthand
-	inline std::string& operator[](std::string s) { return configMap[s]; }
+	std::string& operator[](std::string s) {
-	inline int Int(std::string s) { return Integer(s); }
+		return String(s);
-	inline bool Bool(std::string s) { return Boolean(s); }
+	}
+	int Int(std::string s) {
+		return Integer(s);
+	}
+	bool Bool(std::string s) {
+		return Boolean(s);
+	}
 
+	//OO breaker
+	std::map<std::string, std::string>* GetMap() {
+		return &table;
+	}
 private:
-	typedef std::map<std::string, std::string> table_t;
+	std::map<std::string, std::string> table;
-
-	friend Singleton<ConfigUtility>;
-
-	ConfigUtility() = default;
-	~ConfigUtility() = default;
-
-	table_t Read(std::string fname);
-
-	table_t configMap;
 };
 
 #endif

common/utilities/simple_rng.hpp

@@ -0,0 +1,42 @@
+/* Copyright: (c) Kayne Ruse 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 SIMPLERNG_HPP_
+#define SIMPLERNG_HPP_
+
+//a simple, stateless, random number generator
+class SimpleRNG {
+public:
+	SimpleRNG() { SetSeed(8891.0); }
+	SimpleRNG(double x) { SetSeed(x); }
+
+	double SetSeed(double s) { return seed = s; }
+	double GetSeed() { return seed; }
+
+	double operator()(double x) {
+		return (x + seed) * 11235.0 + 81321.0;
+	};
+
+private:
+	double seed;
+};
+
+#endif

common/utilities/singleton.hpp

@@ -1,63 +0,0 @@
-/* Copyright: (c) Kayne Ruse 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 SINGLETON_HPP_
-#define SINGLETON_HPP_
-
-#include <stdexcept>
-
-template<typename T>
-class Singleton {
-public:
-	static T& GetSingleton() {
-		if (!ptr) {
-			throw(std::logic_error("This singleton has not been created"));
-		}
-		return *ptr;
-	}
-	static void Create() {
-		if (ptr) {
-			throw(std::logic_error("This singleton has already been created"));
-		}
-		ptr = new T();
-	}
-	static void Delete() {
-		if (!ptr) {
-			throw(std::logic_error("A non-existant singleton cannot be deleted"));
-		}
-		delete ptr;
-		ptr = nullptr;
-	}
-
-protected:
-	Singleton() = default;
-	Singleton(Singleton const&) = default;
-	Singleton(Singleton&&) = default;
-	~Singleton() = default;
-
-private:
-	static T* ptr;
-};
-
-template<typename T>
-T* Singleton<T>::ptr = nullptr;
-
-#endif

common/utilities/utility.cpp

@@ -23,6 +23,15 @@
 
 #include <algorithm>
 
+int snapToBase(int base, int x) {
+	//snap to a grid
+	if (x < 0) {
+		++x;
+		return x / base * base - base;
+	}
+	return x / base * base;
+}
+
 std::string truncatePath(std::string pathname) {
 	return std::string(
 		std::find_if(

common/utilities/utility.hpp

@@ -24,6 +24,7 @@
 
 #include <string>
 
+int snapToBase(int base, int x);
 std::string truncatePath(std::string pathname);
 
 //fixing known bugs in g++

common/utilities/vector2.hpp

@@ -43,8 +43,6 @@ public:
 	}
 	void Normalize() {
 		double l = Length();
-		if (l == 0)
-			throw(std::domain_error("Divide by zero"));
 		x /= l;
 		y /= l;
 	}

copyright.txt

@@ -1,15 +0,0 @@
-Future versions (to be determined) may be released under a modified version of the Uplink Developer's License.
-
-The current version of Tortuga is released under the zlib license.
-
-Copyright (c) 2013, 2014 Kayne Ruse
-
-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.

makefile

@@ -3,6 +3,11 @@
 #MKDIR=mkdir
 #RM=del /y
 
+#CXXFLAGS+=-static-libgcc -static-libstdc++ -g -fno-inline-functions -Wall
+CXXFLAGS+=-static-libgcc -static-libstdc++
+
+export
+
 OUTDIR=out
 
 all: $(OUTDIR)
@@ -10,17 +15,6 @@ all: $(OUTDIR)
 	$(MAKE) -C server
 	$(MAKE) -C client
 
-debug: export CXXFLAGS+=-g
-debug: clean all
-
-release: export CXXFLAGS+=-static-libgcc -static-libstdc++
-release: clean all package
-
-#For use on my machine ONLY
-package:
-	rar a -r -ep Tortuga.rar $(OUTDIR)/*.exe  $(OUTDIR)/*.dll
-	rar a -r Tortuga.rar rsc/* copyright.txt
-
 $(OUTDIR):
 	mkdir $(OUTDIR)
 

rsc/config.cfg

@@ -8,8 +8,6 @@ server.name = local
 server.dbname = database.db
 
 #client specific settings
-#client.screen.w = 800
-#client.screen.h = 600
 client.screen.f = false
 
 client.username = Kayne Ruse

rsc/scripts/setup_server.lua

@@ -1,52 +1,42 @@
-print("Lua script check")
+print("Lua script check (./rsc)")
 
 --uber lazy declarations
-function math.sqr(x) return x*x end
+function square(x) return x*x end
-function math.dist(x, y, i, j) return math.sqrt(math.sqr(x - i) + math.sqr(y - j)) end
+function distance(x, y, i, j) return math.sqrt(square(x - i) + square(y - j)) end
 
 --tile macros, mapped to the tilesheet
 local base = 14
 local shift = 36
-tiles = {
+plains	= base + shift * 0
-	plains	= base + shift * 0,
+grass	= base + shift * 1
-	grass	= base + shift * 1,
+dirt	= base + shift * 2
-	dirt	= base + shift * 2,
+sand	= base + shift * 3
-	sand	= base + shift * 3,
+water	= base + shift * 4
-	water	= base + shift * 4
-}
 
---custom generation systems here
+--Overwrite the original OnCreate with my own version
-function islandGenerator(region)
+Region.hcOnCreate = Region.OnCreate
-	io.write("Generating (", Region.GetX(region), ", ", Region.GetY(region), ")\n")
+Region.OnCreate = function(region)
-	for i = 1, Region.GetWidth(region) do
+	local ret = Region.hcOnCreate(region) --best practices
-		for j = 1, Region.GetHeight(region) do
+	for i = 1, Region.GetWidth() do
-			local dist = math.dist(0, 0, i + Region.GetX(region) -1, j + Region.GetY(region) -1)
+		for j = 1, Region.GetHeight() do
-			if dist < 10 then
+			if distance(0, 0, i + Region.GetX(region) -1, j + Region.GetY(region) -1) > 10 then
-				Region.SetTile(region, i, j, 1, tiles.plains)
+				Region.SetTile(region, i, j, 1, water)
-			elseif dist < 12 then
-				Region.SetTile(region, i, j, 1, tiles.sand)
 			else
-				Region.SetTile(region, i, j, 1, tiles.water)
+				Region.SetTile(region, i, j, 1, plains)
-				Region.SetSolid(region, i, j, true)
 			end
 		end
 	end
+	return ret
 end
 
 --Get some regions
---BUG: The server fails without at least one room
+newRoom = RoomMgr.CreateRoom("overworld")
---TODO: Create rooms with names?
-newRoom = RoomManager.CreateRoom()
 pager = Room.GetPager(newRoom)
-RegionPager.SetOnCreate(pager, islandGenerator)
-
---[[
 regionTable = {
-	RegionPager.GetRegion(pager, Region.GetWidth() * 0, Region.GetHeight() * 0),
+	RegionPager.GetRegion(pager, 0, 0),
-	RegionPager.GetRegion(pager, Region.GetWidth() *-1, Region.GetHeight() * 0),
+	RegionPager.GetRegion(pager, 0, -20),
-	RegionPager.GetRegion(pager, Region.GetWidth() * 0, Region.GetHeight() *-1),
+	RegionPager.GetRegion(pager, -20, 0),
-	RegionPager.GetRegion(pager, Region.GetWidth() *-1, Region.GetHeight() *-1)
+	RegionPager.GetRegion(pager, -20, -20)
 }
-]]
 
-print("Finished the lua script")
+print("Finished the lua script")

server/accounts/account_data.hpp

@@ -24,35 +24,15 @@
 
 #include <string>
 
-class AccountData {
+struct AccountData {
-public:
-	AccountData() = default;
-	~AccountData() = default;
-
-	//accessors and mutators
-	int SetClientIndex(int i) { return clientIndex = i; }
-	int GetClientIndex() { return clientIndex; }
-
-	std::string SetUsername(std::string s) { return username = s; }
-	std::string GetUsername() { return username; }
-
-	//database stuff
-	bool GetBlackListed() { return blackListed; }
-	bool GetWhiteListed() { return whiteListed; }
-	bool GetModerator() { return mod; }
-	bool GetAdministrator() { return admin; }
-
-private:
-	friend class AccountManager;
-
-	int clientIndex;
 	std::string username;
 	//TODO: password
-
 	bool blackListed = false;
 	bool whiteListed = true;
 	bool mod = false;
 	bool admin = false;
+
+	int clientIndex;
 };
 
 #endif

server/accounts/account_manager.hpp

@@ -23,14 +23,16 @@
 #define ACCOUNTMANAGER_HPP_
 
 #include "account_data.hpp"
-#include "singleton.hpp"
 
 #include "sqlite3/sqlite3.h"
 
 #include <map>
 
-class AccountManager : public Singleton<AccountManager> {
+class AccountManager {
 public:
+	AccountManager() = default;
+	~AccountManager() { UnloadAll(); };
+
 	//public access methods
 	int CreateAccount(std::string username, int clientIndex);
 	int LoadAccount(std::string username, int clientIndex);
@@ -48,11 +50,6 @@ public:
 	sqlite3* GetDatabase();
 
 private:
-	friend Singleton<AccountManager>;
-
-	AccountManager() = default;
-	~AccountManager() = default;
-
 	std::map<int, AccountData> accountMap;
 	sqlite3* database = nullptr;
 };

server/accounts/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../../common/utilities
+INCLUDES+=.
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 

server/characters/character_manager.cpp

@@ -58,7 +58,7 @@ static const char* DELETE_CHARACTER = "DELETE FROM Characters WHERE uid = ?;";
 //Define the methods
 //-------------------------
 
-//NOTE: default baseStats as a parameter would be good for different beggining states or multiple classes
+//NOTE: default stats as a parameter would be good for different beggining states or multiple classes
 int CharacterManager::CreateCharacter(int owner, std::string handle, std::string avatar) {
 	//Create the character, failing if it exists
 	sqlite3_stmt* statement = nullptr;
@@ -142,20 +142,20 @@ int CharacterManager::LoadCharacter(int owner, std::string handle, std::string a
 		newChar.origin.y = (double)sqlite3_column_int(statement, 7);
 
 		//statistics
-		newChar.baseStats.level = sqlite3_column_int(statement, 8);
+		newChar.stats.level = sqlite3_column_int(statement, 8);
-		newChar.baseStats.exp = sqlite3_column_int(statement, 9);
+		newChar.stats.exp = sqlite3_column_int(statement, 9);
-		newChar.baseStats.maxHP = sqlite3_column_int(statement, 10);
+		newChar.stats.maxHP = sqlite3_column_int(statement, 10);
-		newChar.baseStats.health = sqlite3_column_int(statement, 11);
+		newChar.stats.health = sqlite3_column_int(statement, 11);
-		newChar.baseStats.maxMP = sqlite3_column_int(statement, 12);
+		newChar.stats.maxMP = sqlite3_column_int(statement, 12);
-		newChar.baseStats.mana = sqlite3_column_int(statement, 13);
+		newChar.stats.mana = sqlite3_column_int(statement, 13);
-		newChar.baseStats.attack = sqlite3_column_int(statement, 14);
+		newChar.stats.attack = sqlite3_column_int(statement, 14);
-		newChar.baseStats.defence = sqlite3_column_int(statement, 15);
+		newChar.stats.defence = sqlite3_column_int(statement, 15);
-		newChar.baseStats.intelligence = sqlite3_column_int(statement, 16);
+		newChar.stats.intelligence = sqlite3_column_int(statement, 16);
-		newChar.baseStats.resistance = sqlite3_column_int(statement, 17);
+		newChar.stats.resistance = sqlite3_column_int(statement, 17);
-		newChar.baseStats.speed = sqlite3_column_int(statement, 18);
+		newChar.stats.speed = sqlite3_column_int(statement, 18);
-		newChar.baseStats.accuracy = sqlite3_column_double(statement, 19);
+		newChar.stats.accuracy = sqlite3_column_double(statement, 19);
-		newChar.baseStats.evasion = sqlite3_column_double(statement, 20);
+		newChar.stats.evasion = sqlite3_column_double(statement, 20);
-		newChar.baseStats.luck = sqlite3_column_double(statement, 21);
+		newChar.stats.luck = sqlite3_column_double(statement, 21);
 
 		//TODO: gameplay components: equipment, items, buffs, debuffs
 
@@ -199,20 +199,20 @@ int CharacterManager::SaveCharacter(int uid) {
 	ret |= sqlite3_bind_int(statement, 4, (int)character.origin.y) != SQLITE_OK;
 
 	//statistics
-	ret |= sqlite3_bind_int(statement, 5, character.baseStats.level) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 5, character.stats.level) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 6, character.baseStats.exp) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 6, character.stats.exp) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 7, character.baseStats.maxHP) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 7, character.stats.maxHP) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 8, character.baseStats.health) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 8, character.stats.health) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 9, character.baseStats.maxMP) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 9, character.stats.maxMP) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 10, character.baseStats.mana) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 10, character.stats.mana) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 11, character.baseStats.attack) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 11, character.stats.attack) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 12, character.baseStats.defence) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 12, character.stats.defence) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 13, character.baseStats.intelligence) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 13, character.stats.intelligence) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 14, character.baseStats.resistance) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 14, character.stats.resistance) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 15, character.baseStats.speed) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 15, character.stats.speed) != SQLITE_OK;
-	ret |= sqlite3_bind_double(statement, 16, character.baseStats.accuracy) != SQLITE_OK;
+	ret |= sqlite3_bind_double(statement, 16, character.stats.accuracy) != SQLITE_OK;
-	ret |= sqlite3_bind_double(statement, 17, character.baseStats.evasion) != SQLITE_OK;
+	ret |= sqlite3_bind_double(statement, 17, character.stats.evasion) != SQLITE_OK;
-	ret |= sqlite3_bind_double(statement, 18, character.baseStats.luck) != SQLITE_OK;
+	ret |= sqlite3_bind_double(statement, 18, character.stats.luck) != SQLITE_OK;
 
 	//TODO: gameplay components: equipment, items, buffs, debuffs
 

server/characters/character_manager.hpp

@@ -23,15 +23,17 @@
 #define CHARACTERMANAGER_HPP_
 
 #include "character_data.hpp"
-#include "singleton.hpp"
 
 #include "sqlite3/sqlite3.h"
 
 #include <map>
 #include <functional>
 
-class CharacterManager : public Singleton<CharacterManager> {
+class CharacterManager {
 public:
+	CharacterManager() = default;
+	~CharacterManager() { UnloadAll(); };
+
 	//public access methods
 	int CreateCharacter(int owner, std::string handle, std::string avatar);
 	int LoadCharacter(int owner, std::string handle, std::string avatar);
@@ -51,11 +53,6 @@ public:
 	sqlite3* GetDatabase();
 
 private:
-	friend Singleton<CharacterManager>;
-
-	CharacterManager() = default;
-	~CharacterManager() = default;
-
 	std::map<int, CharacterData> characterMap;
 	sqlite3* database = nullptr;
 };

server/client_data.hpp

@@ -26,7 +26,6 @@
 
 struct ClientData {
 	IPaddress address = {0,0};
-	//TODO: ping system?
 };
 
 #endif

server/combat/combat_manager.cpp

@@ -0,0 +1,54 @@
+/* Copyright: (c) Kayne Ruse 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.
+*/
+#include "combat_manager.hpp"
+
+//-------------------------
+//public access methods
+//-------------------------
+
+//TODO
+
+//-------------------------
+//accessors and mutators
+//-------------------------
+
+CombatData* CombatManager::GetCombat(int uid) {
+	std::map<int, CombatData>::iterator it = combatMap.find(uid);
+
+	if (it == combatMap.end()) {
+		return nullptr;
+	}
+
+	return &it->second;
+}
+
+std::map<int, CombatData>* CombatManager::GetContainer() {
+	return &combatMap;
+}
+
+lua_State* CombatManager::SetLuaState(lua_State* L) {
+	return luaState = L;
+}
+
+lua_State* CombatManager::GetLuaState() {
+	return luaState;
+}

server/combat/combat_manager.hpp

@@ -0,0 +1,51 @@
+/* Copyright: (c) Kayne Ruse 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 COMBATMANAGER_HPP_
+#define COMBATMANAGER_HPP_
+
+#include "combat_data.hpp"
+
+#include "lua/lua.hpp"
+
+#include <map>
+
+class CombatManager {
+public:
+	CombatManager() = default;
+	~CombatManager() = default;
+
+	//public access methods
+	//TODO
+
+	//accessors and mutators
+	CombatData* GetCombat(int uid);
+	std::map<int, CombatData>* GetContainer();
+
+	lua_State* SetLuaState(lua_State*);
+	lua_State* GetLuaState();
+
+private:
+	std::map<int, CombatData> combatMap;
+	lua_State* luaState = nullptr;
+};
+
+#endif

server/combat/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. .. ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/network/packet_types ../../common/ui ../../common/utilities
+INCLUDES+=. ../../common/gameplay ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
@@ -12,7 +12,7 @@ OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
 
 #output
 OUTDIR=..
-OUT=$(addprefix $(OUTDIR)/,client.a)
+OUT=$(addprefix $(OUTDIR)/,server.a)
 
 #targets
 all: $(OBJ) $(OUT)