Updated network version, instructions

Please note that there are duplicate copies of vector2.hpp and
bounding_box.hpp

.gitignore

@@ -9,6 +9,9 @@
 Release/
 Debug/
 Out/
+release/
+debug/
+out/
 
 #Project generated files
 *.db

.gitmodules

@@ -0,0 +1,9 @@
+[submodule "bin"]
+	path = bin
+	url = https://github.com/krgamestudios/bin.git
+[submodule "TurtleGUI"]
+	path = TurtleGUI
+	url = https://github.com/krgamestudios/TurtleGUI.git
+[submodule "TurtleMap"]
+	path = TurtleMap
+	url = https://github.com/krgamestudios/TurtleMap.git

README.md

@@ -1,32 +1,51 @@
 ## Outline
 
-Tortuga is a 2D multiplayer JRPG featuring permadeath, with an emphasis on multiplayer cooperation, exploration and customization. The game runs on customizable public and private servers.
+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.
 
-This game is inspired by classic 2D RPGs (Final Fantasy, The Legend of Zelda), as well as more modern sandboxes amd MMOs (Minecraft, EVE Online). This project is currently independently created and funded, with the goal of creating a game that will engage the players and inspire a large community.
+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.rar).
+* 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).
+
+## Patreon
+
+If you would like to support the development of Tortuga, please consider becoming a patron below.
+
+* [My Patreon Page](https://patreon.com/user?u=2811779)
 
 ## Documentation
 
-* [Tortuga Wiki](https://github.com/Ratstail91/Tortuga/wiki) - Full 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
 
 ## External Dependencies
 
-* [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
+* [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
 * [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
+
+## Using and Including
+
+* [Coolvetica Typeface](http://typodermicfonts.com/coolvetica/)
+
 ## Copyright
 
 (Future versions (to be determined) may be released under a modified version of the [Uplink Developer's License](http://www.introversion.co.uk/uplink/developer/license.html).)
 
 The current version of Tortuga is released under the [zlib license](http://en.wikipedia.org/wiki/Zlib_License).  
 
-Copyright (c) 2013, 2014 Kayne Ruse
+Copyright (c) 2013-2016 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.
 
@@ -34,4 +53,9 @@ Permission is granted to anyone to use this software for any purpose, including
 
 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.
+3. This notice may not be removed or altered from any source distribution.
+
+### Items not made by me
+
+* [Coolvetica Font](http://typodermicfonts.com/coolvetica/)
+* Creative Commons Artwork from [Artsader](http://www.moosader.com/artsader/)

client/base_scene.cpp

@@ -0,0 +1,109 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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
+}
+
+void BaseScene::TextInput(SDL_TextInputEvent const& event) {
+	//EMPTY
+}

client/base_scene.hpp

@@ -0,0 +1,62 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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);
+	virtual void TextInput(SDL_TextInputEvent const& event);
+
+	//TODO: 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, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,11 +19,8 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CHANNELS_HPP_
-#define CHANNELS_HPP_
+#pragma once
 
 enum Channels {
 	SERVER = 0
 };
-
-#endif

client/client_application.cpp

@@ -1,11 +1,11 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
  * arising from the use of this software.
  * 
  * Permission is granted to anyone to use this software for any purpose,
- * including commercial ClientApplications, and to alter it and redistribute it
+ * including commercial applications, and to alter it and redistribute it
  * freely, subject to the following restrictions:
  * 
  * 1. The origin of this software must not be misrepresented; you must not
@@ -24,21 +24,14 @@
 #include "serial_packet.hpp"
 #include "config_utility.hpp"
 
-#include <stdexcept>
+//for handling platforms
+#include "SDL2/SDL_syswm.h"
+#include "SDL2/SDL_version.h"
+
 #include <chrono>
 #include <iostream>
-
-//-------------------------
-//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 "disconnected_screen.hpp"
+#include <sstream>
+#include <stdexcept>
 
 //-------------------------
 //Public access members
@@ -49,59 +42,157 @@ void ClientApplication::Init(int argc, char* argv[]) {
 
 	//load the prerequisites
 	ConfigUtility& config = ConfigUtility::GetSingleton();
-	config.Load("rsc\\config.cfg", argc, argv);
+	config.Load("rsc/config.cfg", false, argc, argv);
+
+	//-------------------------
+	//Initialize SDL
+	//-------------------------
+
+	if (SDL_Init(0)) {
+		std::ostringstream msg;
+		msg << "Failed to initialize SDL: " << SDL_GetError();
+		throw(std::runtime_error(msg.str()));
+	}
+
+	//-------------------------
+	//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";
+			break;
+
+			case SDL_SYSWM_X11:
+				platform = "X Window System";
+			break;
+
+			//NOTE: OS X is currently unsupported, but it could be
+			case SDL_SYSWM_COCOA:
+				platform = "Apple OS X";
+			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;
+	}
+	else {
+		std::ostringstream msg;
+		msg << "Failed to retrieve window info: " << SDL_GetError();
+		throw(std::runtime_error(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()) {
-		throw(std::runtime_error("Failed to initialize SDL_net"));
+		std::ostringstream msg;
+		msg << "Failed to initialize SDL_net 2.0: " << SDL_GetError();
+		throw(std::runtime_error(msg.str()));
 	}
 	UDPNetworkUtility::GetSingleton().Open(0);
-	std::cout << "Initialized SDL_net" << std::endl;
 
-	//-------------------------
-	//Setup the screen
-	//-------------------------
+	std::cout << "Initialized SDL_net 2.0" << std::endl;
 
-	int w = config.Int("client.screen.w");
-	int h = config.Int("client.screen.h");
-	int f = config.Bool("client.screen.f") ? SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_FULLSCREEN : SDL_HWSURFACE|SDL_DOUBLEBUF;
+	//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()));
+	}
 
-	BaseScene::SetScreen(w ? w : 800, h ? h : 600, 0, f);
-	std::cout << "Initialized the screen" << std::endl;
+	std::cout << "Initialized SDL_ttf 2.0" << std::endl;
 
 	//-------------------------
 	//debug output
 	//-------------------------
 
-	//TODO: enable/disable these with a switch
-#define DEBUG_OUTPUT_VAR(x) std::cout << "\t" << #x << ": " << x << std::endl;
+#define DEBUG_INTERNAL_VAR(x) std::cout << "\t" << #x << ": " << x << std::endl;
 
 	std::cout << "Internal sizes:" << std::endl;
 
-	DEBUG_OUTPUT_VAR(NETWORK_VERSION);
-	DEBUG_OUTPUT_VAR(sizeof(Region::type_t));
-	DEBUG_OUTPUT_VAR(sizeof(Region));
-	DEBUG_OUTPUT_VAR(REGION_WIDTH);
-	DEBUG_OUTPUT_VAR(REGION_HEIGHT);
-	DEBUG_OUTPUT_VAR(REGION_DEPTH);
-	DEBUG_OUTPUT_VAR(REGION_TILE_FOOTPRINT);
-	DEBUG_OUTPUT_VAR(REGION_SOLID_FOOTPRINT);
-	DEBUG_OUTPUT_VAR(PACKET_STRING_SIZE);
-	DEBUG_OUTPUT_VAR(PACKET_BUFFER_SIZE);
-	DEBUG_OUTPUT_VAR(MAX_PACKET_SIZE);
-	DEBUG_OUTPUT_VAR(static_cast<int>(SerialPacketType::LAST));
+	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));
 
-#undef DEBUG_OUTPUT_VAR
+	//-------------------------
+	//BUGFIX
+	//-------------------------
+
+	SDL_StopTextInput();
 
 	//-------------------------
 	//finalize the startup
@@ -117,81 +208,165 @@ void ClientApplication::Init(int argc, char* argv[]) {
 }
 
 void ClientApplication::Proc() {
-	LoadScene(SceneList::FIRST);
+	//load the first scene
+	ProcessSceneSignal(SceneSignal::FIRST);
 
-	//prepare the time system
+	//fixed frame rate
 	typedef std::chrono::steady_clock Clock;
 
 	Clock::time_point simTime = Clock::now();
 	Clock::time_point realTime;
+	constexpr std::chrono::duration<int, std::milli> frameDelay(16); //~60FPS
 
-	//The main loop
-	while(activeScene->GetNextScene() != SceneList::QUIT) {
-		//switch scenes when necessary
-		if (activeScene->GetNextScene() != SceneList::CONTINUE) {
-			LoadScene(activeScene->GetNextScene());
+	//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());
 			continue;
 		}
 
 		//update the current time
 		realTime = Clock::now();
 
-		//simulate game time
-		while (simTime < realTime) {
-			//call each user defined function
-			activeScene->RunFrame();
-			//~60 FPS
-			simTime += std::chrono::duration<int, std::milli>(16);
+		//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);
 		}
 
-		//draw the game to the screen
-		activeScene->RenderFrame();
+		SDL_RenderClear(renderer);
+		activeScene->RenderFrame(renderer);
+		SDL_RenderPresent(renderer);
 	}
 
-	UnloadScene();
+	//cleanup
+	ClearScene();
 }
 
 void ClientApplication::Quit() {
+	//clean up after the program
 	std::cout << "Shutting down" << std::endl;
 	UDPNetworkUtility::GetSingleton().Close();
+	TTF_Quit();
 	SDLNet_Quit();
+	BaseScene::SetRenderer(nullptr);
+	SDL_DestroyRenderer(renderer);
+	SDL_DestroyWindow(window);
 	SDL_Quit();
 	std::cout << "Clean exit" << std::endl;
 }
 
 //-------------------------
-//Private access members
+//Scene management
 //-------------------------
 
-void ClientApplication::LoadScene(SceneList sceneIndex) {
-	UnloadScene();
-	switch(sceneIndex) {
-		//add scene creation calls here
-		case SceneList::FIRST:
-		case SceneList::SPLASHSCREEN:
-			activeScene = new SplashScreen();
-		break;
-		case SceneList::MAINMENU:
-			activeScene = new MainMenu();
-		break;
-		case SceneList::OPTIONSMENU:
-			activeScene = new OptionsMenu();
-		break;
-		case SceneList::LOBBYMENU:
-			activeScene = new LobbyMenu(&clientIndex, &accountIndex); //TODO: can I use the ConfigUtility for these parameters?
-		break;
-		case SceneList::INWORLD:
-			activeScene = new InWorld(&clientIndex, &accountIndex);
-		break;
-		case SceneList::DISCONNECTEDSCREEN:
-			activeScene = new DisconnectedScreen();
-		break;
-		default:
-			throw(std::logic_error("Failed to recognize the scene index"));
+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;
+
+			case SDL_TEXTINPUT:
+				activeScene->TextInput(event.text);
+			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;
+		}
 	}
 }
 
-void ClientApplication::UnloadScene() {
+//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 "combat.hpp"
+#include "disconnected_screen.hpp"
+
+void ClientApplication::ProcessSceneSignal(SceneSignal signal) {
+	//BUG: #16 Resources are being reloaded between scenes
+	ClearScene();
+	switch(signal) {
+		//add scene creation calls here
+		case SceneSignal::FIRST:
+		case SceneSignal::SPLASHSCREEN:
+			activeScene = new SplashScreen(window);
+		break;
+		case SceneSignal::MAINMENU:
+			activeScene = new MainMenu();
+		break;
+		case SceneSignal::OPTIONSMENU:
+			activeScene = new OptionsMenu();
+		break;
+		case SceneSignal::LOBBYMENU:
+			activeScene = new LobbyMenu(&clientIndex, &accountIndex);
+		break;
+		case SceneSignal::WORLD:
+			activeScene = new World(&clientIndex, &accountIndex);
+		break;
+		case SceneSignal::COMBAT:
+			activeScene = new Combat(&clientIndex, &accountIndex);
+		break;
+		case SceneSignal::DISCONNECTEDSCREEN:
+			activeScene = new DisconnectedScreen();
+		break;
+		default: {
+			std::ostringstream msg;
+			msg << "Failed to recognize the scene signal: " << signal;
+			throw(std::logic_error(msg.str()));
+		}
+	}
+}
+
+void ClientApplication::ClearScene() {
 	delete activeScene;
 	activeScene = nullptr;
 }

client/client_application.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,19 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CLIENTAPPLICATION_HPP_
-#define CLIENTAPPLICATION_HPP_
+#pragma once
 
-#include "scene_list.hpp"
 #include "base_scene.hpp"
-
+#include "scene_signal.hpp"
+#include "singleton.hpp"
 #include "udp_network_utility.hpp"
 
-#include "singleton.hpp"
-
-#include <map>
+#include "SDL2/SDL.h"
+#include "SDL2/SDL_net.h"
+#include "SDL2/SDL_ttf.h"
 
 class ClientApplication: public Singleton<ClientApplication> {
 public:
-	//public methods
 	void Init(int argc, char* argv[]);
 	void Proc();
 	void Quit();
@@ -44,15 +42,18 @@ private:
 	ClientApplication() = default;
 	~ClientApplication() = default;
 
-	//Private access members
-	void LoadScene(SceneList sceneIndex);
-	void UnloadScene();
+	//scene management
+	void ProcessEvents();
+	void ProcessSceneSignal(SceneSignal);
+	void ClearScene();
 
 	BaseScene* activeScene = nullptr;
 
-	//shared parameters
+	//TODO: (9) build a "window" class?
+	SDL_Window* window = nullptr;
+	SDL_Renderer* renderer = nullptr;
+
+	//global scene parameters
 	int clientIndex = -1;
 	int accountIndex = -1;
-};
-
-#endif
+};

client/composite_image.hpp

@@ -0,0 +1,145 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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 "image.hpp"
+
+#include <list>
+#include <map>
+#include <string>
+
+template<typename T = class Image>
+class CompositeImage {
+public:
+	CompositeImage() = default;
+	~CompositeImage() = default;
+
+	void Load(SDL_Renderer* const, std::string spriteDir, std::list<std::string> nameList);
+	void SetTextures(std::map<std::string, Image>& templateImages);
+	void Free();
+
+	void DrawTo(SDL_Renderer* const, Sint16 x, Sint16 y, double scaleX = 1.0, double scaleY = 1.0);
+
+	//accessors & mutators
+	T* Find(std::string name);
+
+	bool Enable(std::string name);
+	bool Disable(std::string name);
+	void EnableAll();
+	void DisableAll();
+
+	std::map<std::string, std::pair<bool, T>>* GetTemplateImages();
+
+private:
+	std::map<std::string, std::pair<bool, T>> imageMap;
+};
+
+
+template<typename T>
+void CompositeImage<T>::Load(SDL_Renderer* const renderer, std::string spriteDir, std::list<std::string> nameList) {
+	for (auto& it : nameList) {
+		imageMap[it].first = true;
+		imageMap[it].second.Load(renderer, spriteDir + it);
+	}
+}
+
+template<typename T>
+void CompositeImage<T>::SetTextures(std::map<std::string, Image>& templateImages) {
+	for (auto& it : templateImages) {
+		imageMap[it.first].first = true;
+		imageMap[it.first].second.SetTexture(it.second.GetTexture());
+	}
+}
+
+template<typename T>
+void CompositeImage<T>::Free() {
+	imageMap.clear();
+}
+
+template<typename T>
+void CompositeImage<T>::DrawTo(SDL_Renderer* const dest, Sint16 x, Sint16 y, double scaleX, double scaleY) {
+	//draw all members, regardless of internal ordering
+	for (auto& it : imageMap) {
+		if (it.second.first) {
+			it.second.second.DrawTo(dest, x, y, scaleX, scaleY);
+		}
+	}
+}
+
+
+//-------------------------
+//accessors & mutators
+//-------------------------
+
+template<typename T>
+T* CompositeImage<T>::Find(std::string name) {
+	auto it = imageMap.find(name);
+	if (it == imageMap.end()) {
+		return nullptr;
+	}
+	else {
+		return &it->second.second;
+	}
+}
+
+template<typename T>
+bool CompositeImage<T>::Enable(std::string name) {
+	auto it = imageMap.find(name);
+	if (it == imageMap.end()) {
+		return false;
+	}
+	else {
+		imageMap[name].first = true;
+		return true;
+	}
+}
+
+template<typename T>
+bool CompositeImage<T>::Disable(std::string name) {
+	auto it = imageMap.find(name);
+	if (it == imageMap.end()) {
+		return false;
+	}
+	else {
+		imageMap[name].first = false;
+		return true;
+	}
+}
+
+template<typename T>
+void CompositeImage<T>::EnableAll() {
+	for (auto& it : imageMap) {
+		it.second.first = true;
+	}
+}
+
+template<typename T>
+void CompositeImage<T>::DisableAll() {
+	for (auto& it : imageMap) {
+		it.second.first = false;
+	}
+}
+
+template<typename T>
+std::map<std::string, std::pair<bool, T>>* CompositeImage<T>::GetTemplateImages() {
+	return &imageMap;
+}

client/entities/barrier_manager.cpp

@@ -0,0 +1,94 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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 "barrier_manager.hpp"
+
+void BarrierManager::DrawTo(SDL_Renderer* const dest, Sint16 x, Sint16 y, double scaleX, double scaleY) {
+	for (auto& it : elementMap) {
+		it.second.DrawTo(dest, x, y);
+	}
+}
+
+void BarrierManager::LoadBaseImage(SDL_Renderer* renderer, std::string fname) {
+	baseImage.Load(renderer, fname);
+}
+
+void BarrierManager::UnloadBaseImage() {
+	baseImage.Free();
+}
+
+void BarrierManager::LoadTemplateImages(SDL_Renderer* renderer, std::string spriteDir, std::list<std::string> names) {
+	//sprite names are file names only
+	for (auto& it : names) {
+		templateImages.emplace(it, Image(renderer, spriteDir + it));
+	}
+}
+
+void BarrierManager::UnloadTemplateImages() {
+	templateImages.clear();
+}
+
+BaseBarrier* BarrierManager::Create(int index) {
+	elementMap.emplace(index, BaseBarrier(baseImage, templateImages));
+	return &elementMap[index];
+}
+
+void BarrierManager::Unload(int i) {
+	elementMap.erase(i);
+}
+
+void BarrierManager::UnloadAll() {
+	elementMap.clear();
+}
+
+void BarrierManager::UnloadIf(std::function<bool(std::pair<const int, BaseBarrier const&>)> fn) {
+	std::map<int, BaseBarrier>::iterator it = elementMap.begin();
+	while (it != elementMap.end()) {
+		if (fn(*it)) {
+			it = elementMap.erase(it);
+		}
+		else {
+			++it;
+		}
+	}
+}
+
+int BarrierManager::Size() {
+	return elementMap.size();
+}
+
+BaseBarrier* BarrierManager::Find(int i) {
+	std::map<int, BaseBarrier>::iterator it = elementMap.find(i);
+
+	if (it == elementMap.end()) {
+		return nullptr;
+	}
+
+	return &it->second;
+}
+
+std::map<int, BaseBarrier>* BarrierManager::GetContainer() {
+	return &elementMap;
+}
+
+std::map<std::string, Image>* BarrierManager::GetTemplateContainer() {
+	return &templateImages;
+}

client/entities/barrier_manager.hpp

@@ -0,0 +1,58 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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 "base_barrier.hpp"
+
+#include <functional>
+#include <list>
+#include <string>
+
+class BarrierManager {
+public:
+	BarrierManager() = default;
+	~BarrierManager() = default;
+
+	void DrawTo(SDL_Renderer* const, Sint16 x, Sint16 y, double scaleX = 1.0, double scaleY = 1.0);
+
+	//NOTE: don't use these while you have barriers loaded
+	void LoadBaseImage(SDL_Renderer* renderer, std::string fname);
+	void UnloadBaseImage();
+	void LoadTemplateImages(SDL_Renderer* renderer, std::string spriteDir, std::list<std::string> names);
+	void UnloadTemplateImages();
+
+	BaseBarrier* Create(int index);
+	void Unload(int i);
+	void UnloadAll();
+	void UnloadIf(std::function<bool(std::pair<const int, BaseBarrier const&>)> fn);
+
+	int Size();
+
+	BaseBarrier* Find(int i);
+	std::map<int, BaseBarrier>* GetContainer();
+	std::map<std::string, Image>* GetTemplateContainer();
+
+private:
+	Image baseImage;
+	std::map<std::string, Image> templateImages;
+	std::map<int, BaseBarrier> elementMap;
+};

client/entities/base_barrier.cpp

@@ -0,0 +1,105 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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_barrier.hpp"
+
+#include "config_utility.hpp"
+
+#include <cstring>
+#include <sstream>
+#include <stdexcept>
+
+BaseBarrier::BaseBarrier(Image& argBaseImage, std::map<std::string, Image>& templateImages) {
+	baseImage.SetTexture(argBaseImage.GetTexture());
+	composite.SetTextures(templateImages);
+	memset(status, 0, sizeof(int) * 8);
+	CorrectSprite();
+}
+
+BaseBarrier::~BaseBarrier() {
+	//
+}
+
+void BaseBarrier::CorrectSprite() {
+	//TODO: link status to sprite
+	for (int i = 0; i < 8; i++) {
+		//setup the name
+		std::ostringstream os;
+		os << "slot " << i+1;
+
+		switch(status[i]) {
+			case 0:
+				composite.Disable(os.str() + " green.png");
+				composite.Disable(os.str() + " red.png");
+			break;
+			case 1:
+				composite.Enable(os.str() + " green.png");
+				composite.Disable(os.str() + " red.png");
+			break;
+			case 2:
+				composite.Disable(os.str() + " green.png");
+				composite.Enable(os.str() + " red.png");
+			break;
+			default: {
+				std::ostringstream os;
+				os << "index " << i << ", value " << status[i] << std::endl;
+				throw(std::runtime_error("Unknown graphical status in barrier; " + os.str()));
+			}
+		}
+	}
+}
+
+void BaseBarrier::Update() {
+	//
+}
+
+void BaseBarrier::DrawTo(SDL_Renderer* const dest, int camX, int camY) {
+	//ignore the default sprite for now
+	baseImage.DrawTo(dest, origin.x - camX, origin.y - camY);
+	composite.DrawTo(dest, origin.x - camX, origin.y - camY);
+}
+
+int BaseBarrier::SetStatus(int k, int v) {
+	if (k >= 8 || k < 0) {
+		return -1;
+	}
+	return status[k] = v;
+}
+
+int BaseBarrier::FindStatus(int k) {
+	if (k >= 8 || k < 0) {
+		return -1;
+	}
+	return status[k];
+}
+
+int* BaseBarrier::SetStatusArray(int* ptr) {
+	memcpy(status, ptr, sizeof(int) * 8);
+	return status;
+}
+
+int* BaseBarrier::GetStatusArray() {
+	return status;
+}
+
+CompositeImage<>* BaseBarrier::GetComposite() {
+	return &composite;
+}

client/entities/base_barrier.hpp

@@ -0,0 +1,52 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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 "entity.hpp"
+
+#include "composite_image.hpp"
+
+class BaseBarrier: public Entity {
+public:
+	BaseBarrier() = default;
+	BaseBarrier(Image& baseImage, std::map<std::string, Image>& templateImages);
+	virtual ~BaseBarrier();
+
+	void CorrectSprite();
+	void Update();
+	void DrawTo(SDL_Renderer* const, int camX, int camY);
+
+	int SetStatus(int, int);
+	int FindStatus(int);
+
+	int* SetStatusArray(int*);
+	int* GetStatusArray();
+
+	CompositeImage<>* GetComposite();
+
+protected:
+	//metadata
+	int status[8];
+
+	Image baseImage;
+	CompositeImage<> composite;
+};

client/entities/base_character.cpp

@@ -0,0 +1,84 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "base_character.hpp"
+
+//TODO: (3) remove this
+#include "config_utility.hpp"
+
+//-------------------------
+//graphics
+//-------------------------
+
+void BaseCharacter::CorrectSprite() {
+	//NOTE: These must correspond to the sprite sheet in use
+	if (motion.y > 0) {
+		sprite.SetIndexY(0);
+	}
+	else if (motion.y < 0) {
+		sprite.SetIndexY(1);
+	}
+	else if (motion.x > 0) {
+		sprite.SetIndexY(3);
+	}
+	else if (motion.x < 0) {
+		sprite.SetIndexY(2);
+	}
+
+	//animation
+	if (motion != 0) {
+		sprite.SetDelay(0.1);
+	}
+	else {
+		sprite.SetDelay(0);
+		sprite.SetIndexX(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/entities/base_character.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,17 +19,16 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef BASECHARACTER_HPP_
-#define BASECHARACTER_HPP_
+#pragma once
 
 //components
 #include "character_defines.hpp"
-#include "renderable.hpp"
+#include "entity.hpp"
 
 //std namespace
 #include <string>
 
-class BaseCharacter : public Renderable {
+class BaseCharacter: public Entity {
 public:
 	BaseCharacter() = default;
 	virtual ~BaseCharacter() = default;
@@ -38,18 +37,16 @@ public:
 	void CorrectSprite();
 
 	//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; }
+	int SetOwner(int i);
+	int GetOwner();
+	std::string SetHandle(std::string s);
+	std::string GetHandle() const;
+	std::string SetAvatar(SDL_Renderer* const, std::string s);
+	std::string GetAvatar() const;
 
-private:
+protected:
 	//metadata
 	int owner;
 	std::string handle;
 	std::string avatar;
 };
-
-#endif

client/entities/base_creature.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,32 +19,28 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "utility.hpp"
+#include "base_creature.hpp"
 
-#include <algorithm>
+#include "config_utility.hpp"
 
-std::string truncatePath(std::string pathname) {
-	return std::string(
-		std::find_if(
-			pathname.rbegin(),
-			pathname.rend(),
-			[](char ch) -> bool {
-				//windows only
-				return ch == '/' || ch == '\\';
-//				//unix only
-//				return ch == '/';
-			}).base(),
-		pathname.end());
+void BaseCreature::CorrectSprite() {
+	//TODO: (9) BaseCreature::CorrectSprite()
 }
 
-std::string to_string_custom(int i) {
-	char buffer[20];
-	snprintf(buffer, 20, "%d", i);
-	return std::string(buffer);
+std::string BaseCreature::SetHandle(std::string s) {
+	return handle = s;
 }
 
-int to_integer_custom(std::string s) {
-	int ret = 0;
-	sscanf(s.c_str(), "%d", &ret);
-	return ret;
+std::string BaseCreature::GetHandle() const {
+	return handle;
+}
+
+std::string BaseCreature::SetAvatar(SDL_Renderer* const renderer, std::string s) {
+	avatar = s;
+	sprite.Load(renderer, ConfigUtility::GetSingleton()["dir.sprites"] + avatar, 4, 4);
+	return avatar;
+}
+
+std::string BaseCreature::GetAvatar() const {
+	return avatar;
 }

client/entities/base_creature.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,24 +19,24 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef STATISTICS_HPP_
-#define STATISTICS_HPP_
+#pragma once
 
-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;
+#include "entity.hpp"
+
+class BaseCreature: public Entity {
+public:
+	BaseCreature() = default;
+	virtual ~BaseCreature() = default;
+
+	void CorrectSprite();
+
+	std::string SetHandle(std::string s);
+	std::string GetHandle() const;
+	std::string SetAvatar(SDL_Renderer* const, std::string s);
+	std::string GetAvatar() const;
+
+protected:
+	//metadata
+	std::string handle;
+	std::string avatar;
 };
-
-#endif

client/entities/entity.cpp

@@ -0,0 +1,63 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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 "entity.hpp"
+
+void Entity::Update() {
+	origin += motion;
+	sprite.Update(0.016);
+}
+
+void Entity::DrawTo(SDL_Renderer* const renderer, int camX, int camY) {
+	sprite.DrawTo(renderer, origin.x - camX, origin.y - camY);
+}
+
+SpriteSheet* Entity::GetSprite() {
+	return &sprite;
+}
+
+//-------------------------
+//accessors & mutators
+//-------------------------
+
+Vector2 Entity::SetOrigin(Vector2 v) {
+	return origin = v;
+}
+
+Vector2 Entity::SetMotion(Vector2 v) {
+	return motion = v;
+}
+
+BoundingBox Entity::SetBounds(BoundingBox b) {
+	return bounds = b;
+}
+
+Vector2 Entity::GetOrigin() const {
+	return origin;
+}
+
+Vector2 Entity::GetMotion() const {
+	return motion;
+}
+
+BoundingBox Entity::GetBounds() const {
+	return bounds;
+}

client/entities/entity.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,38 +19,36 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef RENDERABLE_HPP_
-#define RENDERABLE_HPP_
+#pragma once
 
 #include "bounding_box.hpp"
 #include "sprite_sheet.hpp"
 #include "vector2.hpp"
 
-class Renderable {
+//The base class for all objects in the world
+//TODO: (9) write a better hierarchy
+class Entity {
 public:
-	Renderable() = default;
-	virtual ~Renderable() = default;
-
 	virtual void Update();
-	virtual void DrawTo(SDL_Surface* const, int camX, int camY);
+	virtual void DrawTo(SDL_Renderer* const, int camX, int camY);
 
-	SpriteSheet* GetSprite() { return &sprite; }
+	SpriteSheet* GetSprite();
 
-	//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; }
+	//accessors & mutators
+	Vector2 SetOrigin(Vector2 v);
+	Vector2 SetMotion(Vector2 v);
+	BoundingBox SetBounds(BoundingBox b);
 
-	//collision
-	BoundingBox SetBounds(BoundingBox b) { return bounds = b; }
-	BoundingBox GetBounds() { return bounds; }
+	Vector2 GetOrigin() const;
+	Vector2 GetMotion() const;
+	BoundingBox GetBounds() const;
+
+protected:
+	Entity() = default;
+	virtual ~Entity() = default;
 
-protected: //TODO: should be private
 	SpriteSheet sprite;
-	Vector2 origin = {0, 0};
-	Vector2 motion = {0, 0};
+	Vector2 origin;
+	Vector2 motion;
 	BoundingBox bounds;
 };
-
-#endif

client/entities/local_character.cpp

@@ -0,0 +1,36 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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/entities/local_character.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,22 +19,21 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef LOCALCHARACTER_HPP_
-#define LOCALCHARACTER_HPP_
+#pragma once
 
 #include "base_character.hpp"
-#include "statistics.hpp"
+#include "bounding_box.hpp"
+#include "vector2.hpp"
 
-class LocalCharacter : public BaseCharacter {
+#include <list>
+
+class LocalCharacter: public BaseCharacter {
 public:
 	LocalCharacter() = default;
-	~LocalCharacter() = default;
+	virtual ~LocalCharacter() = default;
 
-	Statistics* GetBaseStats() { return &baseStats; }
+	bool ProcessCollisionGrid(std::list<BoundingBox>);
 
 private:
-	Statistics baseStats;
-	//TODO: weapons, armour, buffs, debuffs, etc.
+	//NOTE: NO MEMBERS
 };
-
-#endif

client/entities/makefile

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

client/fatal_error.cpp

@@ -0,0 +1,24 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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 "fatal_error.hpp"
+
+//DOCS: This empty file is used to force an object file

client/fatal_error.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,16 +19,13 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef UTILITY_HPP_
-#define UTILITY_HPP_
+#pragma once
 
+#include <stdexcept>
 #include <string>
 
-std::string truncatePath(std::string pathname);
-
-//fixing known bugs in g++
-std::string to_string_custom(int i);
-
-int to_integer_custom(std::string);
-
-#endif
+class fatal_error: public std::runtime_error {
+public:
+	explicit fatal_error(const std::string& str): runtime_error(str) {}
+	explicit fatal_error(const char* cstr): runtime_error(cstr) {}
+};

client/heartbeat_utility.cpp

@@ -0,0 +1,58 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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 "heartbeat_utility.hpp"
+
+#include "channels.hpp"
+#include "ip_operators.hpp"
+
+//heartbeat system
+void HeartbeatUtility::hPing(ServerPacket* const argPacket) {
+	ServerPacket newPacket;
+	newPacket.type = SerialPacketType::PONG;
+	network.SendTo(argPacket->srcAddress, &newPacket);
+}
+
+void HeartbeatUtility::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();
+}
+
+int HeartbeatUtility::CheckHeartBeat() {
+	//check the connection (heartbeat)
+	if (Clock::now() - lastBeat > std::chrono::seconds(3)) {
+		if (attemptedBeats > 2) {
+			return 1;
+		}
+		else {
+			ServerPacket newPacket;
+			newPacket.type = SerialPacketType::PING;
+			network.SendTo(Channels::SERVER, &newPacket);
+
+			attemptedBeats++;
+			lastBeat = Clock::now();
+		}
+	}
+	return 0;
+}

client/heartbeat_utility.hpp

@@ -0,0 +1,42 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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 "server_packet.hpp"
+#include "udp_network_utility.hpp"
+
+#include <chrono>
+
+class HeartbeatUtility {
+public:
+	//heartbeat system
+	void hPing(ServerPacket* const);
+	void hPong(ServerPacket* const);
+
+	int CheckHeartBeat();
+
+private:
+	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
+	typedef std::chrono::steady_clock Clock;
+	Clock::time_point lastBeat = Clock::now();
+	int attemptedBeats = 0;
+};

client/main.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -36,7 +36,7 @@ int main(int argc, char* argv[]) {
 		ConfigUtility::CreateSingleton();
 		UDPNetworkUtility::CreateSingleton();
 
-		//call the server's routines
+		//call the client's routines
 		ClientApplication::CreateSingleton();
 		ClientApplication& app = ClientApplication::GetSingleton();
 
@@ -44,6 +44,7 @@ int main(int argc, char* argv[]) {
 		app.Proc();
 		app.Quit();
 
+		//control the position of the app's destructor
 		ClientApplication::DeleteSingleton();
 
 		//delete the singletons

client/makefile

@@ -1,7 +1,20 @@
-#config
-INCLUDES+=. client_utilities renderable scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
-LIBS+=client.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
+#include directories
+INCLUDES+=. entities scenes ../common/debugging ../common/global_defines ../common/network ../common/network/packet_types ../common/utilities ../TurtleGUI ../TurtleMap
+
+#libraries
+#the order of the $(LIBS) is important, at least for MinGW
+LIBS+=client.a ../libcommon.a ../libturtlegui.a ../libturtlemap.a -lSDL2_net
+ifeq ($(OS),Windows_NT)
+	LIBS+=-lwsock32 -liphlpapi -lmingw32
+endif
+LIBS+=-lSDL2main -lSDL2 -lSDL2_image -lSDL2_ttf
+
+#flags
 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)
@@ -16,9 +29,8 @@ OUT=$(addprefix $(OUTDIR)/,client)
 
 #targets
 all: $(OBJ) $(OUT)
-	$(MAKE) -C client_utilities
+	$(MAKE) -C entities
 	$(MAKE) -C scenes
-	$(MAKE) -C renderable
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)
@@ -35,6 +47,12 @@ $(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/scene_signal.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,22 +19,20 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SCENELIST_HPP_
-#define SCENELIST_HPP_
+#pragma once
 
-enum class SceneList {
-	//these are reserved
-	QUIT,
-	CONTINUE,
-	FIRST,
+enum SceneSignal {
+	//reserved members for internal use
+	QUIT = -1,
+	CONTINUE = 0,
+	FIRST = 1,
 
-	//custom indexes
+	//custom scenes
 	SPLASHSCREEN,
 	MAINMENU,
 	OPTIONSMENU,
 	LOBBYMENU,
-	INWORLD,
+	WORLD,
+	COMBAT,
 	DISCONNECTEDSCREEN,
-};
-
-#endif
+};

client/scenes/base_scene.cpp

@@ -1,140 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#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() {
-	FrameStart();
-	HandleEvents();
-	Update();
-	FrameEnd();
-}
-
-void BaseScene::RenderFrame() {
-	SDL_FillRect(screen, 0, 0);
-	Render(screen);
-	SDL_Flip(screen);
-	SDL_Delay(10);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void BaseScene::HandleEvents() {
-	SDL_Event event;
-
-	while(SDL_PollEvent(&event)) {
-		switch(event.type) {
-			case SDL_QUIT:
-				QuitEvent();
-			break;
-
-			case SDL_VIDEORESIZE:
-				SetScreen(event.resize.w, event.resize.h, 0, screen->flags);
-			break;
-
-			case SDL_MOUSEMOTION:
-				MouseMotion(event.motion);
-			break;
-
-			case SDL_MOUSEBUTTONDOWN:
-				MouseButtonDown(event.button);
-			break;
-
-			case SDL_MOUSEBUTTONUP:
-				MouseButtonUp(event.button);
-			break;
-
-			case SDL_KEYDOWN:
-				KeyDown(event.key);
-			break;
-
-			case SDL_KEYUP:
-				KeyUp(event.key);
-			break;
-
-#ifdef USE_EVENT_JOYSTICK
-			//TODO: joystick/gamepad support
-#endif
-
-#ifdef USE_EVENT_UNKNOWN
-			default:
-				UnknownEvent(event);
-			break;
-#endif
-		}//switch
-	}//while
-}

client/scenes/base_scene.hpp

@@ -1,74 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 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();
-	virtual void RenderFrame();
-
-protected:
-	virtual void FrameStart() {}
-	virtual void HandleEvents();
-	virtual void Update() {}
-	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/combat.cpp

@@ -0,0 +1,77 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "combat.hpp"
+
+//Public access members
+Combat::Combat(int* const argClientIndex, int* const argAccountIndex) {
+	//
+}
+
+Combat::~Combat() {
+	//
+}
+
+void Combat::RenderFrame(SDL_Renderer* renderer) {
+	//
+}
+
+//frame phases
+void Combat::FrameStart() {
+	//
+}
+
+void Combat::Update() {
+	//
+}
+
+void Combat::FrameEnd() {
+	//
+}
+
+//input events
+void Combat::QuitEvent() {
+	//
+}
+
+void Combat::MouseMotion(SDL_MouseMotionEvent const& event) {
+	//
+}
+
+void Combat::MouseButtonDown(SDL_MouseButtonEvent const& event) {
+	//
+}
+
+void Combat::MouseButtonUp(SDL_MouseButtonEvent const& event) {
+	//
+}
+
+void Combat::MouseWheel(SDL_MouseWheelEvent const& event) {
+	//
+}
+
+void Combat::KeyDown(SDL_KeyboardEvent const& event) {
+	//
+}
+
+void Combat::KeyUp(SDL_KeyboardEvent const& event) {
+	//
+}

client/scenes/combat.hpp

@@ -0,0 +1,48 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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 "base_scene.hpp"
+
+class Combat: public BaseScene {
+public:
+	//Public access members
+	Combat(int* const argClientIndex, int* const argAccountIndex);
+	~Combat();
+
+	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;
+};

client/scenes/disconnected_screen.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -25,8 +25,11 @@
 #include "config_utility.hpp"
 #include "udp_network_utility.hpp"
 
+#include <sstream>
 #include <stdexcept>
 
+constexpr SDL_Color WHITE = {255, 255, 255, 255};
+
 //-------------------------
 //Public access members
 //-------------------------
@@ -35,20 +38,29 @@ DisconnectedScreen::DisconnectedScreen() {
 	ConfigUtility& config = ConfigUtility::GetSingleton();
 
 	//setup the utility objects
-	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+	//TODO: (1) resource tool, to prevent reloading like this
+	image.Load(GetRenderer(), config["dir.interface"] + "button_blue.png");
+	font = TTF_OpenFont(config["client.font"].c_str(), 12);
 
-	//pass the utility objects
-	backButton.SetImage(&image);
-	backButton.SetFont(&font);
+	//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, WHITE, "Back");
 
 	//set the button positions
 	backButton.SetX(50);
-	backButton.SetY(50 + image.GetClipH() * 0);
+	backButton.SetY(50);
 
-	//set the button texts
-	backButton.SetText("Back");
+	//set the disconnection message text
+	textLine.SetX(50);
+	textLine.SetY(30);
+	textLine.SetText(GetRenderer(), font, WHITE, config["client.disconnectMessage"]);
 
 	//full reset
 	UDPNetworkUtility::GetSingleton().Unbind(Channels::SERVER);
@@ -58,59 +70,65 @@ DisconnectedScreen::DisconnectedScreen() {
 }
 
 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)) {
-		SetNextScene(SceneList::MAINMENU);
+		SetSceneSignal(SceneSignal::MAINMENU);
 	}
 
 	//Eat incoming packets
 	while(UDPNetworkUtility::GetSingleton().Receive());
 }
 
-void DisconnectedScreen::Render(SDL_Surface* const screen) {
-	ConfigUtility& config = ConfigUtility::GetSingleton();
+void DisconnectedScreen::FrameEnd() {
+	//
+}
 
-	backButton.DrawTo(screen);
-	font.DrawStringTo(config["client.disconnectMessage"], screen, 50, 30);
+void DisconnectedScreen::RenderFrame(SDL_Renderer* renderer) {
+	backButton.DrawTo(renderer);
+	textLine.DrawTo(renderer);
 }
 
 //-------------------------
 //Event handlers
 //-------------------------
 
-void DisconnectedScreen::QuitEvent() {
-	SetNextScene(SceneList::QUIT);
+void DisconnectedScreen::MouseMotion(SDL_MouseMotionEvent const& event) {
+	backButton.MouseMotion(event);
 }
 
-void DisconnectedScreen::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	backButton.MouseMotion(motion);
+void DisconnectedScreen::MouseButtonDown(SDL_MouseButtonEvent const& event) {
+	backButton.MouseButtonDown(event);
 }
 
-void DisconnectedScreen::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	backButton.MouseButtonDown(button);
-}
-
-void DisconnectedScreen::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::MAINMENU);
+void DisconnectedScreen::MouseButtonUp(SDL_MouseButtonEvent const& event) {
+	if (backButton.MouseButtonUp(event) == Button::State::RELEASED) {
+		SetSceneSignal(SceneSignal::MAINMENU);
 	}
 }
 
-void DisconnectedScreen::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
+void DisconnectedScreen::MouseWheel(SDL_MouseWheelEvent const& event) {
+	//
+}
+
+void DisconnectedScreen::KeyDown(SDL_KeyboardEvent const& event) {
+	switch(event.keysym.sym) {
 		case SDLK_ESCAPE:
-			SetNextScene(SceneList::MAINMENU);
+			SetSceneSignal(SceneSignal::MAINMENU);
 		break;
 	}
 }
 
-void DisconnectedScreen::KeyUp(SDL_KeyboardEvent const& key) {
+void DisconnectedScreen::KeyUp(SDL_KeyboardEvent const& event) {
 	//
 }

client/scenes/disconnected_screen.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,18 +19,15 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef DISCONNECTEDSCREEN_HPP_
-#define DISCONNECTEDSCREEN_HPP_
+#pragma once
 
-//graphics
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-
-//client
 #include "base_scene.hpp"
+#include "button.hpp"
+#include "image.hpp"
+#include "text_line.hpp"
+
+#include "SDL2/SDL_ttf.h"
 
-//std namespace
 #include <chrono>
 
 class DisconnectedScreen : public BaseScene {
@@ -39,28 +36,28 @@ public:
 	DisconnectedScreen();
 	~DisconnectedScreen();
 
-protected:
-	//Frame loop
-	void Update();
-	void Render(SDL_Surface* const);
+	void RenderFrame(SDL_Renderer* renderer) 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&);
+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;
 
 	//graphics
 	Image image;
-	RasterFont font;
-
-	//UI
+	TTF_Font* font = nullptr;
 	Button backButton;
+	TextLine textLine;
 
 	//auto return
 	std::chrono::steady_clock::time_point startTick;
 };
-
-#endif

client/scenes/in_world.cpp

@@ -1,538 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "in_world.hpp"
-
-#include "channels.hpp"
-#include "utility.hpp"
-#include "config_utility.hpp"
-
-#include <stdexcept>
-#include <algorithm>
-#include <cmath>
-#include <iostream>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-InWorld::InWorld(int* const argClientIndex,	int* const argAccountIndex):
-	clientIndex(*argClientIndex),
-	accountIndex(*argAccountIndex)
-{
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-
-	//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?
-	//TODO: Tile size and tile sheet should be loaded elsewhere
-	tileSheet.Load(config["dir.tilesets"] + "overworld.bmp", 32, 32);
-
-	//send this player's character info
-	CharacterPacket newPacket;
-	newPacket.type = SerialPacketType::CHARACTER_NEW;
-	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);
-
-	//request a sync
-	RequestSynchronize();
-
-	//debug
-	//
-}
-
-InWorld::~InWorld() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void InWorld::FrameStart() {
-	//
-}
-
-void InWorld::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);
-
-	//update the characters
-	for (auto& it : characterMap) {
-		it.second.Update();
-	}
-
-	//check the map
-	UpdateMap();
-
-	//skip the rest
-	if (!localCharacter) {
-		return;
-	}
-
-	//check for collisions with the map
-	BoundingBox wallBounds = {0, 0, tileSheet.GetTileW(), tileSheet.GetTileH()};
-	const int xCount = localCharacter->GetBounds().w / wallBounds.w + 1;
-	const int yCount = localCharacter->GetBounds().h / wallBounds.h + 1;
-
-	for (int i = -1; i <= xCount; ++i) {
-		for (int j = -1; j <= yCount; ++j) {
-			//set the wall's position
-			wallBounds.x = wallBounds.w * i + snapToBase((double)wallBounds.w, localCharacter->GetOrigin().x);
-			wallBounds.y = wallBounds.h * j + snapToBase((double)wallBounds.h, localCharacter->GetOrigin().y);
-
-			if (!regionPager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
-				continue;
-			}
-
-			if ((localCharacter->GetOrigin() + localCharacter->GetBounds()).CheckOverlap(wallBounds)) {
-				localCharacter->SetOrigin(localCharacter->GetOrigin() - (localCharacter->GetMotion()));
-				localCharacter->SetMotion({0,0});
-				localCharacter->CorrectSprite();
-				SendPlayerUpdate();
-			}
-		}
-	}
-
-	//update the camera
-	camera.x = localCharacter->GetOrigin().x - camera.marginX;
-	camera.y = localCharacter->GetOrigin().y - camera.marginY;
-
-	//check the connection
-	if (Clock::now() - lastBeat > std::chrono::seconds(3)) {
-		if (attemptedBeats > 2) {
-			RequestDisconnect();
-			SetNextScene(SceneList::DISCONNECTEDSCREEN);
-			ConfigUtility::GetSingleton()["client.disconnectMessage"] = "Error: Lost connection to the server";
-		}
-
-		ServerPacket newPacket;
-		newPacket.type = SerialPacketType::PING;
-		network.SendTo(Channels::SERVER, &newPacket);
-
-		attemptedBeats++;
-		lastBeat = Clock::now();
-	}
-}
-
-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;
-	}
-
-	//hotkeys
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			RequestDisconnect();
-		break;
-	}
-
-	//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::PING:
-			HandlePing(static_cast<ServerPacket*>(argPacket));
-		break;
-		case SerialPacketType::PONG:
-			HandlePong(static_cast<ServerPacket*>(argPacket));
-		break;
-		case SerialPacketType::DISCONNECT:
-			HandleDisconnect(static_cast<ClientPacket*>(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::CHARACTER_REJECTION:
-			HandleCharacterRejection(static_cast<TextPacket*>(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::HandlePing(ServerPacket* const argPacket) {
-	ServerPacket newPacket;
-	newPacket.type = SerialPacketType::PONG;
-	network.SendTo(argPacket->srcAddress, &newPacket);
-}
-
-void InWorld::HandlePong(ServerPacket* const argPacket) {
-	if (network.GetIPAddress(Channels::SERVER)->host != argPacket->srcAddress.host) {
-		throw(std::runtime_error("Heartbeat message received from unknown source"));
-	}
-
-	attemptedBeats = 0;
-	lastBeat = Clock::now();
-}
-
-void InWorld::HandleDisconnect(ClientPacket* const argPacket) {
-	//TODO: More needed in the disconnection
-	SetNextScene(SceneList::DISCONNECTEDSCREEN);
-	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have been disconnected";
-}
-
-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
-	BaseCharacter& newCharacter = characterMap[argPacket->characterIndex];
-
-	//fill out the character's members
-	newCharacter.SetHandle(argPacket->handle);
-	newCharacter.SetAvatar(argPacket->avatar);
-
-	newCharacter.GetSprite()->LoadSurface(ConfigUtility::GetSingleton()["dir.sprites"] + newCharacter.GetAvatar(), 4, 4);
-
-	newCharacter.SetOrigin(argPacket->origin);
-	newCharacter.SetMotion(argPacket->motion);
-	newCharacter.SetBounds({
-		CHARACTER_BOUNDS_X,
-		CHARACTER_BOUNDS_Y,
-		CHARACTER_BOUNDS_WIDTH,
-		CHARACTER_BOUNDS_HEIGHT
-	});
-
-//	(*newCharacter.GetBaseStats()) = 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
-		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()) {
-		HandleCharacterNew(argPacket);
-		return;
-	}
-
-	BaseCharacter& character = characterMap[argPacket->characterIndex];
-
-	//other characters moving
-	if (argPacket->characterIndex != characterIndex) {
-		character.SetOrigin(argPacket->origin);
-		character.SetMotion(argPacket->motion);
-		character.CorrectSprite();
-	}
-}
-
-void InWorld::HandleCharacterRejection(TextPacket* const argPacket) {
-	RequestDisconnect();
-	SetNextScene(SceneList::DISCONNECTEDSCREEN);
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-	config["client.disconnectMessage"] = "Error: ";
-	config["client.disconnectMessage"] += argPacket->text;
-}
-
-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->GetBaseStats();
-
-	//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

@@ -1,132 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef INWORLD_HPP_
-#define INWORLD_HPP_
-
-//maps
-#include "region_pager_base.hpp"
-
-//networking
-#include "udp_network_utility.hpp"
-#include "serial_packet.hpp"
-
-//graphics
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-#include "tile_sheet.hpp"
-
-//common
-#include "frame_rate.hpp"
-
-#include "base_character.hpp"
-#include "local_character.hpp"
-
-//client
-#include "base_scene.hpp"
-
-//STL
-#include <map>
-
-#include <chrono>
-
-class InWorld : public BaseScene {
-public:
-	//Public access members
-	InWorld(int* const argClientIndex, int* const argAccountIndex);
-	~InWorld();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update();
-	void FrameEnd();
-	void RenderFrame();
-	void Render(SDL_Surface* const);
-
-	//Event handlers
-	void QuitEvent();
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
-	void KeyDown(SDL_KeyboardEvent const&);
-	void KeyUp(SDL_KeyboardEvent const&);
-
-	//Network handlers
-	void HandlePacket(SerialPacket* const);
-	void HandlePing(ServerPacket* const);
-	void HandlePong(ServerPacket* const);
-	void HandleDisconnect(ClientPacket* const);
-	void HandleCharacterNew(CharacterPacket* const);
-	void HandleCharacterDelete(CharacterPacket* const);
-	void HandleCharacterUpdate(CharacterPacket* const);
-	void HandleCharacterRejection(TextPacket* 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();
-
-	//shared parameters
-	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
-	int& clientIndex;
-	int& accountIndex;
-	int characterIndex = -1;
-	std::map<int, BaseCharacter> characterMap;
-
-	//graphics
-	Image buttonImage;
-	RasterFont font;
-	TileSheet tileSheet;
-
-	//map
-	RegionPagerBase regionPager;
-
-	//UI
-	Button disconnectButton;
-	Button shutDownButton;
-
-	//the camera structure
-	struct {
-		int x = 0, y = 0;
-		int width = 0, height = 0;
-		int marginX = 0, marginY = 0;
-	} camera;
-	FrameRate fps;
-
-	//game
-	BaseCharacter* localCharacter = nullptr;
-
-	//connections
-	//TODO: This needs it's own utility, for both InWorld and InCombat
-	typedef std::chrono::steady_clock Clock;
-	Clock::time_point lastBeat = Clock::now();
-	int attemptedBeats = 0;
-};
-
-#endif

client/scenes/lobby_menu.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -22,9 +22,12 @@
 #include "lobby_menu.hpp"
 
 #include "channels.hpp"
-#include "utility.hpp"
 
+#include <cstring>
 #include <stdexcept>
+#include <sstream>
+
+constexpr SDL_Color WHITE = {255, 255, 255, 255};
 
 //-------------------------
 //Public access members
@@ -39,33 +42,58 @@ LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
 	accountIndex = -1;
 
 	//setup the utility objects
-	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+	buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_blue.png");
+	font = TTF_OpenFont(config["client.font"].c_str(), 12);
 
-	//pass the utility objects
-	search.SetImage(&image);
-	search.SetFont(&font);
-	join.SetImage(&image);
-	join.SetFont(&font);
-	back.SetImage(&image);
-	back.SetFont(&font);
+	//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()));
+	}
 
-	//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);
+	//setup the buttons
+	searchButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
+	searchButton.SetText(GetRenderer(), font, WHITE, "Search");
+	joinButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
+	joinButton.SetText(GetRenderer(), font, WHITE, "Join");
+	backButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
+	backButton.SetText(GetRenderer(), font, WHITE, "Back");
 
-	//set the button texts
-	search.SetText("Search");
-	join.SetText("Join");
-	back.SetText("Back");
+	//set the button positions (assumed)
+	searchButton.SetX(50);
+	searchButton.SetY(50);
+	joinButton.SetX(50);
+	joinButton.SetY(70);
+	backButton.SetX(50);
+	backButton.SetY(90);
 
-	//set the server list's position
-	listBox = {300, 50, 200, font.GetCharH()};
+	//setup the text fields
+	username.SetText(GetRenderer(), font, WHITE, config["client.username"]);
+	password.SetText(GetRenderer(), font, WHITE, config["client.password"]);
+	handle.SetText(GetRenderer(), font, WHITE, config["client.handle"]);
+	avatar.SetText(GetRenderer(), font, WHITE, config["client.avatar"]);
+
+	username.SetBounds(BoundingBox{0, 0, 300, 20});
+	password.SetBounds(BoundingBox{0, 0, 300, 20});
+	handle.SetBounds(BoundingBox{0, 0, 300, 20});
+	avatar.SetBounds(BoundingBox{0, 0, 300, 20});
+
+	username.SetX(50);
+	username.SetY(110);
+	password.SetX(50);
+	password.SetY(130);
+	handle.SetX(50);
+	handle.SetY(150);
+	avatar.SetX(50);
+	avatar.SetY(170);
+
+	//pseudo-list selection
+	//TODO: move this into the UI library?
+	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());
@@ -75,7 +103,7 @@ LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
 }
 
 LobbyMenu::~LobbyMenu() {
-	//
+	TTF_CloseFont(font);
 }
 
 //-------------------------
@@ -99,38 +127,35 @@ void LobbyMenu::FrameEnd() {
 	//
 }
 
-void LobbyMenu::Render(SDL_Surface* const screen) {
-	//TODO: I need a proper UI system for the entire client and the editor
+void LobbyMenu::RenderFrame(SDL_Renderer* renderer) {
+	//TODO: (2) I need a proper UI system for the entire client and the editor
 
 	//UI
-	search.DrawTo(screen);
-	join.DrawTo(screen);
-	back.DrawTo(screen);
+	searchButton.DrawTo(renderer);
+	joinButton.DrawTo(renderer);
+	backButton.DrawTo(renderer);
 
-	//TODO: draw headers for the server list
-	for (int i = 0; i < serverInfo.size(); i++) {
+	username.DrawTo(renderer);
+	password.DrawTo(renderer);
+	handle.DrawTo(renderer);
+	avatar.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 == &serverInfo[i]) {
-			SDL_Rect r = {
-				(Sint16)listBox.x, (Sint16)listBox.y,
-				(Uint16)listBox.w, (Uint16)listBox.h
-			};
-			r.y += i * listBox.h;
-			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 49, 150, 5));
+		if (selection == &serverVector[i]) {
+			highlightImage.DrawTo(renderer, boundingBox.x, boundingBox.y + boundingBox.h * i);
 		}
 
-		//draw the server name
-		font.DrawStringTo(serverInfo[i].name, screen, listBox.x, listBox.y + i*listBox.h);
+		//draw the server's info
+		serverVector[i].nameImage.SetX(boundingBox.x);
+		serverVector[i].nameImage.SetY(boundingBox.y + boundingBox.h * i);
+		serverVector[i].nameImage.DrawTo(renderer);
 
-		//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?
+		serverVector[i].playerCountImage.SetX(boundingBox.x+276);
+		serverVector[i].playerCountImage.SetY(boundingBox.y + boundingBox.h * i);
+		serverVector[i].playerCountImage.DrawTo(renderer);
 	}
 }
 
@@ -138,98 +163,219 @@ void LobbyMenu::Render(SDL_Surface* const screen) {
 //Event handlers
 //-------------------------
 
-void LobbyMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	search.MouseMotion(motion);
-	join.MouseMotion(motion);
-	back.MouseMotion(motion);
+void LobbyMenu::MouseMotion(SDL_MouseMotionEvent const& event) {
+	searchButton.MouseMotion(event);
+	joinButton.MouseMotion(event);
+	backButton.MouseMotion(event);
 }
 
-void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	search.MouseButtonDown(button);
-	join.MouseButtonDown(button);
-	back.MouseButtonDown(button);
+void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& event) {
+	searchButton.MouseButtonDown(event);
+	joinButton.MouseButtonDown(event);
+	backButton.MouseButtonDown(event);
+
+	if (username.MouseButtonDown(event)) {
+		//GUI trick
+		if (!username.GetText().compare(config["client.username"])) {
+			username.SetText(GetRenderer(), font, WHITE, "");
+		}
+		SDL_StartTextInput();
+	}
+	if (password.MouseButtonDown(event)) {
+		//GUI trick
+		if (!password.GetText().compare(config["client.password"])) {
+			password.SetText(GetRenderer(), font, WHITE, "");
+		}
+		SDL_StartTextInput();
+	}
+	if (handle.MouseButtonDown(event)) {
+		//GUI trick
+		if (!handle.GetText().compare(config["client.handle"])) {
+			handle.SetText(GetRenderer(), font, WHITE, "");
+		}
+		SDL_StartTextInput();
+	}
+	if (avatar.MouseButtonDown(event)) {
+		//GUI trick
+		if (!avatar.GetText().compare(config["client.avatar"])) {
+			avatar.SetText(GetRenderer(), font, WHITE, "");
+		}
+		SDL_StartTextInput();
+	}
 }
 
-void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (search.MouseButtonUp(button) == Button::State::HOVER) {
+void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& event) {
+	if (searchButton.MouseButtonUp(event) == Button::State::RELEASED) {
 		SendBroadcastRequest();
 	}
-	else if (join.MouseButtonUp(button) == Button::State::HOVER && selection != nullptr && selection->compatible) {
+	if (joinButton.MouseButtonUp(event) == Button::State::RELEASED && selection && selection->compatible) {
 		SendJoinRequest();
 	}
-	else if (back.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::MAINMENU);
+	if (backButton.MouseButtonUp(event) == Button::State::RELEASED) {
+		SetSceneSignal(SceneSignal::MAINMENU);
 	}
 
 	//has the user selected a server on the list?
-	BoundingBox tmpBox = listBox;
-	tmpBox.h *= serverInfo.size();
-	if (tmpBox.CheckOverlap({button.x, button.y})) {
-		selection = &serverInfo[(button.y - listBox.y)/listBox.h];
+	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::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
+void LobbyMenu::MouseWheel(SDL_MouseWheelEvent const& event) {
+	//
+}
+
+void LobbyMenu::KeyDown(SDL_KeyboardEvent const& event) {
+	switch(event.keysym.sym) {
 		case SDLK_ESCAPE:
-			SetNextScene(SceneList::MAINMENU);
+			SetSceneSignal(SceneSignal::MAINMENU);
+		break;
+
+		case SDLK_BACKSPACE:
+			//easier than mucking about with SDL_TextEditEvent
+			if (username.GetFocus()) {
+				username.PopChars(GetRenderer(), font, WHITE, 1);
+			}
+			if (password.GetFocus()) {
+				password.PopChars(GetRenderer(), font, WHITE, 1);
+			}
+			if (handle.GetFocus()) {
+				handle.PopChars(GetRenderer(), font, WHITE, 1);
+			}
+			if (avatar.GetFocus()) {
+				avatar.PopChars(GetRenderer(), font, WHITE, 1);
+			}
 		break;
 	}
 }
 
-void LobbyMenu::KeyUp(SDL_KeyboardEvent const& key) {
+void LobbyMenu::KeyUp(SDL_KeyboardEvent const& event) {
 	//
 }
 
+void LobbyMenu::TextInput(SDL_TextInputEvent const& event) {
+	if (username.GetFocus()) {
+		username.PushText(GetRenderer(), font, WHITE, std::string(event.text));
+	}
+	if (password.GetFocus()) {
+		password.PushText(GetRenderer(), font, WHITE, std::string(event.text));
+	}
+	if (handle.GetFocus()) {
+		handle.PushText(GetRenderer(), font, WHITE, std::string(event.text));
+	}
+	if (avatar.GetFocus()) {
+		avatar.PushText(GetRenderer(), font, WHITE, std::string(event.text));
+	}
+}
+
 //-------------------------
 //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:
-			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in LobbyMenu: " + to_string_custom(static_cast<int>(argPacket->type)) ));
+		default: {
+			std::ostringstream msg;
+			msg << "Unknown SerialPacketType encountered in LobbyMenu: " << static_cast<int>(argPacket->type);
+			throw(std::runtime_error( msg.str() ));
+		}
 		break;
 	}
 }
 
 void LobbyMenu::HandleBroadcastResponse(ServerPacket* const argPacket) {
 	//extract the data
-	ServerInformation server;
-	server.address = argPacket->srcAddress;
-	server.name = argPacket->name;
-	server.playerCount = argPacket->playerCount;
-	server.version = argPacket->version;
+	ServerInfo newServer;
 
-	//Checking compatibility
-	server.compatible = server.version == NETWORK_VERSION;
+	newServer.address = argPacket->srcAddress;
+	newServer.name = argPacket->name;
+	newServer.playerCount = argPacket->playerCount;
+	newServer.version = argPacket->version;
+	newServer.compatible = newServer.version == NETWORK_VERSION;
 
 	//push
-	serverInfo.push_back(server);
+	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, color, newServer.name);
+	serverVector.back().playerCountImage.SetText(GetRenderer(), font, color, itoa_base10(newServer.playerCount));
 }
 
 void LobbyMenu::HandleJoinResponse(ClientPacket* const argPacket) {
+	//save the server's data
 	clientIndex = argPacket->clientIndex;
-	accountIndex = argPacket->accountIndex;
 	network.Bind(argPacket->srcAddress, Channels::SERVER);
-	SetNextScene(SceneList::INWORLD);
+
+	//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: Better output for join rejection
+	//NOTE: NEVER HAPPENS
+	throw(std::runtime_error("HandleJoinRejection"));
+}
+
+void LobbyMenu::HandleLoginRejection(TextPacket* const argPacket) {
+	config["client.disconnectMessage"] = std::string() + "Join request rejected: " + argPacket->text;
+	SetSceneSignal(SceneSignal::DISCONNECTEDSCREEN);
+
+	//avoid crashes from the heartbeat system
+	ClientPacket newPacket;
+	newPacket.type = SerialPacketType::DISCONNECT_REQUEST;
+	newPacket.clientIndex = clientIndex;
+	network.SendTo(argPacket->srcAddress, &newPacket);
 }
 
 //-------------------------
@@ -237,23 +383,42 @@ void LobbyMenu::HandleJoinRejection(TextPacket* const argPacket) {
 //-------------------------
 
 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);
+	//broadcast to the home server, and to the LAN
+	ClientPacket packet;
 
-		//reset the server list
-		serverInfo.clear();
-		selection = nullptr;
+	packet.type = SerialPacketType::BROADCAST_REQUEST;
+	network.SendTo(config["server.home"].c_str(), config.Int("server.port"), &packet);
+	network.SendTo(config["server.host"].c_str(), config.Int("server.port"), &packet);
+
+	//reset the server list
+	serverVector.clear();
+	selection = nullptr;
 }
 
 void LobbyMenu::SendJoinRequest() {
+	//BUG: 101 received in LobbyMenu on failed join
 	//pack the packet
-		ClientPacket packet;
-		packet.type = SerialPacketType::JOIN_REQUEST;
-		strncpy(packet.username, config["client.username"].c_str(), PACKET_STRING_SIZE);
+	ClientPacket packet;
+	packet.type = SerialPacketType::JOIN_REQUEST;
 
-		//join the selected server
-		network.SendTo(selection->address, &packet);
-		selection = nullptr;
+	//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, username.GetText().c_str(), PACKET_STRING_SIZE+1);
+
+	network.SendTo(Channels::SERVER, &packet);
+
+	//TODO: remove
+	config["client.username"] = username.GetText();
+	config["client.password"] = password.GetText();
+	config["client.handle"] = handle.GetText();
+	config["client.avatar"] = avatar.GetText();
 }

client/scenes/lobby_menu.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,14 +19,16 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef LOBBYMENU_HPP_
-#define LOBBYMENU_HPP_
+#pragma once
 
 //graphics & ui
 #include "image.hpp"
-#include "raster_font.hpp"
 #include "button.hpp"
 #include "bounding_box.hpp"
+#include "text_field.hpp"
+#include "text_line.hpp"
+
+#include "SDL2/SDL_ttf.h"
 
 //utilities
 #include "config_utility.hpp"
@@ -45,29 +47,35 @@ public:
 	LobbyMenu(int* const argClientIndex, int* const argAccountIndex);
 	~LobbyMenu();
 
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update();
-	void FrameEnd();
-	void Render(SDL_Surface* const);
+	void RenderFrame(SDL_Renderer* renderer) 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&);
+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;
+	void TextInput(SDL_TextInputEvent 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();
@@ -75,15 +83,13 @@ protected:
 	int& clientIndex;
 	int& accountIndex;
 
-	//members
-	Image image;
-	RasterFont font;
-	Button search;
-	Button join;
-	Button back;
+	//define the list object
+	struct ServerInfo {
+		//graphics
+		TextLine nameImage;
+		TextLine playerCountImage;
 
-	//server list
-	struct ServerInformation {
+		//networking
 		IPaddress address;
 		std::string name;
 		int playerCount;
@@ -91,12 +97,20 @@ protected:
 		bool compatible;
 	};
 
-	std::vector<ServerInformation> serverInfo;
+	//members
+	Image buttonImage;
+	Image highlightImage;
+	TTF_Font* font = nullptr;
+	Button searchButton;
+	Button joinButton;
+	Button backButton;
+	TextField username;
+	TextField password;
+	TextField handle;
+	TextField avatar;
 
-	//NOTE: a terrible hack
-	//I'd love a proper gui system for this
-	BoundingBox listBox;
-	ServerInformation* selection = nullptr;
+	std::vector<ServerInfo> serverVector;
+	ServerInfo* selection = nullptr;
+
+	BoundingBox boundingBox;
 };
-
-#endif

client/scenes/main_menu.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -23,6 +23,11 @@
 
 #include "config_utility.hpp"
 
+#include <sstream>
+#include <stdexcept>
+
+constexpr SDL_Color WHITE = {255, 255, 255, 255};
+
 //-------------------------
 //Public access members
 //-------------------------
@@ -31,37 +36,49 @@ MainMenu::MainMenu() {
 	ConfigUtility& config = ConfigUtility::GetSingleton();
 
 	//setup the utility objects
-	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+	buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_blue.png");
+	font = TTF_OpenFont(config["client.font"].c_str(), 12);
 
-	//pass the utility objects
-	startButton.SetImage(&image);
-	startButton.SetFont(&font);
-	optionsButton.SetImage(&image);
-	optionsButton.SetFont(&font);
-	quitButton.SetImage(&image);
-	quitButton.SetFont(&font);
+	//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, WHITE, "Start");
+	optionsButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
+	optionsButton.SetText(GetRenderer(), font, WHITE, "Options");
+	quitButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
+	quitButton.SetText(GetRenderer(), font, WHITE, "Quit");
 
 	//set the button positions
 	startButton.SetX(50);
-	startButton.SetY(50 + image.GetClipH() * 0);
+	startButton.SetY(50 + 20 * 0);
 	optionsButton.SetX(50);
-	optionsButton.SetY(50 + image.GetClipH() * 1);
+	optionsButton.SetY(50 + 20 * 1);
 	quitButton.SetX(50);
-	quitButton.SetY(50 + image.GetClipH() * 2);
+	quitButton.SetY(50 + 20 * 2);
 
-	//set the button texts
-	startButton.SetText("Start");
-	optionsButton.SetText("Options");
-	quitButton.SetText("Quit");
+	//text box
+	int h = -1;
+	SDL_RenderGetLogicalSize(GetRenderer(), nullptr, &h);
+
+	textBox.SetX(50);
+	textBox.SetY(h-100);
+
+	textBox.PushLine(GetRenderer(), font, WHITE, "Thanks for playing!");
+	textBox.PushLine(GetRenderer(), font, WHITE, "You can get the latest version at: ");
+	textBox.PushLine(GetRenderer(), font, WHITE, "krgamestudios.com"); //TODO: (9) click to open the website/update
 
 	//debug
 	//
 }
 
 MainMenu::~MainMenu() {
-	//
+	TTF_CloseFont(font);
 }
 
 //-------------------------
@@ -80,45 +97,54 @@ void MainMenu::FrameEnd() {
 	//
 }
 
-void MainMenu::Render(SDL_Surface* const screen) {
-	startButton.DrawTo(screen);
-	optionsButton.DrawTo(screen);
-	quitButton.DrawTo(screen);
+void MainMenu::RenderFrame(SDL_Renderer* renderer) {
+	startButton.DrawTo(renderer);
+	optionsButton.DrawTo(renderer);
+	quitButton.DrawTo(renderer);
+	textBox.DrawTo(renderer);
 }
 
 //-------------------------
 //Event handlers
 //-------------------------
 
-void MainMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	startButton.MouseMotion(motion);
-	optionsButton.MouseMotion(motion);
-	quitButton.MouseMotion(motion);
+void MainMenu::MouseMotion(SDL_MouseMotionEvent const& event) {
+	startButton.MouseMotion(event);
+	optionsButton.MouseMotion(event);
+	quitButton.MouseMotion(event);
 }
 
-void MainMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	startButton.MouseButtonDown(button);
-	optionsButton.MouseButtonDown(button);
-	quitButton.MouseButtonDown(button);
+void MainMenu::MouseButtonDown(SDL_MouseButtonEvent const& event) {
+	startButton.MouseButtonDown(event);
+	optionsButton.MouseButtonDown(event);
+	quitButton.MouseButtonDown(event);
 }
 
-void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	//TODO: Buttons should only register as "selected" when the left button is used
-	if (startButton.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::LOBBYMENU);
+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(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::OPTIONSMENU);
+	if (optionsButton.MouseButtonUp(event) == Button::State::RELEASED) {
+		SetSceneSignal(SceneSignal::OPTIONSMENU);
 	}
-	if (quitButton.MouseButtonUp(button) == Button::State::HOVER) {
+	if (quitButton.MouseButtonUp(event) == Button::State::RELEASED) {
 		QuitEvent();
 	}
 }
 
-void MainMenu::KeyDown(SDL_KeyboardEvent const& key) {
+void MainMenu::MouseWheel(SDL_MouseWheelEvent const& event) {
 	//
 }
 
-void MainMenu::KeyUp(SDL_KeyboardEvent const& key) {
+void MainMenu::KeyDown(SDL_KeyboardEvent const& event) {
 	//
 }
+
+void MainMenu::KeyUp(SDL_KeyboardEvent const& event) {
+	switch(event.keysym.sym) {
+		case SDLK_ESCAPE:
+			QuitEvent();
+		break;
+	}
+}

client/scenes/main_menu.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,14 +19,14 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef MAINMENU_HPP_
-#define MAINMENU_HPP_
+#pragma once
 
 #include "base_scene.hpp"
-
-#include "image.hpp"
-#include "raster_font.hpp"
 #include "button.hpp"
+#include "image.hpp"
+#include "text_box.hpp"
+
+#include "SDL2/SDL_ttf.h"
 
 class MainMenu : public BaseScene {
 public:
@@ -34,26 +34,27 @@ public:
 	MainMenu();
 	~MainMenu();
 
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update();
-	void FrameEnd();
-	void Render(SDL_Surface* const);
+	void RenderFrame(SDL_Renderer* renderer) 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&);
+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;
 
 	//members
-	Image image;
-	RasterFont font;
+	Image buttonImage;
+	TTF_Font* font = nullptr;
 	Button startButton;
 	Button optionsButton;
 	Button quitButton;
+	TextBox textBox;
 };
-
-#endif

client/scenes/makefile

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

client/scenes/options_menu.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -23,6 +23,11 @@
 
 #include "config_utility.hpp"
 
+#include <sstream>
+#include <stdexcept>
+
+constexpr SDL_Color WHITE = {255, 255, 255, 255};
+
 //-------------------------
 //Public access members
 //-------------------------
@@ -31,24 +36,32 @@ OptionsMenu::OptionsMenu() {
 	ConfigUtility& config = ConfigUtility::GetSingleton();
 
 	//setup the utility objects
-	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+	buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_blue.png");
+	font = TTF_OpenFont(config["client.font"].c_str(), 12);
 
-	//pass the utility objects
-	backButton.SetImage(&image);
-	backButton.SetFont(&font);
+	//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, WHITE, "Back");
 
 	//set the button positions
 	backButton.SetX(50);
-	backButton.SetY(50 + image.GetClipH() * 0);
+	backButton.SetY(50);
 
-	//set the button texts
-	backButton.SetText("Back");
+	//text line
+	textLine.SetX(50);
+	textLine.SetY(30);
+	textLine.SetText(GetRenderer(), font, WHITE, "Am I making any progress?");
 }
 
 OptionsMenu::~OptionsMenu() {
-	//
+	TTF_CloseFont(font);
 }
 
 //-------------------------
@@ -67,38 +80,41 @@ 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);
+void OptionsMenu::RenderFrame(SDL_Renderer* renderer) {
+	backButton.DrawTo(renderer);
+	textLine.DrawTo(renderer);
 }
 
 //-------------------------
 //Event handlers
 //-------------------------
 
-void OptionsMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	backButton.MouseMotion(motion);
+void OptionsMenu::MouseMotion(SDL_MouseMotionEvent const& event) {
+	backButton.MouseMotion(event);
 }
 
-void OptionsMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	backButton.MouseButtonDown(button);
+void OptionsMenu::MouseButtonDown(SDL_MouseButtonEvent const& event) {
+	backButton.MouseButtonDown(event);
 }
 
-void OptionsMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::MAINMENU);
+void OptionsMenu::MouseButtonUp(SDL_MouseButtonEvent const& event) {
+	if (backButton.MouseButtonUp(event) == Button::State::RELEASED) {
+		SetSceneSignal(SceneSignal::MAINMENU);
 	}
 }
 
-void OptionsMenu::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
+void OptionsMenu::MouseWheel(SDL_MouseWheelEvent const& event) {
+	//
+}
+
+void OptionsMenu::KeyDown(SDL_KeyboardEvent const& event) {
+	switch(event.keysym.sym) {
 		case SDLK_ESCAPE:
-			SetNextScene(SceneList::MAINMENU);
+			SetSceneSignal(SceneSignal::MAINMENU);
 		break;
 	}
 }
 
-void OptionsMenu::KeyUp(SDL_KeyboardEvent const& key) {
+void OptionsMenu::KeyUp(SDL_KeyboardEvent const& event) {
 	//
 }

client/scenes/options_menu.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,40 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef OPTIONSMENU_HPP_
-#define OPTIONSMENU_HPP_
+#pragma once
+
+#include "button.hpp"
+#include "image.hpp"
+#include "text_line.hpp"
 
 #include "base_scene.hpp"
 
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-
-//TODO: The options screen needs to be USED
+//NOTE: The options screen needs to be USED
 class OptionsMenu : public BaseScene {
 public:
 	//Public access members
 	OptionsMenu();
 	~OptionsMenu();
 
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update();
-	void FrameEnd();
-	void Render(SDL_Surface* const);
+	void RenderFrame(SDL_Renderer* renderer) 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&);
+private:
+	//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;
 
 	//members
-	Image image;
-	RasterFont font;
+	Image buttonImage;
+	TTF_Font* font = nullptr;
 	Button backButton;
+	TextLine textLine;
 };
-
-#endif

client/scenes/splash_screen.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -27,8 +27,14 @@
 //Public access members
 //-------------------------
 
-SplashScreen::SplashScreen() {
-	logo.LoadSurface(ConfigUtility::GetSingleton()["dir.logos"] + "krstudios.bmp");
+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");
+
 	startTick = std::chrono::steady_clock::now();
 }
 
@@ -40,12 +46,16 @@ SplashScreen::~SplashScreen() {
 //Frame loop
 //-------------------------
 
-void SplashScreen::Update() {
-	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(1)) {
-		SetNextScene(SceneList::MAINMENU);
+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::Render(SDL_Surface* const screen) {
-	logo.DrawTo(screen, (screen->w - logo.GetClipW()) / 2, (screen->h - logo.GetClipH()) / 2);
+void SplashScreen::RenderFrame(SDL_Renderer* renderer) {
+	//TODO: version information
+	int w = 0, h = 0;
+	SDL_RenderGetLogicalSize(renderer, &w, &h);
+	logo.DrawTo(renderer, (w - logo.GetClipW()) / 2, (h - logo.GetClipH()) / 2);
 }

client/scenes/splash_screen.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,11 +19,9 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SPLASHSCREEN_HPP_
-#define SPLASHSCREEN_HPP_
+#pragma once
 
 #include "base_scene.hpp"
-
 #include "image.hpp"
 
 #include <chrono>
@@ -31,17 +29,20 @@
 class SplashScreen : public BaseScene {
 public:
 	//Public access members
-	SplashScreen();
+	SplashScreen(SDL_Window*);
 	~SplashScreen();
 
-protected:
+	void RenderFrame(SDL_Renderer* renderer) override;
+
+private:
 	//Frame loop
-	void Update();
-	void Render(SDL_Surface* const);
+	void FrameStart() override;
 
 	//members
 	std::chrono::steady_clock::time_point startTick;
 	Image logo;
-};
 
-#endif
+	//screws with the window
+	SDL_Window* window = nullptr;
+	int windowWidth, windowHeight;
+};

client/scenes/world.hpp

@@ -0,0 +1,171 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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 "barrier_manager.hpp"
+#include "base_scene.hpp"
+#include "base_barrier.hpp"
+#include "base_creature.hpp"
+#include "heartbeat_utility.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);
+
+	//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 hCharacterUnload(CharacterPacket* const);
+	void hQueryCharacterExists(CharacterPacket* const);
+	void hCharacterMovement(CharacterPacket* const);
+	void hCharacterRejection(TextPacket* const);
+
+	//creature management
+	void hCreatureUpdate(CreaturePacket* const);
+	void hCreatureCreate(CreaturePacket* const);
+	void hCreatureUnload(CreaturePacket* const);
+	void hQueryCreatureExists(CreaturePacket* const);
+	void hCreatureMovement(CreaturePacket* const);
+
+	//barrier management
+	void hBarrierUpdate(BarrierPacket* const);
+	void hBarrierCreate(BarrierPacket* const);
+	void hBarrierUnload(BarrierPacket* const);
+	void hQueryBarrierExists(BarrierPacket* const);
+
+	//chat
+	//TODO: ui chat engine
+	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
+	BarrierManager barrierMgr;
+	std::map<int, BaseCharacter> characterMap;
+	std::map<int, BaseCreature> creatureMap;
+	LocalCharacter* localCharacter = nullptr;
+
+	//heartbeat
+	HeartbeatUtility heartbeatUtility;
+	typedef std::chrono::steady_clock Clock;
+	Clock::time_point queryTime = Clock::now() - std::chrono::seconds(4); //back 4 seconds to trigger automatically
+
+	//ugly references; I hate this
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
+};

client/sprite_sheet.cpp

@@ -0,0 +1,186 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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 <sstream>
+#include <stdexcept>
+
+SpriteSheet& SpriteSheet::operator=(SpriteSheet const& rhs) {
+	//don't screw yourself
+	if (this == &rhs) {
+		return *this;
+	}
+
+	Free();
+
+	//Copy the other SpriteSheet's stuff
+	texture = rhs.texture;
+	clip = rhs.clip;
+	local = false;
+	countX = rhs.countX;
+	countY = rhs.countY;
+	indexX = rhs.indexX;
+	indexY = rhs.indexY;
+	delay = rhs.delay;
+	tick = rhs.tick;
+}
+
+SpriteSheet& SpriteSheet::operator=(SpriteSheet&& rhs) {
+	//don't screw yourself
+	if (this == &rhs) {
+		return *this;
+	}
+
+	Free();
+
+	//Steal the other SpriteSheet's stuff
+	texture = rhs.texture;
+	clip = rhs.clip;
+	local = rhs.local;
+	countX = rhs.countX;
+	countY = rhs.countY;
+	indexX = rhs.indexX;
+	indexY = rhs.indexY;
+	delay = rhs.delay;
+	tick = rhs.tick;
+
+	rhs.texture = nullptr;
+	rhs.clip = {0, 0, 0, 0};
+	rhs.local = false;
+	rhs.countX = 0;
+	rhs.countY = 0;
+	rhs.indexX = 0;
+	rhs.indexY = 0;
+	rhs.delay = 0.0;
+	rhs.tick = 0.0;
+}
+
+void SpriteSheet::Update(double delta) {
+	//if the delay has passed
+	if (delay && (tick += delta) >= delay) {
+		//if the index is out of bounds
+		if (++indexX >= countX) {
+			indexX = 0;
+		}
+		tick = 0;
+	}
+	//modify area drawn
+	clip.x = indexX * clip.w;
+	clip.y = indexY * clip.h;
+}
+
+SDL_Texture* SpriteSheet::Load(SDL_Renderer* r, std::string fname, Uint16 cx, Uint16 cy) {
+	//call the base function
+	Image::Load(r, fname);
+
+	//set the metadata
+	countX = cx;
+	countY = cy;
+
+	//assume clip.x and clip.y were set to the size of the texture
+	//reduce the w & h to the size of one cell
+	clip.w = clip.w / countX;
+	clip.h = clip.h / countY;
+
+	indexX = indexY = 0;
+	delay = tick = 0.0;
+
+	return texture;
+}
+
+SDL_Texture* SpriteSheet::Create(SDL_Renderer* r, Uint16 w, Uint16 h, Uint16 cx, Uint16 cy) {
+	//call the base function
+	Image::Create(r, w, h);
+
+	//set the metadata
+	countX = cx;
+	countY = cy;
+
+	//assume clip.x and clip.y were set to the size of the texture
+	//reduce the w & h to the size of one cell
+	clip.w = clip.w / countX;
+	clip.h = clip.h / countY;
+
+	indexX = indexY = 0;
+	delay = tick = 0.0;
+
+	return texture;
+}
+
+SDL_Texture* SpriteSheet::SetTexture(SDL_Texture* ptr, Uint16 cx, Uint16 cy) {
+	//call the base function
+	Image::SetTexture(ptr);
+
+	//set the metadata
+	countX = cx;
+	countY = cy;
+
+	//assume clip.x and clip.y were set to the size of the texture
+	//reduce the w & h to the size of one cell
+	clip.w = clip.w / countX;
+	clip.h = clip.h / countY;
+
+	indexX = indexY = 0;
+	delay = tick = 0.0;
+
+	return texture;
+}
+
+void SpriteSheet::Free() {
+	Image::Free();
+	countX = countY = 0;
+	indexX = indexY = 0;
+	delay = tick = 0.0;
+}
+
+Uint16 SpriteSheet::SetCountX(Uint16 i) {
+	indexX = 0;
+	return countX = i;
+}
+
+Uint16 SpriteSheet::SetCountY(Uint16 i) {
+	indexY = 0;
+	return countY = i;
+}
+
+Uint16 SpriteSheet::SetIndexX(Uint16 i) {
+	if (i > countX) {
+		std::ostringstream msg;
+		msg << "Cannot set index 'x' to " << i;
+		throw(std::out_of_range(msg.str()));
+	}
+	return indexX = i;
+}
+
+Uint16 SpriteSheet::SetIndexY(Uint16 i) {
+	if (i > countY) {
+		std::ostringstream msg;
+		msg << "Cannot set index 'y' to " << i;
+		throw(std::invalid_argument(msg.str()));
+	}
+	return indexY = i;
+}
+
+double SpriteSheet::SetDelay(double d) {
+	tick = 0;
+	return delay = d;
+}

client/sprite_sheet.hpp

@@ -0,0 +1,70 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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 "image.hpp"
+
+class SpriteSheet : public Image {
+public:
+	SpriteSheet() = default;
+	SpriteSheet(SpriteSheet const& rhs) { *this = rhs; }
+	SpriteSheet(SpriteSheet&& rhs) { *this = std::move(rhs); }
+	SpriteSheet(SDL_Renderer* r, std::string fname, Uint16 cx, Uint16 cy)
+		{ Load(r, fname, cx, cy); }
+	SpriteSheet(SDL_Renderer* r, Uint16 w, Uint16 h, Uint16 cx, Uint16 cy)
+		{ Create(r, w, h, cx, cy); }
+	SpriteSheet(SDL_Texture* p, Uint16 cx, Uint16 cy)
+		{ SetTexture(p, cx, cy); }
+	~SpriteSheet() = default;
+
+	SpriteSheet& operator=(SpriteSheet const&);
+	SpriteSheet& operator=(SpriteSheet&&);
+
+	void Update(double delta);
+
+	SDL_Texture* Load(SDL_Renderer*, std::string fname, Uint16 cx, Uint16 cy);
+	SDL_Texture* Create(SDL_Renderer*, Uint16 w, Uint16 h, Uint16 cx, Uint16 cy);
+	SDL_Texture* SetTexture(SDL_Texture*, Uint16 cx, Uint16 cy);
+	void Free() override;
+
+	Uint16 SetCountX(Uint16);
+	Uint16 SetCountY(Uint16);
+	Uint16 SetIndexX(Uint16);
+	Uint16 SetIndexY(Uint16);
+
+	Uint16 GetCountX() const { return countX; }
+	Uint16 GetCountY() const { return countY; }
+	Uint16 GetIndexX() const { return indexX; }
+	Uint16 GetIndexY() const { return indexY; }
+
+	double SetDelay(double d);
+	double GetDelay() const { return delay; }
+
+private:
+	Uint16 countX = 0, countY = 0, indexX = 0, indexY = 0;
+	double delay = 0.0, tick = 0.0;
+
+	//disable access
+	using Image::Load;
+	using Image::Create;
+	using Image::SetTexture;
+};

common/debugging/frame_rate.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef FRAMERATE_HPP_
-#define FRAMERATE_HPP_
+#pragma once
 
 #include <chrono>
 
@@ -29,20 +28,23 @@ public:
 	typedef std::chrono::high_resolution_clock Clock;
 
 	FrameRate() = default;
+
+	//DOCS: for usage purposes, this returns -1 unless a new framerate value is set
 	int Calculate() {
 		frameCount++;
 		if (Clock::now() - tick >= std::chrono::duration<int>(1)) {
 			lastFrameRate = frameCount;
 			frameCount = 0;
 			tick = Clock::now();
+			return lastFrameRate;
 		}
-		return lastFrameRate;
+		return -1;
 	}
+
 	int GetFrameRate() { return lastFrameRate; }
+
 private:
 	int frameCount = 0;
 	int lastFrameRate = 0;
 	Clock::time_point tick = Clock::now();
 };
-
-#endif

common/debugging/makefile

@@ -10,10 +10,6 @@ CXXSRC=$(wildcard *.cpp)
 OBJDIR=obj
 OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
 
-#output
-OUTDIR=../..
-OUT=$(addprefix $(OUTDIR)/,libcommon.a)
-
 #targets
 all: $(OBJ) $(OUT)
 	ar -crs $(OUT) $(OBJ)
@@ -30,8 +26,3 @@ $(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 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -39,7 +39,7 @@ void Timer::Stop() {
 
 std::ostream& operator<<(std::ostream& os, Timer& t) {
 	os << t.GetName() << ": ";
-	os << std::chrono::duration_cast<std::chrono::milliseconds>(t.GetTime()).count();
-	os << "ms";
+	os << std::chrono::duration_cast<std::chrono::microseconds>(t.GetTime()).count();
+	os << "us";
 	return os;
 }

common/debugging/timer.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef TIMER_HPP_
-#define TIMER_HPP_
+#pragma once
 
 #include <chrono>
 #include <string>
@@ -34,8 +33,8 @@ public:
 	Timer(std::string s);
 	~Timer() = default;
 
-	inline void Start();
-	inline void Stop();
+	void Start();
+	void Stop();
 
 	//accessors and mutators
 	Clock::duration GetTime() { return timeSpan; }
@@ -50,5 +49,3 @@ private:
 };
 
 std::ostream& operator<<(std::ostream& os, Timer& t);
-
-#endif

common/global_defines/barrier_defines.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,10 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "renderable.hpp"
+#pragma once
 
-void Renderable::Update() {
-	origin += motion;
-	sprite.Update(0.016);
-}
-
-void Renderable::DrawTo(SDL_Surface* const dest, int camX, int camY) {
-	sprite.DrawTo(dest, origin.x - camX, origin.y - camY);
-}
+//the bounds for the objects, mapped to the default sprites
+constexpr int BARRIER_BOUNDS_X = 0;
+constexpr int BARRIER_BOUNDS_Y = 0;
+constexpr int BARRIER_BOUNDS_WIDTH = 96;
+constexpr int BARRIER_BOUNDS_HEIGHT = 96;

common/global_defines/character_defines.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CHARACTERDEFINES_HPP_
-#define CHARACTERDEFINES_HPP_
+#pragma once
 
 #include <cmath>
 
@@ -35,4 +34,6 @@ constexpr int CHARACTER_BOUNDS_Y = 16;
 constexpr int CHARACTER_BOUNDS_WIDTH = 32;
 constexpr int CHARACTER_BOUNDS_HEIGHT = 32;
 
-#endif
+//the character's sprite format
+constexpr int CHARACTER_CELLS_X = 4;
+constexpr int CHARACTER_CELLS_Y = 4;

common/global_defines/creature_defines.hpp

@@ -0,0 +1,39 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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 <cmath>
+
+//the speeds that the characters move
+constexpr double CREATURE_WALKING_SPEED = 1.0;
+constexpr double CREATURE_WALKING_MOD = 1.0/sqrt(2.0);
+constexpr double CREATURE_WALKING_NEGATIVE_MOD = 1.0 - CREATURE_WALKING_MOD;
+
+//the bounds for the character objects, mapped to the default sprites
+constexpr int CREATURE_BOUNDS_X = 0;
+constexpr int CREATURE_BOUNDS_Y = 0;
+constexpr int CREATURE_BOUNDS_WIDTH = 32;
+constexpr int CREATURE_BOUNDS_HEIGHT = 32;
+
+//the character's sprite format
+constexpr int CREATURE_CELLS_X = 4;
+constexpr int CREATURE_CELLS_Y = 4;

common/global_defines/culling_defines.hpp

@@ -0,0 +1,24 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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
+
+constexpr int INFLUENCE_RADIUS = 1000;

common/global_defines/item_type.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,12 +19,14 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGIONAPI_HPP_
-#define REGIONAPI_HPP_
+#pragma once
 
-#include "lua/lua.hpp"
+enum ItemType {
+	//basics
+	POTION = 101,
 
-#define TORTUGA_REGION_NAME "Region"
-LUAMOD_API int openRegionAPI(lua_State* L);
-
-#endif
+	//weapons
+	SWORD = 201,
+	DAGGER = 202,
+	STAFF = 203
+};

common/global_defines/makefile

@@ -10,10 +10,6 @@ CXXSRC=$(wildcard *.cpp)
 OBJDIR=obj
 OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
 
-#output
-OUTDIR=../..
-OUT=$(addprefix $(OUTDIR)/,libcommon.a)
-
 #targets
 all: $(OBJ) $(OUT)
 	ar -crs $(OUT) $(OBJ)
@@ -30,8 +26,3 @@ $(OUTDIR):
 
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all

common/graphics/image.cpp

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

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

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

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

@@ -1,13 +1,26 @@
-all:
+#output
+export OUTDIR=../..
+export OUT=$(addprefix $(OUTDIR)/,libcommon.a)
+
+all: $(OUTDIR)
 	$(MAKE) -C debugging
-	$(MAKE) -C gameplay
-	$(MAKE) -C graphics
-	$(MAKE) -C map
+	$(MAKE) -C global_defines
 	$(MAKE) -C network
-	$(MAKE) -C ui
 	$(MAKE) -C utilities
 
+debug: export CXXFLAGS+=-g
+debug: clean all
+
+$(OUTDIR):
+	mkdir $(OUTDIR)
+
 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

common/map/region.cpp

@@ -1,58 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "region.hpp"
-
-#include <stdexcept>
-#include <cmath>
-#include <cstring>
-
-int snapToBase(int base, int x) {
-	return floor((double)x / base) * base;
-}
-
-Region::Region(int argX, int argY): x(argX), y(argY) {
-	if (x != snapToBase(REGION_WIDTH, x) || y != snapToBase(REGION_HEIGHT, y)) {
-		throw(std::invalid_argument("Region location is off grid"));
-	}
-	memset(tiles, 0, REGION_WIDTH*REGION_HEIGHT*REGION_DEPTH*sizeof(type_t));
-}
-
-Region::Region(Region const& rhs): x(rhs.x), y(rhs.y) {
-	memcpy(tiles, rhs.tiles, REGION_WIDTH*REGION_HEIGHT*REGION_DEPTH*sizeof(type_t));
-	solid = rhs.solid;
-}
-
-Region::type_t Region::SetTile(int x, int y, int z, type_t v) {
-	return tiles[x][y][z] = v;
-}
-
-Region::type_t Region::GetTile(int x, int y, int z) {
-	return tiles[x][y][z];
-}
-
-bool Region::SetSolid(int x, int y, bool b) {
-	return solid[x * REGION_WIDTH + y] = b;
-}
-
-bool Region::GetSolid(int x, int y) {
-	return solid[x * REGION_WIDTH + y];
-}

common/map/region_api.cpp

@@ -1,97 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "region_api.hpp"
-
-#include "region.hpp"
-
-static int setTile(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	int ret = region->SetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1, lua_tointeger(L, 5));
-	lua_pushinteger(L, ret);
-	return 1;
-}
-
-static int getTile(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	int ret = region->GetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1);
-	lua_pushinteger(L, ret);
-	return 1;
-}
-
-static int setSolid(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	bool ret = region->SetSolid(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_toboolean(L, 4));
-	lua_pushboolean(L, ret);
-	return 1;
-}
-
-static int getSolid(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	bool ret = region->GetSolid(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1);
-	lua_pushboolean(L, ret);
-	return 1;
-}
-
-static int getX(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	lua_pushinteger(L, region->GetX());
-	return 1;
-}
-
-static int getY(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	lua_pushinteger(L, region->GetY());
-	return 1;
-}
-
-static int getWidth(lua_State* L) {
-	lua_pushinteger(L, REGION_WIDTH);
-	return 1;
-}
-
-static int getHeight(lua_State* L) {
-	lua_pushinteger(L, REGION_HEIGHT);
-	return 1;
-}
-
-static int getDepth(lua_State* L) {
-	lua_pushinteger(L, REGION_DEPTH);
-	return 1;
-}
-
-static const luaL_Reg regionLib[] = {
-	{"SetTile",setTile},
-	{"GetTile",getTile},
-	{"SetSolid",setSolid},
-	{"GetSolid",getSolid},
-	{"GetX",getX},
-	{"GetY",getY},
-	{"GetWidth",getWidth},
-	{"GetHeight",getHeight},
-	{"GetDepth",getDepth},
-	{nullptr, nullptr}
-};
-
-LUAMOD_API int openRegionAPI(lua_State* L) {
-	luaL_newlib(L, regionLib);
-	return 1;
-}

common/map/region_pager_api.cpp

@@ -1,146 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "region_pager_api.hpp"
-
-#include "region_pager_lua.hpp"
-#include "region.hpp"
-
-//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 int setOnLoad(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetLoadReference());
-	pager->SetLoadReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
-static int setOnSave(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetSaveReference());
-	pager->SetSaveReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
-static int setOnCreate(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetCreateReference());
-	pager->SetCreateReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
-static int setOnUnload(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetUnloadReference());
-	pager->SetUnloadReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
-static const luaL_Reg regionPagerLib[] = {
-	//curry
-	{"SetTile", setTile},
-	{"GetTile", getTile},
-	{"SetSolid", setSolid},
-	{"GetSolid", getSolid},
-
-	//access and control
-	{"GetRegion", getRegion},
-	{"LoadRegion", loadRegion},
-	{"SaveRegion", saveRegion},
-	{"CreateRegion", createRegion},
-	{"UnloadRegion", unloadRegion},
-
-	//triggers
-	{"SetOnLoad",setOnLoad},
-	{"SetOnSave",setOnSave},
-	{"SetOnCreate",setOnCreate},
-	{"SetOnUnload",setOnUnload},
-
-	//sentinel
-	{nullptr, nullptr}
-};
-
-LUAMOD_API int openRegionPagerAPI(lua_State* L) {
-	luaL_newlib(L, regionPagerLib);
-	return 1;
-}

common/map/region_pager_api.hpp

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

common/map/region_pager_base.cpp

@@ -1,99 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "region_pager_base.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) {
-	//EMPTY, intended for override
-	return nullptr;
-}
-
-Region* RegionPagerBase::SaveRegion(int x, int y) {
-	//EMPTY, intended for override
-	return nullptr;
-}
-
-Region* RegionPagerBase::CreateRegion(int x, int y) {
-	if (FindRegion(x, y)) {
-		throw(std::logic_error("Cannot overwrite an existing region"));
-	}
-	regionList.emplace_front(x, y);
-	return &regionList.front();
-}
-
-void RegionPagerBase::UnloadRegion(int x, int y) {
-	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,60 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef REGIONPAGERBASE_HPP_
-#define REGIONPAGERBASE_HPP_
-
-#include "region.hpp"
-
-#include <list>
-
-class RegionPagerBase {
-public:
-	RegionPagerBase() = default;
-	virtual ~RegionPagerBase() { UnloadAll(); };
-
-	//tile manipulation
-	virtual Region::type_t SetTile(int x, int y, int z, Region::type_t v);
-	virtual Region::type_t GetTile(int x, int y, int z);
-
-	//solid manipulation
-	virtual bool SetSolid(int x, int y, int b);
-	virtual bool GetSolid(int x, int y);
-
-	//region manipulation
-	virtual Region* GetRegion(int x, int y);
-	virtual Region* FindRegion(int x, int y);
-	virtual Region* PushRegion(Region* const);
-
-	virtual Region* LoadRegion(int x, int y);
-	virtual Region* SaveRegion(int x, int y);
-	virtual Region* CreateRegion(int x, int y);
-	virtual void UnloadRegion(int x, int y);
-
-	virtual void UnloadAll();
-
-	//accessors & mutators
-	std::list<Region>* GetContainer() { return &regionList; }
-protected:
-	std::list<Region> regionList;
-};
-
-#endif

common/map/region_pager_lua.cpp

@@ -1,179 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "region_pager_lua.hpp"
-
-#include <stdexcept>
-
-Region* RegionPagerLua::LoadRegion(int x, int y) {
-	//get the pager's function from the registry
-	lua_rawgeti(lua, LUA_REGISTRYINDEX, loadRef);
-
-	//check if this function is available
-	if (lua_isnil(lua, -1)) {
-		lua_pop(lua, 1);
-		return nullptr;
-	}
-
-	//something to work on
-	Region tmpRegion(x, y);
-	lua_pushlightuserdata(lua, &tmpRegion);
-
-	//call the funtion, 1 arg, 1 return
-	if (lua_pcall(lua, 1, 1, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
-	}
-
-	//check the return value, success or failure
-	if (lua_toboolean(lua, -1)) {
-		lua_pop(lua, 1);
-		regionList.push_front(tmpRegion);
-		return &regionList.front();
-	}
-	else {
-		lua_pop(lua, 1);
-		return nullptr;
-	}
-}
-
-Region* RegionPagerLua::SaveRegion(int x, int y) {
-	//get the pager's function from the registry
-	lua_rawgeti(lua, LUA_REGISTRYINDEX, saveRef);
-
-	//check if this function is available
-	if (lua_isnil(lua, -1)) {
-		lua_pop(lua, 1);
-		return nullptr;
-	}
-
-	//find the specified region
-	Region* ptr = FindRegion(x, y);
-	if (!ptr) {
-		lua_pop(lua, 1);
-		return nullptr;
-	}
-	lua_pushlightuserdata(lua, ptr);
-
-	//call the function, 1 arg, 1 return
-	if (lua_pcall(lua, 1, 1, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
-	}
-
-	//check the return value, success or failure
-	if (lua_toboolean(lua, -1)) {
-		lua_pop(lua, 1);
-		return ptr;
-	}
-	else {
-		lua_pop(lua, 1);
-		return nullptr;
-	}
-}
-
-Region* RegionPagerLua::CreateRegion(int x, int y) {
-	if (FindRegion(x, y)) {
-		throw(std::logic_error("Cannot overwrite an existing region"));
-	}
-
-	//get the pager's function from the registry
-	lua_rawgeti(lua, LUA_REGISTRYINDEX, createRef);
-
-	//check if this function is available
-	if (lua_isnil(lua, -1)) {
-		lua_pop(lua, 1);
-		return nullptr;
-	}
-
-	//something to work on
-	Region tmpRegion(x, y);
-	lua_pushlightuserdata(lua, &tmpRegion);
-
-	//call the function, 1 arg, 0 return
-	if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
-	}
-
-	//return the new region
-	regionList.push_front(tmpRegion);
-	return &regionList.front();
-}
-
-void RegionPagerLua::UnloadRegion(int x, int y) {
-	//get the pager's function from the registry
-	lua_rawgeti(lua, LUA_REGISTRYINDEX, unloadRef);
-
-	//check if this function is available
-	if (lua_isnil(lua, -1)) {
-		lua_pop(lua, 1);
-		return;
-	}
-
-	//run each region through this lambda
-	regionList.remove_if([&](Region& region) -> bool {
-		if (region.GetX() == x && region.GetY() == y) {
-
-			//push a copy of the function onto the stack with the region
-			lua_pushvalue(lua, -1);
-			lua_pushlightuserdata(lua, &region);
-
-			//call the function, 1 arg, 0 return
-			if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
-				throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
-			}
-
-			//signal to the container
-			return true;
-		}
-		//signal to the container
-		return false;
-	});
-
-	//pop the base copy of the function
-	lua_pop(lua, 1);
-}
-
-void RegionPagerLua::UnloadAll() {
-	//get the pager's function from the registry
-	lua_rawgeti(lua, LUA_REGISTRYINDEX, unloadRef);
-
-	//check if this function is available
-	if (lua_isnil(lua, -1)) {
-		lua_pop(lua, 1);
-		return;
-	}
-
-	for (auto& it : regionList) {
-		//push a copy of the function onto the stack with the region
-		lua_pushvalue(lua, -1);
-		lua_pushlightuserdata(lua, &it);
-
-		//call the function, 1 arg, 0 return
-		if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
-			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
-		}
-	}
-
-	//pop the base copy of the function
-	lua_pop(lua, 1);
-
-	//remove from memory
-	regionList.clear();
-}

common/map/region_pager_lua.hpp

@@ -1,68 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef REGIONPAGERLUA_HPP_
-#define REGIONPAGERLUA_HPP_
-
-#include "region_pager_base.hpp"
-
-#include "lua/lua.hpp"
-
-#include <string>
-
-class RegionPagerLua : public RegionPagerBase {
-public:
-	RegionPagerLua() = default;
-	~RegionPagerLua() = default;
-
-	//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
-	lua_State* SetLuaState(lua_State* L) { return lua = L; }
-	lua_State* GetLuaState() { return lua; }
-
-	//utilities for the API
-	int SetLoadReference(int i) { return loadRef = i; }
-	int SetSaveReference(int i) { return saveRef = i; }
-	int SetCreateReference(int i) { return createRef = i; }
-	int SetUnloadReference(int i) { return unloadRef = i; }
-
-	int GetLoadReference() { return loadRef; }
-	int GetSaveReference() { return saveRef; }
-	int GetCreateReference() { return createRef; }
-	int GetUnloadReference() { return unloadRef; }
-
-protected:
-	lua_State* lua = nullptr;
-
-	int loadRef = LUA_NOREF;
-	int saveRef = LUA_NOREF;
-	int createRef = LUA_NOREF;
-	int unloadRef = LUA_NOREF;
-};
-
-#endif

common/map/tile_sheet.cpp

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

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

common/network/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. packet_types ../gameplay ../map ../utilities
+INCLUDES+=. packet_types ../global_defines ../utilities ../../TurtleGUI ../../TurtleMap
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
@@ -10,10 +10,6 @@ CXXSRC=$(wildcard *.cpp)
 OBJDIR=obj
 OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
 
-#output
-OUTDIR=../..
-OUT=$(addprefix $(OUTDIR)/,libcommon.a)
-
 #targets
 all: $(OBJ) $(OUT)
 	ar -crs $(OUT) $(OBJ)
@@ -31,8 +27,3 @@ $(OUTDIR):
 
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all

common/network/packet_types/barrier_packet.cpp

@@ -0,0 +1,72 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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 "barrier_packet.hpp"
+
+#include "serial_utility.hpp"
+
+void serializeBarrier(void* buffer, BarrierPacket* packet) {
+	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the barrier
+	serialCopy(&buffer, &packet->barrierIndex, sizeof(int));
+
+	//bounds
+	serialCopy(&buffer, &packet->bounds.x, sizeof(int));
+	serialCopy(&buffer, &packet->bounds.y, sizeof(int));
+	serialCopy(&buffer, &packet->bounds.w, sizeof(int));
+	serialCopy(&buffer, &packet->bounds.h, sizeof(int));
+
+
+	//location
+	serialCopy(&buffer, &packet->roomIndex, sizeof(int));
+	serialCopy(&buffer, &packet->origin.x, sizeof(double));
+	serialCopy(&buffer, &packet->origin.y, sizeof(double));
+	serialCopy(&buffer, &packet->motion.x, sizeof(double));
+	serialCopy(&buffer, &packet->motion.y, sizeof(double));
+
+	//graphical data
+	serialCopy(&buffer, packet->status, sizeof(int) * 8);
+}
+
+void deserializeBarrier(void* buffer, BarrierPacket* packet) {
+	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the barrier
+	deserialCopy(&buffer, &packet->barrierIndex, sizeof(int));
+
+	//bounds
+	deserialCopy(&buffer, &packet->bounds.x, sizeof(int));
+	deserialCopy(&buffer, &packet->bounds.y, sizeof(int));
+	deserialCopy(&buffer, &packet->bounds.w, sizeof(int));
+	deserialCopy(&buffer, &packet->bounds.h, sizeof(int));
+
+
+	//location
+	deserialCopy(&buffer, &packet->roomIndex, sizeof(int));
+	deserialCopy(&buffer, &packet->origin.x, sizeof(double));
+	deserialCopy(&buffer, &packet->origin.y, sizeof(double));
+	deserialCopy(&buffer, &packet->motion.x, sizeof(double));
+	deserialCopy(&buffer, &packet->motion.y, sizeof(double));
+
+	//graphical data
+	deserialCopy(&buffer, packet->status, sizeof(int) * 8);
+}

common/network/packet_types/barrier_packet.hpp

@@ -0,0 +1,44 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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 "serial_packet_base.hpp"
+
+#include "bounding_box.hpp"
+#include "vector2.hpp"
+
+struct BarrierPacket : SerialPacketBase {
+	//identify the barrier
+	int barrierIndex;
+	BoundingBox bounds;
+
+	//location
+	int roomIndex;
+	Vector2 origin;
+	Vector2 motion;
+
+	//graphical data: 0 blank, 1 green, 2 red
+	int status[8];
+};
+
+void serializeBarrier(void* buffer, BarrierPacket* packet);
+void deserializeBarrier(void* buffer, BarrierPacket* packet);

common/network/packet_types/character_packet.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -23,8 +23,6 @@
 
 #include "serial_utility.hpp"
 
-#include "serial_statistics.hpp"
-
 void serializeCharacter(void* buffer, CharacterPacket* packet) {
 	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
 
@@ -38,13 +36,17 @@ void serializeCharacter(void* buffer, CharacterPacket* packet) {
 
 	//location
 	serialCopy(&buffer, &packet->roomIndex, sizeof(int));
+
 	serialCopy(&buffer, &packet->origin.x, sizeof(double));
 	serialCopy(&buffer, &packet->origin.y, sizeof(double));
+
 	serialCopy(&buffer, &packet->motion.x, sizeof(double));
 	serialCopy(&buffer, &packet->motion.y, sizeof(double));
 
-	//stats structure
-	serializeStatistics(&buffer, &packet->stats);
+	serialCopy(&buffer, &packet->bounds.x, sizeof(int));
+	serialCopy(&buffer, &packet->bounds.y, sizeof(int));
+	serialCopy(&buffer, &packet->bounds.w, sizeof(int));
+	serialCopy(&buffer, &packet->bounds.h, sizeof(int));
 
 	//gameplay components: equipment, items, buffs, debuffs...
 }
@@ -62,13 +64,17 @@ void deserializeCharacter(void* buffer, CharacterPacket* packet) {
 
 	//location
 	deserialCopy(&buffer, &packet->roomIndex, sizeof(int));
+
 	deserialCopy(&buffer, &packet->origin.x, sizeof(double));
 	deserialCopy(&buffer, &packet->origin.y, sizeof(double));
+
 	deserialCopy(&buffer, &packet->motion.x, sizeof(double));
 	deserialCopy(&buffer, &packet->motion.y, sizeof(double));
 
-	//stats structure
-	deserializeStatistics(&buffer, &packet->stats);
+	deserialCopy(&buffer, &packet->bounds.x, sizeof(int));
+	deserialCopy(&buffer, &packet->bounds.y, sizeof(int));
+	deserialCopy(&buffer, &packet->bounds.w, sizeof(int));
+	deserialCopy(&buffer, &packet->bounds.h, sizeof(int));
 
 	//gameplay components: equipment, items, buffs, debuffs...
 }

common/network/packet_types/character_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,12 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CHARACTERPACKET_HPP_
-#define CHARACTERPACKET_HPP_
+#pragma once
 
 #include "serial_packet_base.hpp"
 
+#include "bounding_box.hpp"
 #include "vector2.hpp"
-#include "statistics.hpp"
 
 struct CharacterPacket : SerialPacketBase {
 	//identify the character
@@ -40,14 +39,8 @@ struct CharacterPacket : SerialPacketBase {
 	int roomIndex;
 	Vector2 origin;
 	Vector2 motion;
-
-	//gameplay
-	Statistics stats;
-
-	//gameplay components: equipment, items, buffs, debuffs...
+	BoundingBox bounds;
 };
 
 void serializeCharacter(void* buffer, CharacterPacket* packet);
 void deserializeCharacter(void* buffer, CharacterPacket* packet);
-
-#endif

common/network/packet_types/client_packet.cpp

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

common/network/packet_types/client_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CLIENTPACKET_HPP_
-#define CLIENTPACKET_HPP_
+#pragma once
 
 #include "serial_packet_base.hpp"
 
@@ -28,9 +27,8 @@ struct ClientPacket : SerialPacketBase {
 	int clientIndex;
 	int accountIndex;
 	char username[PACKET_STRING_SIZE];
+	//TODO: (3) password, auth token
 };
 
 void serializeClient(void* buffer, ClientPacket* packet);
 void deserializeClient(void* buffer, ClientPacket* packet);
-
-#endif

common/network/packet_types/creature_packet.cpp

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

common/network/packet_types/creature_packet.hpp

@@ -0,0 +1,43 @@
+/* Copyright: (c) Kayne Ruse 2013-2016
+ * 
+ * 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 "serial_packet_base.hpp"
+
+#include "bounding_box.hpp"
+#include "vector2.hpp"
+
+struct CreaturePacket : SerialPacketBase {
+	//identify the creature
+	int creatureIndex;
+	char handle[PACKET_STRING_SIZE];
+	char avatar[PACKET_STRING_SIZE];
+	BoundingBox bounds;
+
+	//location
+	int roomIndex;
+	Vector2 origin;
+	Vector2 motion;
+};
+
+void serializeCreature(void* buffer, CreaturePacket* packet);
+void deserializeCreature(void* buffer, CreaturePacket* packet);

common/network/packet_types/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. .. ../../gameplay ../../map ../../utilities
+INCLUDES+=. .. ../../global_defines ../../utilities ../../../TurtleGUI ../../../TurtleMap
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
@@ -10,13 +10,9 @@ CXXSRC=$(wildcard *.cpp)
 OBJDIR=obj
 OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
 
-#output
-OUTDIR=../../..
-OUT=$(addprefix $(OUTDIR)/,libcommon.a)
-
 #targets
 all: $(OBJ) $(OUT)
-	ar -crs $(OUT) $(OBJ)
+	ar -crs ../$(OUT) $(OBJ)
 
 $(OBJ): | $(OBJDIR)
 
@@ -30,8 +26,3 @@ $(OUTDIR):
 
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all

common/network/packet_types/region_packet.cpp

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

common/network/packet_types/region_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGIONPACKET_HPP_
-#define REGIONPACKET_HPP_
+#pragma once
 
 #include "serial_packet_base.hpp"
 
@@ -44,5 +43,3 @@ struct RegionPacket : SerialPacketBase {
 
 void serializeRegion(void* buffer, RegionPacket* packet);
 void deserializeRegion(void* buffer, RegionPacket* packet);
-
-#endif

common/network/packet_types/serial_packet_base.cpp

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

common/network/packet_types/serial_packet_base.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,12 +19,11 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SERIALPACKETBASE_HPP_
-#define SERIALPACKETBASE_HPP_
+#pragma once
 
 #include "serial_packet_type.hpp"
 
-#include "SDL/SDL_net.h"
+#include "SDL2/SDL_net.h"
 
 constexpr int PACKET_STRING_SIZE = 100;
 
@@ -35,5 +34,3 @@ struct SerialPacketBase {
 
 	virtual ~SerialPacketBase() {};
 };
-
-#endif

common/network/packet_types/serial_statistics.cpp

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

common/network/packet_types/serial_statistics.hpp

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

common/network/packet_types/server_packet.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -27,16 +27,16 @@ void serializeServer(void* buffer, ServerPacket* packet) {
 	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
 
 	//identify the server
+	serialCopy(&buffer, &packet->version, sizeof(int));
 	serialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
 	serialCopy(&buffer, &packet->playerCount, sizeof(int));
-	serialCopy(&buffer, &packet->version, sizeof(int));
 }
 
 void deserializeServer(void* buffer, ServerPacket* packet) {
 	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
 
 	//identify the server
+	deserialCopy(&buffer, &packet->version, sizeof(int));
 	deserialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
 	deserialCopy(&buffer, &packet->playerCount, sizeof(int));
-	deserialCopy(&buffer, &packet->version, sizeof(int));
 }

common/network/packet_types/server_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SERVERPACKET_HPP_
-#define SERVERPACKET_HPP_
+#pragma once
 
 #include "serial_packet_base.hpp"
 
@@ -33,5 +32,3 @@ struct ServerPacket : SerialPacketBase {
 
 void serializeServer(void* buffer, ServerPacket* packet);
 void deserializeServer(void* buffer, ServerPacket* packet);
-
-#endif

common/network/packet_types/text_packet.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -29,6 +29,12 @@ void serializeText(void* buffer, TextPacket* packet) {
 	//content
 	serialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
 	serialCopy(&buffer, packet->text, PACKET_STRING_SIZE);
+
+	//location
+	serialCopy(&buffer, &packet->roomIndex, sizeof(int));
+	serialCopy(&buffer, &packet->origin.x, sizeof(double));
+	serialCopy(&buffer, &packet->origin.y, sizeof(double));
+	serialCopy(&buffer, &packet->range, sizeof(int));
 }
 
 void deserializeText(void* buffer, TextPacket* packet) {
@@ -37,4 +43,10 @@ void deserializeText(void* buffer, TextPacket* packet) {
 	//content
 	deserialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
 	deserialCopy(&buffer, packet->text, PACKET_STRING_SIZE);
+
+	//location
+	deserialCopy(&buffer, &packet->roomIndex, sizeof(int));
+	deserialCopy(&buffer, &packet->origin.x, sizeof(double));
+	deserialCopy(&buffer, &packet->origin.y, sizeof(double));
+	deserialCopy(&buffer, &packet->range, sizeof(int));
 }

common/network/packet_types/text_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,17 +19,19 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef TEXTPACKET_HPP_
-#define TEXTPACKET_HPP_
+#pragma once
 
 #include "serial_packet_base.hpp"
 
+#include "vector2.hpp"
+
 struct TextPacket : SerialPacketBase {
 	char name[PACKET_STRING_SIZE];
 	char text[PACKET_STRING_SIZE];
+	int roomIndex;
+	Vector2 origin;
+	int range;
 };
 
 void serializeText(void* buffer, TextPacket* packet);
 void deserializeText(void* buffer, TextPacket* packet);
-
-#endif

common/network/serial_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,12 +19,13 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SERIALPACKET_HPP_
-#define SERIALPACKET_HPP_
+#pragma once
 
 #include "serial_packet_base.hpp"
+#include "barrier_packet.hpp"
 #include "character_packet.hpp"
 #include "client_packet.hpp"
+#include "creature_packet.hpp"
 #include "region_packet.hpp"
 #include "server_packet.hpp"
 #include "text_packet.hpp"
@@ -33,14 +34,16 @@
 typedef SerialPacketBase SerialPacket;
 
 //DOCS: NETWORK_VERSION is used to discern compatible servers and clients
-constexpr int NETWORK_VERSION = 20140909;
+constexpr int NETWORK_VERSION = 20161209;
 
 union MaxPacket {
-	CharacterPacket a;
-	ClientPacket b;
-	RegionPacket c;
-	ServerPacket d;
-	TextPacket e;
+	BarrierPacket a;
+	CharacterPacket b;
+	ClientPacket c;
+	CreaturePacket d;
+	RegionPacket e;
+	ServerPacket f;
+	TextPacket g;
 };
 
 constexpr int MAX_PACKET_SIZE = sizeof(MaxPacket);
@@ -60,5 +63,3 @@ constexpr int PACKET_BUFFER_SIZE =
 	REGION_METADATA_FOOTPRINT +
 	REGION_TILE_FOOTPRINT +
 	REGION_SOLID_FOOTPRINT;
-
-#endif

common/network/serial_packet_type.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2016
  * 
  * 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,12 +19,12 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SERIALPACKETTYPE_HPP_
-#define SERIALPACKETTYPE_HPP_
+#pragma once
 
 /* DOCS: The headers indicate what packet type is used for each message
  * different messages under the same header will carry different amounts of
  * valid data, but it will still be carried in that packet's format.
+ * FORMAT_* is for internal use, deviding the different format bounds.
 */
 
 enum class SerialPacketType {
@@ -36,75 +36,160 @@ enum class SerialPacketType {
 	//  name, player count, version
 	//-------------------------
 
+	FORMAT_SERVER = 100,
+
 	//heartbeat
-	PING,
-	PONG,
+	PING = 101,
+	PONG = 102,
 
 	//Used for finding available servers
-	BROADCAST_REQUEST,
-	BROADCAST_RESPONSE,
+	BROADCAST_REQUEST = 103,
+	BROADCAST_RESPONSE = 104,
+
+	FORMAT_END_SERVER = 199,
 
 	//-------------------------
 	//ClientPacket
-	//  client index, account index, character index
+	//  client index, account index, username
 	//-------------------------
 
-	//Connecting to a server as a client
-	JOIN_REQUEST,
-	JOIN_RESPONSE,
+	FORMAT_CLIENT = 200,
 
-	//client requests all information from the server
-	SYNCHRONIZE,
+	//Connecting to a server as a client
+	JOIN_REQUEST = 201,
+	JOIN_RESPONSE = 202,
 
 	//disconnect from the server
-	DISCONNECT,
+	DISCONNECT_REQUEST = 203,
+	DISCONNECT_RESPONSE = 204,
+	ADMIN_DISCONNECT_FORCED = 205,
+
+	//load the account
+	LOGIN_REQUEST = 206,
+	LOGIN_RESPONSE = 207,
+
+	//unload the account
+	LOGOUT_REQUEST = 208,
+	LOGOUT_RESPONSE = 209,
 
 	//shut down the server
-	SHUTDOWN,
+	ADMIN_SHUTDOWN_REQUEST = 210,
+
+	FORMAT_END_CLIENT = 299,
 
 	//-------------------------
 	//RegionPacket
 	//  room index, x, y, raw data
 	//-------------------------
 
+	FORMAT_REGION = 300,
+
 	//map data
-	REGION_REQUEST,
-	REGION_CONTENT,
+	REGION_REQUEST = 301,
+	REGION_CONTENT = 302,
+
+	FORMAT_END_REGION = 399,
 
 	//-------------------------
 	//CharacterPacket
-	//  handle, avatar, character index, account index,
+	//  character index,
+	//  handle, avatar,
+	//  account index (owner),
 	//  room index, origin, motion
-	//  statistics
 	//-------------------------
 
-	//controlling characters
-	CHARACTER_NEW,
-	CHARACTER_DELETE,
-	CHARACTER_UPDATE,
+	FORMAT_CHARACTER = 400,
 
-	//authentication, character index => character stats
-	CHARACTER_STATS_REQUEST,
-	CHARACTER_STATS_RESPONSE,
+	//full data update
+	CHARACTER_UPDATE = 401,
+
+	//character management
+	CHARACTER_CREATE = 402,
+	CHARACTER_DELETE = 403,
+	CHARACTER_LOAD = 404,
+	CHARACTER_UNLOAD = 405,
+
+	//find out info from the server
+	QUERY_CHARACTER_EXISTS = 406,
+
+	//actions taken
+	CHARACTER_MOVEMENT = 407,
+
+	FORMAT_END_CHARACTER = 499,
+
+	//-------------------------
+	//CreaturePacket
+	//  creature index,
+	//  handle, avatar
+	//  bounds
+	//  room index, origin, motion
+	//-------------------------
+
+	FORMAT_CREATURE = 500,
+
+	//full data update
+	CREATURE_UPDATE = 501,
+
+	//character management
+	CREATURE_CREATE = 502,
+	CREATURE_UNLOAD = 503,
+
+	//find out info from the server
+	QUERY_CREATURE_EXISTS = 504,
+
+	//actions taken
+	CREATURE_MOVEMENT = 505,
+
+	FORMAT_END_CREATURE = 599,
 
 	//-------------------------
 	//TextPacket
 	//  name, text
 	//-------------------------
 
+	FORMAT_TEXT = 600,
+
 	//general speech
-	TEXT_BROADCAST,
+	TEXT_BROADCAST = 601,
+	TEXT_SPEECH = 602,
+	TEXT_WHISPER = 603,
 
 	//rejection/error messages
-	SHUTDOWN_REJECTION,
-	JOIN_REJECTION,
-	CHARACTER_REJECTION,
+	JOIN_REJECTION = 604,
+	LOGIN_REJECTION = 605,
+	REGION_REJECTION = 606,
+	CHARACTER_REJECTION = 607,
+	CREATURE_REJECTION = 608,
+	SHUTDOWN_REJECTION = 609,
+	QUERY_REJECTION = 610,
+
+	FORMAT_END_TEXT = 699,
+
+	//-------------------------
+	//BarrierPacket
+	//  barrier index,
+	//  bounds,
+	//  roomIndex, origin, motion
+	//  status
+	//-------------------------
+
+	FORMAT_BARRIER = 700,
+
+	BARRIER_UPDATE = 701,
+
+	BARRIER_CREATE = 702,
+	BARRIER_UNLOAD = 703,
+
+	QUERY_BARRIER_EXISTS = 704,
+
+	BARRIER_ENTRY = 705,
+	BARRIER_EXIT = 706,
+
+	FORMAT_END_BARRIER = 799,
 
 	//-------------------------
 	//not used
 	//-------------------------
 
-	LAST
+	LAST = 800
 };
-
-#endif