lobby_server.cpp compiles

Updated the ClientApplication class to help support the new design, but
it's not finished because of that module's dependence on the various
scenes.

Updated the following scenes:

* CleanUp
* MainMenu
* OptionsMenu

The following source files (in client/scenes/) compile correctly:

* base_scene.cpp
* splash_screen.cpp
* clean_up.cpp
* main_menu.cpp
* options_menu.cpp

The folling source files (in client/scenes/) do not compile:

* in_world.cpp
* in_combat.cpp
* lobby_menu.cpp

.gitignore

@@ -9,15 +9,13 @@
 Release/
 Debug/
 Out/
-release/
-debug/
-out/
 
 #Project generated files
 *.db
 *.o
 *.a
 *.exe
+*.diff
 
 #Shell files
 *.bat

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "common"]
-	path = common
-	url = https://github.com/Ratstail91/Tortuga.git
-[submodule "bin"]
-	path = bin
-	url = https://github.com/Ratstail91/Tortuga.git

README.md

@@ -1,41 +1,29 @@
-## Outline
+The most recent stable build for Windows can be found [here](https://dl.dropboxusercontent.com/u/46669050/Tortuga.rar).
 
-Tortuga is a 2D MMORPG featuring permadeath, with an emphasis on multiplayer cooperation, exploration and customization. The game runs on customizable public and private servers.
+Tortuga is a 2D multiplayer JRPG featuring permadeath (deletion of a character upon death). The emphasis of this game is on multiplayer cooperation, exploration and customization. The game runs on customizable server software that can support up to 150 simultaneous players or more.
 
-This game is inspired by classic 2D RPGs (Final Fantasy, The Legend of Zelda), as well as more modern sandboxes and 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-win.rar).
-* The most recent stable build for Linux can be found [here](https://dl.dropboxusercontent.com/u/46669050/Tortuga-linux.tar).
+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.
 
 ## Documentation
 
-* [Tortuga Wiki](https://github.com/Ratstail91/Tortuga/wiki) - Full documentation (incomplete)
-* [Tortuga Bug Tracker](https://github.com/Ratstail91/Tortuga/issues) - A list of all known bugs and issues
+Tortuga's full documentation can be found in a separate branch, see [Tortuga/docs](https://github.com/Ratstail91/Tortuga/tree/docs).  
+For Tortuga's primary documentation, please read the [Tortuga Game Design Document](https://github.com/Ratstail91/Tortuga/blob/docs/Tortuga%20Game%20Design%20Document.docx?raw=true).  
+For a list of known bugs, see the [GitHub bug tracker](https://github.com/Ratstail91/Tortuga/issues).
 
 ## External Dependencies
 
-* [SDL 2.0](http://www.libsdl.org/) - Simple DirectMedia Layer API
-* [SDL_image 2.0](https://www.libsdl.org/projects/SDL_image/) - An SDL Extension for loading multiple image file formats
-* [SDL_net 2.0](http://www.libsdl.org/projects/SDL_net/) - SDL's networking extension
-* [SDL_ttf 2.0](https://www.libsdl.org/projects/SDL_ttf/) - An SDL extention for rendering fonts
+* [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
 
-## Tools
-
-* [WinRAR](http://www.rarlab.com/) - A free archive tool; needed for Windows distribution
-* [tar](http://www.gnu.org/software/tar/manual/) - The GNU archive tool; needed for Linux distribution
-* [Dropbox](https://www.dropbox.com/) - For hosting and 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-2015 Kayne Ruse
+Copyright (c) 2013, 2014 Kayne Ruse
 
 This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
 

client/base_scene.cpp

@@ -1,105 +0,0 @@
-/* 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_scene.hpp"
-
-SDL_Renderer* BaseScene::rendererHandle = nullptr;
-
-BaseScene::BaseScene() {
-	//EMPTY
-}
-
-BaseScene::~BaseScene() {
-	//EMPTY
-}
-
-void BaseScene::RenderFrame(SDL_Renderer* renderer) {
-	//EMPTY
-}
-
-void BaseScene::SetRenderer(SDL_Renderer* r) {
-	rendererHandle = r;
-}
-
-SDL_Renderer* BaseScene::GetRenderer() {
-	return rendererHandle;
-}
-
-void BaseScene::SetSceneSignal(SceneSignal signal) {
-	sceneSignal = signal;
-}
-
-SceneSignal BaseScene::GetSceneSignal() {
-	return sceneSignal;
-}
-
-//-------------------------
-//frame phases
-//-------------------------
-
-void BaseScene::FrameStart() {
-	//EMPTY
-}
-
-void BaseScene::Update() {
-	//EMPTY
-}
-
-void BaseScene::FrameEnd() {
-	//EMPTY
-}
-
-//-------------------------
-//input events
-//-------------------------
-
-void BaseScene::QuitEvent() {
-	sceneSignal = SceneSignal::QUIT;
-}
-
-void BaseScene::MouseMotion(SDL_MouseMotionEvent const& event) {
-	//EMPTY
-}
-
-void BaseScene::MouseButtonDown(SDL_MouseButtonEvent const& event) {
-	//EMPTY
-}
-
-void BaseScene::MouseButtonUp(SDL_MouseButtonEvent const& event) {
-	//EMPTY
-}
-
-void BaseScene::MouseWheel(SDL_MouseWheelEvent const& event) {
-	//EMPTY
-}
-
-void BaseScene::KeyDown(SDL_KeyboardEvent const& event) {
-	//preference as a default
-	switch(event.keysym.sym) {
-		case SDLK_ESCAPE:
-			QuitEvent();
-		break;
-	}
-}
-
-void BaseScene::KeyUp(SDL_KeyboardEvent const& event) {
-	//EMPTY
-}

client/base_scene.hpp

@@ -1,61 +0,0 @@
-/* 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.
-*/
-#pragma once
-
-#include "scene_signal.hpp"
-
-#include "SDL2/SDL.h"
-
-class BaseScene {
-public:
-	BaseScene();
-	virtual ~BaseScene();
-
-	virtual void RenderFrame(SDL_Renderer*);
-	static void SetRenderer(SDL_Renderer*);
-	SceneSignal GetSceneSignal();
-
-	//frame phases
-	virtual void FrameStart();
-	virtual void Update();
-	virtual void FrameEnd();
-
-	//input events
-	virtual void QuitEvent();
-	virtual void MouseMotion(SDL_MouseMotionEvent const& event);
-	virtual void MouseButtonDown(SDL_MouseButtonEvent const& event);
-	virtual void MouseButtonUp(SDL_MouseButtonEvent const& event);
-	virtual void MouseWheel(SDL_MouseWheelEvent const& event);
-	virtual void KeyDown(SDL_KeyboardEvent const& event);
-	virtual void KeyUp(SDL_KeyboardEvent const& event);
-
-	//TODO: (9) joystick and controller events
-
-protected:
-	//control
-	static SDL_Renderer* GetRenderer();
-	void SetSceneSignal(SceneSignal);
-
-private:
-	static SDL_Renderer* rendererHandle;
-	SceneSignal sceneSignal = SceneSignal::CONTINUE;
-};

client/channels.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,8 +19,11 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef CHANNELS_HPP_
+#define CHANNELS_HPP_
 
 enum Channels {
 	SERVER = 0
 };
+
+#endif

client/character.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -19,28 +19,35 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "base_character.hpp"
+#include "character.hpp"
 
-//TODO: (3) remove this
-#include "config_utility.hpp"
+void Character::Update(double delta) {
+	if (motion.x && motion.y) {
+		origin += motion * delta * CHARACTER_WALKING_MOD;
+	}
+	else if (motion != 0) {
+		origin += motion * delta;
+	}
+	sprite.Update(delta);
+}
 
-//-------------------------
-//graphics
-//-------------------------
+void Character::DrawTo(SDL_Surface* const dest, int camX, int camY) {
+	sprite.DrawTo(dest, origin.x - camX, origin.y - camY);
+}
 
-void BaseCharacter::CorrectSprite() {
+void Character::CorrectSprite() {
 	//NOTE: These must correspond to the sprite sheet in use
 	if (motion.y > 0) {
-		sprite.SetIndexY(0);
+		sprite.SetYIndex(0);
 	}
 	else if (motion.y < 0) {
-		sprite.SetIndexY(1);
+		sprite.SetYIndex(1);
 	}
 	else if (motion.x > 0) {
-		sprite.SetIndexY(3);
+		sprite.SetYIndex(3);
 	}
 	else if (motion.x < 0) {
-		sprite.SetIndexY(2);
+		sprite.SetYIndex(2);
 	}
 
 	//animation
@@ -49,36 +56,6 @@ void BaseCharacter::CorrectSprite() {
 	}
 	else {
 		sprite.SetDelay(0);
-		sprite.SetIndexX(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(SDL_Renderer* const renderer, std::string s) {
-	avatar = s;
-	sprite.Load(renderer, ConfigUtility::GetSingleton()["dir.sprites"] + avatar, CHARACTER_CELLS_X, CHARACTER_CELLS_Y);
-	return avatar;
-}
-
-std::string BaseCharacter::GetAvatar() const {
-	return avatar;
-}

client/character.hpp

@@ -0,0 +1,86 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef CHARACTER_HPP_
+#define CHARACTER_HPP_
+
+//components
+#include "character_defines.hpp"
+#include "vector2.hpp"
+#include "bounding_box.hpp"
+
+//graphics
+#include "sprite_sheet.hpp"
+
+//std namespace
+#include <string>
+#include <cmath>
+
+class Character {
+public:
+	Character() = default;
+	~Character() = default;
+
+	void Update(double delta);
+
+	//graphics
+	void DrawTo(SDL_Surface* const, int camX, int camY);
+	void CorrectSprite();
+	SpriteSheet* GetSprite() { return &sprite; }
+
+	//accessors and mutators
+
+	//metadata
+	int SetOwner(int i) { return owner = i; }
+	int GetOwner() { return owner; }
+	std::string SetHandle(std::string s) { return handle = s; }
+	std::string GetHandle() const { return handle; }
+	std::string SetAvatar(std::string s) { return avatar = s; }
+	std::string GetAvatar() const { return avatar; }
+
+	//position
+	Vector2 SetOrigin(Vector2 v) { return origin = v; }
+	Vector2 GetOrigin() const { return origin; }
+	Vector2 SetMotion(Vector2 v) { return motion = v; }
+	Vector2 GetMotion() const { return motion; }
+	BoundingBox SetBoundingBox(BoundingBox b) { return bounds = b; }
+	BoundingBox GetBoundingBox() const { return bounds; }
+
+private:
+	//graphics
+	SpriteSheet sprite;
+
+	//metadata
+	int owner;
+	std::string handle;
+	std::string avatar;
+
+	//position
+	Vector2 origin = {0.0,0.0};
+	Vector2 motion = {0.0,0.0};
+	BoundingBox bounds;
+};
+
+//tmp
+#include <map>
+typedef std::map<int, Character> CharacterMap;
+
+#endif

client/client_application.cpp

@@ -1,11 +1,11 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
  * arising from the use of this software.
  * 
  * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
+ * including commercial ClientApplications, 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,175 +21,123 @@
 */
 #include "client_application.hpp"
 
-#include "serial_packet.hpp"
-#include "config_utility.hpp"
-
-//for handling platforms
-#include "SDL2/SDL_syswm.h"
-#include "SDL2/SDL_version.h"
+#include "serial.hpp"
 
+#include <stdexcept>
 #include <chrono>
 #include <iostream>
-#include <sstream>
-#include <stdexcept>
+
+//-------------------------
+//Scene headers
+//-------------------------
+
+//Add the custom scene headers here
+#include "splash_screen.hpp"
+#include "main_menu.hpp"
+#include "options_menu.hpp"
+#include "lobby_menu.hpp"
+#include "in_world.hpp"
+#include "in_combat.hpp"
+#include "clean_up.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
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-	config.Load("rsc/config.cfg", false, argc, argv);
-
-	//-------------------------
-	//create and check the window
-	//-------------------------
-
-	//get the config values
-	int w = config.Int("client.screen.w");
-	int h = config.Int("client.screen.h");
-	int f = config.Boolean("client.screen.f") ? SDL_WINDOW_FULLSCREEN : 0;
-
-	//BUG: fullscreen is disabled
-	f = 0;
-
-	//default sizes
-	w = w ? w : 800;
-	h = h ? h : 600;
-
-	window = SDL_CreateWindow(argv[0], SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, w, h, f);
-
-	if (!window) {
-		std::ostringstream msg;
-		msg << "Failed to create the window: " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-
-	std::cout << "Initialized the window" << std::endl;
-
-	//-------------------------
-	//DEBUG: detecting platforms, versions & appropriate fonts
-	//-------------------------
-
-	SDL_SysWMinfo windowInfo;
-	SDL_VERSION(&windowInfo.version);
-	if (SDL_GetWindowWMInfo(window, &windowInfo)) {
-		//
-		std::string platform;
-		std::string fontPath;
-
-		//get the info
-		switch(windowInfo.subsystem) {
-			case SDL_SYSWM_WINDOWS:
-				platform = "Microsoft Windows";
-				fontPath = "C:/Windows/Fonts/arialbd.ttf";
-			break;
-
-			case SDL_SYSWM_X11:
-				platform = "X Window System";
-				fontPath = "/usr/share/fonts/truetype/msttcorefonts/Arial_Bold.ttf";
-			break;
-
-			//NOTE: OS X is currently unsupported, but it could be
-			case SDL_SYSWM_COCOA:
-				platform = "Apple OS X";
-				fontPath = "/System/Library/Fonts/arialbd.ttf";
-			break;
-
-			default:
-				platform = "an unsupported platform";
-		}
-
-		//final output
-		std::cout << "SDL Version ";
-		std::cout << (int)windowInfo.version.major << ".";
-		std::cout << (int)windowInfo.version.minor << ".";
-		std::cout << (int)windowInfo.version.patch << " on ";
-		std::cout << platform << std::endl;
-
-		//handle the default font paths
-		if (config["client.font"].size() == 0) {
-			config["client.font"] = fontPath;
-		}
-	}
-	else {
-		std::ostringstream msg;
-		msg << "Failed to retrieve window info: " << SDL_GetError();
-		throw(msg.str());
-	}
-
-	//-------------------------
-	//create and check the renderer
-	//-------------------------
-
-	renderer = SDL_CreateRenderer(window, -1, 0);
-
-	if (!renderer) {
-		std::ostringstream msg;
-		msg << "Failed to create the renderer: " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//screen scaling
-	SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "best");
-	SDL_RenderSetLogicalSize(renderer, w, h);
-
-	//set the hook for the renderer
-	BaseScene::SetRenderer(renderer);
-
-	std::cout << "Initialized the renderer" << std::endl;
-
 	//-------------------------
 	//Initialize the APIs
 	//-------------------------
 
+	//initialize SDL
+	if (SDL_Init(SDL_INIT_VIDEO)) {
+		throw(std::runtime_error("Failed to initialize SDL"));
+	}
+	std::cout << "Initialized SDL" << std::endl;
+
 	//initialize SDL_net
 	if (SDLNet_Init()) {
-		std::ostringstream msg;
-		msg << "Failed to initialize SDL_net 2.0: " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
+		throw(std::runtime_error("Failed to initialize SDL_net"));
 	}
-	UDPNetworkUtility::GetSingleton().Open(0);
+	network.Open(0);
+	std::cout << "Initialized SDL_net" << std::endl;
 
-	std::cout << "Initialized SDL_net 2.0" << std::endl;
-
-	//setting up SDL2_ttf
-	if (TTF_Init()) {
-		std::ostringstream msg;
-		msg << "Failed to initialize SDL_ttf 2.0: " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
+	//initialize lua
+	lua = luaL_newstate();
+	if (!lua) {
+		throw(std::runtime_error("Failed to initialize lua"));
 	}
+	luaL_openlibs(lua);
+	std::cout << "Initialized lua" << std::endl;
 
-	std::cout << "Initialized SDL_ttf 2.0" << std::endl;
+	//run the setup script
+	if (luaL_dofile(lua, "rsc\\setup.lua")) {
+		throw(std::runtime_error("Failed to initialize lua's startup script"));
+	}
+	std::cout << "Initialized lua's setup script" << std::endl;
+
+	//place the config table onto the stack
+	lua_getglobal(lua, "config");
+
+	//-------------------------
+	//Setup the screen
+	//-------------------------
+
+	//get each field
+	lua_getfield(lua, -1, "client");
+	lua_getfield(lua, -1, "screen");
+	lua_getfield(lua, -1, "width");
+	lua_getfield(lua, -2, "height");
+	lua_getfield(lua, -3, "fullscreen");
+
+	int w = lua_tointeger(lua, -3);
+	int h = lua_tointeger(lua, -2);
+	int f = lua_toboolean(lua, -1);
+
+	//pop the screen members
+	lua_pop(lua, 5);
+
+	BaseScene::SetScreen(w ? w : 800, h ? h : 600, 0, f ?
+		SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_FULLSCREEN :
+		SDL_HWSURFACE|SDL_DOUBLEBUF);
+	std::cout << "Initialized the screen" << std::endl;
 
 	//-------------------------
 	//debug output
 	//-------------------------
 
-#define DEBUG_INTERNAL_VAR(x) std::cout << "\t" << #x << ": " << x << std::endl;
+	lua_getfield(lua, -1, "debug");
 
-	std::cout << "Internal sizes:" << std::endl;
+	if (lua_toboolean(lua, -1)) {
+#define DEBUG_OUTPUT_VAR(x) std::cout << "\t" << #x << ": " << x << std::endl;
 
-	DEBUG_INTERNAL_VAR(NETWORK_VERSION);
-	DEBUG_INTERNAL_VAR(sizeof(Region::type_t));
-	DEBUG_INTERNAL_VAR(sizeof(Region));
-	DEBUG_INTERNAL_VAR(REGION_WIDTH);
-	DEBUG_INTERNAL_VAR(REGION_HEIGHT);
-	DEBUG_INTERNAL_VAR(REGION_DEPTH);
-	DEBUG_INTERNAL_VAR(REGION_TILE_FOOTPRINT);
-	DEBUG_INTERNAL_VAR(REGION_SOLID_FOOTPRINT);
-	DEBUG_INTERNAL_VAR(PACKET_STRING_SIZE);
-	DEBUG_INTERNAL_VAR(PACKET_BUFFER_SIZE);
-	DEBUG_INTERNAL_VAR(MAX_PACKET_SIZE);
-	DEBUG_INTERNAL_VAR(static_cast<int>(SerialPacketType::LAST));
+		std::cout << "Internal sizes:" << std::endl;
+
+		DEBUG_OUTPUT_VAR(sizeof(Region::type_t));
+		DEBUG_OUTPUT_VAR(sizeof(Region));
+		DEBUG_OUTPUT_VAR(REGION_WIDTH);
+		DEBUG_OUTPUT_VAR(REGION_HEIGHT);
+		DEBUG_OUTPUT_VAR(REGION_DEPTH);
+		DEBUG_OUTPUT_VAR(REGION_SOLID_FOOTPRINT);
+		DEBUG_OUTPUT_VAR(REGION_FOOTPRINT);
+		DEBUG_OUTPUT_VAR(PACKET_BUFFER_SIZE);
+		DEBUG_OUTPUT_VAR(MAX_PACKET_SIZE);
+
+#undef DEBUG_OUTPUT_VAR
+	}
+
+	//pop the debug value
+	lua_pop(lua, 1);
 
 	//-------------------------
 	//finalize the startup
 	//-------------------------
 
+	//pop the config table
+	lua_pop(lua, 1);
+
 	std::cout << "Startup completed successfully" << std::endl;
 
 	//-------------------------
@@ -200,156 +148,85 @@ void ClientApplication::Init(int argc, char* argv[]) {
 }
 
 void ClientApplication::Proc() {
-	//load the first scene
-	ProcessSceneSignal(SceneSignal::FIRST);
+	LoadScene(SceneList::FIRST);
 
-	//fixed frame rate
+	//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;
-	constexpr std::chrono::duration<int, std::milli> frameDelay(16); //~60FPS
 
-	//the game loop continues until the scenes signal QUIT
-	while(activeScene->GetSceneSignal() != SceneSignal::QUIT) {
-		//switch scenes if necessary
-		if(activeScene->GetSceneSignal() != SceneSignal::CONTINUE) {
-			ProcessSceneSignal(activeScene->GetSceneSignal());
+	//The main loop
+	while(activeScene->GetNextScene() != SceneList::QUIT) {
+		//switch scenes when necessary
+		if (activeScene->GetNextScene() != SceneList::CONTINUE) {
+			LoadScene(activeScene->GetNextScene());
 			continue;
 		}
 
 		//update the current time
 		realTime = Clock::now();
 
-		//simulate the game or give the machine a break
-		if (simTime < realTime) {
-			while(simTime < realTime) {
-				//call the user defined functions
-				activeScene->FrameStart();
-				ProcessEvents();
-				activeScene->Update();
-				activeScene->FrameEnd();
-
-				//step to the next frame
-				simTime += frameDelay;
-			}
-		}
-		else {
-			SDL_Delay(1);
+		//simulate game time
+		while (simTime < realTime) {
+			//call each user defined function
+			activeScene->RunFrame(constexpr(double(delta.count()) / std::chrono::duration<int, std::milli>::period::den));
+			simTime += delta;
 		}
 
-		SDL_RenderClear(renderer);
-		activeScene->RenderFrame(renderer);
-		SDL_RenderPresent(renderer);
+		//draw the game to the screen
+		activeScene->RenderFrame();
 	}
 
-	//cleanup
-	ClearScene();
+	UnloadScene();
 }
 
 void ClientApplication::Quit() {
-	//clean up after the program
 	std::cout << "Shutting down" << std::endl;
-	UDPNetworkUtility::GetSingleton().Close();
-	TTF_Quit();
+	lua_close(lua);
+	network.Close();
 	SDLNet_Quit();
-	BaseScene::SetRenderer(nullptr);
-	SDL_DestroyRenderer(renderer);
-	SDL_DestroyWindow(window);
+	SDL_Quit();
 	std::cout << "Clean exit" << std::endl;
 }
 
 //-------------------------
-//Scene management
+//Private access members
 //-------------------------
 
-void ClientApplication::ProcessEvents() {
-	SDL_Event event;
-	while(SDL_PollEvent(&event)) {
-		switch(event.type) {
-			case SDL_QUIT:
-				activeScene->QuitEvent();
-			break;
-
-			case SDL_MOUSEMOTION:
-				activeScene->MouseMotion(event.motion);
-			break;
-
-			case SDL_MOUSEBUTTONDOWN:
-				activeScene->MouseButtonDown(event.button);
-			break;
-
-			case SDL_MOUSEBUTTONUP:
-				activeScene->MouseButtonUp(event.button);
-			break;
-
-			case SDL_MOUSEWHEEL:
-				activeScene->MouseWheel(event.wheel);
-			break;
-
-			case SDL_KEYDOWN:
-				activeScene->KeyDown(event.key);
-			break;
-
-			case SDL_KEYUP:
-				activeScene->KeyUp(event.key);
-			break;
-
-			//TODO: (9) joystick and controller events
-
-			//window events are handled internally
-			case SDL_WINDOWEVENT:
-				switch(event.window.event) {
-					case SDL_WINDOWEVENT_RESIZED:
-						SDL_RenderSetLogicalSize(renderer, event.window.data1, event.window.data2);
-					break;
-				}
-			break;
-		}
-	}
-}
-
-//Add the custom scene headers here
-#include "splash_screen.hpp"
-#include "main_menu.hpp"
-#include "options_menu.hpp"
-#include "lobby_menu.hpp"
-#include "world.hpp"
-#include "disconnected_screen.hpp"
-
-void ClientApplication::ProcessSceneSignal(SceneSignal signal) {
-	//BUG: #16 Resources are being reloaded between scenes
-	ClearScene();
-	switch(signal) {
+void ClientApplication::LoadScene(SceneList sceneIndex) {
+	UnloadScene();
+	switch(sceneIndex) {
 		//add scene creation calls here
-		case SceneSignal::FIRST:
-		case SceneSignal::SPLASHSCREEN:
-			activeScene = new SplashScreen(window);
+		case SceneList::FIRST:
+		case SceneList::SPLASHSCREEN:
+			activeScene = new SplashScreen(lua);
 		break;
-		case SceneSignal::MAINMENU:
-			activeScene = new MainMenu();
+		case SceneList::MAINMENU:
+			activeScene = new MainMenu(lua);
 		break;
-		case SceneSignal::OPTIONSMENU:
-			activeScene = new OptionsMenu();
+		case SceneList::OPTIONSMENU:
+			activeScene = new OptionsMenu(lua);
 		break;
-		case SceneSignal::LOBBYMENU:
-			activeScene = new LobbyMenu(&clientIndex, &accountIndex);
+		case SceneList::LOBBYMENU:
+			activeScene = new LobbyMenu(lua, network, characterMap);
 		break;
-		case SceneSignal::WORLD:
-			activeScene = new World(&clientIndex, &accountIndex);
+		case SceneList::INWORLD:
+			activeScene = new InWorld(lua, network, characterMap);
 		break;
-		case SceneSignal::DISCONNECTEDSCREEN:
-			activeScene = new DisconnectedScreen();
+		case SceneList::INCOMBAT:
+			activeScene = new InCombat(lua, network, characterMap);
 		break;
-		default: {
-			std::ostringstream msg;
-			msg << "Failed to recognize the scene signal: " << signal;
-			throw(std::logic_error(msg.str()));
-		}
+		case SceneList::CLEANUP:
+			activeScene = new CleanUp(lua, network, characterMap);
+		break;
+		default:
+			throw(std::logic_error("Failed to recognize the scene index"));
 	}
 }
 
-void ClientApplication::ClearScene() {
+void ClientApplication::UnloadScene() {
 	delete activeScene;
 	activeScene = nullptr;
 }

client/client_application.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,41 +19,43 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef CLIENTAPPLICATION_HPP_
+#define CLIENTAPPLICATION_HPP_
 
+#include "scene_list.hpp"
 #include "base_scene.hpp"
-#include "scene_signal.hpp"
-#include "singleton.hpp"
+
 #include "udp_network_utility.hpp"
+#include "character.hpp"
 
-#include "SDL2/SDL.h"
-#include "SDL2/SDL_net.h"
-#include "SDL2/SDL_ttf.h"
+#include "lua/lua.hpp"
 
-class ClientApplication: public Singleton<ClientApplication> {
+#include <map>
+
+class ClientApplication {
 public:
-	void Init(int argc, char* argv[]);
+	ClientApplication() = default;
+	~ClientApplication() = default;
+
+	void Init(int argc, char** argv);
 	void Proc();
 	void Quit();
 
 private:
-	friend Singleton<ClientApplication>;
-
-	ClientApplication() = default;
-	~ClientApplication() = default;
-
-	//scene management
-	void ProcessEvents();
-	void ProcessSceneSignal(SceneSignal);
-	void ClearScene();
+	//Private access members
+	void LoadScene(SceneList sceneIndex);
+	void UnloadScene();
 
 	BaseScene* activeScene = nullptr;
 
-	//TODO: (9) build a "window" class?
-	SDL_Window* window = nullptr;
-	SDL_Renderer* renderer = nullptr;
-
 	//shared parameters
+	lua_State* lua = nullptr;
+	UDPNetworkUtility network;
 	int clientIndex = -1;
 	int accountIndex = -1;
-};
+	int characterIndex = -1;
+
+	CharacterMap characterMap;
+};
+
+#endif

client/entities/entity.hpp

@@ -1,54 +0,0 @@
-/* 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.
-*/
-#pragma once
-
-#include "bounding_box.hpp"
-#include "sprite_sheet.hpp"
-#include "vector2.hpp"
-
-//The base class for all objects in the world
-//TODO: (9) write a better hierarchy
-class Entity {
-public:
-	virtual void Update();
-	virtual void DrawTo(SDL_Renderer* 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;
-};

client/entities/local_character.cpp

@@ -1,36 +0,0 @@
-/* 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)) {
-			//TODO: (9) write a better collision system
-			origin -= motion;
-			motion = {0, 0};
-			return true;
-		}
-	}
-	return false;
-}

client/gameplay_scenes/makefile

@@ -1,32 +0,0 @@
-#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 $@ $<

client/gameplay_scenes/world.hpp

@@ -1,173 +0,0 @@
-/* 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.
-*/
-#pragma once
-
-//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 "button.hpp"
-#include "tile_sheet.hpp"
-#include "text_line.hpp"
-
-//common
-#include "frame_rate.hpp"
-
-//client
-#include "base_scene.hpp"
-#include "base_monster.hpp"
-#include "local_character.hpp"
-
-#include "SDL2/SDL.h"
-#include "SDL2/SDL_net.h"
-#include "SDL2/SDL_ttf.h"
-
-//STL
-#include <map>
-
-#include <chrono>
-
-class World: public BaseScene {
-public:
-	//Public access members
-	World(int* const argClientIndex, int* const argAccountIndex);
-	~World();
-
-	void RenderFrame(SDL_Renderer* renderer) override;
-
-private:
-	//frame phases
-	void FrameStart() override;
-	void Update() override;
-	void FrameEnd() override;
-
-	//input events
-	void QuitEvent();
-	void MouseMotion(SDL_MouseMotionEvent const& event) override;
-	void MouseButtonDown(SDL_MouseButtonEvent const& event) override;
-	void MouseButtonUp(SDL_MouseButtonEvent const& event) override;
-	void MouseWheel(SDL_MouseWheelEvent const& event) override;
-	void KeyDown(SDL_KeyboardEvent const& event) override;
-	void KeyUp(SDL_KeyboardEvent const& event) override;
-
-	//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
-	TileSheet tileSheet;
-
-	//map
-	RegionPagerBase regionPager;
-
-	//UI
-	Image buttonImage;
-	TTF_Font* font = nullptr;
-	Button disconnectButton;
-	Button shutdownButton;
-	FrameRate fps;
-	TextLine fpsTextLine;
-
-	//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();
-};

client/gameplay_scenes/world_characters.cpp

@@ -1,241 +0,0 @@
-/* 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 <cstring>
-#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(GetRenderer(), 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()->GetClipW() / 2);
-		camera.marginY = (camera.height/ 2 - localCharacter->GetSprite()->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
-	//TODO: why is this commented out?
-//	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(GetRenderer(), 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 (non-existant tiles are always false)
-			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_connections.cpp

@@ -1,134 +0,0 @@
-/* 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();
-			SetSceneSignal(SceneSignal::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
-	SetSceneSignal(SceneSignal::DISCONNECTEDSCREEN);
-	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have successfully logged out";
-}
-
-void World::hAdminDisconnectForced(ClientPacket* const argPacket) {
-	hDisconnectResponse(argPacket);//shortcut
-	SetSceneSignal(SceneSignal::DISCONNECTEDSCREEN);
-	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have been forcibly disconnected by the server";
-}
-

client/gameplay_scenes/world_logic.cpp

@@ -1,443 +0,0 @@
-/* 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 <cstring>
-#include <iostream>
-#include <sstream>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-World::World(int* const argClientIndex,	int* const argAccountIndex):
-	clientIndex(*argClientIndex),
-	accountIndex(*argAccountIndex)
-{
-	//setup the utility objects
-	buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_red.png");
-	font = TTF_OpenFont(config["client.font"].c_str(), 12);
-
-	//check that the font loaded
-	if (!font) {
-		std::ostringstream msg;
-		msg << "Failed to load a font file; " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//setup the buttons
-	disconnectButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	disconnectButton.SetText(GetRenderer(), font, "Disconnect", COLOR_BLUE);
-	shutdownButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	shutdownButton.SetText(GetRenderer(), font, "Shutdown", COLOR_BLUE);
-
-	//set the button positions
-	disconnectButton.SetX(50);
-	disconnectButton.SetY(50);
-	shutdownButton.SetX(50);
-	shutdownButton.SetY(70);
-
-	//load the tilesheet
-	//TODO: (2) Tile size and tile sheet should be loaded elsewhere
-	tileSheet.Load(GetRenderer(), config["dir.tilesets"] + "overworld.png", 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
-	SDL_RenderGetLogicalSize(GetRenderer(), &camera.width, &camera.height);
-
-	//debug
-	//
-}
-
-World::~World() {
-	//unload the local data
-	TTF_CloseFont(font);
-	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();
-	}
-
-	try {
-		//update the map
-		UpdateMap();
-	}
-	catch(terminal_error& e) {
-		throw(e);
-	}
-	catch(std::exception& e) {
-		std::cerr << "UpdateMap Error: " << e.what() << std::endl;
-	}
-
-	//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_Renderer* renderer) {
-	//draw the map
-	for (std::list<Region>::iterator it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); it++) {
-		tileSheet.DrawRegionTo(renderer, &(*it), camera.x, camera.y);
-
-		//debugging
-//		std::ostringstream msg;
-//		msg << it->GetX() << ", " << it->GetY();
-//		font.DrawStringTo(msg.str(), screen, it->GetX() * tileSheet.GetImage()->GetClipW() - camera.x, it->GetY() * tileSheet.GetImage()->GetClipH() - camera.y);
-	}
-
-	//draw the entities
-	for (auto& it : characterMap) {
-		//BUG: #29 Characters (and other entities) are drawn out of order
-		it.second.DrawTo(renderer, camera.x, camera.y);
-	}
-	for (auto& it : monsterMap) {
-		it.second.DrawTo(renderer, camera.x, camera.y);
-	}
-
-	//draw UI
-	disconnectButton.DrawTo(renderer);
-	shutdownButton.DrawTo(renderer);
-
-	//FPS
-	fpsTextLine.DrawTo(renderer, 0, 0);
-	int fpsRet = fps.Calculate();
-	if (fpsRet != -1) {
-		std::ostringstream msg;
-		msg << "FPS: " << fpsRet;
-		fpsTextLine.SetText(renderer, font, msg.str(), {255, 255, 255, 255});
-	}
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void World::QuitEvent() {
-	//two-step logout
-	SendDisconnectRequest();
-	SetSceneSignal(SceneSignal::QUIT);
-}
-
-void World::MouseMotion(SDL_MouseMotionEvent const& event) {
-	disconnectButton.MouseMotion(event);
-	shutdownButton.MouseMotion(event);
-}
-
-void World::MouseButtonDown(SDL_MouseButtonEvent const& event) {
-	disconnectButton.MouseButtonDown(event);
-	shutdownButton.MouseButtonDown(event);
-}
-
-void World::MouseButtonUp(SDL_MouseButtonEvent const& event) {
-	if (disconnectButton.MouseButtonUp(event) == Button::State::RELEASED) {
-		SendLogoutRequest();
-	}
-	if (shutdownButton.MouseButtonUp(event) == Button::State::RELEASED) {
-		SendAdminShutdownRequest();
-	}
-}
-
-void World::MouseWheel(SDL_MouseWheelEvent const& event) {
-	//
-}
-
-void World::KeyDown(SDL_KeyboardEvent const& event) {
-	//BUGFIX: SDL2 introduced key repeats, so I need to ignore it
-	if (event.repeat) {
-		return;
-	}
-
-	//hotkeys
-	switch(event.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(event.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& event) {
-	//BUGFIX: SDL2 introduced key repeats, so I need to ignore it
-	if (event.repeat) {
-		return;
-	}
-
-	//character movement
-	if (!localCharacter) {
-		return;
-	}
-	Vector2 motion = localCharacter->GetMotion();
-	switch(event.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

@@ -1,118 +0,0 @@
-/* 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 <sstream>
-
-//-------------------------
-//static functions
-//-------------------------
-
-//TODO: (3) proper checksum
-static int regionChecksum(Region* const region) {
-	int sum = 0;
-	for(int i = 0; i < REGION_WIDTH; i++) {
-		for (int j = 0; j < REGION_HEIGHT; j++) {
-			for (int k = 0; k < REGION_DEPTH; k++) {
-				sum |= region->GetTile(i, j, k);
-			}
-		}
-	}
-	return sum;
-}
-
-//-------------------------
-//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) {
-	//checksum
-	if (regionChecksum(argPacket->region) == 0) {
-		std::ostringstream msg;
-		msg << "Received region checksum failed: " << argPacket->x << ", " << argPacket->y;
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//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) {
-			Region* region = regionPager.FindRegion(i, j);
-			if (!region) {
-				//request absent region
-				SendRegionRequest(roomIndex, i, j);
-			}
-			else if (regionChecksum(region) == 0) {
-				//checksum failed
-				regionPager.UnloadIf([region](Region const& ref) -> bool {
-					//remove the erroneous region
-					return region == &ref;
-				});
-				SendRegionRequest(roomIndex, i, j);
-				std::ostringstream msg;
-				msg << "Existing region checksum failed: " << roomIndex << ", " << i << ", " << j;
-				throw(std::runtime_error(msg.str()));
-			}
-		}
-	}
-}

client/gameplay_scenes/world_monsters.cpp

@@ -1,126 +0,0 @@
-/* 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(GetRenderer(), 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(GetRenderer(), 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/linit.cpp

@@ -0,0 +1,85 @@
+/* $Id: linit.c,v 1.32, modified
+ * Initialization of libraries for lua.c and other clients
+ * See Copyright Notice in lua.h
+ * 
+ * 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.
+ * 
+ * Modified for use in Tortuga, renamed to linit.cpp
+ * Modifications are released under the zlib license:
+ * 
+ * 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.
+*/
+#define linit_c
+#define LUA_LIB
+
+#include "lua/lua.hpp"
+
+#include "region_api.hpp"
+#include "region_pager_api.hpp"
+#include "tile_sheet_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},
+
+	//Tortuga's API
+	{TORTUGA_REGION_NAME, openRegionAPI},
+	{TORTUGA_REGION_PAGER_NAME, openRegionPagerAPI},
+	{TORTUGA_TILE_SHEET_NAME, openTileSheetAPI},
+
+	{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
+}

client/main.cpp

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

client/makefile

@@ -1,20 +1,7 @@
-#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 ../common/libcommon.a -lSDL2_net
-ifeq ($(OS),Windows_NT)
-	LIBS+=-lwsock32 -liphlpapi -lmingw32
-endif
-LIBS+=-lSDL2main -lSDL2 -lSDL2_image -lSDL2_ttf
-
-#flags
+#config
+INCLUDES+=. scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet ../common/network/serial ../common/ui ../common/utilities
+LIBS+=client.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
-ifeq ($(shell uname), Linux)
-	#read data about the current install
-	CXXFLAGS+=$(shell sdl-config --cflags --static-libs)
-endif
 
 #source
 CXXSRC=$(wildcard *.cpp)
@@ -29,10 +16,7 @@ OUT=$(addprefix $(OUTDIR)/,client)
 
 #targets
 all: $(OBJ) $(OUT)
-	$(MAKE) -C client_utilities
-	$(MAKE) -C entities
-	$(MAKE) -C gameplay_scenes
-	$(MAKE) -C menu_scenes
+	$(MAKE) -C scenes
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)
@@ -49,12 +33,6 @@ $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
 clean:
-ifeq ($(OS),Windows_NT)
 	$(RM) *.o *.a *.exe
-else ifeq ($(shell uname), Linux)
-	find . -type f -name *.o -exec rm -f -r -v {} \;
-	find . -type f -name *.a -exec rm -f -r -v {} \;
-	rm -f -v out/client out/server
-endif
 
 rebuild: clean all

client/menu_scenes/disconnected_screen.cpp

@@ -1,130 +0,0 @@
-/* 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 <sstream>
-#include <stdexcept>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-DisconnectedScreen::DisconnectedScreen() {
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-
-	//setup the utility objects
-	//TODO: (1) resource tool, to prevent reloading like this
-	image.Load(GetRenderer(), config["dir.interface"] + "button_red.png");
-	font = TTF_OpenFont(config["client.font"].c_str(), 12);
-
-	//check that the font loaded
-	if (!font) {
-		std::ostringstream msg;
-		msg << "Failed to load a font file; " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//setup the button
-	backButton.SetBackgroundTexture(GetRenderer(), image.GetTexture());
-	backButton.SetText(GetRenderer(), font, "Back", COLOR_BLUE);
-
-	//set the button positions
-	backButton.SetX(50);
-	backButton.SetY(50);
-
-	//set the disconnection message text
-	textLine.SetText(GetRenderer(), font, config["client.disconnectMessage"], {255, 255, 255, 255});
-
-	//full reset
-	UDPNetworkUtility::GetSingleton().Unbind(Channels::SERVER);
-
-	//auto return
-	startTick = std::chrono::steady_clock::now();
-}
-
-DisconnectedScreen::~DisconnectedScreen() {
-	TTF_CloseFont(font);
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void DisconnectedScreen::FrameStart() {
-	//
-}
-
-void DisconnectedScreen::Update() {
-	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(10)) {
-		SetSceneSignal(SceneSignal::MAINMENU);
-	}
-
-	//Eat incoming packets
-	while(UDPNetworkUtility::GetSingleton().Receive());
-}
-
-void DisconnectedScreen::FrameEnd() {
-	//
-}
-
-void DisconnectedScreen::RenderFrame(SDL_Renderer* renderer) {
-	backButton.DrawTo(renderer);
-	textLine.DrawTo(renderer, 50, 30);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void DisconnectedScreen::MouseMotion(SDL_MouseMotionEvent const& event) {
-	backButton.MouseMotion(event);
-}
-
-void DisconnectedScreen::MouseButtonDown(SDL_MouseButtonEvent const& event) {
-	backButton.MouseButtonDown(event);
-}
-
-void DisconnectedScreen::MouseButtonUp(SDL_MouseButtonEvent const& event) {
-	if (backButton.MouseButtonUp(event) == Button::State::RELEASED) {
-		SetSceneSignal(SceneSignal::MAINMENU);
-	}
-}
-
-void DisconnectedScreen::MouseWheel(SDL_MouseWheelEvent const& event) {
-	//
-}
-
-void DisconnectedScreen::KeyDown(SDL_KeyboardEvent const& event) {
-	switch(event.keysym.sym) {
-		case SDLK_ESCAPE:
-			SetSceneSignal(SceneSignal::MAINMENU);
-		break;
-	}
-}
-
-void DisconnectedScreen::KeyUp(SDL_KeyboardEvent const& event) {
-	//
-}

client/menu_scenes/lobby_menu.cpp

@@ -1,314 +0,0 @@
-/* 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 <cstring>
-#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
-	buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_red.png");
-	font = TTF_OpenFont(config["client.font"].c_str(), 12);
-
-	//check that the font loaded
-	if (!font) {
-		std::ostringstream msg;
-		msg << "Failed to load a font file; " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//setup the buttons
-	searchButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	searchButton.SetText(GetRenderer(), font, "Search", COLOR_BLUE);
-	joinButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	joinButton.SetText(GetRenderer(), font, "Join", COLOR_BLUE);
-	backButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	backButton.SetText(GetRenderer(), font, "Back", COLOR_BLUE);
-
-	//set the button positions (assumed)
-	searchButton.SetX(50);
-	searchButton.SetY(50);
-	joinButton.SetX(50);
-	joinButton.SetY(70);
-	backButton.SetX(50);
-	backButton.SetY(90);
-
-	//pseudo-list selection
-	boundingBox = {300, 50, 200, 12};
-
-	//hacked together a highlight box
-	highlightImage.Create(GetRenderer(), 300, 12, {49, 150, 5, 255});
-
-	//Eat incoming packets
-	while(network.Receive());
-
-	//Initial broadcast
-	SendBroadcastRequest();
-}
-
-LobbyMenu::~LobbyMenu() {
-	TTF_CloseFont(font);
-}
-
-//-------------------------
-//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::RenderFrame(SDL_Renderer* renderer) {
-	//TODO: (2) I need a proper UI system for the entire client and the editor
-
-	//UI
-	searchButton.DrawTo(renderer);
-	joinButton.DrawTo(renderer);
-	backButton.DrawTo(renderer);
-
-	//TODO: (3) draw headers for the server list
-	//TODO: (3) ping/delay displayed in the server list
-	for (int i = 0; i < serverVector.size(); i++) {
-		//draw the selected server's highlight
-		if (selection == &serverVector[i]) {
-			highlightImage.DrawTo(renderer, boundingBox.x, boundingBox.y + boundingBox.h * i);
-		}
-
-		//draw the server's info
-		serverVector[i].nameImage.DrawTo(renderer, boundingBox.x, boundingBox.y + boundingBox.h * i);
-		serverVector[i].playerCountImage.DrawTo(renderer, boundingBox.x+300, boundingBox.y + boundingBox.h * i);
-	}
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void LobbyMenu::MouseMotion(SDL_MouseMotionEvent const& event) {
-	searchButton.MouseMotion(event);
-	joinButton.MouseMotion(event);
-	backButton.MouseMotion(event);
-}
-
-void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& event) {
-	searchButton.MouseButtonDown(event);
-	joinButton.MouseButtonDown(event);
-	backButton.MouseButtonDown(event);
-}
-
-void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& event) {
-	if (searchButton.MouseButtonUp(event) == Button::State::RELEASED) {
-		SendBroadcastRequest();
-	}
-	if (joinButton.MouseButtonUp(event) == Button::State::RELEASED && selection && selection->compatible) {
-		SendJoinRequest();
-	}
-	if (backButton.MouseButtonUp(event) == Button::State::RELEASED) {
-		SetSceneSignal(SceneSignal::MAINMENU);
-	}
-
-	//has the user selected a server on the list?
-	BoundingBox tmpBox = boundingBox;
-	tmpBox.h *= serverVector.size(); //within the list bounds
-	if (tmpBox.CheckOverlap({event.x, event.y})) {
-		//NOTE: this memory trick requires a vector
-		selection = &serverVector[(event.y - boundingBox.y)/boundingBox.h];
-	}
-	else {
-		selection = nullptr;
-	}
-}
-
-void LobbyMenu::MouseWheel(SDL_MouseWheelEvent const& event) {
-	//
-}
-
-void LobbyMenu::KeyDown(SDL_KeyboardEvent const& event) {
-	switch(event.keysym.sym) {
-		case SDLK_ESCAPE:
-			SetSceneSignal(SceneSignal::MAINMENU);
-		break;
-	}
-}
-
-void LobbyMenu::KeyUp(SDL_KeyboardEvent const& event) {
-	//
-}
-
-//-------------------------
-//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
-	ServerInfo newServer;
-
-	newServer.address = argPacket->srcAddress;
-	newServer.name = argPacket->name;
-	newServer.playerCount = argPacket->playerCount;
-	newServer.version = argPacket->version;
-	newServer.compatible = newServer.version == NETWORK_VERSION;
-
-	//push
-	serverVector.push_back(newServer);
-
-	//BUGFIX: since TextLine lacks the memory management of Image, I'll wait until after the line is in the vector to handle these
-
-	//fancy colors
-	SDL_Color color;
-	if (newServer.compatible) {
-		color = {255, 255, 255, 255};
-	}
-	else {
-		color = {255, 0, 0, 255};
-	}
-
-	//fancy itoa
-	auto itoa_base10 = [](int i) -> std::string {
-		char str[20];
-		sprintf(str, "%d", i);
-		return std::string(str);
-	};
-
-	//text graphics
-	serverVector.back().nameImage.SetText(GetRenderer(), font, newServer.name, color);
-	serverVector.back().playerCountImage.SetText(GetRenderer(), font, itoa_base10(newServer.playerCount), color);
-}
-
-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;
-	SetSceneSignal(SceneSignal::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
-		serverVector.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
-	//TODO: (9) have a separate login screen
-	ClientPacket packet;
-	packet.type = SerialPacketType::LOGIN_REQUEST;
-	packet.clientIndex = clientIndex;
-	strncpy(packet.username, config["client.username"].c_str(), PACKET_STRING_SIZE+1);
-
-	network.SendTo(Channels::SERVER, &packet);
-}

client/menu_scenes/lobby_menu.hpp

@@ -1,110 +0,0 @@
-/* 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.
-*/
-#pragma once
-
-//graphics & ui
-#include "image.hpp"
-#include "button.hpp"
-#include "bounding_box.hpp"
-#include "text_line.hpp"
-
-#include "SDL2/SDL_ttf.h"
-
-//utilities
-#include "config_utility.hpp"
-#include "udp_network_utility.hpp"
-#include "serial_packet.hpp"
-
-//client
-#include "base_scene.hpp"
-
-//STL
-#include <vector>
-
-class LobbyMenu : public BaseScene {
-public:
-	//Public access members
-	LobbyMenu(int* const argClientIndex, int* const argAccountIndex);
-	~LobbyMenu();
-
-	void RenderFrame(SDL_Renderer* renderer) override;
-
-protected:
-	//frame phases
-	void FrameStart() override;
-	void Update() override;
-	void FrameEnd() override;
-
-	//input events
-	void MouseMotion(SDL_MouseMotionEvent const& event) override;
-	void MouseButtonDown(SDL_MouseButtonEvent const& event) override;
-	void MouseButtonUp(SDL_MouseButtonEvent const& event) override;
-	void MouseWheel(SDL_MouseWheelEvent const& event) override;
-	void KeyDown(SDL_KeyboardEvent const& event) override;
-	void KeyUp(SDL_KeyboardEvent const& event) override;
-
-	//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 = ConfigUtility::GetSingleton();
-	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
-	int& clientIndex;
-	int& accountIndex;
-
-	//define the list object
-	struct ServerInfo {
-		//graphics
-		TextLine nameImage;
-		TextLine playerCountImage;
-
-		//networking
-		IPaddress address;
-		std::string name;
-		int playerCount;
-		int version;
-		bool compatible;
-	};
-
-	//members
-	Image buttonImage;
-	Image highlightImage;
-	TTF_Font* font = nullptr;
-	Button searchButton;
-	Button joinButton;
-	Button backButton;
-
-	std::vector<ServerInfo> serverVector;
-	ServerInfo* selection = nullptr;
-
-	BoundingBox boundingBox;
-};

client/menu_scenes/main_menu.cpp

@@ -1,146 +0,0 @@
-/* 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 "main_menu.hpp"
-
-#include "config_utility.hpp"
-
-#include <sstream>
-#include <stdexcept>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-MainMenu::MainMenu() {
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-
-	//setup the utility objects
-	buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_red.png");
-	font = TTF_OpenFont(config["client.font"].c_str(), 12);
-
-	//check that the font loaded
-	if (!font) {
-		std::ostringstream msg;
-		msg << "Failed to load a font file; " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//setup the buttons
-	startButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	startButton.SetText(GetRenderer(), font, "Start", COLOR_BLUE);
-	optionsButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	optionsButton.SetText(GetRenderer(), font, "Options", COLOR_BLUE);
-	quitButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	quitButton.SetText(GetRenderer(), font, "Quit", COLOR_BLUE);
-
-	//set the button positions
-	startButton.SetX(50);
-	startButton.SetY(50 + 20 * 0);
-	optionsButton.SetX(50);
-	optionsButton.SetY(50 + 20 * 1);
-	quitButton.SetX(50);
-	quitButton.SetY(50 + 20 * 2);
-
-	//text box
-	textBox.PushLine(GetRenderer(), font, "Thanks for playing!", {255, 255, 255, 255});
-	textBox.PushLine(GetRenderer(), font, "You can get the latest version at: ", {255, 255, 255, 255});
-	textBox.PushLine(GetRenderer(), font, "krgamestudios.com", {255, 255, 255, 255}); //TODO: (9) click to open the website/update
-
-	//debug
-	//
-}
-
-MainMenu::~MainMenu() {
-	TTF_CloseFont(font);
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void MainMenu::FrameStart() {
-	//
-}
-
-void MainMenu::Update() {
-	//
-}
-
-void MainMenu::FrameEnd() {
-	//
-}
-
-void MainMenu::RenderFrame(SDL_Renderer* renderer) {
-	startButton.DrawTo(renderer);
-	optionsButton.DrawTo(renderer);
-	quitButton.DrawTo(renderer);
-
-	int h = -1;
-	SDL_RenderGetLogicalSize(GetRenderer(), nullptr, &h);
-
-	textBox.DrawTo(renderer, 50, h-50, -12);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void MainMenu::MouseMotion(SDL_MouseMotionEvent const& event) {
-	startButton.MouseMotion(event);
-	optionsButton.MouseMotion(event);
-	quitButton.MouseMotion(event);
-}
-
-void MainMenu::MouseButtonDown(SDL_MouseButtonEvent const& event) {
-	startButton.MouseButtonDown(event);
-	optionsButton.MouseButtonDown(event);
-	quitButton.MouseButtonDown(event);
-}
-
-void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& event) {
-	//TODO: (2) Buttons should only register as "selected" when the left button is used
-	if (startButton.MouseButtonUp(event) == Button::State::RELEASED) {
-		SetSceneSignal(SceneSignal::LOBBYMENU);
-	}
-	if (optionsButton.MouseButtonUp(event) == Button::State::RELEASED) {
-		SetSceneSignal(SceneSignal::OPTIONSMENU);
-	}
-	if (quitButton.MouseButtonUp(event) == Button::State::RELEASED) {
-		QuitEvent();
-	}
-}
-
-void MainMenu::MouseWheel(SDL_MouseWheelEvent const& event) {
-	//
-}
-
-void MainMenu::KeyDown(SDL_KeyboardEvent const& event) {
-	//
-}
-
-void MainMenu::KeyUp(SDL_KeyboardEvent const& event) {
-	switch(event.keysym.sym) {
-		case SDLK_ESCAPE:
-			QuitEvent();
-		break;
-	}
-}

client/menu_scenes/options_menu.cpp

@@ -1,116 +0,0 @@
-/* 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 "options_menu.hpp"
-
-#include "config_utility.hpp"
-
-#include <sstream>
-#include <stdexcept>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-OptionsMenu::OptionsMenu() {
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-
-	//setup the utility objects
-	buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_red.png");
-	font = TTF_OpenFont(config["client.font"].c_str(), 12);
-
-	//check that the font loaded
-	if (!font) {
-		std::ostringstream msg;
-		msg << "Failed to load a font file; " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//setup the button
-	backButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	backButton.SetText(GetRenderer(), font, "Back", COLOR_BLUE);
-
-	//set the button positions
-	backButton.SetX(50);
-	backButton.SetY(50);
-
-	//text line
-	textLine.SetText(GetRenderer(), font, "This code is fucking hard to refactor.", {255, 255, 255, 255});
-}
-
-OptionsMenu::~OptionsMenu() {
-	TTF_CloseFont(font);
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void OptionsMenu::FrameStart() {
-	//
-}
-
-void OptionsMenu::Update() {
-	//
-}
-
-void OptionsMenu::FrameEnd() {
-	//
-}
-
-void OptionsMenu::RenderFrame(SDL_Renderer* renderer) {
-	backButton.DrawTo(renderer);
-	textLine.DrawTo(renderer, 50, 30);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void OptionsMenu::MouseMotion(SDL_MouseMotionEvent const& event) {
-	backButton.MouseMotion(event);
-}
-
-void OptionsMenu::MouseButtonDown(SDL_MouseButtonEvent const& event) {
-	backButton.MouseButtonDown(event);
-}
-
-void OptionsMenu::MouseButtonUp(SDL_MouseButtonEvent const& event) {
-	if (backButton.MouseButtonUp(event) == Button::State::RELEASED) {
-		SetSceneSignal(SceneSignal::MAINMENU);
-	}
-}
-
-void OptionsMenu::MouseWheel(SDL_MouseWheelEvent const& event) {
-	//
-}
-
-void OptionsMenu::KeyDown(SDL_KeyboardEvent const& event) {
-	switch(event.keysym.sym) {
-		case SDLK_ESCAPE:
-			SetSceneSignal(SceneSignal::MAINMENU);
-		break;
-	}
-}
-
-void OptionsMenu::KeyUp(SDL_KeyboardEvent const& event) {
-	//
-}

client/scene_list.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,19 +19,23 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef SCENELIST_HPP_
+#define SCENELIST_HPP_
 
-enum SceneSignal {
-	//reserved members for internal use
-	QUIT = -1,
-	CONTINUE = 0,
-	FIRST = 1,
+enum class SceneList {
+	//these are reserved
+	QUIT,
+	CONTINUE,
+	FIRST,
 
-	//custom scenes
+	//custom indexes
 	SPLASHSCREEN,
 	MAINMENU,
 	OPTIONSMENU,
 	LOBBYMENU,
-	WORLD,
-	DISCONNECTEDSCREEN,
-};
+	INWORLD,
+	INCOMBAT,
+	CLEANUP,
+};
+
+#endif

client/scenes/base_scene.cpp

@@ -0,0 +1,139 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "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

@@ -0,0 +1,74 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef 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/clean_up.cpp

@@ -0,0 +1,147 @@
+/* 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 "clean_up.hpp"
+
+#include "channels.hpp"
+
+#include <stdexcept>
+
+//-------------------------
+//Public access members
+//-------------------------
+
+CleanUp::CleanUp(lua_State* L, UDPNetworkUtility& aNetwork, CharacterMap& aCharacterMap):
+	lua(L),
+	network(aNetwork),
+	characterMap(aCharacterMap)
+{
+	//get the config table
+	lua_getglobal(lua, "config");
+
+	//TODO: I need to figure out an alternative to loading these over and over again
+	//get the directories
+	lua_getfield(lua, -1, "dir");
+	lua_getfield(lua, -1, "interface");
+	lua_getfield(lua, -2, "fonts");
+
+	std::string interfaceDir = lua_tostring(lua, -2);
+	std::string fontsDir = lua_tostring(lua, -1);
+
+	lua_pop(lua, 3);
+
+	//clear the indicies
+	lua_getfield(lua, -1, "client");
+
+	lua_pushnil(lua);
+	lua_pushnil(lua);
+	lua_pushnil(lua);
+
+	lua_setfield(lua, -4, "clientIndex");
+	lua_setfield(lua, -3, "accountIndex");
+	lua_setfield(lua, -2, "characterIndex");
+
+	//pop the remaining objects from the stack
+	lua_pop(lua, 2);
+
+	//setup the utility objects
+	image.LoadSurface(interfaceDir + "button_menu.bmp");
+	image.SetClipH(image.GetClipH()/3);
+	font.LoadSurface(fontsDir + "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
+	network.Unbind(Channels::SERVER);
+	characterMap.clear();
+
+	//auto return
+	startTick = std::chrono::steady_clock::now();
+}
+
+CleanUp::~CleanUp() {
+	//
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void CleanUp::Update(double delta) {
+	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(10)) {
+		SetNextScene(SceneList::MAINMENU);
+	}
+
+	//BUGFIX: Eat incoming packets
+	while(network.Receive());
+}
+
+void CleanUp::RenderFrame() {
+	SDL_FillRect(GetScreen(), 0, 0);
+	Render(GetScreen());
+	SDL_Flip(GetScreen());
+	fps.Calculate();
+}
+
+void CleanUp::Render(SDL_Surface* const screen) {
+	backButton.DrawTo(screen);
+	font.DrawStringTo("You have been disconnected.", screen, 50, 30);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void CleanUp::QuitEvent() {
+	SetNextScene(SceneList::QUIT);
+}
+
+void CleanUp::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	backButton.MouseMotion(motion);
+}
+
+void CleanUp::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	backButton.MouseButtonDown(button);
+}
+
+void CleanUp::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	if (backButton.MouseButtonUp(button) == Button::State::HOVER &&
+		button.button & SDL_BUTTON_LMASK) {
+		SetNextScene(SceneList::MAINMENU);
+	}
+}
+
+void CleanUp::KeyDown(SDL_KeyboardEvent const& key) {
+	//
+}
+
+void CleanUp::KeyUp(SDL_KeyboardEvent const& key) {
+	//
+}

client/scenes/clean_up.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -19,45 +19,61 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef CLEANUP_HPP_
+#define CLEANUP_HPP_
 
-#include "base_scene.hpp"
-#include "button.hpp"
+//network
+#include "udp_network_utility.hpp"
+
+//graphics & ui
 #include "image.hpp"
-#include "text_line.hpp"
+#include "raster_font.hpp"
+#include "button.hpp"
+#include "frame_rate.hpp"
 
-#include "SDL2/SDL_ttf.h"
+//client
+#include "base_scene.hpp"
+#include "character.hpp"
 
+//APIs
+#include "lua/lua.hpp"
+
+//std namespace
 #include <chrono>
 
-class DisconnectedScreen : public BaseScene {
+class CleanUp : public BaseScene {
 public:
 	//Public access members
-	DisconnectedScreen();
-	~DisconnectedScreen();
-
-	void RenderFrame(SDL_Renderer* renderer) override;
+	CleanUp(lua_State*, UDPNetworkUtility&, CharacterMap&);
+	~CleanUp();
 
 protected:
-	//frame phases
-	void FrameStart() override;
-	void Update() override;
-	void FrameEnd() override;
+	//Frame loop
+	void Update(double delta);
+	void RenderFrame();
+	void Render(SDL_Surface* const);
 
-	//input events
-	void MouseMotion(SDL_MouseMotionEvent const& event) override;
-	void MouseButtonDown(SDL_MouseButtonEvent const& event) override;
-	void MouseButtonUp(SDL_MouseButtonEvent const& event) override;
-	void MouseWheel(SDL_MouseWheelEvent const& event) override;
-	void KeyDown(SDL_KeyboardEvent const& event) override;
-	void KeyUp(SDL_KeyboardEvent const& event) override;
+	//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&);
 
-	//graphics
+	//shared parameters
+	lua_State* lua = nullptr;
+	UDPNetworkUtility& network;
+	CharacterMap& characterMap;
+
+	//graphics & ui
 	Image image;
-	TTF_Font* font = nullptr;
+	RasterFont font;
 	Button backButton;
-	TextLine textLine;
+	FrameRate fps;
 
 	//auto return
 	std::chrono::steady_clock::time_point startTick;
 };
+
+#endif

client/scenes/in_combat.cpp

@@ -0,0 +1,221 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "in_combat.hpp"
+
+#include "channels.hpp"
+#include "utility.hpp"
+
+#include <stdexcept>
+
+//-------------------------
+//Public access members
+//-------------------------
+
+InCombat::InCombat(
+	ConfigUtility* const argConfig,
+	UDPNetworkUtility* const argNetwork,
+	int* const argClientIndex,
+	int* const argAccountIndex,
+	int* const argCharacterIndex,
+	CharacterMap* argCharacterMap
+	):
+	config(*argConfig),
+	network(*argNetwork),
+	clientIndex(*argClientIndex),
+	accountIndex(*argAccountIndex),
+	characterIndex(*argCharacterIndex),
+	characterMap(*argCharacterMap)
+{
+/*	//setup the utility objects
+	buttonImage.LoadSurface(config["dir.interface"] + "button_menu.bmp");
+	buttonImage.SetClipH(buttonImage.GetClipH()/3);
+	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+
+	//pass the utility objects
+	backButton.SetImage(&buttonImage);
+	backButton.SetFont(&font);
+
+	//set the button positions
+	backButton.SetX(50);
+	backButton.SetY(50 + buttonImage.GetClipH() * 0);
+
+	//set the button texts
+	backButton.SetText("Back");
+
+	//request a sync
+	RequestSynchronize();
+*/
+	//debug
+	//
+}
+
+InCombat::~InCombat() {
+	//
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void InCombat::FrameStart() {
+	//
+}
+
+void InCombat::Update(double delta) {
+	//suck in and process all waiting packets
+	SerialPacket* packetBuffer = static_cast<SerialPacket*>(malloc(MAX_PACKET_SIZE));
+	while(network.Receive(packetBuffer)) {
+		HandlePacket(packetBuffer);
+	}
+	free(static_cast<void*>(packetBuffer));
+
+	//TODO: more
+}
+
+void InCombat::FrameEnd() {
+	//
+}
+
+void InCombat::RenderFrame() {
+	SDL_FillRect(GetScreen(), 0, 0);
+	Render(GetScreen());
+	SDL_Flip(GetScreen());
+	fps.Calculate();
+}
+
+void InCombat::Render(SDL_Surface* const screen) {
+	//TODO: draw the background
+
+	//TODO: draw the characters
+
+	//TODO: draw the enemies
+
+	//TODO: draw the UI
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void InCombat::QuitEvent() {
+	//exit the game AND the server
+	RequestDisconnect();
+	SetNextScene(SceneList::QUIT);
+}
+
+void InCombat::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	//
+}
+
+void InCombat::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	//
+}
+
+void InCombat::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	//
+}
+
+void InCombat::KeyDown(SDL_KeyboardEvent const& key) {
+	//
+}
+
+void InCombat::KeyUp(SDL_KeyboardEvent const& key) {
+	//
+}
+
+//-------------------------
+//Network handlers
+//-------------------------
+
+void InCombat::HandlePacket(SerialPacket* const argPacket) {
+	switch(argPacket->type) {
+		case SerialPacketType::DISCONNECT:
+			HandleDisconnect(argPacket);
+		break;
+		//handle errors
+		default:
+			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in InCombat: " + to_string_custom(static_cast<int>(argPacket->type)) ));
+		break;
+	}
+}
+
+void InCombat::HandleDisconnect(SerialPacket* const) {
+	SetNextScene(SceneList::CLEANUP);
+}
+
+//TODO: more network handlers
+
+//-------------------------
+//Server control
+//-------------------------
+
+void InCombat::RequestSynchronize() {
+	ClientPacket newPacket;
+
+	//request a sync
+	newPacket.type = SerialPacketType::SYNCHRONIZE;
+	newPacket.clientIndex = clientIndex;
+	newPacket.accountIndex = accountIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InCombat::SendPlayerUpdate() {
+	CharacterPacket newPacket;
+
+	//pack the packet
+	newPacket.type = SerialPacketType::CHARACTER_UPDATE;
+
+	newPacket.characterIndex = characterIndex;
+	//handle, avatar
+	newPacket.accountIndex = accountIndex;
+//	newPacket.roomIndex = localCharacter->roomIndex;
+//	newPacket.origin = localCharacter->origin;
+//	newPacket.motion = localCharacter->motion;
+//	newPacket.stats = localCharacter->stats;
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InCombat::RequestDisconnect() {
+	ClientPacket newPacket;
+
+	//send a disconnect request
+	newPacket.type = SerialPacketType::DISCONNECT;
+	newPacket.clientIndex = clientIndex;
+	newPacket.accountIndex = accountIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InCombat::RequestShutdown() {
+	ClientPacket newPacket;
+
+	//send a shutdown request
+	newPacket.type = SerialPacketType::SHUTDOWN;
+	newPacket.clientIndex = clientIndex;
+	newPacket.accountIndex = accountIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}

client/scenes/in_combat.hpp

@@ -0,0 +1,97 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef INCOMBAT_HPP_
+#define INCOMBAT_HPP_
+
+//network
+#include "udp_network_utility.hpp"
+
+//graphics
+#include "image.hpp"
+#include "raster_font.hpp"
+#include "button.hpp"
+
+//common
+#include "config_utility.hpp"
+#include "frame_rate.hpp"
+
+#include "character.hpp"
+
+//client
+#include "base_scene.hpp"
+
+class InCombat : public BaseScene {
+public:
+	//Public access members
+	InCombat(
+		ConfigUtility* const argConfig,
+		UDPNetworkUtility* const argNetwork,
+		int* const argClientIndex,
+		int* const argAccountIndex,
+		int* const argCharacterIndex,
+		CharacterMap* argCharacterMap
+	);
+	~InCombat();
+
+protected:
+	//Frame loop
+	void FrameStart();
+	void Update(double delta);
+	void FrameEnd();
+	void RenderFrame();
+	void Render(SDL_Surface* const);
+
+	//Event handlers
+	void QuitEvent();
+	void MouseMotion(SDL_MouseMotionEvent const&);
+	void MouseButtonDown(SDL_MouseButtonEvent const&);
+	void MouseButtonUp(SDL_MouseButtonEvent const&);
+	void KeyDown(SDL_KeyboardEvent const&);
+	void KeyUp(SDL_KeyboardEvent const&);
+
+	//Network handlers
+	void HandlePacket(SerialPacket* const);
+	void HandleDisconnect(SerialPacket* const);
+
+	//Server control
+	void RequestSynchronize();
+	void SendPlayerUpdate();
+	void RequestDisconnect();
+	void RequestShutdown();
+
+	//shared parameters
+	ConfigUtility& config;
+	UDPNetworkUtility& network;
+	int& clientIndex;
+	int& accountIndex;
+	int& characterIndex;
+	CharacterMap& characterMap;
+
+	//graphics
+	//TODO: graphics
+
+	//UI
+	//TODO: UI
+	FrameRate fps;
+};
+
+#endif

client/scenes/in_world.cpp

@@ -0,0 +1,533 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "in_world.hpp"
+
+#include "channels.hpp"
+#include "utility.hpp"
+
+#include <stdexcept>
+#include <algorithm>
+#include <cmath>
+#include <iostream>
+
+//-------------------------
+//Public access members
+//-------------------------
+
+InWorld::InWorld(
+	ConfigUtility* const argConfig,
+	UDPNetworkUtility* const argNetwork,
+	int* const argClientIndex,
+	int* const argAccountIndex,
+	int* const argCharacterIndex,
+	CharacterMap* argCharacterMap
+	):
+	config(*argConfig),
+	network(*argNetwork),
+	clientIndex(*argClientIndex),
+	accountIndex(*argAccountIndex),
+	characterIndex(*argCharacterIndex),
+	characterMap(*argCharacterMap)
+{
+	//register the pager
+	lua_pushstring(lua, TORTUGA_REGION_PAGER_PSEUDO_INDEX);
+	lua_pushlightuserdata(lua, &pager);
+	lua_settable(L, LUA_REGISTRYINDEX);
+
+	//register the tilesheet
+	lua_pushstring(lua, TORTUGA_TILE_SHEET_PSEUDO_INDEX);
+	lua_pushlightuserdata(lua, &tileSheet);
+	lua_settable(L, LUA_REGISTRYINDEX);
+
+	//setup the component objecrs
+	pager.SetLuaState(lua);
+
+	//get the config info
+	lua_getglobal(lua, "config");
+	lua_getfield(lua, -1, "dir");
+	lua_getfield(lua, -1, "fonts");
+	std::string fonts = lua_tostring(lua, -1);
+	lua_getfield(lua, -2, "interface");
+	std::string interface = lua_tostring(lua, -1);
+	lua_getfield(lua, -3, "sprites");
+	std::string sprites = lua_tostring(lua, -1);
+	lua_getfield(lua, -4, "scripts");
+	std::string scripts = lua_tostring(lua, -1);
+	lua_pop(lua, 6);
+
+	//run the additional scripts
+	if (luaL_dofile(lua, (scripts + "in_world.lua").c_str())) {
+		throw(std::runtime_error(std::string() + "Failed to run in_world.lua: " + lua_tostring(lua, -1) ));
+	}
+
+	//setup the utility objects
+	buttonImage.LoadSurface(interface + "button_menu.bmp");
+	buttonImage.SetClipH(buttonImage.GetClipH()/3);
+	font.LoadSurface(fonts + "pk_white_8.bmp");
+
+	//pass the utility objects
+	backButton.SetImage(&buttonImage);
+	backButton.SetFont(&font);
+
+	//set the button positions
+	backButton.SetX(50);
+	backButton.SetY(50 + buttonImage.GetClipH() * 0);
+
+	//set the button texts
+	backButton.SetText("Back");
+
+	//entities
+	character.GetSprite()->LoadSurface(sprites + "elliot2.bmp", 4, 4);
+	character.SetBoundingBox({0, 0,
+		character.GetSprite()->GetImage()->GetClipW(),
+		character.GetSprite()->GetImage()->GetClipH()
+	});
+//-------------------------
+	//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
+	RequestSynchronize();
+
+	//debug
+	//
+}
+
+InWorld::~InWorld() {
+	//unregister the map components
+	lua_pushstring(lua, TORTUGA_REGION_PAGER_PSEUDO_INDEX);
+	lua_pushstring(lua, TORTUGA_TILE_SHEET_PSEUDO_INDEX);
+	lua_pushnil(lua);
+	lua_settable(lua, LUA_REGISTRYINDEX);
+	lua_pushnil(lua);
+	lua_settable(lua, LUA_REGISTRYINDEX);
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void InWorld::FrameStart() {
+	//
+}
+
+void InWorld::Update(double delta) {
+	//suck in and process all waiting packets
+	SerialPacket* packetBuffer = static_cast<SerialPacket*>(malloc(MAX_PACKET_SIZE));
+	while(network.Receive(packetBuffer)) {
+		HandlePacket(packetBuffer);
+	}
+	free(static_cast<void*>(packetBuffer));
+
+	//update the characters
+	for (auto& it : characterMap) {
+		it.second.Update(delta);
+	}
+
+	//TODO: Check collisions here
+	//check for collisions with the map
+	BoundingBox wallBounds = {0, 0, tileSheet.GetTileW(), tileSheet.GetTileH()};
+	const int xCount = character.GetBoundingBox().w / wallBounds.w + 1;
+	const int yCount = character.GetBoundingBox().h / wallBounds.h + 1;
+
+	for (int i = -1; i <= xCount; ++i) {
+		for (int j = -1; j <= yCount; ++j) {
+			//set the wall's position
+			wallBounds.x = wallBounds.w * i + snapToBase((double)wallBounds.w, character.GetOrigin().x);
+			wallBounds.y = wallBounds.h * j + snapToBase((double)wallBounds.h, character.GetOrigin().y);
+
+			if (!pager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
+				continue;
+			}
+
+			if ((character.GetOrigin() + character.GetBoundingBox()).CheckOverlap(wallBounds)) {
+				character.SetOrigin(character.GetOrigin() - (character.GetMotion() * delta));
+				character.SetMotion({0,0});
+				character.CorrectSprite();
+			}
+		}
+	}
+
+	//update the camera
+	if(localCharacter) {
+		camera.x = localCharacter->GetOrigin().x - camera.marginX;
+		camera.y = localCharacter->GetOrigin().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 (std::list<Region>::iterator it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); it++) {
+		tileSheet.DrawRegionTo(screen, &(*it), camera.x, camera.y);
+	}
+
+	//draw characters
+	for (auto& it : characterMap) {
+		//BUG: #29 drawing order according to Y origin
+		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();
+	SetNextScene(SceneList::QUIT);
+}
+
+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) {
+	if (!localCharacter) {
+		return;
+	}
+
+	//player movement
+	Vector2 motion = localCharacter->GetMotion();
+	switch(key.keysym.sym) {
+		case SDLK_LEFT:
+			motion.x -= CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_RIGHT:
+			motion.x += CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_UP:
+			motion.y -= CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_DOWN:
+			motion.y += CHARACTER_WALKING_SPEED;
+		break;
+		default:
+			return;
+	}
+	localCharacter->SetMotion(motion);
+	localCharacter->CorrectSprite();
+	SendPlayerUpdate();
+}
+
+void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
+	if (!localCharacter) {
+		return;
+	}
+
+	//player movement
+	Vector2 motion = localCharacter->GetMotion();
+	switch(key.keysym.sym) {
+		//NOTE: The use of min/max here are to prevent awkward movements
+		case SDLK_LEFT:
+			motion.x = std::min(motion.x + CHARACTER_WALKING_SPEED, 0.0);
+		break;
+		case SDLK_RIGHT:
+			motion.x = std::max(motion.x - CHARACTER_WALKING_SPEED, 0.0);
+		break;
+		case SDLK_UP:
+			motion.y = std::min(motion.y + CHARACTER_WALKING_SPEED, 0.0);
+		break;
+		case SDLK_DOWN:
+			motion.y = std::max(motion.y - CHARACTER_WALKING_SPEED, 0.0);
+		break;
+		default:
+			return;
+	}
+	localCharacter->SetMotion(motion);
+	localCharacter->CorrectSprite();
+	SendPlayerUpdate();
+}
+
+//-------------------------
+//Network handlers
+//-------------------------
+
+void InWorld::HandlePacket(SerialPacket* const argPacket) {
+	switch(argPacket->type) {
+		case SerialPacketType::DISCONNECT:
+			HandleDisconnect(argPacket);
+		break;
+		case SerialPacketType::CHARACTER_NEW:
+			HandleCharacterNew(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::CHARACTER_DELETE:
+			HandleCharacterDelete(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::CHARACTER_UPDATE:
+			HandleCharacterUpdate(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::REGION_CONTENT:
+			HandleRegionContent(static_cast<RegionPacket*>(argPacket));
+		break;
+		//handle errors
+		default:
+			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in InWorld: " + to_string_custom(static_cast<int>(argPacket->type)) ));
+		break;
+	}
+}
+
+void InWorld::HandleDisconnect(SerialPacket* const argPacket) {
+	SetNextScene(SceneList::CLEANUP);
+}
+
+void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
+	if (characterMap.find(argPacket->characterIndex) != characterMap.end()) {
+		throw(std::runtime_error("Cannot create duplicate characters"));
+	}
+
+	//create the character object
+	Character& newCharacter = characterMap[argPacket->characterIndex];
+
+	//fill out the character's members
+	newCharacter.SetHandle(argPacket->handle);
+	newCharacter.SetAvatar(argPacket->avatar);
+
+	newCharacter.GetSprite()->LoadSurface(config["dir.sprites"] + newCharacter.GetAvatar(), 4, 4);
+
+	newCharacter.SetOrigin(argPacket->origin);
+	newCharacter.SetMotion(argPacket->motion);
+
+	(*newCharacter.GetStats()) = argPacket->stats;
+
+	//bookkeeping code
+	newCharacter.CorrectSprite();
+
+	//catch this client's player object
+	if (argPacket->accountIndex == accountIndex && !localCharacter) {
+		characterIndex = argPacket->characterIndex;
+		localCharacter = &newCharacter;
+
+		//setup the camera
+		//TODO: move this?
+		camera.width = GetScreen()->w;
+		camera.height = GetScreen()->h;
+
+		//center on the player's character
+		camera.marginX = (GetScreen()->w / 2 - localCharacter->GetSprite()->GetImage()->GetClipW() / 2);
+		camera.marginY = (GetScreen()->h / 2 - localCharacter->GetSprite()->GetImage()->GetClipH() / 2);
+	}
+}
+
+void InWorld::HandleCharacterDelete(CharacterPacket* const argPacket) {
+	//TODO: authenticate when own character is being deleted (linked to a TODO in the server)
+
+	//catch this client's player object
+	if (argPacket->characterIndex == characterIndex) {
+		characterIndex = -1;
+		localCharacter = nullptr;
+	}
+
+	characterMap.erase(argPacket->characterIndex);
+}
+
+void InWorld::HandleCharacterUpdate(CharacterPacket* const argPacket) {
+	if (characterMap.find(argPacket->characterIndex) == characterMap.end()) {
+		std::cout << "Warning: HandleCharacterUpdate() is passing to HandleCharacterNew()" << std::endl;
+		HandleCharacterNew(argPacket);
+		return;
+	}
+
+	Character& character = characterMap[argPacket->characterIndex];
+
+	//other characters moving
+	if (argPacket->characterIndex != characterIndex) {
+		character.SetOrigin(argPacket->origin);
+		character.SetMotion(argPacket->motion);
+		character.CorrectSprite();
+	}
+}
+
+void InWorld::HandleRegionContent(RegionPacket* const argPacket) {
+	//replace existing regions
+	regionPager.UnloadRegion(argPacket->x, argPacket->y);
+	regionPager.PushRegion(argPacket->region);
+
+	//clean up after the serial code
+	delete argPacket->region;
+	argPacket->region = nullptr;
+}
+
+//-------------------------
+//Server control
+//-------------------------
+
+void InWorld::RequestSynchronize() {
+	ClientPacket newPacket;
+
+	//request a sync
+	newPacket.type = SerialPacketType::SYNCHRONIZE;
+	newPacket.clientIndex = clientIndex;
+	newPacket.accountIndex = accountIndex;
+
+	//TODO: location, range for sync request
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::SendPlayerUpdate() {
+	CharacterPacket newPacket;
+
+	//pack the packet
+	newPacket.type = SerialPacketType::CHARACTER_UPDATE;
+
+	newPacket.characterIndex = characterIndex;
+	//NOTE: omitting the handle and avatar here
+	newPacket.accountIndex = accountIndex;
+	newPacket.roomIndex = 0; //TODO: room index
+	newPacket.origin = localCharacter->GetOrigin();
+	newPacket.motion = localCharacter->GetMotion();
+	newPacket.stats = *localCharacter->GetStats();
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::RequestDisconnect() {
+	ClientPacket newPacket;
+
+	//send a disconnect request
+	newPacket.type = SerialPacketType::DISCONNECT;
+	newPacket.clientIndex = clientIndex;
+	newPacket.accountIndex = accountIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::RequestShutDown() {
+	ClientPacket newPacket;
+
+	//send a shutdown request
+	newPacket.type = SerialPacketType::SHUTDOWN;
+	newPacket.clientIndex = clientIndex;
+	newPacket.accountIndex = accountIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::RequestRegion(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);
+}
+
+//-------------------------
+//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 (std::list<Region>::iterator it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); /* EMPTY */) {
+		//check if the region is outside of 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

@@ -0,0 +1,131 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef INWORLD_HPP_
+#define INWORLD_HPP_
+
+//map stuff
+#include "tile_sheet.hpp"
+#include "region_pager_lua.hpp"
+
+//networking
+#include "udp_network_utility.hpp"
+
+//graphics & ui
+#include "image.hpp"
+#include "raster_font.hpp"
+#include "button.hpp"
+
+//utilities
+#include "frame_rate.hpp"
+#include "timer.hpp"
+
+//client
+#include "base_scene.hpp"
+#include "character.hpp"
+
+//APIs
+#include "lua/lua.hpp"
+
+//STL
+#include <map>
+
+class InWorld : public BaseScene {
+public:
+	//Public access members
+	InWorld(
+		ConfigUtility* const argConfig,
+		UDPNetworkUtility* const argNetwork,
+		int* const argClientIndex,
+		int* const argAccountIndex,
+		int* const argCharacterIndex,
+		CharacterMap* argCharacterMap
+	);
+	~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* const);
+	void HandleDisconnect(SerialPacket* const);
+	void HandleCharacterNew(CharacterPacket* const);
+	void HandleCharacterDelete(CharacterPacket* const);
+	void HandleCharacterUpdate(CharacterPacket* const);
+	void HandleRegionContent(RegionPacket* const);
+
+	//Server control
+	void RequestSynchronize();
+	void SendPlayerUpdate();
+	void RequestDisconnect();
+	void RequestShutDown();
+	void RequestRegion(int roomIndex, int x, int y);
+
+	//utilities
+	void UpdateMap();
+
+	//TODO: Streamline this with lua
+	//shared parameters
+	ConfigUtility& config;
+	UDPNetworkUtility& network;
+	int& clientIndex;
+	int& accountIndex;
+	int& characterIndex;
+	CharacterMap& characterMap;
+
+	//graphics
+	Image buttonImage;
+	RasterFont font;
+	TileSheet tileSheet;
+
+	//map
+	RegionPagerBase regionPager;
+
+	//UI
+	Button disconnectButton;
+	Button shutDownButton;
+	//TODO: Review the camera
+	struct {
+		struct {
+			int x, y;
+		}origin, margin;
+	}camera;
+
+	FrameRate fps;
+
+	//game
+	Character* localCharacter = nullptr;
+};
+
+#endif

client/scenes/lobby_menu.cpp

@@ -0,0 +1,281 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "lobby_menu.hpp"
+
+#include "channels.hpp"
+#include "utility.hpp"
+
+#include <stdexcept>
+
+//-------------------------
+//Public access members
+//-------------------------
+
+LobbyMenu::LobbyMenu(lua_State* L, UDPNetworkUtility& aNetwork):
+	lua(L),
+	network(aNetwork)
+{
+	//get the config info
+	lua_getglobal(lua, "config");
+	lua_getfield(lua, -1, "dir");
+	lua_getfield(lua, -1, "interface");
+	lua_getfield(lua, -2, "fonts");
+
+	std::string interfaceDir = lua_tostring(lua, -2);
+	std::string fontsDir = lua_tostring(lua, -1);
+
+	lua_pop(lua, 4);
+
+	//setup the utility objects
+	image.LoadSurface(interfaceDir + "button_menu.bmp");
+	image.SetClipH(image.GetClipH()/3);
+	font.LoadSurface(fontsDir + "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()};
+
+	//BUGFIX: Eat incoming packets
+	while(network.Receive());
+}
+
+LobbyMenu::~LobbyMenu() {
+	//
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void LobbyMenu::FrameStart() {
+	//
+}
+
+void LobbyMenu::Update(double delta) {
+	//suck in and process all waiting packets
+	SerialPacket* packetBuffer = new SerialPacket();
+	while(network.Receive(packetBuffer)) {
+		HandlePacket(packetBuffer);
+	}
+	delete packetBuffer;
+}
+
+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);
+		}
+
+		//TODO: ping/delay?
+	}
+}
+
+//-------------------------
+//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) {
+	//prep
+	lua_getglobal(lua, "config");
+
+	if (search.MouseButtonUp(button) == Button::State::HOVER) {
+		//get the set parameters
+		lua_getfield(lua, -1, "server");
+		lua_getfield(lua, -1, "host");
+		lua_getfield(lua, -2, "port");
+
+		//broadcast to the network, or a specific server
+		SerialPacket packet;
+		packet.type = SerialPacketType::BROADCAST_REQUEST;
+		network.SendTo(lua_tostring(lua, -2), lua_tointeger(lua, -1), &packet);
+
+		//reset the server list
+		serverInfo.clear();
+		selection = nullptr;
+
+		//clear the parameters
+		lua_pop(lua, 3);
+	}
+
+	else if (join.MouseButtonUp(button) == Button::State::HOVER && selection != nullptr && selection->compatible) {
+		//get the parameters
+		lua_getfield(lua, -1, "client");
+		lua_getfield(lua, -1, "username");
+
+		//pack the packet
+		ClientPacket packet;
+		packet.type = SerialPacketType::JOIN_REQUEST;
+		strncpy(packet.username, lua_tostring(lua, -1), PACKET_STRING_SIZE);
+
+		//join the selected server
+		network.SendTo(&selection->address, &packet);
+		selection = nullptr;
+
+		//clear the parameters
+		lua_pop(lua, 2);
+	}
+
+	else if (back.MouseButtonUp(button) == Button::State::HOVER) {
+		SetNextScene(SceneList::MAINMENU);
+	}
+
+	else if (
+		//has the user selected a server on the list?
+		//TODO: replace with regular collision checker
+		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;
+	}
+
+	//clear the parameters
+	lua_pop(lua, 1);
+}
+
+void LobbyMenu::KeyDown(SDL_KeyboardEvent const& key) {
+	//
+}
+
+void LobbyMenu::KeyUp(SDL_KeyboardEvent const& key) {
+	//
+}
+
+//-------------------------
+//Network handlers
+//-------------------------
+
+void LobbyMenu::HandlePacket(SerialPacket* const argPacket) {
+		switch(argPacket->type) {
+		case SerialPacketType::BROADCAST_RESPONSE:
+			HandleBroadcastResponse(dynamic_cast<ServerPacket*>(argPacket));
+		break;
+		case SerialPacketType::JOIN_RESPONSE:
+			HandleJoinResponse(dynamic_cast<ClientPacket*>(argPacket));
+		break;
+		//handle errors
+		default:
+			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in LobbyMenu: " + to_string_custom(static_cast<int>(argPacket->type)) ));
+		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) {
+	lua_getglobal(lua, "config");
+	lua_getfield(lua, -1, "client");
+	lua_getfield(lua, -1, "handle");
+	lua_getfield(lua, -2, "avatar");
+
+	lua_pushinteger(lua, argPacket->clientIndex);
+	lua_pushinteger(lua, argPacket->accountIndex);
+	lua_setfield(lua, -5, "accountIndex");
+	lua_setfield(lua, -4, "clientIndex");
+	network.Bind(&argPacket->srcAddress, Channels::SERVER);
+	SetNextScene(SceneList::INWORLD);
+
+	//send this player's character info
+	CharacterPacket newPacket;
+	newPacket.type = SerialPacketType::CHARACTER_NEW;
+	strncpy(newPacket.handle, lua_tostring(lua, -2), PACKET_STRING_SIZE);
+	strncpy(newPacket.avatar, lua_tostring(lua, -1), PACKET_STRING_SIZE);
+	newPacket.accountIndex = argPacket->accountIndex;
+	network.SendTo(Channels::SERVER, &newPacket);
+
+	lua_pop(lua, 4);
+}

client/scenes/lobby_menu.hpp

@@ -0,0 +1,95 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef LOBBYMENU_HPP_
+#define LOBBYMENU_HPP_
+
+//graphics & ui
+#include "image.hpp"
+#include "raster_font.hpp"
+#include "button.hpp"
+
+//utilities
+#include "udp_network_utility.hpp"
+
+//client
+#include "base_scene.hpp"
+
+//APIs
+#include "lua/lua.hpp"
+
+//STL
+#include <vector>
+
+class LobbyMenu : public BaseScene {
+public:
+	//Public access members
+	LobbyMenu(lua_State*, UDPNetworkUtility&);
+	~LobbyMenu();
+
+protected:
+	//Frame loop
+	void FrameStart();
+	void Update(double delta);
+	void FrameEnd();
+	void Render(SDL_Surface* const);
+
+	//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&);
+
+	//Network handlers
+	void HandlePacket(SerialPacket* const);
+	void HandleBroadcastResponse(ServerPacket* const);
+	void HandleJoinResponse(ClientPacket* const);
+
+	//shared parameters
+	lua_State* lua = nullptr;
+	UDPNetworkUtility& network;
+
+	//members
+	Image image;
+	RasterFont font;
+	Button search;
+	Button join;
+	Button back;
+
+	//server list
+	struct ServerInformation {
+		IPaddress address;
+		std::string name;
+		int playerCount;
+		int version;
+		bool compatible;
+	};
+
+	std::vector<ServerInformation> serverInfo;
+
+	//a terrible hack, forgive me
+	//TODO: I'd love a proper gui system for this
+	SDL_Rect listBox;
+	ServerInformation* selection = nullptr;
+};
+
+#endif

client/scenes/main_menu.cpp

@@ -0,0 +1,131 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "main_menu.hpp"
+
+//-------------------------
+//Public access members
+//-------------------------
+
+MainMenu::MainMenu(lua_State* L): lua(L) {
+	//get the config info
+	lua_getglobal(lua, "config");
+	lua_getfield(lua, -1, "dir");
+	lua_getfield(lua, -1, "interface");
+	lua_getfield(lua, -2, "fonts");
+
+	std::string interfaceDir = lua_tostring(lua, -2);
+	std::string fontsDir = lua_tostring(lua, -1);
+
+	lua_pop(lua, 4);
+
+	//setup the utility objects
+	image.LoadSurface(interfaceDir + "button_menu.bmp");
+	image.SetClipH(image.GetClipH()/3);
+	font.LoadSurface(fontsDir + "pk_white_8.bmp");
+
+	//pass the utility objects
+	startButton.SetImage(&image);
+	startButton.SetFont(&font);
+	optionsButton.SetImage(&image);
+	optionsButton.SetFont(&font);
+	quitButton.SetImage(&image);
+	quitButton.SetFont(&font);
+
+	//set the button positions
+	startButton.SetX(50);
+	startButton.SetY(50 + image.GetClipH() * 0);
+	optionsButton.SetX(50);
+	optionsButton.SetY(50 + image.GetClipH() * 1);
+	quitButton.SetX(50);
+	quitButton.SetY(50 + image.GetClipH() * 2);
+
+	//set the button texts
+	startButton.SetText("Start");
+	optionsButton.SetText("Options");
+	quitButton.SetText("Quit");
+
+	//debug
+	//
+}
+
+MainMenu::~MainMenu() {
+	//
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void MainMenu::FrameStart() {
+	//
+}
+
+void MainMenu::Update(double delta) {
+	//
+}
+
+void MainMenu::FrameEnd() {
+	//
+}
+
+void MainMenu::Render(SDL_Surface* const screen) {
+	startButton.DrawTo(screen);
+	optionsButton.DrawTo(screen);
+	quitButton.DrawTo(screen);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void MainMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	startButton.MouseMotion(motion);
+	optionsButton.MouseMotion(motion);
+	quitButton.MouseMotion(motion);
+}
+
+void MainMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	startButton.MouseButtonDown(button);
+	optionsButton.MouseButtonDown(button);
+	quitButton.MouseButtonDown(button);
+}
+
+void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	if (startButton.MouseButtonUp(button) == Button::State::HOVER) {
+		SetNextScene(SceneList::INWORLD);
+	}
+	if (optionsButton.MouseButtonUp(button) == Button::State::HOVER) {
+		SetNextScene(SceneList::OPTIONSMENU);
+	}
+	if (quitButton.MouseButtonUp(button) == Button::State::HOVER &&
+		button.button & SDL_BUTTON_LMASK) {
+		QuitEvent();
+	}
+}
+
+void MainMenu::KeyDown(SDL_KeyboardEvent const& key) {
+	//
+}
+
+void MainMenu::KeyUp(SDL_KeyboardEvent const& key) {
+	//
+}

client/scenes/main_menu.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,42 +19,46 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef MAINMENU_HPP_
+#define MAINMENU_HPP_
 
 #include "base_scene.hpp"
-#include "button.hpp"
-#include "image.hpp"
-#include "text_box.hpp"
 
-#include "SDL2/SDL_ttf.h"
+#include "image.hpp"
+#include "raster_font.hpp"
+#include "button.hpp"
+
+#include "lua/lua.hpp"
 
 class MainMenu : public BaseScene {
 public:
 	//Public access members
-	MainMenu();
+	MainMenu(lua_State* L);
 	~MainMenu();
 
-	void RenderFrame(SDL_Renderer* renderer) override;
-
 protected:
-	//frame phases
-	void FrameStart() override;
-	void Update() override;
-	void FrameEnd() override;
+	//Frame loop
+	void FrameStart();
+	void Update(double delta);
+	void FrameEnd();
+	void Render(SDL_Surface* const);
 
-	//input events
-	void MouseMotion(SDL_MouseMotionEvent const& event) override;
-	void MouseButtonDown(SDL_MouseButtonEvent const& event) override;
-	void MouseButtonUp(SDL_MouseButtonEvent const& event) override;
-	void MouseWheel(SDL_MouseWheelEvent const& event) override;
-	void KeyDown(SDL_KeyboardEvent const& event) override;
-	void KeyUp(SDL_KeyboardEvent const& event) override;
+	//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&);
+
+	//shared parameters
+	lua_State* lua = nullptr;
 
 	//members
-	Image buttonImage;
-	TTF_Font* font = nullptr;
+	Image image;
+	RasterFont font;
 	Button startButton;
 	Button optionsButton;
 	Button quitButton;
-	TextBox textBox;
 };
+
+#endif

client/scenes/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. .. ../client_utilities ../../common/graphics ../../common/map ../../common/network ../../common/network/packet_types ../../common/ui ../../common/utilities
+INCLUDES+=. .. ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/network/packet ../../common/network/serial ../../common/ui ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
@@ -30,3 +30,8 @@ $(OUTDIR):
 
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all

client/scenes/options_menu.cpp

@@ -0,0 +1,108 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "options_menu.hpp"
+
+//-------------------------
+//Public access members
+//-------------------------
+
+OptionsMenu::OptionsMenu(lua_State* L): lua(L) {
+	//get the config info
+	lua_getglobal(lua, "config");
+	lua_getfield(lua, -1, "dir");
+	lua_getfield(lua, -1, "interface");
+	lua_getfield(lua, -2, "fonts");
+
+	std::string interfaceDir = lua_tostring(lua, -2);
+	std::string fontsDir = lua_tostring(lua, -1);
+
+	lua_pop(lua, 4);
+
+	//setup the utility objects
+	image.LoadSurface(interfaceDir + "button_menu.bmp");
+	image.SetClipH(image.GetClipH()/3);
+	font.LoadSurface(fontsDir + "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");
+}
+
+OptionsMenu::~OptionsMenu() {
+	//
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void OptionsMenu::FrameStart() {
+	//
+}
+
+void OptionsMenu::Update(double delta) {
+	//
+}
+
+void OptionsMenu::FrameEnd() {
+	//
+}
+
+void OptionsMenu::Render(SDL_Surface* const screen) {
+	backButton.DrawTo(screen);
+
+	font.DrawStringTo("Oh, were you looking for the options screen?", screen, 50, 30);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void OptionsMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	backButton.MouseMotion(motion);
+}
+
+void OptionsMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	backButton.MouseButtonDown(button);
+}
+
+void OptionsMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	if (backButton.MouseButtonUp(button) == Button::State::HOVER &&
+		button.button & SDL_BUTTON_LMASK) {
+		SetNextScene(SceneList::MAINMENU);
+	}
+}
+
+void OptionsMenu::KeyDown(SDL_KeyboardEvent const& key) {
+	//
+}
+
+void OptionsMenu::KeyUp(SDL_KeyboardEvent const& key) {
+	//
+}

client/scenes/options_menu.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,40 +19,45 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
-
-#include "button.hpp"
-#include "image.hpp"
-#include "text_line.hpp"
+#ifndef OPTIONSMENU_HPP_
+#define OPTIONSMENU_HPP_
 
 #include "base_scene.hpp"
 
-//NOTE: The options screen needs to be USED
+#include "image.hpp"
+#include "raster_font.hpp"
+#include "button.hpp"
+
+#include "lua/lua.hpp"
+
+//TODO: The options screen needs to be USED
 class OptionsMenu : public BaseScene {
 public:
 	//Public access members
-	OptionsMenu();
+	OptionsMenu(lua_State* L);
 	~OptionsMenu();
 
-	void RenderFrame(SDL_Renderer* renderer) override;
+protected:
+	//Frame loop
+	void FrameStart();
+	void Update(double delta);
+	void FrameEnd();
+	void Render(SDL_Surface* const);
 
-private:
-	//frame phases
-	void FrameStart() override;
-	void Update() override;
-	void FrameEnd() override;
+	//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&);
 
-	//input events
-	void MouseMotion(SDL_MouseMotionEvent const& event) override;
-	void MouseButtonDown(SDL_MouseButtonEvent const& event) override;
-	void MouseButtonUp(SDL_MouseButtonEvent const& event) override;
-	void MouseWheel(SDL_MouseWheelEvent const& event) override;
-	void KeyDown(SDL_KeyboardEvent const& event) override;
-	void KeyUp(SDL_KeyboardEvent const& event) override;
+	//shared parameters
+	lua_State* lua = nullptr;
 
 	//members
-	Image buttonImage;
-	TTF_Font* font = nullptr;
+	Image image;
+	RasterFont font;
 	Button backButton;
-	TextLine textLine;
 };
+
+#endif

client/scenes/splash_screen.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,44 +21,38 @@
 */
 #include "splash_screen.hpp"
 
-#include "config_utility.hpp"
+#include <string>
 
 //-------------------------
 //Public access members
 //-------------------------
 
-SplashScreen::SplashScreen(SDL_Window* w) {
-	//fit the screen to the logo
-	//NOTE: not using this window trick
-	window = w;
-	SDL_GetWindowSize(window, &windowWidth, &windowHeight);
-
-	logo.Load(GetRenderer(), ConfigUtility::GetSingleton()["dir.logos"] + "krstudios.png");
-
-//	SDL_SetWindowSize(window, logo.GetClipW(), logo.GetClipH());
-//	SDL_RenderSetLogicalSize(GetRenderer(), logo.GetClipW(), logo.GetClipH());
+SplashScreen::SplashScreen(lua_State* L): lua(L) {
+	//get the config info
+	lua_getglobal(lua, "config");
+	lua_getfield(lua, -1, "dir");
+	lua_getfield(lua, -1, "logos");
+	std::string logos = lua_tostring(lua, -1);
+	lua_pop(lua, 3);
 
+	logo.LoadSurface(logos + "krstudios.bmp");
 	startTick = std::chrono::steady_clock::now();
 }
 
 SplashScreen::~SplashScreen() {
-//	SDL_SetWindowSize(window, windowWidth, windowHeight);
-//	SDL_RenderSetLogicalSize(GetRenderer(), windowWidth, windowHeight);
+	//
 }
 
 //-------------------------
 //Frame loop
 //-------------------------
 
-void SplashScreen::FrameStart() {
-	//TODO: (0) config flag to change the delay
-	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(3)) {
-		SetSceneSignal(SceneSignal::MAINMENU);
+void SplashScreen::Update(double delta) {
+	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(1)) {
+		SetNextScene(SceneList::MAINMENU);
 	}
 }
 
-void SplashScreen::RenderFrame(SDL_Renderer* renderer) {
-	int w = 0, h = 0;
-	SDL_RenderGetLogicalSize(renderer, &w, &h);
-	logo.DrawTo(renderer, (w - logo.GetClipW()) / 2, (h - logo.GetClipH()) / 2);
+void SplashScreen::Render(SDL_Surface* const screen) {
+	logo.DrawTo(screen, (screen->w - logo.GetClipW()) / 2, (screen->h - logo.GetClipH()) / 2);
 }

client/scenes/splash_screen.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,30 +19,34 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef SPLASHSCREEN_HPP_
+#define SPLASHSCREEN_HPP_
 
 #include "base_scene.hpp"
+
 #include "image.hpp"
 
+#include "lua/lua.hpp"
+
 #include <chrono>
 
 class SplashScreen : public BaseScene {
 public:
 	//Public access members
-	SplashScreen(SDL_Window*);
+	SplashScreen(lua_State* L);
 	~SplashScreen();
 
-	void RenderFrame(SDL_Renderer* renderer) override;
-
-private:
+protected:
 	//Frame loop
-	void FrameStart() override;
+	void Update(double delta);
+	void Render(SDL_Surface* const);
+
+	//shared parameters
+	lua_State* lua = nullptr;
 
 	//members
 	std::chrono::steady_clock::time_point startTick;
 	Image logo;
-
-	//screws with the window
-	SDL_Window* window = nullptr;
-	int windowWidth, windowHeight;
 };
+
+#endif

common/debugging/makefile

@@ -12,7 +12,7 @@ OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
 
 #output
 OUTDIR=..
-OUT=$(addprefix $(OUTDIR)/,client.a)
+OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 
 #targets
 all: $(OBJ) $(OUT)
@@ -30,3 +30,8 @@ $(OUTDIR):
 
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all

common/debugging/timer.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -19,5 +19,11 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "terminal_error.hpp"
+#include "timer.hpp"
 
+std::ostream& operator<<(std::ostream& os, Timer& t) {
+	os << t.GetName() << ": ";
+	os << std::chrono::duration_cast<std::chrono::nanoseconds>(t.GetTime()).count();
+	os << "ns";
+	return os;
+}

common/debugging/timer.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -19,40 +19,36 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef TIMER_HPP_
+#define TIMER_HPP_
 
-#include "bounding_box.hpp"
-#include "entity.hpp"
-#include "vector2.hpp"
-
-#include "lua.hpp"
-
-#include <list>
+#include <chrono>
 #include <string>
+#include <ostream>
 
-class TriggerData {
+class Timer {
 public:
-	TriggerData() = default;
-	~TriggerData() = default;
+	typedef std::chrono::high_resolution_clock Clock;
 
-	std::string SetHandle(std::string);
-	std::string GetHandle() const;
+	Timer() = default;
+	Timer(std::string s) : name(s), start(Clock::now()) {};
+	~Timer() = default;
 
-	Vector2 SetOrigin(Vector2 v);
-	Vector2 GetOrigin();
+	inline void Start() { start = Clock::now(); }
+	inline void Stop() { time = Clock::now() - start; }
 
-	BoundingBox SetBoundingBox(BoundingBox b);
-	BoundingBox GetBoundingBox();
+	//accessors and mutators
+	Clock::duration GetTime() { return time; }
 
-	int SetScriptReference(int i);
-	int GetScriptReference();
-
-	std::list<Entity*>* GetExclusionList();
+	std::string SetName(std::string s) { return name = s; }
+	std::string GetName() { return name; }
 
 private:
-	std::string handle;
-	Vector2 origin;
-	BoundingBox bounds;
-	int scriptRef = LUA_NOREF;
-	std::list<Entity*> exclusionList;
+	std::string name;
+	Clock::time_point start;
+	Clock::duration time;
 };
+
+std::ostream& operator<<(std::ostream& os, Timer& t);
+
+#endif

common/gameplay/character_defines.hpp

@@ -1,5 +1,4 @@
---[[
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -20,20 +19,17 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
---]]
+#ifndef CHARACTERDEFINES_HPP_
+#define CHARACTERDEFINES_HPP_
 
-local region = require("region")
+#include <cmath>
 
-local mapSaver = {}
+//the speeds that the characters move
+constexpr double CHARACTER_WALKING_SPEED = 140.0;
+constexpr double CHARACTER_WALKING_MOD = 1.0/sqrt(2.0);
 
-function mapSaver.Load(r)
-	--empty
---	io.write("map_saver:Load(", region.GetX(r), ", ", region.GetY(r), ")\n")
-end
-function mapSaver.Save(r)
-	--empty
---	io.write("map_saver:Save(", region.GetX(r), ", ", region.GetY(r), ")\n")
-end
+//the bounding boxes for the characters
+constexpr double CHARACTER_BOUNDS_WIDTH = 32.0;
+constexpr double CHARACTER_BOUNDS_HEIGHT = 32.0;
 
---TODO: (3) create a flexible saving & loading system
-return mapSaver
+#endif

common/gameplay/combat_defines.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -19,9 +19,16 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef COMBATDEFINES_HPP_
+#define COMBATDEFINES_HPP_
 
-#include "lua.hpp"
+#define COMBAT_MAX_CHARACTERS 16
+#define COMBAT_MAX_ENEMIES 16
 
-#define TORTUGA_ENTITY_API "entity"
-LUAMOD_API int openEntityAPI(lua_State* L);
+enum class TerrainType {
+	NONE = 0,
+	GRASSLANDS,
+	//etc.
+};
+
+#endif

common/gameplay/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../../common/utilities
+INCLUDES+=.
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
@@ -11,8 +11,8 @@ OBJDIR=obj
 OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
 
 #output
-OUTDIR=..
-OUT=$(addprefix $(OUTDIR)/,server.a)
+OUTDIR=../..
+OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 
 #targets
 all: $(OBJ) $(OUT)
@@ -30,3 +30,8 @@ $(OUTDIR):
 
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all

common/gameplay/statistics.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -19,21 +19,24 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef STATISTICS_HPP_
+#define STATISTICS_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
+struct 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;
+	int speed = 0;
+	float accuracy = 0.0;
+	float evasion = 0.0;
+	float luck = 0.0;
 };
+
+#endif

common/graphics/image.cpp

@@ -0,0 +1,145 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "image.hpp"
+
+#include <stdexcept>
+#include <sstream>
+
+Image& Image::operator=(Image const& rhs) {
+	//don't screw yourself
+	if (this == &rhs) {
+		return *this;
+	}
+
+	FreeSurface();
+
+	//Copy the other Image's stuff
+	surface = rhs.surface;
+	clip = rhs.clip;
+	local = false;
+}
+
+Image& Image::operator=(Image&& rhs) {
+	//don't screw yourself
+	if (this == &rhs) {
+		return *this;
+	}
+
+	FreeSurface();
+
+	//Steal the other Image's stuff
+	surface = rhs.surface;
+	clip = rhs.clip;
+	local = rhs.local;
+
+	rhs.surface = nullptr;
+	rhs.clip = {0, 0, 0, 0};
+	rhs.local = false;
+}
+
+SDL_Surface* Image::LoadSurface(std::string fname) {
+	FreeSurface();
+	SDL_Surface* p = SDL_LoadBMP(fname.c_str());
+	if (!p) {
+		std::ostringstream os;
+		os << "Failed to load file: " << fname;
+		throw(std::runtime_error(os.str()));
+	}
+	surface = p;
+	clip = {0, 0, (Uint16)surface->w, (Uint16)surface->h};
+	local = true;
+	SetTransparentColor(255, 0, 255); //default
+	return surface;
+}
+
+SDL_Surface* Image::CreateSurface(Uint16 w, Uint16 h) {
+	FreeSurface();
+	Uint32 rmask, gmask, bmask, amask;
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+    rmask = 0xff000000;
+    gmask = 0x00ff0000;
+    bmask = 0x0000ff00;
+    amask = 0x000000ff;
+#else
+    rmask = 0x000000ff;
+    gmask = 0x0000ff00;
+    bmask = 0x00ff0000;
+    amask = 0xff000000;
+#endif
+	SDL_Surface* p = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, 32, rmask, gmask, bmask, amask);
+	if (!p) {
+		throw(std::runtime_error("Failed to create Image surface"));
+	}
+	surface = p;
+	clip = {0, 0, (Uint16)surface->w, (Uint16)surface->h};
+	local = true;
+	SetTransparentColor(255, 0, 255); //default
+	return surface;
+}
+
+SDL_Surface* Image::SetSurface(SDL_Surface* p) {
+	FreeSurface();
+	if (!p) {
+		throw(std::invalid_argument("No surface pointer provided"));
+	}
+	surface = p;
+	clip = {0, 0, (Uint16)surface->w, (Uint16)surface->h};
+	local = false;
+	return surface;
+}
+
+void Image::FreeSurface() {
+	if (local) {
+		SDL_FreeSurface(surface);
+		local = false;
+	}
+	surface = nullptr;
+	clip = {0, 0, 0, 0};
+}
+
+void Image::DrawTo(SDL_Surface* dest, Sint16 x, Sint16 y) {
+	if (!surface) {
+		throw(std::logic_error("No image surface to draw"));
+	}
+	SDL_Rect sclip = clip, dclip = {x,y};
+	SDL_BlitSurface(surface, &sclip, dest, &dclip);
+}
+
+void Image::SetTransparentColor(Uint8 r, Uint8 g, Uint8 b) {
+	if (!surface) {
+		throw(std::logic_error("Failed to set the transparent color"));
+	}
+	if (!local) {
+		throw(std::logic_error("Cannot set the transparent color of a non-local surface"));
+	}
+	SDL_SetColorKey(surface, SDL_SRCCOLORKEY, SDL_MapRGB(surface->format, r, g, b));
+}
+
+void Image::ClearTransparentColor() {
+	if (!surface) {
+		throw(std::logic_error("Failed to clear the transparent color"));
+	}
+	if (!local) {
+		throw(std::logic_error("Cannot clear the transparent color of a non-local surface"));
+	}
+	SDL_SetColorKey(surface, 0, 0);
+}

common/graphics/image.hpp

@@ -0,0 +1,73 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef IMAGE_HPP_
+#define IMAGE_HPP_
+
+#include "SDL/SDL.h"
+#include <string>
+
+class Image {
+public:
+	Image() = default;
+	Image(Image const& rhs) { *this = rhs; }
+	Image(Image&& rhs) { *this = std::move(rhs); }
+	Image(std::string fname) { LoadSurface(fname); }
+	Image(Uint16 w, Uint16 h) { CreateSurface(w, h); }
+	Image(SDL_Surface* p) { SetSurface(p); }
+	~Image() { FreeSurface(); }
+
+	Image& operator=(Image const&);
+	Image& operator=(Image&&);
+
+	SDL_Surface* LoadSurface(std::string fname);
+	SDL_Surface* CreateSurface(Uint16 w, Uint16 h);
+	SDL_Surface* SetSurface(SDL_Surface*);
+	SDL_Surface* GetSurface() const { return surface; }
+	void FreeSurface();
+
+	void DrawTo(SDL_Surface* const, Sint16 x, Sint16 y);
+
+	//Clip handlers
+	SDL_Rect SetClip(SDL_Rect r) { return clip = r; }
+	SDL_Rect GetClip() const { return clip; }
+
+	Sint16 SetClipX(Sint16 x) { return clip.x = x; }
+	Sint16 SetClipY(Sint16 y) { return clip.y = y; }
+	Uint16 SetClipW(Uint16 w) { return clip.w = w; }
+	Uint16 SetClipH(Uint16 h) { return clip.h = h; }
+
+	Sint16 GetClipX() const { return clip.x; }
+	Sint16 GetClipY() const { return clip.y; }
+	Uint16 GetClipW() const { return clip.w; }
+	Uint16 GetClipH() const { return clip.h; }
+
+	bool GetLocal() const { return local; }
+
+	void SetTransparentColor(Uint8 r, Uint8 g, Uint8 b);
+	void ClearTransparentColor();
+protected:
+	SDL_Surface* surface = nullptr;
+	SDL_Rect clip = {0, 0, 0, 0};
+	bool local = false;
+};
+
+#endif

common/graphics/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. .. ../../common/gameplay ../../common/graphics ../../common/utilities
+INCLUDES+=. ../map
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
@@ -11,8 +11,8 @@ OBJDIR=obj
 OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
 
 #output
-OUTDIR=..
-OUT=$(addprefix $(OUTDIR)/,client.a)
+OUTDIR=../..
+OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 
 #targets
 all: $(OBJ) $(OUT)
@@ -30,3 +30,8 @@ $(OUTDIR):
 
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all

common/graphics/sprite_sheet.cpp

@@ -0,0 +1,102 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "sprite_sheet.hpp"
+
+#include <stdexcept>
+#include <sstream>
+
+void SpriteSheet::Update(double delta) {
+	if (delay && (tick += delta) >= delay) {
+		if (++xIndex >= xCount) {
+			xIndex = 0;
+		}
+		tick = 0;
+	}
+	image.SetClipX(xIndex * image.GetClipW());
+	image.SetClipY(yIndex * image.GetClipH());
+}
+
+SDL_Surface* SpriteSheet::LoadSurface(std::string fname, Uint16 xCellCount, Uint16 yCellCount) {
+	image.LoadSurface(fname);
+
+	xCount = xCellCount;
+	yCount = yCellCount;
+
+	image.SetClipW(image.GetSurface()->w / xCount);
+	image.SetClipH(image.GetSurface()->h / yCount);
+
+	xIndex = yIndex = 0;
+	delay = tick = 0.0;
+}
+
+SDL_Surface* SpriteSheet::SetSurface(SDL_Surface* surface, Uint16 xCellCount, Uint16 yCellCount) {
+	image.SetSurface(surface);
+
+	xCount = xCellCount;
+	yCount = yCellCount;
+
+	image.SetClipW(image.GetSurface()->w / xCount);
+	image.SetClipH(image.GetSurface()->h / yCount);
+
+	xIndex = yIndex = 0;
+	delay = tick = 0.0;
+}
+
+void SpriteSheet::FreeSurface() {
+	image.FreeSurface();
+	xCount = yCount = 0;
+	xIndex = yIndex = 0;
+	delay = tick = 0.0;
+}
+
+Uint16 SpriteSheet::SetXCount(Uint16 i) {
+	xIndex = 0;
+	return xCount = i;
+}
+
+Uint16 SpriteSheet::SetYCount(Uint16 i) {
+	yIndex = 0;
+	return yCount = i;
+}
+
+Uint16 SpriteSheet::SetXIndex(Uint16 i) {
+	if (i > xCount) {
+		std::ostringstream os;
+		os << "Cannot set x index to " << i;
+		throw(std::invalid_argument(os.str()));
+	}
+	return xIndex = i;
+}
+
+Uint16 SpriteSheet::SetYIndex(Uint16 i) {
+	if (i > yCount) {
+		std::ostringstream os;
+		os << "Cannot set y index to " << i;
+		throw(std::invalid_argument(os.str()));
+	}
+	return yIndex = i;
+}
+
+double SpriteSheet::SetDelay(double d) {
+	tick = 0;
+	return delay = d;
+}

common/graphics/sprite_sheet.hpp

@@ -0,0 +1,66 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef SPRITESHEET_HPP_
+#define SPRITESHEET_HPP_
+
+#include "image.hpp"
+
+class SpriteSheet {
+public:
+	SpriteSheet() = default;
+	SpriteSheet(std::string fname, Uint16 xCellCount, Uint16 yCellCount) { LoadSurface(fname, xCellCount, yCellCount); }
+	SpriteSheet(SDL_Surface* surface, Uint16 xCellCount, Uint16 yCellCount) { SetSurface(surface, xCellCount, yCellCount); }
+	~SpriteSheet() { FreeSurface(); };
+
+	void Update(double delta);
+
+	SDL_Surface* LoadSurface(std::string fname, Uint16 xCellCount, Uint16 yCellCount);
+	SDL_Surface* SetSurface(SDL_Surface* surface, Uint16 xCellCount, Uint16 yCellCount);
+	SDL_Surface* GetSurface() { return image.GetSurface(); }
+	void FreeSurface();
+
+	void DrawTo(SDL_Surface* const dest, Sint16 x, Sint16 y) { image.DrawTo(dest, x, y); }
+
+	//accessors and mutators
+	Image* GetImage() { return ℑ } //OO breaker
+
+	Uint16 SetXCount(Uint16);
+	Uint16 SetYCount(Uint16);
+	Uint16 SetXIndex(Uint16);
+	Uint16 SetYIndex(Uint16);
+
+	Uint16 GetXCount() const { return xCount; }
+	Uint16 GetYCount() const { return yCount; }
+	Uint16 GetXIndex() const { return xIndex; }
+	Uint16 GetYIndex() const { return yIndex; }
+
+	double SetDelay(double d);
+	double GetDelay() const { return delay; }
+
+private:
+	Image image;
+	Uint16 xCount = 0, yCount = 0; //number of cells
+	Uint16 xIndex = 0, yIndex = 0; //current cell being drawn
+	double delay = 0.0, tick = 0.0;
+};
+
+#endif

common/makefile

@@ -0,0 +1,13 @@
+all:
+	$(MAKE) -C debugging
+	$(MAKE) -C gameplay
+	$(MAKE) -C graphics
+	$(MAKE) -C map
+	$(MAKE) -C network
+	$(MAKE) -C ui
+	$(MAKE) -C utilities
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all

common/map/makefile

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

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -19,48 +19,37 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "entity.hpp"
+#include "region.hpp"
 
-Entity::Entity(const char* _type): type(_type) {
-	//EMPTY
+#include "utility.hpp"
+
+#include <stdexcept>
+#include <cstring>
+
+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));
 }
 
-void Entity::Update() {
-	origin += motion;
+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;
 }
 
-int Entity::SetRoomIndex(int i) {
-	return roomIndex = i;
+Region::type_t Region::SetTile(int x, int y, int z, type_t v) {
+	return tiles[x][y][z] = v;
 }
 
-Vector2 Entity::SetOrigin(Vector2 v) {
-	return origin = v;
+Region::type_t Region::GetTile(int x, int y, int z) {
+	return tiles[x][y][z];
 }
 
-Vector2 Entity::SetMotion(Vector2 v) {
-	return motion = v;
+bool Region::SetSolid(int x, int y, bool b) {
+	return solid[x * REGION_WIDTH + y] = b;
 }
 
-BoundingBox Entity::SetBounds(BoundingBox b) {
-	return bounds = b;
-}
-
-int Entity::GetRoomIndex() const {
-	return roomIndex;
-}
-
-Vector2 Entity::GetOrigin() const {
-	return origin;
-}
-
-Vector2 Entity::GetMotion() const {
-	return motion;
-}
-
-BoundingBox Entity::GetBounds() const {
-	return bounds;
-}
-
-const char* Entity::GetType() const {
-	return type;
+bool Region::GetSolid(int x, int y) {
+	return solid[x * REGION_WIDTH + y];
 }

common/map/region.hpp

@@ -0,0 +1,67 @@
+/* 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 REGION_HPP_
+#define REGION_HPP_
+
+#include <bitset>
+#include <cmath>
+
+//the region's storage format
+constexpr int REGION_WIDTH = 20;
+constexpr int REGION_HEIGHT = 20;
+constexpr int REGION_DEPTH = 3;
+
+//the size of the solid map
+constexpr int REGION_SOLID_FOOTPRINT = ceil(REGION_WIDTH * REGION_HEIGHT / 8.0);
+
+class Region {
+public:
+	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; }
+
+	std::bitset<REGION_WIDTH*REGION_HEIGHT>* GetSolidBitset() { return &solid; }
+private:
+	const int x;
+	const int y;
+
+	type_t tiles[REGION_WIDTH][REGION_HEIGHT][REGION_DEPTH];
+	std::bitset<REGION_WIDTH*REGION_HEIGHT> solid;
+};
+
+//the memory footprint of the tile and solid data; not including any metadata
+constexpr int REGION_FOOTPRINT = REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH * sizeof(Region::type_t) + REGION_SOLID_FOOTPRINT;
+
+#endif

common/map/region_api.cpp

@@ -0,0 +1,122 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "region_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 int load(lua_State* L) {
+	//EMPTY
+	lua_pushboolean(L, false);
+	return 1;
+}
+
+static int save(lua_State* L) {
+	//EMPTY
+	return 0;
+}
+
+static int create(lua_State* L) {
+	//EMPTY
+	return 0;
+}
+
+static int unload(lua_State* L) {
+	//EMPTY
+	return 0;
+}
+
+static const luaL_Reg regionLib[] = {
+	{"SetTile",setTile},
+	{"GetTile",getTile},
+	{"SetSolid",setSolid},
+	{"GetSolid",getSolid},
+	{"GetX",getX},
+	{"GetY",getY},
+	{"GetWidth",getWidth},
+	{"GetHeight",getHeight},
+	{"GetDepth",getDepth},
+	{"Load",load},
+	{"Save",save},
+	{"Create",create},
+	{"Unload",unload},
+	{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-2015
+/* 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
@@ -19,9 +19,12 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef REGIONAPI_HPP_
+#define REGIONAPI_HPP_
 
-#include "lua.hpp"
+#include "lua/lua.hpp"
 
-#define TORTUGA_CHARACTER_MANAGER_API "character_manager"
-LUAMOD_API int openCharacterManagerAPI(lua_State* L);
+#define TORTUGA_REGION_NAME "Region"
+LUAMOD_API int openRegionAPI(lua_State* L);
+
+#endif

common/map/region_pager_api.cpp

@@ -0,0 +1,115 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "region_pager_api.hpp"
+
+#include "region_pager_lua.hpp"
+#include "region.hpp"
+
+#include <string>
+
+static int getRegionPager(lua_State* L) {
+	lua_pushstring(L, TORTUGA_REGION_PAGER_PSEUDO_INDEX);
+	lua_gettable(L, LUA_REGISTRYINDEX);
+}
+
+//DOCS: These glue functions simply wrap RegionPagerLua's methods
+
+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));
+	pager->UnloadRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
+	return 0;
+}
+
+static const luaL_Reg regionPagerLib[] = {
+	{"GetRegionPager", getRegionPager},
+	{"SetTile", setTile},
+	{"GetTile", getTile},
+	{"SetSolid", setSolid},
+	{"GetSolid", getSolid},
+	{"GetRegion", getRegion},
+	{"LoadRegion", loadRegion},
+	{"SaveRegion", saveRegion},
+	{"CreateRegion", createRegion},
+	{"UnloadRegion", unloadRegion},
+	{nullptr, nullptr}
+};
+
+LUAMOD_API int openRegionPagerAPI(lua_State* L) {
+	luaL_newlib(L, regionPagerLib);
+	return 1;
+}

common/map/region_pager_api.hpp

@@ -0,0 +1,31 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef REGIONPAGERAPI_HPP_
+#define REGIONPAGERAPI_HPP_
+
+#include "lua/lua.hpp"
+
+#define TORTUGA_REGION_PAGER_PSEUDO_INDEX "RegionPagerPseudoIndex"
+#define TORTUGA_REGION_PAGER_NAME "RegionPager"
+LUAMOD_API int openRegionPagerAPI(lua_State* L);
+
+#endif

common/map/region_pager_base.cpp

@@ -0,0 +1,100 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "region_pager_base.hpp"
+
+#include "utility.hpp"
+
+#include <stdexcept>
+#include <algorithm>
+
+Region::type_t RegionPagerBase::SetTile(int x, int y, int z, Region::type_t v) {
+	Region* ptr = GetRegion(x, y);
+	return ptr->SetTile(x - ptr->GetX(), y - ptr->GetY(), z, v);
+}
+
+Region::type_t RegionPagerBase::GetTile(int x, int y, int z) {
+	Region* ptr = GetRegion(x, y);
+	return ptr->GetTile(x - ptr->GetX(), y - ptr->GetY(), z);
+}
+
+bool RegionPagerBase::SetSolid(int x, int y, int b) {
+	Region* ptr = GetRegion(x, y);
+	return ptr->SetSolid(x - ptr->GetX(), y - ptr->GetY(), b);
+}
+
+bool RegionPagerBase::GetSolid(int x, int y) {
+	Region* ptr = GetRegion(x, y);
+	return ptr->GetSolid(x - ptr->GetX(), y - ptr->GetY());
+}
+
+Region* RegionPagerBase::GetRegion(int x, int y) {
+	x = snapToBase(REGION_WIDTH, x);
+	y = snapToBase(REGION_HEIGHT, y);
+
+	//get the region by various means
+	Region* ptr = nullptr;
+	ptr = FindRegion(x, y);
+	if (ptr) return ptr;
+	ptr = LoadRegion(x, y);
+	if (ptr) return ptr;
+	return CreateRegion(x, y);
+}
+
+Region* RegionPagerBase::FindRegion(int x, int y) {
+	//find the region
+	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) {
+	//TODO: load the region if possible
+	return nullptr;
+}
+
+Region* RegionPagerBase::SaveRegion(int x, int y) {
+	//TODO: find & save the region
+	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::UnloadRegion(int x, int y) {
+	//custom loop, not FindRegion()
+	regionList.remove_if([x, y](Region& region) -> bool { return region.GetX() == x && region.GetY() == y; });
+}
+
+void RegionPagerBase::UnloadAll() {
+	regionList.clear();
+}

common/map/region_pager_base.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -19,44 +19,42 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef REGIONPAGERBASE_HPP_
+#define REGIONPAGERBASE_HPP_
 
-#include "client_data.hpp"
-#include "server_packet.hpp"
-#include "singleton.hpp"
+#include "region.hpp"
 
-#include "SDL2/SDL_net.h"
-
-#include <functional>
 #include <list>
-#include <map>
 
-class ClientManager: public Singleton<ClientManager> {
+class RegionPagerBase {
 public:
-	//methods
-	std::list<int> CheckConnections();
-	void HandlePong(ServerPacket* const argPacket);
+	RegionPagerBase() = default;
+	virtual ~RegionPagerBase() { UnloadAll(); };
 
-	//common public methods
-	int Create(IPaddress);
-	void Unload(int uid);
+	//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);
 
-	void UnloadAll();
-	void UnloadIf(std::function<bool(std::pair<const int, ClientData const&>)> fn);
+	//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 UnloadRegion(int x, int y);
+
+	virtual void UnloadAll();
 
 	//accessors & mutators
-	ClientData* Get(int uid);
-	int GetLoadedCount();
-	int GetTotalCount();
-	std::map<int, ClientData>* GetContainer();
-
-private:
-	friend Singleton<ClientManager>;
-
-	ClientManager() = default;
-	~ClientManager() = default;
-
-	//members
-	std::map<int, ClientData> elementMap;
-	int counter = 0;
+	std::list<Region>* GetContainer() { return &regionList; }
+protected:
+	std::list<Region> regionList;
 };
+
+#endif

common/map/region_pager_lua.cpp

@@ -0,0 +1,123 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "region_pager_lua.hpp"
+
+#include "utility.hpp"
+
+#include <stdexcept>
+
+Region* RegionPagerLua::LoadRegion(int x, int y) {
+	//load the region if possible
+
+	//something to work on
+	Region tmpRegion(x, y);
+
+	//API hook
+	lua_getglobal(lua, "Region");
+	lua_getfield(lua, -1, "Load");
+	lua_pushlightuserdata(lua, &tmpRegion);
+	if (lua_pcall(lua, 1, 1, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+	}
+	//success or failure
+	if (!lua_toboolean(lua, -1)) {
+		lua_pop(lua, 2);
+		return nullptr;
+	}
+	lua_pop(lua, 2);
+	regionList.push_front(tmpRegion);
+	return &regionList.front();
+}
+
+Region* RegionPagerLua::SaveRegion(int x, int y) {
+	//find & save the region
+	Region* ptr = FindRegion(x, y);
+	if (ptr) {
+		//API hook
+		lua_getglobal(lua, "Region");
+		lua_getfield(lua, -1, "Save");
+		lua_pushlightuserdata(lua, ptr);
+		if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
+			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+		}
+		lua_pop(lua, 1);
+	}
+	return ptr;
+}
+
+Region* RegionPagerLua::CreateRegion(int x, int y) {
+	if (FindRegion(x, y)) {
+		throw(std::logic_error("Cannot overwrite an existing region"));
+	}
+
+	//something to work on
+	Region tmpRegion(x, y);
+
+	//API hook
+	lua_getglobal(lua, "Region");
+	lua_getfield(lua, -1, "Create");
+	lua_pushlightuserdata(lua, &tmpRegion);
+	//TODO: parameters
+	if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+	}
+	lua_pop(lua, 1);
+	regionList.push_front(tmpRegion);
+	return &regionList.front();
+}
+
+void RegionPagerLua::UnloadRegion(int x, int y) {
+	lua_getglobal(lua, "Region");
+
+	regionList.remove_if([&](Region& region) -> bool {
+		if (region.GetX() == x && region.GetY() == y) {
+
+			//API hook
+			lua_getfield(lua, -1, "Unload");
+			lua_pushlightuserdata(lua, &region);
+			if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
+				throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+			}
+
+			return true;
+		}
+		return false;
+	});
+
+	lua_pop(lua, 1);
+}
+
+void RegionPagerLua::UnloadAll() {
+	lua_getglobal(lua, "Region");
+
+	for (auto& it : regionList) {
+		//API hook
+		lua_getfield(lua, -1, "Unload");
+		lua_pushlightuserdata(lua, &it);
+		if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
+			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+		}
+	}
+
+	lua_pop(lua, 1);
+	regionList.clear();
+}

common/map/region_pager_lua.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -19,39 +19,33 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef REGIONPAGERLUA_HPP_
+#define REGIONPAGERLUA_HPP_
 
-#include "entity.hpp"
+#include "region_pager_base.hpp"
 
-#include "lua.hpp"
+#include "lua/lua.hpp"
 
 #include <string>
 
-/* DOCS: Monster attributes, read more
- *  species (avatar, script)
- *  level
- *  health/mana
- *  permadeath/respawn
-*/
-
-class MonsterData: public Entity {
+class RegionPagerLua : public RegionPagerBase {
 public:
-	MonsterData(std::string avatar, int scriptRef);
-	~MonsterData() = default;
+	RegionPagerLua() = default;
+	~RegionPagerLua() = default;
 
-	virtual void Update();
+	//region manipulation
+	Region* LoadRegion(int x, int y) override;
+	Region* SaveRegion(int x, int y) override;
+	Region* CreateRegion(int x, int y) override;
+	void UnloadRegion(int x, int y) override;
+
+	void UnloadAll() override;
 
 	//accessors & mutators
-
-	std::string SetAvatar(std::string);
-	std::string GetAvatar();
-
-	int SetScriptReference(int);
-	int GetScriptReference();
-
-private:
-	friend class MonsterManager;
-
-	std::string avatar;
-	int scriptRef = LUA_NOREF;
+	lua_State* SetLuaState(lua_State* L) { return lua = L; }
+	lua_State* GetLuaState() { return lua; }
+protected:
+	lua_State* lua = nullptr;
 };
+
+#endif

common/map/tile_sheet.cpp

@@ -0,0 +1,61 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "tile_sheet.hpp"
+
+void TileSheet::Load(std::string fname, int tileWidth, int tileHeight) {
+	image.LoadSurface(fname);
+	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;
+}
+
+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.DrawTo(dest, x, y);
+}
+
+void TileSheet::DrawRegionTo(SDL_Surface* const dest, Region* const region, int camX, int camY) {
+	Region::type_t tile = 0;
+	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) {
+				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.DrawTo(dest,
+					(region->GetX() + i) * image.GetClipW() - camX,
+					(region->GetY() + j) * image.GetClipH() - camY);
+			}
+		}
+	}
+}

common/map/tile_sheet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -19,43 +19,36 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef TILESHEET_HPP_
+#define TILESHEET_HPP_
 
-#include "bounding_box.hpp"
-#include "vector2.hpp"
-#include "trigger_data.hpp"
+#include "region.hpp"
 
-#include "lua.hpp"
+#include "image.hpp"
 
-#include <functional>
-#include <map>
 #include <string>
 
-class TriggerManager {
+class TileSheet {
 public:
-	TriggerManager();
-	~TriggerManager();
+	TileSheet() = default;
+	TileSheet(std::string f, int w, int h) { Load(f, w, h); }
+	~TileSheet() = default;
 
-	//common public methods
-	int Create(std::string handle);
-	void Unload(int uid);
+	void Load(std::string fname, int tileWidth, int tileHeight);
+	void Unload();
 
-	void UnloadAll();
-	void UnloadIf(std::function<bool(std::pair<const int, TriggerData const&>)> fn);
-
-	//accessors & mutators
-	TriggerData* Get(int uid);
-	TriggerData* Get(std::string handle);
-	int GetLoadedCount();
-	std::map<int, TriggerData>* GetContainer();
-
-	//hooks
-	lua_State* SetLuaState(lua_State* L);
-	lua_State* GetLuaState();
+	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 &image; }
+	int GetXCount() { return xCount; }
+	int GetYCount() { return yCount; }
+	int GetTileW() { return image.GetClipW(); }
+	int GetTileH() { return image.GetClipH(); }
 private:
-	//members
-	std::map<int, TriggerData> elementMap;
-	lua_State* lua = nullptr;
-	int counter = 0;
+	Image image;
+	int xCount = 0, yCount = 0;
 };
+
+#endif

common/map/tile_sheet_api.cpp

@@ -0,0 +1,82 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "tile_sheet_api.hpp"
+
+#include "tile_sheet.hpp"
+
+static int getTileSheet(lua_State* L) {
+	lua_pushstring(L, TORTUGA_TILE_SHEET_PSEUDO_INDEX);
+	lua_gettable(L, LUA_REGISTRYINDEX);
+	return 1;
+}
+
+static int load(lua_State* L) {
+	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
+	sheet->Load(lua_tostring(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4));
+	return 0;
+}
+
+static int unload(lua_State* L) {
+	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
+	sheet->Unload();
+	return 0;
+}
+
+static int getXCount(lua_State* L) {
+	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
+	lua_pushinteger(L, sheet->GetXCount());
+	return 1;
+}
+
+static int getYCount(lua_State* L) {
+	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
+	lua_pushinteger(L, sheet->GetYCount());
+	return 1;
+}
+
+static int getTileW(lua_State* L) {
+	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
+	lua_pushinteger(L, sheet->GetTileW());
+	return 1;
+}
+
+static int getTileH(lua_State* L) {
+	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
+	lua_pushinteger(L, sheet->GetTileH());
+	return 1;
+}
+
+static const luaL_Reg tileSheetLib[] = {
+	{"GetTileSheet",getTileSheet},
+	{"Load",load},
+	{"Unload",unload},
+	{"GetXCount",getXCount},
+	{"GetYCount",getYCount},
+	{"GetTileW",getTileW},
+	{"GetTileH",getTileH},
+	{nullptr, nullptr}
+};
+
+LUAMOD_API int openTileSheetAPI(lua_State* L) {
+	luaL_newlib(L, tileSheetLib);
+	return 1;
+}

common/map/tile_sheet_api.hpp

@@ -0,0 +1,31 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef TILESHEETAPI_HPP_
+#define TILESHEETAPI_HPP_
+
+#include "lua/lua.hpp"
+
+#define TORTUGA_TILE_SHEET_PSEUDO_INDEX "TileSheetPseudoIndex"
+#define TORTUGA_TILE_SHEET_NAME "TileSheet"
+LUAMOD_API int openTileSheetAPI(lua_State* L);
+
+#endif

common/network/makefile

@@ -0,0 +1,39 @@
+#config
+INCLUDES+=. packet serial ../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)
+	$(MAKE) -C packet
+	$(MAKE) -C serial
+
+$(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/character_packet.hpp

@@ -0,0 +1,50 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef CHARACTERPACKET_HPP_
+#define CHARACTERPACKET_HPP_
+
+#include "serial_packet_base.hpp"
+
+#include "vector2.hpp"
+#include "statistics.hpp"
+
+struct CharacterPacket : SerialPacketBase {
+	//identify the character
+	int characterIndex;
+	char handle[PACKET_STRING_SIZE];
+	char avatar[PACKET_STRING_SIZE];
+
+	//the owner
+	int accountIndex;
+
+	//location
+	int roomIndex;
+	Vector2 origin;
+	Vector2 motion;
+
+	//gameplay
+	Statistics stats;
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs
+};
+
+#endif

common/network/packet/client_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,20 +19,16 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "character_data.hpp"
+#ifndef CLIENTPACKET_HPP_
+#define CLIENTPACKET_HPP_
 
-CharacterData::CharacterData(): Entity("character") {
-	//EMPTY
-}
+#include "serial_packet_base.hpp"
 
-int CharacterData::GetOwner() {
-	return owner;
-}
+struct ClientPacket : SerialPacketBase {
+	int clientIndex;
+	int accountIndex;
+	char username[PACKET_STRING_SIZE];
+//	char password[PACKET_STRING_SIZE]; //hashed, not currently used
+};
 
-std::string CharacterData::GetHandle() {
-	return handle;
-}
-
-std::string CharacterData::GetAvatar() {
-	return avatar;
-}
+#endif

common/network/packet/combat_packet.hpp

@@ -0,0 +1,46 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef COMBATPACKET_HPP_
+#define COMBATPACKET_HPP_
+
+#include "serial_packet_base.hpp"
+
+#include "combat_defines.hpp"
+
+struct CombatPacket : SerialPacketBase {
+	//identify the combat instance
+	int combatIndex;
+	int difficulty;
+	TerrainType terrainType;
+
+	//combatants
+	int characterArray[COMBAT_MAX_CHARACTERS];
+	int enemyArray[COMBAT_MAX_ENEMIES];
+
+	//location
+	int mapIndex;
+	Vector2 origin;
+
+	//TODO: gameplay components: rewards
+};
+
+#endif

common/network/packet/enemy_packet.hpp

@@ -0,0 +1,39 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef ENEMYPACKET_HPP_
+#define ENEMYPACKET_HPP_
+
+#include "serial_packet_base.hpp"
+
+struct EnemyPacket : SerialPacketBase {
+	//identify the enemy
+	int enemyIndex;
+	char handle[PACKET_STRING_SIZE];
+	char avatar[PACKET_STRING_SIZE];
+
+	//gameplay
+	Statistics stats;
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs, rewards
+};
+
+#endif

common/network/packet/makefile

@@ -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/region_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,13 +19,20 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef REGIONPACKET_HPP_
+#define REGIONPACKET_HPP_
 
-#include <stdexcept>
-#include <string>
+#include "serial_packet_base.hpp"
 
-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) {}
+#include "region.hpp"
+
+struct RegionPacket : SerialPacketBase {
+	//location/identify the region
+	int roomIndex;
+	int x, y;
+
+	//the data
+	Region* region;
 };
+
+#endif

common/network/packet/sanity_check.cpp

@@ -0,0 +1,28 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "serial_packet.hpp"
+
+/* DOCS: Sanity check, read more
+ * Since most/all of the files in this directory are header files, I've created
+ * this source file as a "sanity check", to ensure that the above header files
+ * are written correctly via make.
+*/

common/network/packet/serial_packet.hpp

@@ -0,0 +1,44 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef SERIALPACKET_HPP_
+#define SERIALPACKET_HPP_
+
+#include "character_packet.hpp"
+#include "client_packet.hpp"
+#include "combat_packet.hpp"
+#include "enemy_packet.hpp"
+#include "region_packet.hpp"
+#include "server_packet.hpp"
+
+//NOTE: SerialPacket is defined in serial_packet_base.hpp
+
+union MaxPacket {
+	CharacterPacket a;
+	ClientPacket b;
+	CombatPacket c;
+	EnemyPacket d;
+	RegionPacket e;
+	ServerPacket f;
+};
+constexpr int MAX_PACKET_SIZE = sizeof(MaxPacket);
+
+#endif

common/network/packet/serial_packet_base.hpp

@@ -0,0 +1,46 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef SERIALPACKETBASE_HPP_
+#define SERIALPACKETBASE_HPP_
+
+#ifndef SERIALPACKET_HPP_
+ #error Cannot include this file without 'serial_packet.hpp'
+#endif
+
+#include "serial_packet_type.hpp"
+
+#include "SDL/SDL_net.h"
+
+constexpr int NETWORK_VERSION = 20140701;
+constexpr int PACKET_STRING_SIZE = 100;
+
+struct SerialPacketBase {
+	//members
+	SerialPacketType type;
+	IPaddress srcAddress;
+
+	virtual ~SerialPacketBase() {};
+};
+
+typedef SerialPacketBase SerialPacket;
+
+#endif

common/network/packet/serial_packet_type.hpp

@@ -0,0 +1,113 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef SERIALPACKETTYPE_HPP_
+#define SERIALPACKETTYPE_HPP_
+
+/* Key for the comments:
+ * request => response
+*/
+
+enum class SerialPacketType {
+	//default: there is something wrong
+	NONE = 0,
+
+	//keep alive
+	//ping => pong
+	PING = 1,
+	PONG = 2,
+
+	//search for the server list
+	//none => server name, player count, version info (and source address)
+	BROADCAST_REQUEST = 3,
+	BROADCAST_RESPONSE = 4,
+
+	//try to join the server
+	//username, and password => client index, account index
+	JOIN_REQUEST = 5,
+	JOIN_RESPONSE = 6,
+	JOIN_REJECTION = 7,
+
+	//mass update of all surrounding content
+	//character.x, character.y => packet barrage
+	SYNCHRONIZE = 8,
+
+	//disconnect from the server
+	//autentication, account index => disconnect that account
+	DISCONNECT = 9,
+
+	//shut down the server
+	//autentication => disconnect, shutdown
+	SHUTDOWN = 10,
+
+	//map data
+	//room index, region.x, region.y => room index, region.x, region.y, region content
+	REGION_REQUEST = 11,
+	REGION_CONTENT = 12,
+
+	//combat data
+	//TODO: system incomplete
+	COMBAT_NEW = 13,
+	COMBAT_DELETE = 14,
+	COMBAT_UPDATE = 15,
+
+	COMBAT_ENTER_REQUEST = 16,
+	COMBAT_ENTER_RESPONSE = 17,
+
+	COMBAT_EXIT_REQUEST = 18,
+	COMBAT_EXIT_RESPONSE = 19,
+
+	//TODO: COMBAT info
+
+	COMBAT_REJECTION = 20,
+
+	//character data
+	//character data => etc.
+	CHARACTER_NEW = 21,
+	CHARACTER_DELETE = 22,
+	CHARACTER_UPDATE = 23,
+
+	//authentication, character index => character stats
+	CHARACTER_STATS_REQUEST= 24,
+	CHARACTER_STATS_RESPONSE = 25,
+
+	//character new => character rejection, disconnect?
+	CHARACTER_REJECTION = 26,
+
+	//enemy data
+	//enemy data => etc.
+	ENEMY_NEW = 27,
+	ENEMY_DELETE = 28,
+	ENEMY_UPDATE = 29,
+
+	ENEMY_STATS_REQUEST = 30,
+	ENEMY_STATS_RESPONSE = 31,
+
+	//enemy index => enemy doens't exist
+	ENEMY_REJECTION= 32,
+
+	//NOTE: more packet types go here
+
+	//not used
+	LAST
+};
+
+#endif

common/network/packet/server_packet.hpp

@@ -0,0 +1,34 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef SERVERPACKET_HPP_
+#define SERVERPACKET_HPP_
+
+#include "serial_packet_base.hpp"
+
+struct ServerPacket : SerialPacketBase {
+	//identify the server
+	char name[PACKET_STRING_SIZE];
+	int playerCount;
+	int version;
+};
+
+#endif

common/network/serial/makefile

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

common/network/serial/serial.cpp

@@ -0,0 +1,182 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "serial.hpp"
+
+#include "serial_util.hpp"
+
+//simple type functions
+void serializeType(SerialPacketBase* packet, void* buffer) {
+	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+}
+
+void deserializeType(SerialPacketBase* packet, void* buffer) {
+	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+}
+
+//main switch functions
+void serializePacket(SerialPacketBase* packet, void* buffer) {
+	switch(packet->type) {
+		//no extra data
+		case SerialPacketType::NONE:
+		case SerialPacketType::PING:
+		case SerialPacketType::PONG:
+		case SerialPacketType::BROADCAST_REQUEST:
+
+		//all rejections
+		case SerialPacketType::JOIN_REJECTION:
+		case SerialPacketType::CHARACTER_REJECTION:
+		case SerialPacketType::ENEMY_REJECTION:
+		case SerialPacketType::COMBAT_REJECTION:
+
+			serializeType(packet, buffer);
+		break;
+
+		//character info
+		case SerialPacketType::CHARACTER_NEW:
+		case SerialPacketType::CHARACTER_DELETE:
+		case SerialPacketType::CHARACTER_UPDATE:
+		case SerialPacketType::CHARACTER_STATS_REQUEST:
+		case SerialPacketType::CHARACTER_STATS_RESPONSE:
+			serializeCharacter(static_cast<CharacterPacket*>(packet), buffer);
+		break;
+
+		//client info
+		case SerialPacketType::JOIN_REQUEST:
+		case SerialPacketType::JOIN_RESPONSE:
+		case SerialPacketType::SYNCHRONIZE:
+		case SerialPacketType::DISCONNECT:
+		case SerialPacketType::SHUTDOWN:
+			serializeClient(static_cast<ClientPacket*>(packet), buffer);
+		break;
+
+		//combat info
+		case SerialPacketType::COMBAT_NEW:
+		case SerialPacketType::COMBAT_DELETE:
+		case SerialPacketType::COMBAT_UPDATE:
+
+		case SerialPacketType::COMBAT_ENTER_REQUEST:
+		case SerialPacketType::COMBAT_ENTER_RESPONSE:
+		case SerialPacketType::COMBAT_EXIT_REQUEST:
+		case SerialPacketType::COMBAT_EXIT_RESPONSE:
+
+			serializeCombat(static_cast<CombatPacket*>(packet), buffer);
+		break;
+
+		//enemy info
+		case SerialPacketType::ENEMY_NEW:
+		case SerialPacketType::ENEMY_DELETE:
+		case SerialPacketType::ENEMY_UPDATE:
+		case SerialPacketType::ENEMY_STATS_REQUEST:
+		case SerialPacketType::ENEMY_STATS_RESPONSE:
+			serializeEnemy(static_cast<EnemyPacket*>(packet), buffer);
+		break;
+
+		//region info
+		case SerialPacketType::REGION_REQUEST:
+			serializeRegionFormat(static_cast<RegionPacket*>(packet), buffer);
+		break;
+
+		case SerialPacketType::REGION_CONTENT:
+			serializeRegionContent(static_cast<RegionPacket*>(packet), buffer);
+		break;
+
+		//server info
+		case SerialPacketType::BROADCAST_RESPONSE:
+			serializeServer(static_cast<ServerPacket*>(packet), buffer);
+		break;
+	}
+}
+
+void deserializePacket(SerialPacketBase* packet, void* buffer) {
+	//find the type, so that you can actually deserialize the packet!
+	deserializeType(packet, buffer);
+	switch(packet->type) {
+		//no extra data
+		case SerialPacketType::NONE:
+		case SerialPacketType::PING:
+		case SerialPacketType::PONG:
+		case SerialPacketType::BROADCAST_REQUEST:
+
+		//all rejections
+		case SerialPacketType::JOIN_REJECTION:
+		case SerialPacketType::CHARACTER_REJECTION:
+		case SerialPacketType::ENEMY_REJECTION:
+		case SerialPacketType::COMBAT_REJECTION:
+
+			//NOTHING
+		break;
+
+		//character info
+		case SerialPacketType::CHARACTER_NEW:
+		case SerialPacketType::CHARACTER_DELETE:
+		case SerialPacketType::CHARACTER_UPDATE:
+		case SerialPacketType::CHARACTER_STATS_REQUEST:
+		case SerialPacketType::CHARACTER_STATS_RESPONSE:
+			deserializeCharacter(static_cast<CharacterPacket*>(packet), buffer);
+		break;
+
+		//client info
+		case SerialPacketType::JOIN_REQUEST:
+		case SerialPacketType::JOIN_RESPONSE:
+		case SerialPacketType::SYNCHRONIZE:
+		case SerialPacketType::DISCONNECT:
+		case SerialPacketType::SHUTDOWN:
+			deserializeClient(static_cast<ClientPacket*>(packet), buffer);
+		break;
+
+		//combat info
+		case SerialPacketType::COMBAT_NEW:
+		case SerialPacketType::COMBAT_DELETE:
+		case SerialPacketType::COMBAT_UPDATE:
+
+		case SerialPacketType::COMBAT_ENTER_REQUEST:
+		case SerialPacketType::COMBAT_ENTER_RESPONSE:
+		case SerialPacketType::COMBAT_EXIT_REQUEST:
+		case SerialPacketType::COMBAT_EXIT_RESPONSE:
+
+			serializeCombat(static_cast<CombatPacket*>(packet), buffer);
+		break;
+
+		//enemy info
+		case SerialPacketType::ENEMY_NEW:
+		case SerialPacketType::ENEMY_DELETE:
+		case SerialPacketType::ENEMY_UPDATE:
+		case SerialPacketType::ENEMY_STATS_REQUEST:
+		case SerialPacketType::ENEMY_STATS_RESPONSE:
+			serializeEnemy(static_cast<EnemyPacket*>(packet), buffer);
+		break;
+
+		//region info
+		case SerialPacketType::REGION_REQUEST:
+			deserializeRegionFormat(static_cast<RegionPacket*>(packet), buffer);
+		break;
+
+		case SerialPacketType::REGION_CONTENT:
+			deserializeRegionContent(static_cast<RegionPacket*>(packet), buffer);
+		break;
+
+		//server info
+		case SerialPacketType::BROADCAST_RESPONSE:
+			deserializeServer(static_cast<ServerPacket*>(packet), buffer);
+		break;
+	}
+}

common/network/serial/serial.hpp

@@ -0,0 +1,67 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef SERIALIZE_HPP_
+#define SERIALIZE_HPP_
+
+#include "serial_packet.hpp"
+
+#include "region.hpp"
+#include "statistics.hpp"
+
+//Primary interface functions
+void serializePacket(SerialPacketBase*, void* dest);
+void deserializePacket(SerialPacketBase*, void* src);
+
+void serializeType(SerialPacketBase*, void*);
+void deserializeType(SerialPacketBase*, void*);
+
+//utility functions, exposed
+void serializeCharacter(CharacterPacket*, void*);
+void serializeClient(ClientPacket*, void*);
+void serializeCombat(CombatPacket*, void*);
+void serializeEnemy(EnemyPacket*, void*);
+void serializeRegionFormat(RegionPacket*, void*);
+void serializeRegionContent(RegionPacket*, void*);
+void serializeServer(ServerPacket*, void*);
+void serializeStatistics(Statistics*, void*);
+
+void deserializeCharacter(CharacterPacket*, void*);
+void deserializeClient(ClientPacket*, void*);
+void deserializeCombat(CombatPacket*, void*);
+void deserializeEnemy(EnemyPacket*, void*);
+void deserializeRegionFormat(RegionPacket*, void*);
+void deserializeRegionContent(RegionPacket*, void*);
+void deserializeServer(ServerPacket*, void*);
+void deserializeStatistics(Statistics*, void*);
+
+/* DOCS: Keep PACKET_BUFFER_SIZE up to date
+ * DOCS: SerialPacketType::REGION_CONTENT is currently the largest type of packet, read more
+ * The metadata used are:
+ *     SerialPacketType
+ *     room index
+ *     X & Y positon
+ * The rest is taken up by the Regions's content.
+*/
+
+constexpr int PACKET_BUFFER_SIZE = sizeof(SerialPacketType) + sizeof(int) * 3 + REGION_FOOTPRINT;
+
+#endif

common/network/serial/serial_character.cpp

@@ -0,0 +1,74 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "serial.hpp"
+
+#include "serial_util.hpp"
+
+void serializeCharacter(CharacterPacket* packet, void* buffer) {
+	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the character
+	SERIALIZE(buffer, &packet->characterIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->handle, PACKET_STRING_SIZE);
+	SERIALIZE(buffer, &packet->avatar, PACKET_STRING_SIZE);
+
+	//the owner
+	SERIALIZE(buffer, &packet->accountIndex, sizeof(int));
+
+	//location
+	SERIALIZE(buffer, &packet->roomIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->origin.x, sizeof(double));
+	SERIALIZE(buffer, &packet->origin.y, sizeof(double));
+	SERIALIZE(buffer, &packet->motion.x, sizeof(double));
+	SERIALIZE(buffer, &packet->motion.y, sizeof(double));
+
+	//stats structure
+	serializeStatistics(&packet->stats, buffer);
+	buffer = reinterpret_cast<char*>(buffer) + sizeof(Statistics);
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs
+}
+
+void deserializeCharacter(CharacterPacket* packet, void* buffer) {
+	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the character
+	DESERIALIZE(buffer, &packet->characterIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->handle, PACKET_STRING_SIZE);
+	DESERIALIZE(buffer, &packet->avatar, PACKET_STRING_SIZE);
+
+	//the owner
+	DESERIALIZE(buffer, &packet->accountIndex, sizeof(int));
+
+	//location
+	DESERIALIZE(buffer, &packet->roomIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->origin.x, sizeof(double));
+	DESERIALIZE(buffer, &packet->origin.y, sizeof(double));
+	DESERIALIZE(buffer, &packet->motion.x, sizeof(double));
+	DESERIALIZE(buffer, &packet->motion.y, sizeof(double));
+
+	//stats structure
+	deserializeStatistics(&packet->stats, buffer);
+	buffer = reinterpret_cast<char*>(buffer) + sizeof(Statistics);
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs
+}

common/network/serial/serial_client.cpp

@@ -0,0 +1,42 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "serial.hpp"
+
+#include "serial_util.hpp"
+
+void serializeClient(ClientPacket* packet, void* buffer) {
+	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	SERIALIZE(buffer, &packet->clientIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->accountIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->username, PACKET_STRING_SIZE);
+//	SERIALIZE(buffer, &packet->password, PACKET_STRING_SIZE);
+}
+
+void deserializeClient(ClientPacket* packet, void* buffer) {
+	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	DESERIALIZE(buffer, &packet->clientIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->accountIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->username, PACKET_STRING_SIZE);
+//	DESERIALIZE(buffer, &packet->password, PACKET_STRING_SIZE);
+}

common/network/serial/serial_combat.cpp

@@ -0,0 +1,64 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "serial.hpp"
+
+#include "serial_util.hpp"
+
+void serializeCombat(CombatPacket* packet, void* buffer) {
+	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the combat instance
+	SERIALIZE(buffer, &packet->combatIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->difficulty, sizeof(int));
+	SERIALIZE(buffer, &packet->terrainType, sizeof(TerrainType));
+
+	//combatants
+	SERIALIZE(buffer, &packet->characterArray, sizeof(int) * COMBAT_MAX_CHARACTERS);
+	SERIALIZE(buffer, &packet->enemyArray, sizeof(int) * COMBAT_MAX_ENEMIES);
+
+	//location
+	SERIALIZE(buffer, &packet->mapIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->origin.x, sizeof(double));
+	SERIALIZE(buffer, &packet->origin.y, sizeof(double));
+
+	//TODO: gameplay components: rewards
+}
+
+void deserializeCombat(CombatPacket* packet, void* buffer) {
+	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the combat instance
+	DESERIALIZE(buffer, &packet->combatIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->difficulty, sizeof(int));
+	DESERIALIZE(buffer, &packet->terrainType, sizeof(TerrainType));
+
+	//combatants
+	DESERIALIZE(buffer, &packet->characterArray, sizeof(int) * COMBAT_MAX_CHARACTERS);
+	DESERIALIZE(buffer, &packet->enemyArray, sizeof(int) * COMBAT_MAX_ENEMIES);
+
+	//location
+	DESERIALIZE(buffer, &packet->mapIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->origin.x, sizeof(double));
+	DESERIALIZE(buffer, &packet->origin.y, sizeof(double));
+
+	//TODO: gameplay components: rewards
+}

common/network/serial/serial_enemy.cpp

@@ -0,0 +1,56 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "serial.hpp"
+
+#include "serial_util.hpp"
+
+void serializeEnemy(EnemyPacket* packet, void* buffer) {
+	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the enemy
+	SERIALIZE(buffer, &packet->enemyIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->handle, PACKET_STRING_SIZE);
+	SERIALIZE(buffer, &packet->avatar, PACKET_STRING_SIZE);
+
+	//gameplay
+
+	//stats structure
+	serializeStatistics(&packet->stats, buffer);
+	buffer = reinterpret_cast<char*>(buffer) + sizeof(Statistics);
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs, rewards
+}
+
+void deserializeEnemy(EnemyPacket* packet, void* buffer) {
+	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the enemy
+	DESERIALIZE(buffer, &packet->enemyIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->handle, PACKET_STRING_SIZE);
+	DESERIALIZE(buffer, &packet->avatar, PACKET_STRING_SIZE);
+
+	//stats structure
+	deserializeStatistics(&packet->stats, buffer);
+	buffer = reinterpret_cast<char*>(buffer) + sizeof(Statistics);
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs, rewards
+}

common/network/serial/serial_region.cpp

@@ -0,0 +1,89 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "serial.hpp"
+
+#include "serial_util.hpp"
+
+void serializeRegionFormat(RegionPacket* packet, void* buffer) {
+	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//format
+	SERIALIZE(buffer, &packet->roomIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->x, sizeof(int));
+	SERIALIZE(buffer, &packet->y, sizeof(int));
+}
+
+void serializeRegionContent(RegionPacket* packet, void* buffer) {
+	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//format
+	SERIALIZE(buffer, &packet->roomIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->x, sizeof(int));
+	SERIALIZE(buffer, &packet->y, sizeof(int));
+
+	//tiles
+	for (register int i = 0; i < REGION_WIDTH; i++) {
+		for (register int j = 0; j < REGION_HEIGHT; j++) {
+			for (register int k = 0; k < REGION_DEPTH; k++) {
+				*reinterpret_cast<Region::type_t*>(buffer) = packet->region->GetTile(i, j, k);
+				buffer = reinterpret_cast<char*>(buffer) + sizeof(Region::type_t);
+			}
+		}
+	}
+
+	//solids
+	SERIALIZE(buffer, packet->region->GetSolidBitset(), REGION_SOLID_FOOTPRINT);
+}
+
+void deserializeRegionFormat(RegionPacket* packet, void* buffer) {
+	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//format
+	DESERIALIZE(buffer, &packet->roomIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->x, sizeof(int));
+	DESERIALIZE(buffer, &packet->y, sizeof(int));
+}
+
+void deserializeRegionContent(RegionPacket* packet, void* buffer) {
+	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//format
+	DESERIALIZE(buffer, &packet->roomIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->x, sizeof(int));
+	DESERIALIZE(buffer, &packet->y, sizeof(int));
+
+	//an object to work on
+	packet->region = new Region(packet->x, packet->y);
+
+	//tiles
+	for (register int i = 0; i < REGION_WIDTH; i++) {
+		for (register int j = 0; j < REGION_HEIGHT; j++) {
+			for (register int k = 0; k < REGION_DEPTH; k++) {
+				packet->region->SetTile(i, j, k, *reinterpret_cast<Region::type_t*>(buffer));
+				buffer = reinterpret_cast<char*>(buffer) + sizeof(Region::type_t);
+			}
+		}
+	}
+
+	//solids
+	DESERIALIZE(buffer, packet->region->GetSolidBitset(), REGION_SOLID_FOOTPRINT);
+}

common/network/serial/serial_server.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -19,36 +19,24 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "account_data.hpp"
+#include "serial.hpp"
 
-int AccountData::SetClientIndex(int i) {
-	return clientIndex = i;
+#include "serial_util.hpp"
+
+void serializeServer(ServerPacket* packet, void* buffer) {
+	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the server
+	SERIALIZE(buffer, &packet->name, PACKET_STRING_SIZE);
+	SERIALIZE(buffer, &packet->playerCount, sizeof(int));
+	SERIALIZE(buffer, &packet->version, sizeof(int));
 }
 
-int AccountData::GetClientIndex() {
-	return clientIndex;
-}
+void deserializeServer(ServerPacket* packet, void* buffer) {
+	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
 
-std::string AccountData::SetUsername(std::string s) {
-	return username = s;
+	//identify the server
+	DESERIALIZE(buffer, &packet->name, PACKET_STRING_SIZE);
+	DESERIALIZE(buffer, &packet->playerCount, sizeof(int));
+	DESERIALIZE(buffer, &packet->version, sizeof(int));
 }
-
-std::string AccountData::GetUsername() {
-	return username;
-}
-
-bool AccountData::GetBlackListed() {
-	return blackListed;
-}
-
-bool AccountData::GetWhiteListed() {
-	return whiteListed;
-}
-
-bool AccountData::GetModerator() {
-	return mod;
-}
-
-bool AccountData::GetAdministrator() {
-	return admin;
-}

common/network/serial/serial_statistics.cpp

@@ -0,0 +1,65 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "serial.hpp"
+
+#include "serial_util.hpp"
+
+void serializeStatistics(Statistics* stats, void* buffer) {
+	//integers
+	SERIALIZE(buffer, &stats->level, sizeof(int));
+	SERIALIZE(buffer, &stats->exp, sizeof(int));
+	SERIALIZE(buffer, &stats->maxHP, sizeof(int));
+	SERIALIZE(buffer, &stats->health, sizeof(int));
+	SERIALIZE(buffer, &stats->maxMP, sizeof(int));
+	SERIALIZE(buffer, &stats->mana, sizeof(int));
+	SERIALIZE(buffer, &stats->attack, sizeof(int));
+	SERIALIZE(buffer, &stats->defence, sizeof(int));
+	SERIALIZE(buffer, &stats->intelligence, sizeof(int));
+	SERIALIZE(buffer, &stats->resistance, sizeof(int));
+	SERIALIZE(buffer, &stats->speed, sizeof(int));
+
+	//floats
+	SERIALIZE(buffer, &stats->accuracy, sizeof(float));
+	SERIALIZE(buffer, &stats->evasion, sizeof(float));
+	SERIALIZE(buffer, &stats->luck, sizeof(float));
+}
+
+
+void deserializeStatistics(Statistics* stats, void* buffer) {
+	//integers
+	DESERIALIZE(buffer, &stats->level, sizeof(int));
+	DESERIALIZE(buffer, &stats->exp, sizeof(int));
+	DESERIALIZE(buffer, &stats->maxHP, sizeof(int));
+	DESERIALIZE(buffer, &stats->health, sizeof(int));
+	DESERIALIZE(buffer, &stats->maxMP, sizeof(int));
+	DESERIALIZE(buffer, &stats->mana, sizeof(int));
+	DESERIALIZE(buffer, &stats->attack, sizeof(int));
+	DESERIALIZE(buffer, &stats->defence, sizeof(int));
+	DESERIALIZE(buffer, &stats->intelligence, sizeof(int));
+	DESERIALIZE(buffer, &stats->resistance, sizeof(int));
+	DESERIALIZE(buffer, &stats->speed, sizeof(int));
+
+	//floats
+	DESERIALIZE(buffer, &stats->accuracy, sizeof(float));
+	DESERIALIZE(buffer, &stats->evasion, sizeof(float));
+	DESERIALIZE(buffer, &stats->luck, sizeof(float));
+}

common/network/serial/serial_util.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -19,21 +19,13 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "world.hpp"
+#ifndef SERIALIZEUTIL_HPP_
+#define SERIALIZEUTIL_HPP_
 
-//-------------------------
-//chat
-//-------------------------
+#include <cstring>
 
-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()
-}
+//NOTE: The strange assignments here used in order to move the void* parameter
+#define SERIALIZE(buffer, data, size) memcpy(buffer, data, size); buffer = reinterpret_cast<char*>(buffer) + size;
+#define DESERIALIZE(buffer, data, size) memcpy(data, buffer, size); buffer = reinterpret_cast<char*>(buffer) + size;
 
+#endif

common/network/udp_network_utility.cpp

@@ -0,0 +1,224 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "udp_network_utility.hpp"
+
+#include "serial.hpp"
+
+#include <stdexcept>
+
+//BUGFIX: 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 SerialPacket with UDPpacket
+
+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 open UDPNetworkUtility"));
+	}
+}
+
+void UDPNetworkUtility::Close() {
+	SDLNet_UDP_Close(socket);
+	SDLNet_FreePacket(packet);
+	socket = 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);
+}
+
+int UDPNetworkUtility::Bind(IPaddress* add, int channel) {
+	int ret = SDLNet_UDP_Bind(socket, channel, add);
+
+	if (ret < 0) {
+		throw(std::runtime_error("Failed to bind to a channel"));
+	}
+
+	return ret;
+}
+
+void UDPNetworkUtility::Unbind(int channel) {
+	SDLNet_UDP_Unbind(socket, channel);
+}
+
+//-------------------------
+//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"));
+	}
+
+	SendTo(&add, data, len);
+}
+
+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(packet->data, 0, packet->maxlen);
+	memcpy(packet->data, data, len);
+	packet->len = len;
+	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, void* data, int len) {
+	if (len > packet->maxlen) {
+		throw(std::runtime_error("The buffer is to large for the UDPpacket"));
+	}
+	memset(packet->data, 0, packet->maxlen);
+	memcpy(packet->data, data, len);
+	packet->len = len;
+
+	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(void* data, int len) {
+	if (len > packet->maxlen) {
+		throw(std::runtime_error("The buffer is to large for the UDPpacket"));
+	}
+	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, packet);
+		}
+	}
+
+	return sent;
+}
+
+//TODO: put a void* and int* parameter list here
+int UDPNetworkUtility::Receive() {
+	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 SerialPacket
+//-------------------------
+
+int UDPNetworkUtility::SendTo(const char* ip, int port, SerialPacket* 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, SerialPacket* serialPacket) {
+	memset(packet->data, 0, packet->maxlen);
+	serializePacket(serialPacket, packet->data);
+	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, SerialPacket* serialPacket) {
+	memset(packet->data, 0, packet->maxlen);
+	serializePacket(serialPacket, packet->data);
+	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(SerialPacket* serialPacket) {
+	memset(packet->data, 0, packet->maxlen);
+	serializePacket(serialPacket, packet->data);
+	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(SerialPacket* serialPacket) {
+	memset(packet->data, 0, packet->maxlen);
+	int ret = SDLNet_UDP_Recv(socket, packet);
+	deserializePacket(serialPacket, packet->data);
+	serialPacket->srcAddress = packet->address;
+
+	if (ret < 0) {
+		throw(std::runtime_error("Unknown network error occured"));
+	}
+
+	return ret;
+}

common/network/udp_network_utility.hpp

@@ -0,0 +1,72 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef UDPNETWORKUTILITY_HPP_
+#define UDPNETWORKUTILITY_HPP_
+
+#include "SDL/SDL_net.h"
+
+#include "serial_packet.hpp"
+
+class UDPNetworkUtility {
+public:
+	UDPNetworkUtility() = default;
+	~UDPNetworkUtility() = default;
+
+	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);
+	void Unbind(int channel);
+
+	IPaddress* GetIPAddress(int channel) {
+		return SDLNet_UDP_GetPeerAddress(socket, channel);
+	}
+
+	//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();
+
+	//send a SerialPacket
+	int SendTo(const char* ip, int port, SerialPacket* serialPacket);
+	int SendTo(IPaddress* add, SerialPacket* serialPacket);
+	int SendTo(int channel, SerialPacket* serialPacket);
+	int SendToAllChannels(SerialPacket* serialPacket);
+	int Receive(SerialPacket* serialPacket);
+
+	//accessors
+	UDPpacket* GetPacket() const {
+		return packet;
+	}
+	UDPsocket GetSocket() const {
+		return socket;
+	}
+private:
+	UDPsocket socket = nullptr;
+	UDPpacket* packet = nullptr;
+};
+
+#endif