Removed trace statements, moved a couple util files

The world is queried once the client has the player's character.

README.md

@@ -1,26 +1,36 @@
-The most recent stable windows build can be found [here](https://dl.dropboxusercontent.com/u/46669050/Tortuga.rar).
+## Outline
 
-Tortuga is an open source 2D multiplayer role playing game featuring permadeath (deletion of a character upon death). The emphasis of this game is on multiplayer cooperation, competition, exploration and customization. The game runs on customizable server software that can support up to 150 simultaneous players or more.
+Tortuga is a 2D multiplayer JRPG featuring permadeath, with an emphasis on multiplayer cooperation, exploration and customization. The game runs on customizable public and private servers.
 
-This game is inspired by classic 2D RPGs, as well as more modern sandbox MMOs. This project is currently independently created and funded, with the goal of creating a game that will engage user's imagination and inspire a large modding community.
+This game is inspired by classic 2D RPGs (Final Fantasy, The Legend of Zelda), as well as more modern sandboxes amd MMOs (Minecraft, EVE Online). This project is currently independently created and funded, with the goal of creating a game that will engage the players and inspire a large community.
+
+## Releases
+
+The most recent stable build for Windows can be found [here](https://dl.dropboxusercontent.com/u/46669050/Tortuga.rar).
+
+## Documentation
+
+* [Tortuga Wiki](https://github.com/Ratstail91/Tortuga/wiki) - Full documentation
+* [Tortuga Bug Tracker](https://github.com/Ratstail91/Tortuga/issues) - A list of all known bugs and issues
 
 ## External Dependencies
 
-* [SDL 1.6](http://www.libsdl.org/) - Simple DirectMedia Layer API
+* [SDL 1.2](http://www.libsdl.org/) - Simple DirectMedia Layer API
 * [SDL_net 1.2](http://www.libsdl.org/projects/SDL_net/) - SDL's networking extension
 * [lua 5.2](http://www.lua.org/) - The lua programming language
 * [SQLite3](http://www.sqlite.org/) - A lightweight SQL database engine
 
-## Documentation
+## Tools
 
-[Tortuga Game Design Document](https://github.com/Ratstail91/Tortuga/blob/docs/design%20doc.docx?raw=true)  
-[Tortuga Technical Document](https://github.com/Ratstail91/Tortuga/blob/docs/technical%20doc.docx?raw=true)
+* [WinRAR](http://www.rarlab.com/) - The best compression tool available IMO; only needed for distribution
 
 ## Copyright
 
+(Future versions (to be determined) may be released under a modified version of the [Uplink Developer's License](http://www.introversion.co.uk/uplink/developer/license.html).)
+
 The current version of Tortuga is released under the [zlib license](http://en.wikipedia.org/wiki/Zlib_License).  
 
-Copyright (c) 2013, 2014 Kayne Ruse
+Copyright (c) 2013-2015 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.
 

client/base_scene.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -75,10 +75,10 @@ SceneList BaseScene::GetNextScene() const {
 //Frame loop
 //-------------------------
 
-void BaseScene::RunFrame(double delta) {
+void BaseScene::RunFrame() {
 	FrameStart();
 	HandleEvents();
-	Update(delta);
+	Update();
 	FrameEnd();
 }
 
@@ -86,6 +86,7 @@ void BaseScene::RenderFrame() {
 	SDL_FillRect(screen, 0, 0);
 	Render(screen);
 	SDL_Flip(screen);
+	SDL_Delay(10);
 }
 
 //-------------------------
@@ -126,7 +127,7 @@ void BaseScene::HandleEvents() {
 			break;
 
 #ifdef USE_EVENT_JOYSTICK
-			//TODO: joystick/gamepad support
+			//EMPTY
 #endif
 
 #ifdef USE_EVENT_UNKNOWN

client/base_scene.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -40,13 +40,13 @@ public:
 	SceneList GetNextScene() const;
 
 	//Frame loop
-	virtual void RunFrame(double delta);
+	virtual void RunFrame();
 	virtual void RenderFrame();
 
 protected:
 	virtual void FrameStart() {}
 	virtual void HandleEvents();
-	virtual void Update(double delta) {}
+	virtual void Update() {}
 	virtual void FrameEnd() {}
 	virtual void Render(SDL_Surface* const screen) {}
 
@@ -59,7 +59,7 @@ protected:
 	virtual void KeyUp(SDL_KeyboardEvent const&) {}
 
 #ifdef USE_EVENT_JOYSTICK
-	//TODO: joystick/gamepad support
+	//EMPTY
 #endif
 
 #ifdef USE_EVENT_UNKNOWN

client/channels.hpp

@@ -1,3 +1,24 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 CHANNELS_HPP_
 #define CHANNELS_HPP_
 

client/client_application.cpp

@@ -1,11 +1,11 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * 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 ClientApplications, and to alter it and redistribute it
+ * 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
@@ -21,10 +21,12 @@
 */
 #include "client_application.hpp"
 
-#include "serial.hpp"
+#include "serial_packet.hpp"
+#include "config_utility.hpp"
 
 #include <stdexcept>
 #include <chrono>
+#include <iostream>
 
 //-------------------------
 //Scene headers
@@ -35,28 +37,82 @@
 #include "main_menu.hpp"
 #include "options_menu.hpp"
 #include "lobby_menu.hpp"
-#include "in_world.hpp"
-#include "in_combat.hpp"
+#include "world.hpp"
+#include "disconnected_screen.hpp"
 
 //-------------------------
 //Public access members
 //-------------------------
 
-void ClientApplication::Init(int argc, char** argv) {
+void ClientApplication::Init(int argc, char* argv[]) {
+	std::cout << "Beginning " << argv[0] << std::endl;
+
 	//load the prerequisites
-	config.Load("rsc\\config.cfg");
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+	config.Load("rsc/config.cfg", false, argc, argv);
+
+	//-------------------------
+	//Initialize the APIs
+	//-------------------------
 
 	//initialize SDL
 	if (SDL_Init(SDL_INIT_VIDEO)) {
 		throw(std::runtime_error("Failed to initialize SDL"));
 	}
-	BaseScene::SetScreen(config.Int("screen.w"), config.Int("screen.h"), 0, (config.Bool("screen.f")) ? SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_FULLSCREEN : SDL_HWSURFACE|SDL_DOUBLEBUF);
+	std::cout << "Initialized SDL" << std::endl;
 
 	//initialize SDL_net
 	if (SDLNet_Init()) {
 		throw(std::runtime_error("Failed to initialize SDL_net"));
 	}
-	network.Open(0, PACKET_BUFFER_SIZE);
+	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;
+
+	//-------------------------
+	//debug output
+	//-------------------------
+
+#define DEBUG_OUTPUT_VAR(x) std::cout << "\t" << #x << ": " << x << std::endl;
+
+	std::cout << "Internal sizes:" << std::endl;
+
+	DEBUG_OUTPUT_VAR(NETWORK_VERSION);
+	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_STRING_SIZE);
+	DEBUG_OUTPUT_VAR(PACKET_BUFFER_SIZE);
+	DEBUG_OUTPUT_VAR(MAX_PACKET_SIZE);
+	DEBUG_OUTPUT_VAR(static_cast<int>(SerialPacketType::LAST));
+
+#undef DEBUG_OUTPUT_VAR
+
+	//-------------------------
+	//finalize the startup
+	//-------------------------
+
+	std::cout << "Startup completed successfully" << std::endl;
+
+	//-------------------------
+	//debugging
+	//-------------------------
+
+	//...
 }
 
 void ClientApplication::Proc() {
@@ -65,7 +121,6 @@ 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;
 
@@ -81,10 +136,17 @@ void ClientApplication::Proc() {
 		realTime = Clock::now();
 
 		//simulate game time
+		if (simTime < realTime) {
 			while (simTime < realTime) {
 				//call each user defined function
-			activeScene->RunFrame(double(delta.count()) / std::chrono::duration<int, std::milli>::period::den);
-			simTime += delta;
+				activeScene->RunFrame();
+				//~60 FPS
+				simTime += std::chrono::duration<int, std::milli>(16);
+			}
+		}
+		else {
+			//give the machine a break
+			SDL_Delay(10);
 		}
 
 		//draw the game to the screen
@@ -95,9 +157,11 @@ void ClientApplication::Proc() {
 }
 
 void ClientApplication::Quit() {
-	network.Close();
+	std::cout << "Shutting down" << std::endl;
+	UDPNetworkUtility::GetSingleton().Close();
 	SDLNet_Quit();
 	SDL_Quit();
+	std::cout << "Clean exit" << std::endl;
 }
 
 //-------------------------
@@ -105,27 +169,28 @@ void ClientApplication::Quit() {
 //-------------------------
 
 void ClientApplication::LoadScene(SceneList sceneIndex) {
+	//BUG: #16 Resources are being reloaded between scenes
 	UnloadScene();
 	switch(sceneIndex) {
 		//add scene creation calls here
 		case SceneList::FIRST:
 		case SceneList::SPLASHSCREEN:
-			activeScene = new SplashScreen(&config);
+			activeScene = new SplashScreen();
 		break;
 		case SceneList::MAINMENU:
-			activeScene = new MainMenu(&config);
+			activeScene = new MainMenu();
 		break;
 		case SceneList::OPTIONSMENU:
-			activeScene = new OptionsMenu(&config);
+			activeScene = new OptionsMenu();
 		break;
 		case SceneList::LOBBYMENU:
-			activeScene = new LobbyMenu(&config, &network, &clientIndex, &characterIndex);
+			activeScene = new LobbyMenu(&clientIndex, &accountIndex);
 		break;
-		case SceneList::INWORLD:
-			activeScene = new InWorld(&config, &network, &clientIndex, &characterIndex);
+		case SceneList::WORLD:
+			activeScene = new World(&clientIndex, &accountIndex);
 		break;
-		case SceneList::INCOMBAT:
-			activeScene = new InCombat();
+		case SceneList::DISCONNECTEDSCREEN:
+			activeScene = new DisconnectedScreen();
 		break;
 		default:
 			throw(std::logic_error("Failed to recognize the scene index"));

client/client_application.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -25,19 +25,25 @@
 #include "scene_list.hpp"
 #include "base_scene.hpp"
 
-#include "config_utility.hpp"
 #include "udp_network_utility.hpp"
 
-class ClientApplication {
-public:
-	ClientApplication() = default;
-	~ClientApplication() = default;
+#include "singleton.hpp"
 
-	void Init(int argc, char** argv);
+#include <map>
+
+class ClientApplication: public Singleton<ClientApplication> {
+public:
+	//public methods
+	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();
@@ -45,10 +51,8 @@ private:
 	BaseScene* activeScene = nullptr;
 
 	//shared parameters
-	ConfigUtility config;
-	UDPNetworkUtility network;
 	int clientIndex = -1;
-	int characterIndex = -1;
+	int accountIndex = -1;
 };
 
 #endif

client/client_utilities/makefile

@@ -1,21 +1,18 @@
 #config
-INCLUDES+=. .. ../../common ../../common/graphics ../../common/map ../../common/network ../../common/ui
+INCLUDES+=.
 LIBS+=
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
 CXXSRC=$(wildcard *.cpp)
-CSRC=$(wildcard *.c)
 
 #objects
 OBJDIR=obj
 OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.o))
 
 #output
 OUTDIR=..
-OUT=$(addprefix $(OUTDIR)/,libclient.a)
+OUT=$(addprefix $(OUTDIR)/,client.a)
 
 #targets
 all: $(OBJ) $(OUT)
@@ -34,9 +31,6 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
 clean:
 	$(RM) *.o *.a *.exe
 

client/client_utilities/terminal_error.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,6 +19,5 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "client_data.hpp"
+#include "terminal_error.hpp"
 
-int ClientData::uidCounter = 0;

client/client_utilities/terminal_error.hpp

@@ -0,0 +1,34 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 TERMINALERROR_HPP_
+#define TERMINALERROR_HPP_
+
+#include <stdexcept>
+#include <string>
+
+class terminal_error: public std::runtime_error {
+public:
+	explicit terminal_error(const std::string& str): runtime_error(str) {}
+	explicit terminal_error(const char* cstr): runtime_error(cstr) {}
+};
+
+#endif

client/entities/base_character.cpp

@@ -0,0 +1,83 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 "base_character.hpp"
+
+#include "config_utility.hpp"
+
+//-------------------------
+//graphics
+//-------------------------
+
+void BaseCharacter::CorrectSprite() {
+	//NOTE: These must correspond to the sprite sheet in use
+	if (motion.y > 0) {
+		sprite.SetYIndex(0);
+	}
+	else if (motion.y < 0) {
+		sprite.SetYIndex(1);
+	}
+	else if (motion.x > 0) {
+		sprite.SetYIndex(3);
+	}
+	else if (motion.x < 0) {
+		sprite.SetYIndex(2);
+	}
+
+	//animation
+	if (motion != 0) {
+		sprite.SetDelay(0.1);
+	}
+	else {
+		sprite.SetDelay(0);
+		sprite.SetXIndex(0);
+	}
+}
+
+//-------------------------
+//metadata
+//-------------------------
+
+int BaseCharacter::SetOwner(int i) {
+	return owner = i;
+}
+
+int BaseCharacter::GetOwner() {
+	return owner;
+}
+
+std::string BaseCharacter::SetHandle(std::string s) {
+	return handle = s;
+}
+
+std::string BaseCharacter::GetHandle() const {
+	return handle;
+}
+
+std::string BaseCharacter::SetAvatar(std::string s) {
+	avatar = s;
+	sprite.LoadSurface(ConfigUtility::GetSingleton()["dir.sprites"] + avatar, CHARACTER_CELLS_X, CHARACTER_CELLS_Y);
+	return avatar;
+}
+
+std::string BaseCharacter::GetAvatar() const {
+	return avatar;
+}

client/entities/base_character.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,45 +19,37 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CHARACTERDATA_HPP_
-#define CHARACTERDATA_HPP_
+#ifndef BASECHARACTER_HPP_
+#define BASECHARACTER_HPP_
 
-//POD members
-#include "bbox.hpp"
-#include "vector2.hpp"
+//components
+#include "character_defines.hpp"
+#include "entity.hpp"
 
+//std namespace
 #include <string>
 
-struct CharacterData {
+class BaseCharacter: public Entity {
+public:
+	BaseCharacter() = default;
+	virtual ~BaseCharacter() = default;
+
+	//graphics
+	void CorrectSprite();
+
 	//metadata
-	int clientIndex;
-	std::string username;
+	int SetOwner(int i);
+	int GetOwner();
+	std::string SetHandle(std::string s);
+	std::string GetHandle() const;
+	std::string SetAvatar(std::string s);
+	std::string GetAvatar() const;
+
+protected:
+	//metadata
+	int owner;
 	std::string handle;
 	std::string avatar;
-
-	//world position
-	int mapIndex = 0;
-	Vector2 position = {0.0,0.0};
-	Vector2 motion = {0.0,0.0};
-	BBox bbox = {0,0,0,0};
-
-	//statistics
-	int level = 0;
-	int exp = 0;
-	int maxHP = 0;
-	int health = 0;
-	int maxMP = 0;
-	int mana = 0;
-	int attack = 0;
-	int defence = 0;
-	int intelligence = 0;
-	int resistance = 0;
-	float accuracy = 0.0;
-	float evasion = 0.0;
-	float luck = 0.0;
-
-	//uid
-	static int uidCounter;
 };
 
 #endif

client/entities/base_monster.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,31 +19,28 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef EDITORAPPLICATION_HPP_
-#define EDITORAPPLICATION_HPP_
+#include "base_monster.hpp"
 
-#include "scene_list.hpp"
-#include "base_scene.hpp"
 #include "config_utility.hpp"
 
-class EditorApplication {
-public:
-	EditorApplication() = default;
-	~EditorApplication() = default;
+void BaseMonster::CorrectSprite() {
+	//TODO: (9) BaseMonster::CorrectSprite()
+}
 
-	void Init(int argc, char** argv);
-	void Proc();
-	void Quit();
+std::string BaseMonster::SetHandle(std::string s) {
+	return handle = s;
+}
 
-private:
-	//Private access members
-	void LoadScene(SceneList sceneIndex);
-	void UnloadScene();
+std::string BaseMonster::GetHandle() const {
+	return handle;
+}
 
-	//globals
-	ConfigUtility config;
+std::string BaseMonster::SetAvatar(std::string s) {
+	avatar = s;
+	sprite.LoadSurface(ConfigUtility::GetSingleton()["dir.sprites"] + avatar, 4, 1);
+	return avatar;
+}
 
-	BaseScene* activeScene = nullptr;
-};
-
-#endif
+std::string BaseMonster::GetAvatar() const {
+	return avatar;
+}

client/entities/base_monster.hpp

@@ -0,0 +1,45 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 BASEMONSTER_HPP_
+#define BASEMONSTER_HPP_
+
+#include "entity.hpp"
+
+class BaseMonster: public Entity {
+public:
+	BaseMonster() = default;
+	virtual ~BaseMonster() = default;
+
+	void CorrectSprite();
+
+	std::string SetHandle(std::string s);
+	std::string GetHandle() const;
+	std::string SetAvatar(std::string s);
+	std::string GetAvatar() const;
+
+protected:
+	//metadata
+	std::string handle;
+	std::string avatar;
+};
+
+#endif

client/entities/entity.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,41 +19,45 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "utility.hpp"
+#include "entity.hpp"
 
-#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;
+void Entity::Update() {
+	origin += motion;
+	sprite.Update(0.016);
 }
 
-std::string truncatePath(std::string pathname) {
-	return std::string(
-		std::find_if(
-			pathname.rbegin(),
-			pathname.rend(),
-			[](char ch) -> bool {
-				//windows only
-				return ch == '/' || ch == '\\';
-//				//unix only
-//				return ch == '/';
-			}).base(),
-		pathname.end());
+void Entity::DrawTo(SDL_Surface* const dest, int camX, int camY) {
+	sprite.DrawTo(dest, origin.x - camX, origin.y - camY);
 }
 
-std::string to_string_custom(int i) {
-	char buffer[20];
-	snprintf(buffer, 20, "%d", i);
-	return std::string(buffer);
+SpriteSheet* Entity::GetSprite() {
+	return &sprite;
 }
 
-int to_integer_custom(std::string s) {
-	int ret = 0;
-	sscanf(s.c_str(), "%d", &ret);
-	return ret;
+//-------------------------
+//accessors & mutators
+//-------------------------
+
+Vector2 Entity::SetOrigin(Vector2 v) {
+	return origin = v;
+}
+
+Vector2 Entity::SetMotion(Vector2 v) {
+	return motion = v;
+}
+
+BoundingBox Entity::SetBounds(BoundingBox b) {
+	return bounds = b;
+}
+
+Vector2 Entity::GetOrigin() {
+	return origin;
+}
+
+Vector2 Entity::GetMotion() {
+	return motion;
+}
+
+BoundingBox Entity::GetBounds() {
+	return bounds;
 }

client/entities/entity.hpp

@@ -0,0 +1,56 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 ENTITY_HPP_
+#define ENTITY_HPP_
+
+#include "bounding_box.hpp"
+#include "sprite_sheet.hpp"
+#include "vector2.hpp"
+
+//The base class for all objects in the world
+class Entity {
+public:
+	virtual void Update();
+	virtual void DrawTo(SDL_Surface* const, int camX, int camY);
+
+	SpriteSheet* GetSprite();
+
+	//accessors & mutators
+	Vector2 SetOrigin(Vector2 v);
+	Vector2 SetMotion(Vector2 v);
+	BoundingBox SetBounds(BoundingBox b);
+
+	Vector2 GetOrigin();
+	Vector2 GetMotion();
+	BoundingBox GetBounds();
+
+protected:
+	Entity() = default;
+	virtual ~Entity() = default;
+
+	SpriteSheet sprite;
+	Vector2 origin;
+	Vector2 motion;
+	BoundingBox bounds;
+};
+
+#endif

client/entities/local_character.cpp

@@ -0,0 +1,35 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 "local_character.hpp"
+
+#include <iostream>
+
+bool LocalCharacter::ProcessCollisionGrid(std::list<BoundingBox> boxList) {
+	for(auto& box : boxList) {
+		if (box.CheckOverlap(origin + bounds)) {
+			origin -= motion;
+			motion = {0, 0};
+			return true;
+		}
+	}
+	return false;
+}

client/entities/local_character.hpp

@@ -0,0 +1,42 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 LOCALCHARACTER_HPP_
+#define LOCALCHARACTER_HPP_
+
+#include "base_character.hpp"
+#include "bounding_box.hpp"
+#include "vector2.hpp"
+
+#include <list>
+
+class LocalCharacter: public BaseCharacter {
+public:
+	LocalCharacter() = default;
+	virtual ~LocalCharacter() = default;
+
+	bool ProcessCollisionGrid(std::list<BoundingBox>);
+
+private:
+	//NOTE: NO MEMBERS
+};
+
+#endif

client/entities/makefile

@@ -0,0 +1,37 @@
+#config
+INCLUDES+=. .. ../../common/gameplay ../../common/graphics ../../common/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)/,client.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

client/gameplay_scenes/makefile

@@ -0,0 +1,37 @@
+#config
+INCLUDES+=. .. ../client_utilities ../entities ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/network/packet_types ../../common/ui ../../common/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)/,client.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

client/gameplay_scenes/world.hpp

@@ -0,0 +1,170 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 INWORLD_HPP_
+#define INWORLD_HPP_
+
+//maps
+#include "region_pager_base.hpp"
+
+//utilities
+#include "udp_network_utility.hpp"
+#include "serial_packet.hpp"
+#include "config_utility.hpp"
+
+//graphics
+#include "image.hpp"
+#include "raster_font.hpp"
+#include "button.hpp"
+#include "tile_sheet.hpp"
+
+//common
+#include "frame_rate.hpp"
+
+//client
+#include "base_scene.hpp"
+#include "base_monster.hpp"
+#include "local_character.hpp"
+
+//STL
+#include <map>
+
+#include <chrono>
+
+class World: public BaseScene {
+public:
+	//Public access members
+	World(int* const argClientIndex, int* const argAccountIndex);
+	~World();
+
+protected:
+	//Frame loop
+	void FrameStart();
+	void Update();
+	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&);
+
+	//handle incoming traffic
+	void HandlePacket(SerialPacket* const);
+
+	//heartbeat system
+	void hPing(ServerPacket* const);
+	void hPong(ServerPacket* const);
+
+	void CheckHeartBeat();
+
+	//basic connections
+	void SendLogoutRequest();
+	void SendDisconnectRequest();
+	void SendAdminDisconnectForced();
+	void SendAdminShutdownRequest();
+
+	void hLogoutResponse(ClientPacket* const);
+	void hDisconnectResponse(ClientPacket* const);
+	void hAdminDisconnectForced(ClientPacket* const);
+
+	//map management
+	void SendRegionRequest(int roomIndex, int x, int y);
+	void hRegionContent(RegionPacket* const);
+	void UpdateMap();
+
+	//character management
+	void hCharacterUpdate(CharacterPacket* const);
+	void hCharacterCreate(CharacterPacket* const);
+	void hCharacterDelete(CharacterPacket* const);
+	void hQueryCharacterExists(CharacterPacket* const);
+	void hQueryCharacterStats(CharacterPacket* const);
+	void hQueryCharacterLocation(CharacterPacket* const);
+	void hCharacterMovement(CharacterPacket* const);
+	void hCharacterAttack(CharacterPacket* const);
+	void hCharacterDamage(CharacterPacket* const);
+
+	//monster management
+	void hMonsterCreate(MonsterPacket* const);
+	void hMonsterDelete(MonsterPacket* const);
+	void hQueryMonsterExists(MonsterPacket* const);
+	void hQueryMonsterStats(MonsterPacket* const);
+	void hQueryMonsterLocation(MonsterPacket* const);
+	void hMonsterMovement(MonsterPacket* const);
+	void hMonsterAttack(MonsterPacket* const);
+	void hMonsterDamage(MonsterPacket* const);
+
+	//chat
+	void hTextBroadcast(TextPacket* const);
+	void hTextSpeech(TextPacket* const);
+	void hTextWhisper(TextPacket* const);
+
+	//general gameplay
+	void SendLocalCharacterMovement();
+	std::list<BoundingBox> GenerateCollisionGrid(Entity*, int tileWidth, int tileHeight);
+
+	//indexes
+	int& clientIndex;
+	int& accountIndex;
+	int characterIndex = -1;
+	int roomIndex = -1;
+
+	//graphics
+	Image buttonImage;
+	RasterFont font;
+	TileSheet tileSheet;
+
+	//map
+	RegionPagerBase regionPager;
+
+	//UI
+	Button disconnectButton;
+	Button shutDownButton;
+	FrameRate fps;
+
+	//the camera structure
+	struct {
+		int x = 0, y = 0;
+		int width = 0, height = 0;
+		int marginX = 0, marginY = 0;
+	} camera;
+
+	//entities
+	std::map<int, BaseCharacter> characterMap;
+	std::map<int, BaseMonster> monsterMap;
+	LocalCharacter* localCharacter = nullptr;
+
+	//heartbeat
+	//TODO: (2) Heartbeat needs it's own utility
+	typedef std::chrono::steady_clock Clock;
+	Clock::time_point lastBeat = Clock::now();
+	int attemptedBeats = 0;
+
+	//ugly references; I hate this
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
+};
+
+#endif

client/gameplay_scenes/world_characters.cpp

@@ -0,0 +1,239 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 "world.hpp"
+
+#include "channels.hpp"
+
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
+
+//-------------------------
+//character management
+//-------------------------
+
+//DOCS: preexisting characters will result in query responses
+//DOCS: new characters will result in create messages
+//DOCS: this client's character will exist in both (skipped)
+
+void World::hCharacterUpdate(CharacterPacket* const argPacket) {
+	//TODO: (1) Authentication
+	//NOTE: applies to the local character too
+
+	//check that this character exists
+	std::map<int, BaseCharacter>::iterator characterIt = characterMap.find(argPacket->characterIndex);
+	if (characterIt != characterMap.end()) {
+		//update the origin and motion, if there's a difference
+		if (characterIt->second.GetOrigin() != argPacket->origin) {
+			characterIt->second.SetOrigin(argPacket->origin);
+		}
+		if (characterIt->second.GetMotion() != argPacket->motion) {
+			characterIt->second.SetMotion(argPacket->motion);
+			characterIt->second.CorrectSprite(); //only correct the sprite if the motion changes
+		}
+	}
+}
+
+void World::hCharacterCreate(CharacterPacket* const argPacket) {
+	//prevent double message
+	if (characterMap.find(argPacket->characterIndex) != characterMap.end()) {
+		std::ostringstream msg;
+		msg << "Double character creation event; ";
+		msg << "Index: " << argPacket->characterIndex << "; ";
+		msg << "Handle: " << argPacket->handle;
+		throw(std::runtime_error(msg.str()));
+	}
+
+	//implicity create and retrieve the entity
+	BaseCharacter* character = &characterMap[argPacket->characterIndex];
+
+	//fill the character's info
+	character->SetHandle(argPacket->handle);
+	character->SetAvatar(argPacket->avatar);
+	character->SetOwner(argPacket->accountIndex);
+	character->SetOrigin(argPacket->origin);
+	character->SetMotion(argPacket->motion);
+	character->SetBounds(argPacket->bounds);
+
+	character->CorrectSprite();
+
+	//check for this player's character
+	if (character->GetOwner() == accountIndex) {
+		localCharacter = static_cast<LocalCharacter*>(character);
+
+		//focus the camera on this character's sprite
+		camera.marginX = (camera.width / 2 - localCharacter->GetSprite()->GetImage()->GetClipW() / 2);
+		camera.marginY = (camera.height/ 2 - localCharacter->GetSprite()->GetImage()->GetClipH() / 2);
+
+		//focus on this character's info
+		characterIndex = argPacket->characterIndex;
+		roomIndex = argPacket->roomIndex;
+
+		//query the world state (room)
+		CharacterPacket newPacket;
+		memset(&newPacket, 0, MAX_PACKET_SIZE);
+		newPacket.type = SerialPacketType::QUERY_CHARACTER_EXISTS;
+		newPacket.roomIndex = roomIndex;
+		network.SendTo(Channels::SERVER, &newPacket);
+		newPacket.type = SerialPacketType::QUERY_MONSTER_EXISTS;
+		network.SendTo(Channels::SERVER, &newPacket);
+	}
+
+	//debug
+	std::cout << "Character Create, total: " << characterMap.size() << std::endl;
+}
+
+void World::hCharacterDelete(CharacterPacket* const argPacket) {
+	//ignore if this character doesn't exist
+	std::map<int, BaseCharacter>::iterator characterIt = characterMap.find(argPacket->characterIndex);
+	if (characterIt == characterMap.end()) {
+		return;
+	}
+
+	//check for this player's character
+	if ((*characterIt).second.GetOwner() == accountIndex) {
+		localCharacter = nullptr;
+
+		//clear the camera
+		camera.marginX = 0;
+		camera.marginY = 0;
+
+		//clear the room
+		roomIndex = -1;
+		regionPager.UnloadAll();
+		characterMap.clear();
+		monsterMap.clear();
+	}
+	else {
+		//remove this character
+		characterMap.erase(characterIt);
+	}
+
+	//debug
+	std::cout << "Character Delete, total: " << characterMap.size() << std::endl;
+}
+
+void World::hQueryCharacterExists(CharacterPacket* const argPacket) {
+	//prevent a double message about this player's character
+//	if (argPacket->accountIndex == accountIndex) {
+//		return;
+//	}
+
+	//ignore characters in a different room (sub-optimal)
+	if (argPacket->roomIndex != roomIndex) {
+		return;
+	}
+
+	//implicitly construct the character if it doesn't exist
+	BaseCharacter* character = &characterMap[argPacket->characterIndex];
+
+	//set/update the character's info
+	character->SetOrigin(argPacket->origin);
+	character->SetMotion(argPacket->motion);
+	character->SetBounds({CHARACTER_BOUNDS_X, CHARACTER_BOUNDS_Y, CHARACTER_BOUNDS_WIDTH, CHARACTER_BOUNDS_HEIGHT});
+	character->SetHandle(argPacket->handle);
+	character->SetAvatar(argPacket->avatar);
+	character->SetOwner(argPacket->accountIndex);
+	character->CorrectSprite();
+
+	//debug
+	std::cout << "Character Query, total: " << characterMap.size() << std::endl;
+}
+
+void World::hQueryCharacterStats(CharacterPacket* const argPacket) {
+	//TODO: (9) World::hQueryCharacterStats()
+}
+
+void World::hQueryCharacterLocation(CharacterPacket* const argPacket) {
+	//TODO: (9) World::hQueryCharacterLocation()
+}
+
+void World::hCharacterMovement(CharacterPacket* const argPacket) {
+	//TODO: (1) Authentication
+	if (argPacket->characterIndex == characterIndex) {
+		return;
+	}
+
+	//check that this character exists
+	std::map<int, BaseCharacter>::iterator characterIt = characterMap.find(argPacket->characterIndex);
+	if (characterIt != characterMap.end()) {
+		//set the origin and motion
+		characterIt->second.SetOrigin(argPacket->origin);
+		characterIt->second.SetMotion(argPacket->motion);
+		characterIt->second.CorrectSprite();
+	}
+}
+
+void World::hCharacterAttack(CharacterPacket* const argPacket) {
+	//TODO: (9) World::hCharacterAttack()
+}
+
+void World::hCharacterDamage(CharacterPacket* const argPacket) {
+	//TODO: (9) World::hCharacterDamage()
+}
+
+//-------------------------
+//player movement & collision
+//-------------------------
+
+void World::SendLocalCharacterMovement() {
+	CharacterPacket newPacket;
+	newPacket.type = SerialPacketType::CHARACTER_MOVEMENT;
+
+	newPacket.accountIndex = accountIndex;
+	newPacket.characterIndex = characterIndex;
+	newPacket.roomIndex = roomIndex;
+	newPacket.origin = localCharacter->GetOrigin();
+	newPacket.motion = localCharacter->GetMotion();
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+std::list<BoundingBox> World::GenerateCollisionGrid(Entity* ptr, int tileWidth, int tileHeight) {
+	//prepare for collisions
+	BoundingBox wallBounds = {0, 0, tileWidth, tileHeight};
+	std::list<BoundingBox> boxList;
+
+	//NOTE: for loops were too dense to work with, so I've just used while loops
+
+	//outer loop
+	wallBounds.x = snapToBase((double)wallBounds.w, ptr->GetOrigin().x);
+	while(wallBounds.x < (ptr->GetOrigin() + ptr->GetBounds()).x + ptr->GetBounds().w) {
+		//inner loop
+		wallBounds.y = snapToBase((double)wallBounds.h, ptr->GetOrigin().y);
+		while(wallBounds.y < (ptr->GetOrigin() + ptr->GetBounds()).y + ptr->GetBounds().h) {
+			//check to see if this tile is solid
+			if (regionPager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
+				//push onto the box set
+				boxList.push_front(wallBounds);
+			}
+
+			//increment
+			wallBounds.y += wallBounds.h;
+		}
+
+		//increment
+		wallBounds.x += wallBounds.w;
+	}
+
+	return std::move(boxList);
+}

client/gameplay_scenes/world_chat.cpp

@@ -0,0 +1,39 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 "world.hpp"
+
+//-------------------------
+//chat
+//-------------------------
+
+void World::hTextBroadcast(TextPacket* const argPacket) {
+	//TODO: (9) World::hTextBroadcast()
+}
+
+void World::hTextSpeech(TextPacket* const argPacket) {
+	//TODO: (9) World::hTextSpeech()
+}
+
+void World::hTextWhisper(TextPacket* const argPacket) {
+	//TODO: (9) World::hTextWhisper()
+}
+

client/gameplay_scenes/world_connections.cpp

@@ -0,0 +1,134 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 "world.hpp"
+
+#include "channels.hpp"
+#include "ip_operators.hpp"
+
+#include <chrono>
+#include <sstream>
+#include <stdexcept>
+
+//-------------------------
+//heartbeat system
+//-------------------------
+
+void World::hPing(ServerPacket* const argPacket) {
+	ServerPacket newPacket;
+	newPacket.type = SerialPacketType::PONG;
+	network.SendTo(argPacket->srcAddress, &newPacket);
+}
+
+void World::hPong(ServerPacket* const argPacket) {
+	if (*network.GetIPAddress(Channels::SERVER) != argPacket->srcAddress) {
+		throw(std::runtime_error("Heartbeat message received from an unknown source"));
+	}
+	attemptedBeats = 0;
+	lastBeat = Clock::now();
+}
+
+void World::CheckHeartBeat() {
+	//check the connection (heartbeat)
+	if (Clock::now() - lastBeat > std::chrono::seconds(3)) {
+		if (attemptedBeats > 2) {
+			//escape to the disconnect screen
+			SendDisconnectRequest();
+			SetNextScene(SceneList::DISCONNECTEDSCREEN);
+			ConfigUtility::GetSingleton()["client.disconnectMessage"] = "Error: Lost connection to the server";
+		}
+		else {
+			ServerPacket newPacket;
+			newPacket.type = SerialPacketType::PING;
+			network.SendTo(Channels::SERVER, &newPacket);
+
+			attemptedBeats++;
+			lastBeat = Clock::now();
+		}
+	}
+}
+
+//-------------------------
+//Connection control
+//-------------------------
+
+void World::SendLogoutRequest() {
+	ClientPacket newPacket;
+
+	//send a logout request
+	newPacket.type = SerialPacketType::LOGOUT_REQUEST;
+	newPacket.accountIndex = accountIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void World::SendDisconnectRequest() {
+	ClientPacket newPacket;
+
+	//send a disconnect request
+	newPacket.type = SerialPacketType::DISCONNECT_REQUEST;
+	newPacket.clientIndex = clientIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void World::SendAdminDisconnectForced() {
+	//TODO: (9) World::SendAdminDisconnectForced()
+}
+
+void World::SendAdminShutdownRequest() {
+	ClientPacket newPacket;
+
+	//send a shutdown request
+	newPacket.type = SerialPacketType::ADMIN_SHUTDOWN_REQUEST;
+	newPacket.accountIndex = accountIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void World::hLogoutResponse(ClientPacket* const argPacket) {
+	if (localCharacter) {
+		characterMap.erase(characterIndex);
+		localCharacter = nullptr;
+	}
+
+	accountIndex = -1;
+	characterIndex = -1;
+
+	//reset the camera
+	camera.marginX = camera.marginY = 0;
+
+	//because, why not? I guess...
+	SendDisconnectRequest();
+}
+
+void World::hDisconnectResponse(ClientPacket* const argPacket) {
+	hLogoutResponse(argPacket);//shortcut
+	SetNextScene(SceneList::DISCONNECTEDSCREEN);
+	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have successfully logged out";
+}
+
+void World::hAdminDisconnectForced(ClientPacket* const argPacket) {
+	hDisconnectResponse(argPacket);//shortcut
+	SetNextScene(SceneList::DISCONNECTEDSCREEN);
+	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have been forcibly disconnected by the server";
+}
+

client/gameplay_scenes/world_logic.cpp

@@ -0,0 +1,414 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 "world.hpp"
+
+#include "channels.hpp"
+
+#include "terminal_error.hpp"
+#include <stdexcept>
+#include <algorithm>
+#include <cmath>
+#include <iostream>
+#include <sstream>
+
+//-------------------------
+//Public access members
+//-------------------------
+
+World::World(int* const argClientIndex,	int* const argAccountIndex):
+	clientIndex(*argClientIndex),
+	accountIndex(*argAccountIndex)
+{
+	//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
+	disconnectButton.SetImage(&buttonImage);
+	disconnectButton.SetFont(&font);
+	shutDownButton.SetImage(&buttonImage);
+	shutDownButton.SetFont(&font);
+
+	//set the button positions
+	disconnectButton.SetX(50);
+	disconnectButton.SetY(50 + buttonImage.GetClipH() * 0);
+	shutDownButton.SetX(50);
+	shutDownButton.SetY(50 + buttonImage.GetClipH() * 1);
+
+	//set the button texts
+	disconnectButton.SetText("Disconnect");
+	shutDownButton.SetText("Shut Down");
+
+	//load the tilesheet
+	//TODO: (2) Tile size and tile sheet should be loaded elsewhere
+	tileSheet.Load(config["dir.tilesets"] + "overworld.bmp", 32, 32);
+
+	//Send the character data
+	CharacterPacket newPacket;
+	newPacket.type = SerialPacketType::CHARACTER_LOAD;
+	strncpy(newPacket.handle, config["client.handle"].c_str(), PACKET_STRING_SIZE);
+	strncpy(newPacket.avatar, config["client.avatar"].c_str(), PACKET_STRING_SIZE);
+	newPacket.accountIndex = accountIndex;
+	network.SendTo(Channels::SERVER, &newPacket);
+
+	//set the camera's values
+	camera.width = GetScreen()->w;
+	camera.height = GetScreen()->h;
+
+	//debug
+	//
+}
+
+World::~World() {
+	//unload the local data
+	characterMap.clear();
+	monsterMap.clear();
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void World::FrameStart() {
+	//
+}
+
+void World::Update() {
+	//create and zero the buffer
+	SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]);
+	memset(packetBuffer, 0, MAX_PACKET_SIZE);
+
+	try {
+		//suck in and process all waiting packets
+		while(network.Receive(packetBuffer)) {
+			HandlePacket(packetBuffer);
+		}
+	}
+	catch(terminal_error& e) {
+		throw(e);
+	}
+	catch(std::exception& e) {
+		std::cerr << "HandlePacket Error: " << e.what() << std::endl;
+	}
+
+	//free the buffer
+	delete reinterpret_cast<char*>(packetBuffer);
+
+	//heartbeat system
+	CheckHeartBeat();
+
+	//update all entities
+	for (auto& it : characterMap) {
+		it.second.Update();
+	}
+	for (auto& it : monsterMap) {
+		it.second.Update();
+	}
+
+	//update the map
+	UpdateMap();
+
+	//skip the rest without a local character
+	if (!localCharacter) {
+		return;
+	}
+
+	//get the collidable boxes
+	std::list<BoundingBox> boxList = GenerateCollisionGrid(localCharacter, tileSheet.GetTileW(), tileSheet.GetTileH());
+
+	//process the collisions
+	if (localCharacter->ProcessCollisionGrid(boxList)) {
+		localCharacter->CorrectSprite();
+		SendLocalCharacterMovement();
+	}
+
+	//update the camera
+	camera.x = localCharacter->GetOrigin().x - camera.marginX;
+	camera.y = localCharacter->GetOrigin().y - camera.marginY;
+}
+
+void World::FrameEnd() {
+	//
+}
+
+void World::RenderFrame() {
+//	SDL_FillRect(GetScreen(), 0, 0);
+	Render(GetScreen());
+	SDL_Flip(GetScreen());
+	fps.Calculate();
+}
+
+void World::Render(SDL_Surface* const screen) {
+	//draw the map
+	for (std::list<Region>::iterator it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); it++) {
+		tileSheet.DrawRegionTo(screen, &(*it), camera.x, camera.y);
+	}
+
+	//draw the entities
+	for (auto& it : characterMap) {
+		//BUG: #29 Characters (and other entities) are drawn out of order
+		it.second.DrawTo(screen, camera.x, camera.y);
+	}
+	for (auto& it : monsterMap) {
+		it.second.DrawTo(screen, camera.x, camera.y);
+	}
+
+	//draw UI
+	disconnectButton.DrawTo(screen);
+	shutDownButton.DrawTo(screen);
+	std::ostringstream msg;
+	msg << fps.GetFrameRate();
+	font.DrawStringTo(msg.str(), screen, 0, 0);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void World::QuitEvent() {
+	//two-step logout
+	SendDisconnectRequest();
+	SetNextScene(SceneList::QUIT);
+}
+
+void World::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	disconnectButton.MouseMotion(motion);
+	shutDownButton.MouseMotion(motion);
+}
+
+void World::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	disconnectButton.MouseButtonDown(button);
+	shutDownButton.MouseButtonDown(button);
+}
+
+void World::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	if (disconnectButton.MouseButtonUp(button) == Button::State::HOVER && button.button == SDL_BUTTON_LEFT) {
+		SendLogoutRequest();
+	}
+	if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER && button.button == SDL_BUTTON_LEFT) {
+		SendAdminShutdownRequest();
+	}
+}
+
+void World::KeyDown(SDL_KeyboardEvent const& key) {
+	//hotkeys
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+			//TODO: (3) the escape key should actually control menus and stuff
+			SendLogoutRequest();
+		return;
+	}
+
+	//character movement
+	if (!localCharacter) {
+		return;
+	}
+	Vector2 motion = localCharacter->GetMotion();
+	switch(key.keysym.sym) {
+		case SDLK_w:
+			motion.y -= CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_a:
+			motion.x -= CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_s:
+			motion.y += CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_d:
+			motion.x += CHARACTER_WALKING_SPEED;
+		break;
+		default:
+			//DOCS: prevents wrong keys screwing with character movement
+			return;
+	}
+	//handle diagonals
+	if (motion.x != 0 && motion.y != 0) {
+		motion *= CHARACTER_WALKING_MOD;
+	}
+	//set the info
+	localCharacter->SetMotion(motion);
+	localCharacter->CorrectSprite();
+	SendLocalCharacterMovement();
+}
+
+void World::KeyUp(SDL_KeyboardEvent const& key) {
+	//character movement
+	if (!localCharacter) {
+		return;
+	}
+	Vector2 motion = localCharacter->GetMotion();
+	switch(key.keysym.sym) {
+		case SDLK_w:
+			motion.y = std::min(0.0, motion.y += CHARACTER_WALKING_SPEED);
+		break;
+		case SDLK_a:
+			motion.x = std::min(0.0, motion.x += CHARACTER_WALKING_SPEED);
+		break;
+		case SDLK_s:
+			motion.y = std::max(0.0, motion.y -= CHARACTER_WALKING_SPEED);
+		break;
+		case SDLK_d:
+			motion.x = std::max(0.0, motion.x -= CHARACTER_WALKING_SPEED);
+		break;
+		default:
+			//DOCS: prevents wrong keys screwing with character movement
+			return;
+	}
+	//BUGFIX: reset cardinal direction speed on key release
+	if (motion.x > 0) {
+		motion.x = CHARACTER_WALKING_SPEED;
+	}
+	else if (motion.x < 0) {
+		motion.x = -CHARACTER_WALKING_SPEED;
+	}
+	if (motion.y > 0) {
+		motion.y = CHARACTER_WALKING_SPEED;
+	}
+	else if (motion.y < 0) {
+		motion.y = -CHARACTER_WALKING_SPEED;
+	}
+	//handle diagonals
+	if (motion.x != 0 && motion.y != 0) {
+		motion *= CHARACTER_WALKING_MOD;
+	}
+	//set the info
+	localCharacter->SetMotion(motion);
+	localCharacter->CorrectSprite();
+	SendLocalCharacterMovement();
+}
+
+//-------------------------
+//Direct incoming traffic
+//-------------------------
+
+void World::HandlePacket(SerialPacket* const argPacket) {
+	switch(argPacket->type) {
+		//heartbeat system
+		case SerialPacketType::PING:
+			hPing(static_cast<ServerPacket*>(argPacket));
+		break;
+		case SerialPacketType::PONG:
+			hPong(static_cast<ServerPacket*>(argPacket));
+		break;
+
+		//game server connections
+		case SerialPacketType::LOGOUT_RESPONSE:
+			hLogoutResponse(static_cast<ClientPacket*>(argPacket));
+		break;
+		case SerialPacketType::DISCONNECT_RESPONSE:
+			hDisconnectResponse(static_cast<ClientPacket*>(argPacket));
+		break;
+		case SerialPacketType::ADMIN_DISCONNECT_FORCED:
+			hAdminDisconnectForced(static_cast<ClientPacket*>(argPacket));
+		break;
+
+		//map management
+		case SerialPacketType::REGION_CONTENT:
+			hRegionContent(static_cast<RegionPacket*>(argPacket));
+		break;
+
+		//character management
+		case SerialPacketType::CHARACTER_UPDATE:
+			hCharacterUpdate(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::CHARACTER_CREATE:
+			hCharacterCreate(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::CHARACTER_DELETE:
+			hCharacterDelete(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::QUERY_CHARACTER_EXISTS:
+			hQueryCharacterExists(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::QUERY_CHARACTER_STATS:
+			hQueryCharacterStats(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::QUERY_CHARACTER_LOCATION:
+			hQueryCharacterLocation(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::CHARACTER_MOVEMENT:
+			hCharacterMovement(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::CHARACTER_ATTACK:
+			hCharacterAttack(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::CHARACTER_DAMAGE:
+			hCharacterDamage(static_cast<CharacterPacket*>(argPacket));
+		break;
+
+		//monster management
+		case SerialPacketType::MONSTER_CREATE:
+			hMonsterCreate(static_cast<MonsterPacket*>(argPacket));
+		break;
+		case SerialPacketType::MONSTER_DELETE:
+			hMonsterDelete(static_cast<MonsterPacket*>(argPacket));
+		break;
+		case SerialPacketType::QUERY_MONSTER_EXISTS:
+			hQueryMonsterExists(static_cast<MonsterPacket*>(argPacket));
+		break;
+		case SerialPacketType::QUERY_MONSTER_STATS:
+			hQueryMonsterStats(static_cast<MonsterPacket*>(argPacket));
+		break;
+		case SerialPacketType::QUERY_MONSTER_LOCATION:
+			hQueryMonsterLocation(static_cast<MonsterPacket*>(argPacket));
+		break;
+		case SerialPacketType::MONSTER_MOVEMENT:
+			hMonsterMovement(static_cast<MonsterPacket*>(argPacket));
+		break;
+		case SerialPacketType::MONSTER_ATTACK:
+			hMonsterAttack(static_cast<MonsterPacket*>(argPacket));
+		break;
+		case SerialPacketType::MONSTER_DAMAGE:
+			hMonsterDamage(static_cast<MonsterPacket*>(argPacket));
+		break;
+
+		//chat
+		case SerialPacketType::TEXT_BROADCAST:
+			hTextBroadcast(static_cast<TextPacket*>(argPacket));
+		break;
+		case SerialPacketType::TEXT_SPEECH:
+			hTextSpeech(static_cast<TextPacket*>(argPacket));
+		break;
+		case SerialPacketType::TEXT_WHISPER:
+			hTextWhisper(static_cast<TextPacket*>(argPacket));
+		break;
+
+		//general rejection messages
+		case SerialPacketType::REGION_REJECTION:
+		case SerialPacketType::CHARACTER_REJECTION:
+		case SerialPacketType::QUERY_REJECTION:
+			throw(terminal_error(static_cast<TextPacket*>(argPacket)->text));
+		break;
+		case SerialPacketType::SHUTDOWN_REJECTION:
+			throw(std::runtime_error(static_cast<TextPacket*>(argPacket)->text));
+		break;
+
+		//errors
+		default: {
+			std::ostringstream msg;
+			msg << "Unknown SerialPacketType encountered in World: " << static_cast<int>(argPacket->type);
+			throw(std::runtime_error(msg.str()));
+		}
+		break;
+	}
+}

client/gameplay_scenes/world_map.cpp

@@ -0,0 +1,79 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 "world.hpp"
+
+#include "channels.hpp"
+
+//-------------------------
+//map management
+//-------------------------
+
+void World::SendRegionRequest(int roomIndex, int x, int y) {
+	RegionPacket packet;
+
+	//pack the region's data
+	packet.type = SerialPacketType::REGION_REQUEST;
+	packet.roomIndex = roomIndex;
+	packet.x = x;
+	packet.y = y;
+
+	network.SendTo(Channels::SERVER, &packet);
+}
+
+void World::hRegionContent(RegionPacket* const argPacket) {
+	//replace existing regions
+	regionPager.UnloadIf([&](Region const& region) -> bool {
+		return region.GetX() == argPacket->x && region.GetY() == argPacket->y;
+	});
+	regionPager.PushRegion(argPacket->region);
+
+	//clean up after the serial code
+	delete argPacket->region;
+	argPacket->region = nullptr;
+}
+
+void World::UpdateMap() {
+	if (roomIndex == -1) {
+		return;
+	}
+
+	//these represent the zone of regions that the client needs loaded, including the mandatory buffers (+1/-1)
+	int xStart = snapToBase(REGION_WIDTH, camera.x/tileSheet.GetTileW()) - REGION_WIDTH;
+	int xEnd = snapToBase(REGION_WIDTH, (camera.x+camera.width)/tileSheet.GetTileW()) + REGION_WIDTH;
+
+	int yStart = snapToBase(REGION_HEIGHT, camera.y/tileSheet.GetTileH()) - REGION_HEIGHT;
+	int yEnd = snapToBase(REGION_HEIGHT, (camera.y+camera.height)/tileSheet.GetTileH()) + REGION_HEIGHT;
+
+	//prune distant regions
+	regionPager.GetContainer()->remove_if([&](Region const& region) -> bool {
+		return region.GetX() < xStart || region.GetX() > xEnd || region.GetY() < yStart || region.GetY() > yEnd;
+	});
+
+	//request empty regions within this zone
+	for (int i = xStart; i <= xEnd; i += REGION_WIDTH) {
+		for (int j = yStart; j <= yEnd; j += REGION_HEIGHT) {
+			if (!regionPager.FindRegion(i, j)) {
+				SendRegionRequest(roomIndex, i, j);
+			}
+		}
+	}
+}

client/gameplay_scenes/world_monsters.cpp

@@ -0,0 +1,126 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 "world.hpp"
+
+#include "channels.hpp"
+
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
+
+//-------------------------
+//monster management
+//-------------------------
+
+void World::hMonsterCreate(MonsterPacket* const argPacket) {
+	//check for logic errors
+	if (monsterMap.find(argPacket->monsterIndex) != monsterMap.end()) {
+		std::ostringstream msg;
+		msg << "Double monster creation event; ";
+		msg << "Index: " << argPacket->monsterIndex << "; ";
+		msg << "Handle: " << argPacket->handle;
+		throw(std::runtime_error(msg.str()));
+	}
+
+	//ignore monsters from other rooms
+	if (roomIndex != argPacket->roomIndex) {
+		//temporary error checking
+		std::ostringstream msg;
+		msg << "Monster from the wrong room received: ";
+		msg << "monsterIndex: " << argPacket->monsterIndex << ", roomIndex: " << argPacket->roomIndex;
+		throw(std::runtime_error(msg.str()));
+	}
+
+	//implicitly create the element
+	BaseMonster* monster = &monsterMap[argPacket->monsterIndex];
+
+	//fill the monster's info
+	monster->SetHandle(argPacket->handle);
+	monster->SetAvatar(argPacket->avatar);
+	monster->SetBounds(argPacket->bounds);
+	monster->SetOrigin(argPacket->origin);
+	monster->SetMotion(argPacket->motion);
+
+	//debug
+	std::cout << "Monster Create, total: " << monsterMap.size() << std::endl;
+}
+
+void World::hMonsterDelete(MonsterPacket* const argPacket) {
+	//ignore if this monster doesn't exist
+	std::map<int, BaseMonster>::iterator monsterIt = monsterMap.find(argPacket->monsterIndex);
+	if (monsterIt == monsterMap.end()) {
+		return;
+	}
+
+	//remove this monster
+	monsterMap.erase(monsterIt);
+
+	//debug
+	std::cout << "Monster Delete, total: " << monsterMap.size() << std::endl;
+}
+
+void World::hQueryMonsterExists(MonsterPacket* const argPacket) {
+	//ignore monsters in a different room (sub-optimal)
+	if (argPacket->roomIndex != roomIndex) {
+		return;
+	}
+
+	//implicitly create the element
+	BaseMonster* monster = &monsterMap[argPacket->monsterIndex];
+
+	//fill the monster's info
+	monster->SetHandle(argPacket->handle);
+	monster->SetAvatar(argPacket->avatar);
+	monster->SetBounds(argPacket->bounds);
+	monster->SetOrigin(argPacket->origin);
+	monster->SetMotion(argPacket->motion);
+
+	//debug
+	std::cout << "Monster Query, total: " << monsterMap.size() << std::endl;
+}
+
+void World::hQueryMonsterStats(MonsterPacket* const argPacket) {
+	//TODO: (9) World::hQueryMonsterStats()
+}
+
+void World::hQueryMonsterLocation(MonsterPacket* const argPacket) {
+	//TODO: (9) World::hQueryMonsterLocation()
+}
+
+void World::hMonsterMovement(MonsterPacket* const argPacket) {
+	//ignore if this monster doesn't exist
+	std::map<int, BaseMonster>::iterator monsterIt = monsterMap.find(argPacket->monsterIndex);
+	if (monsterIt == monsterMap.end()) {
+		return;
+	}
+
+	monsterIt->second.SetOrigin(argPacket->origin);
+	monsterIt->second.SetOrigin(argPacket->motion);
+}
+
+void World::hMonsterAttack(MonsterPacket* const argPacket) {
+	//TODO: (9) World::hMonsterAttack()
+}
+
+void World::hMonsterDamage(MonsterPacket* const argPacket) {
+	//TODO: (9) World::hMonsterDamage()
+}

client/main.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,23 +21,38 @@
 */
 #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;
+int main(int argc, char* argv[]) {
 	try {
-		ClientApplication app;
+		//create the singletons
+		ConfigUtility::CreateSingleton();
+		UDPNetworkUtility::CreateSingleton();
+
+		//call the client's routines
+		ClientApplication::CreateSingleton();
+		ClientApplication& app = ClientApplication::GetSingleton();
+
 		app.Init(argc, argv);
 		app.Proc();
 		app.Quit();
+
+		ClientApplication::DeleteSingleton();
+
+		//delete the singletons
+		ConfigUtility::DeleteSingleton();
+		UDPNetworkUtility::DeleteSingleton();
 	}
 	catch(exception& e) {
 		cerr << "Fatal exception thrown: " << e.what() << endl;
 		return 1;
 	}
-	cout << "Clean exit" << endl;
 	return 0;
 }

client/makefile

@@ -1,17 +1,23 @@
-#config
-INCLUDES+=. scenes ../common ../common/graphics ../common/map ../common/network ../common/ui
-LIBS+=libclient.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+#include directories
+INCLUDES+=. client_utilities entities gameplay_scenes menu_scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
+
+#libraries
+#the order of the $(LIBS) is important, at least for MinGW
+LIBS+=client.a ../libcommon.a -lSDL_net
+ifeq ($(OS),Windows_NT)
+	LIBS+=-lwsock32 -liphlpapi -lmingw32
+endif
+LIBS+=-lSDLmain -lSDL
+
+#flags
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
 CXXSRC=$(wildcard *.cpp)
-CSRC=$(wildcard *.c)
 
 #objects
 OBJDIR=obj
 OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.o))
 
 #output
 OUTDIR=../out
@@ -19,7 +25,10 @@ OUT=$(addprefix $(OUTDIR)/,client)
 
 #targets
 all: $(OBJ) $(OUT)
-	$(MAKE) -C scenes
+	$(MAKE) -C client_utilities
+	$(MAKE) -C entities
+	$(MAKE) -C gameplay_scenes
+	$(MAKE) -C menu_scenes
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)
@@ -35,9 +44,6 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
 clean:
 	$(RM) *.o *.a *.exe
 

client/menu_scenes/disconnected_screen.cpp

@@ -0,0 +1,116 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 "disconnected_screen.hpp"
+
+#include "channels.hpp"
+#include "config_utility.hpp"
+#include "udp_network_utility.hpp"
+
+#include <stdexcept>
+
+//-------------------------
+//Public access members
+//-------------------------
+
+DisconnectedScreen::DisconnectedScreen() {
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+
+	//setup the utility objects
+	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
+	image.SetClipH(image.GetClipH()/3);
+	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+
+	//pass the utility objects
+	backButton.SetImage(&image);
+	backButton.SetFont(&font);
+
+	//set the button positions
+	backButton.SetX(50);
+	backButton.SetY(50 + image.GetClipH() * 0);
+
+	//set the button texts
+	backButton.SetText("Back");
+
+	//full reset
+	UDPNetworkUtility::GetSingleton().Unbind(Channels::SERVER);
+
+	//auto return
+	startTick = std::chrono::steady_clock::now();
+}
+
+DisconnectedScreen::~DisconnectedScreen() {
+	//
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void DisconnectedScreen::Update() {
+	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(10)) {
+		SetNextScene(SceneList::MAINMENU);
+	}
+
+	//Eat incoming packets
+	while(UDPNetworkUtility::GetSingleton().Receive());
+}
+
+void DisconnectedScreen::Render(SDL_Surface* const screen) {
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+
+	backButton.DrawTo(screen);
+	font.DrawStringTo(config["client.disconnectMessage"], screen, 50, 30);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void DisconnectedScreen::QuitEvent() {
+	SetNextScene(SceneList::QUIT);
+}
+
+void DisconnectedScreen::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	backButton.MouseMotion(motion);
+}
+
+void DisconnectedScreen::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	backButton.MouseButtonDown(button);
+}
+
+void DisconnectedScreen::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
+		SetNextScene(SceneList::MAINMENU);
+	}
+}
+
+void DisconnectedScreen::KeyDown(SDL_KeyboardEvent const& key) {
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+			SetNextScene(SceneList::MAINMENU);
+		break;
+	}
+}
+
+void DisconnectedScreen::KeyUp(SDL_KeyboardEvent const& key) {
+	//
+}

client/menu_scenes/disconnected_screen.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,35 +19,48 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef TESTIFICATESCENE_HPP_
-#define TESTIFICATESCENE_HPP_
+#ifndef DISCONNECTEDSCREEN_HPP_
+#define DISCONNECTEDSCREEN_HPP_
 
+//graphics
+#include "image.hpp"
+#include "raster_font.hpp"
+#include "button.hpp"
+
+//client
 #include "base_scene.hpp"
 
-#include "config_utility.hpp"
+//std namespace
+#include <chrono>
 
-class TestificateScene : public BaseScene {
+class DisconnectedScreen : public BaseScene {
 public:
 	//Public access members
-	TestificateScene(ConfigUtility* const);
-	~TestificateScene();
+	DisconnectedScreen();
+	~DisconnectedScreen();
 
 protected:
 	//Frame loop
-	void FrameStart();
-	void Update(double delta);
-	void FrameEnd();
+	void Update();
 	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&);
 
-	//globals
-	ConfigUtility& config;
+	//graphics
+	Image image;
+	RasterFont font;
+
+	//UI
+	Button backButton;
+
+	//auto return
+	std::chrono::steady_clock::time_point startTick;
 };
 
 #endif

client/menu_scenes/lobby_menu.cpp

@@ -0,0 +1,296 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 "lobby_menu.hpp"
+
+#include "channels.hpp"
+
+#include <stdexcept>
+#include <sstream>
+
+//-------------------------
+//Public access members
+//-------------------------
+
+LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
+	clientIndex(*argClientIndex),
+	accountIndex(*argAccountIndex)
+{
+	//preemptive reset
+	clientIndex = -1;
+	accountIndex = -1;
+
+	//setup the utility objects
+	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
+	image.SetClipH(image.GetClipH()/3);
+	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+
+	//pass the utility objects
+	search.SetImage(&image);
+	search.SetFont(&font);
+	join.SetImage(&image);
+	join.SetFont(&font);
+	back.SetImage(&image);
+	back.SetFont(&font);
+
+	//set the button positions
+	search.SetX(50);
+	search.SetY(50 + image.GetClipH() * 0);
+	join.SetX(50);
+	join.SetY(50 + image.GetClipH() * 1);
+	back.SetX(50);
+	back.SetY(50 + image.GetClipH() * 2);
+
+	//set the button texts
+	search.SetText("Search");
+	join.SetText("Join");
+	back.SetText("Back");
+
+	//set the server list's position
+	listBox = {300, 50, 200, font.GetCharH()};
+
+	//Eat incoming packets
+	while(network.Receive());
+
+	//Initial broadcast
+	SendBroadcastRequest();
+}
+
+LobbyMenu::~LobbyMenu() {
+	//
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void LobbyMenu::FrameStart() {
+	//
+}
+
+void LobbyMenu::Update() {
+	//suck in and process all waiting packets
+	SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]);
+	while(network.Receive(packetBuffer)) {
+		HandlePacket(packetBuffer);
+	}
+	delete reinterpret_cast<char*>(packetBuffer);
+}
+
+void LobbyMenu::FrameEnd() {
+	//
+}
+
+void LobbyMenu::Render(SDL_Surface* const screen) {
+	//TODO: (2) I need a proper UI system for the entire client and the editor
+
+	//UI
+	search.DrawTo(screen);
+	join.DrawTo(screen);
+	back.DrawTo(screen);
+
+	//TODO: (3) draw headers for the server list
+	//TODO: (3) ping/delay displayed in the server list
+	for (int i = 0; i < serverInfo.size(); i++) {
+		//draw the selected server's highlight
+		if (selection == &serverInfo[i]) {
+			SDL_Rect r = {
+				(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, 49, 150, 5));
+		}
+
+		//draw the server name
+		font.DrawStringTo(serverInfo[i].name, screen, listBox.x, listBox.y + i*listBox.h);
+
+		//draw the player count
+		std::ostringstream msg;
+		msg << serverInfo[i].playerCount;
+		font.DrawStringTo(msg.str(), screen, listBox.x + listBox.w, listBox.y + i*listBox.h);
+
+		//compatible?
+		if (!serverInfo[i].compatible) {
+			font.DrawStringTo("?", screen, listBox.x - font.GetCharW(), listBox.y + i*listBox.h);
+		}
+	}
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void LobbyMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	search.MouseMotion(motion);
+	join.MouseMotion(motion);
+	back.MouseMotion(motion);
+}
+
+void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	search.MouseButtonDown(button);
+	join.MouseButtonDown(button);
+	back.MouseButtonDown(button);
+}
+
+void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	if (search.MouseButtonUp(button) == Button::State::HOVER) {
+		SendBroadcastRequest();
+	}
+	else if (join.MouseButtonUp(button) == Button::State::HOVER && selection != nullptr && selection->compatible) {
+		SendJoinRequest();
+	}
+	else if (back.MouseButtonUp(button) == Button::State::HOVER) {
+		SetNextScene(SceneList::MAINMENU);
+	}
+
+	//has the user selected a server on the list?
+	BoundingBox tmpBox = listBox;
+	tmpBox.h *= serverInfo.size();
+	if (tmpBox.CheckOverlap({button.x, button.y})) {
+		selection = &serverInfo[(button.y - listBox.y)/listBox.h];
+	}
+	else {
+		selection = nullptr;
+	}
+}
+
+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) {
+	//
+}
+
+//-------------------------
+//Network handlers
+//-------------------------
+
+void LobbyMenu::HandlePacket(SerialPacket* const argPacket) {
+		switch(argPacket->type) {
+			//responses
+		case SerialPacketType::BROADCAST_RESPONSE:
+			HandleBroadcastResponse(static_cast<ServerPacket*>(argPacket));
+		break;
+		case SerialPacketType::JOIN_RESPONSE:
+			HandleJoinResponse(static_cast<ClientPacket*>(argPacket));
+		break;
+		case SerialPacketType::LOGIN_RESPONSE:
+			HandleLoginResponse(static_cast<ClientPacket*>(argPacket));
+		break;
+
+		//rejections
+		case SerialPacketType::JOIN_REJECTION:
+			HandleJoinRejection(static_cast<TextPacket*>(argPacket));
+		break;
+		case SerialPacketType::LOGIN_REJECTION:
+			HandleLoginRejection(static_cast<TextPacket*>(argPacket));
+		break;
+
+		//handle errors
+		default: {
+			std::ostringstream msg;
+			msg << "Unknown SerialPacketType encountered in LobbyMenu: " << static_cast<int>(argPacket->type);
+			throw(std::runtime_error( msg.str() ));
+		}
+		break;
+	}
+}
+
+void LobbyMenu::HandleBroadcastResponse(ServerPacket* const argPacket) {
+	//extract the data
+	ServerInformation server;
+	server.address = argPacket->srcAddress;
+	server.name = argPacket->name;
+	server.playerCount = argPacket->playerCount;
+	server.version = argPacket->version;
+
+	//Checking compatibility
+	server.compatible = server.version == NETWORK_VERSION;
+
+	//push
+	serverInfo.push_back(server);
+}
+
+void LobbyMenu::HandleJoinResponse(ClientPacket* const argPacket) {
+	//save the server's data
+	clientIndex = argPacket->clientIndex;
+	network.Bind(argPacket->srcAddress, Channels::SERVER);
+
+	//request login data
+	SendLoginRequest();
+}
+
+void LobbyMenu::HandleLoginResponse(ClientPacket* const argPacket) {
+	if (argPacket->clientIndex != clientIndex) {
+		throw(std::runtime_error("Client index invalid during login"));
+	}
+	accountIndex = argPacket->accountIndex;
+	SetNextScene(SceneList::WORLD);
+}
+
+void LobbyMenu::HandleJoinRejection(TextPacket* const argPacket) {
+	//TODO: (9) LobbyMenu::HandleJoinRejection()
+}
+
+void LobbyMenu::HandleLoginRejection(TextPacket* const argPacket) {
+	//TODO: (9) LobbyMenu::HandleLoginRejection
+}
+
+//-------------------------
+//server control
+//-------------------------
+
+void LobbyMenu::SendBroadcastRequest() {
+	//broadcast to the network, or a specific server
+		ClientPacket 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;
+}
+
+void LobbyMenu::SendJoinRequest() {
+	//pack the packet
+		ClientPacket packet;
+		packet.type = SerialPacketType::JOIN_REQUEST;
+
+		//join the selected server
+		network.SendTo(selection->address, &packet);
+		selection = nullptr;
+}
+
+void LobbyMenu::SendLoginRequest() {
+	//NOTE: high cohesion
+	ClientPacket packet;
+	packet.type = SerialPacketType::LOGIN_REQUEST;
+	packet.clientIndex = clientIndex;
+	strncpy(packet.username, config["client.username"].c_str(), PACKET_STRING_SIZE);
+
+	network.SendTo(Channels::SERVER, &packet);
+}

client/menu_scenes/lobby_menu.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -22,16 +22,16 @@
 #ifndef LOBBYMENU_HPP_
 #define LOBBYMENU_HPP_
 
-//graphics & utilities
+//graphics & ui
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
-#include "config_utility.hpp"
+#include "bounding_box.hpp"
 
-//network
+//utilities
+#include "config_utility.hpp"
 #include "udp_network_utility.hpp"
 #include "serial_packet.hpp"
-#include "serial.hpp"
 
 //client
 #include "base_scene.hpp"
@@ -42,13 +42,13 @@
 class LobbyMenu : public BaseScene {
 public:
 	//Public access members
-	LobbyMenu(ConfigUtility* const, UDPNetworkUtility* const, int* const, int* const);
+	LobbyMenu(int* const argClientIndex, int* const argAccountIndex);
 	~LobbyMenu();
 
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update(double delta);
+	void Update();
 	void FrameEnd();
 	void Render(SDL_Surface* const);
 
@@ -59,13 +59,24 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	void HandlePacket(SerialPacket);
+	//Network handlers
+	void HandlePacket(SerialPacket* const);
+	void HandleBroadcastResponse(ServerPacket* const);
+	void HandleJoinResponse(ClientPacket* const);
+	void HandleLoginResponse(ClientPacket* const);
+	void HandleJoinRejection(TextPacket* const);
+	void HandleLoginRejection(TextPacket* const);
+
+	//server control
+	void SendBroadcastRequest();
+	void SendJoinRequest();
+	void SendLoginRequest();
 
 	//shared parameters
-	ConfigUtility& config;
-	UDPNetworkUtility& network;
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
 	int& clientIndex;
-	int& characterIndex;
+	int& accountIndex;
 
 	//members
 	Image image;
@@ -77,17 +88,17 @@ protected:
 	//server list
 	struct ServerInformation {
 		IPaddress address;
-		int networkVersion;
 		std::string name;
 		int playerCount;
+		int version;
 		bool compatible;
 	};
 
 	std::vector<ServerInformation> serverInfo;
 
-	//a terrible hack, forgive me
+	//NOTE: a terrible hack
 	//I'd love a proper gui system for this
-	SDL_Rect listBox;
+	BoundingBox listBox;
 	ServerInformation* selection = nullptr;
 };
 

client/menu_scenes/main_menu.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,13 +21,15 @@
 */
 #include "main_menu.hpp"
 
+#include "config_utility.hpp"
+
 //-------------------------
 //Public access members
 //-------------------------
 
-MainMenu::MainMenu(ConfigUtility* const argConfig):
-	config(*argConfig)
-{
+MainMenu::MainMenu() {
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+
 	//setup the utility objects
 	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
@@ -53,6 +55,9 @@ MainMenu::MainMenu(ConfigUtility* const argConfig):
 	startButton.SetText("Start");
 	optionsButton.SetText("Options");
 	quitButton.SetText("Quit");
+
+	//debug
+	//
 }
 
 MainMenu::~MainMenu() {
@@ -67,7 +72,7 @@ void MainMenu::FrameStart() {
 	//
 }
 
-void MainMenu::Update(double delta) {
+void MainMenu::Update() {
 	//
 }
 
@@ -79,6 +84,11 @@ void MainMenu::Render(SDL_Surface* const screen) {
 	startButton.DrawTo(screen);
 	optionsButton.DrawTo(screen);
 	quitButton.DrawTo(screen);
+
+	//text
+	font.DrawStringTo("Thanks for playing!", screen, 50, screen->h - 50 - image.GetClipH() * 2);
+	font.DrawStringTo("You can get the latest version at: ", screen, 50, screen->h - 50 - image.GetClipH() * 1);
+	font.DrawStringTo("krgamestudios.com", screen, 50, screen->h - 50 - image.GetClipH() * 0);
 }
 
 //-------------------------
@@ -98,6 +108,7 @@ void MainMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 }
 
 void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	//TODO: (2) Buttons should only register as "selected" when the left button is used
 	if (startButton.MouseButtonUp(button) == Button::State::HOVER) {
 		SetNextScene(SceneList::LOBBYMENU);
 	}
@@ -110,13 +121,13 @@ void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 }
 
 void MainMenu::KeyDown(SDL_KeyboardEvent const& key) {
+	//
+}
+
+void MainMenu::KeyUp(SDL_KeyboardEvent const& key) {
 	switch(key.keysym.sym) {
 		case SDLK_ESCAPE:
 			QuitEvent();
 		break;
 	}
 }
-
-void MainMenu::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}

client/menu_scenes/main_menu.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -24,7 +24,6 @@
 
 #include "base_scene.hpp"
 
-#include "config_utility.hpp"
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
@@ -32,13 +31,13 @@
 class MainMenu : public BaseScene {
 public:
 	//Public access members
-	MainMenu(ConfigUtility* const);
+	MainMenu();
 	~MainMenu();
 
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update(double delta);
+	void Update();
 	void FrameEnd();
 	void Render(SDL_Surface* const);
 
@@ -49,9 +48,6 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//shared parameters
-	ConfigUtility& config;
-
 	//members
 	Image image;
 	RasterFont font;

client/menu_scenes/makefile

@@ -0,0 +1,37 @@
+#config
+INCLUDES+=. .. ../../common/graphics ../../common/map ../../common/network ../../common/network/packet_types ../../common/ui ../../common/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)/,client.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

client/menu_scenes/options_menu.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,13 +21,15 @@
 */
 #include "options_menu.hpp"
 
+#include "config_utility.hpp"
+
 //-------------------------
 //Public access members
 //-------------------------
 
-OptionsMenu::OptionsMenu(ConfigUtility* const argConfig):
-	config(*argConfig)
-{
+OptionsMenu::OptionsMenu() {
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+
 	//setup the utility objects
 	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
@@ -57,7 +59,7 @@ void OptionsMenu::FrameStart() {
 	//
 }
 
-void OptionsMenu::Update(double delta) {
+void OptionsMenu::Update() {
 	//
 }
 

client/menu_scenes/options_menu.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -24,21 +24,21 @@
 
 #include "base_scene.hpp"
 
-#include "config_utility.hpp"
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
 
+//NOTE: The options screen needs to be USED
 class OptionsMenu : public BaseScene {
 public:
 	//Public access members
-	OptionsMenu(ConfigUtility* const);
+	OptionsMenu();
 	~OptionsMenu();
 
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update(double delta);
+	void Update();
 	void FrameEnd();
 	void Render(SDL_Surface* const);
 
@@ -49,9 +49,6 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//shared parameters
-	ConfigUtility& config;
-
 	//members
 	Image image;
 	RasterFont font;

client/menu_scenes/splash_screen.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,14 +21,14 @@
 */
 #include "splash_screen.hpp"
 
+#include "config_utility.hpp"
+
 //-------------------------
 //Public access members
 //-------------------------
 
-SplashScreen::SplashScreen(ConfigUtility* const argConfig):
-	config(*argConfig)
-{
-	logo.LoadSurface(config["dir.logos"] + "krstudios.bmp");
+SplashScreen::SplashScreen() {
+	logo.LoadSurface(ConfigUtility::GetSingleton()["dir.logos"] + "krstudios.bmp");
 	startTick = std::chrono::steady_clock::now();
 }
 
@@ -40,7 +40,7 @@ SplashScreen::~SplashScreen() {
 //Frame loop
 //-------------------------
 
-void SplashScreen::Update(double delta) {
+void SplashScreen::Update() {
 	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(1)) {
 		SetNextScene(SceneList::MAINMENU);
 	}

client/menu_scenes/splash_screen.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -24,7 +24,6 @@
 
 #include "base_scene.hpp"
 
-#include "config_utility.hpp"
 #include "image.hpp"
 
 #include <chrono>
@@ -32,17 +31,14 @@
 class SplashScreen : public BaseScene {
 public:
 	//Public access members
-	SplashScreen(ConfigUtility* const);
+	SplashScreen();
 	~SplashScreen();
 
 protected:
 	//Frame loop
-	void Update(double delta);
+	void Update();
 	void Render(SDL_Surface* const);
 
-	//shared parameters
-	ConfigUtility& config;
-
 	//members
 	std::chrono::steady_clock::time_point startTick;
 	Image logo;

client/player_character.cpp

@@ -1,117 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * 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 "player_character.hpp"
-
-#define WALKING_SPEED 140
-
-void PlayerCharacter::Update(double delta) {
-	if (diagonal) {
-		constexpr double d = 1.0/sqrt(2);
-		position += motion * delta * d;
-	}
-	else {
-		position += motion * delta;
-	}
-	sprite.Update(delta);
-}
-
-void PlayerCharacter::AdjustDirection(Direction direction) {
-	//shift the movement in this direction
-	switch(direction) {
-		case Direction::NORTH:
-			if (motion.y >= 0) {
-				motion.y -= WALKING_SPEED;
-			}
-		break;
-		case Direction::SOUTH:
-			if (motion.y <= 0) {
-				motion.y += WALKING_SPEED;
-			}
-		break;
-		case Direction::WEST:
-			if (motion.x >= 0) {
-				motion.x -= WALKING_SPEED;
-			}
-		break;
-		case Direction::EAST:
-			if (motion.x <= 0) {
-				motion.x += WALKING_SPEED;
-			}
-		break;
-	}
-	//face the correct direction
-	ResetDirection();
-}
-
-void PlayerCharacter::FaceDirection(Direction direction) {
-	//this function depends on the format of the sprite sheets
-	switch(direction) {
-		case Direction::NORTH:
-			sprite.SetYIndex(1);
-		break;
-		case Direction::SOUTH:
-			sprite.SetYIndex(0);
-		break;
-		case Direction::WEST:
-			sprite.SetYIndex(2);
-		break;
-		case Direction::EAST:
-			sprite.SetYIndex(3);
-		break;
-	}
-}
-
-void PlayerCharacter::ResetDirection() {
-	//base the direction on the character's movement
-	if (motion.y > 0) {
-		FaceDirection(Direction::SOUTH);
-	}
-	else if (motion.y < 0) {
-		FaceDirection(Direction::NORTH);
-	}
-	else if (motion.x > 0) {
-		FaceDirection(Direction::EAST);
-	}
-	else if (motion.x < 0) {
-		FaceDirection(Direction::WEST);
-	}
-	ResetSpeed();
-}
-
-void PlayerCharacter::ResetSpeed() {
-	//diagonal
-	if (motion.x != 0 && motion.y != 0) {
-		sprite.SetDelay(0.1);
-		diagonal = true;
-	}
-	//cardinal
-	else if (motion != 0) {
-		sprite.SetDelay(0.1);
-		diagonal = false;
-	}
-	//not moving
-	else {
-		sprite.SetDelay(0);
-		sprite.SetXIndex(0);
-		diagonal = false;
-	}
-}

client/player_character.hpp

@@ -1,67 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * 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 PLAYERCHARACTER_HPP_
-#define PLAYERCHARACTER_HPP_
-
-#include "vector2.hpp"
-#include "sprite_sheet.hpp"
-
-//TODO: correct the PlayerCharacter class and it's movement system
-class PlayerCharacter {
-public:
-	enum class Direction {
-		NORTH, SOUTH, EAST, WEST
-	};
-
-	PlayerCharacter() = default;
-	~PlayerCharacter() = default;
-
-	void Update(double delta);
-
-	void DrawTo(SDL_Surface* const dest, int camX, int camY) { sprite.DrawTo(dest, position.x - camX, position.y - camY); }
-
-	//clunky code results in smooth movement and controls
-	void AdjustDirection(Direction);
-	void FaceDirection(Direction);
-	void ResetDirection();
-	void ResetSpeed();
-
-	//accessors and mutators
-	Vector2 SetPosition(Vector2 v) { return position = v; }
-	Vector2 ShiftPosition(Vector2 v) { return position += v; }
-	Vector2 GetPosition() { return position; }
-
-	Vector2 SetMotion(Vector2 v) { return motion = v; }
-	Vector2 ShiftMotion(Vector2 v) { return motion += v; }
-	Vector2 GetMotion() { return motion; }
-
-	SpriteSheet* GetSprite() { return &sprite; }
-private:
-	Vector2 position;
-	Vector2 motion;
-	SpriteSheet sprite;
-
-	//for moving diagonally
-	bool diagonal = false;
-};
-
-#endif

client/scene_list.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -33,8 +33,8 @@ enum class SceneList {
 	MAINMENU,
 	OPTIONSMENU,
 	LOBBYMENU,
-	INWORLD,
-	INCOMBAT,
+	WORLD,
+	DISCONNECTEDSCREEN,
 };
 
 #endif

client/scenes/base_scene.cpp

@@ -1,139 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * 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 "base_scene.hpp"
-
-#include <stdexcept>
-
-//-------------------------
-//Static declarations
-//-------------------------
-
-SDL_Surface* BaseScene::screen = nullptr;
-
-//-------------------------
-//Public access members
-//-------------------------
-
-BaseScene::BaseScene() {
-	//
-}
-
-BaseScene::~BaseScene() {
-	//
-}
-
-//-------------------------
-//Program control
-//-------------------------
-
-SDL_Surface* BaseScene::SetScreen(int w, int h, int bpp, Uint32 flags) {
-	if (!bpp) {
-		bpp = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
-	}
-
-	screen = SDL_SetVideoMode(w, h, bpp, flags);
-
-	if (!screen) {
-		throw(std::runtime_error("Failed to create the screen surface"));
-	}
-
-	return screen;
-}
-
-SDL_Surface* BaseScene::GetScreen() {
-	return screen;
-}
-
-SceneList BaseScene::SetNextScene(SceneList sceneIndex) {
-	return nextScene = sceneIndex;
-}
-
-SceneList BaseScene::GetNextScene() const {
-	return nextScene;
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void BaseScene::RunFrame(double delta) {
-	FrameStart();
-	HandleEvents();
-	Update(delta);
-	FrameEnd();
-}
-
-void BaseScene::RenderFrame() {
-	SDL_FillRect(screen, 0, 0);
-	Render(screen);
-	SDL_Flip(screen);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void BaseScene::HandleEvents() {
-	SDL_Event event;
-
-	while(SDL_PollEvent(&event)) {
-		switch(event.type) {
-			case SDL_QUIT:
-				QuitEvent();
-			break;
-
-			case SDL_VIDEORESIZE:
-				SetScreen(event.resize.w, event.resize.h, 0, screen->flags);
-			break;
-
-			case SDL_MOUSEMOTION:
-				MouseMotion(event.motion);
-			break;
-
-			case SDL_MOUSEBUTTONDOWN:
-				MouseButtonDown(event.button);
-			break;
-
-			case SDL_MOUSEBUTTONUP:
-				MouseButtonUp(event.button);
-			break;
-
-			case SDL_KEYDOWN:
-				KeyDown(event.key);
-			break;
-
-			case SDL_KEYUP:
-				KeyUp(event.key);
-			break;
-
-#ifdef USE_EVENT_JOYSTICK
-			//TODO: joystick/gamepad support
-#endif
-
-#ifdef USE_EVENT_UNKNOWN
-			default:
-				UnknownEvent(event);
-			break;
-#endif
-		}//switch
-	}//while
-}

client/scenes/base_scene.hpp

@@ -1,74 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * 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 BASESCENE_HPP_
-#define BASESCENE_HPP_
-
-#include "scene_list.hpp"
-
-#include "SDL/SDL.h"
-
-class BaseScene {
-public:
-	//Public access members
-	BaseScene();
-	virtual ~BaseScene();
-
-	//Program control
-	static SDL_Surface* SetScreen(int w, int h, int bpp = 0, Uint32 flags = SDL_HWSURFACE|SDL_DOUBLEBUF);
-	static SDL_Surface* GetScreen();
-
-	SceneList SetNextScene(SceneList sceneIndex);
-	SceneList GetNextScene() const;
-
-	//Frame loop
-	virtual void RunFrame(double delta);
-	virtual void RenderFrame();
-
-protected:
-	virtual void FrameStart() {}
-	virtual void HandleEvents();
-	virtual void Update(double delta) {}
-	virtual void FrameEnd() {}
-	virtual void Render(SDL_Surface* const screen) {}
-
-	//Event handlers
-	virtual void QuitEvent() { SetNextScene(SceneList::QUIT); }
-	virtual void MouseMotion(SDL_MouseMotionEvent const&) {}
-	virtual void MouseButtonDown(SDL_MouseButtonEvent const&) {}
-	virtual void MouseButtonUp(SDL_MouseButtonEvent const&) {}
-	virtual void KeyDown(SDL_KeyboardEvent const&) {}
-	virtual void KeyUp(SDL_KeyboardEvent const&) {}
-
-#ifdef USE_EVENT_JOYSTICK
-	//TODO: joystick/gamepad support
-#endif
-
-#ifdef USE_EVENT_UNKNOWN
-	virtual void UnknownEvent(SDL_Event const&) {}
-#endif
-
-private:
-	static SDL_Surface* screen;
-	SceneList nextScene = SceneList::CONTINUE;
-};
-
-#endif

client/scenes/in_combat.cpp

@@ -1,82 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * 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"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-InCombat::InCombat() {
-	//
-}
-
-InCombat::~InCombat() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void InCombat::FrameStart() {
-	//
-}
-
-void InCombat::Update(double delta) {
-	//
-}
-
-void InCombat::FrameEnd() {
-	//
-}
-
-void InCombat::Render(SDL_Surface* const screen) {
-	//
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-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) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			QuitEvent();
-			break;
-	}
-}
-
-void InCombat::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}

client/scenes/in_world.cpp

@@ -1,431 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * 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_world.hpp"
-
-#include "channels.hpp"
-
-#include <algorithm>
-#include <cmath>
-#include <stdexcept>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-InWorld::InWorld(ConfigUtility* const argConfig, UDPNetworkUtility* const argNetwork, int* const argClientIndex, int* const argCharacterIndex):
-	config(*argConfig),
-	network(*argNetwork),
-	clientIndex(*argClientIndex),
-	characterIndex(*argCharacterIndex)
-{
-	//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
-	disconnectButton.SetImage(&buttonImage);
-	disconnectButton.SetFont(&font);
-	shutDownButton.SetImage(&buttonImage);
-	shutDownButton.SetFont(&font);
-
-	//set the button positions
-	disconnectButton.SetX(50);
-	disconnectButton.SetY(50 + buttonImage.GetClipH() * 0);
-	shutDownButton.SetX(50);
-	shutDownButton.SetY(50 + buttonImage.GetClipH() * 1);
-
-	//set the button texts
-	disconnectButton.SetText("Disconnect");
-	shutDownButton.SetText("Shut Down");
-
-	//load the tilesheet
-	//TODO: add the tilesheet to the map system?
-	tileSheet.Load(config["dir.tilesets"] + "terrain.bmp", 12, 15);
-
-	//request a sync
-	SerialPacket packet;
-	char buffer[PACKET_STRING_SIZE];
-	packet.meta.type = SerialPacket::Type::SYNCHRONIZE;
-	packet.clientInfo.clientIndex = clientIndex;
-	packet.clientInfo.characterIndex = characterIndex;
-	serialize(&packet, buffer);
-	network.Send(Channels::SERVER, buffer, PACKET_BUFFER_SIZE);
-
-	//debug
-//	RequestRegion(0, 0);
-}
-
-InWorld::~InWorld() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void InWorld::FrameStart() {
-	//
-}
-
-void InWorld::Update(double delta) {
-	SerialPacket packet;
-
-	//suck in all waiting packets
-	while(network.Receive()) {
-		deserialize(&packet, network.GetInData());
-		packet.meta.srcAddress = network.GetInPacket()->address;
-		HandlePacket(packet);
-	}
-
-	//update the characters
-	for (auto& it : playerCharacters) {
-		it.second.Update(delta);
-	}
-	//TODO: sort the players and entities by Y position
-
-	//update the camera
-	if(localCharacter) {
-		camera.x = localCharacter->GetPosition().x - camera.marginX;
-		camera.y = localCharacter->GetPosition().y - camera.marginY;
-	}
-
-	//check the map
-	UpdateMap();
-}
-
-void InWorld::FrameEnd() {
-	//
-}
-
-void InWorld::RenderFrame() {
-//	SDL_FillRect(GetScreen(), 0, 0);
-	Render(GetScreen());
-	SDL_Flip(GetScreen());
-	fps.Calculate();
-}
-
-void InWorld::Render(SDL_Surface* const screen) {
-	//draw the map
-	for (auto it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); it++) {
-		tileSheet.DrawRegionTo(screen, *it, camera.x, camera.y);
-	}
-
-	//draw characters
-	for (auto& it : playerCharacters) {
-		it.second.DrawTo(screen, camera.x, camera.y);
-	}
-
-	//draw UI
-	disconnectButton.DrawTo(screen);
-	shutDownButton.DrawTo(screen);
-	font.DrawStringTo(to_string_custom(fps.GetFrameRate()), screen, 0, 0);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void InWorld::QuitEvent() {
-	//exit the game AND the server
-	RequestDisconnect();
-}
-
-void InWorld::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	disconnectButton.MouseMotion(motion);
-	shutDownButton.MouseMotion(motion);
-}
-
-void InWorld::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	disconnectButton.MouseButtonDown(button);
-	shutDownButton.MouseButtonDown(button);
-}
-
-void InWorld::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (disconnectButton.MouseButtonUp(button) == Button::State::HOVER) {
-		RequestDisconnect();
-	}
-	if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER) {
-		RequestShutDown();
-	}
-}
-
-void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE: {
-			QuitEvent();
-		}
-		break;
-
-		//player movement
-		case SDLK_LEFT:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::WEST);
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_RIGHT:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::EAST);
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_UP:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::NORTH);
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_DOWN:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::SOUTH);
-				SendPlayerUpdate();
-			}
-		break;
-	}
-}
-
-void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		//player movement
-		case SDLK_LEFT:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::EAST);
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_RIGHT:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::WEST);
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_UP:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::SOUTH);
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_DOWN:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::NORTH);
-				SendPlayerUpdate();
-			}
-		break;
-	}
-}
-
-//-------------------------
-//Network handlers
-//-------------------------
-
-void InWorld::HandlePacket(SerialPacket packet) {
-	switch(packet.meta.type) {
-		case SerialPacket::Type::DISCONNECT:
-			HandleDisconnect(packet);
-		break;
-		case SerialPacket::Type::REGION_CONTENT:
-			HandleRegionContent(packet);
-		break;
-		case SerialPacket::Type::CHARACTER_UPDATE:
-			HandleCharacterUpdate(packet);
-		break;
-		case SerialPacket::Type::CHARACTER_NEW:
-			HandleCharacterNew(packet);
-		break;
-		case SerialPacket::Type::CHARACTER_DELETE:
-			HandleCharacterDelete(packet);
-		break;
-		//handle errors
-		default:
-			throw(std::runtime_error("Unknown SerialPacket::Type encountered"));
-		break;
-	}
-}
-
-void InWorld::HandleDisconnect(SerialPacket packet) {
-	network.Unbind(Channels::SERVER);
-	clientIndex = -1;
-	characterIndex = -1;
-	SetNextScene(SceneList::MAINMENU);
-}
-
-void InWorld::HandleRegionContent(SerialPacket packet) {
-	//replace existing regions
-	//TODO: account for map index
-	if (regionPager.FindRegion(packet.regionInfo.x, packet.regionInfo.y)) {
-		regionPager.UnloadRegion(packet.regionInfo.x, packet.regionInfo.y);
-	}
-	regionPager.PushRegion(packet.regionInfo.region);
-	packet.regionInfo.region = nullptr;
-}
-
-void InWorld::HandleCharacterUpdate(SerialPacket packet) {
-	if (playerCharacters.find(packet.characterInfo.characterIndex) == playerCharacters.end()) {
-		HandleCharacterNew(packet);
-		return;
-	}
-
-	//update only if the message didn't originate from here
-	if (packet.characterInfo.clientIndex != clientIndex) {
-		playerCharacters[packet.characterInfo.characterIndex].SetPosition(packet.characterInfo.position);
-		playerCharacters[packet.characterInfo.characterIndex].SetMotion(packet.characterInfo.motion);
-	}
-	playerCharacters[packet.characterInfo.characterIndex].ResetDirection();
-}
-
-void InWorld::HandleCharacterNew(SerialPacket packet) {
-	if (playerCharacters.find(packet.characterInfo.characterIndex) != playerCharacters.end()) {
-		throw(std::runtime_error("Cannot create duplicate characters"));
-	}
-
-	//TODO: set the player's handle
-	playerCharacters[packet.characterInfo.characterIndex].GetSprite()->LoadSurface(config["dir.sprites"] + packet.characterInfo.avatar, 4, 4);
-	playerCharacters[packet.characterInfo.characterIndex].SetPosition(packet.characterInfo.position);
-	playerCharacters[packet.characterInfo.characterIndex].SetMotion(packet.characterInfo.motion);
-	playerCharacters[packet.characterInfo.characterIndex].ResetDirection();
-
-	//catch this client's player object
-	if (packet.characterInfo.characterIndex == characterIndex && !localCharacter) {
-		localCharacter = &playerCharacters[characterIndex];
-
-		//setup the camera
-		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.marginY = (GetScreen()->h / 2 - localCharacter->GetSprite()->GetImage()->GetClipH() / 2);
-	}
-}
-
-void InWorld::HandleCharacterDelete(SerialPacket packet) {
-	if (playerCharacters.find(packet.characterInfo.characterIndex) == playerCharacters.end()) {
-		throw(std::runtime_error("Cannot delete non-existant characters"));
-	}
-
-	playerCharacters.erase(packet.characterInfo.characterIndex);
-
-	//catch this client's player object
-	if (packet.characterInfo.characterIndex == characterIndex) {
-		characterIndex = -1;
-		localCharacter = nullptr;
-	}
-}
-
-//-------------------------
-//Server control
-//-------------------------
-
-void InWorld::SendPlayerUpdate() {
-	SerialPacket packet;
-	char buffer[PACKET_BUFFER_SIZE];
-
-	//pack the packet
-	packet.meta.type = SerialPacket::Type::CHARACTER_UPDATE;
-	packet.characterInfo.clientIndex = clientIndex;
-	packet.characterInfo.characterIndex = characterIndex;
-	packet.characterInfo.position = localCharacter->GetPosition();
-	packet.characterInfo.motion = localCharacter->GetMotion();
-
-	serialize(&packet, buffer);
-	network.Send(Channels::SERVER, buffer, PACKET_BUFFER_SIZE);
-}
-
-void InWorld::RequestDisconnect() {
-	SerialPacket packet;
-	char buffer[PACKET_BUFFER_SIZE];
-
-	//send a disconnect request
-	packet.meta.type = SerialPacket::Type::DISCONNECT;
-	packet.clientInfo.clientIndex = clientIndex;
-	serialize(&packet, buffer);
-	network.Send(Channels::SERVER, buffer, PACKET_BUFFER_SIZE);
-}
-
-void InWorld::RequestShutDown() {
-	SerialPacket packet;
-	char buffer[PACKET_BUFFER_SIZE];
-
-	//send a shutdown request
-	packet.meta.type = SerialPacket::Type::SHUTDOWN;
-	packet.clientInfo.clientIndex = clientIndex;
-	serialize(&packet, buffer);
-	network.Send(Channels::SERVER, buffer, PACKET_BUFFER_SIZE);
-}
-
-void InWorld::RequestRegion(int mapIndex, int x, int y) {
-	SerialPacket packet;
-	char buffer[PACKET_BUFFER_SIZE];
-
-	//pack the region's data
-	packet.meta.type = SerialPacket::Type::REGION_REQUEST;
-	packet.regionInfo.mapIndex = mapIndex;
-	packet.regionInfo.x = x;
-	packet.regionInfo.y = y;
-	serialize(&packet, buffer);
-	network.Send(Channels::SERVER, buffer, PACKET_BUFFER_SIZE);
-}
-
-//-------------------------
-//Utilities
-//-------------------------
-
-//TODO: convert this into a more generic function?; using parameters for the bounds
-void InWorld::UpdateMap() {
-	//these represent the zone of regions that the client needs loaded, including the mandatory buffers (+1/-1)
-	int xStart = snapToBase(REGION_WIDTH, camera.x/tileSheet.GetTileW()) - REGION_WIDTH;
-	int xEnd = snapToBase(REGION_WIDTH, (camera.x+camera.width)/tileSheet.GetTileW()) + REGION_WIDTH;
-
-	int yStart = snapToBase(REGION_HEIGHT, camera.y/tileSheet.GetTileH()) - REGION_HEIGHT;
-	int yEnd = snapToBase(REGION_HEIGHT, (camera.y+camera.height)/tileSheet.GetTileH()) + REGION_HEIGHT;
-
-	//prune distant regions
-	for (auto it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); /* EMPTY */) {
-		//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
-			int tmpX = (*it)->GetX();
-			int tmpY = (*it)->GetY();
-			++it;
-
-			regionPager.UnloadRegion(tmpX, tmpY);
-			continue;
-		}
-		++it;
-	}
-
-	//request empty regions within this zone
-	for (int i = xStart; i <= xEnd; i += REGION_WIDTH) {
-		for (int j = yStart; j <= yEnd; j += REGION_HEIGHT) {
-			if (!regionPager.FindRegion(i, j)) {
-				RequestRegion(0, i, j);
-			}
-		}
-	}
-}

client/scenes/in_world.hpp

@@ -1,121 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * 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 INWORLD_HPP_
-#define INWORLD_HPP_
-
-//maps
-#include "map_allocator.hpp"
-#include "map_file_format.hpp"
-#include "region_pager.hpp"
-
-//networking
-#include "udp_network_utility.hpp"
-#include "serial_packet.hpp"
-#include "serial.hpp"
-
-//graphics
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-#include "tile_sheet.hpp"
-
-//common
-#include "config_utility.hpp"
-#include "frame_rate.hpp"
-
-//client
-#include "base_scene.hpp"
-#include "player_character.hpp"
-
-//STL
-#include <map>
-
-class InWorld : public BaseScene {
-public:
-	//Public access members
-	InWorld(ConfigUtility* const, UDPNetworkUtility* const, int* const, int* const);
-	~InWorld();
-
-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);
-	void HandleDisconnect(SerialPacket);
-	void HandleCharacterNew(SerialPacket);
-	void HandleCharacterDelete(SerialPacket);
-	void HandleCharacterUpdate(SerialPacket);
-	void HandleRegionContent(SerialPacket);
-
-	//Server control
-	void SendPlayerUpdate();
-	void RequestDisconnect();
-	void RequestShutDown();
-	void RequestRegion(int mapIndex, int x, int y);
-
-	//utilities
-	void UpdateMap();
-
-	//shared parameters
-	ConfigUtility& config;
-	UDPNetworkUtility& network;
-	int& clientIndex;
-	int& characterIndex;
-
-	//graphics
-	Image buttonImage;
-	RasterFont font;
-	TileSheet tileSheet;
-
-	//map
-	RegionPager<BlankAllocator, DummyFormat> regionPager;
-
-	//UI
-	Button disconnectButton;
-	Button shutDownButton;
-	//TODO: Fix the camera
-	struct {
-		int x = 0, y = 0;
-		int width = 0, height = 0;
-		int marginX = 0, marginY = 0;
-	} camera;
-	FrameRate fps;
-
-	//game
-	std::map<int, PlayerCharacter> playerCharacters;
-	PlayerCharacter* localCharacter = nullptr;
-};
-
-#endif

client/scenes/lobby_menu.cpp

@@ -1,234 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * 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 "lobby_menu.hpp"
-
-#include "channels.hpp"
-#include "utility.hpp"
-
-#include <stdexcept>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-LobbyMenu::LobbyMenu(ConfigUtility* const argConfig, UDPNetworkUtility* const argNetwork, int* const argClientIndex, int* const argCharacterIndex):
-	config(*argConfig),
-	network(*argNetwork),
-	clientIndex(*argClientIndex),
-	characterIndex(*argCharacterIndex)
-{
-	//setup the utility objects
-	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
-
-	//pass the utility objects
-	search.SetImage(&image);
-	search.SetFont(&font);
-	join.SetImage(&image);
-	join.SetFont(&font);
-	back.SetImage(&image);
-	back.SetFont(&font);
-
-	//set the button positions
-	search.SetX(50);
-	search.SetY(50 + image.GetClipH() * 0);
-	join.SetX(50);
-	join.SetY(50 + image.GetClipH() * 1);
-	back.SetX(50);
-	back.SetY(50 + image.GetClipH() * 2);
-
-	//set the button texts
-	search.SetText("Search");
-	join.SetText("Join");
-	back.SetText("Back");
-
-	//set the server list's position
-	listBox = {300, 50, 200, font.GetCharH()};
-}
-
-LobbyMenu::~LobbyMenu() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void LobbyMenu::FrameStart() {
-	//
-}
-
-void LobbyMenu::Update(double delta) {
-	//suck in all waiting packets
-	SerialPacket packet;
-	while(network.Receive()) {
-		deserialize(&packet, network.GetInData());
-		packet.meta.srcAddress = network.GetInPacket()->address;
-		HandlePacket(packet);
-	}
-}
-
-void LobbyMenu::FrameEnd() {
-	//
-}
-
-void LobbyMenu::Render(SDL_Surface* const screen) {
-	//TODO: I need a proper UI system for the entire client and the editor
-	//UI
-	search.DrawTo(screen);
-	join.DrawTo(screen);
-	back.DrawTo(screen);
-
-	//TODO: draw headers for the server list
-	for (int i = 0; i < serverInfo.size(); i++) {
-		//draw the selected server's highlight
-		if (selection == &serverInfo[i]) {
-			SDL_Rect r = listBox;
-			r.y += i * listBox.h;
-			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 255, 127, 39));
-		}
-
-		//draw the server name
-		font.DrawStringTo(serverInfo[i].name, screen, listBox.x, listBox.y + i*listBox.h);
-
-		//draw the player count
-		font.DrawStringTo(to_string_custom(serverInfo[i].playerCount), screen, listBox.x + listBox.w, listBox.y + i*listBox.h);
-
-		//compatible?
-		if (!serverInfo[i].compatible) {
-			font.DrawStringTo("?", screen, listBox.x - font.GetCharW(), listBox.y + i*listBox.h);
-		}
-
-		//ping?
-	}
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void LobbyMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	search.MouseMotion(motion);
-	join.MouseMotion(motion);
-	back.MouseMotion(motion);
-}
-
-void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	search.MouseButtonDown(button);
-	join.MouseButtonDown(button);
-	back.MouseButtonDown(button);
-}
-
-void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (search.MouseButtonUp(button) == Button::State::HOVER) {
-		//the vars
-		SerialPacket packet;
-		char buffer[PACKET_BUFFER_SIZE];
-
-		//broadcast to the network, or a specific server
-		packet.meta.type = SerialPacket::Type::BROADCAST_REQUEST;
-		serialize(&packet, buffer);
-		network.Send(config["server.host"].c_str(), config.Int("server.port"), buffer, PACKET_BUFFER_SIZE);
-
-		//reset the server list
-		serverInfo.clear();
-		selection = nullptr;
-	}
-
-	else if (join.MouseButtonUp(button) == Button::State::HOVER && selection != nullptr && selection->compatible) {
-		//the vars
-		SerialPacket packet;
-		char buffer[PACKET_BUFFER_SIZE];
-
-		//pack the packet
-		packet.meta.type = SerialPacket::Type::JOIN_REQUEST;
-		strncpy(packet.clientInfo.username, config["client.username"].c_str(), PACKET_STRING_SIZE);
-		strncpy(packet.clientInfo.handle, config["client.handle"].c_str(), PACKET_STRING_SIZE);
-		strncpy(packet.clientInfo.avatar, config["client.avatar"].c_str(), PACKET_STRING_SIZE);
-
-		//join the selected server
-		serialize(&packet, buffer);
-		network.Send(&selection->address, buffer, PACKET_BUFFER_SIZE);
-		selection = nullptr;
-	}
-
-	else if (back.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::MAINMENU);
-	}
-
-	else if (
-		//has the user selected a server on the list?
-		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 {
-		selection = nullptr;
-	}
-}
-
-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) {
-	//
-}
-
-void LobbyMenu::HandlePacket(SerialPacket packet) {
-		switch(packet.meta.type) {
-		case SerialPacket::Type::BROADCAST_RESPONSE: {
-			//extract the data
-			ServerInformation server;
-			server.address = packet.meta.srcAddress;
-			server.networkVersion = packet.serverInfo.networkVersion;
-			server.name = packet.serverInfo.name;
-			server.playerCount = packet.serverInfo.playerCount;
-
-			//NOTE: Check compatibility here
-			server.compatible = server.networkVersion == NETWORK_VERSION;
-
-			//push
-			serverInfo.push_back(server);
-		}
-		break;
-		case SerialPacket::Type::JOIN_RESPONSE:
-			clientIndex = packet.clientInfo.clientIndex;
-			characterIndex = packet.clientInfo.characterIndex;
-			network.Bind(&packet.meta.srcAddress, Channels::SERVER);
-			SetNextScene(SceneList::INWORLD);
-		break;
-
-		//handle errors
-		default:
-			throw(std::runtime_error("Unknown SerialPacket::Type encountered"));
-		break;
-	}
-}

