Updated README.md

Also added a new config file for developing over multiple machines.

.gitignore

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

.gitmodules

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

README.md

@@ -1,28 +1,37 @@
 ## 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 Windows can be found [here](https://dl.dropboxusercontent.com/u/46669050/Tortuga-linux.tar).
 
 ## 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 2.0](http://www.libsdl.org/) - Simple DirectMedia Layer API
-* [SDL_net 1.2](http://www.libsdl.org/projects/SDL_net/) - SDL's networking extension
+* [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/) - The best compression tool available IMO; only needed for distribution
+* [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
 
@@ -30,7 +39,7 @@ The most recent stable build for Windows can be found [here](https://dl.dropboxu
 
 The current version of Tortuga is released under the [zlib license](http://en.wikipedia.org/wiki/Zlib_License).  
 
-Copyright (c) 2013-2015 Kayne Ruse
+Copyright (c) 2013-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.
 
@@ -38,4 +47,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

@@ -21,120 +21,85 @@
 */
 #include "base_scene.hpp"
 
-#include <stdexcept>
+SDL_Renderer* BaseScene::rendererHandle = nullptr;
-
-//-------------------------
-//Static declarations
-//-------------------------
-
-SDL_Surface* BaseScene::screen = nullptr;
-
-//-------------------------
-//Public access members
-//-------------------------
 
 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;
 }
 
 //-------------------------
-//Program control
+//frame phases
 //-------------------------
 
-SDL_Surface* BaseScene::SetScreen(int w, int h, int bpp, Uint32 flags) {
+void BaseScene::FrameStart() {
-	if (!bpp) {
+	//EMPTY
-		bpp = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
+}
+
+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;
 	}
-
-	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() {
+void BaseScene::KeyUp(SDL_KeyboardEvent const& event) {
-	return screen;
+	//EMPTY
-}
-
-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
-			//EMPTY
-#endif
-
-#ifdef USE_EVENT_UNKNOWN
-			default:
-				UnknownEvent(event);
-			break;
-#endif
-		}//switch
-	}//while
 }

client/base_scene.hpp

@@ -19,56 +19,43 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef BASESCENE_HPP_
+#pragma once
-#define BASESCENE_HPP_
 
-#include "scene_list.hpp"
+#include "scene_signal.hpp"
 
-#include "SDL/SDL.h"
+#include "SDL2/SDL.h"
 
 class BaseScene {
 public:
-	//Public access members
 	BaseScene();
 	virtual ~BaseScene();
 
-	//Program control
+	virtual void RenderFrame(SDL_Renderer*);
-	static SDL_Surface* SetScreen(int w, int h, int bpp = 0, Uint32 flags = SDL_HWSURFACE|SDL_DOUBLEBUF);
+	static void SetRenderer(SDL_Renderer*);
-	static SDL_Surface* GetScreen();
+	SceneSignal GetSceneSignal();
 
-	SceneList SetNextScene(SceneList sceneIndex);
+	//frame phases
-	SceneList GetNextScene() const;
+	virtual void FrameStart();
+	virtual void Update();
+	virtual void FrameEnd();
 
-	//Frame loop
+	//input events
-	virtual void RunFrame();
+	virtual void QuitEvent();
-	virtual void RenderFrame();
+	virtual void MouseMotion(SDL_MouseMotionEvent const& event);
+	virtual void MouseButtonDown(SDL_MouseButtonEvent const& event);
+	virtual void MouseButtonUp(SDL_MouseButtonEvent const& event);
+	virtual void MouseWheel(SDL_MouseWheelEvent const& event);
+	virtual void KeyDown(SDL_KeyboardEvent const& event);
+	virtual void KeyUp(SDL_KeyboardEvent const& event);
+
+	//TODO: (9) joystick and controller events
 
 protected:
-	virtual void FrameStart() {}
+	//control
-	virtual void HandleEvents();
+	static SDL_Renderer* GetRenderer();
-	virtual void Update() {}
+	void SetSceneSignal(SceneSignal);
-	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
-	//EMPTY
-#endif
-
-#ifdef USE_EVENT_UNKNOWN
-	virtual void UnknownEvent(SDL_Event const&) {}
-#endif
 
 private:
-	static SDL_Surface* screen;
+	static SDL_Renderer* rendererHandle;
-	SceneList nextScene = SceneList::CONTINUE;
+	SceneSignal sceneSignal = SceneSignal::CONTINUE;
-};
+};
-
-#endif

client/channels.hpp

@@ -19,11 +19,8 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CHANNELS_HPP_
+#pragma once
-#define CHANNELS_HPP_
 
 enum Channels {
 	SERVER = 0
 };
-
-#endif

client/client_application.cpp

@@ -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>
-
+#include <sstream>
-//-------------------------
+#include <stdexcept>
-//Scene headers
-//-------------------------
-
-//Add the custom scene headers here
-#include "splash_screen.hpp"
-#include "main_menu.hpp"
-#include "options_menu.hpp"
-#include "lobby_menu.hpp"
-#include "world.hpp"
-#include "disconnected_screen.hpp"
 
 //-------------------------
 //Public access members
@@ -51,56 +44,149 @@ void ClientApplication::Init(int argc, char* argv[]) {
 	ConfigUtility& config = ConfigUtility::GetSingleton();
 	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;
 
-	//-------------------------
+	std::cout << "Initialized SDL_net 2.0" << std::endl;
-	//Setup the screen
-	//-------------------------
 
-	int w = config.Int("client.screen.w");
+	//setting up SDL2_ttf
-	int h = config.Int("client.screen.h");
+	if (TTF_Init()) {
-	int f = config.Bool("client.screen.f") ? SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_FULLSCREEN : SDL_HWSURFACE|SDL_DOUBLEBUF;
+		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 SDL_ttf 2.0" << std::endl;
-	std::cout << "Initialized the screen" << std::endl;
 
 	//-------------------------
 	//debug output
 	//-------------------------
 
-#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_INTERNAL_VAR(NETWORK_VERSION);
-	DEBUG_OUTPUT_VAR(sizeof(Region::type_t));
+	DEBUG_INTERNAL_VAR(sizeof(Region::type_t));
-	DEBUG_OUTPUT_VAR(sizeof(Region));
+	DEBUG_INTERNAL_VAR(sizeof(Region));
-	DEBUG_OUTPUT_VAR(REGION_WIDTH);
+	DEBUG_INTERNAL_VAR(REGION_WIDTH);
-	DEBUG_OUTPUT_VAR(REGION_HEIGHT);
+	DEBUG_INTERNAL_VAR(REGION_HEIGHT);
-	DEBUG_OUTPUT_VAR(REGION_DEPTH);
+	DEBUG_INTERNAL_VAR(REGION_DEPTH);
-	DEBUG_OUTPUT_VAR(REGION_TILE_FOOTPRINT);
+	DEBUG_INTERNAL_VAR(REGION_TILE_FOOTPRINT);
-	DEBUG_OUTPUT_VAR(REGION_SOLID_FOOTPRINT);
+	DEBUG_INTERNAL_VAR(REGION_SOLID_FOOTPRINT);
-	DEBUG_OUTPUT_VAR(PACKET_STRING_SIZE);
+	DEBUG_INTERNAL_VAR(PACKET_STRING_SIZE);
-	DEBUG_OUTPUT_VAR(PACKET_BUFFER_SIZE);
+	DEBUG_INTERNAL_VAR(PACKET_BUFFER_SIZE);
-	DEBUG_OUTPUT_VAR(MAX_PACKET_SIZE);
+	DEBUG_INTERNAL_VAR(MAX_PACKET_SIZE);
-	DEBUG_OUTPUT_VAR(static_cast<int>(SerialPacketType::LAST));
+	DEBUG_INTERNAL_VAR(static_cast<int>(SerialPacketType::LAST));
-
-#undef DEBUG_OUTPUT_VAR
 
 	//-------------------------
 	//finalize the startup
@@ -116,88 +202,157 @@ 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
+	//the game loop continues until the scenes signal QUIT
-	while(activeScene->GetNextScene() != SceneList::QUIT) {
+	while(activeScene->GetSceneSignal() != SceneSignal::QUIT) {
-		//switch scenes when necessary
+		//switch scenes if necessary
-		if (activeScene->GetNextScene() != SceneList::CONTINUE) {
+		if(activeScene->GetSceneSignal() != SceneSignal::CONTINUE) {
-			LoadScene(activeScene->GetNextScene());
+			ProcessSceneSignal(activeScene->GetSceneSignal());
 			continue;
 		}
 
 		//update the current time
 		realTime = Clock::now();
 
-		//simulate game time
+		//simulate the game or give the machine a break
 		if (simTime < realTime) {
-			while (simTime < realTime) {
+			while(simTime < realTime) {
-				//call each user defined function
+				//call the user defined functions
-				activeScene->RunFrame();
+				activeScene->FrameStart();
-				//~60 FPS
+				ProcessEvents();
-				simTime += std::chrono::duration<int, std::milli>(16);
+				activeScene->Update();
+				activeScene->FrameEnd();
+
+				//step to the next frame
+				simTime += frameDelay;
 			}
 		}
 		else {
-			//give the machine a break
+			SDL_Delay(1);
-			SDL_Delay(10);
 		}
 
-		//draw the game to the screen
+		SDL_RenderClear(renderer);
-		activeScene->RenderFrame();
+		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) {
+void ClientApplication::ProcessEvents() {
-	//BUG: #16 Resources are being reloaded between scenes
+	SDL_Event event;
-	UnloadScene();
+	while(SDL_PollEvent(&event)) {
-	switch(sceneIndex) {
+		switch(event.type) {
-		//add scene creation calls here
+			case SDL_QUIT:
-		case SceneList::FIRST:
+				activeScene->QuitEvent();
-		case SceneList::SPLASHSCREEN:
+			break;
-			activeScene = new SplashScreen();
+
-		break;
+			case SDL_MOUSEMOTION:
-		case SceneList::MAINMENU:
+				activeScene->MouseMotion(event.motion);
-			activeScene = new MainMenu();
+			break;
-		break;
+
-		case SceneList::OPTIONSMENU:
+			case SDL_MOUSEBUTTONDOWN:
-			activeScene = new OptionsMenu();
+				activeScene->MouseButtonDown(event.button);
-		break;
+			break;
-		case SceneList::LOBBYMENU:
+
-			activeScene = new LobbyMenu(&clientIndex, &accountIndex);
+			case SDL_MOUSEBUTTONUP:
-		break;
+				activeScene->MouseButtonUp(event.button);
-		case SceneList::WORLD:
+			break;
-			activeScene = new World(&clientIndex, &accountIndex);
+
-		break;
+			case SDL_MOUSEWHEEL:
-		case SceneList::DISCONNECTEDSCREEN:
+				activeScene->MouseWheel(event.wheel);
-			activeScene = new DisconnectedScreen();
+			break;
-		break;
+
-		default:
+			case SDL_KEYDOWN:
-			throw(std::logic_error("Failed to recognize the scene index"));
+				activeScene->KeyDown(event.key);
+			break;
+
+			case SDL_KEYUP:
+				activeScene->KeyUp(event.key);
+			break;
+
+			//TODO: (9) joystick and controller events
+
+			//window events are handled internally
+			case SDL_WINDOWEVENT:
+				switch(event.window.event) {
+					case SDL_WINDOWEVENT_RESIZED:
+						SDL_RenderSetLogicalSize(renderer, event.window.data1, event.window.data2);
+					break;
+				}
+			break;
+		}
 	}
 }
 
-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 "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::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

@@ -19,21 +19,19 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CLIENTAPPLICATION_HPP_
+#pragma once
-#define CLIENTAPPLICATION_HPP_
 
-#include "scene_list.hpp"
 #include "base_scene.hpp"
-
+#include "scene_signal.hpp"
+#include "singleton.hpp"
 #include "udp_network_utility.hpp"
 
-#include "singleton.hpp"
+#include "SDL2/SDL.h"
-
+#include "SDL2/SDL_net.h"
-#include <map>
+#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
+	//scene management
-	void LoadScene(SceneList sceneIndex);
+	void ProcessEvents();
-	void UnloadScene();
+	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/entities/base_character.cpp

@@ -21,6 +21,7 @@
 */
 #include "base_character.hpp"
 
+//TODO: (3) remove this
 #include "config_utility.hpp"
 
 //-------------------------
@@ -30,16 +31,16 @@
 void BaseCharacter::CorrectSprite() {
 	//NOTE: These must correspond to the sprite sheet in use
 	if (motion.y > 0) {
-		sprite.SetYIndex(0);
+		sprite.SetIndexY(0);
 	}
 	else if (motion.y < 0) {
-		sprite.SetYIndex(1);
+		sprite.SetIndexY(1);
 	}
 	else if (motion.x > 0) {
-		sprite.SetYIndex(3);
+		sprite.SetIndexY(3);
 	}
 	else if (motion.x < 0) {
-		sprite.SetYIndex(2);
+		sprite.SetIndexY(2);
 	}
 
 	//animation
@@ -48,7 +49,7 @@ void BaseCharacter::CorrectSprite() {
 	}
 	else {
 		sprite.SetDelay(0);
-		sprite.SetXIndex(0);
+		sprite.SetIndexX(0);
 	}
 }
 
@@ -72,9 +73,9 @@ std::string BaseCharacter::GetHandle() const {
 	return handle;
 }
 
-std::string BaseCharacter::SetAvatar(std::string s) {
+std::string BaseCharacter::SetAvatar(SDL_Renderer* const renderer, std::string s) {
 	avatar = s;
-	sprite.LoadSurface(ConfigUtility::GetSingleton()["dir.sprites"] + avatar, CHARACTER_CELLS_X, CHARACTER_CELLS_Y);
+	sprite.Load(renderer, ConfigUtility::GetSingleton()["dir.sprites"] + avatar, CHARACTER_CELLS_X, CHARACTER_CELLS_Y);
 	return avatar;
 }
 

client/entities/base_character.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef BASECHARACTER_HPP_
+#pragma once
-#define BASECHARACTER_HPP_
 
 //components
 #include "character_defines.hpp"
@@ -42,7 +41,7 @@ public:
 	int GetOwner();
 	std::string SetHandle(std::string s);
 	std::string GetHandle() const;
-	std::string SetAvatar(std::string s);
+	std::string SetAvatar(SDL_Renderer* const, std::string s);
 	std::string GetAvatar() const;
 
 protected:
@@ -51,5 +50,3 @@ protected:
 	std::string handle;
 	std::string avatar;
 };
-
-#endif

client/entities/base_creature.cpp

@@ -19,28 +19,28 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "base_monster.hpp"
+#include "base_creature.hpp"
 
 #include "config_utility.hpp"
 
-void BaseMonster::CorrectSprite() {
+void BaseCreature::CorrectSprite() {
-	//TODO: (9) BaseMonster::CorrectSprite()
+	//TODO: (9) BaseCreature::CorrectSprite()
 }
 
-std::string BaseMonster::SetHandle(std::string s) {
+std::string BaseCreature::SetHandle(std::string s) {
 	return handle = s;
 }
 
-std::string BaseMonster::GetHandle() const {
+std::string BaseCreature::GetHandle() const {
 	return handle;
 }
 
-std::string BaseMonster::SetAvatar(std::string s) {
+std::string BaseCreature::SetAvatar(SDL_Renderer* const renderer, std::string s) {
 	avatar = s;
-	sprite.LoadSurface(ConfigUtility::GetSingleton()["dir.sprites"] + avatar, 4, 1);
+	sprite.Load(renderer, ConfigUtility::GetSingleton()["dir.sprites"] + avatar, 4, 1);
 	return avatar;
 }
 
-std::string BaseMonster::GetAvatar() const {
+std::string BaseCreature::GetAvatar() const {
 	return avatar;
 }

client/entities/base_creature.hpp

@@ -19,21 +19,20 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef BASEMONSTER_HPP_
+#pragma once
-#define BASEMONSTER_HPP_
 
 #include "entity.hpp"
 
-class BaseMonster: public Entity {
+class BaseCreature: public Entity {
 public:
-	BaseMonster() = default;
+	BaseCreature() = default;
-	virtual ~BaseMonster() = default;
+	virtual ~BaseCreature() = default;
 
 	void CorrectSprite();
 
 	std::string SetHandle(std::string s);
 	std::string GetHandle() const;
-	std::string SetAvatar(std::string s);
+	std::string SetAvatar(SDL_Renderer* const, std::string s);
 	std::string GetAvatar() const;
 
 protected:
@@ -41,5 +40,3 @@ protected:
 	std::string handle;
 	std::string avatar;
 };
-
-#endif

client/entities/entity.cpp

@@ -26,8 +26,8 @@ void Entity::Update() {
 	sprite.Update(0.016);
 }
 
-void Entity::DrawTo(SDL_Surface* const dest, int camX, int camY) {
+void Entity::DrawTo(SDL_Renderer* const renderer, int camX, int camY) {
-	sprite.DrawTo(dest, origin.x - camX, origin.y - camY);
+	sprite.DrawTo(renderer, origin.x - camX, origin.y - camY);
 }
 
 SpriteSheet* Entity::GetSprite() {

client/entities/entity.hpp

@@ -19,18 +19,18 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ENTITY_HPP_
+#pragma once
-#define ENTITY_HPP_
 
 #include "bounding_box.hpp"
 #include "sprite_sheet.hpp"
 #include "vector2.hpp"
 
 //The base class for all objects in the world
+//TODO: (9) write a better hierarchy
 class Entity {
 public:
 	virtual void Update();
-	virtual void DrawTo(SDL_Surface* const, int camX, int camY);
+	virtual void DrawTo(SDL_Renderer* const, int camX, int camY);
 
 	SpriteSheet* GetSprite();
 
@@ -52,5 +52,3 @@ protected:
 	Vector2 motion;
 	BoundingBox bounds;
 };
-
-#endif

client/entities/local_character.cpp

@@ -26,6 +26,7 @@
 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;

client/entities/local_character.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef LOCALCHARACTER_HPP_
+#pragma once
-#define LOCALCHARACTER_HPP_
 
 #include "base_character.hpp"
 #include "bounding_box.hpp"
@@ -38,5 +37,3 @@ public:
 private:
 	//NOTE: NO MEMBERS
 };
-
-#endif

client/entities/makefile

@@ -30,8 +30,3 @@ $(OUTDIR):
 
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all

client/fatal_error.cpp

@@ -19,5 +19,6 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "terminal_error.hpp"
+#include "fatal_error.hpp"
 
+//DOCS: This empty file is used to force an object file

client/fatal_error.hpp

@@ -19,16 +19,13 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef TERMINALERROR_HPP_
+#pragma once
-#define TERMINALERROR_HPP_
 
 #include <stdexcept>
 #include <string>
 
-class terminal_error: public std::runtime_error {
+class fatal_error: public std::runtime_error {
 public:
-	explicit terminal_error(const std::string& str): runtime_error(str) {}
+	explicit fatal_error(const std::string& str): runtime_error(str) {}
-	explicit terminal_error(const char* cstr): runtime_error(cstr) {}
+	explicit fatal_error(const char* cstr): runtime_error(cstr) {}
 };
-
-#endif

client/gameplay_scenes/world_characters.cpp

@@ -1,239 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "world.hpp"
-
-#include "channels.hpp"
-
-#include <iostream>
-#include <sstream>
-#include <stdexcept>
-
-//-------------------------
-//character management
-//-------------------------
-
-//DOCS: preexisting characters will result in query responses
-//DOCS: new characters will result in create messages
-//DOCS: this client's character will exist in both (skipped)
-
-void World::hCharacterUpdate(CharacterPacket* const argPacket) {
-	//TODO: (1) Authentication
-	//NOTE: applies to the local character too
-
-	//check that this character exists
-	std::map<int, BaseCharacter>::iterator characterIt = characterMap.find(argPacket->characterIndex);
-	if (characterIt != characterMap.end()) {
-		//update the origin and motion, if there's a difference
-		if (characterIt->second.GetOrigin() != argPacket->origin) {
-			characterIt->second.SetOrigin(argPacket->origin);
-		}
-		if (characterIt->second.GetMotion() != argPacket->motion) {
-			characterIt->second.SetMotion(argPacket->motion);
-			characterIt->second.CorrectSprite(); //only correct the sprite if the motion changes
-		}
-	}
-}
-
-void World::hCharacterCreate(CharacterPacket* const argPacket) {
-	//prevent double message
-	if (characterMap.find(argPacket->characterIndex) != characterMap.end()) {
-		std::ostringstream msg;
-		msg << "Double character creation event; ";
-		msg << "Index: " << argPacket->characterIndex << "; ";
-		msg << "Handle: " << argPacket->handle;
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//implicity create and retrieve the entity
-	BaseCharacter* character = &characterMap[argPacket->characterIndex];
-
-	//fill the character's info
-	character->SetHandle(argPacket->handle);
-	character->SetAvatar(argPacket->avatar);
-	character->SetOwner(argPacket->accountIndex);
-	character->SetOrigin(argPacket->origin);
-	character->SetMotion(argPacket->motion);
-	character->SetBounds(argPacket->bounds);
-
-	character->CorrectSprite();
-
-	//check for this player's character
-	if (character->GetOwner() == accountIndex) {
-		localCharacter = static_cast<LocalCharacter*>(character);
-
-		//focus the camera on this character's sprite
-		camera.marginX = (camera.width / 2 - localCharacter->GetSprite()->GetImage()->GetClipW() / 2);
-		camera.marginY = (camera.height/ 2 - localCharacter->GetSprite()->GetImage()->GetClipH() / 2);
-
-		//focus on this character's info
-		characterIndex = argPacket->characterIndex;
-		roomIndex = argPacket->roomIndex;
-
-		//query the world state (room)
-		CharacterPacket newPacket;
-		memset(&newPacket, 0, MAX_PACKET_SIZE);
-		newPacket.type = SerialPacketType::QUERY_CHARACTER_EXISTS;
-		newPacket.roomIndex = roomIndex;
-		network.SendTo(Channels::SERVER, &newPacket);
-		newPacket.type = SerialPacketType::QUERY_MONSTER_EXISTS;
-		network.SendTo(Channels::SERVER, &newPacket);
-	}
-
-	//debug
-	std::cout << "Character Create, total: " << characterMap.size() << std::endl;
-}
-
-void World::hCharacterDelete(CharacterPacket* const argPacket) {
-	//ignore if this character doesn't exist
-	std::map<int, BaseCharacter>::iterator characterIt = characterMap.find(argPacket->characterIndex);
-	if (characterIt == characterMap.end()) {
-		return;
-	}
-
-	//check for this player's character
-	if ((*characterIt).second.GetOwner() == accountIndex) {
-		localCharacter = nullptr;
-
-		//clear the camera
-		camera.marginX = 0;
-		camera.marginY = 0;
-
-		//clear the room
-		roomIndex = -1;
-		regionPager.UnloadAll();
-		characterMap.clear();
-		monsterMap.clear();
-	}
-	else {
-		//remove this character
-		characterMap.erase(characterIt);
-	}
-
-	//debug
-	std::cout << "Character Delete, total: " << characterMap.size() << std::endl;
-}
-
-void World::hQueryCharacterExists(CharacterPacket* const argPacket) {
-	//prevent a double message about this player's character
-//	if (argPacket->accountIndex == accountIndex) {
-//		return;
-//	}
-
-	//ignore characters in a different room (sub-optimal)
-	if (argPacket->roomIndex != roomIndex) {
-		return;
-	}
-
-	//implicitly construct the character if it doesn't exist
-	BaseCharacter* character = &characterMap[argPacket->characterIndex];
-
-	//set/update the character's info
-	character->SetOrigin(argPacket->origin);
-	character->SetMotion(argPacket->motion);
-	character->SetBounds({CHARACTER_BOUNDS_X, CHARACTER_BOUNDS_Y, CHARACTER_BOUNDS_WIDTH, CHARACTER_BOUNDS_HEIGHT});
-	character->SetHandle(argPacket->handle);
-	character->SetAvatar(argPacket->avatar);
-	character->SetOwner(argPacket->accountIndex);
-	character->CorrectSprite();
-
-	//debug
-	std::cout << "Character Query, total: " << characterMap.size() << std::endl;
-}
-
-void World::hQueryCharacterStats(CharacterPacket* const argPacket) {
-	//TODO: (9) World::hQueryCharacterStats()
-}
-
-void World::hQueryCharacterLocation(CharacterPacket* const argPacket) {
-	//TODO: (9) World::hQueryCharacterLocation()
-}
-
-void World::hCharacterMovement(CharacterPacket* const argPacket) {
-	//TODO: (1) Authentication
-	if (argPacket->characterIndex == characterIndex) {
-		return;
-	}
-
-	//check that this character exists
-	std::map<int, BaseCharacter>::iterator characterIt = characterMap.find(argPacket->characterIndex);
-	if (characterIt != characterMap.end()) {
-		//set the origin and motion
-		characterIt->second.SetOrigin(argPacket->origin);
-		characterIt->second.SetMotion(argPacket->motion);
-		characterIt->second.CorrectSprite();
-	}
-}
-
-void World::hCharacterAttack(CharacterPacket* const argPacket) {
-	//TODO: (9) World::hCharacterAttack()
-}
-
-void World::hCharacterDamage(CharacterPacket* const argPacket) {
-	//TODO: (9) World::hCharacterDamage()
-}
-
-//-------------------------
-//player movement & collision
-//-------------------------
-
-void World::SendLocalCharacterMovement() {
-	CharacterPacket newPacket;
-	newPacket.type = SerialPacketType::CHARACTER_MOVEMENT;
-
-	newPacket.accountIndex = accountIndex;
-	newPacket.characterIndex = characterIndex;
-	newPacket.roomIndex = roomIndex;
-	newPacket.origin = localCharacter->GetOrigin();
-	newPacket.motion = localCharacter->GetMotion();
-
-	network.SendTo(Channels::SERVER, &newPacket);
-}
-
-std::list<BoundingBox> World::GenerateCollisionGrid(Entity* ptr, int tileWidth, int tileHeight) {
-	//prepare for collisions
-	BoundingBox wallBounds = {0, 0, tileWidth, tileHeight};
-	std::list<BoundingBox> boxList;
-
-	//NOTE: for loops were too dense to work with, so I've just used while loops
-
-	//outer loop
-	wallBounds.x = snapToBase((double)wallBounds.w, ptr->GetOrigin().x);
-	while(wallBounds.x < (ptr->GetOrigin() + ptr->GetBounds()).x + ptr->GetBounds().w) {
-		//inner loop
-		wallBounds.y = snapToBase((double)wallBounds.h, ptr->GetOrigin().y);
-		while(wallBounds.y < (ptr->GetOrigin() + ptr->GetBounds()).y + ptr->GetBounds().h) {
-			//check to see if this tile is solid
-			if (regionPager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
-				//push onto the box set
-				boxList.push_front(wallBounds);
-			}
-
-			//increment
-			wallBounds.y += wallBounds.h;
-		}
-
-		//increment
-		wallBounds.x += wallBounds.w;
-	}
-
-	return std::move(boxList);
-}

client/gameplay_scenes/world_connections.cpp

@@ -1,134 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "world.hpp"
-
-#include "channels.hpp"
-#include "ip_operators.hpp"
-
-#include <chrono>
-#include <sstream>
-#include <stdexcept>
-
-//-------------------------
-//heartbeat system
-//-------------------------
-
-void World::hPing(ServerPacket* const argPacket) {
-	ServerPacket newPacket;
-	newPacket.type = SerialPacketType::PONG;
-	network.SendTo(argPacket->srcAddress, &newPacket);
-}
-
-void World::hPong(ServerPacket* const argPacket) {
-	if (*network.GetIPAddress(Channels::SERVER) != argPacket->srcAddress) {
-		throw(std::runtime_error("Heartbeat message received from an unknown source"));
-	}
-	attemptedBeats = 0;
-	lastBeat = Clock::now();
-}
-
-void World::CheckHeartBeat() {
-	//check the connection (heartbeat)
-	if (Clock::now() - lastBeat > std::chrono::seconds(3)) {
-		if (attemptedBeats > 2) {
-			//escape to the disconnect screen
-			SendDisconnectRequest();
-			SetNextScene(SceneList::DISCONNECTEDSCREEN);
-			ConfigUtility::GetSingleton()["client.disconnectMessage"] = "Error: Lost connection to the server";
-		}
-		else {
-			ServerPacket newPacket;
-			newPacket.type = SerialPacketType::PING;
-			network.SendTo(Channels::SERVER, &newPacket);
-
-			attemptedBeats++;
-			lastBeat = Clock::now();
-		}
-	}
-}
-
-//-------------------------
-//Connection control
-//-------------------------
-
-void World::SendLogoutRequest() {
-	ClientPacket newPacket;
-
-	//send a logout request
-	newPacket.type = SerialPacketType::LOGOUT_REQUEST;
-	newPacket.accountIndex = accountIndex;
-
-	network.SendTo(Channels::SERVER, &newPacket);
-}
-
-void World::SendDisconnectRequest() {
-	ClientPacket newPacket;
-
-	//send a disconnect request
-	newPacket.type = SerialPacketType::DISCONNECT_REQUEST;
-	newPacket.clientIndex = clientIndex;
-
-	network.SendTo(Channels::SERVER, &newPacket);
-}
-
-void World::SendAdminDisconnectForced() {
-	//TODO: (9) World::SendAdminDisconnectForced()
-}
-
-void World::SendAdminShutdownRequest() {
-	ClientPacket newPacket;
-
-	//send a shutdown request
-	newPacket.type = SerialPacketType::ADMIN_SHUTDOWN_REQUEST;
-	newPacket.accountIndex = accountIndex;
-
-	network.SendTo(Channels::SERVER, &newPacket);
-}
-
-void World::hLogoutResponse(ClientPacket* const argPacket) {
-	if (localCharacter) {
-		characterMap.erase(characterIndex);
-		localCharacter = nullptr;
-	}
-
-	accountIndex = -1;
-	characterIndex = -1;
-
-	//reset the camera
-	camera.marginX = camera.marginY = 0;
-
-	//because, why not? I guess...
-	SendDisconnectRequest();
-}
-
-void World::hDisconnectResponse(ClientPacket* const argPacket) {
-	hLogoutResponse(argPacket);//shortcut
-	SetNextScene(SceneList::DISCONNECTEDSCREEN);
-	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have successfully logged out";
-}
-
-void World::hAdminDisconnectForced(ClientPacket* const argPacket) {
-	hDisconnectResponse(argPacket);//shortcut
-	SetNextScene(SceneList::DISCONNECTEDSCREEN);
-	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have been forcibly disconnected by the server";
-}
-

client/gameplay_scenes/world_logic.cpp

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

client/gameplay_scenes/world_map.cpp

@@ -1,79 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "world.hpp"
-
-#include "channels.hpp"
-
-//-------------------------
-//map management
-//-------------------------
-
-void World::SendRegionRequest(int roomIndex, int x, int y) {
-	RegionPacket packet;
-
-	//pack the region's data
-	packet.type = SerialPacketType::REGION_REQUEST;
-	packet.roomIndex = roomIndex;
-	packet.x = x;
-	packet.y = y;
-
-	network.SendTo(Channels::SERVER, &packet);
-}
-
-void World::hRegionContent(RegionPacket* const argPacket) {
-	//replace existing regions
-	regionPager.UnloadIf([&](Region const& region) -> bool {
-		return region.GetX() == argPacket->x && region.GetY() == argPacket->y;
-	});
-	regionPager.PushRegion(argPacket->region);
-
-	//clean up after the serial code
-	delete argPacket->region;
-	argPacket->region = nullptr;
-}
-
-void World::UpdateMap() {
-	if (roomIndex == -1) {
-		return;
-	}
-
-	//these represent the zone of regions that the client needs loaded, including the mandatory buffers (+1/-1)
-	int xStart = snapToBase(REGION_WIDTH, camera.x/tileSheet.GetTileW()) - REGION_WIDTH;
-	int xEnd = snapToBase(REGION_WIDTH, (camera.x+camera.width)/tileSheet.GetTileW()) + REGION_WIDTH;
-
-	int yStart = snapToBase(REGION_HEIGHT, camera.y/tileSheet.GetTileH()) - REGION_HEIGHT;
-	int yEnd = snapToBase(REGION_HEIGHT, (camera.y+camera.height)/tileSheet.GetTileH()) + REGION_HEIGHT;
-
-	//prune distant regions
-	regionPager.GetContainer()->remove_if([&](Region const& region) -> bool {
-		return region.GetX() < xStart || region.GetX() > xEnd || region.GetY() < yStart || region.GetY() > yEnd;
-	});
-
-	//request empty regions within this zone
-	for (int i = xStart; i <= xEnd; i += REGION_WIDTH) {
-		for (int j = yStart; j <= yEnd; j += REGION_HEIGHT) {
-			if (!regionPager.FindRegion(i, j)) {
-				SendRegionRequest(roomIndex, i, j);
-			}
-		}
-	}
-}

client/gameplay_scenes/world_monsters.cpp

@@ -1,126 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "world.hpp"
-
-#include "channels.hpp"
-
-#include <iostream>
-#include <sstream>
-#include <stdexcept>
-
-//-------------------------
-//monster management
-//-------------------------
-
-void World::hMonsterCreate(MonsterPacket* const argPacket) {
-	//check for logic errors
-	if (monsterMap.find(argPacket->monsterIndex) != monsterMap.end()) {
-		std::ostringstream msg;
-		msg << "Double monster creation event; ";
-		msg << "Index: " << argPacket->monsterIndex << "; ";
-		msg << "Handle: " << argPacket->handle;
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//ignore monsters from other rooms
-	if (roomIndex != argPacket->roomIndex) {
-		//temporary error checking
-		std::ostringstream msg;
-		msg << "Monster from the wrong room received: ";
-		msg << "monsterIndex: " << argPacket->monsterIndex << ", roomIndex: " << argPacket->roomIndex;
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//implicitly create the element
-	BaseMonster* monster = &monsterMap[argPacket->monsterIndex];
-
-	//fill the monster's info
-	monster->SetHandle(argPacket->handle);
-	monster->SetAvatar(argPacket->avatar);
-	monster->SetBounds(argPacket->bounds);
-	monster->SetOrigin(argPacket->origin);
-	monster->SetMotion(argPacket->motion);
-
-	//debug
-	std::cout << "Monster Create, total: " << monsterMap.size() << std::endl;
-}
-
-void World::hMonsterDelete(MonsterPacket* const argPacket) {
-	//ignore if this monster doesn't exist
-	std::map<int, BaseMonster>::iterator monsterIt = monsterMap.find(argPacket->monsterIndex);
-	if (monsterIt == monsterMap.end()) {
-		return;
-	}
-
-	//remove this monster
-	monsterMap.erase(monsterIt);
-
-	//debug
-	std::cout << "Monster Delete, total: " << monsterMap.size() << std::endl;
-}
-
-void World::hQueryMonsterExists(MonsterPacket* const argPacket) {
-	//ignore monsters in a different room (sub-optimal)
-	if (argPacket->roomIndex != roomIndex) {
-		return;
-	}
-
-	//implicitly create the element
-	BaseMonster* monster = &monsterMap[argPacket->monsterIndex];
-
-	//fill the monster's info
-	monster->SetHandle(argPacket->handle);
-	monster->SetAvatar(argPacket->avatar);
-	monster->SetBounds(argPacket->bounds);
-	monster->SetOrigin(argPacket->origin);
-	monster->SetMotion(argPacket->motion);
-
-	//debug
-	std::cout << "Monster Query, total: " << monsterMap.size() << std::endl;
-}
-
-void World::hQueryMonsterStats(MonsterPacket* const argPacket) {
-	//TODO: (9) World::hQueryMonsterStats()
-}
-
-void World::hQueryMonsterLocation(MonsterPacket* const argPacket) {
-	//TODO: (9) World::hQueryMonsterLocation()
-}
-
-void World::hMonsterMovement(MonsterPacket* const argPacket) {
-	//ignore if this monster doesn't exist
-	std::map<int, BaseMonster>::iterator monsterIt = monsterMap.find(argPacket->monsterIndex);
-	if (monsterIt == monsterMap.end()) {
-		return;
-	}
-
-	monsterIt->second.SetOrigin(argPacket->origin);
-	monsterIt->second.SetOrigin(argPacket->motion);
-}
-
-void World::hMonsterAttack(MonsterPacket* const argPacket) {
-	//TODO: (9) World::hMonsterAttack()
-}
-
-void World::hMonsterDamage(MonsterPacket* const argPacket) {
-	//TODO: (9) World::hMonsterDamage()
-}

client/main.cpp

@@ -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,16 +1,20 @@
 #include directories
-INCLUDES+=. client_utilities entities gameplay_scenes menu_scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
+INCLUDES+=. entities scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
 
 #libraries
 #the order of the $(LIBS) is important, at least for MinGW
-LIBS+=client.a ../libcommon.a -lSDL_net
+LIBS+=client.a ../common/libcommon.a -lSDL2_net
 ifeq ($(OS),Windows_NT)
 	LIBS+=-lwsock32 -liphlpapi -lmingw32
 endif
-LIBS+=-lSDLmain -lSDL
+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)
@@ -25,10 +29,8 @@ OUT=$(addprefix $(OUTDIR)/,client)
 
 #targets
 all: $(OBJ) $(OUT)
-	$(MAKE) -C client_utilities
 	$(MAKE) -C entities
-	$(MAKE) -C gameplay_scenes
+	$(MAKE) -C scenes
-	$(MAKE) -C menu_scenes
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)
@@ -45,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/menu_scenes/main_menu.cpp

@@ -1,133 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "main_menu.hpp"
-
-#include "config_utility.hpp"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-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");
-
-	//pass the utility objects
-	startButton.SetImage(&image);
-	startButton.SetFont(&font);
-	optionsButton.SetImage(&image);
-	optionsButton.SetFont(&font);
-	quitButton.SetImage(&image);
-	quitButton.SetFont(&font);
-
-	//set the button positions
-	startButton.SetX(50);
-	startButton.SetY(50 + image.GetClipH() * 0);
-	optionsButton.SetX(50);
-	optionsButton.SetY(50 + image.GetClipH() * 1);
-	quitButton.SetX(50);
-	quitButton.SetY(50 + image.GetClipH() * 2);
-
-	//set the button texts
-	startButton.SetText("Start");
-	optionsButton.SetText("Options");
-	quitButton.SetText("Quit");
-
-	//debug
-	//
-}
-
-MainMenu::~MainMenu() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void MainMenu::FrameStart() {
-	//
-}
-
-void MainMenu::Update() {
-	//
-}
-
-void MainMenu::FrameEnd() {
-	//
-}
-
-void MainMenu::Render(SDL_Surface* const screen) {
-	startButton.DrawTo(screen);
-	optionsButton.DrawTo(screen);
-	quitButton.DrawTo(screen);
-
-	//text
-	font.DrawStringTo("Thanks for playing!", screen, 50, screen->h - 50 - image.GetClipH() * 2);
-	font.DrawStringTo("You can get the latest version at: ", screen, 50, screen->h - 50 - image.GetClipH() * 1);
-	font.DrawStringTo("krgamestudios.com", screen, 50, screen->h - 50 - image.GetClipH() * 0);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void MainMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	startButton.MouseMotion(motion);
-	optionsButton.MouseMotion(motion);
-	quitButton.MouseMotion(motion);
-}
-
-void MainMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	startButton.MouseButtonDown(button);
-	optionsButton.MouseButtonDown(button);
-	quitButton.MouseButtonDown(button);
-}
-
-void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	//TODO: (2) Buttons should only register as "selected" when the left button is used
-	if (startButton.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::LOBBYMENU);
-	}
-	if (optionsButton.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::OPTIONSMENU);
-	}
-	if (quitButton.MouseButtonUp(button) == Button::State::HOVER) {
-		QuitEvent();
-	}
-}
-
-void MainMenu::KeyDown(SDL_KeyboardEvent const& key) {
-	//
-}
-
-void MainMenu::KeyUp(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			QuitEvent();
-		break;
-	}
-}

client/menu_scenes/makefile

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

client/scene_signal.hpp

@@ -19,22 +19,19 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SCENELIST_HPP_
+#pragma once
-#define SCENELIST_HPP_
 
-enum class SceneList {
+enum SceneSignal {
-	//these are reserved
+	//reserved members for internal use
-	QUIT,
+	QUIT = -1,
-	CONTINUE,
+	CONTINUE = 0,
-	FIRST,
+	FIRST = 1,
 
-	//custom indexes
+	//custom scenes
 	SPLASHSCREEN,
 	MAINMENU,
 	OPTIONSMENU,
 	LOBBYMENU,
 	WORLD,
 	DISCONNECTEDSCREEN,
-};
+};
-
-#endif

client/scenes/disconnected_screen.cpp

@@ -25,6 +25,7 @@
 #include "config_utility.hpp"
 #include "udp_network_utility.hpp"
 
+#include <sstream>
 #include <stdexcept>
 
 //-------------------------
@@ -35,20 +36,27 @@ DisconnectedScreen::DisconnectedScreen() {
 	ConfigUtility& config = ConfigUtility::GetSingleton();
 
 	//setup the utility objects
-	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
+	//TODO: (1) resource tool, to prevent reloading like this
-	image.SetClipH(image.GetClipH()/3);
+	image.Load(GetRenderer(), config["dir.interface"] + "button_blue.png");
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+	font = TTF_OpenFont(config["client.font"].c_str(), 12);
 
-	//pass the utility objects
+	//check that the font loaded
-	backButton.SetImage(&image);
+	if (!font) {
-	backButton.SetFont(&font);
+		std::ostringstream msg;
+		msg << "Failed to load a font file; " << SDL_GetError();
+		throw(std::runtime_error(msg.str()));
+	}
+
+	//setup the button
+	backButton.SetBackgroundTexture(GetRenderer(), image.GetTexture());
+	backButton.SetText(GetRenderer(), font, "Back", COLOR_WHITE);
 
 	//set the button positions
 	backButton.SetX(50);
-	backButton.SetY(50 + image.GetClipH() * 0);
+	backButton.SetY(50);
 
-	//set the button texts
+	//set the disconnection message text
-	backButton.SetText("Back");
+	textLine.SetText(GetRenderer(), font, config["client.disconnectMessage"], {255, 255, 255, 255});
 
 	//full reset
 	UDPNetworkUtility::GetSingleton().Unbind(Channels::SERVER);
@@ -58,59 +66,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) {
+void DisconnectedScreen::FrameEnd() {
-	ConfigUtility& config = ConfigUtility::GetSingleton();
+	//
+}
 
-	backButton.DrawTo(screen);
+void DisconnectedScreen::RenderFrame(SDL_Renderer* renderer) {
-	font.DrawStringTo(config["client.disconnectMessage"], screen, 50, 30);
+	backButton.DrawTo(renderer);
+	textLine.DrawTo(renderer, 50, 30);
 }
 
 //-------------------------
 //Event handlers
 //-------------------------
 
-void DisconnectedScreen::QuitEvent() {
+void DisconnectedScreen::MouseMotion(SDL_MouseMotionEvent const& event) {
-	SetNextScene(SceneList::QUIT);
+	backButton.MouseMotion(event);
 }
 
-void DisconnectedScreen::MouseMotion(SDL_MouseMotionEvent const& motion) {
+void DisconnectedScreen::MouseButtonDown(SDL_MouseButtonEvent const& event) {
-	backButton.MouseMotion(motion);
+	backButton.MouseButtonDown(event);
 }
 
-void DisconnectedScreen::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+void DisconnectedScreen::MouseButtonUp(SDL_MouseButtonEvent const& event) {
-	backButton.MouseButtonDown(button);
+	if (backButton.MouseButtonUp(event) == Button::State::RELEASED) {
-}
+		SetSceneSignal(SceneSignal::MAINMENU);
-
-void DisconnectedScreen::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::MAINMENU);
 	}
 }
 
-void DisconnectedScreen::KeyDown(SDL_KeyboardEvent const& key) {
+void DisconnectedScreen::MouseWheel(SDL_MouseWheelEvent const& event) {
-	switch(key.keysym.sym) {
+	//
+}
+
+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

@@ -19,18 +19,15 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef DISCONNECTEDSCREEN_HPP_
+#pragma once
-#define DISCONNECTEDSCREEN_HPP_
 
-//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:
+	void RenderFrame(SDL_Renderer* renderer) override;
-	//Frame loop
-	void Update();
-	void Render(SDL_Surface* const);
 
-	//Event handlers
+protected:
-	void QuitEvent();
+	//frame phases
-	void MouseMotion(SDL_MouseMotionEvent const&);
+	void FrameStart() override;
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
+	void Update() override;
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
+	void FrameEnd() override;
-	void KeyDown(SDL_KeyboardEvent const&);
+
-	void KeyUp(SDL_KeyboardEvent const&);
+	//input events
+	void MouseMotion(SDL_MouseMotionEvent const& event) override;
+	void MouseButtonDown(SDL_MouseButtonEvent const& event) override;
+	void MouseButtonUp(SDL_MouseButtonEvent const& event) override;
+	void MouseWheel(SDL_MouseWheelEvent const& event) override;
+	void KeyDown(SDL_KeyboardEvent const& event) override;
+	void KeyUp(SDL_KeyboardEvent const& event) override;
 
 	//graphics
 	Image image;
-	RasterFont font;
+	TTF_Font* font = nullptr;
-
-	//UI
 	Button backButton;
+	TextLine textLine;
 
 	//auto return
 	std::chrono::steady_clock::time_point startTick;
 };
-
-#endif

client/scenes/lobby_menu.cpp

@@ -23,6 +23,7 @@
 
 #include "channels.hpp"
 
+#include <cstring>
 #include <stdexcept>
 #include <sstream>
 
@@ -39,33 +40,37 @@ LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
 	accountIndex = -1;
 
 	//setup the utility objects
-	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
+	buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_blue.png");
-	image.SetClipH(image.GetClipH()/3);
+	font = TTF_OpenFont(config["client.font"].c_str(), 12);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
 
-	//pass the utility objects
+	//check that the font loaded
-	search.SetImage(&image);
+	if (!font) {
-	search.SetFont(&font);
+		std::ostringstream msg;
-	join.SetImage(&image);
+		msg << "Failed to load a font file; " << SDL_GetError();
-	join.SetFont(&font);
+		throw(std::runtime_error(msg.str()));
-	back.SetImage(&image);
+	}
-	back.SetFont(&font);
 
-	//set the button positions
+	//setup the buttons
-	search.SetX(50);
+	searchButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	search.SetY(50 + image.GetClipH() * 0);
+	searchButton.SetText(GetRenderer(), font, "Search", COLOR_WHITE);
-	join.SetX(50);
+	joinButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	join.SetY(50 + image.GetClipH() * 1);
+	joinButton.SetText(GetRenderer(), font, "Join", COLOR_WHITE);
-	back.SetX(50);
+	backButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	back.SetY(50 + image.GetClipH() * 2);
+	backButton.SetText(GetRenderer(), font, "Back", COLOR_WHITE);
 
-	//set the button texts
+	//set the button positions (assumed)
-	search.SetText("Search");
+	searchButton.SetX(50);
-	join.SetText("Join");
+	searchButton.SetY(50);
-	back.SetText("Back");
+	joinButton.SetX(50);
+	joinButton.SetY(70);
+	backButton.SetX(50);
+	backButton.SetY(90);
 
-	//set the server list's position
+	//pseudo-list selection
-	listBox = {300, 50, 200, font.GetCharH()};
+	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 +80,7 @@ LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
 }
 
 LobbyMenu::~LobbyMenu() {
-	//
+	TTF_CloseFont(font);
 }
 
 //-------------------------
@@ -99,39 +104,25 @@ void LobbyMenu::FrameEnd() {
 	//
 }
 
-void LobbyMenu::Render(SDL_Surface* const screen) {
+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);
+	searchButton.DrawTo(renderer);
-	join.DrawTo(screen);
+	joinButton.DrawTo(renderer);
-	back.DrawTo(screen);
+	backButton.DrawTo(renderer);
 
 	//TODO: (3) draw headers for the server list
 	//TODO: (3) ping/delay displayed in the server list
-	for (int i = 0; i < serverInfo.size(); i++) {
+	for (int i = 0; i < serverVector.size(); i++) {
 		//draw the selected server's highlight
-		if (selection == &serverInfo[i]) {
+		if (selection == &serverVector[i]) {
-			SDL_Rect r = {
+			highlightImage.DrawTo(renderer, boundingBox.x, boundingBox.y + boundingBox.h * i);
-				(Sint16)listBox.x, (Sint16)listBox.y,
-				(Uint16)listBox.w, (Uint16)listBox.h
-			};
-			r.y += i * listBox.h;
-			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 49, 150, 5));
 		}
 
-		//draw the server name
+		//draw the server's info
-		font.DrawStringTo(serverInfo[i].name, screen, listBox.x, listBox.y + i*listBox.h);
+		serverVector[i].nameImage.DrawTo(renderer, boundingBox.x, boundingBox.y + boundingBox.h * i);
-
+		serverVector[i].playerCountImage.DrawTo(renderer, boundingBox.x+276, boundingBox.y + boundingBox.h * i);
-		//draw the player count
-		std::ostringstream msg;
-		msg << serverInfo[i].playerCount;
-		font.DrawStringTo(msg.str(), screen, listBox.x + listBox.w, listBox.y + i*listBox.h);
-
-		//compatible?
-		if (!serverInfo[i].compatible) {
-			font.DrawStringTo("?", screen, listBox.x - font.GetCharW(), listBox.y + i*listBox.h);
-		}
 	}
 }
 
@@ -139,49 +130,54 @@ void LobbyMenu::Render(SDL_Surface* const screen) {
 //Event handlers
 //-------------------------
 
-void LobbyMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
+void LobbyMenu::MouseMotion(SDL_MouseMotionEvent const& event) {
-	search.MouseMotion(motion);
+	searchButton.MouseMotion(event);
-	join.MouseMotion(motion);
+	joinButton.MouseMotion(event);
-	back.MouseMotion(motion);
+	backButton.MouseMotion(event);
 }
 
-void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& event) {
-	search.MouseButtonDown(button);
+	searchButton.MouseButtonDown(event);
-	join.MouseButtonDown(button);
+	joinButton.MouseButtonDown(event);
-	back.MouseButtonDown(button);
+	backButton.MouseButtonDown(event);
 }
 
-void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& event) {
-	if (search.MouseButtonUp(button) == Button::State::HOVER) {
+	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) {
+	if (backButton.MouseButtonUp(event) == Button::State::RELEASED) {
-		SetNextScene(SceneList::MAINMENU);
+		SetSceneSignal(SceneSignal::MAINMENU);
 	}
 
 	//has the user selected a server on the list?
-	BoundingBox tmpBox = listBox;
+	BoundingBox tmpBox = boundingBox;
-	tmpBox.h *= serverInfo.size();
+	tmpBox.h *= serverVector.size(); //within the list bounds
-	if (tmpBox.CheckOverlap({button.x, button.y})) {
+	if (tmpBox.CheckOverlap({event.x, event.y})) {
-		selection = &serverInfo[(button.y - listBox.y)/listBox.h];
+		//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) {
+void LobbyMenu::MouseWheel(SDL_MouseWheelEvent const& event) {
-	switch(key.keysym.sym) {
+	//
+}
+
+void LobbyMenu::KeyDown(SDL_KeyboardEvent const& event) {
+	switch(event.keysym.sym) {
 		case SDLK_ESCAPE:
-			SetNextScene(SceneList::MAINMENU);
+			SetSceneSignal(SceneSignal::MAINMENU);
 		break;
 	}
 }
 
-void LobbyMenu::KeyUp(SDL_KeyboardEvent const& key) {
+void LobbyMenu::KeyUp(SDL_KeyboardEvent const& event) {
 	//
 }
 
@@ -222,17 +218,38 @@ void LobbyMenu::HandlePacket(SerialPacket* const argPacket) {
 
 void LobbyMenu::HandleBroadcastResponse(ServerPacket* const argPacket) {
 	//extract the data
-	ServerInformation server;
+	ServerInfo newServer;
-	server.address = argPacket->srcAddress;
-	server.name = argPacket->name;
-	server.playerCount = argPacket->playerCount;
-	server.version = argPacket->version;
 
-	//Checking compatibility
+	newServer.address = argPacket->srcAddress;
-	server.compatible = server.version == NETWORK_VERSION;
+	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, newServer.name, color);
+	serverVector.back().playerCountImage.SetText(GetRenderer(), font, itoa_base10(newServer.playerCount), color);
 }
 
 void LobbyMenu::HandleJoinResponse(ClientPacket* const argPacket) {
@@ -249,7 +266,7 @@ void LobbyMenu::HandleLoginResponse(ClientPacket* const argPacket) {
 		throw(std::runtime_error("Client index invalid during login"));
 	}
 	accountIndex = argPacket->accountIndex;
-	SetNextScene(SceneList::WORLD);
+	SetSceneSignal(SceneSignal::WORLD);
 }
 
 void LobbyMenu::HandleJoinRejection(TextPacket* const argPacket) {
@@ -271,7 +288,7 @@ void LobbyMenu::SendBroadcastRequest() {
 		network.SendTo(config["server.host"].c_str(), config.Int("server.port"), &packet);
 
 		//reset the server list
-		serverInfo.clear();
+		serverVector.clear();
 		selection = nullptr;
 }
 
@@ -287,10 +304,11 @@ void LobbyMenu::SendJoinRequest() {
 
 void LobbyMenu::SendLoginRequest() {
 	//NOTE: high cohesion
+	//TODO: (9) have a separate login screen
 	ClientPacket packet;
 	packet.type = SerialPacketType::LOGIN_REQUEST;
 	packet.clientIndex = clientIndex;
-	strncpy(packet.username, config["client.username"].c_str(), PACKET_STRING_SIZE);
+	strncpy(packet.username, config["client.username"].c_str(), PACKET_STRING_SIZE+1);
 
 	network.SendTo(Channels::SERVER, &packet);
 }

client/scenes/lobby_menu.hpp

@@ -19,14 +19,15 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef LOBBYMENU_HPP_
+#pragma once
-#define LOBBYMENU_HPP_
 
 //graphics & ui
 #include "image.hpp"
-#include "raster_font.hpp"
 #include "button.hpp"
 #include "bounding_box.hpp"
+#include "text_line.hpp"
+
+#include "SDL2/SDL_ttf.h"
 
 //utilities
 #include "config_utility.hpp"
@@ -45,19 +46,21 @@ public:
 	LobbyMenu(int* const argClientIndex, int* const argAccountIndex);
 	~LobbyMenu();
 
-protected:
+	void RenderFrame(SDL_Renderer* renderer) override;
-	//Frame loop
-	void FrameStart();
-	void Update();
-	void FrameEnd();
-	void Render(SDL_Surface* const);
 
-	//Event handlers
+protected:
-	void MouseMotion(SDL_MouseMotionEvent const&);
+	//frame phases
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
+	void FrameStart() override;
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
+	void Update() override;
-	void KeyDown(SDL_KeyboardEvent const&);
+	void FrameEnd() override;
-	void KeyUp(SDL_KeyboardEvent const&);
+
+	//input events
+	void MouseMotion(SDL_MouseMotionEvent const& event) override;
+	void MouseButtonDown(SDL_MouseButtonEvent const& event) override;
+	void MouseButtonUp(SDL_MouseButtonEvent const& event) override;
+	void MouseWheel(SDL_MouseWheelEvent const& event) override;
+	void KeyDown(SDL_KeyboardEvent const& event) override;
+	void KeyUp(SDL_KeyboardEvent const& event) override;
 
 	//Network handlers
 	void HandlePacket(SerialPacket* const);
@@ -78,15 +81,13 @@ protected:
 	int& clientIndex;
 	int& accountIndex;
 
-	//members
+	//define the list object
-	Image image;
+	struct ServerInfo {
-	RasterFont font;
+		//graphics
-	Button search;
+		TextLine nameImage;
-	Button join;
+		TextLine playerCountImage;
-	Button back;
 
-	//server list
+		//networking
-	struct ServerInformation {
 		IPaddress address;
 		std::string name;
 		int playerCount;
@@ -94,12 +95,16 @@ protected:
 		bool compatible;
 	};
 
-	std::vector<ServerInformation> serverInfo;
+	//members
+	Image buttonImage;
+	Image highlightImage;
+	TTF_Font* font = nullptr;
+	Button searchButton;
+	Button joinButton;
+	Button backButton;
 
-	//NOTE: a terrible hack
+	std::vector<ServerInfo> serverVector;
-	//I'd love a proper gui system for this
+	ServerInfo* selection = nullptr;
-	BoundingBox listBox;
+
-	ServerInformation* selection = nullptr;
+	BoundingBox boundingBox;
 };
-
-#endif

client/scenes/main_menu.cpp

@@ -0,0 +1,146 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "main_menu.hpp"
+
+#include "config_utility.hpp"
+
+#include <sstream>
+#include <stdexcept>
+
+//-------------------------
+//Public access members
+//-------------------------
+
+MainMenu::MainMenu() {
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+
+	//setup the utility objects
+	buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_blue.png");
+	font = TTF_OpenFont(config["client.font"].c_str(), 12);
+
+	//check that the font loaded
+	if (!font) {
+		std::ostringstream msg;
+		msg << "Failed to load a font file; " << SDL_GetError();
+		throw(std::runtime_error(msg.str()));
+	}
+
+	//setup the buttons
+	startButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
+	startButton.SetText(GetRenderer(), font, "Start", COLOR_WHITE);
+	optionsButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
+	optionsButton.SetText(GetRenderer(), font, "Options", COLOR_WHITE);
+	quitButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
+	quitButton.SetText(GetRenderer(), font, "Quit", COLOR_WHITE);
+
+	//set the button positions
+	startButton.SetX(50);
+	startButton.SetY(50 + 20 * 0);
+	optionsButton.SetX(50);
+	optionsButton.SetY(50 + 20 * 1);
+	quitButton.SetX(50);
+	quitButton.SetY(50 + 20 * 2);
+
+	//text box
+	textBox.PushLine(GetRenderer(), font, "Thanks for playing!", {255, 255, 255, 255});
+	textBox.PushLine(GetRenderer(), font, "You can get the latest version at: ", {255, 255, 255, 255});
+	textBox.PushLine(GetRenderer(), font, "krgamestudios.com", {255, 255, 255, 255}); //TODO: (9) click to open the website/update
+
+	//debug
+	//
+}
+
+MainMenu::~MainMenu() {
+	TTF_CloseFont(font);
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void MainMenu::FrameStart() {
+	//
+}
+
+void MainMenu::Update() {
+	//
+}
+
+void MainMenu::FrameEnd() {
+	//
+}
+
+void MainMenu::RenderFrame(SDL_Renderer* renderer) {
+	startButton.DrawTo(renderer);
+	optionsButton.DrawTo(renderer);
+	quitButton.DrawTo(renderer);
+
+	int h = -1;
+	SDL_RenderGetLogicalSize(GetRenderer(), nullptr, &h);
+
+	textBox.DrawTo(renderer, 50, h-50, -12);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void MainMenu::MouseMotion(SDL_MouseMotionEvent const& event) {
+	startButton.MouseMotion(event);
+	optionsButton.MouseMotion(event);
+	quitButton.MouseMotion(event);
+}
+
+void MainMenu::MouseButtonDown(SDL_MouseButtonEvent const& event) {
+	startButton.MouseButtonDown(event);
+	optionsButton.MouseButtonDown(event);
+	quitButton.MouseButtonDown(event);
+}
+
+void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& event) {
+	//TODO: (2) Buttons should only register as "selected" when the left button is used
+	if (startButton.MouseButtonUp(event) == Button::State::RELEASED) {
+		SetSceneSignal(SceneSignal::LOBBYMENU);
+	}
+	if (optionsButton.MouseButtonUp(event) == Button::State::RELEASED) {
+		SetSceneSignal(SceneSignal::OPTIONSMENU);
+	}
+	if (quitButton.MouseButtonUp(event) == Button::State::RELEASED) {
+		QuitEvent();
+	}
+}
+
+void MainMenu::MouseWheel(SDL_MouseWheelEvent const& event) {
+	//
+}
+
+void MainMenu::KeyDown(SDL_KeyboardEvent const& event) {
+	//
+}
+
+void MainMenu::KeyUp(SDL_KeyboardEvent const& event) {
+	switch(event.keysym.sym) {
+		case SDLK_ESCAPE:
+			QuitEvent();
+		break;
+	}
+}

client/scenes/main_menu.hpp

@@ -19,14 +19,14 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef MAINMENU_HPP_
+#pragma once
-#define MAINMENU_HPP_
 
 #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:
+	void RenderFrame(SDL_Renderer* renderer) override;
-	//Frame loop
-	void FrameStart();
-	void Update();
-	void FrameEnd();
-	void Render(SDL_Surface* const);
 
-	//Event handlers
+protected:
-	void MouseMotion(SDL_MouseMotionEvent const&);
+	//frame phases
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
+	void FrameStart() override;
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
+	void Update() override;
-	void KeyDown(SDL_KeyboardEvent const&);
+	void FrameEnd() override;
-	void KeyUp(SDL_KeyboardEvent const&);
+
+	//input events
+	void MouseMotion(SDL_MouseMotionEvent const& event) override;
+	void MouseButtonDown(SDL_MouseButtonEvent const& event) override;
+	void MouseButtonUp(SDL_MouseButtonEvent const& event) override;
+	void MouseWheel(SDL_MouseWheelEvent const& event) override;
+	void KeyDown(SDL_KeyboardEvent const& event) override;
+	void KeyUp(SDL_KeyboardEvent const& event) override;
 
 	//members
-	Image image;
+	Image buttonImage;
-	RasterFont font;
+	TTF_Font* font = nullptr;
 	Button startButton;
 	Button optionsButton;
 	Button quitButton;
+	TextBox textBox;
 };
-
-#endif

client/scenes/makefile

@@ -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

@@ -23,6 +23,9 @@
 
 #include "config_utility.hpp"
 
+#include <sstream>
+#include <stdexcept>
+
 //-------------------------
 //Public access members
 //-------------------------
@@ -31,24 +34,30 @@ OptionsMenu::OptionsMenu() {
 	ConfigUtility& config = ConfigUtility::GetSingleton();
 
 	//setup the utility objects
-	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
+	buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_blue.png");
-	image.SetClipH(image.GetClipH()/3);
+	font = TTF_OpenFont(config["client.font"].c_str(), 12);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
 
-	//pass the utility objects
+	//check that the font loaded
-	backButton.SetImage(&image);
+	if (!font) {
-	backButton.SetFont(&font);
+		std::ostringstream msg;
+		msg << "Failed to load a font file; " << SDL_GetError();
+		throw(std::runtime_error(msg.str()));
+	}
+
+	//setup the button
+	backButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
+	backButton.SetText(GetRenderer(), font, "Back", COLOR_WHITE);
 
 	//set the button positions
 	backButton.SetX(50);
-	backButton.SetY(50 + image.GetClipH() * 0);
+	backButton.SetY(50);
 
-	//set the button texts
+	//text line
-	backButton.SetText("Back");
+	textLine.SetText(GetRenderer(), font, "This code is fucking hard to refactor.", {255, 255, 255, 255});
 }
 
 OptionsMenu::~OptionsMenu() {
-	//
+	TTF_CloseFont(font);
 }
 
 //-------------------------
@@ -67,38 +76,41 @@ void OptionsMenu::FrameEnd() {
 	//
 }
 
-void OptionsMenu::Render(SDL_Surface* const screen) {
+void OptionsMenu::RenderFrame(SDL_Renderer* renderer) {
-	backButton.DrawTo(screen);
+	backButton.DrawTo(renderer);
-
+	textLine.DrawTo(renderer, 50, 30);
-	font.DrawStringTo("Oh, were you looking for the options screen?", screen, 50, 30);
 }
 
 //-------------------------
 //Event handlers
 //-------------------------
 
-void OptionsMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
+void OptionsMenu::MouseMotion(SDL_MouseMotionEvent const& event) {
-	backButton.MouseMotion(motion);
+	backButton.MouseMotion(event);
 }
 
-void OptionsMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+void OptionsMenu::MouseButtonDown(SDL_MouseButtonEvent const& event) {
-	backButton.MouseButtonDown(button);
+	backButton.MouseButtonDown(event);
 }
 
-void OptionsMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+void OptionsMenu::MouseButtonUp(SDL_MouseButtonEvent const& event) {
-	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
+	if (backButton.MouseButtonUp(event) == Button::State::RELEASED) {
-		SetNextScene(SceneList::MAINMENU);
+		SetSceneSignal(SceneSignal::MAINMENU);
 	}
 }
 
-void OptionsMenu::KeyDown(SDL_KeyboardEvent const& key) {
+void OptionsMenu::MouseWheel(SDL_MouseWheelEvent const& event) {
-	switch(key.keysym.sym) {
+	//
+}
+
+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

@@ -19,15 +19,14 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef OPTIONSMENU_HPP_
+#pragma once
-#define OPTIONSMENU_HPP_
+
+#include "button.hpp"
+#include "image.hpp"
+#include "text_line.hpp"
 
 #include "base_scene.hpp"
 
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-
 //NOTE: The options screen needs to be USED
 class OptionsMenu : public BaseScene {
 public:
@@ -35,24 +34,25 @@ public:
 	OptionsMenu();
 	~OptionsMenu();
 
-protected:
+	void RenderFrame(SDL_Renderer* renderer) override;
-	//Frame loop
-	void FrameStart();
-	void Update();
-	void FrameEnd();
-	void Render(SDL_Surface* const);
 
-	//Event handlers
+private:
-	void MouseMotion(SDL_MouseMotionEvent const&);
+	//frame phases
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
+	void FrameStart() override;
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
+	void Update() override;
-	void KeyDown(SDL_KeyboardEvent const&);
+	void FrameEnd() override;
-	void KeyUp(SDL_KeyboardEvent const&);
+
+	//input events
+	void MouseMotion(SDL_MouseMotionEvent const& event) override;
+	void MouseButtonDown(SDL_MouseButtonEvent const& event) override;
+	void MouseButtonUp(SDL_MouseButtonEvent const& event) override;
+	void MouseWheel(SDL_MouseWheelEvent const& event) override;
+	void KeyDown(SDL_KeyboardEvent const& event) override;
+	void KeyUp(SDL_KeyboardEvent const& event) override;
 
 	//members
-	Image image;
+	Image buttonImage;
-	RasterFont font;
+	TTF_Font* font = nullptr;
 	Button backButton;
+	TextLine textLine;
 };
-
-#endif

client/scenes/splash_screen.cpp

@@ -27,8 +27,14 @@
 //Public access members
 //-------------------------
 
-SplashScreen::SplashScreen() {
+SplashScreen::SplashScreen(SDL_Window* w) {
-	logo.LoadSurface(ConfigUtility::GetSingleton()["dir.logos"] + "krstudios.bmp");
+	//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() {
+void SplashScreen::FrameStart() {
-	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(1)) {
+	//TODO: (0) config flag to change the delay
-		SetNextScene(SceneList::MAINMENU);
+	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(3)) {
+		SetSceneSignal(SceneSignal::MAINMENU);
 	}
 }
 
-void SplashScreen::Render(SDL_Surface* const screen) {
+void SplashScreen::RenderFrame(SDL_Renderer* renderer) {
-	logo.DrawTo(screen, (screen->w - logo.GetClipW()) / 2, (screen->h - logo.GetClipH()) / 2);
+	//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

@@ -19,11 +19,9 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SPLASHSCREEN_HPP_
+#pragma once
-#define SPLASHSCREEN_HPP_
 
 #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 FrameStart() override;
-	void Render(SDL_Surface* const);
 
 	//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.cpp

@@ -0,0 +1,925 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "world.hpp"
+
+#include "channels.hpp"
+#include "ip_operators.hpp"
+#include "fatal_error.hpp"
+
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <cstring>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
+
+//-------------------------
+//static functions
+//-------------------------
+
+//TODO: (3) proper checksum
+static int regionChecksum(Region* const region) {
+	int sum = 0;
+	for(int i = 0; i < REGION_WIDTH; i++) {
+		for (int j = 0; j < REGION_HEIGHT; j++) {
+			for (int k = 0; k < REGION_DEPTH; k++) {
+				sum |= region->GetTile(i, j, k);
+			}
+		}
+	}
+	return sum;
+}
+
+//-------------------------
+//Public access members
+//-------------------------
+
+World::World(int* const argClientIndex,	int* const argAccountIndex):
+	clientIndex(*argClientIndex),
+	accountIndex(*argAccountIndex)
+{
+	//setup the utility objects
+	buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_blue.png");
+	font = TTF_OpenFont(config["client.font"].c_str(), 12);
+
+	//check that the font loaded
+	if (!font) {
+		std::ostringstream msg;
+		msg << "Failed to load a font file; " << SDL_GetError();
+		throw(std::runtime_error(msg.str()));
+	}
+
+	//setup the buttons
+	disconnectButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
+	disconnectButton.SetText(GetRenderer(), font, "Disconnect", COLOR_WHITE);
+	shutdownButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
+	shutdownButton.SetText(GetRenderer(), font, "Shutdown", COLOR_WHITE);
+
+	//set the button positions
+	disconnectButton.SetX(50);
+	disconnectButton.SetY(50);
+	shutdownButton.SetX(50);
+	shutdownButton.SetY(70);
+
+	//load the tilesheet
+	//TODO: (2) Tile size and tile sheet should be loaded elsewhere
+	tileSheet.Load(GetRenderer(), config["dir.tilesets"] + "overworld.png", 32, 32);
+
+	//Send the character data
+	CharacterPacket newPacket;
+	newPacket.type = SerialPacketType::CHARACTER_LOAD;
+	strncpy(newPacket.handle, config["client.handle"].c_str(), PACKET_STRING_SIZE);
+	strncpy(newPacket.avatar, config["client.avatar"].c_str(), PACKET_STRING_SIZE);
+	newPacket.accountIndex = accountIndex;
+	network.SendTo(Channels::SERVER, &newPacket);
+
+	//set the camera's values
+	SDL_RenderGetLogicalSize(GetRenderer(), &camera.width, &camera.height);
+
+	//debug
+	//
+}
+
+World::~World() {
+	//unload the local data
+	TTF_CloseFont(font);
+	characterMap.clear();
+	creatureMap.clear();
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void World::FrameStart() {
+	//
+}
+
+void World::Update() {
+	//create and zero the buffer
+	SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]);
+	memset(packetBuffer, 0, MAX_PACKET_SIZE);
+
+	try {
+		//suck in and process all waiting packets
+		while(network.Receive(packetBuffer)) {
+			HandlePacket(packetBuffer);
+		}
+	}
+	catch(fatal_error& e) {
+		throw(e);
+	}
+	catch(std::exception& e) {
+		std::cerr << "HandlePacket Error: " << e.what() << std::endl;
+	}
+
+	//free the buffer
+	delete reinterpret_cast<char*>(packetBuffer);
+
+	//heartbeat system
+	CheckHeartBeat();
+
+	//update all entities
+	for (auto& it : characterMap) {
+		it.second.Update();
+	}
+	for (auto& it : creatureMap) {
+		it.second.Update();
+	}
+
+	try {
+		//update the map
+		UpdateMap();
+	}
+	catch(fatal_error& e) {
+		throw(e);
+	}
+	catch(std::exception& e) {
+		std::cerr << "UpdateMap Error: " << e.what() << std::endl;
+	}
+
+	//skip the rest without a local character
+	if (!localCharacter) {
+		return;
+	}
+
+	//get the collidable boxes
+	std::list<BoundingBox> boxList = GenerateCollisionGrid(localCharacter, tileSheet.GetTileW(), tileSheet.GetTileH());
+
+	//process the collisions
+	//BUG: Collisions not working
+	if (localCharacter->ProcessCollisionGrid(boxList)) {
+		localCharacter->CorrectSprite();
+		SendLocalCharacterMovement();
+	}
+
+	//update the camera
+	camera.x = localCharacter->GetOrigin().x - camera.marginX;
+	camera.y = localCharacter->GetOrigin().y - camera.marginY;
+}
+
+void World::FrameEnd() {
+	//
+}
+
+void World::RenderFrame(SDL_Renderer* renderer) {
+	//draw the map
+	for (std::list<Region>::iterator it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); it++) {
+		tileSheet.DrawRegionTo(renderer, &(*it), camera.x, camera.y);
+
+		//debugging
+//		std::ostringstream msg;
+//		msg << it->GetX() << ", " << it->GetY();
+//		font.DrawStringTo(msg.str(), screen, it->GetX() * tileSheet.GetImage()->GetClipW() - camera.x, it->GetY() * tileSheet.GetImage()->GetClipH() - camera.y);
+	}
+
+	//draw the entities
+	for (auto& it : characterMap) {
+		//BUG: #29 Characters (and other entities) are drawn out of order
+		it.second.DrawTo(renderer, camera.x, camera.y);
+	}
+	for (auto& it : creatureMap) {
+		it.second.DrawTo(renderer, camera.x, camera.y);
+	}
+
+	//draw UI
+	disconnectButton.DrawTo(renderer);
+	shutdownButton.DrawTo(renderer);
+
+	//FPS
+	fpsTextLine.DrawTo(renderer, 0, 0);
+	int fpsRet = fps.Calculate();
+	if (fpsRet != -1) {
+		std::ostringstream msg;
+		msg << "FPS: " << fpsRet;
+		fpsTextLine.SetText(renderer, font, msg.str(), {255, 255, 255, 255});
+	}
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void World::QuitEvent() {
+	//two-step logout
+	SendDisconnectRequest();
+	SetSceneSignal(SceneSignal::QUIT);
+}
+
+void World::MouseMotion(SDL_MouseMotionEvent const& event) {
+	disconnectButton.MouseMotion(event);
+	shutdownButton.MouseMotion(event);
+}
+
+void World::MouseButtonDown(SDL_MouseButtonEvent const& event) {
+	disconnectButton.MouseButtonDown(event);
+	shutdownButton.MouseButtonDown(event);
+}
+
+void World::MouseButtonUp(SDL_MouseButtonEvent const& event) {
+	if (disconnectButton.MouseButtonUp(event) == Button::State::RELEASED) {
+		SendLogoutRequest();
+	}
+	if (shutdownButton.MouseButtonUp(event) == Button::State::RELEASED) {
+		SendAdminShutdownRequest();
+	}
+}
+
+void World::MouseWheel(SDL_MouseWheelEvent const& event) {
+	//
+}
+
+void World::KeyDown(SDL_KeyboardEvent const& event) {
+	//BUGFIX: SDL2 introduced key repeats, so I need to ignore it
+	if (event.repeat) {
+		return;
+	}
+
+	//hotkeys
+	switch(event.keysym.sym) {
+		case SDLK_ESCAPE:
+			//TODO: (3) the escape key should actually control menus and stuff
+			SendLogoutRequest();
+		return;
+	}
+
+	//character movement
+	if (!localCharacter) {
+		return;
+	}
+	Vector2 motion = localCharacter->GetMotion();
+	switch(event.keysym.sym) {
+		case SDLK_w:
+			motion.y -= CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_a:
+			motion.x -= CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_s:
+			motion.y += CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_d:
+			motion.x += CHARACTER_WALKING_SPEED;
+		break;
+		default:
+			//DOCS: prevents wrong keys screwing with character movement
+			return;
+	}
+	//handle diagonals
+	if (motion.x != 0 && motion.y != 0) {
+		motion *= CHARACTER_WALKING_MOD;
+	}
+	//set the info
+	localCharacter->SetMotion(motion);
+	localCharacter->CorrectSprite();
+	SendLocalCharacterMovement();
+}
+
+void World::KeyUp(SDL_KeyboardEvent const& event) {
+	//BUGFIX: SDL2 introduced key repeats, so I need to ignore it
+	if (event.repeat) {
+		return;
+	}
+
+	//character movement
+	if (!localCharacter) {
+		return;
+	}
+	Vector2 motion = localCharacter->GetMotion();
+	switch(event.keysym.sym) {
+		case SDLK_w:
+			motion.y = std::min(0.0, motion.y += CHARACTER_WALKING_SPEED);
+		break;
+		case SDLK_a:
+			motion.x = std::min(0.0, motion.x += CHARACTER_WALKING_SPEED);
+		break;
+		case SDLK_s:
+			motion.y = std::max(0.0, motion.y -= CHARACTER_WALKING_SPEED);
+		break;
+		case SDLK_d:
+			motion.x = std::max(0.0, motion.x -= CHARACTER_WALKING_SPEED);
+		break;
+		default:
+			//DOCS: prevents wrong keys screwing with character movement
+			return;
+	}
+	//BUGFIX: reset cardinal direction speed on key release
+	if (motion.x > 0) {
+		motion.x = CHARACTER_WALKING_SPEED;
+	}
+	else if (motion.x < 0) {
+		motion.x = -CHARACTER_WALKING_SPEED;
+	}
+	if (motion.y > 0) {
+		motion.y = CHARACTER_WALKING_SPEED;
+	}
+	else if (motion.y < 0) {
+		motion.y = -CHARACTER_WALKING_SPEED;
+	}
+	//handle diagonals
+	if (motion.x != 0 && motion.y != 0) {
+		motion *= CHARACTER_WALKING_MOD;
+	}
+	//set the info
+	localCharacter->SetMotion(motion);
+	localCharacter->CorrectSprite();
+	SendLocalCharacterMovement();
+}
+
+//-------------------------
+//Direct incoming traffic
+//-------------------------
+
+void World::HandlePacket(SerialPacket* const argPacket) {
+	switch(argPacket->type) {
+		//heartbeat system
+		case SerialPacketType::PING:
+			hPing(static_cast<ServerPacket*>(argPacket));
+		break;
+		case SerialPacketType::PONG:
+			hPong(static_cast<ServerPacket*>(argPacket));
+		break;
+
+		//game server connections
+		case SerialPacketType::LOGOUT_RESPONSE:
+			hLogoutResponse(static_cast<ClientPacket*>(argPacket));
+		break;
+		case SerialPacketType::DISCONNECT_RESPONSE:
+			hDisconnectResponse(static_cast<ClientPacket*>(argPacket));
+		break;
+		case SerialPacketType::ADMIN_DISCONNECT_FORCED:
+			hAdminDisconnectForced(static_cast<ClientPacket*>(argPacket));
+		break;
+
+		//map management
+		case SerialPacketType::REGION_CONTENT:
+			hRegionContent(static_cast<RegionPacket*>(argPacket));
+		break;
+
+		//character management
+		case SerialPacketType::CHARACTER_UPDATE:
+			hCharacterUpdate(static_cast<CharacterPacket*>(argPacket));
+		break;
+
+		case SerialPacketType::CHARACTER_CREATE:
+			hCharacterCreate(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::CHARACTER_UNLOAD:
+			hCharacterUnload(static_cast<CharacterPacket*>(argPacket));
+		break;
+
+		case SerialPacketType::QUERY_CHARACTER_EXISTS:
+			hQueryCharacterExists(static_cast<CharacterPacket*>(argPacket));
+		break;
+
+		case SerialPacketType::CHARACTER_MOVEMENT:
+			hCharacterMovement(static_cast<CharacterPacket*>(argPacket));
+		break;
+
+		//creature management
+		case SerialPacketType::CREATURE_CREATE:
+			hCreatureCreate(static_cast<CreaturePacket*>(argPacket));
+		break;
+		case SerialPacketType::CREATURE_UNLOAD:
+			hCreatureUnload(static_cast<CreaturePacket*>(argPacket));
+		break;
+
+		case SerialPacketType::QUERY_CREATURE_EXISTS:
+			hQueryCreatureExists(static_cast<CreaturePacket*>(argPacket));
+		break;
+
+		case SerialPacketType::CREATURE_MOVEMENT:
+			hCreatureMovement(static_cast<CreaturePacket*>(argPacket));
+		break;
+
+		//chat
+		case SerialPacketType::TEXT_BROADCAST:
+			hTextBroadcast(static_cast<TextPacket*>(argPacket));
+		break;
+		case SerialPacketType::TEXT_SPEECH:
+			hTextSpeech(static_cast<TextPacket*>(argPacket));
+		break;
+		case SerialPacketType::TEXT_WHISPER:
+			hTextWhisper(static_cast<TextPacket*>(argPacket));
+		break;
+
+		//general rejection messages
+		case SerialPacketType::REGION_REJECTION:
+		case SerialPacketType::CHARACTER_REJECTION:
+		case SerialPacketType::QUERY_REJECTION:
+			throw(fatal_error(static_cast<TextPacket*>(argPacket)->text));
+		break;
+		case SerialPacketType::SHUTDOWN_REJECTION:
+			throw(std::runtime_error(static_cast<TextPacket*>(argPacket)->text));
+		break;
+
+		//errors
+		default: {
+			std::ostringstream msg;
+			msg << "Unknown SerialPacketType encountered in World: " << static_cast<int>(argPacket->type);
+			throw(std::runtime_error(msg.str()));
+		}
+		break;
+	}
+}
+
+//-------------------------
+//heartbeat system
+//-------------------------
+
+void World::hPing(ServerPacket* const argPacket) {
+	ServerPacket newPacket;
+	newPacket.type = SerialPacketType::PONG;
+	network.SendTo(argPacket->srcAddress, &newPacket);
+}
+
+void World::hPong(ServerPacket* const argPacket) {
+	if (*network.GetIPAddress(Channels::SERVER) != argPacket->srcAddress) {
+		throw(std::runtime_error("Heartbeat message received from an unknown source"));
+	}
+	attemptedBeats = 0;
+	lastBeat = Clock::now();
+}
+
+void World::CheckHeartBeat() {
+	//check the connection (heartbeat)
+	if (Clock::now() - lastBeat > std::chrono::seconds(3)) {
+		if (attemptedBeats > 2) {
+			//escape to the disconnect screen
+			SendDisconnectRequest();
+			SetSceneSignal(SceneSignal::DISCONNECTEDSCREEN);
+			ConfigUtility::GetSingleton()["client.disconnectMessage"] = "Error: Lost connection to the server";
+		}
+		else {
+			ServerPacket newPacket;
+			newPacket.type = SerialPacketType::PING;
+			network.SendTo(Channels::SERVER, &newPacket);
+
+			attemptedBeats++;
+			lastBeat = Clock::now();
+		}
+	}
+}
+
+//-------------------------
+//Connection control
+//-------------------------
+
+void World::SendLogoutRequest() {
+	ClientPacket newPacket;
+
+	//send a logout request
+	newPacket.type = SerialPacketType::LOGOUT_REQUEST;
+	newPacket.accountIndex = accountIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void World::SendDisconnectRequest() {
+	ClientPacket newPacket;
+
+	//send a disconnect request
+	newPacket.type = SerialPacketType::DISCONNECT_REQUEST;
+	newPacket.clientIndex = clientIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void World::SendAdminDisconnectForced() {
+	//TODO: (9) World::SendAdminDisconnectForced()
+}
+
+void World::SendAdminShutdownRequest() {
+	ClientPacket newPacket;
+
+	//send a shutdown request
+	newPacket.type = SerialPacketType::ADMIN_SHUTDOWN_REQUEST;
+	newPacket.accountIndex = accountIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void World::hLogoutResponse(ClientPacket* const argPacket) {
+	if (localCharacter) {
+		characterMap.erase(characterIndex);
+		localCharacter = nullptr;
+	}
+
+	accountIndex = -1;
+	characterIndex = -1;
+
+	//reset the camera
+	camera.marginX = camera.marginY = 0;
+
+	//because, why not? I guess...
+	SendDisconnectRequest();
+}
+
+void World::hDisconnectResponse(ClientPacket* const argPacket) {
+	hLogoutResponse(argPacket);//shortcut
+	SetSceneSignal(SceneSignal::DISCONNECTEDSCREEN);
+	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have successfully logged out";
+}
+
+void World::hAdminDisconnectForced(ClientPacket* const argPacket) {
+	hDisconnectResponse(argPacket);//shortcut
+	SetSceneSignal(SceneSignal::DISCONNECTEDSCREEN);
+	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have been forcibly disconnected by the server";
+}
+
+//-------------------------
+//map management
+//-------------------------
+
+void World::SendRegionRequest(int roomIndex, int x, int y) {
+	RegionPacket packet;
+
+	//pack the region's data
+	packet.type = SerialPacketType::REGION_REQUEST;
+	packet.roomIndex = roomIndex;
+	packet.x = x;
+	packet.y = y;
+
+	network.SendTo(Channels::SERVER, &packet);
+}
+
+void World::hRegionContent(RegionPacket* const argPacket) {
+	//checksum
+	if (regionChecksum(argPacket->region) == 0) {
+		std::ostringstream msg;
+		msg << "Received region checksum failed: " << argPacket->x << ", " << argPacket->y;
+		throw(std::runtime_error(msg.str()));
+	}
+
+	//replace existing regions
+	regionPager.UnloadIf([&](Region const& region) -> bool {
+		if (region.GetX() == argPacket->x && region.GetY() == argPacket->y) {
+			std::cout << "Region Overwrite: " << region.GetX() << ", " << region.GetY();
+			std::cout << "\t" << region.GetSolid(1,1) << "\t" << argPacket->region->GetSolid(1,1) << std::endl;
+			return true;
+		}
+		else {
+			return false;
+		}
+	});
+	regionPager.PushRegion(argPacket->region);
+
+	//clean up after the serial code
+	delete argPacket->region;
+	argPacket->region = nullptr;
+}
+
+void World::UpdateMap() {
+	if (roomIndex == -1) {
+		return;
+	}
+
+	//these represent the zone of regions that the client needs loaded, including the mandatory buffers (+1/-1)
+	int xStart = snapToBase(REGION_WIDTH, camera.x/tileSheet.GetTileW()) - REGION_WIDTH;
+	int xEnd = snapToBase(REGION_WIDTH, (camera.x+camera.width)/tileSheet.GetTileW()) + REGION_WIDTH;
+
+	int yStart = snapToBase(REGION_HEIGHT, camera.y/tileSheet.GetTileH()) - REGION_HEIGHT;
+	int yEnd = snapToBase(REGION_HEIGHT, (camera.y+camera.height)/tileSheet.GetTileH()) + REGION_HEIGHT;
+
+	//prune distant regions
+	regionPager.GetContainer()->remove_if([&](Region const& region) -> bool {
+		return region.GetX() < xStart || region.GetX() > xEnd || region.GetY() < yStart || region.GetY() > yEnd;
+	});
+
+	//request empty regions within this zone
+	for (int i = xStart; i <= xEnd; i += REGION_WIDTH) {
+		for (int j = yStart; j <= yEnd; j += REGION_HEIGHT) {
+			Region* region = regionPager.FindRegion(i, j);
+			if (!region) {
+				//request absent region
+				SendRegionRequest(roomIndex, i, j);
+			}
+			else if (regionChecksum(region) == 0) {
+				//checksum failed
+				regionPager.UnloadIf([region](Region const& ref) -> bool {
+					//remove the erroneous region
+					return region == &ref;
+				});
+				SendRegionRequest(roomIndex, i, j);
+				std::ostringstream msg;
+				msg << "Existing region checksum failed: " << roomIndex << ", " << i << ", " << j;
+				throw(std::runtime_error(msg.str()));
+			}
+		}
+	}
+}
+
+//-------------------------
+//character management
+//-------------------------
+
+//DOCS: preexisting characters will result in query responses
+//DOCS: new characters will result in create messages
+//DOCS: this client's character will exist in both (skipped)
+
+void World::hCharacterUpdate(CharacterPacket* const argPacket) {
+	//TODO: (1) Authentication
+	//NOTE: applies to the local character too
+
+	//check that this character exists
+	std::map<int, BaseCharacter>::iterator characterIt = characterMap.find(argPacket->characterIndex);
+	if (characterIt != characterMap.end()) {
+		//update the origin and motion, if there's a difference
+		if (characterIt->second.GetOrigin() != argPacket->origin) {
+			characterIt->second.SetOrigin(argPacket->origin);
+		}
+		if (characterIt->second.GetMotion() != argPacket->motion) {
+			characterIt->second.SetMotion(argPacket->motion);
+			characterIt->second.CorrectSprite(); //only correct the sprite if the motion changes
+		}
+	}
+}
+
+void World::hCharacterCreate(CharacterPacket* const argPacket) {
+	//prevent double message
+	if (characterMap.find(argPacket->characterIndex) != characterMap.end()) {
+		std::ostringstream msg;
+		msg << "Double character creation event; ";
+		msg << "Index: " << argPacket->characterIndex << "; ";
+		msg << "Handle: " << argPacket->handle;
+		throw(std::runtime_error(msg.str()));
+	}
+
+	//implicity create and retrieve the entity
+	BaseCharacter* character = &characterMap[argPacket->characterIndex];
+
+	//fill the character's info
+	character->SetHandle(argPacket->handle);
+	character->SetAvatar(GetRenderer(), argPacket->avatar);
+	character->SetOwner(argPacket->accountIndex);
+	character->SetOrigin(argPacket->origin);
+	character->SetMotion(argPacket->motion);
+	character->SetBounds(argPacket->bounds);
+
+	character->CorrectSprite();
+
+	//check for this player's character
+	if (character->GetOwner() == accountIndex) {
+		localCharacter = static_cast<LocalCharacter*>(character);
+
+		//focus the camera on this character's sprite
+		camera.marginX = (camera.width / 2 - localCharacter->GetSprite()->GetClipW() / 2);
+		camera.marginY = (camera.height/ 2 - localCharacter->GetSprite()->GetClipH() / 2);
+
+		//focus on this character's info
+		characterIndex = argPacket->characterIndex;
+		roomIndex = argPacket->roomIndex;
+
+		//query the world state (room)
+		CharacterPacket newPacket;
+		memset(&newPacket, 0, MAX_PACKET_SIZE);
+		newPacket.type = SerialPacketType::QUERY_CHARACTER_EXISTS;
+		newPacket.roomIndex = roomIndex;
+		network.SendTo(Channels::SERVER, &newPacket);
+		newPacket.type = SerialPacketType::QUERY_CREATURE_EXISTS;
+		network.SendTo(Channels::SERVER, &newPacket);
+	}
+
+	//debug
+	std::cout << "Character Create, total: " << characterMap.size() << std::endl;
+}
+
+void World::hCharacterUnload(CharacterPacket* const argPacket) {
+	//ignore if this character doesn't exist
+	std::map<int, BaseCharacter>::iterator characterIt = characterMap.find(argPacket->characterIndex);
+	if (characterIt == characterMap.end()) {
+		return;
+	}
+
+	//check for this player's character
+	if ((*characterIt).second.GetOwner() == accountIndex) {
+		localCharacter = nullptr;
+
+		//clear the camera
+		camera.marginX = 0;
+		camera.marginY = 0;
+
+		//clear the room
+		roomIndex = -1;
+		regionPager.UnloadAll();
+		characterMap.clear();
+		creatureMap.clear();
+	}
+	else {
+		//remove this character
+		characterMap.erase(characterIt);
+	}
+
+	//debug
+	std::cout << "Character Unload, total: " << characterMap.size() << std::endl;
+}
+
+void World::hQueryCharacterExists(CharacterPacket* const argPacket) {
+	//prevent a double message about this player's character
+	//TODO: why is this commented out?
+//	if (argPacket->accountIndex == accountIndex) {
+//		return;
+//	}
+
+	//ignore characters in a different room (sub-optimal)
+	if (argPacket->roomIndex != roomIndex) {
+		return;
+	}
+
+	//implicitly construct the character if it doesn't exist
+	BaseCharacter* character = &characterMap[argPacket->characterIndex];
+
+	//set/update the character's info
+	character->SetOrigin(argPacket->origin);
+	character->SetMotion(argPacket->motion);
+	character->SetBounds({CHARACTER_BOUNDS_X, CHARACTER_BOUNDS_Y, CHARACTER_BOUNDS_WIDTH, CHARACTER_BOUNDS_HEIGHT});
+	character->SetHandle(argPacket->handle);
+	character->SetAvatar(GetRenderer(), argPacket->avatar);
+	character->SetOwner(argPacket->accountIndex);
+	character->CorrectSprite();
+
+	//debug
+	std::cout << "Character Query, total: " << characterMap.size() << std::endl;
+}
+
+void World::hCharacterMovement(CharacterPacket* const argPacket) {
+	//TODO: (1) Authentication
+	if (argPacket->characterIndex == characterIndex) {
+		return;
+	}
+
+	//check that this character exists
+	std::map<int, BaseCharacter>::iterator characterIt = characterMap.find(argPacket->characterIndex);
+	if (characterIt != characterMap.end()) {
+		//set the origin and motion
+		characterIt->second.SetOrigin(argPacket->origin);
+		characterIt->second.SetMotion(argPacket->motion);
+		characterIt->second.CorrectSprite();
+	}
+}
+
+//-------------------------
+//creature management
+//-------------------------
+
+void World::hCreatureCreate(CreaturePacket* const argPacket) {
+	//check for logic errors
+	if (creatureMap.find(argPacket->creatureIndex) != creatureMap.end()) {
+		std::ostringstream msg;
+		msg << "Double creature creation event; ";
+		msg << "Index: " << argPacket->creatureIndex << "; ";
+		msg << "Handle: " << argPacket->handle;
+		throw(std::runtime_error(msg.str()));
+	}
+
+	//ignore creatures from other rooms
+	if (roomIndex != argPacket->roomIndex) {
+		//temporary error checking
+		std::ostringstream msg;
+		msg << "Creature from the wrong room received: ";
+		msg << "creatureIndex: " << argPacket->creatureIndex << ", roomIndex: " << argPacket->roomIndex;
+		throw(std::runtime_error(msg.str()));
+	}
+
+	//implicitly create the element
+	BaseCreature* creature = &creatureMap[argPacket->creatureIndex];
+
+	//fill the creature's info
+	creature->SetHandle(argPacket->handle);
+	creature->SetAvatar(GetRenderer(), argPacket->avatar);
+	creature->SetBounds(argPacket->bounds);
+	creature->SetOrigin(argPacket->origin);
+	creature->SetMotion(argPacket->motion);
+
+	//debug
+	std::cout << "Creature Create, total: " << creatureMap.size() << std::endl;
+}
+
+void World::hCreatureUnload(CreaturePacket* const argPacket) {
+	//ignore if this creature doesn't exist
+	std::map<int, BaseCreature>::iterator creatureIt = creatureMap.find(argPacket->creatureIndex);
+	if (creatureIt == creatureMap.end()) {
+		return;
+	}
+
+	//remove this creature
+	creatureMap.erase(creatureIt);
+
+	//debug
+	std::cout << "Creature Unload, total: " << creatureMap.size() << std::endl;
+}
+
+void World::hQueryCreatureExists(CreaturePacket* const argPacket) {
+	//ignore creatures in a different room (sub-optimal)
+	if (argPacket->roomIndex != roomIndex) {
+		return;
+	}
+
+	//implicitly create the element
+	BaseCreature* creature = &creatureMap[argPacket->creatureIndex];
+
+	//fill the creature's info
+	creature->SetHandle(argPacket->handle);
+	creature->SetAvatar(GetRenderer(), argPacket->avatar);
+	creature->SetBounds(argPacket->bounds);
+	creature->SetOrigin(argPacket->origin);
+	creature->SetMotion(argPacket->motion);
+
+	//debug
+	std::cout << "Creature Query, total: " << creatureMap.size() << std::endl;
+}
+
+void World::hCreatureMovement(CreaturePacket* const argPacket) {
+	//ignore if this creature doesn't exist
+	std::map<int, BaseCreature>::iterator creatureIt = creatureMap.find(argPacket->creatureIndex);
+	if (creatureIt == creatureMap.end()) {
+		return;
+	}
+
+	creatureIt->second.SetOrigin(argPacket->origin);
+	creatureIt->second.SetMotion(argPacket->motion);
+}
+
+//-------------------------
+//chat
+//-------------------------
+
+void World::hTextBroadcast(TextPacket* const argPacket) {
+	//TODO: (9) World::hTextBroadcast()
+}
+
+void World::hTextSpeech(TextPacket* const argPacket) {
+	//TODO: (9) World::hTextSpeech()
+}
+
+void World::hTextWhisper(TextPacket* const argPacket) {
+	//TODO: (9) World::hTextWhisper()
+}
+
+//-------------------------
+//player movement & collision
+//-------------------------
+
+void World::SendLocalCharacterMovement() {
+	CharacterPacket newPacket;
+	newPacket.type = SerialPacketType::CHARACTER_MOVEMENT;
+
+	newPacket.accountIndex = accountIndex;
+	newPacket.characterIndex = characterIndex;
+	newPacket.roomIndex = roomIndex;
+	newPacket.origin = localCharacter->GetOrigin();
+	newPacket.motion = localCharacter->GetMotion();
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+std::list<BoundingBox> World::GenerateCollisionGrid(Entity* ptr, int tileWidth, int tileHeight) {
+	//prepare for collisions
+	BoundingBox wallBounds = {0, 0, tileWidth, tileHeight};
+	std::list<BoundingBox> boxList;
+
+	//NOTE: for loops were too dense to work with, so I've just used while loops
+
+	//outer loop
+	wallBounds.x = snapToBase((double)wallBounds.w, ptr->GetOrigin().x);
+	while(wallBounds.x < (ptr->GetOrigin() + ptr->GetBounds()).x + ptr->GetBounds().w) {
+		//inner loop
+		wallBounds.y = snapToBase((double)wallBounds.h, ptr->GetOrigin().y);
+		while(wallBounds.y < (ptr->GetOrigin() + ptr->GetBounds()).y + ptr->GetBounds().h) {
+			//check to see if this tile is solid (non-existant tiles are always false)
+
+			if (regionPager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
+				//push onto the box set
+				boxList.push_front(wallBounds);
+			}
+
+			//increment
+			wallBounds.y += wallBounds.h;
+		}
+
+		//increment
+		wallBounds.x += wallBounds.w;
+	}
+
+	return std::move(boxList);
+}

client/scenes/world.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef INWORLD_HPP_
+#pragma once
-#define INWORLD_HPP_
 
 //maps
 #include "region_pager_base.hpp"
@@ -32,18 +31,22 @@
 
 //graphics
 #include "image.hpp"
-#include "raster_font.hpp"
 #include "button.hpp"
 #include "tile_sheet.hpp"
+#include "text_line.hpp"
 
 //common
 #include "frame_rate.hpp"
 
 //client
 #include "base_scene.hpp"
-#include "base_monster.hpp"
+#include "base_creature.hpp"
 #include "local_character.hpp"
 
+#include "SDL2/SDL.h"
+#include "SDL2/SDL_net.h"
+#include "SDL2/SDL_ttf.h"
+
 //STL
 #include <map>
 
@@ -55,21 +58,22 @@ public:
 	World(int* const argClientIndex, int* const argAccountIndex);
 	~World();
 
-protected:
+	void RenderFrame(SDL_Renderer* renderer) override;
-	//Frame loop
-	void FrameStart();
-	void Update();
-	void FrameEnd();
-	void RenderFrame();
-	void Render(SDL_Surface* const);
 
-	//Event handlers
+private:
+	//frame phases
+	void FrameStart() override;
+	void Update() override;
+	void FrameEnd() override;
+
+	//input events
 	void QuitEvent();
-	void MouseMotion(SDL_MouseMotionEvent const&);
+	void MouseMotion(SDL_MouseMotionEvent const& event) override;
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
+	void MouseButtonDown(SDL_MouseButtonEvent const& event) override;
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
+	void MouseButtonUp(SDL_MouseButtonEvent const& event) override;
-	void KeyDown(SDL_KeyboardEvent const&);
+	void MouseWheel(SDL_MouseWheelEvent const& event) override;
-	void KeyUp(SDL_KeyboardEvent const&);
+	void KeyDown(SDL_KeyboardEvent const& event) override;
+	void KeyUp(SDL_KeyboardEvent const& event) override;
 
 	//handle incoming traffic
 	void HandlePacket(SerialPacket* const);
@@ -98,25 +102,18 @@ protected:
 	//character management
 	void hCharacterUpdate(CharacterPacket* const);
 	void hCharacterCreate(CharacterPacket* const);
-	void hCharacterDelete(CharacterPacket* const);
+	void hCharacterUnload(CharacterPacket* const);
 	void hQueryCharacterExists(CharacterPacket* const);
-	void hQueryCharacterStats(CharacterPacket* const);
-	void hQueryCharacterLocation(CharacterPacket* const);
 	void hCharacterMovement(CharacterPacket* const);
-	void hCharacterAttack(CharacterPacket* const);
-	void hCharacterDamage(CharacterPacket* const);
 
-	//monster management
+	//creature management
-	void hMonsterCreate(MonsterPacket* const);
+	void hCreatureCreate(CreaturePacket* const);
-	void hMonsterDelete(MonsterPacket* const);
+	void hCreatureUnload(CreaturePacket* const);
-	void hQueryMonsterExists(MonsterPacket* const);
+	void hQueryCreatureExists(CreaturePacket* const);
-	void hQueryMonsterStats(MonsterPacket* const);
+	void hCreatureMovement(CreaturePacket* const);
-	void hQueryMonsterLocation(MonsterPacket* const);
-	void hMonsterMovement(MonsterPacket* const);
-	void hMonsterAttack(MonsterPacket* const);
-	void hMonsterDamage(MonsterPacket* const);
 
 	//chat
+	//TODO: ui chat engine
 	void hTextBroadcast(TextPacket* const);
 	void hTextSpeech(TextPacket* const);
 	void hTextWhisper(TextPacket* const);
@@ -132,17 +129,18 @@ protected:
 	int roomIndex = -1;
 
 	//graphics
-	Image buttonImage;
-	RasterFont font;
 	TileSheet tileSheet;
 
 	//map
 	RegionPagerBase regionPager;
 
 	//UI
+	Image buttonImage;
+	TTF_Font* font = nullptr;
 	Button disconnectButton;
-	Button shutDownButton;
+	Button shutdownButton;
 	FrameRate fps;
+	TextLine fpsTextLine;
 
 	//the camera structure
 	struct {
@@ -153,7 +151,7 @@ protected:
 
 	//entities
 	std::map<int, BaseCharacter> characterMap;
-	std::map<int, BaseMonster> monsterMap;
+	std::map<int, BaseCreature> creatureMap;
 	LocalCharacter* localCharacter = nullptr;
 
 	//heartbeat
@@ -166,5 +164,3 @@ protected:
 	ConfigUtility& config = ConfigUtility::GetSingleton();
 	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
 };
-
-#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.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef TIMER_HPP_
+#pragma once
-#define TIMER_HPP_
 
 #include <chrono>
 #include <string>
@@ -50,5 +49,3 @@ private:
 };
 
 std::ostream& operator<<(std::ostream& os, Timer& t);
-
-#endif

common/frameworks/network/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../graphics
+INCLUDES+=. packet_types ../gameplay ../map ../utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
@@ -10,13 +10,10 @@ 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)
+	$(MAKE) -C packet_types
 
 $(OBJ): | $(OBJDIR)
 
@@ -30,8 +27,3 @@ $(OUTDIR):
 
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all

common/frameworks/scenes/application.cpp

@@ -0,0 +1,188 @@
+/* Copyright: (c) Kayne Ruse 2015
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "application.hpp"
+
+#include <chrono>
+#include <sstream>
+#include <stdexcept>
+
+void Application::Init(int argc, char* argv[]) {
+	//create and check the window
+	window = SDL_CreateWindow(
+		"Example Caption",
+		SDL_WINDOWPOS_UNDEFINED,
+		SDL_WINDOWPOS_UNDEFINED,
+		screenWidth,
+		screenHeight,
+		SDL_WINDOW_RESIZABLE);
+
+	if (!window) {
+		std::ostringstream msg;
+		msg << "Failed to create the window: " << 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, screenWidth, screenHeight);
+
+	//set the hook for the renderer
+	BaseScene::SetRenderer(renderer);
+}
+
+void Application::Proc() {
+	//load the first scene
+	ProcessSceneSignal(SceneSignal::FIRST);
+
+	//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 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 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);
+		}
+
+		SDL_RenderClear(renderer);
+		activeScene->RenderFrame(renderer);
+		SDL_RenderPresent(renderer);
+	}
+
+	//cleanup
+	ClearScene();
+}
+
+void Application::Quit() {
+	//clean up after the program
+	BaseScene::SetRenderer(nullptr);
+	SDL_DestroyRenderer(renderer);
+	SDL_DestroyWindow(window);
+}
+
+//-------------------------
+//Scene management
+//-------------------------
+
+void Application::ProcessEvents() {
+	SDL_Event event;
+	while(SDL_PollEvent(&event)) {
+		switch(event.type) {
+			case SDL_QUIT:
+				activeScene->QuitEvent();
+			break;
+
+			case SDL_MOUSEMOTION:
+				activeScene->MouseMotion(event.motion);
+			break;
+
+			case SDL_MOUSEBUTTONDOWN:
+				activeScene->MouseButtonDown(event.button);
+			break;
+
+			case SDL_MOUSEBUTTONUP:
+				activeScene->MouseButtonUp(event.button);
+			break;
+
+			case SDL_MOUSEWHEEL:
+				activeScene->MouseWheel(event.wheel);
+			break;
+
+			case SDL_KEYDOWN:
+				activeScene->KeyDown(event.key);
+			break;
+
+			case SDL_KEYUP:
+				activeScene->KeyUp(event.key);
+			break;
+
+			//TODO: joystick and controller events
+
+			//window events are handled internally
+			case SDL_WINDOWEVENT:
+				switch(event.window.event) {
+					case SDL_WINDOWEVENT_RESIZED:
+						SDL_RenderSetLogicalSize(renderer, event.window.data1, event.window.data2);
+					break;
+				}
+			break;
+		}
+	}
+}
+
+//Add the custom scene headers here
+#include "example_scene.hpp"
+
+void Application::ProcessSceneSignal(SceneSignal signal) {
+	ClearScene();
+
+	switch(signal) {
+		case SceneSignal::FIRST:
+		case SceneSignal::EXAMPLE_SCENE:
+			activeScene = new ExampleScene();
+		break;
+		default: {
+			std::ostringstream msg;
+			msg << "Failed to recognize the scene signal: " << signal;
+			throw(std::logic_error(msg.str()));
+		}
+	}
+}
+
+void Application::ClearScene() {
+	delete activeScene;
+	activeScene = nullptr;
+}

common/frameworks/scenes/application.hpp

@@ -0,0 +1,54 @@
+/* Copyright: (c) Kayne Ruse 2015
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#pragma once
+
+#include "base_scene.hpp"
+#include "scene_signal.hpp"
+
+#include "SDL2/SDL.h"
+
+//TODO: do something with these
+constexpr int screenWidth = 800;
+constexpr int screenHeight = 600;
+
+//DOCS: The Application class handles scene switching, utilizing only one window
+class Application {
+public:
+	Application() = default;
+	~Application() = default;
+
+	void Init(int argc, char* argv[]);
+	void Proc();
+	void Quit();
+
+private:
+	//scene management
+	void ProcessEvents();
+	void ProcessSceneSignal(SceneSignal);
+	void ClearScene();
+
+	BaseScene* activeScene = nullptr;
+
+	//TODO: build a "window" class?
+	SDL_Window* window = nullptr;
+	SDL_Renderer* renderer = nullptr;
+};

common/frameworks/scenes/base_scene.cpp

@@ -0,0 +1,105 @@
+/* Copyright: (c) Kayne Ruse 2015
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "base_scene.hpp"
+
+SDL_Renderer* BaseScene::rendererHandle = nullptr;
+
+BaseScene::BaseScene() {
+	//EMPTY
+}
+
+BaseScene::~BaseScene() {
+	//EMPTY
+}
+
+void BaseScene::RenderFrame(SDL_Renderer* renderer) {
+	//EMPTY
+}
+
+void BaseScene::SetRenderer(SDL_Renderer* r) {
+	rendererHandle = r;
+}
+
+SDL_Renderer* BaseScene::GetRenderer() {
+	return rendererHandle;
+}
+
+void BaseScene::SetSceneSignal(SceneSignal signal) {
+	sceneSignal = signal;
+}
+
+SceneSignal BaseScene::GetSceneSignal() {
+	return sceneSignal;
+}
+
+//-------------------------
+//frame phases
+//-------------------------
+
+void BaseScene::FrameStart() {
+	//EMPTY
+}
+
+void BaseScene::Update() {
+	//EMPTY
+}
+
+void BaseScene::FrameEnd() {
+	//EMPTY
+}
+
+//-------------------------
+//input events
+//-------------------------
+
+void BaseScene::QuitEvent() {
+	sceneSignal = SceneSignal::QUIT;
+}
+
+void BaseScene::MouseMotion(SDL_MouseMotionEvent const& event) {
+	//EMPTY
+}
+
+void BaseScene::MouseButtonDown(SDL_MouseButtonEvent const& event) {
+	//EMPTY
+}
+
+void BaseScene::MouseButtonUp(SDL_MouseButtonEvent const& event) {
+	//EMPTY
+}
+
+void BaseScene::MouseWheel(SDL_MouseWheelEvent const& event) {
+	//EMPTY
+}
+
+void BaseScene::KeyDown(SDL_KeyboardEvent const& event) {
+	//preference as a default
+	switch(event.keysym.sym) {
+		case SDLK_ESCAPE:
+			QuitEvent();
+		break;
+	}
+}
+
+void BaseScene::KeyUp(SDL_KeyboardEvent const& event) {
+	//EMPTY
+}

common/frameworks/scenes/base_scene.hpp

@@ -0,0 +1,61 @@
+/* Copyright: (c) Kayne Ruse 2015
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#pragma once
+
+#include "scene_signal.hpp"
+
+#include "SDL2/SDL.h"
+
+class BaseScene {
+public:
+	BaseScene();
+	virtual ~BaseScene();
+
+	virtual void RenderFrame(SDL_Renderer*);
+	static void SetRenderer(SDL_Renderer*);
+	SceneSignal GetSceneSignal();
+
+	//frame phases
+	virtual void FrameStart();
+	virtual void Update();
+	virtual void FrameEnd();
+
+	//input events
+	virtual void QuitEvent();
+	virtual void MouseMotion(SDL_MouseMotionEvent const& event);
+	virtual void MouseButtonDown(SDL_MouseButtonEvent const& event);
+	virtual void MouseButtonUp(SDL_MouseButtonEvent const& event);
+	virtual void MouseWheel(SDL_MouseWheelEvent const& event);
+	virtual void KeyDown(SDL_KeyboardEvent const& event);
+	virtual void KeyUp(SDL_KeyboardEvent const& event);
+
+	//TODO: joystick and controller events
+
+protected:
+	//control
+	static SDL_Renderer* GetRenderer();
+	void SetSceneSignal(SceneSignal);
+
+private:
+	static SDL_Renderer* rendererHandle;
+	SceneSignal sceneSignal = SceneSignal::CONTINUE;
+};

common/frameworks/scenes/example_scene.cpp

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

common/frameworks/scenes/example_scene.hpp

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

common/frameworks/scenes/main.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,15 +19,25 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "monster_manager_api.hpp"
+#include "application.hpp"
 
-#include "monster_manager.hpp"
+#include "SDL2/SDL.h"
 
-static const luaL_Reg monsterManagerLib[] = {
+#include <iostream>
-	{nullptr, nullptr}
+#include <stdexcept>
-};
 
-LUAMOD_API int openMonsterManagerAPI(lua_State* L) {
+int main(int argc, char** argv) {
-	luaL_newlib(L, monsterManagerLib);
+	std::cout << "Beginning " << argv[0] << std::endl;
-	return 1;
+	try {
+		Application app;
+		app.Init(argc, argv);
+		app.Proc();
+		app.Quit();
+	}
+	catch(std::exception& e) {
+		std::cerr << "Fatal Error: " << e.what() << std::endl;
+		return 1;
+	}
+	std::cout << "Clean exit from " << argv[0] << std::endl;
+	return 0;
 }

common/frameworks/scenes/makefile

@@ -0,0 +1,56 @@
+#include directories
+INCLUDES+=.
+
+#libraries
+#the order of the $(LIBS) is important, at least for MinGW
+LIBS+=
+ifeq ($(OS),Windows_NT)
+	LIBS+=-lmingw32
+endif
+LIBS+=-lSDL2main -lSDL2
+
+#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)
+
+#objects
+OBJDIR=obj
+OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
+
+#output
+OUTDIR=out
+OUT=$(addprefix $(OUTDIR)/,scenes)
+
+#targets
+all: $(OBJ) $(OUT)
+	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
+
+$(OBJ): | $(OBJDIR)
+
+$(OUT): | $(OUTDIR)
+
+$(OBJDIR):
+	mkdir $(OBJDIR)
+
+$(OUTDIR):
+	mkdir $(OUTDIR)
+
+$(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)
+endif
+
+rebuild: clean all

common/frameworks/scenes/scene_signal.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,12 +19,14 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef MONSTERMANAGERAPI_HPP_
+#pragma once
-#define MONSTERMANAGERAPI_HPP_
 
-#include "lua.hpp"
+enum SceneSignal {
+	//reserved members for internal use
+	QUIT = -1,
+	CONTINUE = 0,
+	FIRST = 1,
 
-#define TORTUGA_MONSTER_MANAGER_API "monster_manager"
+	//custom scenes
-LUAMOD_API int openMonsterManagerAPI(lua_State* L);
+	EXAMPLE_SCENE
-
+};
-#endif

common/gameplay/character_defines.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CHARACTERDEFINES_HPP_
+#pragma once
-#define CHARACTERDEFINES_HPP_
 
 #include <cmath>
 
@@ -38,5 +37,3 @@ constexpr int CHARACTER_BOUNDS_HEIGHT = 32;
 //the character's sprite format
 constexpr int CHARACTER_CELLS_X = 4;
 constexpr int CHARACTER_CELLS_Y = 4;
-
-#endif

common/gameplay/makefile

@@ -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/button.cpp

@@ -0,0 +1,167 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "button.hpp"
+
+#include <stdexcept>
+
+void Button::DrawTo(SDL_Renderer* renderer) {
+	image.SetClipY(image.GetClipH() * state);
+	image.DrawTo(renderer, posX, posY);
+}
+
+void Button::SetBackgroundTexture(SDL_Renderer* renderer, SDL_Texture* texture) {
+	//copy the given texture
+	image.Free();
+
+	//a null texture can simply free the image
+	if (!texture) {
+		return;
+	}
+
+	//get the w & h, & create
+	int w = 0, h = 0;
+	SDL_QueryTexture(texture, nullptr, nullptr, &w, &h);
+	image.Create(renderer, w, h);
+
+	//copy
+	SDL_SetRenderTarget(renderer, image.GetTexture());
+	SDL_RenderCopy(renderer, texture, nullptr, nullptr);
+	SDL_SetRenderTarget(renderer, nullptr);
+
+	//prune
+	image.SetClipH(image.GetClipH() / 3);
+}
+
+void Button::SetText(SDL_Renderer* renderer, TTF_Font* font, std::string s, SDL_Color color) {
+	//make the surface (from SDL_ttf)
+	SDL_Surface* surf = TTF_RenderText_Solid(font, s.c_str(), color);
+	if (!surf) {
+		throw(std::runtime_error("Failed to create a TTF surface"));
+	}
+
+	//convert to texture
+	SDL_Texture* text = SDL_CreateTextureFromSurface(renderer, surf);
+	SDL_FreeSurface(surf);
+	if (!text) {
+		throw(std::runtime_error("Failed to create a TTF texture"));
+	}
+
+	//get the dimensions & rects
+	int x, y, w, h;
+	SDL_QueryTexture(text, nullptr, nullptr, &w, &h);
+	x = (image.GetClipW() - w) / 2;
+	y = (image.GetClipH() - h) / 2;
+	SDL_Rect src = {0, 0, w, h};
+	SDL_Rect dst;
+
+	//draw the text to the background
+	SDL_SetRenderTarget(renderer, image.GetTexture());
+
+	for (int i = 0; i < 3; i++) {
+		dst = {x, y + image.GetClipH() * i, w, h};
+		SDL_RenderCopy(renderer, text, &src, &dst);
+	}
+
+	SDL_SetRenderTarget(renderer, nullptr);
+
+	//free the texture
+	SDL_DestroyTexture(text);
+}
+
+void Button::SetX(int x) {
+	posX = x;
+}
+
+void Button::SetY(int y) {
+	posY = y;
+}
+
+Button::State Button::MouseMotion(SDL_MouseMotionEvent const& event) {
+	//if out of bounds, exit
+	if (!CheckBounds(event.x, event.y)) {
+		return state = State::IDLE;
+	}
+
+	//if in bounds, check button
+	if (event.state & SDL_BUTTON_LMASK && state == State::PRESSED) {
+		//stay pressed
+//		state = State::PRESSED;
+	}
+	else {
+		state = State::HOVER;
+	}
+
+	return state;
+}
+
+Button::State Button::MouseButtonDown(SDL_MouseButtonEvent const& event) {
+	//if out of bounds, exit
+	if (!CheckBounds(event.x, event.y)) {
+		return state = State::IDLE;
+	}
+
+	//if in bounds, check button
+	if (event.button == SDL_BUTTON_LEFT) {
+		return state = State::PRESSED;
+	}
+
+	//NOTE: if not left button down, ignore
+	return State::HOVER;
+}
+
+Button::State Button::MouseButtonUp(SDL_MouseButtonEvent const& event) {
+	//if out of bounds, exit
+	if (!CheckBounds(event.x, event.y)) {
+		return state = State::IDLE;
+	}
+
+	//if not left button up, ignore
+	if (event.button != SDL_BUTTON_LEFT) {
+		return state;
+	}
+
+	//if in bounds and left button up, send release signal
+	if (state == State::PRESSED) {
+		state = State::HOVER;
+		return State::RELEASED;
+	}
+
+	return state;
+}
+
+void Button::SetState(State s) {
+	state = s;
+}
+
+Button::State Button::GetState() {
+	return state;
+}
+
+bool Button::CheckBounds(int x, int y) {
+	//return if true (x, y) is within bounds, otherwise return false
+	return !(
+		x < posX ||
+		y < posY ||
+		x > posX + image.GetClipW() ||
+		y > posY + image.GetClipH()
+		);
+}

common/graphics/button.hpp

@@ -19,36 +19,50 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef TILESHEET_HPP_
+#pragma once
-#define TILESHEET_HPP_
-
-#include "region.hpp"
 
 #include "image.hpp"
 
+#include "SDL2/SDL_ttf.h"
+
 #include <string>
 
-class TileSheet {
+constexpr SDL_Color COLOR_WHITE = {255, 255, 255, 255};
+constexpr SDL_Color COLOR_RED = {255, 0, 0, 255};
+constexpr SDL_Color COLOR_ORANGE = {255, 127, 0, 255};
+constexpr SDL_Color COLOR_BLUE = {0, 0, 255, 255};
+
+class Button {
 public:
-	TileSheet() = default;
+	enum State {
-	TileSheet(std::string f, int w, int h) { Load(f, w, h); }
+		IDLE = 0, HOVER = 1, PRESSED = 2, RELEASED = 3
-	~TileSheet() = default;
+	};
 
-	void Load(std::string fname, int tileWidth, int tileHeight);
+	//methods
-	void Unload();
+	Button() = default;
+	~Button() = default;
 
-	void DrawTileTo(SDL_Surface* const dest, int x, int y, Region::type_t tile);
+	void DrawTo(SDL_Renderer*);
-	void DrawRegionTo(SDL_Surface* const dest, Region* const region, int camX, int camY);
+
+	//setup
+	void SetBackgroundTexture(SDL_Renderer*, SDL_Texture*);
+	void SetText(SDL_Renderer*, TTF_Font*, std::string, SDL_Color);
+	void SetX(int x);
+	void SetY(int y);
+
+	//capture input
+	State MouseMotion(SDL_MouseMotionEvent const&);
+	State MouseButtonDown(SDL_MouseButtonEvent const&);
+	State MouseButtonUp(SDL_MouseButtonEvent const&);
+
+	//states
+	void SetState(State); //TODO: idle, busy or disabled
+	State GetState();
+
+protected:
+	bool CheckBounds(int x, int y);
 
-	//accessors
-	Image* GetImage() { return &image; }
-	int GetXCount() { return xCount; }
-	int GetYCount() { return yCount; }
-	int GetTileW() { return image.GetClipW(); }
-	int GetTileH() { return image.GetClipH(); }
-private:
 	Image image;
-	int xCount = 0, yCount = 0;
+	int posX = 0, posY = 0;
+	State state = State::IDLE;
 };
-
-#endif

common/graphics/image.cpp

@@ -21,8 +21,10 @@
 */
 #include "image.hpp"
 
-#include <stdexcept>
+#include "SDL2/SDL_image.h"
+
 #include <sstream>
+#include <stdexcept>
 
 Image& Image::operator=(Image const& rhs) {
 	//don't screw yourself
@@ -30,10 +32,10 @@ Image& Image::operator=(Image const& rhs) {
 		return *this;
 	}
 
-	FreeSurface();
+	Free();
 
 	//Copy the other Image's stuff
-	surface = rhs.surface;
+	texture = rhs.texture;
 	clip = rhs.clip;
 	local = false;
 }
@@ -44,102 +46,166 @@ Image& Image::operator=(Image&& rhs) {
 		return *this;
 	}
 
-	FreeSurface();
+	Free();
 
 	//Steal the other Image's stuff
-	surface = rhs.surface;
+	texture = rhs.texture;
 	clip = rhs.clip;
 	local = rhs.local;
 
-	rhs.surface = nullptr;
+	rhs.texture = nullptr;
 	rhs.clip = {0, 0, 0, 0};
 	rhs.local = false;
 }
 
-SDL_Surface* Image::LoadSurface(std::string fname) {
+SDL_Texture* Image::Load(SDL_Renderer* renderer, std::string fname) {
-	FreeSurface();
+	Free();
-	SDL_Surface* p = SDL_LoadBMP(fname.c_str());
+
-	if (!p) {
+	//load the file into a surface
-		std::ostringstream os;
+	SDL_Surface* surface = IMG_Load(fname.c_str());
-		os << "Failed to load file: " << fname;
+	if (!surface) {
-		throw(std::runtime_error(os.str()));
+		std::ostringstream msg;
+		msg << "Failed to load an image file: " << fname;
+		msg << "; " << IMG_GetError();
+		throw(std::runtime_error(msg.str()));
+	}
+
+	//create a texture from this surface
+	texture = SDL_CreateTextureFromSurface(renderer, surface);
+	if (!texture) {
+		std::ostringstream msg;
+		msg << "Failed to convert a newly loaded image file: " << fname;
+		msg << "; " << SDL_GetError();
+		throw(std::runtime_error(msg.str()));
+	}
+
+	//set the metadata
+	clip.x = 0;
+	clip.y = 0;
+	if (SDL_QueryTexture(texture, nullptr, nullptr, &clip.w, &clip.h)) {
+		std::ostringstream msg;
+		msg << "Failed to record metadata for a newly loaded image file: " << fname;
+		msg << "; " << SDL_GetError();
+		throw(std::runtime_error(msg.str()));
 	}
-	surface = p;
-	clip = {0, 0, (Uint16)surface->w, (Uint16)surface->h};
 	local = true;
-	SetTransparentColor(255, 0, 255); //default
+
-	return surface;
+	//free the surface & return
+	SDL_FreeSurface(surface);
+	return texture;
 }
 
-SDL_Surface* Image::CreateSurface(Uint16 w, Uint16 h) {
+SDL_Texture* Image::Create(SDL_Renderer* renderer, Uint16 w, Uint16 h, SDL_Color blank) {
-	FreeSurface();
+	Free();
-	Uint32 rmask, gmask, bmask, amask;
+
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+	//make the texture
-    rmask = 0xff000000;
+	texture = SDL_CreateTexture(renderer,
-    gmask = 0x00ff0000;
+		SDL_PIXELFORMAT_RGBA8888,
-    bmask = 0x0000ff00;
+		SDL_TEXTUREACCESS_TARGET,
-    amask = 0x000000ff;
+		w, h);
-#else
+
-    rmask = 0x000000ff;
+	//check
-    gmask = 0x0000ff00;
+	if (!texture) {
-    bmask = 0x00ff0000;
+		std::ostringstream msg;
-    amask = 0xff000000;
+		msg << "Failed to create a texture; " << SDL_GetError();
-#endif
+		throw(std::runtime_error(msg.str()));
-	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"));
+	//set the metadata
+	clip.x = 0;
+	clip.y = 0;
+	if (SDL_QueryTexture(texture, nullptr, nullptr, &clip.w, &clip.h)) {
+		std::ostringstream msg;
+		msg << "Failed to record metadata for a newly created image";
+		msg << "; " << SDL_GetError();
+		throw(std::runtime_error(msg.str()));
 	}
-	surface = p;
-	clip = {0, 0, (Uint16)surface->w, (Uint16)surface->h};
 	local = true;
-	SetTransparentColor(255, 0, 255); //default
+
-	return surface;
+	//blank (black) texture
+	SDL_SetRenderTarget(renderer, texture);
+	SDL_SetRenderDrawColor(renderer, blank.r, blank.g, blank.b, blank.a);
+	SDL_RenderFillRect(renderer, nullptr);
+	SDL_SetRenderDrawColor(renderer, 0, 0, 0, 0);
+	SDL_SetRenderTarget(renderer, nullptr);
+
+	return texture;
 }
 
-SDL_Surface* Image::SetSurface(SDL_Surface* p) {
+SDL_Texture* Image::CopyTexture(SDL_Renderer* renderer, SDL_Texture* ptr) {
-	FreeSurface();
+	Free();
-	if (!p) {
+	int w = 0, h = 0;
-		throw(std::invalid_argument("No surface pointer provided"));
+
+	//get the info
+	SDL_QueryTexture(ptr, nullptr, nullptr, &w, &h);
+
+	//create a texture of (w, h) size (also sets the metadata)
+	Create(renderer, w, h);
+
+	//copy the argument texture to the local texture
+	SDL_SetRenderTarget(renderer, texture);
+	SDL_RenderCopy(renderer, ptr, nullptr, nullptr);
+	SDL_SetRenderTarget(renderer, nullptr);
+
+	//return the local texture
+	return texture;
+}
+
+SDL_Texture* Image::SetTexture(SDL_Texture* ptr) {
+	Free();
+
+	texture = ptr;
+
+	//set the metadata
+	clip.x = 0;
+	clip.y = 0;
+	if (SDL_QueryTexture(texture, nullptr, nullptr, &clip.w, &clip.h)) {
+		std::ostringstream msg;
+		msg << "Failed to record metadata for a newly image image";
+		msg << "; " << SDL_GetError();
+		throw(std::runtime_error(msg.str()));
 	}
-	surface = p;
-	clip = {0, 0, (Uint16)surface->w, (Uint16)surface->h};
 	local = false;
-	return surface;
+
+	return texture;
 }
 
-void Image::FreeSurface() {
+SDL_Texture* Image::GetTexture() const {
+	return texture;
+}
+
+void Image::Free() {
 	if (local) {
-		SDL_FreeSurface(surface);
+		SDL_DestroyTexture(texture);
 		local = false;
 	}
-	surface = nullptr;
+	texture = nullptr;
 	clip = {0, 0, 0, 0};
 }
 
-void Image::DrawTo(SDL_Surface* dest, Sint16 x, Sint16 y) {
+void Image::DrawTo(SDL_Renderer* const renderer, Sint16 x, Sint16 y, double scaleX, double scaleY) {
-	if (!surface) {
+	if (!texture) {
-		throw(std::logic_error("No image surface to draw"));
+		throw(std::logic_error("No image texture to draw"));
 	}
-	SDL_Rect sclip = clip, dclip = {x,y};
+	SDL_Rect sclip = clip;
-	SDL_BlitSurface(surface, &sclip, dest, &dclip);
+	SDL_Rect dclip = {x, y, Uint16(clip.w * scaleX), Uint16(clip.h * scaleY)};
+	SDL_RenderCopy(renderer, texture, &sclip, &dclip);
 }
 
-void Image::SetTransparentColor(Uint8 r, Uint8 g, Uint8 b) {
+void Image::SetAlpha(Uint8 a) {
-	if (!surface) {
+	if (SDL_SetTextureAlphaMod(texture, a)) {
-		throw(std::logic_error("Failed to set the transparent color"));
+		std::ostringstream msg;
+		msg << "Failed to set alpha; " << SDL_GetError();
+		throw(std::runtime_error(msg.str()));
 	}
-	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() {
+Uint8 Image::GetAlpha() {
-	if (!surface) {
+	Uint8 ret = 0;
-		throw(std::logic_error("Failed to clear the transparent color"));
+	if (SDL_GetTextureAlphaMod(texture, &ret)) {
+		std::ostringstream msg;
+		msg << "Failed to get alpha; " << SDL_GetError();
+		throw(std::runtime_error(msg.str()));
 	}
-	if (!local) {
+	return ret;
-		throw(std::logic_error("Cannot clear the transparent color of a non-local surface"));
+}
-	}
-	SDL_SetColorKey(surface, 0, 0);
-}

common/graphics/image.hpp

@@ -19,10 +19,10 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef IMAGE_HPP_
+#pragma once
-#define IMAGE_HPP_
+
+#include "SDL2/SDL.h"
 
-#include "SDL/SDL.h"
 #include <string>
 
 class Image {
@@ -30,21 +30,25 @@ public:
 	Image() = default;
 	Image(Image const& rhs) { *this = rhs; }
 	Image(Image&& rhs) { *this = std::move(rhs); }
-	Image(std::string fname) { LoadSurface(fname); }
+	Image(SDL_Renderer* r, std::string fname) { Load(r, fname); }
-	Image(Uint16 w, Uint16 h) { CreateSurface(w, h); }
+	Image(SDL_Renderer* r, Uint16 w, Uint16 h) { Create(r, w, h); }
-	Image(SDL_Surface* p) { SetSurface(p); }
+	Image(SDL_Texture* p) { SetTexture(p); }
-	~Image() { FreeSurface(); }
+	virtual ~Image() { Free(); }
 
 	Image& operator=(Image const&);
 	Image& operator=(Image&&);
 
-	SDL_Surface* LoadSurface(std::string fname);
+	SDL_Texture* Load(SDL_Renderer* renderer, std::string fname);
-	SDL_Surface* CreateSurface(Uint16 w, Uint16 h);
+	SDL_Texture* Create(SDL_Renderer* renderer, Uint16 w, Uint16 h, SDL_Color blank = {0, 0, 0, 255});
-	SDL_Surface* SetSurface(SDL_Surface*);
+	SDL_Texture* CopyTexture(SDL_Renderer* renderer, SDL_Texture* ptr);
-	SDL_Surface* GetSurface() const { return surface; }
+	SDL_Texture* SetTexture(SDL_Texture*);
-	void FreeSurface();
+	SDL_Texture* GetTexture() const;
+	virtual void Free();
 
-	void DrawTo(SDL_Surface* const, Sint16 x, Sint16 y);
+	void DrawTo(SDL_Renderer* const, Sint16 x, Sint16 y, double scaleX = 1.0, double scaleY = 1.0);
+
+	void SetAlpha(Uint8 a);
+	Uint8 GetAlpha();
 
 	//Clip handlers
 	SDL_Rect SetClip(SDL_Rect r) { return clip = r; }
@@ -62,12 +66,8 @@ public:
 
 	bool GetLocal() const { return local; }
 
-	void SetTransparentColor(Uint8 r, Uint8 g, Uint8 b);
-	void ClearTransparentColor();
 protected:
-	SDL_Surface* surface = nullptr;
+	SDL_Texture* texture = nullptr;
 	SDL_Rect clip = {0, 0, 0, 0};
 	bool local = false;
-};
+};
-
-#endif

common/graphics/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../map
+INCLUDES+=.
 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)
@@ -30,8 +26,3 @@ $(OUTDIR):
 
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all

common/graphics/sprite_sheet.cpp

@@ -21,82 +21,166 @@
 */
 #include "sprite_sheet.hpp"
 
-#include <stdexcept>
 #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 (++xIndex >= xCount) {
+		//if the index is out of bounds
-			xIndex = 0;
+		if (++indexX >= countX) {
+			indexX = 0;
 		}
 		tick = 0;
 	}
-	image.SetClipX(xIndex * image.GetClipW());
+	//modify area drawn
-	image.SetClipY(yIndex * image.GetClipH());
+	clip.x = indexX * clip.w;
+	clip.y = indexY * clip.h;
 }
 
-SDL_Surface* SpriteSheet::LoadSurface(std::string fname, Uint16 xCellCount, Uint16 yCellCount) {
+SDL_Texture* SpriteSheet::Load(SDL_Renderer* r, std::string fname, Uint16 cx, Uint16 cy) {
-	image.LoadSurface(fname);
+	//call the base function
+	Image::Load(r, fname);
 
-	xCount = xCellCount;
+	//set the metadata
-	yCount = yCellCount;
+	countX = cx;
+	countY = cy;
 
-	image.SetClipW(image.GetSurface()->w / xCount);
+	//assume clip.x and clip.y were set to the size of the texture
-	image.SetClipH(image.GetSurface()->h / yCount);
+	//reduce the w & h to the size of one cell
+	clip.w = clip.w / countX;
+	clip.h = clip.h / countY;
 
-	xIndex = yIndex = 0;
+	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;
 }
 
-SDL_Surface* SpriteSheet::SetSurface(SDL_Surface* surface, Uint16 xCellCount, Uint16 yCellCount) {
+Uint16 SpriteSheet::SetCountX(Uint16 i) {
-	image.SetSurface(surface);
+	indexX = 0;
-
+	return countX = i;
-	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() {
+Uint16 SpriteSheet::SetCountY(Uint16 i) {
-	image.FreeSurface();
+	indexY = 0;
-	xCount = yCount = 0;
+	return countY = i;
-	xIndex = yIndex = 0;
-	delay = tick = 0.0;
 }
 
-Uint16 SpriteSheet::SetXCount(Uint16 i) {
+Uint16 SpriteSheet::SetIndexX(Uint16 i) {
-	xIndex = 0;
+	if (i > countX) {
-	return xCount = i;
+		std::ostringstream msg;
-}
+		msg << "Cannot set index 'x' to " << i;
-
+		throw(std::out_of_range(msg.str()));
-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;
+	return indexX = i;
 }
 
-Uint16 SpriteSheet::SetYIndex(Uint16 i) {
+Uint16 SpriteSheet::SetIndexY(Uint16 i) {
-	if (i > yCount) {
+	if (i > countY) {
-		std::ostringstream os;
+		std::ostringstream msg;
-		os << "Cannot set y index to " << i;
+		msg << "Cannot set index 'y' to " << i;
-		throw(std::invalid_argument(os.str()));
+		throw(std::invalid_argument(msg.str()));
 	}
-	return yIndex = i;
+	return indexY = i;
 }
 
 double SpriteSheet::SetDelay(double d) {
 	tick = 0;
 	return delay = d;
-}
+}

common/graphics/sprite_sheet.hpp

@@ -19,48 +19,52 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SPRITESHEET_HPP_
+#pragma once
-#define SPRITESHEET_HPP_
 
 #include "image.hpp"
 
-class SpriteSheet {
+class SpriteSheet : public Image {
 public:
 	SpriteSheet() = default;
-	SpriteSheet(std::string fname, Uint16 xCellCount, Uint16 yCellCount) { LoadSurface(fname, xCellCount, yCellCount); }
+	SpriteSheet(SpriteSheet const& rhs) { *this = rhs; }
-	SpriteSheet(SDL_Surface* surface, Uint16 xCellCount, Uint16 yCellCount) { SetSurface(surface, xCellCount, yCellCount); }
+	SpriteSheet(SpriteSheet&& rhs) { *this = std::move(rhs); }
-	~SpriteSheet() { FreeSurface(); };
+	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_Surface* LoadSurface(std::string fname, Uint16 xCellCount, Uint16 yCellCount);
+	SDL_Texture* Load(SDL_Renderer*, std::string fname, Uint16 cx, Uint16 cy);
-	SDL_Surface* SetSurface(SDL_Surface* surface, Uint16 xCellCount, Uint16 yCellCount);
+	SDL_Texture* Create(SDL_Renderer*, Uint16 w, Uint16 h, Uint16 cx, Uint16 cy);
-	SDL_Surface* GetSurface() { return image.GetSurface(); }
+	SDL_Texture* SetTexture(SDL_Texture*, Uint16 cx, Uint16 cy);
-	void FreeSurface();
+	void Free() override;
 
-	void DrawTo(SDL_Surface* const dest, Sint16 x, Sint16 y) { image.DrawTo(dest, x, y); }
+	Uint16 SetCountX(Uint16);
+	Uint16 SetCountY(Uint16);
+	Uint16 SetIndexX(Uint16);
+	Uint16 SetIndexY(Uint16);
 
-	//accessors and mutators
+	Uint16 GetCountX() const { return countX; }
-	Image* GetImage() { return ℑ } //OO breaker
+	Uint16 GetCountY() const { return countY; }
-
+	Uint16 GetIndexX() const { return indexX; }
-	Uint16 SetXCount(Uint16);
+	Uint16 GetIndexY() const { return indexY; }
-	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 countX = 0, countY = 0, indexX = 0, indexY = 0;
-	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
+	//disable access
+	using Image::Load;
+	using Image::Create;
+	using Image::SetTexture;
+};

common/graphics/text_box.cpp

@@ -0,0 +1,56 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "text_box.hpp"
+
+#include <stdexcept>
+
+TextBox::TextBox() {
+	//
+}
+
+TextBox::~TextBox() {
+	//
+}
+
+void TextBox::DrawTo(SDL_Renderer* renderer, int posX, int posY, int pointSize) {
+	for (std::list<TextLine>::iterator it = lineList.begin(); it != lineList.end(); it++) {
+		it->DrawTo(renderer, posX, posY);
+		posY += pointSize;
+	}
+}
+
+void TextBox::PushLine(SDL_Renderer* renderer, TTF_Font* font, std::string str, SDL_Color color) {
+	lineList.emplace_front(renderer, font, str, color);
+}
+
+void TextBox::PopLine(int num) {
+	//prevent underflow
+	num < lineList.size() ? num : lineList.size();
+
+	for (int i = 0; i < num; ++i) {
+		lineList.pop_back();
+	}
+}
+
+void TextBox::ClearLines() {
+	lineList.clear();
+}

common/graphics/text_box.hpp

@@ -19,24 +19,27 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "monster_data.hpp"
+#pragma once
 
-MonsterData::MonsterData(): Entity("monster") {
+#include "text_line.hpp"
-	//EMPTY
-}
 
-std::string MonsterData::SetAvatar(std::string s) {
+#include "SDL2/SDL.h"
-	return avatar = s;
+#include "SDL2/SDL_ttf.h"
-}
 
-std::string MonsterData::GetAvatar() {
+#include <string>
-	return avatar;
+#include <list>
-}
 
-int MonsterData::SetScriptReference(int i) {
+class TextBox {
-	return scriptRef = i;
+public:
-}
+	TextBox();
+	~TextBox();
 
-int MonsterData::GetScriptReference() {
+	void DrawTo(SDL_Renderer*, int posX, int posY, int pointSize);
-	return scriptRef;
+
-}
+	void PushLine(SDL_Renderer*, TTF_Font*, std::string, SDL_Color color);
+	void PopLine(int num = 1);
+	void ClearLines();
+
+private:
+	std::list<TextLine> lineList;
+};

common/graphics/text_line.cpp

@@ -0,0 +1,70 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "text_line.hpp"
+
+#include <stdexcept>
+
+SDL_Texture* renderTextTexture(SDL_Renderer* renderer, TTF_Font* font, std::string str, SDL_Color color) {
+	//make the surface (from SDL_ttf)
+	SDL_Surface* surface = TTF_RenderText_Solid(font, str.c_str(), color);
+	if (!surface) {
+		throw(std::runtime_error("Failed to create a TTF surface"));
+	}
+
+	//convert to texture
+	SDL_Texture* texture = SDL_CreateTextureFromSurface(renderer, surface);
+
+	//cleanup
+	SDL_FreeSurface(surface);
+
+	//check
+	if (!texture) {
+		throw(std::runtime_error("Failed to create a TTF texture"));
+	}
+
+	//NOTE: free the texture yourself
+	return texture;
+}
+
+TextLine::TextLine() {
+	//
+}
+
+TextLine::~TextLine() {
+	ClearText();
+}
+
+void TextLine::DrawTo(SDL_Renderer* renderer, int posX, int posY) {
+	SDL_Rect dclip = {posX, posY, 0, 0};
+	SDL_QueryTexture(texture, nullptr, nullptr, &dclip.w, &dclip.h);
+	SDL_RenderCopy(renderer, texture, nullptr, &dclip);
+}
+
+void TextLine::SetText(SDL_Renderer* renderer, TTF_Font* font, std::string str, SDL_Color color) {
+	//just use the above global function
+	SDL_DestroyTexture(texture);
+	texture = renderTextTexture(renderer, font, str, color);
+}
+
+void TextLine::ClearText() {
+	SDL_DestroyTexture(texture);
+}

common/graphics/text_line.hpp

@@ -0,0 +1,45 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#pragma once
+
+#include "SDL2/SDL.h"
+#include "SDL2/SDL_ttf.h"
+
+#include <string>
+
+SDL_Texture* renderTextTexture(SDL_Renderer*, TTF_Font*, std::string, SDL_Color color);
+
+class TextLine {
+public:
+	TextLine();
+	TextLine(SDL_Renderer* r, TTF_Font* f, std::string s, SDL_Color c)
+		{ SetText(r, f, s, c); }
+	virtual ~TextLine();
+
+	void DrawTo(SDL_Renderer*, int posX, int posY);
+
+	void SetText(SDL_Renderer*, TTF_Font*, std::string, SDL_Color color);
+	void ClearText();
+
+protected:
+	SDL_Texture* texture = nullptr;
+};

common/graphics/tile_sheet.cpp

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

@@ -1,13 +1,28 @@
-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 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/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../utilities
+INCLUDES+=. ../graphics
 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)
@@ -30,8 +26,3 @@ $(OUTDIR):
 
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all

common/map/region.cpp

@@ -62,7 +62,7 @@ bool Region::SetSolid(int x, int y, bool b) {
 	return solid[x * REGION_WIDTH + y] = b;
 }
 
-bool Region::GetSolid(int x, int y) {
+bool Region::GetSolid(int x, int y) const {
 	if (x < 0 || y < 0 || x >= REGION_WIDTH || y >= REGION_HEIGHT) {
 		throw(std::out_of_range("Region::GetSolid() argument out of range"));
 	}

common/map/region.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGION_HPP_
+#pragma once
-#define REGION_HPP_
 
 #include <bitset>
 
@@ -45,7 +44,7 @@ public:
 	type_t GetTile(int x, int y, int z);
 
 	bool SetSolid(int x, int y, bool b);
-	bool GetSolid(int x, int y);
+	bool GetSolid(int x, int y) const;
 
 	//accessors
 	int GetX() const;
@@ -53,11 +52,11 @@ public:
 
 	std::bitset<REGION_WIDTH*REGION_HEIGHT>* GetSolidBitset();
 private:
+	friend class TileSheet;
+
 	const int x;
 	const int y;
 
 	type_t tiles[REGION_WIDTH][REGION_HEIGHT][REGION_DEPTH];
 	std::bitset<REGION_WIDTH*REGION_HEIGHT> solid;
 };
-
-#endif

common/map/region_api.hpp

@@ -19,12 +19,9 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGIONAPI_HPP_
+#pragma once
-#define REGIONAPI_HPP_
 
 #include "lua.hpp"
 
 #define TORTUGA_REGION_API "region"
 LUAMOD_API int openRegionAPI(lua_State* L);
-
-#endif

common/map/region_pager_api.hpp

@@ -19,12 +19,9 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGIONPAGERAPI_HPP_
+#pragma once
-#define REGIONPAGERAPI_HPP_
 
 #include "lua.hpp"
 
 #define TORTUGA_REGION_PAGER_API "region_pager"
 LUAMOD_API int openRegionPagerAPI(lua_State* L);
-
-#endif

common/map/region_pager_base.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGIONPAGERBASE_HPP_
+#pragma once
-#define REGIONPAGERBASE_HPP_
 
 #include "region.hpp"
 
@@ -57,5 +56,3 @@ public:
 protected:
 	std::list<Region> regionList;
 };
-
-#endif

common/map/region_pager_lua.cpp

@@ -23,9 +23,6 @@
 
 #include <stdexcept>
 
-//DOCS: Load, Save and Create fail unless the lua function has been set
-//DOCS: UnloadIf and UnloadAll will still continue without the function set
-
 RegionPagerLua::~RegionPagerLua() {
 	//unload all regions
 	UnloadAll();
@@ -44,6 +41,7 @@ Region* RegionPagerLua::LoadRegion(int x, int y) {
 	//check if this function is available
 	if (lua_isnil(lua, -1)) {
 		lua_pop(lua, 1);
+		//signal that there is no load function
 		return nullptr;
 	}
 
@@ -57,17 +55,20 @@ Region* RegionPagerLua::LoadRegion(int x, int y) {
 	}
 
 	//check the return value, success or failure
-	if (lua_toboolean(lua, -1)) {
+	if (lua_isboolean(lua, -1) && lua_toboolean(lua, -1)) {
 		lua_pop(lua, 1);
+		//push and return the loaded region
 		regionList.push_front(tmpRegion);
 		return &regionList.front();
 	}
 	else {
 		lua_pop(lua, 1);
+		//signal a failure
 		return nullptr;
 	}
 }
 
+//NOTE: this return value seems strange; could replace it with a boolean
 //return the saved region, or nullptr on failure
 Region* RegionPagerLua::SaveRegion(int x, int y) {
 	//get the pager's function from the registry
@@ -76,6 +77,7 @@ Region* RegionPagerLua::SaveRegion(int x, int y) {
 	//check if this function is available
 	if (lua_isnil(lua, -1)) {
 		lua_pop(lua, 1);
+		//signal that the region wasn't saved
 		return nullptr;
 	}
 
@@ -83,6 +85,7 @@ Region* RegionPagerLua::SaveRegion(int x, int y) {
 	Region* ptr = FindRegion(x, y);
 	if (!ptr) {
 		lua_pop(lua, 1);
+		//signal that there is no save function
 		return nullptr;
 	}
 	lua_pushlightuserdata(lua, ptr);
@@ -93,17 +96,20 @@ Region* RegionPagerLua::SaveRegion(int x, int y) {
 	}
 
 	//check the return value, success or failure
-	if (lua_toboolean(lua, -1)) {
+	if (lua_isboolean(lua, -1) && lua_toboolean(lua, -1)) {
 		lua_pop(lua, 1);
+		//return the specified region that was saved
 		return ptr;
 	}
 	else {
 		lua_pop(lua, 1);
+		//signal a failure
 		return nullptr;
 	}
 }
 
-//return the created region, or nullptr on failure
+//DOCS: since this method is the last ditch call from GetRegion, it must return a valid region object, even if the create function hasn't been set.
+//return a new region, throwing an error on failure
 Region* RegionPagerLua::CreateRegion(int x, int y) {
 	if (FindRegion(x, y)) {
 		throw(std::logic_error("Cannot overwrite an existing region"));
@@ -115,7 +121,9 @@ Region* RegionPagerLua::CreateRegion(int x, int y) {
 	//check if this function is available
 	if (lua_isnil(lua, -1)) {
 		lua_pop(lua, 1);
-		return nullptr;
+		//return an empty region object
+		regionList.emplace_front(x, y);
+		return &regionList.front();
 	}
 
 	//something to work on

common/map/region_pager_lua.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGIONPAGERLUA_HPP_
+#pragma once
-#define REGIONPAGERLUA_HPP_
 
 #include "region_pager_base.hpp"
 
@@ -29,6 +28,8 @@
 #include <functional>
 #include <string>
 
+//DOCS: set the lua hook before use
+
 class RegionPagerLua : public RegionPagerBase {
 public:
 	RegionPagerLua() = default;
@@ -65,5 +66,3 @@ protected:
 	int createRef = LUA_NOREF;
 	int unloadRef = LUA_NOREF;
 };
-
-#endif

common/map/tile_sheet.cpp

@@ -0,0 +1,124 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "tile_sheet.hpp"
+
+#include <stdexcept>
+
+TileSheet& TileSheet::operator=(TileSheet const& rhs) {
+	//don't screw yourself
+	if (this == &rhs) {
+		return *this;
+	}
+
+	Free();
+
+	//Copy the other TileSheet's stuff
+	texture = rhs.texture;
+	clip = rhs.clip;
+	local = false;
+	countX = rhs.countX;
+	countY = rhs.countY;
+}
+
+TileSheet& TileSheet::operator=(TileSheet&& rhs) {
+	//don't screw yourself
+	if (this == &rhs) {
+		return *this;
+	}
+
+	Free();
+
+	//Copy the other TileSheet's stuff
+	texture = rhs.texture;
+	clip = rhs.clip;
+	local = false;
+	countX = rhs.countX;
+	countY = rhs.countY;
+
+	rhs.texture = nullptr;
+	rhs.clip = {0, 0, 0, 0};
+	rhs.local = false;
+	rhs.countX = 0;
+	rhs.countY = 0;
+}
+
+void TileSheet::Load(SDL_Renderer* renderer, std::string fname, int tileWidth, int tileHeight) {
+	Image::Load(renderer, fname);
+	countX = clip.w / tileWidth;
+	countY = clip.h / tileHeight;
+	clip.w = tileWidth;
+	clip.h = tileHeight;
+}
+
+SDL_Texture* TileSheet::SetTexture(SDL_Texture* ptr, int tileWidth, int tileHeight) {
+	Image::SetTexture(ptr);
+	countX = clip.w / tileWidth;
+	countY = clip.h / tileHeight;
+	clip.w = tileWidth;
+	clip.h = tileHeight;
+}
+
+void TileSheet::Free() {
+	Image::Free();
+	countX = countY = 0;
+}
+
+void TileSheet::DrawLayerTo(SDL_Renderer* const renderer, Region* const region, int layer, int camX, int camY, double scaleX, double scaleY) {
+	//TODO: (2) empty
+}
+
+void TileSheet::DrawRegionTo(SDL_Renderer* const renderer, Region* const region, int camX, int camY, double scaleX, double scaleY) {
+	//NOTE: TileSheet is a friend class of Region
+	//reimplementing DrawTo() to improve performance (less indirection)
+	if (!texture) {
+		throw(std::logic_error("No image texture to draw"));
+	}
+
+	//the local variables
+	SDL_Rect sclip = {0, 0, clip.w, clip.h};
+	SDL_Rect dclip = {0, 0, Uint16(clip.w * scaleX), Uint16(clip.h * scaleY)};
+	Region::type_t tile = 0;
+
+	//for each tile
+	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) {
+				//get the value to skip expensive lookups
+				tile = region->tiles[i][j][k];
+
+				//0 is invisible
+				if (tile == 0) continue;
+
+				//set the sclip
+				sclip.x = (tile-1) % countX * clip.h;
+				sclip.y = (tile-1) / countX * clip.w;
+
+				//set the dclip
+				dclip.x = ((region->x + i) * clip.w - camX) * scaleX;
+				dclip.y = ((region->y + j) * clip.h - camY) * scaleY;
+
+				//draw
+				SDL_RenderCopy(renderer, texture, &sclip, &dclip);
+			}
+		}
+	}
+}

common/map/tile_sheet.hpp

@@ -0,0 +1,67 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#pragma once
+
+#include "region.hpp"
+
+#include "image.hpp"
+
+#include <string>
+
+class TileSheet : public Image {
+public:
+	TileSheet() = default;
+	TileSheet(TileSheet const& rhs) { *this = rhs; }
+	TileSheet(TileSheet&& rhs) { *this = std::move(rhs); }
+	TileSheet(SDL_Renderer* r, std::string fn, int tw, int th) { Load(r, fn, tw, th); }
+	TileSheet(SDL_Texture* p, int tw, int th) { SetTexture(p, tw, th); }
+	~TileSheet() = default;
+
+	TileSheet& operator=(TileSheet const&);
+	TileSheet& operator=(TileSheet&&);
+
+	void Load(SDL_Renderer*, std::string fname, int tileWidth, int tileHeight);
+	SDL_Texture* SetTexture(SDL_Texture*, int tileWidth, int tileHeight);
+	void Free() override;
+
+	void DrawLayerTo(SDL_Renderer* const renderer, Region* const region, int layer, int camX, int camY, double scaleX = 1.0, double scaleY = 1.0);
+	void DrawRegionTo(SDL_Renderer* const renderer, Region* const region, int camX, int camY, double scaleX = 1.0, double scaleY = 1.0);
+
+	//accessors
+	//DOCS: Reuse Image::clip for tile sizes
+	int GetCountX() { return countX; }
+	int GetCountY() { return countY; }
+	int GetTileW() { return clip.w; }
+	int GetTileH() { return clip.h; }
+
+protected:
+	int countX = 0, countY = 0;
+
+	using Image::Load;
+	using Image::Create;
+	using Image::SetTexture;
+	using Image::SetClip;
+	using Image::SetClipX;
+	using Image::SetClipY;
+	using Image::SetClipW;
+	using Image::SetClipH;
+};

common/network/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)
@@ -31,8 +27,3 @@ $(OUTDIR):
 
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all

common/network/packet_types/character_packet.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CHARACTERPACKET_HPP_
+#pragma once
-#define CHARACTERPACKET_HPP_
 
 #include "serial_packet_base.hpp"
 
@@ -45,5 +44,3 @@ struct CharacterPacket : SerialPacketBase {
 
 void serializeCharacter(void* buffer, CharacterPacket* packet);
 void deserializeCharacter(void* buffer, CharacterPacket* packet);
-
-#endif

common/network/packet_types/client_packet.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CLIENTPACKET_HPP_
+#pragma once
-#define CLIENTPACKET_HPP_
 
 #include "serial_packet_base.hpp"
 
@@ -33,5 +32,3 @@ struct ClientPacket : SerialPacketBase {
 
 void serializeClient(void* buffer, ClientPacket* packet);
 void deserializeClient(void* buffer, ClientPacket* packet);
-
-#endif

common/network/packet_types/creature_packet.cpp

@@ -19,15 +19,15 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "monster_packet.hpp"
+#include "creature_packet.hpp"
 
 #include "serial_utility.hpp"
 
-void serializeMonster(void* buffer, MonsterPacket* packet) {
+void serializeCreature(void* buffer, CreaturePacket* packet) {
 	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
 
-	//identify the monster
+	//identify the creature
-	serialCopy(&buffer, &packet->monsterIndex, sizeof(int));
+	serialCopy(&buffer, &packet->creatureIndex, sizeof(int));
 	serialCopy(&buffer, packet->handle, PACKET_STRING_SIZE);
 	serialCopy(&buffer, packet->avatar, PACKET_STRING_SIZE);
 
@@ -46,11 +46,11 @@ void serializeMonster(void* buffer, MonsterPacket* packet) {
 	serialCopy(&buffer, &packet->motion.y, sizeof(double));
 }
 
-void deserializeMonster(void* buffer, MonsterPacket* packet) {
+void deserializeCreature(void* buffer, CreaturePacket* packet) {
 	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
 
-	//identify the monster
+	//identify the creature
-	deserialCopy(&buffer, &packet->monsterIndex, sizeof(int));
+	deserialCopy(&buffer, &packet->creatureIndex, sizeof(int));
 	deserialCopy(&buffer, packet->handle, PACKET_STRING_SIZE);
 	deserialCopy(&buffer, packet->avatar, PACKET_STRING_SIZE);
 

common/network/packet_types/creature_packet.hpp

@@ -19,17 +19,16 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef MONSTERPACKET_HPP_
+#pragma once
-#define MONSTERPACKET_HPP_
 
 #include "serial_packet_base.hpp"
 
 #include "bounding_box.hpp"
 #include "vector2.hpp"
 
-struct MonsterPacket : SerialPacketBase {
+struct CreaturePacket : SerialPacketBase {
-	//identify the monster
+	//identify the creature
-	int monsterIndex;
+	int creatureIndex;
 	char handle[PACKET_STRING_SIZE];
 	char avatar[PACKET_STRING_SIZE];
 	BoundingBox bounds;
@@ -40,7 +39,5 @@ struct MonsterPacket : SerialPacketBase {
 	Vector2 motion;
 };
 
-void serializeMonster(void* buffer, MonsterPacket* packet);
+void serializeCreature(void* buffer, CreaturePacket* packet);
-void deserializeMonster(void* buffer, MonsterPacket* packet);
+void deserializeCreature(void* buffer, CreaturePacket* packet);
-
-#endif

common/network/packet_types/makefile

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

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGIONPACKET_HPP_
+#pragma once
-#define REGIONPACKET_HPP_
 
 #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.hpp

@@ -19,12 +19,11 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SERIALPACKETBASE_HPP_
+#pragma once
-#define SERIALPACKETBASE_HPP_
 
 #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/server_packet.cpp

@@ -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

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SERVERPACKET_HPP_
+#pragma once
-#define SERVERPACKET_HPP_
 
 #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.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef TEXTPACKET_HPP_
+#pragma once
-#define TEXTPACKET_HPP_
 
 #include "serial_packet_base.hpp"
 
@@ -36,5 +35,3 @@ struct TextPacket : SerialPacketBase {
 
 void serializeText(void* buffer, TextPacket* packet);
 void deserializeText(void* buffer, TextPacket* packet);
-
-#endif

common/network/serial_packet.hpp

@@ -19,13 +19,12 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SERIALPACKET_HPP_
+#pragma once
-#define SERIALPACKET_HPP_
 
 #include "serial_packet_base.hpp"
 #include "character_packet.hpp"
 #include "client_packet.hpp"
-#include "monster_packet.hpp"
+#include "creature_packet.hpp"
 #include "region_packet.hpp"
 #include "server_packet.hpp"
 #include "text_packet.hpp"
@@ -34,12 +33,12 @@
 typedef SerialPacketBase SerialPacket;
 
 //DOCS: NETWORK_VERSION is used to discern compatible servers and clients
-constexpr int NETWORK_VERSION = 20150304;
+constexpr int NETWORK_VERSION = 20160321;
 
 union MaxPacket {
 	CharacterPacket a;
 	ClientPacket b;
-	MonsterPacket c;
+	CreaturePacket c;
 	RegionPacket d;
 	ServerPacket e;
 	TextPacket f;
@@ -62,5 +61,3 @@ constexpr int PACKET_BUFFER_SIZE =
 	REGION_METADATA_FOOTPRINT +
 	REGION_TILE_FOOTPRINT +
 	REGION_SOLID_FOOTPRINT;
-
-#endif

common/network/serial_packet_type.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SERIALPACKETTYPE_HPP_
+#pragma once
-#define SERIALPACKETTYPE_HPP_
 
 /* DOCS: The headers indicate what packet type is used for each message
  * different messages under the same header will carry different amounts of
@@ -30,66 +29,66 @@
 
 enum class SerialPacketType {
 	//default: there is something wrong
-	NONE,
+	NONE = 0,
 
 	//-------------------------
 	//ServerPacket
 	//  name, player count, version
 	//-------------------------
 
-	FORMAT_SERVER,
+	FORMAT_SERVER = 100,
 
 	//heartbeat
-	PING,
+	PING = 101,
-	PONG,
+	PONG = 102,
 
 	//Used for finding available servers
-	BROADCAST_REQUEST,
+	BROADCAST_REQUEST = 103,
-	BROADCAST_RESPONSE,
+	BROADCAST_RESPONSE = 104,
 
-	FORMAT_END_SERVER,
+	FORMAT_END_SERVER = 199,
 
 	//-------------------------
 	//ClientPacket
 	//  client index, account index, username
 	//-------------------------
 
-	FORMAT_CLIENT,
+	FORMAT_CLIENT = 200,
 
 	//Connecting to a server as a client
-	JOIN_REQUEST,
+	JOIN_REQUEST = 201,
-	JOIN_RESPONSE,
+	JOIN_RESPONSE = 202,
 
 	//disconnect from the server
-	DISCONNECT_REQUEST,
+	DISCONNECT_REQUEST = 203,
-	DISCONNECT_RESPONSE,
+	DISCONNECT_RESPONSE = 204,
-	ADMIN_DISCONNECT_FORCED,
+	ADMIN_DISCONNECT_FORCED = 205,
 
 	//load the account
-	LOGIN_REQUEST,
+	LOGIN_REQUEST = 206,
-	LOGIN_RESPONSE,
+	LOGIN_RESPONSE = 207,
 
 	//unload the account
-	LOGOUT_REQUEST,
+	LOGOUT_REQUEST = 208,
-	LOGOUT_RESPONSE,
+	LOGOUT_RESPONSE = 209,
 
 	//shut down the server
-	ADMIN_SHUTDOWN_REQUEST,
+	ADMIN_SHUTDOWN_REQUEST = 210,
 
-	FORMAT_END_CLIENT,
+	FORMAT_END_CLIENT = 299,
 
 	//-------------------------
 	//RegionPacket
 	//  room index, x, y, raw data
 	//-------------------------
 
-	FORMAT_REGION,
+	FORMAT_REGION = 300,
 
 	//map data
-	REGION_REQUEST,
+	REGION_REQUEST = 301,
-	REGION_CONTENT,
+	REGION_CONTENT = 302,
 
-	FORMAT_END_REGION,
+	FORMAT_END_REGION = 399,
 
 	//-------------------------
 	//CharacterPacket
@@ -99,89 +98,76 @@ enum class SerialPacketType {
 	//  room index, origin, motion
 	//-------------------------
 
-	FORMAT_CHARACTER,
+	FORMAT_CHARACTER = 400,
 
 	//full data update
-	CHARACTER_UPDATE,
+	CHARACTER_UPDATE = 401,
 
 	//character management
-	CHARACTER_CREATE,
+	CHARACTER_CREATE = 402,
-	CHARACTER_DELETE,
+	CHARACTER_DELETE = 403,
-	CHARACTER_LOAD,
+	CHARACTER_LOAD = 404,
-	CHARACTER_UNLOAD,
+	CHARACTER_UNLOAD = 405,
 
 	//find out info from the server
-	QUERY_CHARACTER_EXISTS,
+	QUERY_CHARACTER_EXISTS = 406,
-	QUERY_CHARACTER_STATS,
-	QUERY_CHARACTER_LOCATION,
 
 	//actions taken
-	CHARACTER_MOVEMENT,
+	CHARACTER_MOVEMENT = 407,
-	CHARACTER_ATTACK,
-	CHARACTER_DAMAGE,
 
-	//admin control
+	FORMAT_END_CHARACTER = 499,
-//	ADMIN_SET_CHARACTER_ORIGIN,
-
-	FORMAT_END_CHARACTER,
 
 	//-------------------------
-	//MonsterPacket
+	//CreaturePacket
-	//  monster index,
+	//  creature index,
 	//  handle, avatar
 	//  bounds
 	//  room index, origin, motion
 	//-------------------------
 
-	FORMAT_MONSTER,
+	FORMAT_CREATURE = 500,
 
 	//full data update
-	MONSTER_UPDATE,
+	CREATURE_UPDATE = 501,
 
 	//character management
-	MONSTER_CREATE,
+	CREATURE_CREATE = 502,
-	MONSTER_DELETE,
+	CREATURE_UNLOAD = 503,
 
 	//find out info from the server
-	QUERY_MONSTER_EXISTS,
+	QUERY_CREATURE_EXISTS = 504,
-	QUERY_MONSTER_STATS,
-	QUERY_MONSTER_LOCATION,
 
 	//actions taken
-	MONSTER_MOVEMENT,
+	CREATURE_MOVEMENT = 505,
-	MONSTER_ATTACK,
-	MONSTER_DAMAGE,
 
-	FORMAT_END_MONSTER,
+	FORMAT_END_CREATURE = 599,
 
 	//-------------------------
 	//TextPacket
 	//  name, text
 	//-------------------------
 
-	FORMAT_TEXT,
+	FORMAT_TEXT = 600,
 
 	//general speech
-	TEXT_BROADCAST,
+	TEXT_BROADCAST = 601,
-	TEXT_SPEECH,
+	TEXT_SPEECH = 602,
-	TEXT_WHISPER,
+	TEXT_WHISPER = 603,
 
 	//rejection/error messages
-	JOIN_REJECTION,
+	JOIN_REJECTION = 604,
-	LOGIN_REJECTION,
+	LOGIN_REJECTION = 605,
-	REGION_REJECTION,
+	REGION_REJECTION = 606,
-	CHARACTER_REJECTION,
+	CHARACTER_REJECTION = 607,
-	MONSTER_REJECTION,
+	CREATURE_REJECTION = 608,
-	SHUTDOWN_REJECTION,
+	SHUTDOWN_REJECTION = 609,
-	QUERY_REJECTION,
+	QUERY_REJECTION = 610,
 
-	FORMAT_END_TEXT,
+	FORMAT_END_TEXT = 699,
 
 	//-------------------------
 	//not used
 	//-------------------------
 
-	LAST
+	LAST = 700
 };
-
-#endif

common/network/serial_utility.cpp

@@ -24,7 +24,7 @@
 //packet types
 #include "character_packet.hpp"
 #include "client_packet.hpp"
-#include "monster_packet.hpp"
+#include "creature_packet.hpp"
 #include "region_packet.hpp"
 #include "server_packet.hpp"
 #include "text_packet.hpp"
@@ -65,8 +65,8 @@ void serializePacket(void* buffer, SerialPacketBase* packet) {
 		serializeCharacter(buffer, static_cast<CharacterPacket*>(packet));
 	}
 
-	if (BOUNDS(packet->type, SerialPacketType::FORMAT_MONSTER, SerialPacketType::FORMAT_END_MONSTER)) {
+	if (BOUNDS(packet->type, SerialPacketType::FORMAT_CREATURE, SerialPacketType::FORMAT_END_CREATURE)) {
-		serializeMonster(buffer, static_cast<MonsterPacket*>(packet));
+		serializeCreature(buffer, static_cast<CreaturePacket*>(packet));
 	}
 
 	if (BOUNDS(packet->type, SerialPacketType::FORMAT_TEXT, SerialPacketType::FORMAT_END_TEXT)) {
@@ -95,8 +95,8 @@ void deserializePacket(void* buffer, SerialPacketBase* packet) {
 		deserializeCharacter(buffer, static_cast<CharacterPacket*>(packet));
 	}
 
-	if (BOUNDS(type, SerialPacketType::FORMAT_MONSTER, SerialPacketType::FORMAT_END_MONSTER)) {
+	if (BOUNDS(type, SerialPacketType::FORMAT_CREATURE, SerialPacketType::FORMAT_END_CREATURE)) {
-		deserializeMonster(buffer, static_cast<MonsterPacket*>(packet));
+		deserializeCreature(buffer, static_cast<CreaturePacket*>(packet));
 	}
 
 	if (BOUNDS(type, SerialPacketType::FORMAT_TEXT, SerialPacketType::FORMAT_END_TEXT)) {

common/network/serial_utility.hpp

@@ -19,8 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SERIALIZEUTILITY_HPP_
+#pragma once
-#define SERIALIZEUTILITY_HPP_
 
 #include "serial_packet_base.hpp"
 
@@ -33,5 +32,3 @@ void deserialCopy(void** buffer, void* data, int size);
 //primary functions
 void serializePacket(void* buffer, SerialPacketBase* packet);
 void deserializePacket(void* buffer, SerialPacketBase* packet);
-
-#endif

common/network/udp_network_utility.hpp

@@ -19,15 +19,14 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef UDPNETWORKUTILITY_HPP_
+#pragma once
-#define UDPNETWORKUTILITY_HPP_
 
 //common
 #include "serial_packet_base.hpp"
 #include "singleton.hpp"
 
 //APIs
-#include "SDL/SDL_net.h"
+#include "SDL2/SDL_net.h"
 
 class UDPNetworkUtility : public Singleton<UDPNetworkUtility> {
 public:
@@ -73,5 +72,3 @@ private:
 	UDPsocket socket = nullptr;
 	UDPpacket* packet = nullptr;
 };
-
-#endif

common/ui/button.cpp

@@ -1,81 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "button.hpp"
-
-#include <stdexcept>
-
-Button::State Button::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	return CalcState(motion.x, motion.y, motion.state & SDL_BUTTON_LMASK);
-}
-
-Button::State Button::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	if (button.button == SDL_BUTTON_LEFT) {
-		return CalcState(button.x, button.y, true);
-	}
-	return state;
-}
-
-Button::State Button::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (button.button == SDL_BUTTON_LEFT) {
-		return CalcState(button.x, button.y, false);
-	}
-	return state;
-}
-
-void Button::DrawTo(SDL_Surface* const dest) {
-	if (!image || !font) {
-		throw(std::runtime_error("Surface not set for Button"));
-	}
-	image->SetClipY(state * image->GetClipH());
-	image->DrawTo(dest, x, y);
-	font->DrawStringTo(text, dest, textX + x, textY + y);
-}
-
-std::string Button::SetText(std::string t) {
-	if (!image || !font) {
-		throw(std::runtime_error("Surface not set for Button"));
-	}
-	//one line, cache the position
-	text = t;
-	textX = (image->GetClipW() / 2) - (font->GetCharW() * text.size() / 2);
-	textY = (image->GetClipH() / 2) - (font->GetCharH() / 2);
-	return text;
-}
-
-Button::State Button::CalcState(Sint16 i, Sint16 j, bool leftPressed) {
-	if (!image || !font) {
-		throw(std::runtime_error("Surface not set for Button"));
-	}
-	//if out of bounds
-	if (i < x || i >= (x + image->GetClipW()) ||
-		j < y || j >= (y + image->GetClipH())
-		) {
-		return state = State::NORMAL;
-	}
-
-	if (leftPressed) {
-		return state = State::PRESSED;
-	}
-	else {
-		return state = State::HOVER;
-	}
-}

common/ui/button.hpp

@@ -1,94 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef BUTTON_HPP_
-#define BUTTON_HPP_
-
-#include "image.hpp"
-#include "raster_font.hpp"
-
-#include <string>
-
-/* 3-phases, no toggle, centred text
- * This class uses the size of the provided image as its bounds. Also,
- * The provided image should be formatted correctly.
- *
- * The button's image should be divided into 3 sections virtucally,
- * which act as the different button images. The clip width & height of the
- * Image should be set manually, and the height should be 1/3 of the total
- * graphical data.
-*/
-class Button {
-public:
-	enum State {
-		NORMAL = 0, HOVER = 1, PRESSED = 2
-	};
-
-	Button() = default;
-	~Button() = default;
-
-	//handle input
-	State MouseMotion(SDL_MouseMotionEvent const&);
-	State MouseButtonDown(SDL_MouseButtonEvent const&);
-	State MouseButtonUp(SDL_MouseButtonEvent const&);
-
-	//yet another draw function
-	void DrawTo(SDL_Surface* const);
-
-	//accessors and mutators
-	Image* SetImage(Image* const ptr) { return image = ptr; }
-	Image* GetImage() { return image; }
-	RasterFont* SetFont(RasterFont* const ptr) { return font = ptr; }
-	RasterFont* GetFont() { return font; }
-
-	Sint16 SetX(Sint16 i) { return x = i; }
-	Sint16 SetY(Sint16 i) { return y = i; }
-	Sint16 GetX() const { return x; }
-	Sint16 GetY() const { return y; }
-
-	Sint16 SetTextX(Sint16 i) { return textX = i; }
-	Sint16 SetTextY(Sint16 i) { return textY = i; }
-	Sint16 GetTextX() const { return textX; }
-	Sint16 GetTextY() const { return textY; }
-
-	State SetState(State s) { return state = s; }
-	State GetState() const { return state; }
-
-	std::string SetText(std::string);
-	std::string GetText() const { return text; }
-
-private:
-	State CalcState(Sint16 x, Sint16 y, bool leftPressed);
-
-	//point to the provided external objects
-	Image* image = nullptr;
-	RasterFont* font = nullptr;
-
-	//positions
-	Sint16 x = 0, y = 0;
-	Sint16 textX = 0, textY = 0;
-
-	//
-	State state = State::NORMAL;
-	std::string text;
-};
-
-#endif

common/ui/menu_bar.cpp

@@ -1,139 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "menu_bar.hpp"
-
-#include <stdexcept>
-#include <sstream>
-
-void MenuBar::DrawTo(SDL_Surface* const dest) {
-	for (auto& i : entries) {
-		i.DrawTo(dest);
-	}
-}
-
-void MenuBar::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	for (auto& i : entries) {
-		i.MouseMotion(motion);
-	}
-}
-
-void MenuBar::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	for (auto& i : entries) {
-		i.MouseButtonDown(button);
-	}
-}
-
-void MenuBar::MouseButtonUp(SDL_MouseButtonEvent const& button, int* entry, int* butt) {
-	*entry = *butt = -1;
-	int ret = -1;
-	for (auto& i : entries) {
-		ret = i.MouseButtonUp(button);
-
-		if (ret != -1) {
-			*entry = (&i - entries.data());
-			*butt = ret;
-		}
-	}
-}
-
-void MenuBar::SetEntries(std::vector<std::vector<std::string>> info) {
-	if (!image || !font) {
-		throw(std::runtime_error("Surfaces not loaded into the menu bar"));
-	}
-
-	entries.clear();
-	for (int i = 0; i < info.size(); i++) {
-		//create the entry & the main button
-		entries.push_back(MenuBarEntry());
-		entries[i].mainButton.SetImage(image);
-		entries[i].mainButton.SetFont(font);
-		entries[i].mainButton.SetText(info[i][0]);
-		entries[i].mainButton.SetX(i * image->GetClipW());
-		entries[i].mainButton.SetY(0);
-		for (int j = 0; j < info[i].size()-1; j++) {
-			//create each drop button in this entry
-			entries[i].dropButtons.push_back(Button());
-			entries[i].dropButtons[j].SetImage(image);
-			entries[i].dropButtons[j].SetFont(font);
-			entries[i].dropButtons[j].SetText(info[i][j+1]);
-			entries[i].dropButtons[j].SetX(i * image->GetClipW());
-			entries[i].dropButtons[j].SetY((j+1) * image->GetClipH());
-		}
-	}
-}
-
-void MenuBar::MenuBarEntry::DrawTo(SDL_Surface* const dest) {
-	//only draw the dropButtons in the user has this menu open
-	mainButton.DrawTo(dest);
-
-	if (!open) {
-		return;
-	}
-
-	for (auto& i : dropButtons) {
-		i.DrawTo(dest);
-	}
-}
-
-void MenuBar::MenuBarEntry::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	//open the menu
-	bool o = mainButton.MouseMotion(motion) == Button::State::PRESSED;
-
-	if (!(open |= o)) {
-		return;
-	}
-
-	for (auto& i : dropButtons) {
-		//dragging down the menu
-		o |= i.MouseMotion(motion) == Button::State::PRESSED;
-	}
-
-	open = o;
-}
-
-void MenuBar::MenuBarEntry::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	//open the menu
-	if (!(open = mainButton.MouseButtonDown(button) == Button::State::PRESSED)) {
-		return;
-	}
-
-	//update the others anyway
-	for (auto& i : dropButtons) {
-		i.MouseButtonDown(button);
-	}
-}
-
-int MenuBar::MenuBarEntry::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	int ret = -1;
-	mainButton.MouseButtonUp(button);
-
-	for (auto& i : dropButtons) {
-		//the user just released this button
-		if (i.GetState() != i.MouseButtonUp(button) && i.GetState() == Button::State::HOVER && open) {
-			//get this button's index
-			ret = (&i - dropButtons.data());
-		}
-	}
-
-	open = false;
-	return ret;
-}

common/ui/menu_bar.hpp

@@ -1,92 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef MENUBAR_HPP_
-#define MENUBAR_HPP_
-
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-
-#include <string>
-#include <vector>
-
-/* I've redesigned this so that the contents of the menu bar can't change during run time.
- * This is more restrictive but I'm focusing on getting this working first.
- * The Image and Font pointers must be set before the text data is entered.
- * 
- * This class needs a rewrite.
-*/
-
-//TODO: This thing is fucking terrible, fix it and the button class
-class MenuBar {
-public:
-	MenuBar() = default;
-	~MenuBar() = default;
-
-	//yet another draw function
-	void DrawTo(SDL_Surface* const dest);
-
-	//user inputs
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&, int* entry, int* button);
-
-	//manage the entries & buttons
-	void SetEntries(std::vector<std::vector<std::string>> info);
-	void ClearEntries() { entries.clear(); }
-
-	//Accessors and mutators
-	Image* SetImage(Image* const ptr) { return image = ptr; }
-	Image* GetImage() { return image; }
-	RasterFont* SetFont(RasterFont* const ptr) { return font = ptr; }
-	RasterFont* GetFont() { return font; }
-
-private:
-	class MenuBarEntry;
-
-	std::vector<MenuBarEntry> entries;
-
-	Image* image = nullptr;
-	RasterFont* font = nullptr;
-};
-
-class MenuBar::MenuBarEntry {
-public:
-	MenuBarEntry() = default;
-	~MenuBarEntry() = default;
-
-	void DrawTo(SDL_Surface* const dest);
-
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	int MouseButtonUp(SDL_MouseButtonEvent const&);
-
-private:
-	Button mainButton;
-
-	std::vector<Button> dropButtons;
-	bool open = false;
-
-	friend class MenuBar;
-};
-
-#endif