Tried, failed. I give up

It looks like this whole branch is fucking useless, considering that I'll
need to reimplement that massive switch statement again just to determine
which overwritten method to use. I might as well not have bothered.

.gitignore

@@ -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,29 @@
-## Outline
+The most recent stable build for Windows can be found [here](https://dl.dropboxusercontent.com/u/46669050/Tortuga.rar).
 
-Tortuga is a 2D MMORPG featuring permadeath, with an emphasis on multiplayer cooperation, exploration and customization. The game runs on customizable public and private servers.
+Tortuga is a 2D multiplayer JRPG featuring permadeath (deletion of a character upon death). The emphasis of this game is on multiplayer cooperation, exploration and customization. The game runs on customizable server software that can support up to 150 simultaneous players or more.
 
-This game is inspired by classic 2D RPGs (Final Fantasy, The Legend of Zelda), as well as more modern sandboxes and MMOs (Minecraft, EVE Online). This project is currently independently created and funded, with the goal of creating a game that will engage the players and inspire a large community.
+This game is inspired by classic 2D RPGs, as well as more modern sandbox MMOs. This project is currently independently created and funded, with the goal of creating a game that will engage user's imagination and inspire a large modding community.
-
-## Releases
-
-* The most recent stable build for Windows can be found [here](https://dl.dropboxusercontent.com/u/46669050/Tortuga-win.rar).
-* The most recent stable build for Windows can be found [here](https://dl.dropboxusercontent.com/u/46669050/Tortuga-linux.tar).
 
 ## Documentation
 
-* [Tortuga Wiki](https://github.com/Ratstail91/Tortuga/wiki) - Full documentation (incomplete)
+Tortuga's full documentation can be found in a separate branch, see [Tortuga/docs](https://github.com/Ratstail91/Tortuga/tree/docs).  
-* [Tortuga Bug Tracker](https://github.com/Ratstail91/Tortuga/issues) - A list of all known bugs and issues
+For Tortuga's primary documentation, please read the [Tortuga Game Design Document](https://github.com/Ratstail91/Tortuga/blob/docs/Tortuga%20Game%20Design%20Document.docx?raw=true).  
+For a list of known bugs, see the [GitHub bug tracker](https://github.com/Ratstail91/Tortuga/issues).
 
 ## External Dependencies
 
-* [SDL 2.0](http://www.libsdl.org/) - Simple DirectMedia Layer API
+* [SDL 1.2](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 1.2](http://www.libsdl.org/projects/SDL_net/) - SDL's networking extension
-* [SDL_net 2.0](http://www.libsdl.org/projects/SDL_net/) - SDL's networking extension
-* [SDL_ttf 2.0](https://www.libsdl.org/projects/SDL_ttf/) - An SDL extention for rendering fonts
 * [lua 5.2](http://www.lua.org/) - The lua programming language
 * [SQLite3](http://www.sqlite.org/) - A lightweight SQL database engine
 
-## Tools
-
-* [WinRAR](http://www.rarlab.com/) - A free archive tool; needed for Windows distribution
-* [tar](http://www.gnu.org/software/tar/manual/) - The GNU archive tool; needed for Linux distribution
-* [Dropbox](https://www.dropbox.com/) - For hosting and distribution
-
-## Using and Including
-
-* [Coolvetica Typeface](http://typodermicfonts.com/coolvetica/)
-
 ## Copyright
 
 (Future versions (to be determined) may be released under a modified version of the [Uplink Developer's License](http://www.introversion.co.uk/uplink/developer/license.html).)
 
 The current version of Tortuga is released under the [zlib license](http://en.wikipedia.org/wiki/Zlib_License).  
 
-Copyright (c) 2013-2016 Kayne Ruse
+Copyright (c) 2013, 2014 Kayne Ruse
 
 This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
 
@@ -48,8 +32,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,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
-}

client/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: (9) joystick and controller events
-
-protected:
-	//control
-	static SDL_Renderer* GetRenderer();
-	void SetSceneSignal(SceneSignal);
-
-private:
-	static SDL_Renderer* rendererHandle;
-	SceneSignal sceneSignal = SceneSignal::CONTINUE;
-};

client/channels.hpp

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

client/character.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,45 +19,43 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "entity.hpp"
+#include "character.hpp"
 
-void Entity::Update() {
+void Character::Update() {
-	origin += motion;
+	if (motion.x && motion.y) {
+		origin += motion * CHARACTER_WALKING_MOD;
+	}
+	else if (motion != 0) {
+		origin += motion;
+	}
 	sprite.Update(0.016);
 }
 
-void Entity::DrawTo(SDL_Renderer* const renderer, int camX, int camY) {
+void Character::DrawTo(SDL_Surface* const dest, int camX, int camY) {
-	sprite.DrawTo(renderer, origin.x - camX, origin.y - camY);
+	sprite.DrawTo(dest, origin.x - camX, origin.y - camY);
 }
 
-SpriteSheet* Entity::GetSprite() {
+void Character::CorrectSprite() {
-	return &sprite;
+	//NOTE: These must correspond to the sprite sheet in use
-}
+	if (motion.y > 0) {
+		sprite.SetYIndex(0);
+	}
+	else if (motion.y < 0) {
+		sprite.SetYIndex(1);
+	}
+	else if (motion.x > 0) {
+		sprite.SetYIndex(3);
+	}
+	else if (motion.x < 0) {
+		sprite.SetYIndex(2);
+	}
 
-//-------------------------
+	//animation
-//accessors & mutators
+	if (motion != 0) {
-//-------------------------
+		sprite.SetDelay(0.1);
-
+	}
-Vector2 Entity::SetOrigin(Vector2 v) {
+	else {
-	return origin = v;
+		sprite.SetDelay(0);
-}
+		sprite.SetXIndex(0);
-
+	}
-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/character.hpp

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

client/client_application.cpp

@@ -1,11 +1,11 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
  * arising from the use of this software.
  * 
  * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
+ * including commercial ClientApplications, and to alter it and redistribute it
  * freely, subject to the following restrictions:
  * 
  * 1. The origin of this software must not be misrepresented; you must not
@@ -21,172 +21,84 @@
 */
 #include "client_application.hpp"
 
-#include "serial_packet.hpp"
 #include "config_utility.hpp"
 
-//for handling platforms
+#include <stdexcept>
-#include "SDL2/SDL_syswm.h"
-#include "SDL2/SDL_version.h"
-
 #include <chrono>
 #include <iostream>
-#include <sstream>
+
-#include <stdexcept>
+//-------------------------
+//Scene headers
+//-------------------------
+
+//Add the custom scene headers here
+#include "splash_screen.hpp"
+#include "main_menu.hpp"
+#include "options_menu.hpp"
+#include "lobby_menu.hpp"
+#include "in_world.hpp"
+//#include "in_combat.hpp"
+#include "clean_up.hpp"
 
 //-------------------------
 //Public access members
 //-------------------------
 
-void ClientApplication::Init(int argc, char* argv[]) {
+void ClientApplication::Init(int argc, char** argv) {
 	std::cout << "Beginning " << argv[0] << std::endl;
 
 	//load the prerequisites
 	ConfigUtility& config = ConfigUtility::GetSingleton();
-	config.Load("rsc/config.cfg", false, argc, argv);
+	config.Load("rsc\\config.cfg");
-
-	//-------------------------
-	//Initialize SDL
-	//-------------------------
-
-	if (SDL_Init(0)) {
-		std::ostringstream msg;
-		msg << "Failed to initialize SDL: " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//-------------------------
-	//create and check the window
-	//-------------------------
-
-	//get the config values
-	int w = config.Int("client.screen.w");
-	int h = config.Int("client.screen.h");
-	int f = config.Boolean("client.screen.f") ? SDL_WINDOW_FULLSCREEN : 0;
-
-	//BUG: fullscreen is disabled
-	f = 0;
-
-	//default sizes
-	w = w ? w : 800;
-	h = h ? h : 600;
-
-	window = SDL_CreateWindow(argv[0], SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, w, h, f);
-
-	if (!window) {
-		std::ostringstream msg;
-		msg << "Failed to create the window: " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-
-	std::cout << "Initialized the window" << std::endl;
-
-	//-------------------------
-	//DEBUG: detecting platforms, versions & appropriate fonts
-	//-------------------------
-
-	SDL_SysWMinfo windowInfo;
-	SDL_VERSION(&windowInfo.version);
-	if (SDL_GetWindowWMInfo(window, &windowInfo)) {
-		//
-		std::string platform;
-		std::string fontPath;
-
-		//get the info
-		switch(windowInfo.subsystem) {
-			case SDL_SYSWM_WINDOWS:
-				platform = "Microsoft Windows";
-			break;
-
-			case SDL_SYSWM_X11:
-				platform = "X Window System";
-			break;
-
-			//NOTE: OS X is currently unsupported, but it could be
-			case SDL_SYSWM_COCOA:
-				platform = "Apple OS X";
-			break;
-
-			default:
-				platform = "an unsupported platform";
-		}
-
-		//final output
-		std::cout << "SDL Version ";
-		std::cout << (int)windowInfo.version.major << ".";
-		std::cout << (int)windowInfo.version.minor << ".";
-		std::cout << (int)windowInfo.version.patch << " on ";
-		std::cout << platform << std::endl;
-	}
-	else {
-		std::ostringstream msg;
-		msg << "Failed to retrieve window info: " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//-------------------------
-	//create and check the renderer
-	//-------------------------
-
-	renderer = SDL_CreateRenderer(window, -1, 0);
-
-	if (!renderer) {
-		std::ostringstream msg;
-		msg << "Failed to create the renderer: " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//screen scaling
-	SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "best");
-	SDL_RenderSetLogicalSize(renderer, w, h);
-
-	//set the hook for the renderer
-	BaseScene::SetRenderer(renderer);
-
-	std::cout << "Initialized the renderer" << std::endl;
 
 	//-------------------------
 	//Initialize the APIs
 	//-------------------------
 
+	//initialize SDL
+	if (SDL_Init(SDL_INIT_VIDEO)) {
+		throw(std::runtime_error("Failed to initialize SDL"));
+	}
+	std::cout << "Initialized SDL" << std::endl;
+
 	//initialize SDL_net
 	if (SDLNet_Init()) {
-		std::ostringstream msg;
+		throw(std::runtime_error("Failed to initialize SDL_net"));
-		msg << "Failed to initialize SDL_net 2.0: " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
 	}
 	UDPNetworkUtility::GetSingleton().Open(0);
+	std::cout << "Initialized SDL_net" << std::endl;
 
-	std::cout << "Initialized SDL_net 2.0" << std::endl;
+	//-------------------------
+	//Setup the screen
+	//-------------------------
 
-	//setting up SDL2_ttf
+	int w = config.Int("client.screen.w");
-	if (TTF_Init()) {
+	int h = config.Int("client.screen.h");
-		std::ostringstream msg;
+	int f = config.Bool("client.screen.f") ? SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_FULLSCREEN : SDL_HWSURFACE|SDL_DOUBLEBUF;
-		msg << "Failed to initialize SDL_ttf 2.0: " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
 
-	std::cout << "Initialized SDL_ttf 2.0" << std::endl;
+	BaseScene::SetScreen(w ? w : 800, h ? h : 600, 0, f);
+	std::cout << "Initialized the screen" << std::endl;
 
 	//-------------------------
 	//debug output
 	//-------------------------
 
-#define DEBUG_INTERNAL_VAR(x) std::cout << "\t" << #x << ": " << x << std::endl;
+	//TODO: enable/disable these with a switch
+#define DEBUG_OUTPUT_VAR(x) std::cout << "\t" << #x << ": " << x << std::endl;
 
 	std::cout << "Internal sizes:" << std::endl;
 
-	DEBUG_INTERNAL_VAR(NETWORK_VERSION);
+	DEBUG_OUTPUT_VAR(sizeof(Region::type_t));
-	DEBUG_INTERNAL_VAR(sizeof(Region::type_t));
+	DEBUG_OUTPUT_VAR(sizeof(Region));
-	DEBUG_INTERNAL_VAR(sizeof(Region));
+	DEBUG_OUTPUT_VAR(REGION_WIDTH);
-	DEBUG_INTERNAL_VAR(REGION_WIDTH);
+	DEBUG_OUTPUT_VAR(REGION_HEIGHT);
-	DEBUG_INTERNAL_VAR(REGION_HEIGHT);
+	DEBUG_OUTPUT_VAR(REGION_DEPTH);
-	DEBUG_INTERNAL_VAR(REGION_DEPTH);
+	DEBUG_OUTPUT_VAR(REGION_TILE_FOOTPRINT);
-	DEBUG_INTERNAL_VAR(REGION_TILE_FOOTPRINT);
+	DEBUG_OUTPUT_VAR(REGION_SOLID_FOOTPRINT);
-	DEBUG_INTERNAL_VAR(REGION_SOLID_FOOTPRINT);
+	DEBUG_OUTPUT_VAR(PACKET_BUFFER_SIZE);
-	DEBUG_INTERNAL_VAR(PACKET_STRING_SIZE);
+	DEBUG_OUTPUT_VAR(MAX_PACKET_SIZE);
-	DEBUG_INTERNAL_VAR(PACKET_BUFFER_SIZE);
+
-	DEBUG_INTERNAL_VAR(MAX_PACKET_SIZE);
+#undef DEBUG_OUTPUT_VAR
-	DEBUG_INTERNAL_VAR(static_cast<int>(SerialPacketType::LAST));
 
 	//-------------------------
 	//finalize the startup
@@ -202,161 +114,84 @@ void ClientApplication::Init(int argc, char* argv[]) {
 }
 
 void ClientApplication::Proc() {
-	//load the first scene
+	LoadScene(SceneList::FIRST);
-	ProcessSceneSignal(SceneSignal::FIRST);
 
-	//fixed frame rate
+	//prepare the time system
 	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
+	//The main loop
-	while(activeScene->GetSceneSignal() != SceneSignal::QUIT) {
+	while(activeScene->GetNextScene() != SceneList::QUIT) {
-		//switch scenes if necessary
+		//switch scenes when necessary
-		if(activeScene->GetSceneSignal() != SceneSignal::CONTINUE) {
+		if (activeScene->GetNextScene() != SceneList::CONTINUE) {
-			ProcessSceneSignal(activeScene->GetSceneSignal());
+			LoadScene(activeScene->GetNextScene());
 			continue;
 		}
 
 		//update the current time
 		realTime = Clock::now();
 
-		//simulate the game or give the machine a break
+		//simulate game time
-		if (simTime < realTime) {
+		while (simTime < realTime) {
-			while(simTime < realTime) {
+			//call each user defined function
-				//call the user defined functions
+			activeScene->RunFrame();
-				activeScene->FrameStart();
+			//~60 FPS
-				ProcessEvents();
+			simTime += std::chrono::duration<int, std::milli>(16);
-				activeScene->Update();
-				activeScene->FrameEnd();
-
-				//step to the next frame
-				simTime += frameDelay;
-			}
-		}
-		else {
-			SDL_Delay(1);
 		}
 
-		SDL_RenderClear(renderer);
+		//draw the game to the screen
-		activeScene->RenderFrame(renderer);
+		activeScene->RenderFrame();
-		SDL_RenderPresent(renderer);
 	}
 
-	//cleanup
+	UnloadScene();
-	ClearScene();
 }
 
 void ClientApplication::Quit() {
-	//clean up after the program
 	std::cout << "Shutting down" << std::endl;
 	UDPNetworkUtility::GetSingleton().Close();
-	TTF_Quit();
 	SDLNet_Quit();
-	BaseScene::SetRenderer(nullptr);
-	SDL_DestroyRenderer(renderer);
-	SDL_DestroyWindow(window);
 	SDL_Quit();
 	std::cout << "Clean exit" << std::endl;
 }
 
 //-------------------------
-//Scene management
+//Private access members
 //-------------------------
 
-void ClientApplication::ProcessEvents() {
+void ClientApplication::LoadScene(SceneList sceneIndex) {
-	SDL_Event event;
+	UnloadScene();
-	while(SDL_PollEvent(&event)) {
+	switch(sceneIndex) {
-		switch(event.type) {
-			case SDL_QUIT:
-				activeScene->QuitEvent();
-			break;
-
-			case SDL_MOUSEMOTION:
-				activeScene->MouseMotion(event.motion);
-			break;
-
-			case SDL_MOUSEBUTTONDOWN:
-				activeScene->MouseButtonDown(event.button);
-			break;
-
-			case SDL_MOUSEBUTTONUP:
-				activeScene->MouseButtonUp(event.button);
-			break;
-
-			case SDL_MOUSEWHEEL:
-				activeScene->MouseWheel(event.wheel);
-			break;
-
-			case SDL_KEYDOWN:
-				activeScene->KeyDown(event.key);
-			break;
-
-			case SDL_KEYUP:
-				activeScene->KeyUp(event.key);
-			break;
-
-			//TODO: (9) joystick and controller events
-
-			//window events are handled internally
-			case SDL_WINDOWEVENT:
-				switch(event.window.event) {
-					case SDL_WINDOWEVENT_RESIZED:
-						SDL_RenderSetLogicalSize(renderer, event.window.data1, event.window.data2);
-					break;
-				}
-			break;
-		}
-	}
-}
-
-//Add the custom scene headers here
-#include "splash_screen.hpp"
-#include "main_menu.hpp"
-#include "options_menu.hpp"
-#include "lobby_menu.hpp"
-#include "world.hpp"
-#include "combat.hpp"
-#include "disconnected_screen.hpp"
-
-void ClientApplication::ProcessSceneSignal(SceneSignal signal) {
-	//BUG: #16 Resources are being reloaded between scenes
-	ClearScene();
-	switch(signal) {
 		//add scene creation calls here
-		case SceneSignal::FIRST:
+		case SceneList::FIRST:
-		case SceneSignal::SPLASHSCREEN:
+		case SceneList::SPLASHSCREEN:
-			activeScene = new SplashScreen(window);
+			activeScene = new SplashScreen();
 		break;
-		case SceneSignal::MAINMENU:
+		case SceneList::MAINMENU:
 			activeScene = new MainMenu();
 		break;
-		case SceneSignal::OPTIONSMENU:
+		case SceneList::OPTIONSMENU:
 			activeScene = new OptionsMenu();
 		break;
-		case SceneSignal::LOBBYMENU:
+		case SceneList::LOBBYMENU:
 			activeScene = new LobbyMenu(&clientIndex, &accountIndex);
 		break;
-		case SceneSignal::WORLD:
+		case SceneList::INWORLD:
-			activeScene = new World(&clientIndex, &accountIndex);
+			activeScene = new InWorld(&clientIndex, &accountIndex, &characterIndex, &characterMap);
 		break;
-		case SceneSignal::COMBAT:
+//		case SceneList::INCOMBAT:
-			activeScene = new Combat(&clientIndex, &accountIndex);
+//			activeScene = new InCombat(&clientIndex, &accountIndex, &characterIndex, &characterMap);
+//		break;
+		case SceneList::CLEANUP:
+			activeScene = new CleanUp(&clientIndex, &accountIndex, &characterIndex, &characterMap);
 		break;
-		case SceneSignal::DISCONNECTEDSCREEN:
+		default:
-			activeScene = new DisconnectedScreen();
+			throw(std::logic_error("Failed to recognize the scene index"));
-		break;
-		default: {
-			std::ostringstream msg;
-			msg << "Failed to recognize the scene signal: " << signal;
-			throw(std::logic_error(msg.str()));
-		}
 	}
 }
 
-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, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,20 +19,23 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef CLIENTAPPLICATION_HPP_
+#define CLIENTAPPLICATION_HPP_
 
+#include "scene_list.hpp"
 #include "base_scene.hpp"
-#include "scene_signal.hpp"
-#include "singleton.hpp"
-#include "udp_network_utility.hpp"
 
-#include "SDL2/SDL.h"
+#include "udp_network_utility.hpp"
-#include "SDL2/SDL_net.h"
+#include "character.hpp"
-#include "SDL2/SDL_ttf.h"
+
+#include "singleton.hpp"
+
+#include <map>
 
 class ClientApplication: public Singleton<ClientApplication> {
 public:
-	void Init(int argc, char* argv[]);
+	//public methods
+	void Init(int argc, char** argv);
 	void Proc();
 	void Quit();
 
@@ -42,18 +45,18 @@ private:
 	ClientApplication() = default;
 	~ClientApplication() = default;
 
-	//scene management
+	//Private access members
-	void ProcessEvents();
+	void LoadScene(SceneList sceneIndex);
-	void ProcessSceneSignal(SceneSignal);
+	void UnloadScene();
-	void ClearScene();
 
 	BaseScene* activeScene = nullptr;
 
-	//TODO: (9) build a "window" class?
+	//shared parameters
-	SDL_Window* window = nullptr;
-	SDL_Renderer* renderer = nullptr;
-
-	//global scene parameters
 	int clientIndex = -1;
 	int accountIndex = -1;
+	int characterIndex = -1;
+
+	CharacterMap characterMap;
 };
+
+#endif

client/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;
-}

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

client/entities/base_character.cpp

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

@@ -1,42 +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 "entity.hpp"
-
-class BaseCreature: public Entity {
-public:
-	BaseCreature() = default;
-	virtual ~BaseCreature() = default;
-
-	void CorrectSprite();
-
-	std::string SetHandle(std::string s);
-	std::string GetHandle() const;
-	std::string SetAvatar(SDL_Renderer* const, std::string s);
-	std::string GetAvatar() const;
-
-protected:
-	//metadata
-	std::string handle;
-	std::string avatar;
-};

client/entities/entity.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 "bounding_box.hpp"
-#include "sprite_sheet.hpp"
-#include "vector2.hpp"
-
-//The base class for all objects in the world
-//TODO: (9) write a better hierarchy
-class Entity {
-public:
-	virtual void Update();
-	virtual void DrawTo(SDL_Renderer* const, int camX, int camY);
-
-	SpriteSheet* GetSprite();
-
-	//accessors & mutators
-	Vector2 SetOrigin(Vector2 v);
-	Vector2 SetMotion(Vector2 v);
-	BoundingBox SetBounds(BoundingBox b);
-
-	Vector2 GetOrigin() const;
-	Vector2 GetMotion() const;
-	BoundingBox GetBounds() const;
-
-protected:
-	Entity() = default;
-	virtual ~Entity() = default;
-
-	SpriteSheet sprite;
-	Vector2 origin;
-	Vector2 motion;
-	BoundingBox bounds;
-};

client/entities/local_character.cpp

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

client/entities/local_character.hpp

@@ -1,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 "base_character.hpp"
-#include "bounding_box.hpp"
-#include "vector2.hpp"
-
-#include <list>
-
-class LocalCharacter: public BaseCharacter {
-public:
-	LocalCharacter() = default;
-	virtual ~LocalCharacter() = default;
-
-	bool ProcessCollisionGrid(std::list<BoundingBox>);
-
-private:
-	//NOTE: NO MEMBERS
-};

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/main.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -30,26 +30,25 @@
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char** argv) {
 	try {
 		//create the singletons
-		ConfigUtility::CreateSingleton();
+		ConfigUtility::Create();
-		UDPNetworkUtility::CreateSingleton();
+		UDPNetworkUtility::Create();
 
-		//call the client's routines
+		//call the server's routines
-		ClientApplication::CreateSingleton();
+		ClientApplication::Create();
 		ClientApplication& app = ClientApplication::GetSingleton();
 
 		app.Init(argc, argv);
 		app.Proc();
 		app.Quit();
 
-		//control the position of the app's destructor
+		ClientApplication::Delete();
-		ClientApplication::DeleteSingleton();
 
 		//delete the singletons
-		ConfigUtility::DeleteSingleton();
+		ConfigUtility::Delete();
-		UDPNetworkUtility::DeleteSingleton();
+		UDPNetworkUtility::Delete();
 	}
 	catch(exception& e) {
 		cerr << "Fatal exception thrown: " << e.what() << endl;

client/makefile

@@ -1,20 +1,7 @@
-#include directories
+#config
-INCLUDES+=. entities scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
+INCLUDES+=. scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
-
+LIBS+=client.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
-#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
 
 #source
 CXXSRC=$(wildcard *.cpp)
@@ -29,7 +16,6 @@ OUT=$(addprefix $(OUTDIR)/,client)
 
 #targets
 all: $(OBJ) $(OUT)
-	$(MAKE) -C entities
 	$(MAKE) -C scenes
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
@@ -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/scene_list.hpp

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

client/scenes/base_scene.cpp

@@ -0,0 +1,140 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "base_scene.hpp"
+
+#include <stdexcept>
+
+//-------------------------
+//Static declarations
+//-------------------------
+
+SDL_Surface* BaseScene::screen = nullptr;
+
+//-------------------------
+//Public access members
+//-------------------------
+
+BaseScene::BaseScene() {
+	//
+}
+
+BaseScene::~BaseScene() {
+	//
+}
+
+//-------------------------
+//Program control
+//-------------------------
+
+SDL_Surface* BaseScene::SetScreen(int w, int h, int bpp, Uint32 flags) {
+	if (!bpp) {
+		bpp = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
+	}
+
+	screen = SDL_SetVideoMode(w, h, bpp, flags);
+
+	if (!screen) {
+		throw(std::runtime_error("Failed to create the screen surface"));
+	}
+
+	return screen;
+}
+
+SDL_Surface* BaseScene::GetScreen() {
+	return screen;
+}
+
+SceneList BaseScene::SetNextScene(SceneList sceneIndex) {
+	return nextScene = sceneIndex;
+}
+
+SceneList BaseScene::GetNextScene() const {
+	return nextScene;
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void BaseScene::RunFrame() {
+	FrameStart();
+	HandleEvents();
+	Update();
+	FrameEnd();
+}
+
+void BaseScene::RenderFrame() {
+	SDL_FillRect(screen, 0, 0);
+	Render(screen);
+	SDL_Flip(screen);
+	SDL_Delay(10);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void BaseScene::HandleEvents() {
+	SDL_Event event;
+
+	while(SDL_PollEvent(&event)) {
+		switch(event.type) {
+			case SDL_QUIT:
+				QuitEvent();
+			break;
+
+			case SDL_VIDEORESIZE:
+				SetScreen(event.resize.w, event.resize.h, 0, screen->flags);
+			break;
+
+			case SDL_MOUSEMOTION:
+				MouseMotion(event.motion);
+			break;
+
+			case SDL_MOUSEBUTTONDOWN:
+				MouseButtonDown(event.button);
+			break;
+
+			case SDL_MOUSEBUTTONUP:
+				MouseButtonUp(event.button);
+			break;
+
+			case SDL_KEYDOWN:
+				KeyDown(event.key);
+			break;
+
+			case SDL_KEYUP:
+				KeyUp(event.key);
+			break;
+
+#ifdef USE_EVENT_JOYSTICK
+			//TODO: joystick/gamepad support
+#endif
+
+#ifdef USE_EVENT_UNKNOWN
+			default:
+				UnknownEvent(event);
+			break;
+#endif
+		}//switch
+	}//while
+}

client/scenes/base_scene.hpp

@@ -0,0 +1,74 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef BASESCENE_HPP_
+#define BASESCENE_HPP_
+
+#include "scene_list.hpp"
+
+#include "SDL/SDL.h"
+
+class BaseScene {
+public:
+	//Public access members
+	BaseScene();
+	virtual ~BaseScene();
+
+	//Program control
+	static SDL_Surface* SetScreen(int w, int h, int bpp = 0, Uint32 flags = SDL_HWSURFACE|SDL_DOUBLEBUF);
+	static SDL_Surface* GetScreen();
+
+	SceneList SetNextScene(SceneList sceneIndex);
+	SceneList GetNextScene() const;
+
+	//Frame loop
+	virtual void RunFrame();
+	virtual void RenderFrame();
+
+protected:
+	virtual void FrameStart() {}
+	virtual void HandleEvents();
+	virtual void Update() {}
+	virtual void FrameEnd() {}
+	virtual void Render(SDL_Surface* const screen) {}
+
+	//Event handlers
+	virtual void QuitEvent() { SetNextScene(SceneList::QUIT); }
+	virtual void MouseMotion(SDL_MouseMotionEvent const&) {}
+	virtual void MouseButtonDown(SDL_MouseButtonEvent const&) {}
+	virtual void MouseButtonUp(SDL_MouseButtonEvent const&) {}
+	virtual void KeyDown(SDL_KeyboardEvent const&) {}
+	virtual void KeyUp(SDL_KeyboardEvent const&) {}
+
+#ifdef USE_EVENT_JOYSTICK
+	//TODO: joystick/gamepad support
+#endif
+
+#ifdef USE_EVENT_UNKNOWN
+	virtual void UnknownEvent(SDL_Event const&) {}
+#endif
+
+private:
+	static SDL_Surface* screen;
+	SceneList nextScene = SceneList::CONTINUE;
+};
+
+#endif

client/scenes/clean_up.cpp

@@ -0,0 +1,129 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "clean_up.hpp"
+
+#include "channels.hpp"
+#include "config_utility.hpp"
+
+#include <stdexcept>
+
+//-------------------------
+//Public access members
+//-------------------------
+
+CleanUp::CleanUp(
+	int* const argClientIndex,
+	int* const argAccountIndex,
+	int* const argCharacterIndex,
+	CharacterMap* argCharacterMap
+	):
+	clientIndex(*argClientIndex),
+	accountIndex(*argAccountIndex),
+	characterIndex(*argCharacterIndex),
+	characterMap(*argCharacterMap)
+{
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+
+	//setup the utility objects
+	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
+	image.SetClipH(image.GetClipH()/3);
+	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+
+	//pass the utility objects
+	backButton.SetImage(&image);
+	backButton.SetFont(&font);
+
+	//set the button positions
+	backButton.SetX(50);
+	backButton.SetY(50 + image.GetClipH() * 0);
+
+	//set the button texts
+	backButton.SetText("Back");
+
+	//full reset
+	network.Unbind(Channels::SERVER);
+	clientIndex = -1;
+	accountIndex = -1;
+	characterIndex = -1;
+//	combatMap.clear();
+	characterMap.clear();
+//	enemyMap.clear();
+
+	//auto return
+	startTick = std::chrono::steady_clock::now();
+}
+
+CleanUp::~CleanUp() {
+	//
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void CleanUp::Update() {
+	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(10)) {
+		SetNextScene(SceneList::MAINMENU);
+	}
+
+	//BUGFIX: Eat incoming packets
+	while(network.Receive());
+}
+
+void CleanUp::Render(SDL_Surface* const screen) {
+	backButton.DrawTo(screen);
+	font.DrawStringTo("You have been disconnected.", screen, 50, 30);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void CleanUp::QuitEvent() {
+	SetNextScene(SceneList::QUIT);
+}
+
+void CleanUp::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	backButton.MouseMotion(motion);
+}
+
+void CleanUp::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	backButton.MouseButtonDown(button);
+}
+
+void CleanUp::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
+		SetNextScene(SceneList::MAINMENU);
+	}
+}
+
+void CleanUp::KeyDown(SDL_KeyboardEvent const& key) {
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+			SetNextScene(SceneList::MAINMENU);
+		break;
+	}
+}
+
+void CleanUp::KeyUp(SDL_KeyboardEvent const& key) {
+	//
+}

client/scenes/clean_up.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,45 +19,64 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef CLEANUP_HPP_
+#define CLEANUP_HPP_
 
-#include "base_scene.hpp"
+//network
-#include "button.hpp"
+#include "udp_network_utility.hpp"
+
+//graphics
 #include "image.hpp"
-#include "text_line.hpp"
+#include "raster_font.hpp"
+#include "button.hpp"
 
-#include "SDL2/SDL_ttf.h"
+//client
+#include "character.hpp"
+#include "base_scene.hpp"
 
+//std namespace
 #include <chrono>
 
-class DisconnectedScreen : public BaseScene {
+class CleanUp : public BaseScene {
 public:
 	//Public access members
-	DisconnectedScreen();
+	CleanUp(
-	~DisconnectedScreen();
+		int* const argClientIndex,
-
+		int* const argAccountIndex,
-	void RenderFrame(SDL_Renderer* renderer) override;
+		int* const argCharacterIndex,
+		CharacterMap* argCharacterMap
+	);
+	~CleanUp();
 
 protected:
-	//frame phases
+	//Frame loop
-	void FrameStart() override;
+	void Update();
-	void Update() override;
+	void Render(SDL_Surface* const);
-	void FrameEnd() override;
 
-	//input events
+	//Event handlers
-	void MouseMotion(SDL_MouseMotionEvent const& event) override;
+	void QuitEvent();
-	void MouseButtonDown(SDL_MouseButtonEvent const& event) override;
+	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const& event) override;
+	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseWheel(SDL_MouseWheelEvent const& event) override;
+	void MouseButtonUp(SDL_MouseButtonEvent const&);
-	void KeyDown(SDL_KeyboardEvent const& event) override;
+	void KeyDown(SDL_KeyboardEvent const&);
-	void KeyUp(SDL_KeyboardEvent const& event) override;
+	void KeyUp(SDL_KeyboardEvent const&);
+
+	//shared parameters
+	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
+	int& clientIndex;
+	int& accountIndex;
+	int& characterIndex;
+	CharacterMap& characterMap;
 
 	//graphics
 	Image image;
-	TTF_Font* font = nullptr;
+	RasterFont font;
+
+	//UI
 	Button backButton;
-	TextLine textLine;
 
 	//auto return
 	std::chrono::steady_clock::time_point startTick;
 };
+
+#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,130 +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>
-
-//-------------------------
-//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, "Back", COLOR_WHITE);
-
-	//set the button positions
-	backButton.SetX(50);
-	backButton.SetY(50);
-
-	//set the disconnection message text
-	textLine.SetText(GetRenderer(), font, config["client.disconnectMessage"], {255, 255, 255, 255});
-
-	//full reset
-	UDPNetworkUtility::GetSingleton().Unbind(Channels::SERVER);
-
-	//auto return
-	startTick = std::chrono::steady_clock::now();
-}
-
-DisconnectedScreen::~DisconnectedScreen() {
-	TTF_CloseFont(font);
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void DisconnectedScreen::FrameStart() {
-	//
-}
-
-void DisconnectedScreen::Update() {
-	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(10)) {
-		SetSceneSignal(SceneSignal::MAINMENU);
-	}
-
-	//Eat incoming packets
-	while(UDPNetworkUtility::GetSingleton().Receive());
-}
-
-void DisconnectedScreen::FrameEnd() {
-	//
-}
-
-void DisconnectedScreen::RenderFrame(SDL_Renderer* renderer) {
-	backButton.DrawTo(renderer);
-	textLine.DrawTo(renderer, 50, 30);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void DisconnectedScreen::MouseMotion(SDL_MouseMotionEvent const& event) {
-	backButton.MouseMotion(event);
-}
-
-void DisconnectedScreen::MouseButtonDown(SDL_MouseButtonEvent const& event) {
-	backButton.MouseButtonDown(event);
-}
-
-void DisconnectedScreen::MouseButtonUp(SDL_MouseButtonEvent const& event) {
-	if (backButton.MouseButtonUp(event) == Button::State::RELEASED) {
-		SetSceneSignal(SceneSignal::MAINMENU);
-	}
-}
-
-void DisconnectedScreen::MouseWheel(SDL_MouseWheelEvent const& event) {
-	//
-}
-
-void DisconnectedScreen::KeyDown(SDL_KeyboardEvent const& event) {
-	switch(event.keysym.sym) {
-		case SDLK_ESCAPE:
-			SetSceneSignal(SceneSignal::MAINMENU);
-		break;
-	}
-}
-
-void DisconnectedScreen::KeyUp(SDL_KeyboardEvent const& event) {
-	//
-}

client/scenes/in_world.cpp

@@ -0,0 +1,489 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "in_world.hpp"
+
+#include "channels.hpp"
+#include "utility.hpp"
+#include "config_utility.hpp"
+
+#include <stdexcept>
+#include <algorithm>
+#include <cmath>
+#include <iostream>
+
+//-------------------------
+//Public access members
+//-------------------------
+
+InWorld::InWorld(
+	int* const argClientIndex,
+	int* const argAccountIndex,
+	int* const argCharacterIndex,
+	CharacterMap* argCharacterMap
+	):
+	clientIndex(*argClientIndex),
+	accountIndex(*argAccountIndex),
+	characterIndex(*argCharacterIndex),
+	characterMap(*argCharacterMap)
+{
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+
+	//setup the utility objects
+	buttonImage.LoadSurface(config["dir.interface"] + "button_menu.bmp");
+	buttonImage.SetClipH(buttonImage.GetClipH()/3);
+	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+
+	//pass the utility objects
+	disconnectButton.SetImage(&buttonImage);
+	disconnectButton.SetFont(&font);
+	shutDownButton.SetImage(&buttonImage);
+	shutDownButton.SetFont(&font);
+
+	//set the button positions
+	disconnectButton.SetX(50);
+	disconnectButton.SetY(50 + buttonImage.GetClipH() * 0);
+	shutDownButton.SetX(50);
+	shutDownButton.SetY(50 + buttonImage.GetClipH() * 1);
+
+	//set the button texts
+	disconnectButton.SetText("Disconnect");
+	shutDownButton.SetText("Shut Down");
+
+	//load the tilesheet
+	//TODO: add the tilesheet to the map system?
+	//TODO: Tile size and tile sheet should be loaded elsewhere
+	tileSheet.Load(config["dir.tilesets"] + "terrain.bmp", 32, 32);
+
+	//request a sync
+	RequestSynchronize();
+
+	//debug
+	//
+}
+
+InWorld::~InWorld() {
+	//
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void InWorld::FrameStart() {
+	//
+}
+
+void InWorld::Update() {
+	//suck in and process all waiting packets
+	SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]);
+	while(network.Receive(packetBuffer)) {
+		HandlePacket(packetBuffer);
+	}
+	delete reinterpret_cast<char*>(packetBuffer);
+
+	//update the characters
+	for (auto& it : characterMap) {
+		it.second.Update();
+	}
+
+	//check the map
+	UpdateMap();
+
+	//skip the rest
+	if (!localCharacter) {
+		return;
+	}
+
+	//check for collisions with the map
+	BoundingBox wallBounds = {0, 0, tileSheet.GetTileW(), tileSheet.GetTileH()};
+	const int xCount = localCharacter->GetBounds().w / wallBounds.w + 1;
+	const int yCount = localCharacter->GetBounds().h / wallBounds.h + 1;
+
+	for (int i = -1; i <= xCount; ++i) {
+		for (int j = -1; j <= yCount; ++j) {
+			//set the wall's position
+			wallBounds.x = wallBounds.w * i + snapToBase((double)wallBounds.w, localCharacter->GetOrigin().x);
+			wallBounds.y = wallBounds.h * j + snapToBase((double)wallBounds.h, localCharacter->GetOrigin().y);
+
+			if (!regionPager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
+				continue;
+			}
+
+			if ((localCharacter->GetOrigin() + localCharacter->GetBounds()).CheckOverlap(wallBounds)) {
+				localCharacter->SetOrigin(localCharacter->GetOrigin() - (localCharacter->GetMotion()));
+				localCharacter->SetMotion({0,0});
+				localCharacter->CorrectSprite();
+				SendPlayerUpdate();
+			}
+		}
+	}
+
+	//update the camera
+	camera.x = localCharacter->GetOrigin().x - camera.marginX;
+	camera.y = localCharacter->GetOrigin().y - camera.marginY;
+}
+
+void InWorld::FrameEnd() {
+	//
+}
+
+void InWorld::RenderFrame() {
+//	SDL_FillRect(GetScreen(), 0, 0);
+	Render(GetScreen());
+	SDL_Flip(GetScreen());
+	fps.Calculate();
+}
+
+void InWorld::Render(SDL_Surface* const screen) {
+	//draw the map
+	for (std::list<Region>::iterator it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); it++) {
+		tileSheet.DrawRegionTo(screen, &(*it), camera.x, camera.y);
+	}
+
+	//draw characters
+	for (auto& it : characterMap) {
+		//BUG: #29 drawing order according to Y origin
+		it.second.DrawTo(screen, camera.x, camera.y);
+	}
+
+	//draw UI
+	disconnectButton.DrawTo(screen);
+	shutDownButton.DrawTo(screen);
+	font.DrawStringTo(to_string_custom(fps.GetFrameRate()), screen, 0, 0);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void InWorld::QuitEvent() {
+	//exit the game AND the server
+	RequestDisconnect();
+	SetNextScene(SceneList::QUIT);
+}
+
+void InWorld::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	disconnectButton.MouseMotion(motion);
+	shutDownButton.MouseMotion(motion);
+}
+
+void InWorld::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	disconnectButton.MouseButtonDown(button);
+	shutDownButton.MouseButtonDown(button);
+}
+
+void InWorld::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	if (disconnectButton.MouseButtonUp(button) == Button::State::HOVER) {
+		RequestDisconnect();
+	}
+	if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER) {
+		RequestShutDown();
+	}
+}
+
+void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
+	if (!localCharacter) {
+		return;
+	}
+
+	//hotkeys
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+			RequestDisconnect();
+		break;
+	}
+
+	//player movement
+	Vector2 motion = localCharacter->GetMotion();
+	switch(key.keysym.sym) {
+		case SDLK_LEFT:
+			motion.x -= CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_RIGHT:
+			motion.x += CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_UP:
+			motion.y -= CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_DOWN:
+			motion.y += CHARACTER_WALKING_SPEED;
+		break;
+		default:
+			return;
+	}
+	localCharacter->SetMotion(motion);
+	localCharacter->CorrectSprite();
+	SendPlayerUpdate();
+}
+
+void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
+	if (!localCharacter) {
+		return;
+	}
+
+	//player movement
+	Vector2 motion = localCharacter->GetMotion();
+	switch(key.keysym.sym) {
+		//NOTE: The use of min/max here are to prevent awkward movements
+		case SDLK_LEFT:
+			motion.x = std::min(motion.x + CHARACTER_WALKING_SPEED, 0.0);
+		break;
+		case SDLK_RIGHT:
+			motion.x = std::max(motion.x - CHARACTER_WALKING_SPEED, 0.0);
+		break;
+		case SDLK_UP:
+			motion.y = std::min(motion.y + CHARACTER_WALKING_SPEED, 0.0);
+		break;
+		case SDLK_DOWN:
+			motion.y = std::max(motion.y - CHARACTER_WALKING_SPEED, 0.0);
+		break;
+		default:
+			return;
+	}
+	localCharacter->SetMotion(motion);
+	localCharacter->CorrectSprite();
+	SendPlayerUpdate();
+}
+
+//-------------------------
+//Network handlers
+//-------------------------
+
+void InWorld::HandlePacket(SerialPacket* const argPacket) {
+	switch(argPacket->GetType()) {
+		case SerialPacketType::DISCONNECT:
+			HandleDisconnect(argPacket);
+		break;
+		case SerialPacketType::CHARACTER_NEW:
+			HandleCharacterNew(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::CHARACTER_DELETE:
+			HandleCharacterDelete(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::CHARACTER_UPDATE:
+			HandleCharacterUpdate(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::REGION_CONTENT:
+			HandleRegionContent(static_cast<RegionPacket*>(argPacket));
+		break;
+		//handle errors
+		default:
+			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in InWorld: " + to_string_custom(static_cast<int>(argPacket->GetType())) ));
+		break;
+	}
+}
+
+void InWorld::HandleDisconnect(SerialPacket* const argPacket) {
+	SetNextScene(SceneList::CLEANUP);
+}
+
+void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
+	if (characterMap.find(argPacket->GetCharacterIndex()) != characterMap.end()) {
+		throw(std::runtime_error("Cannot create duplicate characters"));
+	}
+
+	//create the character object
+	Character& newCharacter = characterMap[argPacket->GetCharacterIndex()];
+
+	//fill out the character's members
+	newCharacter.SetHandle(argPacket->GetHandle());
+	newCharacter.SetAvatar(argPacket->GetAvatar());
+
+	newCharacter.GetSprite()->LoadSurface(ConfigUtility::GetSingleton()["dir.sprites"] + newCharacter.GetAvatar(), 4, 4);
+
+	newCharacter.SetOrigin(argPacket->GetOrigin());
+	newCharacter.SetMotion(argPacket->GetMotion());
+	newCharacter.SetBounds({
+		CHARACTER_BOUNDS_X,
+		CHARACTER_BOUNDS_Y,
+		CHARACTER_BOUNDS_WIDTH,
+		CHARACTER_BOUNDS_HEIGHT
+	});
+
+	*newCharacter.GetStats() = *argPacket->GetStatistics();
+
+	//bookkeeping code
+	newCharacter.CorrectSprite();
+
+	//catch this client's player object
+	if (argPacket->GetAccountIndex() == accountIndex && !localCharacter) {
+		characterIndex = argPacket->GetCharacterIndex();
+		localCharacter = &newCharacter;
+
+		//setup the camera
+		//TODO: move this?
+		camera.width = GetScreen()->w;
+		camera.height = GetScreen()->h;
+
+		//center on the player's character
+		camera.marginX = (GetScreen()->w / 2 - localCharacter->GetSprite()->GetImage()->GetClipW() / 2);
+		camera.marginY = (GetScreen()->h / 2 - localCharacter->GetSprite()->GetImage()->GetClipH() / 2);
+	}
+}
+
+void InWorld::HandleCharacterDelete(CharacterPacket* const argPacket) {
+	//TODO: authenticate when own character is being deleted (linked to a TODO in the server)
+
+	//catch this client's player object
+	if (argPacket->GetCharacterIndex() == characterIndex) {
+		characterIndex = -1;
+		localCharacter = nullptr;
+	}
+
+	characterMap.erase(argPacket->GetCharacterIndex());
+}
+
+void InWorld::HandleCharacterUpdate(CharacterPacket* const argPacket) {
+	if (characterMap.find(argPacket->GetCharacterIndex()) == characterMap.end()) {
+		std::cout << "Warning: HandleCharacterUpdate() is passing to HandleCharacterNew()" << std::endl;
+		HandleCharacterNew(argPacket);
+		return;
+	}
+
+	Character& character = characterMap[argPacket->GetCharacterIndex()];
+
+	//other characters moving
+	if (argPacket->GetCharacterIndex() != characterIndex) {
+		character.SetOrigin(argPacket->GetOrigin());
+		character.SetMotion(argPacket->GetMotion());
+		character.CorrectSprite();
+	}
+}
+
+void InWorld::HandleRegionContent(RegionPacket* const argPacket) {
+	//replace existing regions
+	regionPager.UnloadRegion(argPacket->GetX(), argPacket->GetY());
+	regionPager.PushRegion(argPacket->GetRegion());
+
+	//clean up after the serial code
+	delete argPacket->GetRegion();
+	argPacket->SetRegion(nullptr);
+}
+
+//-------------------------
+//Server control
+//-------------------------
+
+void InWorld::RequestSynchronize() {
+	ClientPacket newPacket;
+
+	//request a sync
+	newPacket.SetType(SerialPacketType::SYNCHRONIZE);
+	newPacket.SetClientIndex(clientIndex);
+	newPacket.SetAccountIndex(accountIndex);
+
+	//TODO: location, range for sync request
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::SendPlayerUpdate() {
+	CharacterPacket newPacket;
+
+	//pack the packet
+	newPacket.SetType(SerialPacketType::CHARACTER_UPDATE);
+
+	newPacket.SetCharacterIndex(characterIndex);
+	//NOTE: omitting the handle and avatar here
+	newPacket.SetAccountIndex(accountIndex);
+	newPacket.SetRoomIndex(0); //TODO: room index
+	newPacket.SetOrigin(localCharacter->GetOrigin());
+	newPacket.SetMotion(localCharacter->GetMotion());
+	*newPacket.GetStatistics() = *localCharacter->GetStats();
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::RequestDisconnect() {
+	ClientPacket newPacket;
+
+	//send a disconnect request
+	newPacket.SetType(SerialPacketType::DISCONNECT);
+	newPacket.SetClientIndex(clientIndex);
+	newPacket.SetAccountIndex(accountIndex);
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::RequestShutDown() {
+	ClientPacket newPacket;
+
+	//send a shutdown request
+	newPacket.SetType(SerialPacketType::SHUTDOWN);
+	newPacket.SetClientIndex(clientIndex);
+	newPacket.SetAccountIndex(accountIndex);
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::RequestRegion(int roomIndex, int x, int y) {
+	RegionPacket packet;
+
+	//pack the region's data
+	packet.SetType(SerialPacketType::REGION_REQUEST);
+	packet.SetRoomIndex(roomIndex);
+	packet.SetX(x);
+	packet.SetY(y);
+
+	network.SendTo(Channels::SERVER, &packet);
+}
+
+//-------------------------
+//Utilities
+//-------------------------
+
+//TODO: convert this into a more generic function?; using parameters for the bounds
+void InWorld::UpdateMap() {
+	//these represent the zone of regions that the client needs loaded, including the mandatory buffers (+1/-1)
+	int xStart = snapToBase(REGION_WIDTH, camera.x/tileSheet.GetTileW()) - REGION_WIDTH;
+	int xEnd = snapToBase(REGION_WIDTH, (camera.x+camera.width)/tileSheet.GetTileW()) + REGION_WIDTH;
+
+	int yStart = snapToBase(REGION_HEIGHT, camera.y/tileSheet.GetTileH()) - REGION_HEIGHT;
+	int yEnd = snapToBase(REGION_HEIGHT, (camera.y+camera.height)/tileSheet.GetTileH()) + REGION_HEIGHT;
+
+	//prune distant regions
+	for (std::list<Region>::iterator it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); /* EMPTY */) {
+		//check if the region is outside of this area
+		if (it->GetX() < xStart || it->GetX() > xEnd || it->GetY() < yStart || it->GetY() > yEnd) {
+
+			//clunky, but the alternative was time consuming
+			int tmpX = it->GetX();
+			int tmpY = it->GetY();
+			++it;
+
+			regionPager.UnloadRegion(tmpX, tmpY);
+			continue;
+		}
+		++it;
+	}
+
+	//request empty regions within this zone
+	for (int i = xStart; i <= xEnd; i += REGION_WIDTH) {
+		for (int j = yStart; j <= yEnd; j += REGION_HEIGHT) {
+			if (!regionPager.FindRegion(i, j)) {
+				RequestRegion(0, i, j);
+			}
+		}
+	}
+}

client/scenes/in_world.hpp

@@ -0,0 +1,123 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef INWORLD_HPP_
+#define INWORLD_HPP_
+
+//maps
+#include "region_pager_base.hpp"
+
+//networking
+#include "udp_network_utility.hpp"
+
+//graphics
+#include "image.hpp"
+#include "raster_font.hpp"
+#include "button.hpp"
+#include "tile_sheet.hpp"
+
+//common
+#include "frame_rate.hpp"
+
+#include "character.hpp"
+
+//client
+#include "base_scene.hpp"
+
+//STL
+#include <map>
+
+class InWorld : public BaseScene {
+public:
+	//Public access members
+	InWorld(
+		int* const argClientIndex,
+		int* const argAccountIndex,
+		int* const argCharacterIndex,
+		CharacterMap* argCharacterMap
+	);
+	~InWorld();
+
+protected:
+	//Frame loop
+	void FrameStart();
+	void Update();
+	void FrameEnd();
+	void RenderFrame();
+	void Render(SDL_Surface* const);
+
+	//Event handlers
+	void QuitEvent();
+	void MouseMotion(SDL_MouseMotionEvent const&);
+	void MouseButtonDown(SDL_MouseButtonEvent const&);
+	void MouseButtonUp(SDL_MouseButtonEvent const&);
+	void KeyDown(SDL_KeyboardEvent const&);
+	void KeyUp(SDL_KeyboardEvent const&);
+
+	//Network handlers
+	void HandlePacket(SerialPacket* const);
+	void HandleDisconnect(SerialPacket* const);
+	void HandleCharacterNew(CharacterPacket* const);
+	void HandleCharacterDelete(CharacterPacket* const);
+	void HandleCharacterUpdate(CharacterPacket* const);
+	void HandleRegionContent(RegionPacket* const);
+
+	//Server control
+	void RequestSynchronize();
+	void SendPlayerUpdate();
+	void RequestDisconnect();
+	void RequestShutDown();
+	void RequestRegion(int roomIndex, int x, int y);
+
+	//utilities
+	void UpdateMap();
+
+	//shared parameters
+	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
+	int& clientIndex;
+	int& accountIndex;
+	int& characterIndex;
+	CharacterMap& characterMap;
+
+	//graphics
+	Image buttonImage;
+	RasterFont font;
+	TileSheet tileSheet;
+
+	//map
+	RegionPagerBase regionPager;
+
+	//UI
+	Button disconnectButton;
+	Button shutDownButton;
+	//TODO: Review the camera
+	struct {
+		int x = 0, y = 0;
+		int width = 0, height = 0;
+		int marginX = 0, marginY = 0;
+	} camera;
+	FrameRate fps;
+
+	//game
+	Character* localCharacter = nullptr;
+};
+
+#endif

client/scenes/lobby_menu.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -22,10 +22,9 @@
 #include "lobby_menu.hpp"
 
 #include "channels.hpp"
+#include "utility.hpp"
 
-#include <cstring>
 #include <stdexcept>
-#include <sstream>
 
 //-------------------------
 //Public access members
@@ -35,44 +34,36 @@ 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");
+	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	font = TTF_OpenFont(config["client.font"].c_str(), 12);
+	image.SetClipH(image.GetClipH()/3);
+	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
 
-	//check that the font loaded
+	//pass the utility objects
-	if (!font) {
+	search.SetImage(&image);
-		std::ostringstream msg;
+	search.SetFont(&font);
-		msg << "Failed to load a font file; " << SDL_GetError();
+	join.SetImage(&image);
-		throw(std::runtime_error(msg.str()));
+	join.SetFont(&font);
-	}
+	back.SetImage(&image);
+	back.SetFont(&font);
 
-	//setup the buttons
+	//set the button positions
-	searchButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
+	search.SetX(50);
-	searchButton.SetText(GetRenderer(), font, "Search", COLOR_WHITE);
+	search.SetY(50 + image.GetClipH() * 0);
-	joinButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
+	join.SetX(50);
-	joinButton.SetText(GetRenderer(), font, "Join", COLOR_WHITE);
+	join.SetY(50 + image.GetClipH() * 1);
-	backButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
+	back.SetX(50);
-	backButton.SetText(GetRenderer(), font, "Back", COLOR_WHITE);
+	back.SetY(50 + image.GetClipH() * 2);
 
-	//set the button positions (assumed)
+	//set the button texts
-	searchButton.SetX(50);
+	search.SetText("Search");
-	searchButton.SetY(50);
+	join.SetText("Join");
-	joinButton.SetX(50);
+	back.SetText("Back");
-	joinButton.SetY(70);
-	backButton.SetX(50);
-	backButton.SetY(90);
 
-	//pseudo-list selection
+	//set the server list's position
-	boundingBox = {300, 50, 200, 12};
+	listBox = {300, 50, 200, font.GetCharH()};
 
-	//hacked together a highlight box
+	//BUGFIX: Eat incoming packets
-	highlightImage.Create(GetRenderer(), 300, 12, {49, 150, 5, 255});
-
-	//Eat incoming packets
 	while(network.Receive());
 
 	//Initial broadcast
@@ -80,7 +71,7 @@ LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
 }
 
 LobbyMenu::~LobbyMenu() {
-	TTF_CloseFont(font);
+	//
 }
 
 //-------------------------
@@ -104,25 +95,38 @@ void LobbyMenu::FrameEnd() {
 	//
 }
 
-void LobbyMenu::RenderFrame(SDL_Renderer* renderer) {
+void LobbyMenu::Render(SDL_Surface* const screen) {
-	//TODO: (2) I need a proper UI system for the entire client and the editor
+	//TODO: I need a proper UI system for the entire client and the editor
 
 	//UI
-	searchButton.DrawTo(renderer);
+	search.DrawTo(screen);
-	joinButton.DrawTo(renderer);
+	join.DrawTo(screen);
-	backButton.DrawTo(renderer);
+	back.DrawTo(screen);
 
-	//TODO: (3) draw headers for the server list
+	//TODO: draw headers for the server list
-	//TODO: (3) ping/delay displayed in the server list
+	for (int i = 0; i < serverInfo.size(); i++) {
-	for (int i = 0; i < serverVector.size(); i++) {
 		//draw the selected server's highlight
-		if (selection == &serverVector[i]) {
+		if (selection == &serverInfo[i]) {
-			highlightImage.DrawTo(renderer, boundingBox.x, boundingBox.y + boundingBox.h * i);
+			SDL_Rect r = {
+				(Sint16)listBox.x, (Sint16)listBox.y,
+				(Uint16)listBox.w, (Uint16)listBox.h
+			};
+			r.y += i * listBox.h;
+			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 255, 127, 39));
 		}
 
-		//draw the server's info
+		//draw the server name
-		serverVector[i].nameImage.DrawTo(renderer, boundingBox.x, boundingBox.y + boundingBox.h * i);
+		font.DrawStringTo(serverInfo[i].name, screen, listBox.x, listBox.y + i*listBox.h);
-		serverVector[i].playerCountImage.DrawTo(renderer, boundingBox.x+276, boundingBox.y + boundingBox.h * i);
+
+		//draw the player count
+		font.DrawStringTo(to_string_custom(serverInfo[i].playerCount), screen, listBox.x + listBox.w, listBox.y + i*listBox.h);
+
+		//compatible?
+		if (!serverInfo[i].compatible) {
+			font.DrawStringTo("?", screen, listBox.x - font.GetCharW(), listBox.y + i*listBox.h);
+		}
+
+		//TODO: ping/delay?
 	}
 }
 
@@ -130,54 +134,49 @@ void LobbyMenu::RenderFrame(SDL_Renderer* renderer) {
 //Event handlers
 //-------------------------
 
-void LobbyMenu::MouseMotion(SDL_MouseMotionEvent const& event) {
+void LobbyMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	searchButton.MouseMotion(event);
+	search.MouseMotion(motion);
-	joinButton.MouseMotion(event);
+	join.MouseMotion(motion);
-	backButton.MouseMotion(event);
+	back.MouseMotion(motion);
 }
 
-void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& event) {
+void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	searchButton.MouseButtonDown(event);
+	search.MouseButtonDown(button);
-	joinButton.MouseButtonDown(event);
+	join.MouseButtonDown(button);
-	backButton.MouseButtonDown(event);
+	back.MouseButtonDown(button);
 }
 
-void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& event) {
+void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (searchButton.MouseButtonUp(event) == Button::State::RELEASED) {
+	if (search.MouseButtonUp(button) == Button::State::HOVER) {
 		SendBroadcastRequest();
 	}
-	if (joinButton.MouseButtonUp(event) == Button::State::RELEASED && selection && selection->compatible) {
+	else if (join.MouseButtonUp(button) == Button::State::HOVER && selection != nullptr && selection->compatible) {
 		SendJoinRequest();
 	}
-	if (backButton.MouseButtonUp(event) == Button::State::RELEASED) {
+	else if (back.MouseButtonUp(button) == Button::State::HOVER) {
-		SetSceneSignal(SceneSignal::MAINMENU);
+		SetNextScene(SceneList::MAINMENU);
 	}
 
 	//has the user selected a server on the list?
-	BoundingBox tmpBox = boundingBox;
+	BoundingBox tmpBox = listBox;
-	tmpBox.h *= serverVector.size(); //within the list bounds
+	tmpBox.h *= serverInfo.size();
-	if (tmpBox.CheckOverlap({event.x, event.y})) {
+	if (tmpBox.CheckOverlap({button.x, button.y})) {
-		//NOTE: this memory trick requires a vector
+		selection = &serverInfo[(button.y - listBox.y)/listBox.h];
-		selection = &serverVector[(event.y - boundingBox.y)/boundingBox.h];
 	}
 	else {
 		selection = nullptr;
 	}
 }
 
-void LobbyMenu::MouseWheel(SDL_MouseWheelEvent const& event) {
+void LobbyMenu::KeyDown(SDL_KeyboardEvent const& key) {
-	//
+	switch(key.keysym.sym) {
-}
-
-void LobbyMenu::KeyDown(SDL_KeyboardEvent const& event) {
-	switch(event.keysym.sym) {
 		case SDLK_ESCAPE:
-			SetSceneSignal(SceneSignal::MAINMENU);
+			SetNextScene(SceneList::MAINMENU);
 		break;
 	}
 }
 
-void LobbyMenu::KeyUp(SDL_KeyboardEvent const& event) {
+void LobbyMenu::KeyUp(SDL_KeyboardEvent const& key) {
 	//
 }
 
@@ -186,95 +185,48 @@ void LobbyMenu::KeyUp(SDL_KeyboardEvent const& event) {
 //-------------------------
 
 void LobbyMenu::HandlePacket(SerialPacket* const argPacket) {
-		switch(argPacket->type) {
+		switch(argPacket->GetType()) {
-			//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: {
+		default:
-			std::ostringstream msg;
+			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in LobbyMenu: " + to_string_custom(static_cast<int>(argPacket->GetType())) ));
-			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;
+	ServerInformation server;
+	server.address = argPacket->GetAddress();
+	server.name = argPacket->GetName();
+	server.playerCount = argPacket->GetPlayerCount();
+	server.version = argPacket->GetVersion();
 
-	newServer.address = argPacket->srcAddress;
+	//Checking compatibility
-	newServer.name = argPacket->name;
+	server.compatible = server.version == NETWORK_VERSION;
-	newServer.playerCount = argPacket->playerCount;
-	newServer.version = argPacket->version;
-	newServer.compatible = newServer.version == NETWORK_VERSION;
 
 	//push
-	serverVector.push_back(newServer);
+	serverInfo.push_back(server);
-
-	//BUGFIX: since TextLine lacks the memory management of Image, I'll wait until after the line is in the vector to handle these
-
-	//fancy colors
-	SDL_Color color;
-	if (newServer.compatible) {
-		color = {255, 255, 255, 255};
-	}
-	else {
-		color = {255, 0, 0, 255};
-	}
-
-	//fancy itoa
-	auto itoa_base10 = [](int i) -> std::string {
-		char str[20];
-		sprintf(str, "%d", i);
-		return std::string(str);
-	};
-
-	//text graphics
-	serverVector.back().nameImage.SetText(GetRenderer(), font, newServer.name, color);
-	serverVector.back().playerCountImage.SetText(GetRenderer(), font, itoa_base10(newServer.playerCount), color);
 }
 
 void LobbyMenu::HandleJoinResponse(ClientPacket* const argPacket) {
-	//save the server's data
+	clientIndex = argPacket->GetClientIndex();
-	clientIndex = argPacket->clientIndex;
+	accountIndex = argPacket->GetAccountIndex();
-	network.Bind(argPacket->srcAddress, Channels::SERVER);
+	network.Bind(argPacket->GetAddressPtr(), Channels::SERVER);
+	SetNextScene(SceneList::INWORLD);
 
-	//request login data
+	//send this player's character info
-	SendLoginRequest();
+	CharacterPacket newPacket;
-}
+	newPacket.SetType(SerialPacketType::CHARACTER_NEW);
-
+	newPacket.SetHandle(config["client.handle"].c_str());
-void LobbyMenu::HandleLoginResponse(ClientPacket* const argPacket) {
+	newPacket.SetAvatar(config["client.avatar"].c_str());
-	if (argPacket->clientIndex != clientIndex) {
+	newPacket.SetAccountIndex(accountIndex);
-		throw(std::runtime_error("Client index invalid during login"));
+	network.SendTo(Channels::SERVER, &newPacket);
-	}
-	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
 }
 
 //-------------------------
@@ -283,32 +235,22 @@ void LobbyMenu::HandleLoginRejection(TextPacket* const argPacket) {
 
 void LobbyMenu::SendBroadcastRequest() {
 	//broadcast to the network, or a specific server
-		ClientPacket packet;
+		ServerPacket packet;
-		packet.type = SerialPacketType::BROADCAST_REQUEST;
+		packet.SetType(SerialPacketType::BROADCAST_REQUEST);
 		network.SendTo(config["server.host"].c_str(), config.Int("server.port"), &packet);
 
 		//reset the server list
-		serverVector.clear();
+		serverInfo.clear();
 		selection = nullptr;
 }
 
 void LobbyMenu::SendJoinRequest() {
 	//pack the packet
 		ClientPacket packet;
-		packet.type = SerialPacketType::JOIN_REQUEST;
+		packet.SetType(SerialPacketType::JOIN_REQUEST);
+		packet.SetUsername(config["client.username"].c_str());
 
 		//join the selected server
-		network.SendTo(selection->address, &packet);
+		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,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,20 +19,18 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef LOBBYMENU_HPP_
+#define LOBBYMENU_HPP_
 
 //graphics & ui
 #include "image.hpp"
+#include "raster_font.hpp"
 #include "button.hpp"
 #include "bounding_box.hpp"
-#include "text_line.hpp"
-
-#include "SDL2/SDL_ttf.h"
 
 //utilities
 #include "config_utility.hpp"
 #include "udp_network_utility.hpp"
-#include "serial_packet.hpp"
 
 //client
 #include "base_scene.hpp"
@@ -46,34 +44,28 @@ public:
 	LobbyMenu(int* const argClientIndex, int* const argAccountIndex);
 	~LobbyMenu();
 
-	void RenderFrame(SDL_Renderer* renderer) override;
-
 protected:
-	//frame phases
+	//Frame loop
-	void FrameStart() override;
+	void FrameStart();
-	void Update() override;
+	void Update();
-	void FrameEnd() override;
+	void FrameEnd();
+	void Render(SDL_Surface* const);
 
-	//input events
+	//Event handlers
-	void MouseMotion(SDL_MouseMotionEvent const& event) override;
+	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const& event) override;
+	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const& event) override;
+	void MouseButtonUp(SDL_MouseButtonEvent const&);
-	void MouseWheel(SDL_MouseWheelEvent const& event) override;
+	void KeyDown(SDL_KeyboardEvent const&);
-	void KeyDown(SDL_KeyboardEvent const& event) override;
+	void KeyUp(SDL_KeyboardEvent const&);
-	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();
@@ -81,13 +73,15 @@ protected:
 	int& clientIndex;
 	int& accountIndex;
 
-	//define the list object
+	//members
-	struct ServerInfo {
+	Image image;
-		//graphics
+	RasterFont font;
-		TextLine nameImage;
+	Button search;
-		TextLine playerCountImage;
+	Button join;
+	Button back;
 
-		//networking
+	//server list
+	struct ServerInformation {
 		IPaddress address;
 		std::string name;
 		int playerCount;
@@ -95,16 +89,12 @@ protected:
 		bool compatible;
 	};
 
-	//members
+	std::vector<ServerInformation> serverInfo;
-	Image buttonImage;
-	Image highlightImage;
-	TTF_Font* font = nullptr;
-	Button searchButton;
-	Button joinButton;
-	Button backButton;
 
-	std::vector<ServerInfo> serverVector;
+	//NOTE: a terrible hack
-	ServerInfo* selection = nullptr;
+	//I'd love a proper gui system for this
-
+	BoundingBox listBox;
-	BoundingBox boundingBox;
+	ServerInformation* selection = nullptr;
 };
+
+#endif

client/scenes/main_menu.cpp

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

client/scenes/main_menu.hpp

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

client/scenes/makefile

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

client/scenes/options_menu.cpp

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

client/scenes/options_menu.hpp

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

client/scenes/splash_screen.cpp

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

client/scenes/splash_screen.hpp

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

client/scenes/world.hpp

@@ -1,177 +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 "local_character.hpp"
-
-#include "SDL2/SDL.h"
-#include "SDL2/SDL_net.h"
-#include "SDL2/SDL_ttf.h"
-
-//STL
-#include <map>
-
-#include <chrono>
-
-class World: public BaseScene {
-public:
-	//Public access members
-	World(int* const argClientIndex, int* const argAccountIndex);
-	~World();
-
-	void RenderFrame(SDL_Renderer* renderer) override;
-
-private:
-	//frame phases
-	void FrameStart() override;
-	void Update() override;
-	void FrameEnd() override;
-
-	//input events
-	void QuitEvent();
-	void MouseMotion(SDL_MouseMotionEvent const& event) override;
-	void MouseButtonDown(SDL_MouseButtonEvent const& event) override;
-	void MouseButtonUp(SDL_MouseButtonEvent const& event) override;
-	void MouseWheel(SDL_MouseWheelEvent const& event) override;
-	void KeyDown(SDL_KeyboardEvent const& event) override;
-	void KeyUp(SDL_KeyboardEvent const& event) override;
-
-	//handle incoming traffic
-	void HandlePacket(SerialPacket* const);
-
-	//heartbeat system
-	void hPing(ServerPacket* const);
-	void hPong(ServerPacket* const);
-
-	void CheckHeartBeat();
-
-	//basic connections
-	void SendLogoutRequest();
-	void SendDisconnectRequest();
-	void SendAdminDisconnectForced();
-	void SendAdminShutdownRequest();
-
-	void hLogoutResponse(ClientPacket* const);
-	void hDisconnectResponse(ClientPacket* const);
-	void hAdminDisconnectForced(ClientPacket* const);
-
-	//map management
-	void SendRegionRequest(int roomIndex, int x, int y);
-	void hRegionContent(RegionPacket* const);
-	void UpdateMap();
-
-	//character management
-	void hCharacterUpdate(CharacterPacket* const);
-	void hCharacterCreate(CharacterPacket* const);
-	void 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
-	//TODO: (2) Heartbeat needs it's own utility
-	typedef std::chrono::steady_clock Clock;
-	Clock::time_point lastBeat = Clock::now();
-	Clock::time_point queryTime = Clock::now() - std::chrono::seconds(4); //back 4 seconds to trigger automatically
-	int attemptedBeats = 0;
-
-	//ugly references; I hate this
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
-};

common/debugging/makefile

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

common/debugging/timer.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -39,7 +39,7 @@ void Timer::Stop() {
 
 std::ostream& operator<<(std::ostream& os, Timer& t) {
 	os << t.GetName() << ": ";
-	os << std::chrono::duration_cast<std::chrono::microseconds>(t.GetTime()).count();
+	os << std::chrono::duration_cast<std::chrono::milliseconds>(t.GetTime()).count();
-	os << "us";
+	os << "ms";
 	return os;
 }

common/debugging/timer.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,7 +19,8 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef TIMER_HPP_
+#define TIMER_HPP_
 
 #include <chrono>
 #include <string>
@@ -33,8 +34,8 @@ public:
 	Timer(std::string s);
 	~Timer() = default;
 
-	void Start();
+	inline void Start();
-	void Stop();
+	inline void Stop();
 
 	//accessors and mutators
 	Clock::duration GetTime() { return timeSpan; }
@@ -49,3 +50,5 @@ private:
 };
 
 std::ostream& operator<<(std::ostream& os, Timer& t);
+
+#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.cpp

@@ -1,83 +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 "example_scene.hpp"
-
-ExampleScene::ExampleScene() {
-	//
-}
-
-ExampleScene::~ExampleScene() {
-	//
-}
-
-//-------------------------
-//frame phases
-//-------------------------
-
-void ExampleScene::FrameStart() {
-	//
-}
-
-void ExampleScene::Update() {
-	//
-}
-
-void ExampleScene::FrameEnd() {
-	//
-}
-
-void ExampleScene::RenderFrame(SDL_Renderer* renderer) {
-	//
-}
-
-//-------------------------
-//input events
-//-------------------------
-
-void ExampleScene::MouseMotion(SDL_MouseMotionEvent const& event) {
-	//
-}
-
-void ExampleScene::MouseButtonDown(SDL_MouseButtonEvent const& event) {
-	//
-}
-
-void ExampleScene::MouseButtonUp(SDL_MouseButtonEvent const& event) {
-	//
-}
-
-void ExampleScene::MouseWheel(SDL_MouseWheelEvent const& event) {
-	//
-}
-
-void ExampleScene::KeyDown(SDL_KeyboardEvent const& event) {
-	//preference as a default
-	switch(event.keysym.sym) {
-		case SDLK_ESCAPE:
-			QuitEvent();
-		break;
-	}
-}
-
-void ExampleScene::KeyUp(SDL_KeyboardEvent const& event) {
-	//
-}

common/frameworks/scenes/example_scene.hpp

@@ -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,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,14 +19,14 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef CHARACTERDEFINES_HPP_
+#define CHARACTERDEFINES_HPP_
 
 #include <cmath>
 
 //the speeds that the characters move
 constexpr double CHARACTER_WALKING_SPEED = 2.24;
 constexpr double CHARACTER_WALKING_MOD = 1.0/sqrt(2.0);
-constexpr double CHARACTER_WALKING_NEGATIVE_MOD = 1.0 - CHARACTER_WALKING_MOD;
 
 //the bounds for the character objects, mapped to the default sprites
 constexpr int CHARACTER_BOUNDS_X = 0;
@@ -34,6 +34,4 @@ constexpr int CHARACTER_BOUNDS_Y = 16;
 constexpr int CHARACTER_BOUNDS_WIDTH = 32;
 constexpr int CHARACTER_BOUNDS_HEIGHT = 32;
 
-//the character's sprite format
+#endif
-constexpr int CHARACTER_CELLS_X = 4;
-constexpr int CHARACTER_CELLS_Y = 4;

common/gameplay/combat_defines.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,10 +19,16 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef COMBATDEFINES_HPP_
+#define COMBATDEFINES_HPP_
 
-#include "SDL2/SDL_net.h"
+#define COMBAT_MAX_CHARACTERS 16
+#define COMBAT_MAX_ENEMIES 16
 
-//these should've come standard
+enum class TerrainType {
-bool operator==(IPaddress lhs, IPaddress rhs);
+	NONE = 0,
-bool operator!=(IPaddress lhs, IPaddress rhs);
+	GRASSLANDS,
+	//etc.
+};
+
+#endif

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/culling_defines.hpp

@@ -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.
-*/
-#pragma once
-
-constexpr int INFLUENCE_RADIUS = 1000;

common/gameplay/makefile

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

common/gameplay/statistics.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,13 +19,24 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef STATISTICS_HPP_
+#define STATISTICS_HPP_
 
-#include <stdexcept>
+struct Statistics {
-#include <string>
+	int level = 0;
-
+	int exp = 0;
-class fatal_error: public std::runtime_error {
+	int maxHP = 0;
-public:
+	int health = 0;
-	explicit fatal_error(const std::string& str): runtime_error(str) {}
+	int maxMP = 0;
-	explicit fatal_error(const char* cstr): runtime_error(cstr) {}
+	int mana = 0;
+	int attack = 0;
+	int defence = 0;
+	int intelligence = 0;
+	int resistance = 0;
+	int speed = 0;
+	float accuracy = 0.0;
+	float evasion = 0.0;
+	float luck = 0.0;
 };
+
+#endif

common/graphics/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 <stdexcept>
-
-void Button::DrawTo(SDL_Renderer* renderer) {
-	image.SetClipY(image.GetClipH() * state);
-	image.DrawTo(renderer, posX, posY);
-}
-
-void Button::SetBackgroundTexture(SDL_Renderer* renderer, SDL_Texture* texture) {
-	//copy the given texture
-	image.Free();
-
-	//a null texture can simply free the image
-	if (!texture) {
-		return;
-	}
-
-	//get the w & h, & create
-	int w = 0, h = 0;
-	SDL_QueryTexture(texture, nullptr, nullptr, &w, &h);
-	image.Create(renderer, w, h);
-
-	//copy
-	SDL_SetRenderTarget(renderer, image.GetTexture());
-	SDL_RenderCopy(renderer, texture, nullptr, nullptr);
-	SDL_SetRenderTarget(renderer, nullptr);
-
-	//prune
-	image.SetClipH(image.GetClipH() / 3);
-}
-
-void Button::SetText(SDL_Renderer* renderer, TTF_Font* font, std::string s, SDL_Color color) {
-	//make the surface (from SDL_ttf)
-	SDL_Surface* surf = TTF_RenderText_Solid(font, s.c_str(), color);
-	if (!surf) {
-		throw(std::runtime_error("Failed to create a TTF surface"));
-	}
-
-	//convert to texture
-	SDL_Texture* text = SDL_CreateTextureFromSurface(renderer, surf);
-	SDL_FreeSurface(surf);
-	if (!text) {
-		throw(std::runtime_error("Failed to create a TTF texture"));
-	}
-
-	//get the dimensions & rects
-	int x, y, w, h;
-	SDL_QueryTexture(text, nullptr, nullptr, &w, &h);
-	x = (image.GetClipW() - w) / 2;
-	y = (image.GetClipH() - h) / 2;
-	SDL_Rect src = {0, 0, w, h};
-	SDL_Rect dst;
-
-	//draw the text to the background
-	SDL_SetRenderTarget(renderer, image.GetTexture());
-
-	for (int i = 0; i < 3; i++) {
-		dst = {x, y + image.GetClipH() * i, w, h};
-		SDL_RenderCopy(renderer, text, &src, &dst);
-	}
-
-	SDL_SetRenderTarget(renderer, nullptr);
-
-	//free the texture
-	SDL_DestroyTexture(text);
-}
-
-void Button::SetX(int x) {
-	posX = x;
-}
-
-void Button::SetY(int y) {
-	posY = y;
-}
-
-Button::State Button::MouseMotion(SDL_MouseMotionEvent const& event) {
-	//if out of bounds, exit
-	if (!CheckBounds(event.x, event.y)) {
-		return state = State::IDLE;
-	}
-
-	//if in bounds, check button
-	if (event.state & SDL_BUTTON_LMASK && state == State::PRESSED) {
-		//stay pressed
-//		state = State::PRESSED;
-	}
-	else {
-		state = State::HOVER;
-	}
-
-	return state;
-}
-
-Button::State Button::MouseButtonDown(SDL_MouseButtonEvent const& event) {
-	//if out of bounds, exit
-	if (!CheckBounds(event.x, event.y)) {
-		return state = State::IDLE;
-	}
-
-	//if in bounds, check button
-	if (event.button == SDL_BUTTON_LEFT) {
-		return state = State::PRESSED;
-	}
-
-	//NOTE: if not left button down, ignore
-	return State::HOVER;
-}
-
-Button::State Button::MouseButtonUp(SDL_MouseButtonEvent const& event) {
-	//if out of bounds, exit
-	if (!CheckBounds(event.x, event.y)) {
-		return state = State::IDLE;
-	}
-
-	//if not left button up, ignore
-	if (event.button != SDL_BUTTON_LEFT) {
-		return state;
-	}
-
-	//if in bounds and left button up, send release signal
-	if (state == State::PRESSED) {
-		state = State::HOVER;
-		return State::RELEASED;
-	}
-
-	return state;
-}
-
-void Button::SetState(State s) {
-	state = s;
-}
-
-Button::State Button::GetState() {
-	return state;
-}
-
-bool Button::CheckBounds(int x, int y) {
-	//return if true (x, y) is within bounds, otherwise return false
-	return !(
-		x < posX ||
-		y < posY ||
-		x > posX + image.GetClipW() ||
-		y > posY + image.GetClipH()
-		);
-}

common/graphics/button.hpp

@@ -1,68 +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>
-
-constexpr SDL_Color COLOR_WHITE = {255, 255, 255, 255};
-constexpr SDL_Color COLOR_RED = {255, 0, 0, 255};
-constexpr SDL_Color COLOR_ORANGE = {255, 127, 0, 255};
-constexpr SDL_Color COLOR_BLUE = {0, 0, 255, 255};
-
-class Button {
-public:
-	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*, std::string, SDL_Color);
-	void SetX(int x);
-	void SetY(int y);
-
-	//capture input
-	State MouseMotion(SDL_MouseMotionEvent const&);
-	State MouseButtonDown(SDL_MouseButtonEvent const&);
-	State MouseButtonUp(SDL_MouseButtonEvent const&);
-
-	//states
-	void SetState(State); //TODO: idle, busy or disabled
-	State GetState();
-
-protected:
-	bool CheckBounds(int x, int y);
-
-	Image image;
-	int posX = 0, posY = 0;
-	State state = State::IDLE;
-};

common/graphics/image.cpp

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

common/graphics/image.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,10 +19,10 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef IMAGE_HPP_
-
+#define IMAGE_HPP_
-#include "SDL2/SDL.h"
 
+#include "SDL/SDL.h"
 #include <string>
 
 class Image {
@@ -30,25 +30,21 @@ 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(std::string fname) { LoadSurface(fname); }
-	Image(SDL_Renderer* r, Uint16 w, Uint16 h) { Create(r, w, h); }
+	Image(Uint16 w, Uint16 h) { CreateSurface(w, h); }
-	Image(SDL_Texture* p) { SetTexture(p); }
+	Image(SDL_Surface* p) { SetSurface(p); }
-	virtual ~Image() { Free(); }
+	~Image() { FreeSurface(); }
 
 	Image& operator=(Image const&);
 	Image& operator=(Image&&);
 
-	SDL_Texture* Load(SDL_Renderer* renderer, std::string fname);
+	SDL_Surface* LoadSurface(std::string fname);
-	SDL_Texture* Create(SDL_Renderer* renderer, Uint16 w, Uint16 h, SDL_Color blank = {0, 0, 0, 255});
+	SDL_Surface* CreateSurface(Uint16 w, Uint16 h);
-	SDL_Texture* CopyTexture(SDL_Renderer* renderer, SDL_Texture* ptr);
+	SDL_Surface* SetSurface(SDL_Surface*);
-	SDL_Texture* SetTexture(SDL_Texture*);
+	SDL_Surface* GetSurface() const { return surface; }
-	SDL_Texture* GetTexture() const;
+	void FreeSurface();
-	virtual void Free();
 
-	void DrawTo(SDL_Renderer* const, Sint16 x, Sint16 y, double scaleX = 1.0, double scaleY = 1.0);
+	void DrawTo(SDL_Surface* const, Sint16 x, Sint16 y);
-
-	void SetAlpha(Uint8 a);
-	Uint8 GetAlpha();
 
 	//Clip handlers
 	SDL_Rect SetClip(SDL_Rect r) { return clip = r; }
@@ -66,8 +62,12 @@ public:
 
 	bool GetLocal() const { 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/graphics/makefile

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

common/graphics/sprite_sheet.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,163 +21,79 @@
 */
 #include "sprite_sheet.hpp"
 
-#include <sstream>
 #include <stdexcept>
-
+#include <sstream>
-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 (++xIndex >= xCount) {
-		if (++indexX >= countX) {
+			xIndex = 0;
-			indexX = 0;
 		}
 		tick = 0;
 	}
-	//modify area drawn
+	image.SetClipX(xIndex * image.GetClipW());
-	clip.x = indexX * clip.w;
+	image.SetClipY(yIndex * image.GetClipH());
-	clip.y = indexY * clip.h;
 }
 
-SDL_Texture* SpriteSheet::Load(SDL_Renderer* r, std::string fname, Uint16 cx, Uint16 cy) {
+SDL_Surface* SpriteSheet::LoadSurface(std::string fname, Uint16 xCellCount, Uint16 yCellCount) {
-	//call the base function
+	image.LoadSurface(fname);
-	Image::Load(r, fname);
 
-	//set the metadata
+	xCount = xCellCount;
-	countX = cx;
+	yCount = yCellCount;
-	countY = cy;
 
-	//assume clip.x and clip.y were set to the size of the texture
+	image.SetClipW(image.GetSurface()->w / xCount);
-	//reduce the w & h to the size of one cell
+	image.SetClipH(image.GetSurface()->h / yCount);
-	clip.w = clip.w / countX;
-	clip.h = clip.h / countY;
 
-	indexX = indexY = 0;
+	xIndex = yIndex = 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) {
+SDL_Surface* SpriteSheet::SetSurface(SDL_Surface* surface, Uint16 xCellCount, Uint16 yCellCount) {
-	indexX = 0;
+	image.SetSurface(surface);
-	return countX = i;
+
+	xCount = xCellCount;
+	yCount = yCellCount;
+
+	image.SetClipW(image.GetSurface()->w / xCount);
+	image.SetClipH(image.GetSurface()->h / yCount);
+
+	xIndex = yIndex = 0;
+	delay = tick = 0.0;
 }
 
-Uint16 SpriteSheet::SetCountY(Uint16 i) {
+void SpriteSheet::FreeSurface() {
-	indexY = 0;
+	image.FreeSurface();
-	return countY = i;
+	xCount = yCount = 0;
+	xIndex = yIndex = 0;
+	delay = tick = 0.0;
 }
 
-Uint16 SpriteSheet::SetIndexX(Uint16 i) {
+Uint16 SpriteSheet::SetXCount(Uint16 i) {
-	if (i > countX) {
+	xIndex = 0;
-		std::ostringstream msg;
+	return xCount = i;
-		msg << "Cannot set index 'x' to " << i;
+}
-		throw(std::out_of_range(msg.str()));
+
+Uint16 SpriteSheet::SetYCount(Uint16 i) {
+	yIndex = 0;
+	return yCount = i;
+}
+
+Uint16 SpriteSheet::SetXIndex(Uint16 i) {
+	if (i > xCount) {
+		std::ostringstream os;
+		os << "Cannot set x index to " << i;
+		throw(std::invalid_argument(os.str()));
 	}
-	return indexX = i;
+	return xIndex = i;
 }
 
-Uint16 SpriteSheet::SetIndexY(Uint16 i) {
+Uint16 SpriteSheet::SetYIndex(Uint16 i) {
-	if (i > countY) {
+	if (i > yCount) {
-		std::ostringstream msg;
+		std::ostringstream os;
-		msg << "Cannot set index 'y' to " << i;
+		os << "Cannot set y index to " << i;
-		throw(std::invalid_argument(msg.str()));
+		throw(std::invalid_argument(os.str()));
 	}
-	return indexY = i;
+	return yIndex = i;
 }
 
 double SpriteSheet::SetDelay(double d) {

common/graphics/sprite_sheet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,52 +19,48 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef SPRITESHEET_HPP_
+#define SPRITESHEET_HPP_
 
 #include "image.hpp"
 
-class SpriteSheet : public Image {
+class SpriteSheet {
 public:
 	SpriteSheet() = default;
-	SpriteSheet(SpriteSheet const& rhs) { *this = rhs; }
+	SpriteSheet(std::string fname, Uint16 xCellCount, Uint16 yCellCount) { LoadSurface(fname, xCellCount, yCellCount); }
-	SpriteSheet(SpriteSheet&& rhs) { *this = std::move(rhs); }
+	SpriteSheet(SDL_Surface* surface, Uint16 xCellCount, Uint16 yCellCount) { SetSurface(surface, xCellCount, yCellCount); }
-	SpriteSheet(SDL_Renderer* r, std::string fname, Uint16 cx, Uint16 cy)
+	~SpriteSheet() { FreeSurface(); };
-		{ 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_Surface* LoadSurface(std::string fname, Uint16 xCellCount, Uint16 yCellCount);
-	SDL_Texture* Create(SDL_Renderer*, Uint16 w, Uint16 h, Uint16 cx, Uint16 cy);
+	SDL_Surface* SetSurface(SDL_Surface* surface, Uint16 xCellCount, Uint16 yCellCount);
-	SDL_Texture* SetTexture(SDL_Texture*, Uint16 cx, Uint16 cy);
+	SDL_Surface* GetSurface() { return image.GetSurface(); }
-	void Free() override;
+	void FreeSurface();
 
-	Uint16 SetCountX(Uint16);
+	void DrawTo(SDL_Surface* const dest, Sint16 x, Sint16 y) { image.DrawTo(dest, x, y); }
-	Uint16 SetCountY(Uint16);
-	Uint16 SetIndexX(Uint16);
-	Uint16 SetIndexY(Uint16);
 
-	Uint16 GetCountX() const { return countX; }
+	//accessors and mutators
-	Uint16 GetCountY() const { return countY; }
+	Image* GetImage() { return ℑ } //OO breaker
-	Uint16 GetIndexX() const { return indexX; }
+
-	Uint16 GetIndexY() const { return indexY; }
+	Uint16 SetXCount(Uint16);
+	Uint16 SetYCount(Uint16);
+	Uint16 SetXIndex(Uint16);
+	Uint16 SetYIndex(Uint16);
+
+	Uint16 GetXCount() const { return xCount; }
+	Uint16 GetYCount() const { return yCount; }
+	Uint16 GetXIndex() const { return xIndex; }
+	Uint16 GetYIndex() const { return yIndex; }
 
 	double SetDelay(double d);
 	double GetDelay() const { return delay; }
 
 private:
-	Uint16 countX = 0, countY = 0, indexX = 0, indexY = 0;
+	Image image;
+	Uint16 xCount = 0, yCount = 0; //number of cells
+	Uint16 xIndex = 0, yIndex = 0; //current cell being drawn
 	double delay = 0.0, tick = 0.0;
-
-	//disable access
-	using Image::Load;
-	using Image::Create;
-	using Image::SetTexture;
 };
+
+#endif

common/graphics/text_box.cpp

@@ -1,56 +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 posX, int posY, int pointSize) {
-	for (std::list<TextLine>::iterator it = lineList.begin(); it != lineList.end(); it++) {
-		it->DrawTo(renderer, posX, posY);
-		posY += pointSize;
-	}
-}
-
-void TextBox::PushLine(SDL_Renderer* renderer, TTF_Font* font, std::string str, SDL_Color color) {
-	lineList.emplace_front(renderer, font, str, color);
-}
-
-void TextBox::PopLine(int num) {
-	//prevent underflow
-	num < lineList.size() ? num : lineList.size();
-
-	for (int i = 0; i < num; ++i) {
-		lineList.pop_back();
-	}
-}
-
-void TextBox::ClearLines() {
-	lineList.clear();
-}

common/graphics/text_box.hpp

@@ -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.
-*/
-#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*, int posX, int posY, int pointSize);
-
-	void PushLine(SDL_Renderer*, TTF_Font*, std::string, SDL_Color color);
-	void PopLine(int num = 1);
-	void ClearLines();
-
-private:
-	std::list<TextLine> lineList;
-};

common/graphics/text_line.cpp

@@ -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.
-*/
-#include "text_line.hpp"
-
-#include <stdexcept>
-
-SDL_Texture* renderTextTexture(SDL_Renderer* renderer, TTF_Font* font, std::string str, SDL_Color color) {
-	//make the surface (from SDL_ttf)
-	SDL_Surface* surface = TTF_RenderText_Solid(font, str.c_str(), color);
-	if (!surface) {
-		throw(std::runtime_error("Failed to create a TTF surface"));
-	}
-
-	//convert to texture
-	SDL_Texture* texture = SDL_CreateTextureFromSurface(renderer, surface);
-
-	//cleanup
-	SDL_FreeSurface(surface);
-
-	//check
-	if (!texture) {
-		throw(std::runtime_error("Failed to create a TTF texture"));
-	}
-
-	//NOTE: free the texture yourself
-	return texture;
-}
-
-TextLine::TextLine() {
-	//
-}
-
-TextLine::~TextLine() {
-	ClearText();
-}
-
-void TextLine::DrawTo(SDL_Renderer* renderer, int posX, int posY) {
-	SDL_Rect dclip = {posX, posY, 0, 0};
-	SDL_QueryTexture(texture, nullptr, nullptr, &dclip.w, &dclip.h);
-	SDL_RenderCopy(renderer, texture, nullptr, &dclip);
-}
-
-void TextLine::SetText(SDL_Renderer* renderer, TTF_Font* font, std::string str, SDL_Color color) {
-	//just use the above global function
-	SDL_DestroyTexture(texture);
-	texture = renderTextTexture(renderer, font, str, color);
-}
-
-void TextLine::ClearText() {
-	SDL_DestroyTexture(texture);
-}

common/graphics/text_line.hpp

@@ -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.
-*/
-#pragma once
-
-#include "SDL2/SDL.h"
-#include "SDL2/SDL_ttf.h"
-
-#include <string>
-
-SDL_Texture* renderTextTexture(SDL_Renderer*, TTF_Font*, std::string, SDL_Color color);
-
-class TextLine {
-public:
-	TextLine();
-	TextLine(SDL_Renderer* r, TTF_Font* f, std::string s, SDL_Color c)
-		{ SetText(r, f, s, c); }
-	virtual ~TextLine();
-
-	void DrawTo(SDL_Renderer*, int posX, int posY);
-
-	void SetText(SDL_Renderer*, TTF_Font*, std::string, SDL_Color color);
-	void ClearText();
-
-protected:
-	SDL_Texture* texture = nullptr;
-};

common/makefile

@@ -1,28 +1,13 @@
-#output
+all:
-export OUTDIR=..
-export OUT=$(addprefix $(OUTDIR)/,libcommon.a)
-
-all: $(OUTDIR)
 	$(MAKE) -C debugging
 	$(MAKE) -C gameplay
 	$(MAKE) -C graphics
 	$(MAKE) -C map
 	$(MAKE) -C network
+	$(MAKE) -C ui
 	$(MAKE) -C utilities
 
-debug: export CXXFLAGS+=-g
-debug: clean all
-
-$(OUTDIR):
-	mkdir $(OUTDIR)
-
 clean:
-ifeq ($(OS),Windows_NT)
 	$(RM) *.o *.a *.exe
-else ifeq ($(shell uname), Linux)
-	find . -type f -name *.o -exec rm -f -r -v {} \;
-	find . -type f -name *.a -exec rm -f -r -v {} \;
-	rm -f -v out/client out/server
-endif
 
 rebuild: clean all

common/map/makefile

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

common/map/region.cpp

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

common/map/region.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,7 +19,8 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef REGION_HPP_
+#define REGION_HPP_
 
 #include <bitset>
 
@@ -41,22 +42,22 @@ public:
 	~Region() = default;
 
 	type_t SetTile(int x, int y, int z, type_t v);
-	type_t GetTile(int x, int y, int z) const;
+	type_t GetTile(int x, int y, int z);
 
 	bool SetSolid(int x, int y, bool b);
-	bool GetSolid(int x, int y) const;
+	bool GetSolid(int x, int y);
 
 	//accessors
-	int GetX() const;
+	int GetX() const { return x; }
-	int GetY() const;
+	int GetY() const { return y; }
 
-	std::bitset<REGION_WIDTH*REGION_HEIGHT>* GetSolidBitset();
+	std::bitset<REGION_WIDTH*REGION_HEIGHT>* GetSolidBitset() { return &solid; }
 private:
-	friend class TileSheet;
-
 	const int x;
 	const int y;
 
 	type_t tiles[REGION_WIDTH][REGION_HEIGHT][REGION_DEPTH];
 	std::bitset<REGION_WIDTH*REGION_HEIGHT> solid;
 };
+
+#endif

common/map/region_api.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -85,8 +85,6 @@ static const luaL_Reg regionLib[] = {
 	{"GetSolid",getSolid},
 	{"GetX",getX},
 	{"GetY",getY},
-
-	//the global macros
 	{"GetWidth",getWidth},
 	{"GetHeight",getHeight},
 	{"GetDepth",getDepth},

common/map/region_api.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,9 +19,12 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef REGIONAPI_HPP_
+#define REGIONAPI_HPP_
 
-#include "lua.hpp"
+#include "lua/lua.hpp"
 
-#define TORTUGA_REGION_API "region"
+#define TORTUGA_REGION_NAME "Region"
 LUAMOD_API int openRegionAPI(lua_State* L);
+
+#endif

common/map/region_pager_api.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -25,7 +25,6 @@
 #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));
@@ -85,22 +84,7 @@ static int createRegion(lua_State* L) {
 
 static int unloadRegion(lua_State* L) {
 	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-
+	pager->UnloadRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	//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;
 }
 
@@ -132,13 +116,6 @@ static int setOnUnload(lua_State* L) {
 	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},
@@ -159,9 +136,6 @@ static const luaL_Reg regionPagerLib[] = {
 	{"SetOnCreate",setOnCreate},
 	{"SetOnUnload",setOnUnload},
 
-	//debugging
-	{"ContainerSize", containerSize},
-
 	//sentinel
 	{nullptr, nullptr}
 };

common/map/region_pager_api.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,9 +19,12 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef REGIONPAGERAPI_HPP_
+#define REGIONPAGERAPI_HPP_
 
-#include "lua.hpp"
+#include "lua/lua.hpp"
 
-#define TORTUGA_REGION_PAGER_API "region_pager"
+#define TORTUGA_REGION_PAGER_NAME "RegionPager"
 LUAMOD_API int openRegionPagerAPI(lua_State* L);
+
+#endif

common/map/region_pager_base.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -24,16 +24,11 @@
 #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);
@@ -93,14 +88,12 @@ Region* RegionPagerBase::CreateRegion(int x, int y) {
 	return &regionList.front();
 }
 
-void RegionPagerBase::UnloadIf(std::function<bool(Region const&)> fn) {
+void RegionPagerBase::UnloadRegion(int x, int y) {
-	regionList.remove_if(fn);
+	regionList.remove_if([x, y](Region& region) -> bool {
+		return region.GetX() == x && region.GetY() == y;
+	});
 }
 
 void RegionPagerBase::UnloadAll() {
 	regionList.clear();
 }
-
-std::list<Region>* RegionPagerBase::GetContainer() {
-	return &regionList;
-}

common/map/region_pager_base.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,17 +19,17 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef REGIONPAGERBASE_HPP_
+#define REGIONPAGERBASE_HPP_
 
 #include "region.hpp"
 
-#include <functional>
 #include <list>
 
 class RegionPagerBase {
 public:
 	RegionPagerBase() = default;
-	virtual ~RegionPagerBase();
+	virtual ~RegionPagerBase() { UnloadAll(); };
 
 	//tile manipulation
 	virtual Region::type_t SetTile(int x, int y, int z, Region::type_t v);
@@ -47,12 +47,14 @@ public:
 	virtual Region* LoadRegion(int x, int y);
 	virtual Region* SaveRegion(int x, int y);
 	virtual Region* CreateRegion(int x, int y);
+	virtual void UnloadRegion(int x, int y);
 
-	virtual void UnloadIf(std::function<bool(Region const&)> fn);
 	virtual void UnloadAll();
 
 	//accessors & mutators
-	std::list<Region>* GetContainer();
+	std::list<Region>* GetContainer() { return &regionList; }
 protected:
 	std::list<Region> regionList;
 };
+
+#endif

common/map/region_pager_lua.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -23,17 +23,6 @@
 
 #include <stdexcept>
 
-RegionPagerLua::~RegionPagerLua() {
-	//unload all regions
-	UnloadAll();
-	//clear any stored functions
-	luaL_unref(lua, LUA_REGISTRYINDEX, loadRef);
-	luaL_unref(lua, LUA_REGISTRYINDEX, saveRef);
-	luaL_unref(lua, LUA_REGISTRYINDEX, createRef);
-	luaL_unref(lua, LUA_REGISTRYINDEX, unloadRef);
-}
-
-//return the loaded region, or nullptr on failure
 Region* RegionPagerLua::LoadRegion(int x, int y) {
 	//get the pager's function from the registry
 	lua_rawgeti(lua, LUA_REGISTRYINDEX, loadRef);
@@ -41,7 +30,6 @@ Region* RegionPagerLua::LoadRegion(int x, int y) {
 	//check if this function is available
 	if (lua_isnil(lua, -1)) {
 		lua_pop(lua, 1);
-		//signal that there is no load function
 		return nullptr;
 	}
 
@@ -55,21 +43,17 @@ Region* RegionPagerLua::LoadRegion(int x, int y) {
 	}
 
 	//check the return value, success or failure
-	if (lua_isboolean(lua, -1) && lua_toboolean(lua, -1)) {
+	if (lua_toboolean(lua, -1)) {
 		lua_pop(lua, 1);
-		//push and return the loaded region
 		regionList.push_front(tmpRegion);
 		return &regionList.front();
 	}
 	else {
 		lua_pop(lua, 1);
-		//signal a failure
 		return nullptr;
 	}
 }
 
-//NOTE: this return value seems strange; could replace it with a boolean
-//return the saved region, or nullptr on failure
 Region* RegionPagerLua::SaveRegion(int x, int y) {
 	//get the pager's function from the registry
 	lua_rawgeti(lua, LUA_REGISTRYINDEX, saveRef);
@@ -77,7 +61,6 @@ Region* RegionPagerLua::SaveRegion(int x, int y) {
 	//check if this function is available
 	if (lua_isnil(lua, -1)) {
 		lua_pop(lua, 1);
-		//signal that the region wasn't saved
 		return nullptr;
 	}
 
@@ -85,7 +68,6 @@ Region* RegionPagerLua::SaveRegion(int x, int y) {
 	Region* ptr = FindRegion(x, y);
 	if (!ptr) {
 		lua_pop(lua, 1);
-		//signal that there is no save function
 		return nullptr;
 	}
 	lua_pushlightuserdata(lua, ptr);
@@ -96,20 +78,16 @@ Region* RegionPagerLua::SaveRegion(int x, int y) {
 	}
 
 	//check the return value, success or failure
-	if (lua_isboolean(lua, -1) && lua_toboolean(lua, -1)) {
+	if (lua_toboolean(lua, -1)) {
 		lua_pop(lua, 1);
-		//return the specified region that was saved
 		return ptr;
 	}
 	else {
 		lua_pop(lua, 1);
-		//signal a failure
 		return nullptr;
 	}
 }
 
-//DOCS: since this method is the last ditch call from GetRegion, it must return a valid region object, even if the create function hasn't been set.
-//return a new region, throwing an error on failure
 Region* RegionPagerLua::CreateRegion(int x, int y) {
 	if (FindRegion(x, y)) {
 		throw(std::logic_error("Cannot overwrite an existing region"));
@@ -121,9 +99,7 @@ Region* RegionPagerLua::CreateRegion(int x, int y) {
 	//check if this function is available
 	if (lua_isnil(lua, -1)) {
 		lua_pop(lua, 1);
-		//return an empty region object
+		return nullptr;
-		regionList.emplace_front(x, y);
-		return &regionList.front();
 	}
 
 	//something to work on
@@ -140,26 +116,23 @@ Region* RegionPagerLua::CreateRegion(int x, int y) {
 	return &regionList.front();
 }
 
-//no return
+void RegionPagerLua::UnloadRegion(int x, int y) {
-void RegionPagerLua::UnloadIf(std::function<bool(Region const&)> fn) {
 	//get the pager's function from the registry
 	lua_rawgeti(lua, LUA_REGISTRYINDEX, unloadRef);
 
 	//check if this function is available
 	if (lua_isnil(lua, -1)) {
 		lua_pop(lua, 1);
-		//remove the regions anyway
-		regionList.remove_if(fn);
 		return;
 	}
 
 	//run each region through this lambda
 	regionList.remove_if([&](Region& region) -> bool {
-		if (fn(region)) {
+		if (region.GetX() == x && region.GetY() == y) {
 
 			//push a copy of the function onto the stack with the region
 			lua_pushvalue(lua, -1);
-			lua_pushlightuserdata(lua, static_cast<void*>(&region));
+			lua_pushlightuserdata(lua, &region);
 
 			//call the function, 1 arg, 0 return
 			if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
@@ -184,8 +157,6 @@ void RegionPagerLua::UnloadAll() {
 	//check if this function is available
 	if (lua_isnil(lua, -1)) {
 		lua_pop(lua, 1);
-		//remove the regions anyway
-		regionList.clear();
 		return;
 	}
 

common/map/region_pager_lua.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,28 +19,26 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef REGIONPAGERLUA_HPP_
+#define REGIONPAGERLUA_HPP_
 
 #include "region_pager_base.hpp"
 
-#include "lua.hpp"
+#include "lua/lua.hpp"
 
-#include <functional>
 #include <string>
 
-//DOCS: set the lua hook before use
-
 class RegionPagerLua : public RegionPagerBase {
 public:
 	RegionPagerLua() = default;
-	~RegionPagerLua();
+	~RegionPagerLua() = default;
 
 	//region manipulation
 	Region* LoadRegion(int x, int y) override;
 	Region* SaveRegion(int x, int y) override;
 	Region* CreateRegion(int x, int y) override;
+	void UnloadRegion(int x, int y) override;
 
-	void UnloadIf(std::function<bool(Region const&)> fn) override;
 	void UnloadAll() override;
 
 	//accessors & mutators
@@ -66,3 +64,5 @@ protected:
 	int createRef = LUA_NOREF;
 	int unloadRef = LUA_NOREF;
 };
+
+#endif

common/map/tile_sheet.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,103 +21,40 @@
 */
 #include "tile_sheet.hpp"
 
-#include <stdexcept>
+void TileSheet::Load(std::string fname, int tileWidth, int tileHeight) {
-
+	image.LoadSurface(fname);
-TileSheet& TileSheet::operator=(TileSheet const& rhs) {
+	image.SetClipW(tileWidth);
-	//don't screw yourself
+	image.SetClipH(tileHeight);
-	if (this == &rhs) {
+	xCount = image.GetSurface()->w / image.GetClipW();
-		return *this;
+	yCount = image.GetSurface()->h / image.GetClipH();
-	}
-
-	Free();
-
-	//Copy the other TileSheet's stuff
-	texture = rhs.texture;
-	clip = rhs.clip;
-	local = false;
-	countX = rhs.countX;
-	countY = rhs.countY;
 }
 
-TileSheet& TileSheet::operator=(TileSheet&& rhs) {
+void TileSheet::Unload() {
-	//don't screw yourself
+	image.FreeSurface();
-	if (this == &rhs) {
+	xCount = yCount = 0;
-		return *this;
-	}
-
-	Free();
-
-	//Copy the other TileSheet's stuff
-	texture = rhs.texture;
-	clip = rhs.clip;
-	local = false;
-	countX = rhs.countX;
-	countY = rhs.countY;
-
-	rhs.texture = nullptr;
-	rhs.clip = {0, 0, 0, 0};
-	rhs.local = false;
-	rhs.countX = 0;
-	rhs.countY = 0;
 }
 
-void TileSheet::Load(SDL_Renderer* renderer, std::string fname, int tileWidth, int tileHeight) {
+void TileSheet::DrawTileTo(SDL_Surface* const dest, int x, int y, Region::type_t tile) {
-	Image::Load(renderer, fname);
+	//0 is invisible
-	countX = clip.w / tileWidth;
+	if (tile == 0) return;
-	countY = clip.h / tileHeight;
+	image.SetClipX((tile-1) % xCount * image.GetClipW());
-	clip.w = tileWidth;
+	image.SetClipY((tile-1) / xCount * image.GetClipH());
-	clip.h = tileHeight;
+	image.DrawTo(dest, x, y);
 }
 
-SDL_Texture* TileSheet::SetTexture(SDL_Texture* ptr, int tileWidth, int tileHeight) {
+void TileSheet::DrawRegionTo(SDL_Surface* const dest, Region* const region, int camX, int camY) {
-	Image::SetTexture(ptr);
-	countX = clip.w / tileWidth;
-	countY = clip.h / tileHeight;
-	clip.w = tileWidth;
-	clip.h = tileHeight;
-}
-
-void TileSheet::Free() {
-	Image::Free();
-	countX = countY = 0;
-}
-
-void TileSheet::DrawLayerTo(SDL_Renderer* const renderer, Region* const region, int layer, int camX, int camY, double scaleX, double scaleY) {
-	//TODO: (2) empty
-}
-
-void TileSheet::DrawRegionTo(SDL_Renderer* const renderer, Region* const region, int camX, int camY, double scaleX, double scaleY) {
-	//NOTE: TileSheet is a friend class of Region
-	//reimplementing DrawTo() to improve performance (less indirection)
-	if (!texture) {
-		throw(std::logic_error("No image texture to draw"));
-	}
-
-	//the local variables
-	SDL_Rect sclip = {0, 0, clip.w, clip.h};
-	SDL_Rect dclip = {0, 0, Uint16(clip.w * scaleX), Uint16(clip.h * scaleY)};
 	Region::type_t tile = 0;
-
-	//for each tile
 	for (register int i = 0; i < REGION_WIDTH; ++i) {
 		for (register int j = 0; j < REGION_HEIGHT; ++j) {
 			for (register int k = 0; k < REGION_DEPTH; ++k) {
-				//get the value to skip expensive lookups
+				tile = region->GetTile(i, j, k);
-				tile = region->tiles[i][j][k];
-
 				//0 is invisible
 				if (tile == 0) continue;
-
+				image.SetClipX((tile-1) % xCount * image.GetClipW());
-				//set the sclip
+				image.SetClipY((tile-1) / xCount * image.GetClipH());
-				sclip.x = (tile-1) % countX * clip.h;
+				image.DrawTo(dest,
-				sclip.y = (tile-1) / countX * clip.w;
+					(region->GetX() + i) * image.GetClipW() - camX,
-
+					(region->GetY() + j) * image.GetClipH() - camY);
-				//set the dclip
-				dclip.x = ((region->x + i) * clip.w - camX) * scaleX;
-				dclip.y = ((region->y + j) * clip.h - camY) * scaleY;
-
-				//draw
-				SDL_RenderCopy(renderer, texture, &sclip, &dclip);
 			}
 		}
 	}

common/map/tile_sheet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,7 +19,8 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef TILESHEET_HPP_
+#define TILESHEET_HPP_
 
 #include "region.hpp"
 
@@ -27,41 +28,27 @@
 
 #include <string>
 
-class TileSheet : public Image {
+class TileSheet {
 public:
 	TileSheet() = default;
-	TileSheet(TileSheet const& rhs) { *this = rhs; }
+	TileSheet(std::string f, int w, int h) { Load(f, w, h); }
-	TileSheet(TileSheet&& rhs) { *this = std::move(rhs); }
-	TileSheet(SDL_Renderer* r, std::string fn, int tw, int th) { Load(r, fn, tw, th); }
-	TileSheet(SDL_Texture* p, int tw, int th) { SetTexture(p, tw, th); }
 	~TileSheet() = default;
 
-	TileSheet& operator=(TileSheet const&);
+	void Load(std::string fname, int tileWidth, int tileHeight);
-	TileSheet& operator=(TileSheet&&);
+	void Unload();
 
-	void Load(SDL_Renderer*, std::string fname, int tileWidth, int tileHeight);
+	void DrawTileTo(SDL_Surface* const dest, int x, int y, Region::type_t tile);
-	SDL_Texture* SetTexture(SDL_Texture*, int tileWidth, int tileHeight);
+	void DrawRegionTo(SDL_Surface* const dest, Region* const region, int camX, int camY);
-	void Free() override;
-
-	void DrawLayerTo(SDL_Renderer* const renderer, Region* const region, int layer, int camX, int camY, double scaleX = 1.0, double scaleY = 1.0);
-	void DrawRegionTo(SDL_Renderer* const renderer, Region* const region, int camX, int camY, double scaleX = 1.0, double scaleY = 1.0);
 
 	//accessors
-	//DOCS: Reuse Image::clip for tile sizes
+	Image* GetImage() { return &image; }
-	int GetCountX() { return countX; }
+	int GetXCount() { return xCount; }
-	int GetCountY() { return countY; }
+	int GetYCount() { return yCount; }
-	int GetTileW() { return clip.w; }
+	int GetTileW() { return image.GetClipW(); }
-	int GetTileH() { return clip.h; }
+	int GetTileH() { return image.GetClipH(); }
-
+private:
-protected:
+	Image image;
-	int countX = 0, countY = 0;
+	int xCount = 0, yCount = 0;
-
-	using Image::Load;
-	using Image::Create;
-	using Image::SetTexture;
-	using Image::SetClip;
-	using Image::SetClipX;
-	using Image::SetClipY;
-	using Image::SetClipW;
-	using Image::SetClipH;
 };
+
+#endif

common/map/tile_sheet_api.cpp

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

common/map/tile_sheet_api.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,9 +19,12 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef TILESHEETAPI_HPP_
+#define TILESHEETAPI_HPP_
 
-#include "lua.hpp"
+#include "lua/lua.hpp"
 
-#define TORTUGA_CHARACTER_API "character"
+#define TORTUGA_TILE_SHEET_NAME "TileSheet"
-LUAMOD_API int openCharacterAPI(lua_State* L);
+LUAMOD_API int openTileSheetAPI(lua_State* L);
+
+#endif

common/network/makefile

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

common/network/packet_types/barrier_packet.cpp

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

common/network/packet_types/barrier_packet.hpp

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

common/network/packet_types/character_packet.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -23,58 +23,50 @@
 
 #include "serial_utility.hpp"
 
-void serializeCharacter(void* buffer, CharacterPacket* packet) {
+void CharacterPacket::Serialize(void* buffer) {
-	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+	serializeCopy(&buffer, &type, sizeof(SerialPacketType));
 
 	//identify the character
-	serialCopy(&buffer, &packet->characterIndex, sizeof(int));
+	serializeCopy(&buffer, &characterIndex, sizeof(int));
-	serialCopy(&buffer, packet->handle, PACKET_STRING_SIZE);
+	serializeCopy(&buffer, handle, PACKET_STRING_SIZE);
-	serialCopy(&buffer, packet->avatar, PACKET_STRING_SIZE);
+	serializeCopy(&buffer, avatar, PACKET_STRING_SIZE);
 
 	//the owner
-	serialCopy(&buffer, &packet->accountIndex, sizeof(int));
+	serializeCopy(&buffer, &accountIndex, sizeof(int));
 
 	//location
-	serialCopy(&buffer, &packet->roomIndex, sizeof(int));
+	serializeCopy(&buffer, &roomIndex, sizeof(int));
+	serializeCopy(&buffer, &origin.x, sizeof(double));
+	serializeCopy(&buffer, &origin.y, sizeof(double));
+	serializeCopy(&buffer, &motion.x, sizeof(double));
+	serializeCopy(&buffer, &motion.y, sizeof(double));
 
-	serialCopy(&buffer, &packet->origin.x, sizeof(double));
+	//stats structure
-	serialCopy(&buffer, &packet->origin.y, sizeof(double));
+	serializeCopyStatistics(&buffer, &stats);
 
-	serialCopy(&buffer, &packet->motion.x, sizeof(double));
+	//TODO: gameplay components: equipment, items, buffs, debuffs
-	serialCopy(&buffer, &packet->motion.y, sizeof(double));
-
-	serialCopy(&buffer, &packet->bounds.x, sizeof(int));
-	serialCopy(&buffer, &packet->bounds.y, sizeof(int));
-	serialCopy(&buffer, &packet->bounds.w, sizeof(int));
-	serialCopy(&buffer, &packet->bounds.h, sizeof(int));
-
-	//gameplay components: equipment, items, buffs, debuffs...
 }
 
-void deserializeCharacter(void* buffer, CharacterPacket* packet) {
+void CharacterPacket::Deserialize(void* buffer) {
-	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+	deserializeCopy(&buffer, &type, sizeof(SerialPacketType));
 
 	//identify the character
-	deserialCopy(&buffer, &packet->characterIndex, sizeof(int));
+	deserializeCopy(&buffer, &characterIndex, sizeof(int));
-	deserialCopy(&buffer, packet->handle, PACKET_STRING_SIZE);
+	deserializeCopy(&buffer, handle, PACKET_STRING_SIZE);
-	deserialCopy(&buffer, packet->avatar, PACKET_STRING_SIZE);
+	deserializeCopy(&buffer, avatar, PACKET_STRING_SIZE);
 
 	//the owner
-	deserialCopy(&buffer, &packet->accountIndex, sizeof(int));
+	deserializeCopy(&buffer, &accountIndex, sizeof(int));
 
 	//location
-	deserialCopy(&buffer, &packet->roomIndex, sizeof(int));
+	deserializeCopy(&buffer, &roomIndex, sizeof(int));
+	deserializeCopy(&buffer, &origin.x, sizeof(double));
+	deserializeCopy(&buffer, &origin.y, sizeof(double));
+	deserializeCopy(&buffer, &motion.x, sizeof(double));
+	deserializeCopy(&buffer, &motion.y, sizeof(double));
 
-	deserialCopy(&buffer, &packet->origin.x, sizeof(double));
+	//stats structure
-	deserialCopy(&buffer, &packet->origin.y, sizeof(double));
+	deserializeCopyStatistics(&buffer, &stats);
 
-	deserialCopy(&buffer, &packet->motion.x, sizeof(double));
+	//TODO: gameplay components: equipment, items, buffs, debuffs
-	deserialCopy(&buffer, &packet->motion.y, sizeof(double));
-
-	deserialCopy(&buffer, &packet->bounds.x, sizeof(int));
-	deserialCopy(&buffer, &packet->bounds.y, sizeof(int));
-	deserialCopy(&buffer, &packet->bounds.w, sizeof(int));
-	deserialCopy(&buffer, &packet->bounds.h, sizeof(int));
-
-	//gameplay components: equipment, items, buffs, debuffs...
 }

common/network/packet_types/character_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,18 +19,56 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef CHARACTERPACKET_HPP_
+#define CHARACTERPACKET_HPP_
 
 #include "serial_packet_base.hpp"
 
-#include "bounding_box.hpp"
 #include "vector2.hpp"
+#include "statistics.hpp"
 
-struct CharacterPacket : SerialPacketBase {
+#include <cstring>
+
+class CharacterPacket : public SerialPacketBase {
+public:
+	CharacterPacket() {}
+	~CharacterPacket() {}
+
+	//indentity
+	int SetCharacterIndex(int i) { return characterIndex = i; }
+	const char* SetHandle(const char* s)
+	{ return strncpy(handle, s, PACKET_STRING_SIZE); }
+	const char* SetAvatar(const char* s)
+	{ return strncpy(handle, s, PACKET_STRING_SIZE); }
+
+	int SetAccountIndex(int i) { return accountIndex = i; }
+
+	int GetCharacterIndex() { return characterIndex; }
+	const char* GetHandle() { return handle; }
+	const char* GetAvatar() { return avatar; }
+
+	int GetAccountIndex() { return accountIndex; }
+
+	//location
+	int SetRoomIndex(int i) { return roomIndex = i; }
+	Vector2 SetOrigin(Vector2 v) { return origin = v; }
+	Vector2 SetMotion(Vector2 v) { return motion = v; }
+
+	int GetRoomIndex() { return roomIndex; }
+	Vector2 GetOrigin() { return origin; }
+	Vector2 GetMotion() { return motion; }
+
+	//gameplay
+	Statistics* GetStatistics() { return &stats; }
+
+	virtual void Serialize(void* buffer) override;
+	virtual void Deserialize(void* buffer) override;
+
+private:
 	//identify the character
 	int characterIndex;
-	char handle[PACKET_STRING_SIZE];
+	char handle[PACKET_STRING_SIZE+1];
-	char avatar[PACKET_STRING_SIZE];
+	char avatar[PACKET_STRING_SIZE+1];
 
 	//the owner
 	int accountIndex;
@@ -39,8 +77,11 @@ struct CharacterPacket : SerialPacketBase {
 	int roomIndex;
 	Vector2 origin;
 	Vector2 motion;
-	BoundingBox bounds;
+
+	//gameplay
+	Statistics stats;
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs
 };
 
-void serializeCharacter(void* buffer, CharacterPacket* packet);
+#endif
-void deserializeCharacter(void* buffer, CharacterPacket* packet);