common/config_utility.cpp

@@ -1,105 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * 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 "config_utility.hpp"
-
-#include <cstdlib>
-#include <fstream>
-#include <stdexcept>
-
-using namespace std;
-
-void ConfigUtility::Load(string fname) {
-	ifstream is(fname);
-
-	if (!is.is_open()) {
-		throw(runtime_error("Failed to open config file"));
-	}
-
-	string key, val;
-
-	for (;;) { //forever
-		//eat whitespace
-		while(isspace(is.peek()))
-			is.ignore();
-
-		//end of file
-		if (is.eof())
-			break;
-
-		//skip comment lines
-		if (is.peek() == '#') {
-			while(is.peek() != '\n' && !is.eof()) {
-				is.ignore();
-			}
-			continue;
-		}
-
-		//read in the pair
-		getline(is, key,'=');
-		getline(is, val);
-
-		//trim the strings at the start & end
-		while(key.size() && isspace(*key.begin())) key.erase(0, 1);
-		while(val.size() && isspace(*val.begin())) val.erase(0, 1);
-
-		while(key.size() && isspace(*(key.end()-1))) key.erase(key.end() - 1);
-		while(val.size() && isspace(*(val.end()-1))) val.erase(val.end() - 1);
-
-		//allow empty/wiped values
-		if (key.size() == 0) {
-			continue;
-		}
-
-		//save the pair
-		table[key] = val;
-	}
-
-	is.close();
-}
-
-std::string& ConfigUtility::String(std::string s) {
-	return table[s];
-}
-
-int ConfigUtility::Integer(std::string s) {
-	std::map<std::string, std::string>::iterator it = table.find(s);
-	if (it == table.end()) {
-		return 0;
-	}
-	return atoi(it->second.c_str());
-}
-
-double ConfigUtility::Double(std::string s) {
-	std::map<std::string, std::string>::iterator it = table.find(s);
-	if (it == table.end()) {
-		return 0.0;
-	}
-	return atof(it->second.c_str());
-}
-
-bool ConfigUtility::Boolean(std::string s) {
-	std::map<std::string, std::string>::iterator it = table.find(s);
-	if (it == table.end()) {
-		return false;
-	}
-	return it->second == "true";
-}

