Codebase update: Added transparency control to Image

I just _had_ to get rid of that horrible libs/ directory. Now most of the
graphical stuff is in client/, but I'll create more subdirectories so that
they're not getting in the way.

.gitignore

@@ -1,6 +1,6 @@
 #Editor generated files
-*.sln
-*.vcproj
+#*.sln
+#*.vcproj
 *.suo
 *.ncb
 *.user
@@ -9,9 +9,6 @@
 Release/
 Debug/
 Out/
-release/
-debug/
-out/
 
 #Project generated files
 *.db

.gitmodules

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

README.md

@@ -1,45 +1,23 @@
-## Outline
+_This project is currently in it's early prototype stage. You can see other versions in various branches or tagged as prototype-X._
 
-Tortuga is a 2D MMORPG featuring permadeath, with an emphasis on multiplayer cooperation, exploration and customization. The game runs on customizable public and private servers.
+Tortuga is a 2D multiplayer role playing game set in a large archipelago occupied by warring pirate clans. The emphasis of this game is on multiplayer cooperation, competition, and server customization. The game runs on highly customizable server software that can support up to 150 simultaneous players or more. The player characters are tied to the server where they are created and are susceptible to permadeath: deletion of a character upon death.
 
-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.
+## Dependencies
 
-## Releases
+* [SDL](http://www.libsdl.org/) - Simple DirectMedia Layer API
+* [SDL_net](http://www.libsdl.org/projects/SDL_net/) - SDL's networking extension
 
-* The most recent stable build for Windows can be found [here](https://dl.dropboxusercontent.com/u/46669050/Tortuga-win.rar).
-* The most recent stable build for Linux can be found [here](https://dl.dropboxusercontent.com/u/46669050/Tortuga-linux.tar).
+## Instructions
 
-## 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 2.0](http://www.libsdl.org/) - Simple DirectMedia Layer API
-* [SDL_image 2.0](https://www.libsdl.org/projects/SDL_image/) - An SDL Extension for loading multiple image file formats
-* [SDL_net 2.0](http://www.libsdl.org/projects/SDL_net/) - SDL's networking extension
-* [SDL_ttf 2.0](https://www.libsdl.org/projects/SDL_ttf/) - An SDL extention for rendering fonts
-* [lua 5.2](http://www.lua.org/) - The lua programming language
-* [SQLite3](http://www.sqlite.org/) - A lightweight SQL database engine
-
-## Tools
-
-* [WinRAR](http://www.rarlab.com/) - A free archive tool; needed for Windows distribution
-* [tar](http://www.gnu.org/software/tar/manual/) - The GNU archive tool; needed for Linux distribution
-* [Dropbox](https://www.dropbox.com/) - For hosting and distribution
-
-## Using and Including
-
-* [Coolvetica Typeface](http://typodermicfonts.com/coolvetica/)
+* This project uses C++11, which is available via GNU (or MinGW) 4.7, or Visual Studio 2012. Personally, I'm using MinGW 4.7.2.
+* I'm trying to keep this as IDE agnostic as possible, so if you use an IDE, please add it's files to .gitignore.
+* You can read more details on the Tortuga wiki [here](https://github.com/Ratstail91/Tortuga/wiki).
 
 ## Copyright
 
-(Future versions (to be determined) may be released under a modified version of the [Uplink Developer's License](http://www.introversion.co.uk/uplink/developer/license.html).)
-
 The current version of Tortuga is released under the [zlib license](http://en.wikipedia.org/wiki/Zlib_License).  
 
-Copyright (c) 2013-2016 Kayne Ruse
+Copyright (c) 2013 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.
 
@@ -48,8 +26,3 @@ 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.
-
-### 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

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,85 +21,119 @@
 */
 #include "base_scene.hpp"
 
-SDL_Renderer* BaseScene::rendererHandle = nullptr;
+#include <stdexcept>
+
+//-------------------------
+//Static declarations
+//-------------------------
+
+SDL_Surface* BaseScene::screen = nullptr;
+
+//-------------------------
+//Public access members
+//-------------------------
 
 BaseScene::BaseScene() {
-	//EMPTY
+	nextScene = SceneList::CONTINUE;
 }
 
 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
+//Program control
 //-------------------------
 
-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;
+SDL_Surface* BaseScene::SetScreen(int w, int h, int bpp, Uint32 flags) {
+	if (!bpp) {
+		bpp = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
 	}
+
+	screen = SDL_SetVideoMode(w, h, bpp, flags);
+
+	if (!screen) {
+		throw(std::runtime_error("Failed to create the screen surface"));
+	}
+
+	return screen;
 }
 
-void BaseScene::KeyUp(SDL_KeyboardEvent const& event) {
-	//EMPTY
+SDL_Surface* BaseScene::GetScreen() {
+	return screen;
+}
+
+SceneList BaseScene::SetNextScene(SceneList sceneIndex) {
+	return nextScene = sceneIndex;
+}
+
+SceneList BaseScene::GetNextScene() const {
+	return nextScene;
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void BaseScene::RunFrame(double delta) {
+	FrameStart();
+	HandleEvents();
+	Update(delta);
+	FrameEnd();
+}
+
+void BaseScene::RenderFrame() {
+	SDL_FillRect(screen, 0, 0);
+	Render(screen);
+	SDL_Flip(screen);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void BaseScene::HandleEvents() {
+	SDL_Event event;
+
+	while(SDL_PollEvent(&event)) {
+		switch(event.type) {
+			case SDL_QUIT:
+				QuitEvent();
+			break;
+
+			case SDL_VIDEORESIZE:
+				SetScreen(event.resize.w, event.resize.h, 0, screen->flags);
+			break;
+
+			case SDL_MOUSEMOTION:
+				MouseMotion(event.motion);
+			break;
+
+			case SDL_MOUSEBUTTONDOWN:
+				MouseButtonDown(event.button);
+			break;
+
+			case SDL_MOUSEBUTTONUP:
+				MouseButtonUp(event.button);
+			break;
+
+			case SDL_KEYDOWN:
+				KeyDown(event.key);
+			break;
+
+			case SDL_KEYUP:
+				KeyUp(event.key);
+			break;
+
+#ifdef USE_EVENT_JOYSTICK
+			//TODO: joystick/gamepad support
+#endif
+
+#ifdef USE_EVENT_UNKNOWN
+			default:
+				UnknownEvent(event);
+			break;
+#endif
+		}//switch
+	}//while
 }

client/base_scene.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,43 +19,56 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef BASESCENE_HPP_
+#define BASESCENE_HPP_
 
-#include "scene_signal.hpp"
+#include "scene_list.hpp"
 
-#include "SDL2/SDL.h"
+#include "SDL/SDL.h"
 
 class BaseScene {
 public:
+	/* Public access members */
 	BaseScene();
 	virtual ~BaseScene();
 
-	virtual void RenderFrame(SDL_Renderer*);
-	static void SetRenderer(SDL_Renderer*);
-	SceneSignal GetSceneSignal();
+	/* Program control */
+	static SDL_Surface* SetScreen(int w, int h, int bpp = 0, Uint32 flags = SDL_HWSURFACE|SDL_DOUBLEBUF);
+	static SDL_Surface* GetScreen();
 
-	//frame phases
-	virtual void FrameStart();
-	virtual void Update();
-	virtual void FrameEnd();
+	SceneList SetNextScene(SceneList sceneIndex);
+	SceneList GetNextScene() const;
 
-	//input events
-	virtual void QuitEvent();
-	virtual void MouseMotion(SDL_MouseMotionEvent const& event);
-	virtual void MouseButtonDown(SDL_MouseButtonEvent const& event);
-	virtual void MouseButtonUp(SDL_MouseButtonEvent const& event);
-	virtual void MouseWheel(SDL_MouseWheelEvent const& event);
-	virtual void KeyDown(SDL_KeyboardEvent const& event);
-	virtual void KeyUp(SDL_KeyboardEvent const& event);
-
-	//TODO: (9) joystick and controller events
+	/* Frame loop */
+	virtual void RunFrame(double delta);
+	virtual void RenderFrame();
 
 protected:
-	//control
-	static SDL_Renderer* GetRenderer();
-	void SetSceneSignal(SceneSignal);
+	virtual void FrameStart() {}
+	virtual void HandleEvents();
+	virtual void Update(double delta) {}
+	virtual void FrameEnd() {}
+	virtual void Render(SDL_Surface* const screen) {}
+
+	/* Event handlers */
+	virtual void QuitEvent() { SetNextScene(SceneList::QUIT); }
+	virtual void MouseMotion(SDL_MouseMotionEvent const&) {}
+	virtual void MouseButtonDown(SDL_MouseButtonEvent const&) {}
+	virtual void MouseButtonUp(SDL_MouseButtonEvent const&) {}
+	virtual void KeyDown(SDL_KeyboardEvent const&) {}
+	virtual void KeyUp(SDL_KeyboardEvent const&) {}
+
+#ifdef USE_EVENT_JOYSTICK
+	//TODO: joystick/gamepad support
+#endif
+
+#ifdef USE_EVENT_UNKNOWN
+	virtual void UnknownEvent(SDL_Event const&) {}
+#endif
 
 private:
-	static SDL_Renderer* rendererHandle;
-	SceneSignal sceneSignal = SceneSignal::CONTINUE;
-};
+	static SDL_Surface* screen;
+	SceneList nextScene;
+};
+
+#endif

client/client_application.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,342 +21,162 @@
 */
 #include "client_application.hpp"
 
-#include "serial_packet.hpp"
-#include "config_utility.hpp"
-
-//for handling platforms
-#include "SDL2/SDL_syswm.h"
-#include "SDL2/SDL_version.h"
-
-#include <chrono>
-#include <iostream>
-#include <sstream>
 #include <stdexcept>
+#include <chrono>
+
+//-------------------------
+//Scene headers
+//-------------------------
+
+//Add the custom scene headers here
+#include "in_combat.hpp"
+#include "in_world.hpp"
+#include "lobby.hpp"
+#include "main_menu.hpp"
+#include "option_screen.hpp"
+#include "splash_screen.hpp"
 
 //-------------------------
 //Public access members
 //-------------------------
 
-void ClientApplication::Init(int argc, char* argv[]) {
-	std::cout << "Beginning " << argv[0] << std::endl;
+ClientApplication::ClientApplication() {
+	//
+}
 
-	//load the prerequisites
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-	config.Load("rsc/config.cfg", false, argc, argv);
+ClientApplication::~ClientApplication() {
+	UnloadScene();
+}
 
-	//-------------------------
-	//Initialize SDL
-	//-------------------------
+/* ClientApplication::Init()
+ * This function initializes the entire program. There are a number of things
+ * that could go wrong here, which is why there is such an unusual order of
+ * operations.
+ * Important things to note:
+ *   The APIs are initiated here.
+ *   The global objects are initialized here.
+ *   The game's screen is created here, based on information loaded from the config file.
+ *   The ConfigUtility's call to Load() also ensures that the "rsc\" folder is in the directory. It's easy to forget it.
+*/
 
-	if (SDL_Init(0)) {
-		std::ostringstream msg;
-		msg << "Failed to initialize SDL: " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
+void ClientApplication::Init() {
+	//load the config file
+	try {
+		configUtil->Load("rsc/config.cfg");
+	}
+	catch(std::runtime_error& e) {
+		std::string s = e.what();
+		s += "; Ensure that the \"rsc\" directory is present";
+		throw(std::runtime_error(s));
 	}
 
-	//-------------------------
-	//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()));
+	//initialize the APIs
+	if (SDL_Init(SDL_INIT_VIDEO)) {
+		throw(std::runtime_error("Failed to initialize SDL"));
 	}
-
-	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_net
 	if (SDLNet_Init()) {
-		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 2.0" << std::endl;
-
-	//setting up SDL2_ttf
-	if (TTF_Init()) {
-		std::ostringstream msg;
-		msg << "Failed to initialize SDL_ttf 2.0: " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
+		throw(std::runtime_error("Failed to initialize SDL_net"));
 	}
 
-	std::cout << "Initialized SDL_ttf 2.0" << std::endl;
+	//create the screen
+	Uint32 flags = SDL_HWSURFACE | SDL_DOUBLEBUF;
+	flags |= configUtil->Bool("screen.f") ? SDL_FULLSCREEN : 0;
 
-	//-------------------------
-	//debug output
-	//-------------------------
+	BaseScene::SetScreen(
+		configUtil->Int("screen.w"),
+		configUtil->Int("screen.h"),
+		SDL_GetVideoInfo()->vfmt->BitsPerPixel,
+		flags);
 
-#define DEBUG_INTERNAL_VAR(x) std::cout << "\t" << #x << ": " << x << std::endl;
-
-	std::cout << "Internal sizes:" << std::endl;
-
-	DEBUG_INTERNAL_VAR(NETWORK_VERSION);
-	DEBUG_INTERNAL_VAR(sizeof(Region::type_t));
-	DEBUG_INTERNAL_VAR(sizeof(Region));
-	DEBUG_INTERNAL_VAR(REGION_WIDTH);
-	DEBUG_INTERNAL_VAR(REGION_HEIGHT);
-	DEBUG_INTERNAL_VAR(REGION_DEPTH);
-	DEBUG_INTERNAL_VAR(REGION_TILE_FOOTPRINT);
-	DEBUG_INTERNAL_VAR(REGION_SOLID_FOOTPRINT);
-	DEBUG_INTERNAL_VAR(PACKET_STRING_SIZE);
-	DEBUG_INTERNAL_VAR(PACKET_BUFFER_SIZE);
-	DEBUG_INTERNAL_VAR(MAX_PACKET_SIZE);
-	DEBUG_INTERNAL_VAR(static_cast<int>(SerialPacketType::LAST));
-
-	//-------------------------
-	//finalize the startup
-	//-------------------------
-
-	std::cout << "Startup completed successfully" << std::endl;
-
-	//-------------------------
-	//debugging
-	//-------------------------
-
-	//...
+	//initiate the remaining singletons
+	netUtil->Open(0, sizeof(Packet));
 }
 
 void ClientApplication::Proc() {
-	//load the first scene
-	ProcessSceneSignal(SceneSignal::FIRST);
+	LoadScene(SceneList::FIRST);
 
-	//fixed frame rate
-	typedef std::chrono::steady_clock Clock;
+	//prepare the time system
+	typedef std::chrono::high_resolution_clock Clock;
 
+	Clock::duration delta(5 * Clock::duration::period::den / std::milli::den);
 	Clock::time_point simTime = Clock::now();
 	Clock::time_point realTime;
-	constexpr std::chrono::duration<int, std::milli> frameDelay(16); //~60FPS
 
-	//the game loop continues until the scenes signal QUIT
-	while(activeScene->GetSceneSignal() != SceneSignal::QUIT) {
-		//switch scenes if necessary
-		if(activeScene->GetSceneSignal() != SceneSignal::CONTINUE) {
-			ProcessSceneSignal(activeScene->GetSceneSignal());
+	//The main loop
+	while(activeScene->GetNextScene() != SceneList::QUIT) {
+		//switch scenes when necessary
+		if (activeScene->GetNextScene() != SceneList::CONTINUE) {
+			LoadScene(activeScene->GetNextScene());
 			continue;
 		}
 
-		//update the current time
-		realTime = Clock::now();
-
-		//simulate the game or give the machine a break
-		if (simTime < realTime) {
-			while(simTime < realTime) {
-				//call the user defined functions
-				activeScene->FrameStart();
-				ProcessEvents();
-				activeScene->Update();
-				activeScene->FrameEnd();
-
-				//step to the next frame
-				simTime += frameDelay;
-			}
-		}
-		else {
+		//update the current time & give the computer as much of a break as possible
+		while ((realTime = Clock::now()) < simTime) {
 			SDL_Delay(1);
 		}
 
-		SDL_RenderClear(renderer);
-		activeScene->RenderFrame(renderer);
-		SDL_RenderPresent(renderer);
+		//simulate game time
+		while (simTime < realTime) {
+			//call each user defined function
+			activeScene->RunFrame(double(delta.count()) / Clock::duration::period::den);
+			simTime += delta;
+		}
+
+		//draw the game to the screen
+		activeScene->RenderFrame();
 	}
 
-	//cleanup
-	ClearScene();
+	UnloadScene();
 }
 
 void ClientApplication::Quit() {
-	//clean up after the program
-	std::cout << "Shutting down" << std::endl;
-	UDPNetworkUtility::GetSingleton().Close();
-	TTF_Quit();
+	//clean up the singletons
+	netUtil->Close();
+	surfaceMgr->FreeAll();
+
+	//clean up the scene
+	UnloadScene();
+
+	//deinitialize the APIs
 	SDLNet_Quit();
-	BaseScene::SetRenderer(nullptr);
-	SDL_DestroyRenderer(renderer);
-	SDL_DestroyWindow(window);
 	SDL_Quit();
-	std::cout << "Clean exit" << std::endl;
 }
 
 //-------------------------
-//Scene management
+//Private access members
 //-------------------------
 
-void ClientApplication::ProcessEvents() {
-	SDL_Event event;
-	while(SDL_PollEvent(&event)) {
-		switch(event.type) {
-			case SDL_QUIT:
-				activeScene->QuitEvent();
-			break;
+void ClientApplication::LoadScene(SceneList sceneIndex) {
+	UnloadScene();
 
-			case SDL_MOUSEMOTION:
-				activeScene->MouseMotion(event.motion);
-			break;
-
-			case SDL_MOUSEBUTTONDOWN:
-				activeScene->MouseButtonDown(event.button);
-			break;
-
-			case SDL_MOUSEBUTTONUP:
-				activeScene->MouseButtonUp(event.button);
-			break;
-
-			case SDL_MOUSEWHEEL:
-				activeScene->MouseWheel(event.wheel);
-			break;
-
-			case SDL_KEYDOWN:
-				activeScene->KeyDown(event.key);
-			break;
-
-			case SDL_KEYUP:
-				activeScene->KeyUp(event.key);
-			break;
-
-			//TODO: (9) joystick and controller events
-
-			//window events are handled internally
-			case SDL_WINDOWEVENT:
-				switch(event.window.event) {
-					case SDL_WINDOWEVENT_RESIZED:
-						SDL_RenderSetLogicalSize(renderer, event.window.data1, event.window.data2);
-					break;
-				}
-			break;
-		}
-	}
-}
-
-//Add the custom scene headers here
-#include "splash_screen.hpp"
-#include "main_menu.hpp"
-#include "options_menu.hpp"
-#include "lobby_menu.hpp"
-#include "world.hpp"
-#include "combat.hpp"
-#include "disconnected_screen.hpp"
-
-void ClientApplication::ProcessSceneSignal(SceneSignal signal) {
-	//BUG: #16 Resources are being reloaded between scenes
-	ClearScene();
-	switch(signal) {
+	switch(sceneIndex) {
 		//add scene creation calls here
-		case SceneSignal::FIRST:
-		case SceneSignal::SPLASHSCREEN:
-			activeScene = new SplashScreen(window);
+		case SceneList::INCOMBAT:
+			activeScene = new InCombat();
 		break;
-		case SceneSignal::MAINMENU:
+		case SceneList::INWORLD:
+			activeScene = new InWorld();
+		break;
+		case SceneList::LOBBY:
+			activeScene = new Lobby();
+		break;
+		case SceneList::MAINMENU:
 			activeScene = new MainMenu();
 		break;
-		case SceneSignal::OPTIONSMENU:
-			activeScene = new OptionsMenu();
+		case SceneList::OPTIONSCREEN:
+			activeScene = new OptionScreen();
 		break;
-		case SceneSignal::LOBBYMENU:
-			activeScene = new LobbyMenu(&clientIndex, &accountIndex);
+		case SceneList::FIRST:
+		case SceneList::SPLASHSCREEN:
+			activeScene = new SplashScreen();
 		break;
-		case SceneSignal::WORLD:
-			activeScene = new World(&clientIndex, &accountIndex);
-		break;
-		case SceneSignal::COMBAT:
-			activeScene = new Combat(&clientIndex, &accountIndex);
-		break;
-		case SceneSignal::DISCONNECTEDSCREEN:
-			activeScene = new DisconnectedScreen();
-		break;
-		default: {
-			std::ostringstream msg;
-			msg << "Failed to recognize the scene signal: " << signal;
-			throw(std::logic_error(msg.str()));
-		}
+
+		default:
+			throw(std::logic_error("Failed to recognize the scene index"));
 	}
 }
 
-void ClientApplication::ClearScene() {
+void ClientApplication::UnloadScene() {
 	delete activeScene;
 	activeScene = nullptr;
 }

client/client_application.hpp

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

client/entities/barrier_manager.cpp

@@ -1,94 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "barrier_manager.hpp"
-
-void BarrierManager::DrawTo(SDL_Renderer* const dest, Sint16 x, Sint16 y, double scaleX, double scaleY) {
-	for (auto& it : elementMap) {
-		it.second.DrawTo(dest, x, y);
-	}
-}
-
-void BarrierManager::LoadBaseImage(SDL_Renderer* renderer, std::string fname) {
-	baseImage.Load(renderer, fname);
-}
-
-void BarrierManager::UnloadBaseImage() {
-	baseImage.Free();
-}
-
-void BarrierManager::LoadTemplateImages(SDL_Renderer* renderer, std::string spriteDir, std::list<std::string> names) {
-	//sprite names are file names only
-	for (auto& it : names) {
-		templateImages.emplace(it, Image(renderer, spriteDir + it));
-	}
-}
-
-void BarrierManager::UnloadTemplateImages() {
-	templateImages.clear();
-}
-
-BaseBarrier* BarrierManager::Create(int index) {
-	elementMap.emplace(index, BaseBarrier(baseImage, templateImages));
-	return &elementMap[index];
-}
-
-void BarrierManager::Unload(int i) {
-	elementMap.erase(i);
-}
-
-void BarrierManager::UnloadAll() {
-	elementMap.clear();
-}
-
-void BarrierManager::UnloadIf(std::function<bool(std::pair<const int, BaseBarrier const&>)> fn) {
-	std::map<int, BaseBarrier>::iterator it = elementMap.begin();
-	while (it != elementMap.end()) {
-		if (fn(*it)) {
-			it = elementMap.erase(it);
-		}
-		else {
-			++it;
-		}
-	}
-}
-
-int BarrierManager::Size() {
-	return elementMap.size();
-}
-
-BaseBarrier* BarrierManager::Find(int i) {
-	std::map<int, BaseBarrier>::iterator it = elementMap.find(i);
-
-	if (it == elementMap.end()) {
-		return nullptr;
-	}
-
-	return &it->second;
-}
-
-std::map<int, BaseBarrier>* BarrierManager::GetContainer() {
-	return &elementMap;
-}
-
-std::map<std::string, Image>* BarrierManager::GetTemplateContainer() {
-	return &templateImages;
-}

client/entities/barrier_manager.hpp

@@ -1,58 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#pragma once
-
-#include "base_barrier.hpp"
-
-#include <functional>
-#include <list>
-#include <string>
-
-class BarrierManager {
-public:
-	BarrierManager() = default;
-	~BarrierManager() = default;
-
-	void DrawTo(SDL_Renderer* const, Sint16 x, Sint16 y, double scaleX = 1.0, double scaleY = 1.0);
-
-	//NOTE: don't use these while you have barriers loaded
-	void LoadBaseImage(SDL_Renderer* renderer, std::string fname);
-	void UnloadBaseImage();
-	void LoadTemplateImages(SDL_Renderer* renderer, std::string spriteDir, std::list<std::string> names);
-	void UnloadTemplateImages();
-
-	BaseBarrier* Create(int index);
-	void Unload(int i);
-	void UnloadAll();
-	void UnloadIf(std::function<bool(std::pair<const int, BaseBarrier const&>)> fn);
-
-	int Size();
-
-	BaseBarrier* Find(int i);
-	std::map<int, BaseBarrier>* GetContainer();
-	std::map<std::string, Image>* GetTemplateContainer();
-
-private:
-	Image baseImage;
-	std::map<std::string, Image> templateImages;
-	std::map<int, BaseBarrier> elementMap;
-};

client/entities/base_barrier.cpp

@@ -1,105 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "base_barrier.hpp"
-
-#include "config_utility.hpp"
-
-#include <cstring>
-#include <sstream>
-#include <stdexcept>
-
-BaseBarrier::BaseBarrier(Image& argBaseImage, std::map<std::string, Image>& templateImages) {
-	baseImage.SetTexture(argBaseImage.GetTexture());
-	composite.SetTextures(templateImages);
-	memset(status, 0, sizeof(int) * 8);
-	CorrectSprite();
-}
-
-BaseBarrier::~BaseBarrier() {
-	//
-}
-
-void BaseBarrier::CorrectSprite() {
-	//TODO: link status to sprite
-	for (int i = 0; i < 8; i++) {
-		//setup the name
-		std::ostringstream os;
-		os << "slot " << i+1;
-
-		switch(status[i]) {
-			case 0:
-				composite.Disable(os.str() + " green.png");
-				composite.Disable(os.str() + " red.png");
-			break;
-			case 1:
-				composite.Enable(os.str() + " green.png");
-				composite.Disable(os.str() + " red.png");
-			break;
-			case 2:
-				composite.Disable(os.str() + " green.png");
-				composite.Enable(os.str() + " red.png");
-			break;
-			default: {
-				std::ostringstream os;
-				os << "index " << i << ", value " << status[i] << std::endl;
-				throw(std::runtime_error("Unknown graphical status in barrier; " + os.str()));
-			}
-		}
-	}
-}
-
-void BaseBarrier::Update() {
-	//
-}
-
-void BaseBarrier::DrawTo(SDL_Renderer* const dest, int camX, int camY) {
-	//ignore the default sprite for now
-	baseImage.DrawTo(dest, origin.x - camX, origin.y - camY);
-	composite.DrawTo(dest, origin.x - camX, origin.y - camY);
-}
-
-int BaseBarrier::SetStatus(int k, int v) {
-	if (k >= 8 || k < 0) {
-		return -1;
-	}
-	return status[k] = v;
-}
-
-int BaseBarrier::FindStatus(int k) {
-	if (k >= 8 || k < 0) {
-		return -1;
-	}
-	return status[k];
-}
-
-int* BaseBarrier::SetStatusArray(int* ptr) {
-	memcpy(status, ptr, sizeof(int) * 8);
-	return status;
-}
-
-int* BaseBarrier::GetStatusArray() {
-	return status;
-}
-
-CompositeImage<>* BaseBarrier::GetComposite() {
-	return &composite;
-}

client/entities/base_character.cpp

@@ -1,84 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "base_character.hpp"
-
-//TODO: (3) remove this
-#include "config_utility.hpp"
-
-//-------------------------
-//graphics
-//-------------------------
-
-void BaseCharacter::CorrectSprite() {
-	//NOTE: These must correspond to the sprite sheet in use
-	if (motion.y > 0) {
-		sprite.SetIndexY(0);
-	}
-	else if (motion.y < 0) {
-		sprite.SetIndexY(1);
-	}
-	else if (motion.x > 0) {
-		sprite.SetIndexY(3);
-	}
-	else if (motion.x < 0) {
-		sprite.SetIndexY(2);
-	}
-
-	//animation
-	if (motion != 0) {
-		sprite.SetDelay(0.1);
-	}
-	else {
-		sprite.SetDelay(0);
-		sprite.SetIndexX(0);
-	}
-}
-
-//-------------------------
-//metadata
-//-------------------------
-
-int BaseCharacter::SetOwner(int i) {
-	return owner = i;
-}
-
-int BaseCharacter::GetOwner() {
-	return owner;
-}
-
-std::string BaseCharacter::SetHandle(std::string s) {
-	return handle = s;
-}
-
-std::string BaseCharacter::GetHandle() const {
-	return handle;
-}
-
-std::string BaseCharacter::SetAvatar(SDL_Renderer* const renderer, std::string s) {
-	avatar = s;
-	sprite.Load(renderer, ConfigUtility::GetSingleton()["dir.sprites"] + avatar, CHARACTER_CELLS_X, CHARACTER_CELLS_Y);
-	return avatar;
-}
-
-std::string BaseCharacter::GetAvatar() const {
-	return avatar;
-}

client/entities/base_character.hpp

@@ -1,52 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#pragma once
-
-//components
-#include "character_defines.hpp"
-#include "entity.hpp"
-
-//std namespace
-#include <string>
-
-class BaseCharacter: public Entity {
-public:
-	BaseCharacter() = default;
-	virtual ~BaseCharacter() = default;
-
-	//graphics
-	void CorrectSprite();
-
-	//metadata
-	int SetOwner(int i);
-	int GetOwner();
-	std::string SetHandle(std::string s);
-	std::string GetHandle() const;
-	std::string SetAvatar(SDL_Renderer* const, std::string s);
-	std::string GetAvatar() const;
-
-protected:
-	//metadata
-	int owner;
-	std::string handle;
-	std::string avatar;
-};

client/entities/base_creature.cpp

@@ -1,46 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "base_creature.hpp"
-
-#include "config_utility.hpp"
-
-void BaseCreature::CorrectSprite() {
-	//TODO: (9) BaseCreature::CorrectSprite()
-}
-
-std::string BaseCreature::SetHandle(std::string s) {
-	return handle = s;
-}
-
-std::string BaseCreature::GetHandle() const {
-	return handle;
-}
-
-std::string BaseCreature::SetAvatar(SDL_Renderer* const renderer, std::string s) {
-	avatar = s;
-	sprite.Load(renderer, ConfigUtility::GetSingleton()["dir.sprites"] + avatar, 4, 4);
-	return avatar;
-}
-
-std::string BaseCreature::GetAvatar() const {
-	return avatar;
-}

client/entities/entity.cpp

@@ -1,63 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "entity.hpp"
-
-void Entity::Update() {
-	origin += motion;
-	sprite.Update(0.016);
-}
-
-void Entity::DrawTo(SDL_Renderer* const renderer, int camX, int camY) {
-	sprite.DrawTo(renderer, origin.x - camX, origin.y - camY);
-}
-
-SpriteSheet* Entity::GetSprite() {
-	return &sprite;
-}
-
-//-------------------------
-//accessors & mutators
-//-------------------------
-
-Vector2 Entity::SetOrigin(Vector2 v) {
-	return origin = v;
-}
-
-Vector2 Entity::SetMotion(Vector2 v) {
-	return motion = v;
-}
-
-BoundingBox Entity::SetBounds(BoundingBox b) {
-	return bounds = b;
-}
-
-Vector2 Entity::GetOrigin() const {
-	return origin;
-}
-
-Vector2 Entity::GetMotion() const {
-	return motion;
-}
-
-BoundingBox Entity::GetBounds() const {
-	return bounds;
-}

client/entities/local_character.cpp

@@ -1,36 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "local_character.hpp"
-
-#include <iostream>
-
-bool LocalCharacter::ProcessCollisionGrid(std::list<BoundingBox> boxList) {
-	for(auto& box : boxList) {
-		if (box.CheckOverlap(origin + bounds)) {
-			//TODO: (9) write a better collision system
-			origin -= motion;
-			motion = {0, 0};
-			return true;
-		}
-	}
-	return false;
-}

client/entities/makefile

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

client/fatal_error.cpp

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

client/fatal_error.hpp

@@ -1,31 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#pragma once
-
-#include <stdexcept>
-#include <string>
-
-class fatal_error: public std::runtime_error {
-public:
-	explicit fatal_error(const std::string& str): runtime_error(str) {}
-	explicit fatal_error(const char* cstr): runtime_error(cstr) {}
-};

client/heartbeat_utility.cpp

@@ -1,58 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "heartbeat_utility.hpp"
-
-#include "channels.hpp"
-#include "ip_operators.hpp"
-
-//heartbeat system
-void HeartbeatUtility::hPing(ServerPacket* const argPacket) {
-	ServerPacket newPacket;
-	newPacket.type = SerialPacketType::PONG;
-	network.SendTo(argPacket->srcAddress, &newPacket);
-}
-
-void HeartbeatUtility::hPong(ServerPacket* const argPacket) {
-	if (*network.GetIPAddress(Channels::SERVER) != argPacket->srcAddress) {
-		throw(std::runtime_error("Heartbeat message received from an unknown source"));
-	}
-	attemptedBeats = 0;
-	lastBeat = Clock::now();
-}
-
-int HeartbeatUtility::CheckHeartBeat() {
-	//check the connection (heartbeat)
-	if (Clock::now() - lastBeat > std::chrono::seconds(3)) {
-		if (attemptedBeats > 2) {
-			return 1;
-		}
-		else {
-			ServerPacket newPacket;
-			newPacket.type = SerialPacketType::PING;
-			network.SendTo(Channels::SERVER, &newPacket);
-
-			attemptedBeats++;
-			lastBeat = Clock::now();
-		}
-	}
-	return 0;
-}

client/in_combat.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,65 +19,72 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "example_scene.hpp"
+#include "in_combat.hpp"
 
-ExampleScene::ExampleScene() {
+#include <iostream>
+
+using namespace std;
+
+//-------------------------
+//Public access members
+//-------------------------
+
+InCombat::InCombat() {
+#ifdef DEBUG
+	cout << "entering InCombat" << endl;
+#endif
+}
+
+InCombat::~InCombat() {
+#ifdef DEBUG
+	cout << "leaving InCombat" << endl;
+#endif
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void InCombat::FrameStart() {
 	//
 }
 
-ExampleScene::~ExampleScene() {
+void InCombat::Update(double delta) {
+	//
+}
+
+void InCombat::FrameEnd() {
+	//
+}
+
+void InCombat::Render(SDL_Surface* const screen) {
 	//
 }
 
 //-------------------------
-//frame phases
+//Event handlers
 //-------------------------
 
-void ExampleScene::FrameStart() {
+void InCombat::MouseMotion(SDL_MouseMotionEvent const& motion) {
 	//
 }
 
-void ExampleScene::Update() {
+void InCombat::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 	//
 }
 
-void ExampleScene::FrameEnd() {
+void InCombat::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 	//
 }
 
-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) {
+void InCombat::KeyDown(SDL_KeyboardEvent const& key) {
+	switch(key.keysym.sym) {
 		case SDLK_ESCAPE:
 			QuitEvent();
-		break;
+			break;
 	}
 }
 
-void ExampleScene::KeyUp(SDL_KeyboardEvent const& event) {
+void InCombat::KeyUp(SDL_KeyboardEvent const& key) {
 	//
 }

client/in_combat.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,24 +19,30 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef INCOMBAT_HPP_
+#define INCOMBAT_HPP_
 
-#include "entity.hpp"
+#include "base_scene.hpp"
 
-class BaseCreature: public Entity {
+class InCombat : public BaseScene {
 public:
-	BaseCreature() = default;
-	virtual ~BaseCreature() = default;
-
-	void CorrectSprite();
-
-	std::string SetHandle(std::string s);
-	std::string GetHandle() const;
-	std::string SetAvatar(SDL_Renderer* const, std::string s);
-	std::string GetAvatar() const;
+	/* Public access members */
+	InCombat();
+	~InCombat();
 
 protected:
-	//metadata
-	std::string handle;
-	std::string avatar;
+	/* Frame loop */
+	void FrameStart();
+	void Update(double delta);
+	void FrameEnd();
+	void Render(SDL_Surface* const);
+
+	/* Event handlers */
+	void MouseMotion(SDL_MouseMotionEvent const&);
+	void MouseButtonDown(SDL_MouseButtonEvent const&);
+	void MouseButtonUp(SDL_MouseButtonEvent const&);
+	void KeyDown(SDL_KeyboardEvent const&);
+	void KeyUp(SDL_KeyboardEvent const&);
 };
+
+#endif

client/in_world.cpp

@@ -0,0 +1,326 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "in_world.hpp"
+
+#include <iostream>
+
+using namespace std;
+
+//-------------------------
+//Quick and dirty
+//-------------------------
+
+static std::string itos(int i) {
+	char buffer[20];
+	snprintf(buffer, 20, "%d", i);
+	return std::string(buffer);
+}
+
+//-------------------------
+//Public access members
+//-------------------------
+
+InWorld::InWorld() {
+#ifdef DEBUG
+	cout << "entering InWorld" << endl;
+#endif
+	cout << "Client Index: " << infoMgr->GetClientIndex() << endl;
+	font.SetSurface(surfaceMgr->Get("font"));
+
+	//debugging
+	Packet p;
+	p.meta.type = Packet::Type::PLAYER_NEW;
+	p.meta.clientIndex = infoMgr->GetClientIndex();
+
+	snprintf(p.playerInfo.handle, PACKET_STRING_SIZE, "%s", configUtil->CString("handle"));
+	snprintf(p.playerInfo.avatar, PACKET_STRING_SIZE, "%s", configUtil->CString("avatar"));
+	p.playerInfo.position.x = 50;
+	p.playerInfo.position.y = 50;
+	p.playerInfo.motion.x = 0;
+	p.playerInfo.motion.y = 0;
+
+	netUtil->Send(GAME_CHANNEL, &p, sizeof(Packet));
+
+	//request a sync
+	p.meta.type = Packet::Type::SYNCHRONIZE;
+	p.meta.clientIndex = infoMgr->GetClientIndex();
+	netUtil->Send(GAME_CHANNEL, &p, sizeof(Packet));
+}
+
+InWorld::~InWorld() {
+#ifdef DEBUG
+	cout << "leaving InWorld" << endl;
+#endif
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void InWorld::FrameStart() {
+	//
+}
+
+void InWorld::Update(double delta) {
+	while(HandlePacket(popNetworkPacket()));
+
+	for (auto& it : playerCharacters) {
+		it.second.Update(delta);
+	}
+}
+
+void InWorld::FrameEnd() {
+	//
+}
+
+void InWorld::Render(SDL_Surface* const screen) {
+	clockFrameRate();
+
+	for (auto& it : playerCharacters) {
+		it.second.DrawTo(screen);
+	}
+
+	//since we're using this twice, make a tmp var
+	string fps = itos(getFrameRate());
+	font.DrawStringTo(fps, screen, screen->w - fps.size() * font.GetCharW(), 0);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void InWorld::QuitEvent() {
+	//ensure that the client is disconnected properly
+	ExitGame();
+	SetNextScene(SceneList::QUIT);
+}
+
+void InWorld::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	//
+}
+
+void InWorld::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	//
+}
+
+void InWorld::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	//
+}
+
+void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
+	//general
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+			ExitGame();
+		break;
+	}
+
+	//player movement
+	if (infoMgr->GetPlayerIndex() == -1) {
+		return;
+	}
+
+	switch(key.keysym.sym) {
+		case SDLK_w:
+			playerCharacters[infoMgr->GetPlayerIndex()].MoveDirection(CardinalDirection::NORTH);
+			SendState();
+		break;
+		case SDLK_s:
+			playerCharacters[infoMgr->GetPlayerIndex()].MoveDirection(CardinalDirection::SOUTH);
+			SendState();
+		break;
+		case SDLK_a:
+			playerCharacters[infoMgr->GetPlayerIndex()].MoveDirection(CardinalDirection::WEST);
+			SendState();
+		break;
+		case SDLK_d:
+			playerCharacters[infoMgr->GetPlayerIndex()].MoveDirection(CardinalDirection::EAST);
+			SendState();
+		break;
+	}
+}
+
+void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
+	//player movement reversed
+	switch(key.keysym.sym) {
+		case SDLK_w:
+			playerCharacters[infoMgr->GetPlayerIndex()].MoveDirection(CardinalDirection::SOUTH);
+			SendState();
+		break;
+		case SDLK_s:
+			playerCharacters[infoMgr->GetPlayerIndex()].MoveDirection(CardinalDirection::NORTH);
+			SendState();
+		break;
+		case SDLK_a:
+			playerCharacters[infoMgr->GetPlayerIndex()].MoveDirection(CardinalDirection::EAST);
+			SendState();
+		break;
+		case SDLK_d:
+			playerCharacters[infoMgr->GetPlayerIndex()].MoveDirection(CardinalDirection::WEST);
+			SendState();
+		break;
+	}
+}
+
+//-------------------------
+//Utilities
+//-------------------------
+
+int InWorld::HandlePacket(Packet p) {
+	switch(p.meta.type) {
+		case Packet::Type::NONE:
+			//DO NOTHING
+			return 0;
+		break;
+		case Packet::Type::PING:
+			//quick pong
+			p.meta.type = Packet::Type::PONG;
+			p.meta.clientIndex = infoMgr->GetClientIndex();
+			netUtil->Send(&p.meta.address, &p, sizeof(Packet));
+		break;
+		case Packet::Type::PONG:
+			//
+		break;
+//		case Packet::Type::BROADCAST_REQUEST:
+//			//
+//		break;
+//		case Packet::Type::BROADCAST_RESPONSE:
+//			//
+//		break;
+//		case Packet::Type::JOIN_REQUEST:
+//			//
+//		break;
+//		case Packet::Type::JOIN_RESPONSE:
+//			//
+//		break;
+		case Packet::Type::DISCONNECT:
+			HandleDisconnection(p);
+		break;
+//		case Packet::Type::SYNCHRONIZE:
+//			//
+//		break;
+		case Packet::Type::PLAYER_NEW:
+			AddPlayer(p);
+		break;
+		case Packet::Type::PLAYER_DELETE:
+			RemovePlayer(p);
+		break;
+		case Packet::Type::PLAYER_UPDATE:
+			UpdatePlayer(p);
+		break;
+		default:
+			throw(runtime_error("Failed to recognize the packet type: " + itos(int(p.meta.type))));
+	}
+	return 1;
+}
+
+void InWorld::Disconnect() {
+	Packet p;
+
+	//delete the player
+	p.meta.type = Packet::Type::PLAYER_DELETE;
+	p.meta.clientIndex = infoMgr->GetClientIndex();
+	p.playerInfo.index = infoMgr->GetPlayerIndex();
+	netUtil->Send(GAME_CHANNEL, &p, sizeof(Packet));
+
+	//disconnect
+	p.meta.type = Packet::Type::DISCONNECT;
+	p.meta.clientIndex = infoMgr->GetClientIndex();
+	netUtil->Send(GAME_CHANNEL, &p, sizeof(Packet));
+
+	netUtil->Unbind(GAME_CHANNEL);
+
+	//reset the client
+	infoMgr->ResetClientIndex();
+	infoMgr->ResetPlayerIndex();
+}
+
+void InWorld::ExitGame() {
+	Disconnect();
+	SetNextScene(SceneList::MAINMENU);
+	endQueueThread();
+	cout << "The game session has ended" << endl;
+}
+
+void InWorld::HandleDisconnection(Packet& disconnect) {
+	Disconnect();
+	SetNextScene(SceneList::MAINMENU);
+	endQueueThread();
+	cout << "You have been disconnected" << endl;
+}
+
+void InWorld::AddPlayer(Packet& p) {
+	if (playerCharacters.find(p.playerInfo.index) != playerCharacters.end()) {
+		throw(runtime_error("Duplicate players detected"));
+	}
+
+	//position
+	playerCharacters[p.playerInfo.index].SetPosition(p.playerInfo.position);
+	playerCharacters[p.playerInfo.index].SetMotion(p.playerInfo.motion);
+
+	//sprite
+	playerCharacters[p.playerInfo.index].GetSprite()->SetSurface(surfaceMgr->Get(p.playerInfo.avatar), 32, 48);
+	playerCharacters[p.playerInfo.index].FaceDirection();
+
+	//is it this player?
+	if (p.meta.clientIndex == infoMgr->GetClientIndex()) {
+		infoMgr->SetPlayerIndex(p.playerInfo.index);
+	}
+
+	//debugging
+	cout << "New player, index " << p.playerInfo.index << endl;
+}
+
+void InWorld::RemovePlayer(Packet& p) {
+	if (playerCharacters.find(p.playerInfo.index) == playerCharacters.end()) {
+		throw(runtime_error("Player to delete not found"));
+	}
+
+	playerCharacters.erase(p.playerInfo.index);
+}
+
+void InWorld::UpdatePlayer(Packet& p) {
+	if (playerCharacters.find(p.playerInfo.index) == playerCharacters.end()) {
+		AddPlayer(p);
+		return;
+	}
+
+	playerCharacters[p.playerInfo.index].SetPosition(p.playerInfo.position);
+	playerCharacters[p.playerInfo.index].SetMotion(p.playerInfo.motion);
+	playerCharacters[p.playerInfo.index].FaceDirection();
+}
+
+void InWorld::SendState() {
+	//send the state of this player's character
+	if (infoMgr->GetPlayerIndex() == -1) {
+		return;
+	}
+
+	Packet p;
+	p.meta.type = Packet::Type::PLAYER_UPDATE;
+	p.meta.clientIndex = infoMgr->GetClientIndex();
+	p.playerInfo.index = infoMgr->GetPlayerIndex();
+	p.playerInfo.position = playerCharacters[infoMgr->GetPlayerIndex()].GetPosition();
+	p.playerInfo.motion = playerCharacters[infoMgr->GetPlayerIndex()].GetMotion();
+
+	netUtil->Send(GAME_CHANNEL, &p, sizeof(Packet));
+}

client/in_world.hpp

@@ -0,0 +1,88 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef INWORLD_HPP_
+#define INWORLD_HPP_
+
+#include "base_scene.hpp"
+
+#include "defines.hpp"
+#include "singleton.hpp"
+#include "packet.hpp"
+#include "network_queue.hpp"
+#include "information_manager.hpp"
+#include "player_character.hpp"
+
+#include "config_utility.hpp"
+#include "surface_manager.hpp"
+#include "udp_network_utility.hpp"
+#include "button.hpp"
+#include "raster_font.hpp"
+#include "frame_rate.hpp"
+
+#include <map>
+
+class InWorld : public BaseScene {
+public:
+	//Public access members
+	InWorld();
+	~InWorld();
+
+protected:
+	//Frame loop
+	void FrameStart();
+	void Update(double delta);
+	void FrameEnd();
+	void Render(SDL_Surface* const);
+
+	//Event handlers
+	void QuitEvent();
+	void MouseMotion(SDL_MouseMotionEvent const&);
+	void MouseButtonDown(SDL_MouseButtonEvent const&);
+	void MouseButtonUp(SDL_MouseButtonEvent const&);
+	void KeyDown(SDL_KeyboardEvent const&);
+	void KeyUp(SDL_KeyboardEvent const&);
+
+	//Utilities
+	int HandlePacket(Packet);
+	void Disconnect();
+	void ExitGame();
+
+	void HandleDisconnection(Packet&);
+
+	void AddPlayer(Packet&);
+	void RemovePlayer(Packet&);
+	void UpdatePlayer(Packet&);
+
+	void SendState();
+
+	//services
+	ConfigUtility* configUtil = Singleton<ConfigUtility>::Get();
+	SurfaceManager* surfaceMgr = Singleton<SurfaceManager>::Get();
+	UDPNetworkUtility* netUtil = Singleton<UDPNetworkUtility>::Get();
+	InformationManager* infoMgr = Singleton<InformationManager>::Get();
+
+	//members
+	RasterFont font;
+	std::map<int, PlayerCharacter> playerCharacters;
+};
+
+#endif

client/information_manager.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,21 +19,22 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef INFORMATIONMANAGER_HPP_
+#define INFORMATIONMANAGER_HPP_
 
-#include "base_character.hpp"
-#include "bounding_box.hpp"
-#include "vector2.hpp"
-
-#include <list>
-
-class LocalCharacter: public BaseCharacter {
+class InformationManager {
 public:
-	LocalCharacter() = default;
-	virtual ~LocalCharacter() = default;
-
-	bool ProcessCollisionGrid(std::list<BoundingBox>);
+	int SetClientIndex(int i) { return clientIndex = i; }
+	int GetClientIndex() { return clientIndex; }
+	void ResetClientIndex() { clientIndex = -1; }
 
+	//one player at a time
+	int SetPlayerIndex(int i) { return playerIndex = i; }
+	int GetPlayerIndex() { return playerIndex; }
+	void ResetPlayerIndex() { playerIndex = -1; }
 private:
-	//NOTE: NO MEMBERS
+	int clientIndex = -1;
+	int playerIndex = -1;
 };
+
+#endif

client/lobby.cpp

@@ -0,0 +1,244 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "lobby.hpp"
+
+#include <iostream>
+
+using namespace std;
+
+//-------------------------
+//Quick and dirty
+//-------------------------
+
+static std::string itos(int i) {
+	char buffer[20];
+	snprintf(buffer, 20, "%d", i);
+	return std::string(buffer);
+}
+
+//-------------------------
+//Public access members
+//-------------------------
+
+Lobby::Lobby() {
+#ifdef DEBUG
+	cout << "entering Lobby" << endl;
+#endif
+	refreshButton.Setup(50, 50, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Refresh");
+	joinButton.Setup(50, 50 + surfaceMgr->Get("button")->h/3, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Join");
+	backButton.Setup(50, 50 + surfaceMgr->Get("button")->h/3 * 2, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Back");
+
+	font.SetSurface(surfaceMgr->Get("font"));
+	listBox.x = 280;
+	listBox.y = 50;
+	listBox.w = GetScreen()->w - listBox.x - 50;
+	listBox.h = font.GetCharH();
+
+	serverList.push_back({"foo",{0,0}});
+	serverList.push_back({"bar",{0,0}});
+	serverList.push_back({"foobar",{0,0}});
+
+	flushNetworkQueue();
+	beginQueueThread();
+	BroadcastNetwork();
+}
+
+Lobby::~Lobby() {
+#ifdef DEBUG
+	cout << "leaving Lobby" << endl;
+#endif
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void Lobby::FrameStart() {
+	//
+}
+
+void Lobby::Update(double delta) {
+	while(HandlePacket(popNetworkPacket()));
+}
+
+void Lobby::FrameEnd() {
+	//
+}
+
+void Lobby::Render(SDL_Surface* const screen) {
+	refreshButton.DrawTo(screen);
+	joinButton.DrawTo(screen);
+	backButton.DrawTo(screen);
+
+	for (int i = 0; i < serverList.size(); i++) {
+		if (selectedServer == &serverList[i]) {
+			//draw the highlight box
+			SDL_Rect r = listBox;
+			r.y += i * font.GetCharH();
+			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 255, 127, 39));
+		}
+		font.DrawStringTo(serverList[i].name, screen, listBox.x, listBox.y + i * font.GetCharH());
+	}
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void Lobby::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	refreshButton.MouseMotion(motion);
+	joinButton.MouseMotion(motion);
+	backButton.MouseMotion(motion);
+}
+
+void Lobby::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	refreshButton.MouseButtonDown(button);
+	joinButton.MouseButtonDown(button);
+	backButton.MouseButtonDown(button);
+}
+
+void Lobby::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	if (refreshButton.MouseButtonUp(button) == Button::State::HOVER) {
+		BroadcastNetwork();
+		selectedServer = nullptr;
+	}
+	else if (joinButton.MouseButtonUp(button) == Button::State::HOVER) {
+		if (selectedServer) {
+			ConnectToServer(selectedServer);
+			selectedServer = nullptr;
+		}
+	}
+	else if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
+		SetNextScene(SceneList::MAINMENU);
+		endQueueThread();
+		selectedServer = nullptr;
+	}
+	else if (
+		//clicked within bounds TODO: make the damn collision system
+		button.x > listBox.x &&
+		button.y > listBox.y &&
+		button.x < listBox.x + listBox.w &&
+		button.y < listBox.y + (listBox.h * serverList.size())
+		)
+	{
+		//selecting a server
+		selectedServer = &serverList[(button.y - listBox.y) / listBox.h];
+	}
+	else {
+		//lose focus on a server
+		selectedServer = nullptr;
+	}
+}
+
+void Lobby::KeyDown(SDL_KeyboardEvent const& key) {
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+			SetNextScene(SceneList::MAINMENU);
+			break;
+	}
+}
+
+void Lobby::KeyUp(SDL_KeyboardEvent const& key) {
+	//
+}
+
+//-------------------------
+//Utilities
+//-------------------------
+
+int Lobby::HandlePacket(Packet p) {
+	switch(p.meta.type) {
+		case Packet::Type::NONE:
+			//DO NOTHING
+			return 0;
+		break;
+		case Packet::Type::PING:
+			//quick pong
+			p.meta.type = Packet::Type::PONG;
+			netUtil->Send(&p.meta.address, &p, sizeof(Packet));
+		break;
+		case Packet::Type::PONG:
+			//
+		break;
+//		case Packet::Type::BROADCAST_REQUEST:
+//			//
+//		break;
+		case Packet::Type::BROADCAST_RESPONSE:
+			PushServer(p);
+		break;
+//		case Packet::Type::JOIN_REQUEST:
+//			//
+//		break;
+		case Packet::Type::JOIN_RESPONSE:
+			BeginGame(p);
+		break;
+//		case Packet::Type::DISCONNECT:
+//			//
+//		break;
+//		case Packet::Type::SYNCHRONIZE:
+//			//
+//		break;
+//		case Packet::Type::PLAYER_NEW:
+//			//
+//		break;
+//		case Packet::Type::PLAYER_DELETE:
+//			//
+//		break;
+//		case Packet::Type::PLAYER_UPDATE:
+//			//
+//		break;
+		default:
+			throw(runtime_error("Failed to recognize the packet type: " + itos(int(p.meta.type))));
+	}
+	return 1;
+}
+
+void Lobby::BroadcastNetwork() {
+	Packet p;
+	p.meta.type = Packet::Type::BROADCAST_REQUEST;
+	netUtil->Send("255.255.255.255", configUtil->Int("server.port"), &p, sizeof(Packet));
+	serverList.clear();
+}
+
+void Lobby::PushServer(Packet& bcast) {
+	ServerEntry entry;
+	entry.name = bcast.serverInfo.name;
+	entry.address = bcast.meta.address;
+	serverList.push_back(entry);
+}
+
+void Lobby::ConnectToServer(ServerEntry* server) {
+	//_attempt_ to connect to a server
+	if (!server) {
+		throw(runtime_error("No server received"));
+	}
+	Packet p;
+	p.meta.type = Packet::Type::JOIN_REQUEST;
+	netUtil->Send(&server->address, reinterpret_cast<void*>(&p), sizeof(Packet));
+}
+
+void Lobby::BeginGame(Packet& response) {
+	//should be downloading the resources here as well
+	infoMgr->SetClientIndex(response.meta.clientIndex);
+	netUtil->Bind(&response.meta.address, GAME_CHANNEL);
+	SetNextScene(SceneList::INWORLD);
+}

client/lobby.hpp

@@ -0,0 +1,93 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef LOBBY_HPP_
+#define LOBBY_HPP_
+
+#include "base_scene.hpp"
+
+#include "defines.hpp"
+#include "singleton.hpp"
+
+#include "packet.hpp"
+#include "network_queue.hpp"
+#include "information_manager.hpp"
+
+#include "config_utility.hpp"
+#include "surface_manager.hpp"
+#include "udp_network_utility.hpp"
+#include "button.hpp"
+#include "raster_font.hpp"
+
+#include <vector>
+#include <string>
+
+struct ServerEntry {
+	std::string name;
+	IPaddress address;
+	//TODO: player count
+};
+
+class Lobby : public BaseScene {
+public:
+	//Public access members
+	Lobby();
+	~Lobby();
+
+protected:
+	//Frame loop
+	void FrameStart();
+	void Update(double delta);
+	void FrameEnd();
+	void Render(SDL_Surface* const);
+
+	//Event handlers
+	void MouseMotion(SDL_MouseMotionEvent const&);
+	void MouseButtonDown(SDL_MouseButtonEvent const&);
+	void MouseButtonUp(SDL_MouseButtonEvent const&);
+	void KeyDown(SDL_KeyboardEvent const&);
+	void KeyUp(SDL_KeyboardEvent const&);
+
+	//utilities
+	int HandlePacket(Packet);
+	void BroadcastNetwork();
+	void PushServer(Packet&);
+	void ConnectToServer(ServerEntry*);
+	void BeginGame(Packet&);
+
+	//services
+	ConfigUtility* configUtil = Singleton<ConfigUtility>::Get();
+	SurfaceManager* surfaceMgr = Singleton<SurfaceManager>::Get();
+	UDPNetworkUtility* netUtil = Singleton<UDPNetworkUtility>::Get();
+	InformationManager* infoMgr = Singleton<InformationManager>::Get();
+
+	//members
+	Button refreshButton;
+	Button joinButton;
+	Button backButton;
+
+	RasterFont font;
+	SDL_Rect listBox;
+	std::vector<ServerEntry> serverList;
+	ServerEntry* selectedServer = nullptr;
+};
+
+#endif

client/main.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,39 +21,27 @@
 */
 #include "client_application.hpp"
 
-//singletons
-#include "config_utility.hpp"
-#include "udp_network_utility.hpp"
-
 #include <stdexcept>
 #include <iostream>
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int, char**) {
+#ifdef DEBUG
+	cout << "Beginning program" << endl;
+#endif
 	try {
-		//create the singletons
-		ConfigUtility::CreateSingleton();
-		UDPNetworkUtility::CreateSingleton();
-
-		//call the client's routines
-		ClientApplication::CreateSingleton();
-		ClientApplication& app = ClientApplication::GetSingleton();
-
-		app.Init(argc, argv);
+		ClientApplication app;
+		app.Init();
 		app.Proc();
 		app.Quit();
-
-		//control the position of the app's destructor
-		ClientApplication::DeleteSingleton();
-
-		//delete the singletons
-		ConfigUtility::DeleteSingleton();
-		UDPNetworkUtility::DeleteSingleton();
 	}
 	catch(exception& e) {
-		cerr << "Fatal exception thrown: " << e.what() << endl;
+		cerr << "Fatal error: " << e.what() << endl;
 		return 1;
 	}
+#ifdef DEBUG
+	cout << "Clean exit" << endl;
+#endif
 	return 0;
-}
+}

client/main_menu.cpp

@@ -0,0 +1,103 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "main_menu.hpp"
+
+#include <iostream>
+
+using namespace std;
+
+//-------------------------
+//Public access members
+//-------------------------
+
+MainMenu::MainMenu() {
+#ifdef DEBUG
+	cout << "entering MainMenu" << endl;
+#endif
+	startButton.Setup(50, 50, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Start");
+	optionsButton.Setup(50, 50 + surfaceMgr->Get("button")->h/3, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Options");
+	quitButton.Setup(50, 50 + surfaceMgr->Get("button")->h/3 * 2, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Quit");
+}
+
+MainMenu::~MainMenu() {
+#ifdef DEBUG
+	cout << "leaving MainMenu" << endl;
+#endif
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void MainMenu::FrameStart() {
+	//
+}
+
+void MainMenu::Update(double delta) {
+	//
+}
+
+void MainMenu::FrameEnd() {
+	//
+}
+
+void MainMenu::Render(SDL_Surface* const screen) {
+	startButton.DrawTo(screen);
+	optionsButton.DrawTo(screen);
+	quitButton.DrawTo(screen);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void MainMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	startButton.MouseMotion(motion);
+	optionsButton.MouseMotion(motion);
+	quitButton.MouseMotion(motion);
+}
+
+void MainMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	startButton.MouseButtonDown(button);
+	optionsButton.MouseButtonDown(button);
+	quitButton.MouseButtonDown(button);
+}
+
+void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	if (startButton.MouseButtonUp(button) == Button::State::HOVER) {
+		SetNextScene(SceneList::LOBBY);
+	}
+	if (optionsButton.MouseButtonUp(button) == Button::State::HOVER) {
+		SetNextScene(SceneList::OPTIONSCREEN);
+	}
+	if (quitButton.MouseButtonUp(button) == Button::State::HOVER) {
+		QuitEvent();
+	}
+}
+
+void MainMenu::KeyDown(SDL_KeyboardEvent const& key) {
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+			QuitEvent();
+			break;
+	}
+}

client/main_menu.hpp

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

client/makefile

@@ -1,27 +1,15 @@
-#include directories
-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 ../common/libcommon.a -lSDL2_net
-ifeq ($(OS),Windows_NT)
-	LIBS+=-lwsock32 -liphlpapi -lmingw32
-endif
-LIBS+=-lSDL2main -lSDL2 -lSDL2_image -lSDL2_ttf
-
-#flags
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
-ifeq ($(shell uname), Linux)
-	#read data about the current install
-	CXXFLAGS+=$(shell sdl-config --cflags --static-libs)
-endif
+#config
+LOCALLIBS=../lib/libCommon.a
+LIB=$(LOCALLIBS) -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL
+INCLUDES=../common
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
 
 #source
-CXXSRC=$(wildcard *.cpp)
+SRC=$(wildcard *.cpp)
 
 #objects
 OBJDIR=obj
-OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
+OBJ=$(addprefix $(OBJDIR)/,$(SRC:.cpp=.o))
 
 #output
 OUTDIR=../out
@@ -29,9 +17,7 @@ OUT=$(addprefix $(OUTDIR)/,client)
 
 #targets
 all: $(OBJ) $(OUT)
-	$(MAKE) -C entities
-	$(MAKE) -C scenes
-	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
+	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIB)
 
 $(OBJ): | $(OBJDIR)
 
@@ -47,12 +33,6 @@ $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
 clean:
-ifeq ($(OS),Windows_NT)
 	$(RM) *.o *.a *.exe
-else ifeq ($(shell uname), Linux)
-	find . -type f -name *.o -exec rm -f -r -v {} \;
-	find . -type f -name *.a -exec rm -f -r -v {} \;
-	rm -f -v out/client out/server
-endif
 
 rebuild: clean all

client/option_screen.cpp

@@ -0,0 +1,77 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "option_screen.hpp"
+
+#include <iostream>
+
+using namespace std;
+
+//-------------------------
+//Public access members
+//-------------------------
+
+OptionScreen::OptionScreen() {
+#ifdef DEBUG
+	cout << "entering OptionScreen" << endl;
+#endif
+	backButton.Setup(50, 50, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Back");
+}
+
+OptionScreen::~OptionScreen() {
+#ifdef DEBUG
+	cout << "leaving OptionScreen" << endl;
+#endif
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void OptionScreen::Render(SDL_Surface* const screen) {
+	backButton.DrawTo(screen);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void OptionScreen::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	backButton.MouseMotion(motion);
+}
+
+void OptionScreen::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	backButton.MouseButtonDown(button);
+}
+
+void OptionScreen::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
+		SetNextScene(SceneList::MAINMENU);
+	}
+}
+
+void OptionScreen::KeyDown(SDL_KeyboardEvent const& key) {
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+			SetNextScene(SceneList::MAINMENU);
+			break;
+	}
+}

client/option_screen.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,34 +19,33 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef OPTIONSCREEN_HPP_
+#define OPTIONSCREEN_HPP_
 
-#include "entity.hpp"
+#include "base_scene.hpp"
+#include "singleton.hpp"
 
-#include "composite_image.hpp"
+#include "surface_manager.hpp"
+#include "button.hpp"
 
-class BaseBarrier: public Entity {
+class OptionScreen : public BaseScene {
 public:
-	BaseBarrier() = default;
-	BaseBarrier(Image& baseImage, std::map<std::string, Image>& templateImages);
-	virtual ~BaseBarrier();
-
-	void CorrectSprite();
-	void Update();
-	void DrawTo(SDL_Renderer* const, int camX, int camY);
-
-	int SetStatus(int, int);
-	int FindStatus(int);
-
-	int* SetStatusArray(int*);
-	int* GetStatusArray();
-
-	CompositeImage<>* GetComposite();
+	/* Public access members */
+	OptionScreen();
+	~OptionScreen();
 
 protected:
-	//metadata
-	int status[8];
+	/* Frame loop */
+	void Render(SDL_Surface* const);
 
-	Image baseImage;
-	CompositeImage<> composite;
+	/* Event handlers */
+	void MouseMotion(SDL_MouseMotionEvent const&);
+	void MouseButtonDown(SDL_MouseButtonEvent const&);
+	void MouseButtonUp(SDL_MouseButtonEvent const&);
+	void KeyDown(SDL_KeyboardEvent const&);
+
+	SurfaceManager* surfaceMgr = Singleton<SurfaceManager>::Get();
+	Button backButton;
 };
+
+#endif

client/player_character.cpp

@@ -0,0 +1,114 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "player_character.hpp"
+
+void PlayerCharacter::Update(double delta) {
+	if (limitSpeed) {
+		constexpr double d = 1.0/sqrt(2);
+		position += motion * delta * d;
+	}
+	else {
+		position += motion * delta;
+	}
+	sprite.Update(delta);
+}
+
+void PlayerCharacter::MoveDirection(CardinalDirection cd) {
+	//shift the movement in this direction
+	switch(cd) {
+		case CardinalDirection::NORTH:
+			if (motion.y >= 0) {
+				motion.y -= WALKING_SPEED;
+			}
+		break;
+		case CardinalDirection::SOUTH:
+			if (motion.y <= 0) {
+				motion.y += WALKING_SPEED;
+			}
+		break;
+		case CardinalDirection::WEST:
+			if (motion.x >= 0) {
+				motion.x -= WALKING_SPEED;
+			}
+		break;
+		case CardinalDirection::EAST:
+			if (motion.x <= 0) {
+				motion.x += WALKING_SPEED;
+			}
+		break;
+	}
+	//face the correct direction
+	FaceDirection();
+}
+
+void PlayerCharacter::FaceDirection(CardinalDirection cd) {
+	switch(cd) {
+		case CardinalDirection::NORTH:
+			sprite.SetCurrentStrip(1);
+		break;
+		case CardinalDirection::SOUTH:
+			sprite.SetCurrentStrip(0);
+		break;
+		case CardinalDirection::WEST:
+			sprite.SetCurrentStrip(2);
+		break;
+		case CardinalDirection::EAST:
+			sprite.SetCurrentStrip(3);
+		break;
+	}
+}
+
+void PlayerCharacter::FaceDirection() {
+	//base the direction on the character's movement
+	if (motion.y < 0) {
+		FaceDirection(CardinalDirection::NORTH);
+	}
+	if (motion.y > 0) {
+		FaceDirection(CardinalDirection::SOUTH);
+	}
+	if (motion.x < 0) {
+		FaceDirection(CardinalDirection::WEST);
+	}
+	if (motion.x > 0) {
+		FaceDirection(CardinalDirection::EAST);
+	}
+	CheckSpeed();
+}
+
+void PlayerCharacter::CheckSpeed() {
+	//diagonal
+	if (motion.x != 0 && motion.y != 0) {
+		sprite.SetDelay(0.1);
+		limitSpeed = true;
+	}
+	//cardinal
+	else if (motion != 0) {
+		sprite.SetDelay(0.1);
+		limitSpeed = false;
+	}
+	//not moving
+	else {
+		sprite.SetDelay(0);
+		sprite.SetCurrentFrame(0);
+		limitSpeed = false;
+	}
+}

client/player_character.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,36 +19,45 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef PLAYERCHARACTER_HPP_
+#define PLAYERCHARACTER_HPP_
 
-#include "bounding_box.hpp"
-#include "sprite_sheet.hpp"
 #include "vector2.hpp"
+#include "sprite_sheet.hpp"
+#include "defines.hpp"
 
-//The base class for all objects in the world
-//TODO: (9) write a better hierarchy
-class Entity {
+class PlayerCharacter {
 public:
-	virtual void Update();
-	virtual void DrawTo(SDL_Renderer* const, int camX, int camY);
+	PlayerCharacter() = default;
+	~PlayerCharacter() = default;
 
-	SpriteSheet* GetSprite();
+	void Update(double delta);
 
-	//accessors & mutators
-	Vector2 SetOrigin(Vector2 v);
-	Vector2 SetMotion(Vector2 v);
-	BoundingBox SetBounds(BoundingBox b);
+	void MoveDirection(CardinalDirection);
+	void FaceDirection(CardinalDirection);
+	void FaceDirection();
 
-	Vector2 GetOrigin() const;
-	Vector2 GetMotion() const;
-	BoundingBox GetBounds() const;
+	void DrawTo(SDL_Surface* const dest) { sprite.DrawTo(dest, position.x, position.y); }
 
-protected:
-	Entity() = default;
-	virtual ~Entity() = default;
+	//accessors and mutators
+	Vector2 SetPosition(Vector2 v) { return position = v; }
+	Vector2 ShiftPosition(Vector2 v) { return position += v; }
+	Vector2 GetPosition() { return position; }
 
-	SpriteSheet sprite;
-	Vector2 origin;
+	Vector2 SetMotion(Vector2 v) { return motion = v; }
+	Vector2 ShiftMotion(Vector2 v) { return motion += v; }
+	Vector2 GetMotion() { return motion; }
+
+	SpriteSheet* GetSprite() { return &sprite; }
+private:
+	void CheckSpeed();
+
+	Vector2 position;
 	Vector2 motion;
-	BoundingBox bounds;
+	SpriteSheet sprite;
+
+	//for moving diagonal
+	bool limitSpeed = false;
 };
+
+#endif

client/scene_list.hpp

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

client/scenes/combat.cpp

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

client/scenes/combat.hpp

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

client/scenes/disconnected_screen.cpp

@@ -1,134 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "disconnected_screen.hpp"
-
-#include "channels.hpp"
-#include "config_utility.hpp"
-#include "udp_network_utility.hpp"
-
-#include <sstream>
-#include <stdexcept>
-
-constexpr SDL_Color WHITE = {255, 255, 255, 255};
-
-//-------------------------
-//Public access members
-//-------------------------
-
-DisconnectedScreen::DisconnectedScreen() {
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-
-	//setup the utility objects
-	//TODO: (1) resource tool, to prevent reloading like this
-	image.Load(GetRenderer(), config["dir.interface"] + "button_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 button
-	backButton.SetBackgroundTexture(GetRenderer(), image.GetTexture());
-	backButton.SetText(GetRenderer(), font, WHITE, "Back");
-
-	//set the button positions
-	backButton.SetX(50);
-	backButton.SetY(50);
-
-	//set the disconnection message text
-	textLine.SetX(50);
-	textLine.SetY(30);
-	textLine.SetText(GetRenderer(), font, WHITE, config["client.disconnectMessage"]);
-
-	//full reset
-	UDPNetworkUtility::GetSingleton().Unbind(Channels::SERVER);
-
-	//auto return
-	startTick = std::chrono::steady_clock::now();
-}
-
-DisconnectedScreen::~DisconnectedScreen() {
-	TTF_CloseFont(font);
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void DisconnectedScreen::FrameStart() {
-	//
-}
-
-void DisconnectedScreen::Update() {
-	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(10)) {
-		SetSceneSignal(SceneSignal::MAINMENU);
-	}
-
-	//Eat incoming packets
-	while(UDPNetworkUtility::GetSingleton().Receive());
-}
-
-void DisconnectedScreen::FrameEnd() {
-	//
-}
-
-void DisconnectedScreen::RenderFrame(SDL_Renderer* renderer) {
-	backButton.DrawTo(renderer);
-	textLine.DrawTo(renderer);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void DisconnectedScreen::MouseMotion(SDL_MouseMotionEvent const& event) {
-	backButton.MouseMotion(event);
-}
-
-void DisconnectedScreen::MouseButtonDown(SDL_MouseButtonEvent const& event) {
-	backButton.MouseButtonDown(event);
-}
-
-void DisconnectedScreen::MouseButtonUp(SDL_MouseButtonEvent const& event) {
-	if (backButton.MouseButtonUp(event) == Button::State::RELEASED) {
-		SetSceneSignal(SceneSignal::MAINMENU);
-	}
-}
-
-void DisconnectedScreen::MouseWheel(SDL_MouseWheelEvent const& event) {
-	//
-}
-
-void DisconnectedScreen::KeyDown(SDL_KeyboardEvent const& event) {
-	switch(event.keysym.sym) {
-		case SDLK_ESCAPE:
-			SetSceneSignal(SceneSignal::MAINMENU);
-		break;
-	}
-}
-
-void DisconnectedScreen::KeyUp(SDL_KeyboardEvent const& event) {
-	//
-}

client/scenes/disconnected_screen.hpp

@@ -1,63 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#pragma once
-
-#include "base_scene.hpp"
-#include "button.hpp"
-#include "image.hpp"
-#include "text_line.hpp"
-
-#include "SDL2/SDL_ttf.h"
-
-#include <chrono>
-
-class DisconnectedScreen : public BaseScene {
-public:
-	//Public access members
-	DisconnectedScreen();
-	~DisconnectedScreen();
-
-	void RenderFrame(SDL_Renderer* renderer) override;
-
-protected:
-	//frame phases
-	void FrameStart() override;
-	void Update() override;
-	void FrameEnd() override;
-
-	//input events
-	void MouseMotion(SDL_MouseMotionEvent const& event) override;
-	void MouseButtonDown(SDL_MouseButtonEvent const& event) override;
-	void MouseButtonUp(SDL_MouseButtonEvent const& event) override;
-	void MouseWheel(SDL_MouseWheelEvent const& event) override;
-	void KeyDown(SDL_KeyboardEvent const& event) override;
-	void KeyUp(SDL_KeyboardEvent const& event) override;
-
-	//graphics
-	Image image;
-	TTF_Font* font = nullptr;
-	Button backButton;
-	TextLine textLine;
-
-	//auto return
-	std::chrono::steady_clock::time_point startTick;
-};

client/scenes/lobby_menu.cpp

@@ -1,322 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "lobby_menu.hpp"
-
-#include "channels.hpp"
-
-#include <cstring>
-#include <stdexcept>
-#include <sstream>
-
-constexpr SDL_Color WHITE = {255, 255, 255, 255};
-
-//-------------------------
-//Public access members
-//-------------------------
-
-LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
-	clientIndex(*argClientIndex),
-	accountIndex(*argAccountIndex)
-{
-	//preemptive reset
-	clientIndex = -1;
-	accountIndex = -1;
-
-	//setup the utility objects
-	buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_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
-	searchButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	searchButton.SetText(GetRenderer(), font, WHITE, "Search");
-	joinButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	joinButton.SetText(GetRenderer(), font, WHITE, "Join");
-	backButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	backButton.SetText(GetRenderer(), font, WHITE, "Back");
-
-	//set the button positions (assumed)
-	searchButton.SetX(50);
-	searchButton.SetY(50);
-	joinButton.SetX(50);
-	joinButton.SetY(70);
-	backButton.SetX(50);
-	backButton.SetY(90);
-
-	//pseudo-list selection
-	//TODO: move this into the UI library?
-	boundingBox = {300, 50, 200, 12};
-
-	//hacked together a highlight box
-	highlightImage.Create(GetRenderer(), 300, 12, {49, 150, 5, 255});
-
-	//Eat incoming packets
-	while(network.Receive());
-
-	//Initial broadcast
-	SendBroadcastRequest();
-}
-
-LobbyMenu::~LobbyMenu() {
-	TTF_CloseFont(font);
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void LobbyMenu::FrameStart() {
-	//
-}
-
-void LobbyMenu::Update() {
-	//suck in and process all waiting packets
-	SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]);
-	while(network.Receive(packetBuffer)) {
-		HandlePacket(packetBuffer);
-	}
-	delete reinterpret_cast<char*>(packetBuffer);
-}
-
-void LobbyMenu::FrameEnd() {
-	//
-}
-
-void LobbyMenu::RenderFrame(SDL_Renderer* renderer) {
-	//TODO: (2) I need a proper UI system for the entire client and the editor
-
-	//UI
-	searchButton.DrawTo(renderer);
-	joinButton.DrawTo(renderer);
-	backButton.DrawTo(renderer);
-
-	//TODO: (3) draw headers for the server list
-	//TODO: (3) ping/delay displayed in the server list
-	for (int i = 0; i < serverVector.size(); i++) {
-		//draw the selected server's highlight
-		if (selection == &serverVector[i]) {
-			highlightImage.DrawTo(renderer, boundingBox.x, boundingBox.y + boundingBox.h * i);
-		}
-
-		//draw the server's info
-		serverVector[i].nameImage.SetX(boundingBox.x);
-		serverVector[i].nameImage.SetY(boundingBox.y + boundingBox.h * i);
-		serverVector[i].nameImage.DrawTo(renderer);
-
-		serverVector[i].playerCountImage.SetX(boundingBox.x+276);
-		serverVector[i].playerCountImage.SetY(boundingBox.y + boundingBox.h * i);
-		serverVector[i].playerCountImage.DrawTo(renderer);
-	}
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void LobbyMenu::MouseMotion(SDL_MouseMotionEvent const& event) {
-	searchButton.MouseMotion(event);
-	joinButton.MouseMotion(event);
-	backButton.MouseMotion(event);
-}
-
-void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& event) {
-	searchButton.MouseButtonDown(event);
-	joinButton.MouseButtonDown(event);
-	backButton.MouseButtonDown(event);
-}
-
-void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& event) {
-	if (searchButton.MouseButtonUp(event) == Button::State::RELEASED) {
-		SendBroadcastRequest();
-	}
-	if (joinButton.MouseButtonUp(event) == Button::State::RELEASED && selection && selection->compatible) {
-		SendJoinRequest();
-	}
-	if (backButton.MouseButtonUp(event) == Button::State::RELEASED) {
-		SetSceneSignal(SceneSignal::MAINMENU);
-	}
-
-	//has the user selected a server on the list?
-	BoundingBox tmpBox = boundingBox;
-	tmpBox.h *= serverVector.size(); //within the list bounds
-	if (tmpBox.CheckOverlap({event.x, event.y})) {
-		//NOTE: this memory trick requires a vector
-		selection = &serverVector[(event.y - boundingBox.y)/boundingBox.h];
-	}
-	else {
-		selection = nullptr;
-	}
-}
-
-void LobbyMenu::MouseWheel(SDL_MouseWheelEvent const& event) {
-	//
-}
-
-void LobbyMenu::KeyDown(SDL_KeyboardEvent const& event) {
-	switch(event.keysym.sym) {
-		case SDLK_ESCAPE:
-			SetSceneSignal(SceneSignal::MAINMENU);
-		break;
-	}
-}
-
-void LobbyMenu::KeyUp(SDL_KeyboardEvent const& event) {
-	//
-}
-
-//-------------------------
-//Network handlers
-//-------------------------
-
-void LobbyMenu::HandlePacket(SerialPacket* const argPacket) {
-		switch(argPacket->type) {
-			//responses
-		case SerialPacketType::BROADCAST_RESPONSE:
-			HandleBroadcastResponse(static_cast<ServerPacket*>(argPacket));
-		break;
-		case SerialPacketType::JOIN_RESPONSE:
-			HandleJoinResponse(static_cast<ClientPacket*>(argPacket));
-		break;
-		case SerialPacketType::LOGIN_RESPONSE:
-			HandleLoginResponse(static_cast<ClientPacket*>(argPacket));
-		break;
-
-		//rejections
-		case SerialPacketType::JOIN_REJECTION:
-			HandleJoinRejection(static_cast<TextPacket*>(argPacket));
-		break;
-		case SerialPacketType::LOGIN_REJECTION:
-			HandleLoginRejection(static_cast<TextPacket*>(argPacket));
-		break;
-
-		//handle errors
-		default: {
-			std::ostringstream msg;
-			msg << "Unknown SerialPacketType encountered in LobbyMenu: " << static_cast<int>(argPacket->type);
-			throw(std::runtime_error( msg.str() ));
-		}
-		break;
-	}
-}
-
-void LobbyMenu::HandleBroadcastResponse(ServerPacket* const argPacket) {
-	//extract the data
-	ServerInfo newServer;
-
-	newServer.address = argPacket->srcAddress;
-	newServer.name = argPacket->name;
-	newServer.playerCount = argPacket->playerCount;
-	newServer.version = argPacket->version;
-	newServer.compatible = newServer.version == NETWORK_VERSION;
-
-	//push
-	serverVector.push_back(newServer);
-
-	//BUGFIX: since TextLine lacks the memory management of Image, I'll wait until after the line is in the vector to handle these
-
-	//fancy colors
-	SDL_Color color;
-	if (newServer.compatible) {
-		color = {255, 255, 255, 255};
-	}
-	else {
-		color = {255, 0, 0, 255};
-	}
-
-	//fancy itoa
-	auto itoa_base10 = [](int i) -> std::string {
-		char str[20];
-		sprintf(str, "%d", i);
-		return std::string(str);
-	};
-
-	//text graphics
-	serverVector.back().nameImage.SetText(GetRenderer(), font, color, newServer.name);
-	serverVector.back().playerCountImage.SetText(GetRenderer(), font, color, itoa_base10(newServer.playerCount));
-}
-
-void LobbyMenu::HandleJoinResponse(ClientPacket* const argPacket) {
-	//save the server's data
-	clientIndex = argPacket->clientIndex;
-	network.Bind(argPacket->srcAddress, Channels::SERVER);
-
-	//request login data
-	SendLoginRequest();
-}
-
-void LobbyMenu::HandleLoginResponse(ClientPacket* const argPacket) {
-	if (argPacket->clientIndex != clientIndex) {
-		throw(std::runtime_error("Client index invalid during login"));
-	}
-	accountIndex = argPacket->accountIndex;
-	SetSceneSignal(SceneSignal::WORLD);
-}
-
-void LobbyMenu::HandleJoinRejection(TextPacket* const argPacket) {
-	//TODO: (9) LobbyMenu::HandleJoinRejection()
-}
-
-void LobbyMenu::HandleLoginRejection(TextPacket* const argPacket) {
-	//TODO: (9) LobbyMenu::HandleLoginRejection
-}
-
-//-------------------------
-//server control
-//-------------------------
-
-void LobbyMenu::SendBroadcastRequest() {
-	//broadcast to the network, or a specific server
-		ClientPacket packet;
-		packet.type = SerialPacketType::BROADCAST_REQUEST;
-		network.SendTo(config["server.host"].c_str(), config.Int("server.port"), &packet);
-
-		//reset the server list
-		serverVector.clear();
-		selection = nullptr;
-}
-
-void LobbyMenu::SendJoinRequest() {
-	//pack the packet
-		ClientPacket packet;
-		packet.type = SerialPacketType::JOIN_REQUEST;
-
-		//join the selected server
-		network.SendTo(selection->address, &packet);
-		selection = nullptr;
-}
-
-void LobbyMenu::SendLoginRequest() {
-	//NOTE: high cohesion
-	//TODO: (9) have a separate login screen
-	ClientPacket packet;
-	packet.type = SerialPacketType::LOGIN_REQUEST;
-	packet.clientIndex = clientIndex;
-	strncpy(packet.username, config["client.username"].c_str(), PACKET_STRING_SIZE+1);
-
-	network.SendTo(Channels::SERVER, &packet);
-}

client/scenes/lobby_menu.hpp

@@ -1,110 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#pragma once
-
-//graphics & ui
-#include "image.hpp"
-#include "button.hpp"
-#include "bounding_box.hpp"
-#include "text_line.hpp"
-
-#include "SDL2/SDL_ttf.h"
-
-//utilities
-#include "config_utility.hpp"
-#include "udp_network_utility.hpp"
-#include "serial_packet.hpp"
-
-//client
-#include "base_scene.hpp"
-
-//STL
-#include <vector>
-
-class LobbyMenu : public BaseScene {
-public:
-	//Public access members
-	LobbyMenu(int* const argClientIndex, int* const argAccountIndex);
-	~LobbyMenu();
-
-	void RenderFrame(SDL_Renderer* renderer) override;
-
-protected:
-	//frame phases
-	void FrameStart() override;
-	void Update() override;
-	void FrameEnd() override;
-
-	//input events
-	void MouseMotion(SDL_MouseMotionEvent const& event) override;
-	void MouseButtonDown(SDL_MouseButtonEvent const& event) override;
-	void MouseButtonUp(SDL_MouseButtonEvent const& event) override;
-	void MouseWheel(SDL_MouseWheelEvent const& event) override;
-	void KeyDown(SDL_KeyboardEvent const& event) override;
-	void KeyUp(SDL_KeyboardEvent const& event) override;
-
-	//Network handlers
-	void HandlePacket(SerialPacket* const);
-	void HandleBroadcastResponse(ServerPacket* const);
-	void HandleJoinResponse(ClientPacket* const);
-	void HandleLoginResponse(ClientPacket* const);
-	void HandleJoinRejection(TextPacket* const);
-	void HandleLoginRejection(TextPacket* const);
-
-	//server control
-	void SendBroadcastRequest();
-	void SendJoinRequest();
-	void SendLoginRequest();
-
-	//shared parameters
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
-	int& clientIndex;
-	int& accountIndex;
-
-	//define the list object
-	struct ServerInfo {
-		//graphics
-		TextLine nameImage;
-		TextLine playerCountImage;
-
-		//networking
-		IPaddress address;
-		std::string name;
-		int playerCount;
-		int version;
-		bool compatible;
-	};
-
-	//members
-	Image buttonImage;
-	Image highlightImage;
-	TTF_Font* font = nullptr;
-	Button searchButton;
-	Button joinButton;
-	Button backButton;
-
-	std::vector<ServerInfo> serverVector;
-	ServerInfo* selection = nullptr;
-
-	BoundingBox boundingBox;
-};

client/scenes/main_menu.cpp

@@ -1,150 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "main_menu.hpp"
-
-#include "config_utility.hpp"
-
-#include <sstream>
-#include <stdexcept>
-
-constexpr SDL_Color WHITE = {255, 255, 255, 255};
-
-//-------------------------
-//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, WHITE, "Start");
-	optionsButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	optionsButton.SetText(GetRenderer(), font, WHITE, "Options");
-	quitButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	quitButton.SetText(GetRenderer(), font, WHITE, "Quit");
-
-	//set the button positions
-	startButton.SetX(50);
-	startButton.SetY(50 + 20 * 0);
-	optionsButton.SetX(50);
-	optionsButton.SetY(50 + 20 * 1);
-	quitButton.SetX(50);
-	quitButton.SetY(50 + 20 * 2);
-
-	//text box
-	int h = -1;
-	SDL_RenderGetLogicalSize(GetRenderer(), nullptr, &h);
-
-	textBox.SetX(50);
-	textBox.SetY(h-100);
-
-	textBox.PushLine(GetRenderer(), font, WHITE, "Thanks for playing!");
-	textBox.PushLine(GetRenderer(), font, WHITE, "You can get the latest version at: ");
-	textBox.PushLine(GetRenderer(), font, WHITE, "krgamestudios.com"); //TODO: (9) click to open the website/update
-
-	//debug
-	//
-}
-
-MainMenu::~MainMenu() {
-	TTF_CloseFont(font);
-}
-
-//-------------------------
-//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);
-	textBox.DrawTo(renderer);
-}
-
-//-------------------------
-//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/makefile

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

client/scenes/options_menu.cpp

@@ -1,120 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "options_menu.hpp"
-
-#include "config_utility.hpp"
-
-#include <sstream>
-#include <stdexcept>
-
-constexpr SDL_Color WHITE = {255, 255, 255, 255};
-
-//-------------------------
-//Public access members
-//-------------------------
-
-OptionsMenu::OptionsMenu() {
-	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 button
-	backButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	backButton.SetText(GetRenderer(), font, WHITE, "Back");
-
-	//set the button positions
-	backButton.SetX(50);
-	backButton.SetY(50);
-
-	//text line
-	textLine.SetX(50);
-	textLine.SetY(30);
-	textLine.SetText(GetRenderer(), font, WHITE, "Am I making any progress?");
-}
-
-OptionsMenu::~OptionsMenu() {
-	TTF_CloseFont(font);
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void OptionsMenu::FrameStart() {
-	//
-}
-
-void OptionsMenu::Update() {
-	//
-}
-
-void OptionsMenu::FrameEnd() {
-	//
-}
-
-void OptionsMenu::RenderFrame(SDL_Renderer* renderer) {
-	backButton.DrawTo(renderer);
-	textLine.DrawTo(renderer);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void OptionsMenu::MouseMotion(SDL_MouseMotionEvent const& event) {
-	backButton.MouseMotion(event);
-}
-
-void OptionsMenu::MouseButtonDown(SDL_MouseButtonEvent const& event) {
-	backButton.MouseButtonDown(event);
-}
-
-void OptionsMenu::MouseButtonUp(SDL_MouseButtonEvent const& event) {
-	if (backButton.MouseButtonUp(event) == Button::State::RELEASED) {
-		SetSceneSignal(SceneSignal::MAINMENU);
-	}
-}
-
-void OptionsMenu::MouseWheel(SDL_MouseWheelEvent const& event) {
-	//
-}
-
-void OptionsMenu::KeyDown(SDL_KeyboardEvent const& event) {
-	switch(event.keysym.sym) {
-		case SDLK_ESCAPE:
-			SetSceneSignal(SceneSignal::MAINMENU);
-		break;
-	}
-}
-
-void OptionsMenu::KeyUp(SDL_KeyboardEvent const& event) {
-	//
-}

client/scenes/options_menu.hpp

@@ -1,58 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#pragma once
-
-#include "button.hpp"
-#include "image.hpp"
-#include "text_line.hpp"
-
-#include "base_scene.hpp"
-
-//NOTE: The options screen needs to be USED
-class OptionsMenu : public BaseScene {
-public:
-	//Public access members
-	OptionsMenu();
-	~OptionsMenu();
-
-	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;
-
-	//members
-	Image buttonImage;
-	TTF_Font* font = nullptr;
-	Button backButton;
-	TextLine textLine;
-};

client/scenes/splash_screen.cpp

@@ -1,61 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "splash_screen.hpp"
-
-#include "config_utility.hpp"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-SplashScreen::SplashScreen(SDL_Window* w) {
-	//fit the screen to the logo
-	//NOTE: not using this window trick
-	window = w;
-	SDL_GetWindowSize(window, &windowWidth, &windowHeight);
-
-	logo.Load(GetRenderer(), ConfigUtility::GetSingleton()["dir.logos"] + "krstudios.png");
-
-	startTick = std::chrono::steady_clock::now();
-}
-
-SplashScreen::~SplashScreen() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void SplashScreen::FrameStart() {
-	//TODO: (0) config flag to change the delay
-	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(3)) {
-		SetSceneSignal(SceneSignal::MAINMENU);
-	}
-}
-
-void SplashScreen::RenderFrame(SDL_Renderer* renderer) {
-	//TODO: version information
-	int w = 0, h = 0;
-	SDL_RenderGetLogicalSize(renderer, &w, &h);
-	logo.DrawTo(renderer, (w - logo.GetClipW()) / 2, (h - logo.GetClipH()) / 2);
-}

client/scenes/world.hpp

@@ -1,170 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#pragma once
-
-//maps
-#include "region_pager_base.hpp"
-
-//utilities
-#include "udp_network_utility.hpp"
-#include "serial_packet.hpp"
-#include "config_utility.hpp"
-
-//graphics
-#include "image.hpp"
-#include "button.hpp"
-#include "tile_sheet.hpp"
-#include "text_line.hpp"
-
-//common
-#include "frame_rate.hpp"
-
-//client
-#include "barrier_manager.hpp"
-#include "base_scene.hpp"
-#include "base_barrier.hpp"
-#include "base_creature.hpp"
-#include "heartbeat_utility.hpp"
-#include "local_character.hpp"
-
-#include "SDL2/SDL.h"
-#include "SDL2/SDL_net.h"
-#include "SDL2/SDL_ttf.h"
-
-//STL
-#include <map>
-
-#include <chrono>
-
-class World: public BaseScene {
-public:
-	//Public access members
-	World(int* const argClientIndex, int* const argAccountIndex);
-	~World();
-
-	void RenderFrame(SDL_Renderer* renderer) override;
-
-private:
-	//frame phases
-	void FrameStart() override;
-	void Update() override;
-	void FrameEnd() override;
-
-	//input events
-	void QuitEvent();
-	void MouseMotion(SDL_MouseMotionEvent const& event) override;
-	void MouseButtonDown(SDL_MouseButtonEvent const& event) override;
-	void MouseButtonUp(SDL_MouseButtonEvent const& event) override;
-	void MouseWheel(SDL_MouseWheelEvent const& event) override;
-	void KeyDown(SDL_KeyboardEvent const& event) override;
-	void KeyUp(SDL_KeyboardEvent const& event) override;
-
-	//handle incoming traffic
-	void HandlePacket(SerialPacket* const);
-
-	//basic connections
-	void SendLogoutRequest();
-	void SendDisconnectRequest();
-	void SendAdminDisconnectForced();
-	void SendAdminShutdownRequest();
-
-	void hLogoutResponse(ClientPacket* const);
-	void hDisconnectResponse(ClientPacket* const);
-	void hAdminDisconnectForced(ClientPacket* const);
-
-	//map management
-	void SendRegionRequest(int roomIndex, int x, int y);
-	void hRegionContent(RegionPacket* const);
-	void UpdateMap();
-
-	//character management
-	void hCharacterUpdate(CharacterPacket* const);
-	void hCharacterCreate(CharacterPacket* const);
-	void hCharacterUnload(CharacterPacket* const);
-	void hQueryCharacterExists(CharacterPacket* const);
-	void hCharacterMovement(CharacterPacket* const);
-
-	//creature management
-	void hCreatureUpdate(CreaturePacket* const);
-	void hCreatureCreate(CreaturePacket* const);
-	void hCreatureUnload(CreaturePacket* const);
-	void hQueryCreatureExists(CreaturePacket* const);
-	void hCreatureMovement(CreaturePacket* const);
-
-	//barrier management
-	void hBarrierUpdate(BarrierPacket* const);
-	void hBarrierCreate(BarrierPacket* const);
-	void hBarrierUnload(BarrierPacket* const);
-	void hQueryBarrierExists(BarrierPacket* const);
-
-	//chat
-	//TODO: ui chat engine
-	void hTextBroadcast(TextPacket* const);
-	void hTextSpeech(TextPacket* const);
-	void hTextWhisper(TextPacket* const);
-
-	//general gameplay
-	void SendLocalCharacterMovement();
-	std::list<BoundingBox> GenerateCollisionGrid(Entity*, int tileWidth, int tileHeight);
-
-	//indexes
-	int& clientIndex;
-	int& accountIndex;
-	int characterIndex = -1;
-	int roomIndex = -1;
-
-	//graphics
-	TileSheet tileSheet;
-
-	//map
-	RegionPagerBase regionPager;
-
-	//UI
-	Image buttonImage;
-	TTF_Font* font = nullptr;
-	Button disconnectButton;
-	Button shutdownButton;
-	FrameRate fps;
-	TextLine fpsTextLine;
-
-	//the camera structure
-	struct {
-		int x = 0, y = 0;
-		int width = 0, height = 0;
-		int marginX = 0, marginY = 0;
-	} camera;
-
-	//entities
-	BarrierManager barrierMgr;
-	std::map<int, BaseCharacter> characterMap;
-	std::map<int, BaseCreature> creatureMap;
-	LocalCharacter* localCharacter = nullptr;
-
-	//heartbeat
-	HeartbeatUtility heartbeatUtility;
-	typedef std::chrono::steady_clock Clock;
-	Clock::time_point queryTime = Clock::now() - std::chrono::seconds(4); //back 4 seconds to trigger automatically
-
-	//ugly references; I hate this
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
-};

client/splash_screen.cpp

@@ -0,0 +1,86 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "splash_screen.hpp"
+
+#include <iostream>
+
+using namespace std;
+
+//-------------------------
+//Public access members
+//-------------------------
+
+SplashScreen::SplashScreen() {
+#ifdef DEBUG
+	cout << "entering SplashScreen" << endl;
+#endif
+	logo.SetSurface(surfaceMgr->Load("splash-logo", configUtil->String("logos") + "/krstudios.bmp"));
+}
+
+SplashScreen::~SplashScreen() {
+	surfaceMgr->Free("splash-logo");
+#ifdef DEBUG
+	cout << "leaving SplashScreen" << endl;
+#endif
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void SplashScreen::RunFrame(double delta) {
+	HandleEvents();
+	if (!loaded) {
+		//never repeat this
+		loaded = true;
+
+		//quick draw
+		RenderFrame();
+
+		LoadResources();
+	}
+
+	if (std::chrono::steady_clock::now() - start > std::chrono::duration<int>(1)) {
+		SetNextScene(SceneList::MAINMENU);
+	}
+}
+
+void SplashScreen::RenderFrame() {
+	SDL_FillRect(GetScreen(), 0, 0);
+	int x = (GetScreen()->w - logo.GetClipW()) / 2;
+	int y = (GetScreen()->h - logo.GetClipH()) / 2;
+	logo.DrawTo(GetScreen(), x, y);
+	SDL_Flip(GetScreen());
+}
+
+void SplashScreen::LoadResources() {
+	//standard
+	surfaceMgr->Load("font", configUtil->String("fonts") + "/pk_white_8.bmp");
+	surfaceMgr->Load("button", configUtil->String("interface") + "/button_menu.bmp");
+
+	//debugging
+	surfaceMgr->Load("elliot", configUtil->String("sprites") + "/elliot2.bmp");
+	surfaceMgr->Load("coa", configUtil->String("sprites") + "/coa2.bmp");
+	surfaceMgr->Load("flower", configUtil->String("sprites") + "/aniflower.bmp");
+	surfaceMgr->Load("terrain", configUtil->String("tilesets") + "/terrain.bmp");
+	//TODO
+}

client/splash_screen.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,30 +19,35 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef SPLASHSCREEN_HPP_
+#define SPLASHSCREEN_HPP_
 
 #include "base_scene.hpp"
+#include "singleton.hpp"
+
+#include "config_utility.hpp"
+#include "surface_manager.hpp"
 #include "image.hpp"
 
 #include <chrono>
 
 class SplashScreen : public BaseScene {
 public:
-	//Public access members
-	SplashScreen(SDL_Window*);
+	/* Public access members */
+	SplashScreen();
 	~SplashScreen();
 
-	void RenderFrame(SDL_Renderer* renderer) override;
+protected:
+	/* Frame loop */
+	void RunFrame(double delta);
+	void RenderFrame();
+	void LoadResources();
 
-private:
-	//Frame loop
-	void FrameStart() override;
-
-	//members
-	std::chrono::steady_clock::time_point startTick;
+	bool loaded = false;
+	ConfigUtility* configUtil = Singleton<ConfigUtility>::Get();
+	SurfaceManager* surfaceMgr = Singleton<SurfaceManager>::Get();
 	Image logo;
-
-	//screws with the window
-	SDL_Window* window = nullptr;
-	int windowWidth, windowHeight;
+	std::chrono::steady_clock::time_point start = std::chrono::steady_clock::now();
 };
+
+#endif

common/button.cpp

@@ -0,0 +1,89 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "button.hpp"
+
+#include <stdexcept>
+
+void Button::Setup(Sint16 i, Sint16 j, SDL_Surface* bg, SDL_Surface* fg, std::string t) {
+	x = i;
+	y = j;
+	SetSurfaces(bg, fg);
+	SetText(t);
+}
+
+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) {
+	image.DrawTo(dest, x, y);
+	font.DrawStringTo(text, dest, textX + x, textY + y);
+}
+
+void Button::SetSurfaces(SDL_Surface* bg, SDL_Surface* fg) {
+	//graphical stuff
+	image.SetSurface(bg);
+	image.SetClipH(image.GetClipH() / 3); //3 phases, vertical storage
+	font.SetSurface(fg);
+
+	//reset textX & textY
+	SetText(text);
+}
+
+std::string Button::SetText(std::string t) {
+	//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 (i < x || i > (x + image.GetClipW()) ||
+		j < y || j > (y + image.GetClipH())
+		) {
+		image.SetClipY(0);
+		return state = State::NORMAL;
+	}
+	if (leftPressed) {
+		image.SetClipY(image.GetClipH()*2);
+		return state = State::PRESSED;
+	}
+	else {
+		image.SetClipY(image.GetClipH());
+		return state = State::HOVER;
+	}
+}

common/button.hpp

@@ -0,0 +1,80 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef BUTTON_HPP_
+#define BUTTON_HPP_
+
+#include "image.hpp"
+#include "raster_font.hpp"
+
+#include <string>
+
+//3-phases, no toggle, centred text
+class Button {
+public:
+	enum class State {
+		NORMAL, HOVER, PRESSED
+	};
+
+	Button() = default;
+	Button(Sint16 x, Sint16 y, SDL_Surface* bg, SDL_Surface* fg, std::string t = "") { Setup(x, y, bg, fg, t); }
+
+	void Setup(Sint16 x, Sint16 y, SDL_Surface* bg, SDL_Surface* fg, std::string text = "");
+
+	//return the current state
+	State MouseMotion(SDL_MouseMotionEvent const&);
+	State MouseButtonDown(SDL_MouseButtonEvent const&);
+	State MouseButtonUp(SDL_MouseButtonEvent const&);
+	State GetState() const { return state; }
+
+	//yet another draw function
+	void DrawTo(SDL_Surface* const);
+
+	//simple accessors and mutators
+	Sint16 SetX(Sint16 i) { return x = i; }
+	Sint16 SetY(Sint16 i) { return y = i; }
+	Sint16 GetX() const { return x; }
+	Sint16 GetY() const { return y; }
+
+	void SetSurfaces(SDL_Surface* bg, SDL_Surface* fg);
+
+	std::string SetText(std::string t);
+	std::string GetText() const { return text; }
+
+	//raw access, be careful
+	Image* GetImage() { return &image; }
+	RasterFont* GetFont() { return &font; }
+
+	//debug
+	Sint16 GetTextX() const { return textX; }
+	Sint16 GetTextY() const { return textY; }
+private:
+	State CalcState(Sint16 x, Sint16 y, bool leftPressed);
+
+	Sint16 x = 0, y = 0;
+	Sint16 textX = 0, textY = 0; //prevent recalc every loop
+	Image image;
+	RasterFont font;
+	State state = State::NORMAL;
+	std::string text;
+};
+
+#endif

common/config_utility.cpp

@@ -0,0 +1,76 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "config_utility.hpp"
+
+#include <stdexcept>
+#include <fstream>
+
+using namespace std;
+
+void ConfigUtility::Load(string fname) {
+	ifstream is(fname);
+
+	if (!is.is_open()) {
+		throw(runtime_error("Failed to open config file"));
+	}
+
+	string key, val;
+
+	for (;;) { //forever
+		//eat whitespace
+		while(isspace(is.peek()))
+			is.ignore();
+
+		//end of file
+		if (is.eof())
+			break;
+
+		//skip comment lines
+		if (is.peek() == '#') {
+			while(is.peek() != '\n' && !is.eof()) {
+				is.ignore();
+			}
+			continue;
+		}
+
+		//read in the pair
+		getline(is, key,'=');
+		getline(is, val);
+
+		//trim the strings at the start & end
+		while(key.size() && isspace(*key.begin())) key.erase(0, 1);
+		while(val.size() && isspace(*val.begin())) val.erase(0, 1);
+
+		while(key.size() && isspace(*(key.end()-1))) key.erase(key.end() - 1);
+		while(val.size() && isspace(*(val.end()-1))) val.erase(val.end() - 1);
+
+		//allow empty/wiped values
+		if (key.size() == 0) {
+			continue;
+		}
+
+		//save the pair
+		table[key] = val;
+	}
+
+	is.close();
+}

common/config_utility.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,41 +19,50 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef CONFIGUTILITY_HPP_
+#define CONFIGUTILITY_HPP_
 
-#include "bounding_box.hpp"
-#include "entity.hpp"
-#include "vector2.hpp"
-
-#include "lua.hpp"
-
-#include <list>
+#include <map>
 #include <string>
+#include <cstdlib>
 
-class TriggerData {
+class ConfigUtility {
 public:
-	TriggerData() = default;
-	~TriggerData() = default;
+	ConfigUtility() {}
+	ConfigUtility(std::string s) { Load(s); }
 
-	std::string SetHandle(std::string);
-	std::string GetHandle() const;
+	void Load(std::string fname);
 
-	Vector2 SetOrigin(Vector2 v);
-	Vector2 GetOrigin();
-
-	BoundingBox SetBoundingBox(BoundingBox b);
-	BoundingBox GetBoundingBox();
-
-	int SetScriptReference(int i);
-	int GetScriptReference();
-
-	//NOTE: exclusion list is currently used for entities that have already "fired" the trigger
-	std::list<Entity*>* GetExclusionList();
+	std::string String(std::string s) {
+		return table[s];
+	}
+	const char* CString(std::string s) {
+		return table[s].c_str();
+	}
+	int Integer(std::string s) {
+		return atoi(table[s].c_str());
+	}
+	double Double(std::string s) {
+		return atof(table[s].c_str());
+	}
+	bool Boolean(std::string s) {
+		return table[s] == "true";
+	}
 
+	std::string& operator[](std::string s) {
+		return table[s];
+	}
+	int Int(std::string s) {
+		return Integer(s);
+	}
+	int Bool(std::string s) {
+		return Boolean(s);
+	}
+	std::map<std::string, std::string>* GetMap() {
+		return &table;
+	}
 private:
-	std::string handle;
-	Vector2 origin;
-	BoundingBox bounds;
-	int scriptRef = LUA_NOREF;
-	std::list<Entity*> exclusionList;
+	std::map<std::string, std::string> table;
 };
+
+#endif

common/debugging/makefile

@@ -1,28 +0,0 @@
-#config
-INCLUDES+=.
-LIBS+=
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
-
-#source
-CXXSRC=$(wildcard *.cpp)
-
-#objects
-OBJDIR=obj
-OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-
-#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 $@ $<

common/debugging/timer.cpp

@@ -1,45 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "timer.hpp"
-
-Timer::Timer(): start(Timer::Clock::now()) {
-	//
-}
-
-Timer::Timer(std::string s): name(s), start(Timer::Clock::now()) {
-	//
-}
-
-void Timer::Start() {
-	start = Clock::now();
-}
-
-void Timer::Stop() {
-	timeSpan = Clock::now() - start;
-}
-
-std::ostream& operator<<(std::ostream& os, Timer& t) {
-	os << t.GetName() << ": ";
-	os << std::chrono::duration_cast<std::chrono::microseconds>(t.GetTime()).count();
-	os << "us";
-	return os;
-}

common/defines.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,17 +19,16 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef DEFINES_HPP_
+#define DEFINES_HPP_
 
-#include "item_data.hpp"
+#define GAME_CHANNEL 0
+#define CHAT_CHANNEL 1
 
-#include <list>
+#define WALKING_SPEED 140
 
-class Inventory {
-public:
-	Inventory() = default;
-	~Inventory() = default;
+enum class CardinalDirection {
+	NORTH, SOUTH, EAST, WEST
+};
 
-private:
-	std::list<ItemData> itemList;
-};
+#endif

common/frame_rate.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,24 +19,26 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
-
-#include "server_packet.hpp"
-#include "udp_network_utility.hpp"
+#include "frame_rate.hpp"
 
 #include <chrono>
 
-class HeartbeatUtility {
-public:
-	//heartbeat system
-	void hPing(ServerPacket* const);
-	void hPong(ServerPacket* const);
+typedef std::chrono::high_resolution_clock Clock;
 
-	int CheckHeartBeat();
+static int frameCount = 0;
+static int lastFrameRate = 0;
+static Clock::time_point tick = Clock::now();
 
-private:
-	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
-	typedef std::chrono::steady_clock Clock;
-	Clock::time_point lastBeat = Clock::now();
-	int attemptedBeats = 0;
-};
+int clockFrameRate() {
+	frameCount++;
+	if (Clock::now() - tick >= std::chrono::duration<int>(1)) {
+		lastFrameRate = frameCount;
+		frameCount = 0;
+		tick = Clock::now();
+	}
+	return lastFrameRate;
+}
+
+int getFrameRate() {
+	return lastFrameRate;
+}

common/frame_rate.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,6 +19,10 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef FRAMERATE_HPP_
+#define FRAMERATE_HPP_
 
-constexpr int INFLUENCE_RADIUS = 1000;
+int clockFrameRate();
+int getFrameRate();
+
+#endif

common/frameworks/network/makefile

@@ -1,29 +0,0 @@
-#config
-INCLUDES+=. packet_types ../gameplay ../map ../utilities
-LIBS+=
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
-
-#source
-CXXSRC=$(wildcard *.cpp)
-
-#objects
-OBJDIR=obj
-OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-
-#targets
-all: $(OBJ) $(OUT)
-	ar -crs $(OUT) $(OBJ)
-	$(MAKE) -C packet_types
-
-$(OBJ): | $(OBJDIR)
-
-$(OUT): | $(OUTDIR)
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-$(OUTDIR):
-	mkdir $(OUTDIR)
-
-$(OBJDIR)/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c -o $@ $<

common/frameworks/scenes/application.cpp

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

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

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

common/frameworks/scenes/base_scene.hpp

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

@@ -1,46 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#pragma once
-
-#include "base_scene.hpp"
-
-class 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,43 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "application.hpp"
-
-#include "SDL2/SDL.h"
-
-#include <iostream>
-#include <stdexcept>
-
-int main(int argc, char** argv) {
-	std::cout << "Beginning " << argv[0] << std::endl;
-	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

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

common/gameplay/barrier_defines.hpp

@@ -1,28 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#pragma once
-
-//the bounds for the objects, mapped to the default sprites
-constexpr int BARRIER_BOUNDS_X = 0;
-constexpr int BARRIER_BOUNDS_Y = 0;
-constexpr int BARRIER_BOUNDS_WIDTH = 96;
-constexpr int BARRIER_BOUNDS_HEIGHT = 96;

common/gameplay/character_defines.hpp

@@ -1,39 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#pragma once
-
-#include <cmath>
-
-//the speeds that the characters move
-constexpr double CHARACTER_WALKING_SPEED = 2.24;
-constexpr double CHARACTER_WALKING_MOD = 1.0/sqrt(2.0);
-constexpr double CHARACTER_WALKING_NEGATIVE_MOD = 1.0 - CHARACTER_WALKING_MOD;
-
-//the bounds for the character objects, mapped to the default sprites
-constexpr int CHARACTER_BOUNDS_X = 0;
-constexpr int CHARACTER_BOUNDS_Y = 16;
-constexpr int CHARACTER_BOUNDS_WIDTH = 32;
-constexpr int CHARACTER_BOUNDS_HEIGHT = 32;
-
-//the character's sprite format
-constexpr int CHARACTER_CELLS_X = 4;
-constexpr int CHARACTER_CELLS_Y = 4;

common/gameplay/creature_defines.hpp

@@ -1,39 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#pragma once
-
-#include <cmath>
-
-//the speeds that the characters move
-constexpr double CREATURE_WALKING_SPEED = 1.0;
-constexpr double CREATURE_WALKING_MOD = 1.0/sqrt(2.0);
-constexpr double CREATURE_WALKING_NEGATIVE_MOD = 1.0 - CREATURE_WALKING_MOD;
-
-//the bounds for the character objects, mapped to the default sprites
-constexpr int CREATURE_BOUNDS_X = 0;
-constexpr int CREATURE_BOUNDS_Y = 0;
-constexpr int CREATURE_BOUNDS_WIDTH = 32;
-constexpr int CREATURE_BOUNDS_HEIGHT = 32;
-
-//the character's sprite format
-constexpr int CREATURE_CELLS_X = 4;
-constexpr int CREATURE_CELLS_Y = 4;

common/gameplay/item_type.hpp

@@ -1,32 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#pragma once
-
-enum ItemType {
-	//basics
-	POTION = 101,
-
-	//weapons
-	SWORD = 201,
-	DAGGER = 202,
-	STAFF = 203
-};

common/gameplay/makefile

@@ -1,28 +0,0 @@
-#config
-INCLUDES+=.
-LIBS+=
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
-
-#source
-CXXSRC=$(wildcard *.cpp)
-
-#objects
-OBJDIR=obj
-OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-
-#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 $@ $<

common/graphics/button.cpp

@@ -1,167 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "button.hpp"
-
-#include "render_text_texture.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, SDL_Color color, std::string s) {
-	//convert to texture
-	SDL_Texture* text = renderTextTexture(renderer, font, color, s);
-
-	//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);
-}
-
-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;
-}
-
-int Button::SetX(int i) {
-	return posX = i;
-}
-
-int Button::SetY(int i) {
-	return posY = i;
-}
-
-int Button::GetX() const {
-	return posX;
-}
-
-int Button::GetY() const {
-	return posY;
-}
-
-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

@@ -1,67 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#pragma once
-
-#include "image.hpp"
-
-#include "SDL2/SDL_ttf.h"
-
-#include <string>
-
-class Button {
-public:
-	enum State {
-		IDLE = 0, HOVER = 1, PRESSED = 2, RELEASED = 3
-	};
-
-	//methods
-	Button() = default;
-	~Button() = default;
-
-	void DrawTo(SDL_Renderer*);
-
-	//setup
-	void SetBackgroundTexture(SDL_Renderer*, SDL_Texture*);
-	void SetText(SDL_Renderer*, TTF_Font*, SDL_Color, std::string);
-
-	//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();
-
-	//accessors & mutators
-	int SetX(int x);
-	int SetY(int y);
-	int GetX() const;
-	int GetY() const;
-
-protected:
-	bool CheckBounds(int x, int y);
-
-	Image image;
-	State state = State::IDLE;
-	int posX = 0, posY = 0;
-};

common/graphics/composite_image.hpp

@@ -1,145 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#pragma once
-
-#include "image.hpp"
-
-#include <list>
-#include <map>
-#include <string>
-
-template<typename T = class Image>
-class CompositeImage {
-public:
-	CompositeImage() = default;
-	~CompositeImage() = default;
-
-	void Load(SDL_Renderer* const, std::string spriteDir, std::list<std::string> nameList);
-	void SetTextures(std::map<std::string, Image>& templateImages);
-	void Free();
-
-	void DrawTo(SDL_Renderer* const, Sint16 x, Sint16 y, double scaleX = 1.0, double scaleY = 1.0);
-
-	//accessors & mutators
-	T* Find(std::string name);
-
-	bool Enable(std::string name);
-	bool Disable(std::string name);
-	void EnableAll();
-	void DisableAll();
-
-	std::map<std::string, std::pair<bool, T>>* GetTemplateImages();
-
-private:
-	std::map<std::string, std::pair<bool, T>> imageMap;
-};
-
-
-template<typename T>
-void CompositeImage<T>::Load(SDL_Renderer* const renderer, std::string spriteDir, std::list<std::string> nameList) {
-	for (auto& it : nameList) {
-		imageMap[it].first = true;
-		imageMap[it].second.Load(renderer, spriteDir + it);
-	}
-}
-
-template<typename T>
-void CompositeImage<T>::SetTextures(std::map<std::string, Image>& templateImages) {
-	for (auto& it : templateImages) {
-		imageMap[it.first].first = true;
-		imageMap[it.first].second.SetTexture(it.second.GetTexture());
-	}
-}
-
-template<typename T>
-void CompositeImage<T>::Free() {
-	imageMap.clear();
-}
-
-template<typename T>
-void CompositeImage<T>::DrawTo(SDL_Renderer* const dest, Sint16 x, Sint16 y, double scaleX, double scaleY) {
-	//draw all members, regardless of internal ordering
-	for (auto& it : imageMap) {
-		if (it.second.first) {
-			it.second.second.DrawTo(dest, x, y, scaleX, scaleY);
-		}
-	}
-}
-
-
-//-------------------------
-//accessors & mutators
-//-------------------------
-
-template<typename T>
-T* CompositeImage<T>::Find(std::string name) {
-	auto it = imageMap.find(name);
-	if (it == imageMap.end()) {
-		return nullptr;
-	}
-	else {
-		return &it->second.second;
-	}
-}
-
-template<typename T>
-bool CompositeImage<T>::Enable(std::string name) {
-	auto it = imageMap.find(name);
-	if (it == imageMap.end()) {
-		return false;
-	}
-	else {
-		imageMap[name].first = true;
-		return true;
-	}
-}
-
-template<typename T>
-bool CompositeImage<T>::Disable(std::string name) {
-	auto it = imageMap.find(name);
-	if (it == imageMap.end()) {
-		return false;
-	}
-	else {
-		imageMap[name].first = false;
-		return true;
-	}
-}
-
-template<typename T>
-void CompositeImage<T>::EnableAll() {
-	for (auto& it : imageMap) {
-		it.second.first = true;
-	}
-}
-
-template<typename T>
-void CompositeImage<T>::DisableAll() {
-	for (auto& it : imageMap) {
-		it.second.first = false;
-	}
-}
-
-template<typename T>
-std::map<std::string, std::pair<bool, T>>* CompositeImage<T>::GetTemplateImages() {
-	return &imageMap;
-}

common/graphics/image.cpp

@@ -1,211 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "image.hpp"
-
-#include "SDL2/SDL_image.h"
-
-#include <sstream>
-#include <stdexcept>
-
-Image& Image::operator=(Image const& rhs) {
-	//don't screw yourself
-	if (this == &rhs) {
-		return *this;
-	}
-
-	Free();
-
-	//Copy the other Image's stuff
-	texture = rhs.texture;
-	clip = rhs.clip;
-	local = false;
-}
-
-Image& Image::operator=(Image&& rhs) {
-	//don't screw yourself
-	if (this == &rhs) {
-		return *this;
-	}
-
-	Free();
-
-	//Steal the other Image's stuff
-	texture = rhs.texture;
-	clip = rhs.clip;
-	local = rhs.local;
-
-	rhs.texture = nullptr;
-	rhs.clip = {0, 0, 0, 0};
-	rhs.local = false;
-}
-
-SDL_Texture* Image::Load(SDL_Renderer* renderer, std::string fname) {
-	Free();
-
-	//load the file into a surface
-	SDL_Surface* surface = IMG_Load(fname.c_str());
-	if (!surface) {
-		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()));
-	}
-	local = true;
-
-	//free the surface & return
-	SDL_FreeSurface(surface);
-	return texture;
-}
-
-SDL_Texture* Image::Create(SDL_Renderer* renderer, Uint16 w, Uint16 h, SDL_Color blank) {
-	Free();
-
-	//make the texture
-	texture = SDL_CreateTexture(renderer,
-		SDL_PIXELFORMAT_RGBA8888,
-		SDL_TEXTUREACCESS_TARGET,
-		w, h);
-
-	//check
-	if (!texture) {
-		std::ostringstream msg;
-		msg << "Failed to create a texture; " << 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 created image";
-		msg << "; " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-	local = true;
-
-	//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_Texture* Image::CopyTexture(SDL_Renderer* renderer, SDL_Texture* ptr) {
-	Free();
-	int w = 0, h = 0;
-
-	//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 set image";
-		msg << "; " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-	local = false;
-
-	return texture;
-}
-
-SDL_Texture* Image::GetTexture() const {
-	return texture;
-}
-
-void Image::Free() {
-	if (local) {
-		SDL_DestroyTexture(texture);
-		local = false;
-	}
-	texture = nullptr;
-	clip = {0, 0, 0, 0};
-}
-
-void Image::DrawTo(SDL_Renderer* const renderer, Sint16 x, Sint16 y, double scaleX, double scaleY) {
-	if (!texture) {
-		throw(std::logic_error("No image texture to draw"));
-	}
-	SDL_Rect sclip = clip;
-	SDL_Rect dclip = {x, y, Uint16(clip.w * scaleX), Uint16(clip.h * scaleY)};
-	SDL_RenderCopy(renderer, texture, &sclip, &dclip);
-}
-
-void Image::SetAlpha(Uint8 a) {
-	if (SDL_SetTextureAlphaMod(texture, a)) {
-		std::ostringstream msg;
-		msg << "Failed to set alpha; " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-}
-
-Uint8 Image::GetAlpha() {
-	Uint8 ret = 0;
-	if (SDL_GetTextureAlphaMod(texture, &ret)) {
-		std::ostringstream msg;
-		msg << "Failed to get alpha; " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-	return ret;
-}

common/graphics/makefile

@@ -1,28 +0,0 @@
-#config
-INCLUDES+=. ../utilities
-LIBS+=
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
-
-#source
-CXXSRC=$(wildcard *.cpp)
-
-#objects
-OBJDIR=obj
-OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-
-#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 $@ $<

common/graphics/render_text_texture.cpp

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

common/graphics/render_text_texture.hpp

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

common/graphics/sprite_sheet.cpp

@@ -1,186 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "sprite_sheet.hpp"
-
-#include <sstream>
-#include <stdexcept>
-
-SpriteSheet& SpriteSheet::operator=(SpriteSheet const& rhs) {
-	//don't screw yourself
-	if (this == &rhs) {
-		return *this;
-	}
-
-	Free();
-
-	//Copy the other SpriteSheet's stuff
-	texture = rhs.texture;
-	clip = rhs.clip;
-	local = false;
-	countX = rhs.countX;
-	countY = rhs.countY;
-	indexX = rhs.indexX;
-	indexY = rhs.indexY;
-	delay = rhs.delay;
-	tick = rhs.tick;
-}
-
-SpriteSheet& SpriteSheet::operator=(SpriteSheet&& rhs) {
-	//don't screw yourself
-	if (this == &rhs) {
-		return *this;
-	}
-
-	Free();
-
-	//Steal the other SpriteSheet's stuff
-	texture = rhs.texture;
-	clip = rhs.clip;
-	local = rhs.local;
-	countX = rhs.countX;
-	countY = rhs.countY;
-	indexX = rhs.indexX;
-	indexY = rhs.indexY;
-	delay = rhs.delay;
-	tick = rhs.tick;
-
-	rhs.texture = nullptr;
-	rhs.clip = {0, 0, 0, 0};
-	rhs.local = false;
-	rhs.countX = 0;
-	rhs.countY = 0;
-	rhs.indexX = 0;
-	rhs.indexY = 0;
-	rhs.delay = 0.0;
-	rhs.tick = 0.0;
-}
-
-void SpriteSheet::Update(double delta) {
-	//if the delay has passed
-	if (delay && (tick += delta) >= delay) {
-		//if the index is out of bounds
-		if (++indexX >= countX) {
-			indexX = 0;
-		}
-		tick = 0;
-	}
-	//modify area drawn
-	clip.x = indexX * clip.w;
-	clip.y = indexY * clip.h;
-}
-
-SDL_Texture* SpriteSheet::Load(SDL_Renderer* r, std::string fname, Uint16 cx, Uint16 cy) {
-	//call the base function
-	Image::Load(r, fname);
-
-	//set the metadata
-	countX = cx;
-	countY = cy;
-
-	//assume clip.x and clip.y were set to the size of the texture
-	//reduce the w & h to the size of one cell
-	clip.w = clip.w / countX;
-	clip.h = clip.h / countY;
-
-	indexX = indexY = 0;
-	delay = tick = 0.0;
-
-	return texture;
-}
-
-SDL_Texture* SpriteSheet::Create(SDL_Renderer* r, Uint16 w, Uint16 h, Uint16 cx, Uint16 cy) {
-	//call the base function
-	Image::Create(r, w, h);
-
-	//set the metadata
-	countX = cx;
-	countY = cy;
-
-	//assume clip.x and clip.y were set to the size of the texture
-	//reduce the w & h to the size of one cell
-	clip.w = clip.w / countX;
-	clip.h = clip.h / countY;
-
-	indexX = indexY = 0;
-	delay = tick = 0.0;
-
-	return texture;
-}
-
-SDL_Texture* SpriteSheet::SetTexture(SDL_Texture* ptr, Uint16 cx, Uint16 cy) {
-	//call the base function
-	Image::SetTexture(ptr);
-
-	//set the metadata
-	countX = cx;
-	countY = cy;
-
-	//assume clip.x and clip.y were set to the size of the texture
-	//reduce the w & h to the size of one cell
-	clip.w = clip.w / countX;
-	clip.h = clip.h / countY;
-
-	indexX = indexY = 0;
-	delay = tick = 0.0;
-
-	return texture;
-}
-
-void SpriteSheet::Free() {
-	Image::Free();
-	countX = countY = 0;
-	indexX = indexY = 0;
-	delay = tick = 0.0;
-}
-
-Uint16 SpriteSheet::SetCountX(Uint16 i) {
-	indexX = 0;
-	return countX = i;
-}
-
-Uint16 SpriteSheet::SetCountY(Uint16 i) {
-	indexY = 0;
-	return countY = i;
-}
-
-Uint16 SpriteSheet::SetIndexX(Uint16 i) {
-	if (i > countX) {
-		std::ostringstream msg;
-		msg << "Cannot set index 'x' to " << i;
-		throw(std::out_of_range(msg.str()));
-	}
-	return indexX = i;
-}
-
-Uint16 SpriteSheet::SetIndexY(Uint16 i) {
-	if (i > countY) {
-		std::ostringstream msg;
-		msg << "Cannot set index 'y' to " << i;
-		throw(std::invalid_argument(msg.str()));
-	}
-	return indexY = i;
-}
-
-double SpriteSheet::SetDelay(double d) {
-	tick = 0;
-	return delay = d;
-}

common/graphics/sprite_sheet.hpp

@@ -1,70 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#pragma once
-
-#include "image.hpp"
-
-class SpriteSheet : public Image {
-public:
-	SpriteSheet() = default;
-	SpriteSheet(SpriteSheet const& rhs) { *this = rhs; }
-	SpriteSheet(SpriteSheet&& rhs) { *this = std::move(rhs); }
-	SpriteSheet(SDL_Renderer* r, std::string fname, Uint16 cx, Uint16 cy)
-		{ Load(r, fname, cx, cy); }
-	SpriteSheet(SDL_Renderer* r, Uint16 w, Uint16 h, Uint16 cx, Uint16 cy)
-		{ Create(r, w, h, cx, cy); }
-	SpriteSheet(SDL_Texture* p, Uint16 cx, Uint16 cy)
-		{ SetTexture(p, cx, cy); }
-	~SpriteSheet() = default;
-
-	SpriteSheet& operator=(SpriteSheet const&);
-	SpriteSheet& operator=(SpriteSheet&&);
-
-	void Update(double delta);
-
-	SDL_Texture* Load(SDL_Renderer*, std::string fname, Uint16 cx, Uint16 cy);
-	SDL_Texture* Create(SDL_Renderer*, Uint16 w, Uint16 h, Uint16 cx, Uint16 cy);
-	SDL_Texture* SetTexture(SDL_Texture*, Uint16 cx, Uint16 cy);
-	void Free() override;
-
-	Uint16 SetCountX(Uint16);
-	Uint16 SetCountY(Uint16);
-	Uint16 SetIndexX(Uint16);
-	Uint16 SetIndexY(Uint16);
-
-	Uint16 GetCountX() const { return countX; }
-	Uint16 GetCountY() const { return countY; }
-	Uint16 GetIndexX() const { return indexX; }
-	Uint16 GetIndexY() const { return indexY; }
-
-	double SetDelay(double d);
-	double GetDelay() const { return delay; }
-
-private:
-	Uint16 countX = 0, countY = 0, indexX = 0, indexY = 0;
-	double delay = 0.0, tick = 0.0;
-
-	//disable access
-	using Image::Load;
-	using Image::Create;
-	using Image::SetTexture;
-};

common/graphics/text_box.cpp

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

common/graphics/text_box.hpp

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

common/graphics/text_field.cpp

@@ -1,109 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "text_field.hpp"
-
-#include "render_text_texture.hpp"
-
-TextField::TextField() {
-	//
-}
-
-TextField::~TextField() {
-	SDL_DestroyTexture(texture);
-}
-
-void TextField::DrawTo(SDL_Renderer* renderer) {
-	if (!texture) {
-		return;
-	}
-	SDL_Rect dclip = {posX, posY, 0, 0};
-	SDL_QueryTexture(texture, nullptr, nullptr, &dclip.w, &dclip.h);
-	SDL_RenderCopy(renderer, texture, nullptr, &dclip);
-}
-
-std::string TextField::PushText(SDL_Renderer* renderer, TTF_Font* font, SDL_Color color, std::string s) {
-	text += s;
-	return SetText(renderer, font, color, text);
-}
-
-std::string TextField::SetText(SDL_Renderer* renderer, TTF_Font* font, SDL_Color color, std::string s) {
-	text = s;
-	SDL_DestroyTexture(texture);
-	if (text.size()) {
-		texture = renderTextTexture(renderer, font, color, text);
-	}
-	else {
-		texture = nullptr;
-	}
-	return text;
-}
-
-std::string TextField::PopChars(SDL_Renderer* renderer, TTF_Font* font, SDL_Color color, int i) {
-	if (text.size() > 0) {
-		text.erase(text.size() - i);
-	}
-	return SetText(renderer, font, color, text);
-}
-
-std::string TextField::GetText() {
-	return text;
-}
-
-bool TextField::MouseButtonDown(SDL_MouseButtonEvent const& event) {
-	BoundingBox cursorBox = {event.x, event.y, 0, 0};
-	BoundingBox fieldBox = bounds;
-	fieldBox.x += posX;
-	fieldBox.y += posY;
-	return focus = fieldBox.CheckOverlap(cursorBox);
-}
-
-BoundingBox TextField::SetBounds(BoundingBox b) {
-	return bounds = b;
-}
-
-BoundingBox TextField::GetBounds() {
-	return bounds;
-}
-
-bool TextField::SetFocus(bool b) {
-	return focus = b;
-}
-
-bool TextField::GetFocus() {
-	return focus;
-}
-
-int TextField::SetX(int i) {
-	return posX = i;
-}
-
-int TextField::SetY(int i) {
-	return posY = i;
-}
-
-int TextField::GetX() const {
-	return posX;
-}
-
-int TextField::GetY() const {
-	return posY;
-}

common/graphics/text_field.hpp

@@ -1,65 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#pragma once
-
-#include "bounding_box.hpp"
-
-#include "SDL2/SDL.h"
-#include "SDL2/SDL_ttf.h"
-
-#include <string>
-
-class TextField {
-public:
-	TextField();
-	~TextField();
-
-	void DrawTo(SDL_Renderer*);
-
-	//input
-	std::string PushText(SDL_Renderer*, TTF_Font*, SDL_Color color, std::string);
-	std::string SetText(SDL_Renderer*, TTF_Font*, SDL_Color color, std::string);
-	std::string PopChars(SDL_Renderer*, TTF_Font*, SDL_Color color, int i);
-
-	std::string GetText();
-
-	bool MouseButtonDown(SDL_MouseButtonEvent const& event);
-
-	BoundingBox SetBounds(BoundingBox b);
-	BoundingBox GetBounds();
-
-	bool SetFocus(bool b);
-	bool GetFocus();
-
-	//accessors & mutators
-	int SetX(int i);
-	int SetY(int i);
-	int GetX() const;
-	int GetY() const;
-
-private:
-	SDL_Texture* texture = nullptr;
-	std::string text;
-	BoundingBox bounds;
-	bool focus = false;
-	int posX = 0, posY = 0;
-};

common/graphics/text_line.cpp

@@ -1,78 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "text_line.hpp"
-
-#include "render_text_texture.hpp"
-
-#include <stdexcept>
-
-TextLine::TextLine() {
-	//
-}
-
-TextLine::TextLine(SDL_Renderer* renderer, TTF_Font* font, SDL_Color color, std::string str, int x, int y) {
-	SetText(renderer, font, color, str);
-	posX = x;
-	posY = y;
-}
-
-TextLine::~TextLine() {
-	ClearText();
-}
-
-void TextLine::DrawTo(SDL_Renderer* renderer) {
-	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, SDL_Color color, std::string str) {
-	//just use the above global function
-	SDL_DestroyTexture(texture);
-	texture = renderTextTexture(renderer, font, color, str);
-	pointHeight = TTF_FontHeight(font);
-}
-
-void TextLine::ClearText() {
-	SDL_DestroyTexture(texture);
-	pointHeight = 0;
-}
-
-int TextLine::SetX(int i) {
-	return posX = i;
-}
-
-int TextLine::SetY(int i) {
-	return posY = i;
-}
-
-int TextLine::GetX() const {
-	return posX;
-}
-
-int TextLine::GetY() const {
-	return posY;
-}
-
-int TextLine::GetPointHeight() {
-	return pointHeight;
-}

common/graphics/text_line.hpp

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

common/image.cpp

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

common/image.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,36 +19,25 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
-
-#include "SDL2/SDL.h"
+#ifndef IMAGE_HPP_
+#define IMAGE_HPP_
 
+#include "SDL/SDL.h"
 #include <string>
 
 class Image {
 public:
 	Image() = default;
-	Image(Image const& rhs) { *this = rhs; }
-	Image(Image&& rhs) { *this = std::move(rhs); }
-	Image(SDL_Renderer* r, std::string fname) { Load(r, fname); }
-	Image(SDL_Renderer* r, Uint16 w, Uint16 h) { Create(r, w, h); }
-	Image(SDL_Texture* p) { SetTexture(p); }
-	virtual ~Image() { Free(); }
+	Image(SDL_Surface* p) { SetSurface(p); }
+	~Image() { FreeSurface(); }
 
-	Image& operator=(Image const&);
-	Image& operator=(Image&&);
+	SDL_Surface* LoadSurface(std::string fname);
+	void FreeSurface();
 
-	SDL_Texture* Load(SDL_Renderer* renderer, std::string fname);
-	SDL_Texture* Create(SDL_Renderer* renderer, Uint16 w, Uint16 h, SDL_Color blank = {0, 0, 0, 255});
-	SDL_Texture* CopyTexture(SDL_Renderer* renderer, SDL_Texture* ptr);
-	SDL_Texture* SetTexture(SDL_Texture*);
-	SDL_Texture* GetTexture() const;
-	virtual void Free();
+	SDL_Surface* SetSurface(SDL_Surface*);
+	SDL_Surface* GetSurface() const { return surface; }
 
-	void DrawTo(SDL_Renderer* const, Sint16 x, Sint16 y, double scaleX = 1.0, double scaleY = 1.0);
-
-	void SetAlpha(Uint8 a);
-	Uint8 GetAlpha();
+	void DrawTo(SDL_Surface* const, Sint16 x, Sint16 y);
 
 	//Clip handlers
 	SDL_Rect SetClip(SDL_Rect r) { return clip = r; }
@@ -64,10 +53,14 @@ public:
 	Uint16 GetClipW() const { return clip.w; }
 	Uint16 GetClipH() const { return clip.h; }
 
-	bool GetLocal() const { return local; }
+	bool GetLocal() { return local; }
 
+	void SetTransparentColor(Uint8 r, Uint8 g, Uint8 b);
+	void ClearTransparentColor();
 protected:
-	SDL_Texture* texture = nullptr;
+	SDL_Surface* surface = nullptr;
 	SDL_Rect clip = {0, 0, 0, 0};
 	bool local = false;
-};
+};
+
+#endif

common/makefile

@@ -1,28 +1,38 @@
+#config
+LOCALLIBS=
+LIB=
+INCLUDES=
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
+
+#source
+SRC=$(wildcard *.cpp)
+
+#objects
+OBJDIR=obj
+OBJ=$(addprefix $(OBJDIR)/,$(SRC:.cpp=.o))
+
 #output
-export OUTDIR=..
-export OUT=$(addprefix $(OUTDIR)/,libcommon.a)
+OUTDIR=../lib
+OUT=$(addprefix $(OUTDIR)/,libCommon.a)
 
-all: $(OUTDIR)
-	$(MAKE) -C debugging
-	$(MAKE) -C gameplay
-	$(MAKE) -C graphics
-	$(MAKE) -C map
-	$(MAKE) -C network
-	$(MAKE) -C utilities
+#targets
+all: $(OBJ) $(OUT)
+	ar -crs $(OUT) $(OBJ)
 
-debug: export CXXFLAGS+=-g
-debug: clean all
+$(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/client out/server
-endif
 
 rebuild: clean all

common/map/makefile

@@ -1,28 +0,0 @@
-#config
-INCLUDES+=. ../graphics
-LIBS+=
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
-
-#source
-CXXSRC=$(wildcard *.cpp)
-
-#objects
-OBJDIR=obj
-OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-
-#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 $@ $<

common/map/region.cpp

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

common/map/region.hpp

@@ -1,62 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#pragma once
-
-#include <bitset>
-
-//the region's storage format
-constexpr int REGION_WIDTH = 20;
-constexpr int REGION_HEIGHT = 20;
-constexpr int REGION_DEPTH = 3;
-
-//utility function
-int snapToBase(int base, int x);
-
-class Region {
-public:
-	typedef unsigned char type_t;
-
-	Region() = delete;
-	Region(int x, int y);
-	Region(Region const&);
-	~Region() = default;
-
-	type_t SetTile(int x, int y, int z, type_t v);
-	type_t GetTile(int x, int y, int z) const;
-
-	bool SetSolid(int x, int y, bool b);
-	bool GetSolid(int x, int y) const;
-
-	//accessors
-	int GetX() const;
-	int GetY() const;
-
-	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;
-};

common/map/region_api.cpp

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

common/map/region_api.hpp

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

common/map/region_pager_api.cpp

@@ -1,172 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "region_pager_api.hpp"
-
-#include "region_pager_lua.hpp"
-#include "region.hpp"
-
-//DOCS: These glue functions simply wrap RegionPagerLua's methods
-//NOTE: zero indexing is used here, but not in the region API
-
-static int setTile(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	int ret = pager->SetTile(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4), lua_tointeger(L, 5));
-	lua_pushinteger(L, ret);
-	return 1;
-}
-
-static int getTile(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	int ret = pager->GetTile(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4));
-	lua_pushinteger(L, ret);
-	return 1;
-}
-
-static int setSolid(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	bool ret = pager->SetSolid(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_toboolean(L, 4));
-	lua_pushboolean(L, ret);
-	return 1;
-}
-
-static int getSolid(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	bool ret = pager->GetSolid(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	lua_pushboolean(L, ret);
-	return 1;
-}
-
-static int getRegion(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	lua_pushlightuserdata(L, region);
-	return 1;
-}
-
-static int loadRegion(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->LoadRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	lua_pushlightuserdata(L, region);
-	return 1;
-}
-
-static int saveRegion(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->SaveRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	lua_pushlightuserdata(L, region);
-	return 1;
-}
-
-static int createRegion(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->CreateRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	lua_pushlightuserdata(L, region);
-	return 1;
-}
-
-static int unloadRegion(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-
-	//two argument types: coords & the region itself
-	switch(lua_type(L, 2)) {
-		case LUA_TNUMBER:
-			pager->UnloadIf([&](Region const& region) -> bool {
-				int x = lua_tointeger(L, 2);
-				int y = lua_tointeger(L, 3);
-				return region.GetX() == x && region.GetY() == y;
-			});
-		break;
-		case LUA_TLIGHTUSERDATA:
-			pager->UnloadIf([&](Region const& region) -> bool {
-				return (&region) == lua_touserdata(L, 2);
-			});
-		break;
-	}
-	return 0;
-}
-
-static int setOnLoad(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetLoadReference());
-	pager->SetLoadReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
-static int setOnSave(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetSaveReference());
-	pager->SetSaveReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
-static int setOnCreate(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetCreateReference());
-	pager->SetCreateReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
-static int setOnUnload(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetUnloadReference());
-	pager->SetUnloadReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
-//debugging
-static int containerSize(lua_State* L) {
-	RegionPagerLua* pager = static_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	lua_pushinteger(L, pager->GetContainer()->size());
-	return 1;
-}
-
-static const luaL_Reg regionPagerLib[] = {
-	//curry
-	{"SetTile", setTile},
-	{"GetTile", getTile},
-	{"SetSolid", setSolid},
-	{"GetSolid", getSolid},
-
-	//access and control
-	{"GetRegion", getRegion},
-	{"LoadRegion", loadRegion},
-	{"SaveRegion", saveRegion},
-	{"CreateRegion", createRegion},
-	{"UnloadRegion", unloadRegion},
-
-	//triggers
-	{"SetOnLoad",setOnLoad},
-	{"SetOnSave",setOnSave},
-	{"SetOnCreate",setOnCreate},
-	{"SetOnUnload",setOnUnload},
-
-	//debugging
-	{"ContainerSize", containerSize},
-
-	//sentinel
-	{nullptr, nullptr}
-};
-
-LUAMOD_API int openRegionPagerAPI(lua_State* L) {
-	luaL_newlib(L, regionPagerLib);
-	return 1;
-}

common/map/region_pager_api.hpp

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

common/map/region_pager_base.cpp

@@ -1,106 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "region_pager_base.hpp"
-
-#include <stdexcept>
-#include <algorithm>
-
-RegionPagerBase::~RegionPagerBase() {
-	UnloadAll();
-};
-
-Region::type_t RegionPagerBase::SetTile(int x, int y, int z, Region::type_t v) {
-	Region* ptr = GetRegion(x, y);
-	return ptr->SetTile(x - ptr->GetX(), y - ptr->GetY(), z, v);
-}
-
-//Bug Origin?
-Region::type_t RegionPagerBase::GetTile(int x, int y, int z) {
-	Region* ptr = GetRegion(x, y);
-	return ptr->GetTile(x - ptr->GetX(), y - ptr->GetY(), z);
-}
-
-bool RegionPagerBase::SetSolid(int x, int y, int b) {
-	Region* ptr = GetRegion(x, y);
-	return ptr->SetSolid(x - ptr->GetX(), y - ptr->GetY(), b);
-}
-
-bool RegionPagerBase::GetSolid(int x, int y) {
-	Region* ptr = GetRegion(x, y);
-	return ptr->GetSolid(x - ptr->GetX(), y - ptr->GetY());
-}
-
-Region* RegionPagerBase::GetRegion(int x, int y) {
-	x = snapToBase(REGION_WIDTH, x);
-	y = snapToBase(REGION_HEIGHT, y);
-
-	//get the region by various means
-	Region* ptr = nullptr;
-	ptr = FindRegion(x, y);
-	if (ptr) return ptr;
-	ptr = LoadRegion(x, y);
-	if (ptr) return ptr;
-	return CreateRegion(x, y);
-}
-
-Region* RegionPagerBase::FindRegion(int x, int y) {
-	//find the region
-	std::list<Region>::iterator it = find_if(regionList.begin(), regionList.end(), [x, y](Region& region) -> bool {
-		return region.GetX() == x && region.GetY() == y;
-	});
-	return it != regionList.end() ? &(*it) : nullptr;
-}
-
-Region* RegionPagerBase::PushRegion(Region* const ptr) {
-	regionList.push_front(*ptr);
-	return &regionList.front();
-}
-
-Region* RegionPagerBase::LoadRegion(int x, int y) {
-	//EMPTY, intended for override
-	return nullptr;
-}
-
-Region* RegionPagerBase::SaveRegion(int x, int y) {
-	//EMPTY, intended for override
-	return nullptr;
-}
-
-Region* RegionPagerBase::CreateRegion(int x, int y) {
-	if (FindRegion(x, y)) {
-		throw(std::logic_error("Cannot overwrite an existing region"));
-	}
-	regionList.emplace_front(x, y);
-	return &regionList.front();
-}
-
-void RegionPagerBase::UnloadIf(std::function<bool(Region const&)> fn) {
-	regionList.remove_if(fn);
-}
-
-void RegionPagerBase::UnloadAll() {
-	regionList.clear();
-}
-
-std::list<Region>* RegionPagerBase::GetContainer() {
-	return &regionList;
-}