common/debugging/makefile

@@ -1,17 +1,14 @@
 #config
-INCLUDES+=. .. ../map
+INCLUDES+=.
 LIBS+=
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
 CXXSRC=$(wildcard *.cpp)
-CSRC=$(wildcard *.c)
 
 #objects
 OBJDIR=obj
 OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.o))
 
 #output
 OUTDIR=../..
@@ -34,9 +31,6 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
 clean:
 	$(RM) *.o *.a *.exe
 

common/debugging/timer.cpp

@@ -0,0 +1,45 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 "timer.hpp"
+
+Timer::Timer(): start(Timer::Clock::now()) {
+	//
+}
+
+Timer::Timer(std::string s): name(s), start(Timer::Clock::now()) {
+	//
+}
+
+void Timer::Start() {
+	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::microseconds>(t.GetTime()).count();
+	os << "us";
+	return os;
+}

common/debugging/timer.hpp

@@ -0,0 +1,54 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 TIMER_HPP_
+#define TIMER_HPP_
+
+#include <chrono>
+#include <string>
+#include <ostream>
+
+class Timer {
+public:
+	typedef std::chrono::high_resolution_clock Clock;
+
+	Timer();
+	Timer(std::string s);
+	~Timer() = default;
+
+	void Start();
+	void Stop();
+
+	//accessors and mutators
+	Clock::duration GetTime() { return timeSpan; }
+
+	std::string SetName(std::string s) { return name = s; }
+	std::string GetName() { return name; }
+
+private:
+	std::string name;
+	Clock::time_point start;
+	Clock::duration timeSpan;
+};
+
+std::ostream& operator<<(std::ostream& os, Timer& t);
+
+#endif

common/gameplay/character_defines.hpp

@@ -0,0 +1,42 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 CHARACTERDEFINES_HPP_
+#define CHARACTERDEFINES_HPP_
+
+#include <cmath>
+
+//the speeds that the characters move
+constexpr double CHARACTER_WALKING_SPEED = 2.24;
+constexpr double CHARACTER_WALKING_MOD = 1.0/sqrt(2.0);
+constexpr double CHARACTER_WALKING_NEGATIVE_MOD = 1.0 - CHARACTER_WALKING_MOD;
+
+//the bounds for the character objects, mapped to the default sprites
+constexpr int CHARACTER_BOUNDS_X = 0;
+constexpr int CHARACTER_BOUNDS_Y = 16;
+constexpr int CHARACTER_BOUNDS_WIDTH = 32;
+constexpr int CHARACTER_BOUNDS_HEIGHT = 32;
+
+//the character's sprite format
+constexpr int CHARACTER_CELLS_X = 4;
+constexpr int CHARACTER_CELLS_Y = 4;
+
+#endif

common/gameplay/makefile

@@ -0,0 +1,37 @@
+#config
+INCLUDES+=.
+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/graphics/image.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages

common/graphics/image.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages

common/graphics/makefile

@@ -1,17 +1,14 @@
 #config
-INCLUDES+=. .. ../map
+INCLUDES+=. ../map
 LIBS+=
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
 CXXSRC=$(wildcard *.cpp)
-CSRC=$(wildcard *.c)
 
 #objects
 OBJDIR=obj
 OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.o))
 
 #output
 OUTDIR=../..
@@ -34,9 +31,6 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
 clean:
 	$(RM) *.o *.a *.exe
 

common/graphics/sprite_sheet.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages

common/graphics/sprite_sheet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages

common/graphics/tile_sheet.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,24 +21,24 @@
 */
 #include "tile_sheet.hpp"
 
-void TileSheet::Load(std::string fname, int xc, int yc) {
-	XCount = xc;
-	YCount = yc;
+void TileSheet::Load(std::string fname, int tileWidth, int tileHeight) {
 	image.LoadSurface(fname);
-	image.SetClipW(image.GetClipW()/XCount);
-	image.SetClipH(image.GetClipH()/YCount);
+	image.SetClipW(tileWidth);
+	image.SetClipH(tileHeight);
+	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::DrawTo(SDL_Surface* const dest, int x, int y, Region::type_t tile) {
+void TileSheet::DrawTileTo(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.SetClipY((tile-1) / XCount * image.GetClipH());
+	image.SetClipX((tile-1) % xCount * image.GetClipW());
+	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.SetClipY((tile-1) / XCount * image.GetClipH());
+				image.SetClipX((tile-1) % xCount * image.GetClipW());
+				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

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -31,24 +31,24 @@
 class TileSheet {
 public:
 	TileSheet() = default;
-	TileSheet(std::string f, int x, int y) { Load(f, x, y); }
+	TileSheet(std::string f, int w, int h) { Load(f, w, h); }
 	~TileSheet() = default;
 
-	void Load(std::string fname, int XCount, int YCount);
+	void Load(std::string fname, int tileWidth, int tileHeight);
 	void Unload();
 
-	void DrawTo(SDL_Surface* const dest, int x, int y, Region::type_t tile);
+	void DrawTileTo(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 GetYCount() { return YCount; }
+	int GetXCount() { return xCount; }
+	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,46 +1,11 @@
-#config
-INCLUDES+=.
-LIBS+=
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
-
-#source
-CXXSRC=$(wildcard *.cpp)
-CSRC=$(wildcard *.c)
-
-#objects
-OBJDIR=obj
-OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.o))
-
-#output
-OUTDIR=..
-OUT=$(addprefix $(OUTDIR)/,libcommon.a)
-
-#targets
-all: $(OBJ) $(OUT)
-	ar -crs $(OUT) $(OBJ)
+all:
+	$(MAKE) -C debugging
+	$(MAKE) -C gameplay
 	$(MAKE) -C graphics
 	$(MAKE) -C map
-	$(MAKE) -C script
 	$(MAKE) -C network
 	$(MAKE) -C ui
-
-$(OBJ): | $(OBJDIR)
-
-$(OUT): | $(OUTDIR)
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-$(OUTDIR):
-	mkdir $(OUTDIR)
-
-$(OBJDIR)/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
+	$(MAKE) -C utilities
 
 clean:
 	$(RM) *.o *.a *.exe

common/map/makefile

@@ -1,17 +1,14 @@
 #config
-INCLUDES+=. .. ../graphics
+INCLUDES+=. ../utilities
 LIBS+=
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
 CXXSRC=$(wildcard *.cpp)
-CSRC=$(wildcard *.c)
 
 #objects
 OBJDIR=obj
 OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.o))
 
 #output
 OUTDIR=../..
@@ -34,9 +31,6 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
 clean:
 	$(RM) *.o *.a *.exe
 

common/map/map_allocator.cpp

@@ -1,60 +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 "map_allocator.hpp"
-
-#include <stdexcept>
-
-void BlankAllocator::Create(Region** const ptr, int x, int y) {
-	(*ptr) = new Region(x, y);
-}
-
-void BlankAllocator::Unload(Region* const ptr) {
-	delete ptr;
-}
-
-void LuaAllocator::Create(Region** const ptr, int x, int y) {
-	//something to work on
-	(*ptr) = new Region(x, y);
-
-	//API hook
-	lua_getglobal(state, "map");
-	lua_getfield(state, -1, "create");
-	lua_pushlightuserdata(state, *ptr);
-	if (lua_pcall(state, 1, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));
-	}
-	lua_pop(state, 1);
-}
-
-void LuaAllocator::Unload(Region* const ptr) {
-	//API hook
-	lua_getglobal(state, "map");
-	lua_getfield(state, -1, "unload");
-	lua_pushlightuserdata(state, ptr);
-	if (lua_pcall(state, 1, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));
-	}
-	lua_pop(state, 1);
-
-	//clean up the memory
-	delete ptr;
-}

common/map/map_file_format.cpp

@@ -1,66 +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 "map_file_format.hpp"
-
-#include <stdexcept>
-
-void DummyFormat::Load(Region** const ptr, int x, int y) {
-	//EMPTY
-}
-
-void DummyFormat::Save(Region* const ptr) {
-	//EMPTY
-}
-
-void LuaFormat::Load(Region** const ptr, int x, int y) {
-	//something to load into
-
-	if (!(*ptr)) {
-		(*ptr) = new Region(x, y);
-	}
-
-	//API hook
-	lua_getglobal(state, "map");
-	lua_getfield(state, -1, "load");
-	lua_pushlightuserdata(state, *ptr);
-	lua_pushstring(state, saveDir.c_str());
-	if (lua_pcall(state, 2, 1, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));
-	}
-	if (lua_toboolean(state, -1) == false) {
-		delete (*ptr);
-		(*ptr) = nullptr;
-	}
-	lua_pop(state, 2);
-}
-
-void LuaFormat::Save(Region* const ptr) {
-	//API hook
-	lua_getglobal(state, "map");
-	lua_getfield(state, -1, "save");
-	lua_pushlightuserdata(state, ptr);
-	lua_pushstring(state, saveDir.c_str());
-	if (lua_pcall(state, 2, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));
-	}
-	lua_pop(state, 1);
-}

common/map/region.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,19 +21,62 @@
 */
 #include "region.hpp"
 
-Region::Region(int argX, int argY):
-	x(argX),
-	y(argY)
-{
-	for (register int i = 0; i < REGION_WIDTH*REGION_HEIGHT*REGION_DEPTH; ++i) {
-		*(reinterpret_cast<type_t*>(tiles) + i) = 0;
+#include <cmath>
+#include <cstring>
+#include <stdexcept>
+
+int snapToBase(int base, int x) {
+	return floor((double)x / base) * base;
 }
+
+Region::Region(int argX, int argY): x(argX), y(argY) {
+	if (x != snapToBase(REGION_WIDTH, x) || y != snapToBase(REGION_HEIGHT, y)) {
+		throw(std::invalid_argument("Region location is off grid"));
+	}
+	memset(tiles, 0, REGION_WIDTH*REGION_HEIGHT*REGION_DEPTH*sizeof(type_t));
+}
+
+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) {
+	if (x < 0 || y < 0 || z < 0 || x >= REGION_WIDTH || y >= REGION_HEIGHT || z >= REGION_DEPTH) {
+		throw(std::out_of_range("Region::SetTile() argument out of range"));
+	}
 	return tiles[x][y][z] = v;
 }
 
 Region::type_t Region::GetTile(int x, int y, int z) {
+	if (x < 0 || y < 0 || z < 0 || x >= REGION_WIDTH || y >= REGION_HEIGHT || z >= REGION_DEPTH) {
+		throw(std::out_of_range("Region::GetTile() argument out of range"));
+	}
 	return tiles[x][y][z];
 }
+
+bool Region::SetSolid(int x, int y, bool b) {
+	if (x < 0 || y < 0 || x >= REGION_WIDTH || y >= REGION_HEIGHT) {
+		throw(std::out_of_range("Region::SetSolid() argument out of range"));
+	}
+	return solid[x * REGION_WIDTH + y] = b;
+}
+
+bool Region::GetSolid(int x, int y) {
+	if (x < 0 || y < 0 || x >= REGION_WIDTH || y >= REGION_HEIGHT) {
+		throw(std::out_of_range("Region::GetSolid() argument out of range"));
+	}
+	return solid[x * REGION_WIDTH + y];
+}
+
+int Region::GetX() const {
+	return x;
+}
+
+int Region::GetY() const {
+	return y;
+}
+
+std::bitset<REGION_WIDTH*REGION_HEIGHT>* Region::GetSolidBitset() {
+	return &solid;
+}

common/map/region.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -22,29 +22,42 @@
 #ifndef REGION_HPP_
 #define REGION_HPP_
 
-#define REGION_WIDTH 20
-#define REGION_HEIGHT 20
-#define REGION_DEPTH 3
+#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 short type_t;
+	typedef unsigned char type_t;
 
 	Region() = delete;
 	Region(int x, int y);
+	Region(Region const&);
 	~Region() = default;
 
 	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; }
+	int GetX() const;
+	int GetY() const;
+
+	std::bitset<REGION_WIDTH*REGION_HEIGHT>* GetSolidBitset();
 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

@@ -0,0 +1,99 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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_api.hpp"
+
+#include "region.hpp"
+
+static int setTile(lua_State* L) {
+	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
+	int ret = region->SetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1, lua_tointeger(L, 5));
+	lua_pushinteger(L, ret);
+	return 1;
+}
+
+static int getTile(lua_State* L) {
+	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
+	int ret = region->GetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1);
+	lua_pushinteger(L, ret);
+	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());
+	return 1;
+}
+
+static int getY(lua_State* L) {
+	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
+	lua_pushinteger(L, region->GetY());
+	return 1;
+}
+
+static int getWidth(lua_State* L) {
+	lua_pushinteger(L, REGION_WIDTH);
+	return 1;
+}
+
+static int getHeight(lua_State* L) {
+	lua_pushinteger(L, REGION_HEIGHT);
+	return 1;
+}
+
+static int getDepth(lua_State* L) {
+	lua_pushinteger(L, REGION_DEPTH);
+	return 1;
+}
+
+static const luaL_Reg regionLib[] = {
+	{"SetTile",setTile},
+	{"GetTile",getTile},
+	{"SetSolid",setSolid},
+	{"GetSolid",getSolid},
+	{"GetX",getX},
+	{"GetY",getY},
+
+	//the global macros
+	{"GetWidth",getWidth},
+	{"GetHeight",getHeight},
+	{"GetDepth",getDepth},
+	{nullptr, nullptr}
+};
+
+LUAMOD_API int openRegionAPI(lua_State* L) {
+	luaL_newlib(L, regionLib);
+	return 1;
+}

common/map/region_api.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,18 +19,12 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SCENELIST_HPP_
-#define SCENELIST_HPP_
+#ifndef REGIONAPI_HPP_
+#define REGIONAPI_HPP_
 
-enum class SceneList {
-	//these are reserved
-	QUIT,
-	CONTINUE,
-	FIRST,
+#include "lua.hpp"
 
-	//custom indexes
-	TESTIFICATESCENE,
-	EDITORSCENE,
-};
+#define TORTUGA_REGION_API "region"
+LUAMOD_API int openRegionAPI(lua_State* L);
 
 #endif

common/map/region_pager.hpp

@@ -1,133 +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 REGIONPAGER_HPP_
-#define REGIONPAGER_HPP_
-
-#include "region.hpp"
-#include "utility.hpp"
-
-#include <list>
-
-class RegionPagerBase {
-public:
-	RegionPagerBase() {};
-	virtual ~RegionPagerBase() {};
-
-	//tile manipulation
-	Region::type_t SetTile(int x, int y, int z, Region::type_t v);
-	Region::type_t GetTile(int x, int y, int z);
-
-	//region manipulation
-	Region* GetRegion(int x, int y);
-	Region* FindRegion(int x, int y);
-	Region* PushRegion(Region*);
-
-	//interface
-	virtual Region* LoadRegion(int x, int y) = 0;
-	virtual Region* SaveRegion(int x, int y) = 0;
-	virtual Region* CreateRegion(int x, int y) = 0;
-	virtual void UnloadRegion(int x, int y) = 0;
-	//TODO: delete existing regions
-
-	//accessors & mutators
-	std::list<Region*>* GetContainer() { return &regionList; }
-protected:
-	std::list<Region*> regionList;
-};
-
-template<typename Allocator, typename FileFormat>
-class RegionPager : public RegionPagerBase {
-public:
-	RegionPager() {};
-	~RegionPager() {
-		UnloadAll();
-	}
-
-	Region* LoadRegion(int x, int y) {
-		//snap the coords
-		x = snapToBase(REGION_WIDTH, x);
-		y = snapToBase(REGION_HEIGHT, y);
-
-		//load the region if possible
-		Region* ptr = nullptr;
-		format.Load(&ptr, x, y);
-		if (ptr) {
-			return PushRegion(ptr);
-		}
-		return nullptr;
-	}
-
-	Region* SaveRegion(int x, int y) {
-		//snap the coords
-		x = snapToBase(REGION_WIDTH, x);
-		y = snapToBase(REGION_HEIGHT, y);
-
-		//find & save the region
-		Region* ptr = FindRegion(x, y);
-		if (ptr) {
-			format.Save(ptr);
-		}
-		return ptr;
-	}
-
-	Region* CreateRegion(int x, int y) {
-		//snap the coords
-		x = snapToBase(REGION_WIDTH, x);
-		y = snapToBase(REGION_HEIGHT, y);
-
-		//create and push the object
-		Region* ptr = nullptr;
-		allocator.Create(&ptr, x, y);
-		return PushRegion(ptr);
-	}
-
-	void UnloadRegion(int x, int y) {
-		//snap the coords
-		x = snapToBase(REGION_WIDTH, x);
-		y = snapToBase(REGION_HEIGHT, y);
-
-		//custom loop
-		for (std::list<Region*>::iterator it = regionList.begin(); it != regionList.end(); /* EMPTY */) {
-			if ((*it)->GetX() == x && (*it)->GetY() == y) {
-				allocator.Unload(*it);
-				it = regionList.erase(it);
-				continue;
-			}
-			++it;
-		}
-	}
-	void UnloadAll() {
-		for (auto& it : regionList) {
-			allocator.Unload(it);
-		}
-		regionList.clear();
-	}
-
-	//accessors
-	Allocator* GetAllocator() { return &allocator; }
-	FileFormat* GetFormat() { return &format; }
-protected:
-	Allocator allocator;
-	FileFormat format;
-};
-
-#endif

common/map/region_pager_api.cpp

@@ -0,0 +1,172 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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_pager_api.hpp"
+
+#include "region_pager_lua.hpp"
+#include "region.hpp"
+
+//DOCS: These glue functions simply wrap RegionPagerLua's methods
+//NOTE: zero indexing is used here, but not in the region API
+
+static int setTile(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	int ret = pager->SetTile(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4), lua_tointeger(L, 5));
+	lua_pushinteger(L, ret);
+	return 1;
+}
+
+static int getTile(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	int ret = pager->GetTile(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4));
+	lua_pushinteger(L, ret);
+	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));
+	lua_pushlightuserdata(L, region);
+	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));
+	lua_pushlightuserdata(L, region);
+	return 1;
+}
+
+static int saveRegion(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	Region* region = pager->SaveRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
+	lua_pushlightuserdata(L, region);
+	return 1;
+}
+
+static int createRegion(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	Region* region = pager->CreateRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
+	lua_pushlightuserdata(L, region);
+	return 1;
+}
+
+static int unloadRegion(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+
+	//two argument types: coords & the region itself
+	switch(lua_type(L, 2)) {
+		case LUA_TNUMBER:
+			pager->UnloadIf([&](Region const& region) -> bool {
+				int x = lua_tointeger(L, 2);
+				int y = lua_tointeger(L, 3);
+				return region.GetX() == x && region.GetY() == y;
+			});
+		break;
+		case LUA_TLIGHTUSERDATA:
+			pager->UnloadIf([&](Region const& region) -> bool {
+				return (&region) == lua_touserdata(L, 2);
+			});
+		break;
+	}
+	return 0;
+}
+
+static int setOnLoad(lua_State* L) {
+	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;
+}
+
+//debugging
+static int containerSize(lua_State* L) {
+	RegionPagerLua* pager = static_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	lua_pushinteger(L, pager->GetContainer()->size());
+	return 1;
+}
+
+static const luaL_Reg regionPagerLib[] = {
+	//curry
+	{"SetTile", setTile},
+	{"GetTile", getTile},
+	{"SetSolid", setSolid},
+	{"GetSolid", getSolid},
+
+	//access and control
+	{"GetRegion", getRegion},
+	{"LoadRegion", loadRegion},
+	{"SaveRegion", saveRegion},
+	{"CreateRegion", createRegion},
+	{"UnloadRegion", unloadRegion},
+
+	//triggers
+	{"SetOnLoad",setOnLoad},
+	{"SetOnSave",setOnSave},
+	{"SetOnCreate",setOnCreate},
+	{"SetOnUnload",setOnUnload},
+
+	//debugging
+	{"ContainerSize", containerSize},
+
+	//sentinel
+	{nullptr, nullptr}
+};
+
+LUAMOD_API int openRegionPagerAPI(lua_State* L) {
+	luaL_newlib(L, regionPagerLib);
+	return 1;
+}

common/map/region_pager_api.hpp

@@ -0,0 +1,30 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 REGIONPAGERAPI_HPP_
+#define REGIONPAGERAPI_HPP_
+
+#include "lua.hpp"
+
+#define TORTUGA_REGION_PAGER_API "region_pager"
+LUAMOD_API int openRegionPagerAPI(lua_State* L);
+
+#endif

common/map/region_pager_base.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,9 +19,14 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "region_pager.hpp"
+#include "region_pager_base.hpp"
 
-#include "utility.hpp"
+#include <stdexcept>
+#include <algorithm>
+
+RegionPagerBase::~RegionPagerBase() {
+	UnloadAll();
+};
 
 Region::type_t RegionPagerBase::SetTile(int x, int y, int z, Region::type_t v) {
 	Region* ptr = GetRegion(x, y);
@@ -33,8 +38,17 @@ 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) {
-	//snap the coords
 	x = snapToBase(REGION_WIDTH, x);
 	y = snapToBase(REGION_HEIGHT, y);
 
@@ -48,20 +62,44 @@ Region* RegionPagerBase::GetRegion(int x, int y) {
 }
 
 Region* RegionPagerBase::FindRegion(int x, int y) {
-	//snap the coords
-	x = snapToBase(REGION_WIDTH, x);
-	y = snapToBase(REGION_HEIGHT, y);
-
 	//find the region
-	for (std::list<Region*>::iterator it = regionList.begin(); it != regionList.end(); it++) {
-		if ((*it)->GetX() == x && (*it)->GetY() == y) {
-			return *it;
+	std::list<Region>::iterator it = find_if(regionList.begin(), regionList.end(), [x, y](Region& region) -> bool {
+		return region.GetX() == x && region.GetY() == y;
+	});
+	return it != regionList.end() ? &(*it) : nullptr;
 }
+
+Region* RegionPagerBase::PushRegion(Region* const ptr) {
+	regionList.push_front(*ptr);
+	return &regionList.front();
 }
+
+Region* RegionPagerBase::LoadRegion(int x, int y) {
+	//EMPTY, intended for override
 	return nullptr;
 }
 
-Region* RegionPagerBase::PushRegion(Region* ptr) {
-	regionList.push_front(ptr);
-	return regionList.front();
+Region* RegionPagerBase::SaveRegion(int x, int y) {
+	//EMPTY, intended for override
+	return nullptr;
+}
+
+Region* RegionPagerBase::CreateRegion(int x, int y) {
+	if (FindRegion(x, y)) {
+		throw(std::logic_error("Cannot overwrite an existing region"));
+	}
+	regionList.emplace_front(x, y);
+	return &regionList.front();
+}
+
+void RegionPagerBase::UnloadIf(std::function<bool(Region const&)> fn) {
+	regionList.remove_if(fn);
+}
+
+void RegionPagerBase::UnloadAll() {
+	regionList.clear();
+}
+
+std::list<Region>* RegionPagerBase::GetContainer() {
+	return &regionList;
 }

common/map/region_pager_base.hpp

@@ -0,0 +1,61 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 REGIONPAGERBASE_HPP_
+#define REGIONPAGERBASE_HPP_
+
+#include "region.hpp"
+
+#include <functional>
+#include <list>
+
+class RegionPagerBase {
+public:
+	RegionPagerBase() = default;
+	virtual ~RegionPagerBase();
+
+	//tile manipulation
+	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);
+	virtual Region* PushRegion(Region* const);
+
+	virtual Region* LoadRegion(int x, int y);
+	virtual Region* SaveRegion(int x, int y);
+	virtual Region* CreateRegion(int x, int y);
+
+	virtual void UnloadIf(std::function<bool(Region const&)> fn);
+	virtual void UnloadAll();
+
+	//accessors & mutators
+	std::list<Region>* GetContainer();
+protected:
+	std::list<Region> regionList;
+};
+
+#endif

common/map/region_pager_lua.cpp

@@ -0,0 +1,200 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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_pager_lua.hpp"
+
+#include <stdexcept>
+
+//DOCS: Load, Save and Create fail unless the lua function has been set
+//DOCS: UnloadIf and UnloadAll will still continue without the function set
+
+RegionPagerLua::~RegionPagerLua() {
+	//unload all regions
+	UnloadAll();
+	//clear any stored functions
+	luaL_unref(lua, LUA_REGISTRYINDEX, loadRef);
+	luaL_unref(lua, LUA_REGISTRYINDEX, saveRef);
+	luaL_unref(lua, LUA_REGISTRYINDEX, createRef);
+	luaL_unref(lua, LUA_REGISTRYINDEX, unloadRef);
+}
+
+//return the loaded region, or nullptr on failure
+Region* RegionPagerLua::LoadRegion(int x, int y) {
+	//get the pager's function from the registry
+	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
+	if (lua_pcall(lua, 1, 1, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+	}
+
+	//check the return value, success or failure
+	if (lua_toboolean(lua, -1)) {
+		lua_pop(lua, 1);
+		regionList.push_front(tmpRegion);
+		return &regionList.front();
+	}
+	else {
+		lua_pop(lua, 1);
+		return nullptr;
+	}
+}
+
+//return the saved region, or nullptr on failure
+Region* RegionPagerLua::SaveRegion(int x, int y) {
+	//get the pager's function from the registry
+	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) {
+		lua_pop(lua, 1);
+		return nullptr;
+	}
+	lua_pushlightuserdata(lua, ptr);
+
+	//call the function, 1 arg, 1 return
+	if (lua_pcall(lua, 1, 1, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -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 the created region, or nullptr on failure
+Region* RegionPagerLua::CreateRegion(int x, int y) {
+	if (FindRegion(x, 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
+	if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+	}
+
+	//return the new region
+	regionList.push_front(tmpRegion);
+	return &regionList.front();
+}
+
+//no return
+void RegionPagerLua::UnloadIf(std::function<bool(Region const&)> fn) {
+	//get the pager's function from the registry
+	lua_rawgeti(lua, LUA_REGISTRYINDEX, unloadRef);
+
+	//check if this function is available
+	if (lua_isnil(lua, -1)) {
+		lua_pop(lua, 1);
+		//remove the regions anyway
+		regionList.remove_if(fn);
+		return;
+	}
+
+	//run each region through this lambda
+	regionList.remove_if([&](Region& region) -> bool {
+		if (fn(region)) {
+
+			//push a copy of the function onto the stack with the region
+			lua_pushvalue(lua, -1);
+			lua_pushlightuserdata(lua, static_cast<void*>(&region));
+
+			//call the function, 1 arg, 0 return
+			if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
+				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(lua, 1);
+}
+
+void RegionPagerLua::UnloadAll() {
+	//get the pager's function from the registry
+	lua_rawgeti(lua, LUA_REGISTRYINDEX, unloadRef);
+
+	//check if this function is available
+	if (lua_isnil(lua, -1)) {
+		lua_pop(lua, 1);
+		//remove the regions anyway
+		regionList.clear();
+		return;
+	}
+
+	for (auto& it : regionList) {
+		//push a copy of the function onto the stack with the region
+		lua_pushvalue(lua, -1);
+		lua_pushlightuserdata(lua, &it);
+
+		//call the function, 1 arg, 0 return
+		if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
+			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+		}
+	}
+
+	//pop the base copy of the function
+	lua_pop(lua, 1);
+
+	//remove from memory
+	regionList.clear();
+}

common/map/region_pager_lua.hpp

@@ -0,0 +1,69 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 REGIONPAGERLUA_HPP_
+#define REGIONPAGERLUA_HPP_
+
+#include "region_pager_base.hpp"
+
+#include "lua.hpp"
+
+#include <functional>
+#include <string>
+
+class RegionPagerLua : public RegionPagerBase {
+public:
+	RegionPagerLua() = default;
+	~RegionPagerLua();
+
+	//region manipulation
+	Region* LoadRegion(int x, int y) override;
+	Region* SaveRegion(int x, int y) override;
+	Region* CreateRegion(int x, int y) override;
+
+	void UnloadIf(std::function<bool(Region const&)> fn) override;
+	void UnloadAll() override;
+
+	//accessors & mutators
+	lua_State* SetLuaState(lua_State* L) { return lua = L; }
+	lua_State* GetLuaState() { return lua; }
+
+	//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; }
+
+protected:
+	lua_State* lua = nullptr;
+
+	int loadRef = LUA_NOREF;
+	int saveRef = LUA_NOREF;
+	int createRef = LUA_NOREF;
+	int unloadRef = LUA_NOREF;
+};
+
+#endif

common/network/makefile

@@ -1,17 +1,14 @@
 #config
-INCLUDES+=. .. ../map
+INCLUDES+=. packet_types ../gameplay ../map ../utilities
 LIBS+=
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
 CXXSRC=$(wildcard *.cpp)
-CSRC=$(wildcard *.c)
 
 #objects
 OBJDIR=obj
 OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.o))
 
 #output
 OUTDIR=../..
@@ -20,6 +17,7 @@ OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 #targets
 all: $(OBJ) $(OUT)
 	ar -crs $(OUT) $(OBJ)
+	$(MAKE) -C packet_types
 
 $(OBJ): | $(OBJDIR)
 
@@ -34,9 +32,6 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
 clean:
 	$(RM) *.o *.a *.exe
 

common/network/packet_types/character_packet.cpp

@@ -0,0 +1,80 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 serializeCharacter(void* buffer, CharacterPacket* packet) {
+	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the character
+	serialCopy(&buffer, &packet->characterIndex, sizeof(int));
+	serialCopy(&buffer, packet->handle, PACKET_STRING_SIZE);
+	serialCopy(&buffer, packet->avatar, PACKET_STRING_SIZE);
+
+	//the owner
+	serialCopy(&buffer, &packet->accountIndex, sizeof(int));
+
+	//location
+	serialCopy(&buffer, &packet->roomIndex, sizeof(int));
+
+	serialCopy(&buffer, &packet->origin.x, sizeof(double));
+	serialCopy(&buffer, &packet->origin.y, sizeof(double));
+
+	serialCopy(&buffer, &packet->motion.x, sizeof(double));
+	serialCopy(&buffer, &packet->motion.y, sizeof(double));
+
+	serialCopy(&buffer, &packet->bounds.x, sizeof(int));
+	serialCopy(&buffer, &packet->bounds.y, sizeof(int));
+	serialCopy(&buffer, &packet->bounds.w, sizeof(int));
+	serialCopy(&buffer, &packet->bounds.h, sizeof(int));
+
+	//gameplay components: equipment, items, buffs, debuffs...
+}
+
+void deserializeCharacter(void* buffer, CharacterPacket* packet) {
+	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the character
+	deserialCopy(&buffer, &packet->characterIndex, sizeof(int));
+	deserialCopy(&buffer, packet->handle, PACKET_STRING_SIZE);
+	deserialCopy(&buffer, packet->avatar, PACKET_STRING_SIZE);
+
+	//the owner
+	deserialCopy(&buffer, &packet->accountIndex, sizeof(int));
+
+	//location
+	deserialCopy(&buffer, &packet->roomIndex, sizeof(int));
+
+	deserialCopy(&buffer, &packet->origin.x, sizeof(double));
+	deserialCopy(&buffer, &packet->origin.y, sizeof(double));
+
+	deserialCopy(&buffer, &packet->motion.x, sizeof(double));
+	deserialCopy(&buffer, &packet->motion.y, sizeof(double));
+
+	deserialCopy(&buffer, &packet->bounds.x, sizeof(int));
+	deserialCopy(&buffer, &packet->bounds.y, sizeof(int));
+	deserialCopy(&buffer, &packet->bounds.w, sizeof(int));
+	deserialCopy(&buffer, &packet->bounds.h, sizeof(int));
+
+	//gameplay components: equipment, items, buffs, debuffs...
+}

common/network/packet_types/character_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,30 +19,31 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef INCOMBAT_HPP_
-#define INCOMBAT_HPP_
+#ifndef CHARACTERPACKET_HPP_
+#define CHARACTERPACKET_HPP_
 
-#include "base_scene.hpp"
+#include "serial_packet_base.hpp"
 
-class InCombat : public BaseScene {
-public:
-	//Public access members
-	InCombat();
-	~InCombat();
+#include "bounding_box.hpp"
+#include "vector2.hpp"
 
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update(double delta);
-	void FrameEnd();
-	void Render(SDL_Surface* const);
+struct CharacterPacket : SerialPacketBase {
+	//identify the character
+	int characterIndex;
+	char handle[PACKET_STRING_SIZE];
+	char avatar[PACKET_STRING_SIZE];
 
-	//Event handlers
-	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&);
+	//the owner
+	int accountIndex;
+
+	//location
+	int roomIndex;
+	Vector2 origin;
+	Vector2 motion;
+	BoundingBox bounds;
 };
 
+void serializeCharacter(void* buffer, CharacterPacket* packet);
+void deserializeCharacter(void* buffer, CharacterPacket* packet);
+
 #endif

common/network/packet_types/client_packet.cpp

@@ -0,0 +1,40 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 "client_packet.hpp"
+
+#include "serial_utility.hpp"
+
+void serializeClient(void* buffer, ClientPacket* packet) {
+	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	serialCopy(&buffer, &packet->clientIndex, sizeof(int));
+	serialCopy(&buffer, &packet->accountIndex, sizeof(int));
+	serialCopy(&buffer, packet->username, PACKET_STRING_SIZE);
+}
+
+void deserializeClient(void* buffer, ClientPacket* packet) {
+	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	deserialCopy(&buffer, &packet->clientIndex, sizeof(int));
+	deserialCopy(&buffer, &packet->accountIndex, sizeof(int));
+	deserialCopy(&buffer, packet->username, PACKET_STRING_SIZE);
+}

common/network/packet_types/client_packet.hpp

@@ -0,0 +1,37 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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];
+	//TODO: (3) password, auth token
+};
+
+void serializeClient(void* buffer, ClientPacket* packet);
+void deserializeClient(void* buffer, ClientPacket* packet);
+
+#endif

common/network/packet_types/makefile

@@ -0,0 +1,37 @@
+#config
+INCLUDES+=. .. ../../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/packet_types/monster_packet.cpp

@@ -0,0 +1,70 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 "monster_packet.hpp"
+
+#include "serial_utility.hpp"
+
+void serializeMonster(void* buffer, MonsterPacket* packet) {
+	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the monster
+	serialCopy(&buffer, &packet->monsterIndex, sizeof(int));
+	serialCopy(&buffer, packet->handle, PACKET_STRING_SIZE);
+	serialCopy(&buffer, packet->avatar, PACKET_STRING_SIZE);
+
+	//bounds
+	serialCopy(&buffer, &packet->bounds.x, sizeof(int));
+	serialCopy(&buffer, &packet->bounds.y, sizeof(int));
+	serialCopy(&buffer, &packet->bounds.w, sizeof(int));
+	serialCopy(&buffer, &packet->bounds.h, sizeof(int));
+
+
+	//location
+	serialCopy(&buffer, &packet->roomIndex, sizeof(int));
+	serialCopy(&buffer, &packet->origin.x, sizeof(double));
+	serialCopy(&buffer, &packet->origin.y, sizeof(double));
+	serialCopy(&buffer, &packet->motion.x, sizeof(double));
+	serialCopy(&buffer, &packet->motion.y, sizeof(double));
+}
+
+void deserializeMonster(void* buffer, MonsterPacket* packet) {
+	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the monster
+	deserialCopy(&buffer, &packet->monsterIndex, sizeof(int));
+	deserialCopy(&buffer, packet->handle, PACKET_STRING_SIZE);
+	deserialCopy(&buffer, packet->avatar, PACKET_STRING_SIZE);
+
+	//bounds
+	deserialCopy(&buffer, &packet->bounds.x, sizeof(int));
+	deserialCopy(&buffer, &packet->bounds.y, sizeof(int));
+	deserialCopy(&buffer, &packet->bounds.w, sizeof(int));
+	deserialCopy(&buffer, &packet->bounds.h, sizeof(int));
+
+
+	//location
+	deserialCopy(&buffer, &packet->roomIndex, sizeof(int));
+	deserialCopy(&buffer, &packet->origin.x, sizeof(double));
+	deserialCopy(&buffer, &packet->origin.y, sizeof(double));
+	deserialCopy(&buffer, &packet->motion.x, sizeof(double));
+	deserialCopy(&buffer, &packet->motion.y, sizeof(double));
+}

common/network/packet_types/monster_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,30 +19,28 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef UTILITY_HPP_
-#define UTILITY_HPP_
+#ifndef MONSTERPACKET_HPP_
+#define MONSTERPACKET_HPP_
 
-#include <string>
+#include "serial_packet_base.hpp"
 
-int snapToBase(int base, int x);
-std::string truncatePath(std::string pathname);
+#include "bounding_box.hpp"
+#include "vector2.hpp"
 
-//fixing known bugs in g++
-std::string to_string_custom(int i);
+struct MonsterPacket : SerialPacketBase {
+	//identify the monster
+	int monsterIndex;
+	char handle[PACKET_STRING_SIZE];
+	char avatar[PACKET_STRING_SIZE];
+	BoundingBox bounds;
 
-int to_integer_custom(std::string);
-
-//wow
-template<typename ContainerT, typename PredicateT>
-void erase_if(ContainerT& items, const PredicateT& predicate) {
-	for(auto it = items.begin(); it != items.end(); /* empty */) {
-		if(predicate(*it)) {
-			it = items.erase(it);
-		}
-		else {
-			++it;
-		}
-	}
+	//location
+	int roomIndex;
+	Vector2 origin;
+	Vector2 motion;
 };
 
+void serializeMonster(void* buffer, MonsterPacket* packet);
+void deserializeMonster(void* buffer, MonsterPacket* packet);
+
 #endif

common/network/packet_types/region_packet.cpp

@@ -0,0 +1,79 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 serializeRegion(void* buffer, RegionPacket* packet) {
+	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	//format
+	serialCopy(&buffer, &packet->roomIndex, sizeof(int));
+	serialCopy(&buffer, &packet->x, sizeof(int));
+	serialCopy(&buffer, &packet->y, sizeof(int));
+
+	if (packet->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) = packet->region->GetTile(i, j, k);
+				buffer = reinterpret_cast<char*>(buffer) + sizeof(Region::type_t);
+			}
+		}
+	}
+
+	//solids
+	serialCopy(&buffer, packet->region->GetSolidBitset(), REGION_SOLID_FOOTPRINT);
+}
+
+void deserializeRegion(void* buffer, RegionPacket* packet) {
+	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	//format
+	deserialCopy(&buffer, &packet->roomIndex, sizeof(int));
+	deserialCopy(&buffer, &packet->x, sizeof(int));
+	deserialCopy(&buffer, &packet->y, sizeof(int));
+
+	if (packet->type != SerialPacketType::REGION_CONTENT) {
+		return;
+	}
+
+	//an object to work on
+	packet->region = new Region(packet->x, packet->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++) {
+				packet->region->SetTile(i, j, k, *reinterpret_cast<Region::type_t*>(buffer));
+				buffer = reinterpret_cast<char*>(buffer) + sizeof(Region::type_t);
+			}
+		}
+	}
+
+	//solids
+	deserialCopy(&buffer, packet->region->GetSolidBitset(), REGION_SOLID_FOOTPRINT);
+}

common/network/packet_types/region_packet.hpp

@@ -0,0 +1,48 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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>
+
+//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;
+
+struct RegionPacket : SerialPacketBase {
+	//location/identify the region
+	int roomIndex;
+	int x, y;
+
+	//the data
+	Region* region;
+};
+
+void serializeRegion(void* buffer, RegionPacket* packet);
+void deserializeRegion(void* buffer, RegionPacket* packet);
+
+#endif

common/network/packet_types/serial_packet_base.cpp

@@ -0,0 +1,24 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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_base.hpp"
+
+//sanity check

common/network/packet_types/serial_packet_base.hpp

@@ -0,0 +1,39 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 SERIALPACKETBASE_HPP_
+#define SERIALPACKETBASE_HPP_
+
+#include "serial_packet_type.hpp"
+
+#include "SDL/SDL_net.h"
+
+constexpr int PACKET_STRING_SIZE = 100;
+
+struct SerialPacketBase {
+	//members
+	SerialPacketType type;
+	IPaddress srcAddress;
+
+	virtual ~SerialPacketBase() {};
+};
+
+#endif

common/network/packet_types/server_packet.cpp

@@ -0,0 +1,42 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 "server_packet.hpp"
+
+#include "serial_utility.hpp"
+
+void serializeServer(void* buffer, ServerPacket* packet) {
+	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the server
+	serialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
+	serialCopy(&buffer, &packet->playerCount, sizeof(int));
+	serialCopy(&buffer, &packet->version, sizeof(int));
+}
+
+void deserializeServer(void* buffer, ServerPacket* packet) {
+	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the server
+	deserialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
+	deserialCopy(&buffer, &packet->playerCount, sizeof(int));
+	deserialCopy(&buffer, &packet->version, sizeof(int));
+}

common/network/packet_types/server_packet.hpp

@@ -0,0 +1,37 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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;
+};
+
+void serializeServer(void* buffer, ServerPacket* packet);
+void deserializeServer(void* buffer, ServerPacket* packet);
+
+#endif

common/network/packet_types/text_packet.cpp

@@ -0,0 +1,52 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 "text_packet.hpp"
+
+#include "serial_utility.hpp"
+
+void serializeText(void* buffer, TextPacket* packet) {
+	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	//content
+	serialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
+	serialCopy(&buffer, packet->text, PACKET_STRING_SIZE);
+
+	//location
+	serialCopy(&buffer, &packet->roomIndex, sizeof(int));
+	serialCopy(&buffer, &packet->origin.x, sizeof(double));
+	serialCopy(&buffer, &packet->origin.y, sizeof(double));
+	serialCopy(&buffer, &packet->range, sizeof(int));
+}
+
+void deserializeText(void* buffer, TextPacket* packet) {
+	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	//content
+	deserialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
+	deserialCopy(&buffer, packet->text, PACKET_STRING_SIZE);
+
+	//location
+	deserialCopy(&buffer, &packet->roomIndex, sizeof(int));
+	deserialCopy(&buffer, &packet->origin.x, sizeof(double));
+	deserialCopy(&buffer, &packet->origin.y, sizeof(double));
+	deserialCopy(&buffer, &packet->range, sizeof(int));
+}

common/network/packet_types/text_packet.hpp

@@ -0,0 +1,40 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 TEXTPACKET_HPP_
+#define TEXTPACKET_HPP_
+
+#include "serial_packet_base.hpp"
+
+#include "vector2.hpp"
+
+struct TextPacket : SerialPacketBase {
+	char name[PACKET_STRING_SIZE];
+	char text[PACKET_STRING_SIZE];
+	int roomIndex;
+	Vector2 origin;
+	int range;
+};
+
+void serializeText(void* buffer, TextPacket* packet);
+void deserializeText(void* buffer, TextPacket* packet);
+
+#endif

common/network/serial.cpp

@@ -1,282 +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.hpp"
-
-#include "map_allocator.hpp"
-
-#include <cstring>
-
-//-------------------------
-//Convenience Macros
-//-------------------------
-
-#define SERIALIZE(buffer, data, size) memcpy(buffer, data, size); buffer += size;
-#define DESERIALIZE(buffer, data, size) memcpy(data, buffer, size); buffer += size;
-
-//-------------------------
-//internal serialization functions
-//-------------------------
-
-void serializeType(SerialPacket* packet, char* buffer) {
-	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-}
-
-void serializeServer(SerialPacket* packet, char* buffer) {
-	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//server info
-	SERIALIZE(buffer, &packet->serverInfo.networkVersion, sizeof(int));
-	SERIALIZE(buffer, packet->serverInfo.name, PACKET_STRING_SIZE);
-	SERIALIZE(buffer, &packet->serverInfo.playerCount, sizeof(int));
-}
-
-void serializeClient(SerialPacket* packet, char* buffer) {
-	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//indexes
-	SERIALIZE(buffer, &packet->clientInfo.clientIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->clientInfo.characterIndex, sizeof(int));
-
-	//texts
-	SERIALIZE(buffer, packet->clientInfo.username, PACKET_STRING_SIZE);
-	SERIALIZE(buffer, packet->clientInfo.handle, PACKET_STRING_SIZE);
-	SERIALIZE(buffer, packet->clientInfo.avatar, PACKET_STRING_SIZE);
-}
-
-void serializeRegionFormat(SerialPacket* packet, char* buffer) {
-	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//format
-	SERIALIZE(buffer, &packet->regionInfo.mapIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->regionInfo.x, sizeof(int));
-	SERIALIZE(buffer, &packet->regionInfo.y, sizeof(int));
-}
-
-void serializeRegionContent(SerialPacket* packet, char* buffer) {
-	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//format
-	SERIALIZE(buffer, &packet->regionInfo.mapIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->regionInfo.x, sizeof(int));
-	SERIALIZE(buffer, &packet->regionInfo.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->regionInfo.region->GetTile(i, j, k);
-				buffer += sizeof(Region::type_t);
-			}
-		}
-	}
-}
-
-void serializeCharacter(SerialPacket* packet, char* buffer) {
-	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//indexes
-	SERIALIZE(buffer, &packet->characterInfo.clientIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->characterInfo.characterIndex, sizeof(int));
-
-	//texts
-	SERIALIZE(buffer, packet->clientInfo.handle, PACKET_STRING_SIZE);
-	SERIALIZE(buffer, packet->clientInfo.avatar, PACKET_STRING_SIZE);
-
-	//vectors
-	SERIALIZE(buffer, &packet->characterInfo.position.x, sizeof(double));
-	SERIALIZE(buffer, &packet->characterInfo.position.y, sizeof(double));
-	SERIALIZE(buffer, &packet->characterInfo.motion.x, sizeof(double));
-	SERIALIZE(buffer, &packet->characterInfo.motion.y, sizeof(double));
-}
-
-//-------------------------
-//internal deserialization functions
-//-------------------------
-
-void deserializeType(SerialPacket* packet, char* buffer) {
-	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-}
-
-void deserializeServer(SerialPacket* packet, char* buffer) {
-	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//server info
-	DESERIALIZE(buffer, &packet->serverInfo.networkVersion, sizeof(int));
-	DESERIALIZE(buffer, packet->serverInfo.name, PACKET_STRING_SIZE);
-	DESERIALIZE(buffer, &packet->serverInfo.playerCount, sizeof(int));
-}
-
-void deserializeClient(SerialPacket* packet, char* buffer) {
-	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//indexes
-	DESERIALIZE(buffer, &packet->clientInfo.clientIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->clientInfo.characterIndex, sizeof(int));
-
-	//texts
-	DESERIALIZE(buffer, packet->clientInfo.username, PACKET_STRING_SIZE);
-	DESERIALIZE(buffer, packet->clientInfo.handle, PACKET_STRING_SIZE);
-	DESERIALIZE(buffer, packet->clientInfo.avatar, PACKET_STRING_SIZE);
-}
-
-void deserializeRegionFormat(SerialPacket* packet, char* buffer) {
-	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//format
-	DESERIALIZE(buffer, &packet->regionInfo.mapIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->regionInfo.x, sizeof(int));
-	DESERIALIZE(buffer, &packet->regionInfo.y, sizeof(int));
-}
-
-void deserializeRegionContent(SerialPacket* packet, char* buffer) {
-	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//format
-	DESERIALIZE(buffer, &packet->regionInfo.mapIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->regionInfo.x, sizeof(int));
-	DESERIALIZE(buffer, &packet->regionInfo.y, sizeof(int));
-
-	//an object to work on
-	BlankAllocator().Create(
-		&packet->regionInfo.region,
-		packet->regionInfo.x,
-		packet->regionInfo.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->regionInfo.region->SetTile(i, j, k, *reinterpret_cast<Region::type_t*>(buffer));
-				buffer += sizeof(Region::type_t);
-			}
-		}
-	}
-}
-
-void deserializeCharacter(SerialPacket* packet, char* buffer) {
-	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//indexes
-	DESERIALIZE(buffer, &packet->characterInfo.clientIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->characterInfo.characterIndex, sizeof(int));
-
-	//texts
-	DESERIALIZE(buffer, packet->clientInfo.handle, PACKET_STRING_SIZE);
-	DESERIALIZE(buffer, packet->clientInfo.avatar, PACKET_STRING_SIZE);
-
-	//vectors
-	DESERIALIZE(buffer, &packet->characterInfo.position.x, sizeof(double));
-	DESERIALIZE(buffer, &packet->characterInfo.position.y, sizeof(double));
-	DESERIALIZE(buffer, &packet->characterInfo.motion.x, sizeof(double));
-	DESERIALIZE(buffer, &packet->characterInfo.motion.y, sizeof(double));
-}
-
-//-------------------------
-//the interface functions
-//-------------------------
-
-void serialize(SerialPacket* packet, void* buffer) {
-	switch(packet->meta.type) {
-		//No extra data
-		case SerialPacket::Type::NONE:
-		case SerialPacket::Type::PING:
-		case SerialPacket::Type::PONG:
-		case SerialPacket::Type::BROADCAST_REQUEST:
-			serializeType(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//Server info
-		case SerialPacket::Type::BROADCAST_RESPONSE:
-			serializeServer(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//Client info
-		case SerialPacket::Type::JOIN_REQUEST:
-		case SerialPacket::Type::JOIN_RESPONSE:
-		case SerialPacket::Type::SYNCHRONIZE:
-		case SerialPacket::Type::DISCONNECT:
-		case SerialPacket::Type::SHUTDOWN:
-			serializeClient(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//region info
-		case SerialPacket::Type::REGION_REQUEST:
-			serializeRegionFormat(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		case SerialPacket::Type::REGION_CONTENT:
-			serializeRegionContent(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//Character info
-		case SerialPacket::Type::CHARACTER_NEW:
-		case SerialPacket::Type::CHARACTER_DELETE:
-		case SerialPacket::Type::CHARACTER_UPDATE:
-			serializeCharacter(packet, reinterpret_cast<char*>(buffer));
-		break;
-	}
-}
-
-void deserialize(SerialPacket* packet, void* buffer) {
-	//find the type, so that you can actually deserialize the packet!
-	deserializeType(packet, reinterpret_cast<char*>(buffer));
-	switch(packet->meta.type) {
-		//No extra data
-		case SerialPacket::Type::NONE:
-		case SerialPacket::Type::PING:
-		case SerialPacket::Type::PONG:
-		case SerialPacket::Type::BROADCAST_REQUEST:
-			//NOTHING
-		break;
-
-		//Server info
-		case SerialPacket::Type::BROADCAST_RESPONSE:
-			deserializeServer(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//Client info
-		case SerialPacket::Type::JOIN_REQUEST:
-		case SerialPacket::Type::JOIN_RESPONSE:
-		case SerialPacket::Type::SYNCHRONIZE:
-		case SerialPacket::Type::DISCONNECT:
-		case SerialPacket::Type::SHUTDOWN:
-			deserializeClient(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//region info
-		case SerialPacket::Type::REGION_REQUEST:
-			deserializeRegionFormat(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		case SerialPacket::Type::REGION_CONTENT:
-			deserializeRegionContent(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//Character info
-		case SerialPacket::Type::CHARACTER_NEW:
-		case SerialPacket::Type::CHARACTER_DELETE:
-		case SerialPacket::Type::CHARACTER_UPDATE:
-			deserializeCharacter(packet, reinterpret_cast<char*>(buffer));
-		break;
-	}
-}

common/network/serial_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -22,106 +22,45 @@
 #ifndef SERIALPACKET_HPP_
 #define SERIALPACKET_HPP_
 
-#include "vector2.hpp"
-#include "region.hpp"
+#include "serial_packet_base.hpp"
+#include "character_packet.hpp"
+#include "client_packet.hpp"
+#include "monster_packet.hpp"
+#include "region_packet.hpp"
+#include "server_packet.hpp"
+#include "text_packet.hpp"
 
-#include "SDL/SDL_net.h"
+//SerialPacketBase is defined in serial_packet_base.hpp
+typedef SerialPacketBase SerialPacket;
 
-#define NETWORK_VERSION 20140428
-#define PACKET_STRING_SIZE 100
+//DOCS: NETWORK_VERSION is used to discern compatible servers and clients
+constexpr int NETWORK_VERSION = 20150304;
 
-#pragma pack(push, 0)
-
-union SerialPacket {
-	//types of packets
-	enum class Type {
-		//default: there is something wrong
-		NONE = 0,
-
-		//not used
-		PING = 1,
-		PONG = 2,
-
-		//Searching for a server to join
-		BROADCAST_REQUEST = 3,
-		BROADCAST_RESPONSE = 4,
-
-		//try to join the server
-		JOIN_REQUEST = 5,
-		JOIN_RESPONSE = 6,
-
-		//mass update
-		SYNCHRONIZE = 7,
-
-		//disconnect from the server
-		DISCONNECT = 8,
-
-		//shut down the server
-		SHUTDOWN = 9,
-
-		//map data
-		REGION_REQUEST = 10,
-		REGION_CONTENT = 11,
-
-		//Character movement, etc.
-		CHARACTER_NEW = 12,
-		CHARACTER_DELETE = 13,
-		CHARACTER_UPDATE = 14,
-
-		//TODO: combat packets
+union MaxPacket {
+	CharacterPacket a;
+	ClientPacket b;
+	MonsterPacket c;
+	RegionPacket d;
+	ServerPacket e;
+	TextPacket f;
 };
 
-	//metadata on the packet itself
-	struct Metadata {
-		Type type;
-		IPaddress srcAddress;
-	}meta;
+constexpr int MAX_PACKET_SIZE = sizeof(MaxPacket);
 
-	//information about the server
-	struct ServerInformation {
-		Metadata meta;
-		int networkVersion;
-		char name[PACKET_STRING_SIZE];
-		int playerCount;
-	}serverInfo;
+/* 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)
+*/
 
-	//information about the client
-	struct ClientInformation {
-		Metadata meta;
-		int clientIndex;
-		int characterIndex;
-		char username[PACKET_STRING_SIZE];
-		char handle[PACKET_STRING_SIZE];
-		char avatar[PACKET_STRING_SIZE];
-	}clientInfo;
-
-	//map data
-	struct RegionInformation {
-		Metadata meta;
-		int mapIndex;
-		int x, y;
-		Region* region;
-	}regionInfo;
-
-	//information about a character
-	struct CharacterInformation {
-		Metadata meta;
-		int clientIndex;
-		int characterIndex;
-		char handle[PACKET_STRING_SIZE];
-		char avatar[PACKET_STRING_SIZE];
-		int mapIndex;
-		Vector2 position;
-		Vector2 motion;
-	}characterInfo;
-
-	//defaults
-	SerialPacket() {
-		meta.type = Type::NONE;
-		meta.srcAddress = {0,0};
-	}
-};
-
-#pragma pack(pop)
+constexpr int PACKET_BUFFER_SIZE =
+	sizeof(SerialPacketType) +
+	REGION_METADATA_FOOTPRINT +
+	REGION_TILE_FOOTPRINT +
+	REGION_SOLID_FOOTPRINT;
 
 #endif

common/network/serial_packet_type.hpp

@@ -0,0 +1,187 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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.
+ * FORMAT_* is for internal use, deviding the different format bounds.
+*/
+
+enum class SerialPacketType {
+	//default: there is something wrong
+	NONE,
+
+	//-------------------------
+	//ServerPacket
+	//  name, player count, version
+	//-------------------------
+
+	FORMAT_SERVER,
+
+	//heartbeat
+	PING,
+	PONG,
+
+	//Used for finding available servers
+	BROADCAST_REQUEST,
+	BROADCAST_RESPONSE,
+
+	FORMAT_END_SERVER,
+
+	//-------------------------
+	//ClientPacket
+	//  client index, account index, username
+	//-------------------------
+
+	FORMAT_CLIENT,
+
+	//Connecting to a server as a client
+	JOIN_REQUEST,
+	JOIN_RESPONSE,
+
+	//disconnect from the server
+	DISCONNECT_REQUEST,
+	DISCONNECT_RESPONSE,
+	ADMIN_DISCONNECT_FORCED,
+
+	//load the account
+	LOGIN_REQUEST,
+	LOGIN_RESPONSE,
+
+	//unload the account
+	LOGOUT_REQUEST,
+	LOGOUT_RESPONSE,
+
+	//shut down the server
+	ADMIN_SHUTDOWN_REQUEST,
+
+	FORMAT_END_CLIENT,
+
+	//-------------------------
+	//RegionPacket
+	//  room index, x, y, raw data
+	//-------------------------
+
+	FORMAT_REGION,
+
+	//map data
+	REGION_REQUEST,
+	REGION_CONTENT,
+
+	FORMAT_END_REGION,
+
+	//-------------------------
+	//CharacterPacket
+	//  character index,
+	//  handle, avatar,
+	//  account index (owner),
+	//  room index, origin, motion
+	//-------------------------
+
+	FORMAT_CHARACTER,
+
+	//full data update
+	CHARACTER_UPDATE,
+
+	//character management
+	CHARACTER_CREATE,
+	CHARACTER_DELETE,
+	CHARACTER_LOAD,
+	CHARACTER_UNLOAD,
+
+	//find out info from the server
+	QUERY_CHARACTER_EXISTS,
+	QUERY_CHARACTER_STATS,
+	QUERY_CHARACTER_LOCATION,
+
+	//actions taken
+	CHARACTER_MOVEMENT,
+	CHARACTER_ATTACK,
+	CHARACTER_DAMAGE,
+
+	//admin control
+//	ADMIN_SET_CHARACTER_ORIGIN,
+
+	FORMAT_END_CHARACTER,
+
+	//-------------------------
+	//MonsterPacket
+	//  monster index,
+	//  handle, avatar
+	//  bounds
+	//  room index, origin, motion
+	//-------------------------
+
+	FORMAT_MONSTER,
+
+	//full data update
+	MONSTER_UPDATE,
+
+	//character management
+	MONSTER_CREATE,
+	MONSTER_DELETE,
+
+	//find out info from the server
+	QUERY_MONSTER_EXISTS,
+	QUERY_MONSTER_STATS,
+	QUERY_MONSTER_LOCATION,
+
+	//actions taken
+	MONSTER_MOVEMENT,
+	MONSTER_ATTACK,
+	MONSTER_DAMAGE,
+
+	FORMAT_END_MONSTER,
+
+	//-------------------------
+	//TextPacket
+	//  name, text
+	//-------------------------
+
+	FORMAT_TEXT,
+
+	//general speech
+	TEXT_BROADCAST,
+	TEXT_SPEECH,
+	TEXT_WHISPER,
+
+	//rejection/error messages
+	JOIN_REJECTION,
+	LOGIN_REJECTION,
+	REGION_REJECTION,
+	CHARACTER_REJECTION,
+	MONSTER_REJECTION,
+	SHUTDOWN_REJECTION,
+	QUERY_REJECTION,
+
+	FORMAT_END_TEXT,
+
+	//-------------------------
+	//not used
+	//-------------------------
+
+	LAST
+};
+
+#endif

common/network/serial_utility.cpp

@@ -0,0 +1,105 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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"
+
+//packet types
+#include "character_packet.hpp"
+#include "client_packet.hpp"
+#include "monster_packet.hpp"
+#include "region_packet.hpp"
+#include "server_packet.hpp"
+#include "text_packet.hpp"
+
+#include <cstring>
+
+//macros
+#define BOUNDS(type, lower, upper) ((type) > (lower) && (type) < (upper))
+
+//raw memory copy
+void serialCopy(void** buffer, void* data, int size) {
+	memcpy(*buffer, data, size);
+	*buffer = reinterpret_cast<char*>(*buffer) + size;
+}
+
+void deserialCopy(void** buffer, void* data, int size) {
+	memcpy(data, *buffer, size);
+	*buffer = reinterpret_cast<char*>(*buffer) + size;
+}
+
+//DOCS: The server and client MUST use the correct packet types
+
+//main switch functions
+void serializePacket(void* buffer, SerialPacketBase* packet) {
+	if (BOUNDS(packet->type, SerialPacketType::FORMAT_SERVER, SerialPacketType::FORMAT_END_SERVER)) {
+		serializeServer(buffer, static_cast<ServerPacket*>(packet));
+	}
+
+	if (BOUNDS(packet->type, SerialPacketType::FORMAT_CLIENT, SerialPacketType::FORMAT_END_CLIENT)) {
+		serializeClient(buffer, static_cast<ClientPacket*>(packet));
+	}
+
+	if (BOUNDS(packet->type, SerialPacketType::FORMAT_REGION, SerialPacketType::FORMAT_END_REGION)) {
+		serializeRegion(buffer, static_cast<RegionPacket*>(packet));
+	}
+
+	if (BOUNDS(packet->type, SerialPacketType::FORMAT_CHARACTER, SerialPacketType::FORMAT_END_CHARACTER)) {
+		serializeCharacter(buffer, static_cast<CharacterPacket*>(packet));
+	}
+
+	if (BOUNDS(packet->type, SerialPacketType::FORMAT_MONSTER, SerialPacketType::FORMAT_END_MONSTER)) {
+		serializeMonster(buffer, static_cast<MonsterPacket*>(packet));
+	}
+
+	if (BOUNDS(packet->type, SerialPacketType::FORMAT_TEXT, SerialPacketType::FORMAT_END_TEXT)) {
+		serializeText(buffer, static_cast<TextPacket*>(packet));
+	}
+}
+
+void deserializePacket(void* buffer, SerialPacketBase* packet) {
+	//find the type, so that you can actually deserialize the packet!
+	SerialPacketType type;
+	memcpy(&type, buffer, sizeof(SerialPacketType));
+
+	if (BOUNDS(type, SerialPacketType::FORMAT_SERVER, SerialPacketType::FORMAT_END_SERVER)) {
+		deserializeServer(buffer, static_cast<ServerPacket*>(packet));
+	}
+
+	if (BOUNDS(type, SerialPacketType::FORMAT_CLIENT, SerialPacketType::FORMAT_END_CLIENT)) {
+		deserializeClient(buffer, static_cast<ClientPacket*>(packet));
+	}
+
+	if (BOUNDS(type, SerialPacketType::FORMAT_REGION, SerialPacketType::FORMAT_END_REGION)) {
+		deserializeRegion(buffer, static_cast<RegionPacket*>(packet));
+	}
+
+	if (BOUNDS(type, SerialPacketType::FORMAT_CHARACTER, SerialPacketType::FORMAT_END_CHARACTER)) {
+		deserializeCharacter(buffer, static_cast<CharacterPacket*>(packet));
+	}
+
+	if (BOUNDS(type, SerialPacketType::FORMAT_MONSTER, SerialPacketType::FORMAT_END_MONSTER)) {
+		deserializeMonster(buffer, static_cast<MonsterPacket*>(packet));
+	}
+
+	if (BOUNDS(type, SerialPacketType::FORMAT_TEXT, SerialPacketType::FORMAT_END_TEXT)) {
+		deserializeText(buffer, static_cast<TextPacket*>(packet));
+	}
+}

common/network/serial_utility.hpp

@@ -0,0 +1,37 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 SERIALIZEUTILITY_HPP_
+#define SERIALIZEUTILITY_HPP_
+
+#include "serial_packet_base.hpp"
+
+#include <cstring>
+
+//raw memory copy
+void serialCopy(void** buffer, void* data, int size);
+void deserialCopy(void** buffer, void* data, int size);
+
+//primary functions
+void serializePacket(void* buffer, SerialPacketBase* packet);
+void deserializePacket(void* buffer, SerialPacketBase* packet);
+
+#endif

common/network/udp_network_utility.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,47 +21,47 @@
 */
 #include "udp_network_utility.hpp"
 
+#include "serial_packet.hpp"
+#include "serial_utility.hpp"
+
 #include <stdexcept>
 
-void UDPNetworkUtility::Open(int port, int packSize) {
-	if (!(socket = SDLNet_UDP_Open(port))) {
-		Close();
-		throw(std::runtime_error("Failed to open a UDP socket"));
-	}
+//DOCS: memset() is used before sending a packet to remove old data; you don't want to send sensitive data over the network
+//NOTE: don't confuse SerialPacketBase with UDPpacket
 
-	if (!(packOut = SDLNet_AllocPacket(packSize))) {
+void UDPNetworkUtility::Open(int port) {
+	socket = SDLNet_UDP_Open(port);
+	packet = SDLNet_AllocPacket(PACKET_BUFFER_SIZE);
+	if (!socket || !packet) {
 		Close();
-		throw(std::runtime_error("Failed to allocate the out packet"));
-	}
-
-	if (!(packIn = SDLNet_AllocPacket(packSize))) {
-		Close();
-		throw(std::runtime_error("Failed to allocate the in packet"));
+		throw(std::runtime_error("Failed to open UDPNetworkUtility"));
 	}
 }
 
 void UDPNetworkUtility::Close() {
 	SDLNet_UDP_Close(socket);
-	SDLNet_FreePacket(packOut);
-	SDLNet_FreePacket(packIn);
+	SDLNet_FreePacket(packet);
 	socket = nullptr;
-	packOut = nullptr;
-	packIn = nullptr;
+	packet = nullptr;
 }
 
+//-------------------------
+//bind to a channel
+//-------------------------
+
 int UDPNetworkUtility::Bind(const char* ip, int port, int channel) {
 	IPaddress add;
 	if (SDLNet_ResolveHost(&add, ip, port) == -1) {
 		throw(std::runtime_error("Failed to resolve a host"));
 	}
 
-	return Bind(&add, channel);
+	return Bind(add, channel);
 }
 
-int UDPNetworkUtility::Bind(IPaddress* add, int channel) {
-	int ret = SDLNet_UDP_Bind(socket, channel, add);
+int UDPNetworkUtility::Bind(IPaddress add, int channel) {
+	int ret = SDLNet_UDP_Bind(socket, channel, &add);
 
-	if (ret == -1) {
+	if (ret < 0) {
 		throw(std::runtime_error("Failed to bind to a channel"));
 	}
 
@@ -72,25 +72,29 @@ void UDPNetworkUtility::Unbind(int channel) {
 	SDLNet_UDP_Unbind(socket, channel);
 }
 
-int UDPNetworkUtility::Send(const char* ip, int port, void* data, int len) {
+//-------------------------
+//send a buffer
+//-------------------------
+
+int UDPNetworkUtility::SendTo(const char* ip, int port, void* data, int len) {
 	IPaddress add;
 	if (SDLNet_ResolveHost(&add, ip, port) == -1) {
 		throw(std::runtime_error("Failed to resolve a host"));
 	}
 
-	Send(&add, data, len);
+	SendTo(add, data, len);
 }
 
-int UDPNetworkUtility::Send(IPaddress* add, void* data, int len) {
-	if (len > packOut->maxlen) {
-		throw(std::runtime_error("Failed to copy the data into the packet"));
+int UDPNetworkUtility::SendTo(IPaddress add, void* data, int len) {
+	if (len > packet->maxlen) {
+		throw(std::runtime_error("The buffer is to large for the UDPpacket"));
 	}
-	memset(packOut->data, 0, packOut->maxlen);
-	memcpy(packOut->data, data, len);
-	packOut->len = len;
-	packOut->address = *add;
+	memset(packet->data, 0, packet->maxlen);
+	memcpy(packet->data, data, len);
+	packet->len = len;
+	packet->address = add;
 
-	int ret = SDLNet_UDP_Send(socket, -1, packOut);
+	int ret = SDLNet_UDP_Send(socket, -1, packet);
 
 	if (ret <= 0) {
 		throw(std::runtime_error("Failed to send a packet"));
@@ -99,15 +103,15 @@ int UDPNetworkUtility::Send(IPaddress* add, void* data, int len) {
 	return ret;
 }
 
-int UDPNetworkUtility::Send(int channel, void* data, int len) {
-	if (len > packOut->maxlen) {
-		throw(std::runtime_error("Failed to copy the data into the packet"));
+int UDPNetworkUtility::SendTo(int channel, void* data, int len) {
+	if (len > packet->maxlen) {
+		throw(std::runtime_error("The buffer is to large for the UDPpacket"));
 	}
-	memset(packOut->data, 0, packOut->maxlen);
-	memcpy(packOut->data, data, len);
-	packOut->len = len;
+	memset(packet->data, 0, packet->maxlen);
+	memcpy(packet->data, data, len);
+	packet->len = len;
 
-	int ret = SDLNet_UDP_Send(socket, channel, packOut);
+	int ret = SDLNet_UDP_Send(socket, channel, packet);
 
 	if (ret <= 0) {
 		throw(std::runtime_error("Failed to send a packet"));
@@ -116,20 +120,20 @@ int UDPNetworkUtility::Send(int channel, void* data, int len) {
 	return ret;
 }
 
-int UDPNetworkUtility::SendAll(void* data, int len) {
-	if (len > packOut->maxlen) {
-		throw(std::runtime_error("Failed to copy the data into the packet"));
+int UDPNetworkUtility::SendToAllChannels(void* data, int len) {
+	if (len > packet->maxlen) {
+		throw(std::runtime_error("The buffer is to large for the UDPpacket"));
 	}
-	memset(packOut->data, 0, packOut->maxlen);
-	memcpy(packOut->data, data, len);
-	packOut->len = len;
+	memset(packet->data, 0, packet->maxlen);
+	memcpy(packet->data, data, len);
+	packet->len = len;
 
 	int sent = 0;
 
 	//send to all bound channels
 	for (int i = 0; i < SDLNET_MAX_UDPCHANNELS; i++) {
 		if (SDLNet_UDP_GetPeerAddress(socket, i)) {
-			sent += SDLNet_UDP_Send(socket, i, packOut);
+			sent += SDLNet_UDP_Send(socket, i, packet);
 		}
 	}
 
@@ -137,8 +141,80 @@ int UDPNetworkUtility::SendAll(void* data, int len) {
 }
 
 int UDPNetworkUtility::Receive() {
-	memset(packIn->data, 0, packIn->maxlen);
-	int ret = SDLNet_UDP_Recv(socket, packIn);
+	memset(packet->data, 0, packet->maxlen);
+	int ret = SDLNet_UDP_Recv(socket, packet);
+
+	if (ret < 0) {
+		throw(std::runtime_error("Unknown network error occured"));
+	}
+
+	return ret;
+}
+
+//-------------------------
+//send a SerialPacketBase
+//-------------------------
+
+int UDPNetworkUtility::SendTo(const char* ip, int port, SerialPacketBase* serialPacket) {
+	IPaddress add;
+	if (SDLNet_ResolveHost(&add, ip, port) == -1) {
+		throw(std::runtime_error("Failed to resolve a host"));
+	}
+
+	SendTo(add, serialPacket);
+}
+
+int UDPNetworkUtility::SendTo(IPaddress add, SerialPacketBase* serialPacket) {
+	memset(packet->data, 0, packet->maxlen);
+	serializePacket(packet->data, serialPacket);
+	packet->len = PACKET_BUFFER_SIZE;
+	packet->address = add;
+
+	int ret = SDLNet_UDP_Send(socket, -1, packet);
+
+	if (ret <= 0) {
+		throw(std::runtime_error("Failed to send a packet"));
+	}
+
+	return ret;
+}
+
+int UDPNetworkUtility::SendTo(int channel, SerialPacketBase* serialPacket) {
+	memset(packet->data, 0, packet->maxlen);
+	serializePacket(packet->data, serialPacket);
+	packet->len = PACKET_BUFFER_SIZE;
+
+	int ret = SDLNet_UDP_Send(socket, channel, packet);
+
+	if (ret <= 0) {
+		throw(std::runtime_error("Failed to send a packet"));
+	}
+
+	return ret;
+}
+
+int UDPNetworkUtility::SendToAllChannels(SerialPacketBase* serialPacket) {
+	memset(packet->data, 0, packet->maxlen);
+	serializePacket(packet->data, serialPacket);
+	packet->len = PACKET_BUFFER_SIZE;
+
+	int sent = 0;
+
+	//send to all bound channels
+	for (int i = 0; i < SDLNET_MAX_UDPCHANNELS; i++) {
+		if (SDLNet_UDP_GetPeerAddress(socket, i)) {
+			sent += SDLNet_UDP_Send(socket, i, packet);
+		}
+	}
+
+	return sent;
+}
+
+int UDPNetworkUtility::Receive(SerialPacketBase* serialPacket) {
+	memset(packet->data, 0, packet->maxlen);
+	int ret = SDLNet_UDP_Recv(socket, packet);
+	deserializePacket(packet->data, serialPacket);
+	serialPacket->srcAddress = packet->address;
 
 	if (ret < 0) {
 		throw(std::runtime_error("Unknown network error occured"));

common/network/udp_network_utility.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -22,50 +22,56 @@
 #ifndef UDPNETWORKUTILITY_HPP_
 #define UDPNETWORKUTILITY_HPP_
 
+//common
+#include "serial_packet_base.hpp"
+#include "singleton.hpp"
+
+//APIs
 #include "SDL/SDL_net.h"
 
-class UDPNetworkUtility {
+class UDPNetworkUtility : public Singleton<UDPNetworkUtility> {
 public:
-	UDPNetworkUtility() = default;
-	~UDPNetworkUtility() = default;
-
-	void Open(int port, int packSize);
+	void Open(int port);
 	void Close();
 
 	//bind to a channel
 	int Bind(const char* ip, int port, int channel = -1);
-	int Bind(IPaddress* add, int channel = -1);
+	int Bind(IPaddress add, int channel = -1);
 	void Unbind(int channel);
 
 	IPaddress* GetIPAddress(int channel) {
 		return SDLNet_UDP_GetPeerAddress(socket, channel);
 	}
 
-	int Send(const char* ip, int port, void* data, int len);
-	int Send(IPaddress* add, void* data, int len);
-	int Send(int channel, void* data, int len);
-	int SendAll(void* data, int len);
+	//send a buffer
+	int SendTo(const char* ip, int port, void* data, int len);
+	int SendTo(IPaddress add, void* data, int len);
+	int SendTo(int channel, void* data, int len);
+	int SendToAllChannels(void* data, int len);
 	int Receive();
 
-	void* GetOutData() const {
-		return reinterpret_cast<void*>(packOut->data);
-	};
-	void* GetInData() const {
-		return reinterpret_cast<void*>(packIn->data);
-	};
-	UDPpacket* GetOutPacket() const {
-		return packOut;
-	}
-	UDPpacket* GetInPacket() const {
-		return packIn;
+	//send a SerialPacketBase
+	int SendTo(const char* ip, int port, SerialPacketBase* serialPacket);
+	int SendTo(IPaddress add, SerialPacketBase* serialPacket);
+	int SendTo(int channel, SerialPacketBase* serialPacket);
+	int SendToAllChannels(SerialPacketBase* serialPacket);
+	int Receive(SerialPacketBase* serialPacket);
+
+	//accessors
+	UDPpacket* GetPacket() const {
+		return packet;
 	}
 	UDPsocket GetSocket() const {
 		return socket;
 	}
 private:
+	friend Singleton<UDPNetworkUtility>;
+
+	UDPNetworkUtility() = default;
+	~UDPNetworkUtility() = default;
+
 	UDPsocket socket = nullptr;
-	UDPpacket* packOut = nullptr;
-	UDPpacket* packIn = nullptr;
+	UDPpacket* packet = nullptr;
 };
 
 #endif

common/script/linit.cpp

@@ -1,72 +0,0 @@
-/*
-** $Id: linit.c,v 1.32 2011/04/08 19:17:36 roberto Exp $
-** Initialization of libraries for lua.c and other clients
-** See Copyright Notice in lua.h
-*/
-
-/* Modified for use in Tortuga, renamed to linit.cpp
-*/
-
-
-/*
-** If you embed Lua in your program and need to open the standard
-** libraries, call luaL_openlibs in your program. If you need a
-** different set of libraries, copy this file to your project and edit
-** it to suit your needs.
-*/
-
-
-#define linit_c
-#define LUA_LIB
-
-#include "lua/lua.hpp"
-#include "map_api.hpp"
-
-
-/*
-** these libs are loaded by lua.c and are readily available to any Lua
-** program
-*/
-static const luaL_Reg loadedlibs[] = {
-  /* Standard libs */
-  {"_G", luaopen_base},
-  {LUA_LOADLIBNAME, luaopen_package},
-  {LUA_COLIBNAME, luaopen_coroutine},
-  {LUA_TABLIBNAME, luaopen_table},
-  {LUA_IOLIBNAME, luaopen_io},
-  {LUA_OSLIBNAME, luaopen_os},
-  {LUA_STRLIBNAME, luaopen_string},
-  {LUA_BITLIBNAME, luaopen_bit32},
-  {LUA_MATHLIBNAME, luaopen_math},
-  {LUA_DBLIBNAME, luaopen_debug},
-
-  /* custom libs */
-  {LUA_MAPLIBNAME, luaopen_mapapi},
-
-  {NULL, NULL}
-};
-
-
-/*
-** these libs are preloaded and must be required before used
-*/
-static const luaL_Reg preloadedlibs[] = {
-  {NULL, NULL}
-};
-
-
-LUALIB_API void luaL_openlibs (lua_State *L) {
-  const luaL_Reg *lib;
-  /* call open functions from 'loadedlibs' and set results to global table */
-  for (lib = loadedlibs; lib->func; lib++) {
-    luaL_requiref(L, lib->name, lib->func, 1);
-    lua_pop(L, 1);  /* remove lib */
-  }
-  /* add open functions from 'preloadedlibs' into 'package.preload' table */
-  luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD");
-  for (lib = preloadedlibs; lib->func; lib++) {
-    lua_pushcfunction(L, lib->func);
-    lua_setfield(L, -2, lib->name);
-  }
-  lua_pop(L, 1);  /* remove _PRELOAD table */
-}