That didn't go as well as I'd hoped

.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,37 +1,28 @@
 ## Outline
 
-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, with an emphasis on multiplayer cooperation, exploration and customization. The game runs on customizable public and private servers.
 
-This game is inspired by classic 2D RPGs (Final Fantasy, The Legend of Zelda), as well as more modern sandboxes 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 (Final Fantasy, The Legend of Zelda), as well as more modern sandboxes amd MMOs (Minecraft, EVE Online). This project is currently independently created and funded, with the goal of creating a game that will engage the players and inspire a large community.
 
 ## 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).
+The most recent stable build for Windows can be found [here](https://dl.dropboxusercontent.com/u/46669050/Tortuga.rar).
 
 ## Documentation
 
-* [Tortuga Wiki](https://github.com/Ratstail91/Tortuga/wiki) - Full documentation (incomplete)
+* [Tortuga Wiki](https://github.com/Ratstail91/Tortuga/wiki) - Full documentation
 * [Tortuga Bug Tracker](https://github.com/Ratstail91/Tortuga/issues) - A list of all known bugs and issues
 
 ## External Dependencies
 
-* [SDL 2.0](http://www.libsdl.org/) - Simple DirectMedia Layer API
-* [SDL_image 2.0](https://www.libsdl.org/projects/SDL_image/) - An SDL Extension for loading multiple image file formats
-* [SDL_net 2.0](http://www.libsdl.org/projects/SDL_net/) - SDL's networking extension
-* [SDL_ttf 2.0](https://www.libsdl.org/projects/SDL_ttf/) - An SDL extention for rendering fonts
+* [SDL 1.2](http://www.libsdl.org/) - Simple DirectMedia Layer API
+* [SDL_net 1.2](http://www.libsdl.org/projects/SDL_net/) - SDL's networking extension
 * [lua 5.2](http://www.lua.org/) - The lua programming language
 * [SQLite3](http://www.sqlite.org/) - A lightweight SQL database engine
 
 ## Tools
 
-* [WinRAR](http://www.rarlab.com/) - A free archive tool; needed for Windows distribution
-* [tar](http://www.gnu.org/software/tar/manual/) - The GNU archive tool; needed for Linux distribution
-* [Dropbox](https://www.dropbox.com/) - For hosting and distribution
-
-## Using and Including
-
-* [Coolvetica Typeface](http://typodermicfonts.com/coolvetica/)
+* [WinRAR](http://www.rarlab.com/) - The best compression tool available IMO; only needed for distribution
 
 ## Copyright
 
@@ -39,7 +30,7 @@ This game is inspired by classic 2D RPGs (Final Fantasy, The Legend of Zelda), a
 
 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-2015 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.
 
@@ -47,9 +38,4 @@ 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/)
+3. This notice may not be removed or altered from any source distribution.

README.txt

@@ -26,8 +26,8 @@ Instructions For Setup
 
 5. There are currently two options for 'client.avatar':
 
-* client.avatar = character1.png #male
-* client.avatar = character2.png #female
+* client.avatar = elliot2.bmp #male
+* client.avatar = coa2.bmp    #female
 
 6. When you've correctly set these values, run client.exe, and select 'Start'
 	from the main menu; this displays the list of available servers.

client/base_scene.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,85 +21,120 @@
 */
 #include "base_scene.hpp"
 
-SDL_Renderer* BaseScene::rendererHandle = nullptr;
+#include <stdexcept>
+
+//-------------------------
+//Static declarations
+//-------------------------
+
+SDL_Surface* BaseScene::screen = nullptr;
+
+//-------------------------
+//Public access members
+//-------------------------
 
 BaseScene::BaseScene() {
-	//EMPTY
+	//
 }
 
 BaseScene::~BaseScene() {
-	//EMPTY
-}
-
-void BaseScene::RenderFrame(SDL_Renderer* renderer) {
-	//EMPTY
-}
-
-void BaseScene::SetRenderer(SDL_Renderer* r) {
-	rendererHandle = r;
-}
-
-SDL_Renderer* BaseScene::GetRenderer() {
-	return rendererHandle;
-}
-
-void BaseScene::SetSceneSignal(SceneSignal signal) {
-	sceneSignal = signal;
-}
-
-SceneSignal BaseScene::GetSceneSignal() {
-	return sceneSignal;
+	//
 }
 
 //-------------------------
-//frame phases
+//Program control
 //-------------------------
 
-void BaseScene::FrameStart() {
-	//EMPTY
-}
-
-void BaseScene::Update() {
-	//EMPTY
-}
-
-void BaseScene::FrameEnd() {
-	//EMPTY
-}
-
-//-------------------------
-//input events
-//-------------------------
-
-void BaseScene::QuitEvent() {
-	sceneSignal = SceneSignal::QUIT;
-}
-
-void BaseScene::MouseMotion(SDL_MouseMotionEvent const& event) {
-	//EMPTY
-}
-
-void BaseScene::MouseButtonDown(SDL_MouseButtonEvent const& event) {
-	//EMPTY
-}
-
-void BaseScene::MouseButtonUp(SDL_MouseButtonEvent const& event) {
-	//EMPTY
-}
-
-void BaseScene::MouseWheel(SDL_MouseWheelEvent const& event) {
-	//EMPTY
-}
-
-void BaseScene::KeyDown(SDL_KeyboardEvent const& event) {
-	//preference as a default
-	switch(event.keysym.sym) {
-		case SDLK_ESCAPE:
-			QuitEvent();
-		break;
+SDL_Surface* BaseScene::SetScreen(int w, int h, int bpp, Uint32 flags) {
+	if (!bpp) {
+		bpp = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
 	}
+
+	screen = SDL_SetVideoMode(w, h, bpp, flags);
+
+	if (!screen) {
+		throw(std::runtime_error("Failed to create the screen surface"));
+	}
+
+	return screen;
 }
 
-void BaseScene::KeyUp(SDL_KeyboardEvent const& event) {
-	//EMPTY
+SDL_Surface* BaseScene::GetScreen() {
+	return screen;
+}
+
+SceneList BaseScene::SetNextScene(SceneList sceneIndex) {
+	return nextScene = sceneIndex;
+}
+
+SceneList BaseScene::GetNextScene() const {
+	return nextScene;
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void BaseScene::RunFrame() {
+	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/base_scene.hpp

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

client/channels.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -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/client_application.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -24,14 +24,21 @@
 #include "serial_packet.hpp"
 #include "config_utility.hpp"
 
-//for handling platforms
-#include "SDL2/SDL_syswm.h"
-#include "SDL2/SDL_version.h"
-
+#include <stdexcept>
 #include <chrono>
 #include <iostream>
-#include <sstream>
-#include <stdexcept>
+
+//-------------------------
+//Scene headers
+//-------------------------
+
+//Add the custom scene headers here
+#include "splash_screen.hpp"
+#include "main_menu.hpp"
+#include "options_menu.hpp"
+#include "lobby_menu.hpp"
+#include "in_world.hpp"
+#include "disconnected_screen.hpp"
 
 //-------------------------
 //Public access members
@@ -44,149 +51,57 @@ void ClientApplication::Init(int argc, char* argv[]) {
 	ConfigUtility& config = ConfigUtility::GetSingleton();
 	config.Load("rsc/config.cfg", false, argc, argv);
 
-	//-------------------------
-	//Initialize SDL
-	//-------------------------
-
-	if (SDL_Init(0)) {
-		std::ostringstream msg;
-		msg << "Failed to initialize SDL: " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//-------------------------
-	//create and check the window
-	//-------------------------
-
-	//get the config values
-	int w = config.Int("client.screen.w");
-	int h = config.Int("client.screen.h");
-	int f = config.Boolean("client.screen.f") ? SDL_WINDOW_FULLSCREEN : 0;
-
-	//BUG: fullscreen is disabled
-	f = 0;
-
-	//default sizes
-	w = w ? w : 800;
-	h = h ? h : 600;
-
-	window = SDL_CreateWindow(argv[0], SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, w, h, f);
-
-	if (!window) {
-		std::ostringstream msg;
-		msg << "Failed to create the window: " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-
-	std::cout << "Initialized the window" << std::endl;
-
-	//-------------------------
-	//DEBUG: detecting platforms, versions & appropriate fonts
-	//-------------------------
-
-	SDL_SysWMinfo windowInfo;
-	SDL_VERSION(&windowInfo.version);
-	if (SDL_GetWindowWMInfo(window, &windowInfo)) {
-		//
-		std::string platform;
-		std::string fontPath;
-
-		//get the info
-		switch(windowInfo.subsystem) {
-			case SDL_SYSWM_WINDOWS:
-				platform = "Microsoft Windows";
-			break;
-
-			case SDL_SYSWM_X11:
-				platform = "X Window System";
-			break;
-
-			//NOTE: OS X is currently unsupported, but it could be
-			case SDL_SYSWM_COCOA:
-				platform = "Apple OS X";
-			break;
-
-			default:
-				platform = "an unsupported platform";
-		}
-
-		//final output
-		std::cout << "SDL Version ";
-		std::cout << (int)windowInfo.version.major << ".";
-		std::cout << (int)windowInfo.version.minor << ".";
-		std::cout << (int)windowInfo.version.patch << " on ";
-		std::cout << platform << std::endl;
-	}
-	else {
-		std::ostringstream msg;
-		msg << "Failed to retrieve window info: " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//-------------------------
-	//create and check the renderer
-	//-------------------------
-
-	renderer = SDL_CreateRenderer(window, -1, 0);
-
-	if (!renderer) {
-		std::ostringstream msg;
-		msg << "Failed to create the renderer: " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//screen scaling
-	SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "best");
-	SDL_RenderSetLogicalSize(renderer, w, h);
-
-	//set the hook for the renderer
-	BaseScene::SetRenderer(renderer);
-
-	std::cout << "Initialized the renderer" << std::endl;
-
 	//-------------------------
 	//Initialize the APIs
 	//-------------------------
 
+	//initialize SDL
+	if (SDL_Init(SDL_INIT_VIDEO)) {
+		throw(std::runtime_error("Failed to initialize SDL"));
+	}
+	std::cout << "Initialized SDL" << std::endl;
+
 	//initialize SDL_net
 	if (SDLNet_Init()) {
-		std::ostringstream msg;
-		msg << "Failed to initialize SDL_net 2.0: " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
+		throw(std::runtime_error("Failed to initialize SDL_net"));
 	}
 	UDPNetworkUtility::GetSingleton().Open(0);
+	std::cout << "Initialized SDL_net" << std::endl;
 
-	std::cout << "Initialized SDL_net 2.0" << std::endl;
+	//-------------------------
+	//Setup the screen
+	//-------------------------
 
-	//setting up SDL2_ttf
-	if (TTF_Init()) {
-		std::ostringstream msg;
-		msg << "Failed to initialize SDL_ttf 2.0: " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
+	int w = config.Int("client.screen.w");
+	int h = config.Int("client.screen.h");
+	int f = config.Bool("client.screen.f") ? SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_FULLSCREEN : SDL_HWSURFACE|SDL_DOUBLEBUF;
 
-	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_INTERNAL_VAR(sizeof(Region::type_t));
-	DEBUG_INTERNAL_VAR(sizeof(Region));
-	DEBUG_INTERNAL_VAR(REGION_WIDTH);
-	DEBUG_INTERNAL_VAR(REGION_HEIGHT);
-	DEBUG_INTERNAL_VAR(REGION_DEPTH);
-	DEBUG_INTERNAL_VAR(REGION_TILE_FOOTPRINT);
-	DEBUG_INTERNAL_VAR(REGION_SOLID_FOOTPRINT);
-	DEBUG_INTERNAL_VAR(PACKET_STRING_SIZE);
-	DEBUG_INTERNAL_VAR(PACKET_BUFFER_SIZE);
-	DEBUG_INTERNAL_VAR(MAX_PACKET_SIZE);
-	DEBUG_INTERNAL_VAR(static_cast<int>(SerialPacketType::LAST));
+	DEBUG_OUTPUT_VAR(NETWORK_VERSION);
+	DEBUG_OUTPUT_VAR(sizeof(Region::type_t));
+	DEBUG_OUTPUT_VAR(sizeof(Region));
+	DEBUG_OUTPUT_VAR(REGION_WIDTH);
+	DEBUG_OUTPUT_VAR(REGION_HEIGHT);
+	DEBUG_OUTPUT_VAR(REGION_DEPTH);
+	DEBUG_OUTPUT_VAR(REGION_TILE_FOOTPRINT);
+	DEBUG_OUTPUT_VAR(REGION_SOLID_FOOTPRINT);
+	DEBUG_OUTPUT_VAR(PACKET_STRING_SIZE);
+	DEBUG_OUTPUT_VAR(PACKET_BUFFER_SIZE);
+	DEBUG_OUTPUT_VAR(MAX_PACKET_SIZE);
+	DEBUG_OUTPUT_VAR(static_cast<int>(SerialPacketType::LAST));
+
+#undef DEBUG_OUTPUT_VAR
 
 	//-------------------------
 	//finalize the startup
@@ -202,161 +117,87 @@ void ClientApplication::Init(int argc, char* argv[]) {
 }
 
 void ClientApplication::Proc() {
-	//load the first scene
-	ProcessSceneSignal(SceneSignal::FIRST);
+	LoadScene(SceneList::FIRST);
 
-	//fixed frame rate
+	//prepare the time system
 	typedef std::chrono::steady_clock Clock;
 
 	Clock::time_point simTime = Clock::now();
 	Clock::time_point realTime;
-	constexpr std::chrono::duration<int, std::milli> frameDelay(16); //~60FPS
 
-	//the game loop continues until the scenes signal QUIT
-	while(activeScene->GetSceneSignal() != SceneSignal::QUIT) {
-		//switch scenes if necessary
-		if(activeScene->GetSceneSignal() != SceneSignal::CONTINUE) {
-			ProcessSceneSignal(activeScene->GetSceneSignal());
+	//The main loop
+	while(activeScene->GetNextScene() != SceneList::QUIT) {
+		//switch scenes when necessary
+		if (activeScene->GetNextScene() != SceneList::CONTINUE) {
+			LoadScene(activeScene->GetNextScene());
 			continue;
 		}
 
 		//update the current time
 		realTime = Clock::now();
 
-		//simulate the game or give the machine a break
+		//simulate game time
 		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;
+			while (simTime < realTime) {
+				//call each user defined function
+				activeScene->RunFrame();
+				//~60 FPS
+				simTime += std::chrono::duration<int, std::milli>(16);
 			}
 		}
 		else {
-			SDL_Delay(1);
+			//give the machine a break
+			SDL_Delay(10);
 		}
 
-		SDL_RenderClear(renderer);
-		activeScene->RenderFrame(renderer);
-		SDL_RenderPresent(renderer);
+		//draw the game to the screen
+		activeScene->RenderFrame();
 	}
 
-	//cleanup
-	ClearScene();
+	UnloadScene();
 }
 
 void ClientApplication::Quit() {
-	//clean up after the program
 	std::cout << "Shutting down" << std::endl;
 	UDPNetworkUtility::GetSingleton().Close();
-	TTF_Quit();
 	SDLNet_Quit();
-	BaseScene::SetRenderer(nullptr);
-	SDL_DestroyRenderer(renderer);
-	SDL_DestroyWindow(window);
 	SDL_Quit();
 	std::cout << "Clean exit" << std::endl;
 }
 
 //-------------------------
-//Scene management
+//Private access members
 //-------------------------
 
-void ClientApplication::ProcessEvents() {
-	SDL_Event event;
-	while(SDL_PollEvent(&event)) {
-		switch(event.type) {
-			case SDL_QUIT:
-				activeScene->QuitEvent();
-			break;
-
-			case SDL_MOUSEMOTION:
-				activeScene->MouseMotion(event.motion);
-			break;
-
-			case SDL_MOUSEBUTTONDOWN:
-				activeScene->MouseButtonDown(event.button);
-			break;
-
-			case SDL_MOUSEBUTTONUP:
-				activeScene->MouseButtonUp(event.button);
-			break;
-
-			case SDL_MOUSEWHEEL:
-				activeScene->MouseWheel(event.wheel);
-			break;
-
-			case SDL_KEYDOWN:
-				activeScene->KeyDown(event.key);
-			break;
-
-			case SDL_KEYUP:
-				activeScene->KeyUp(event.key);
-			break;
-
-			//TODO: (9) joystick and controller events
-
-			//window events are handled internally
-			case SDL_WINDOWEVENT:
-				switch(event.window.event) {
-					case SDL_WINDOWEVENT_RESIZED:
-						SDL_RenderSetLogicalSize(renderer, event.window.data1, event.window.data2);
-					break;
-				}
-			break;
-		}
-	}
-}
-
-//Add the custom scene headers here
-#include "splash_screen.hpp"
-#include "main_menu.hpp"
-#include "options_menu.hpp"
-#include "lobby_menu.hpp"
-#include "world.hpp"
-#include "combat.hpp"
-#include "disconnected_screen.hpp"
-
-void ClientApplication::ProcessSceneSignal(SceneSignal signal) {
-	//BUG: #16 Resources are being reloaded between scenes
-	ClearScene();
-	switch(signal) {
+void ClientApplication::LoadScene(SceneList sceneIndex) {
+	UnloadScene();
+	switch(sceneIndex) {
 		//add scene creation calls here
-		case SceneSignal::FIRST:
-		case SceneSignal::SPLASHSCREEN:
-			activeScene = new SplashScreen(window);
+		case SceneList::FIRST:
+		case SceneList::SPLASHSCREEN:
+			activeScene = new SplashScreen();
 		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:
-			activeScene = new World(&clientIndex, &accountIndex);
+		case SceneList::INWORLD:
+			activeScene = new InWorld(&clientIndex, &accountIndex);
 		break;
-		case SceneSignal::COMBAT:
-			activeScene = new Combat(&clientIndex, &accountIndex);
-		break;
-		case SceneSignal::DISCONNECTEDSCREEN:
+		case SceneList::DISCONNECTEDSCREEN:
 			activeScene = new DisconnectedScreen();
 		break;
-		default: {
-			std::ostringstream msg;
-			msg << "Failed to recognize the scene signal: " << signal;
-			throw(std::logic_error(msg.str()));
-		}
+		default:
+			throw(std::logic_error("Failed to recognize the scene index"));
 	}
 }
 
-void ClientApplication::ClearScene() {
+void ClientApplication::UnloadScene() {
 	delete activeScene;
 	activeScene = nullptr;
 }

client/client_application.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,19 +19,21 @@
  * 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 "SDL2/SDL_net.h"
-#include "SDL2/SDL_ttf.h"
+#include "singleton.hpp"
+
+#include <map>
 
 class ClientApplication: public Singleton<ClientApplication> {
 public:
+	//public methods
 	void Init(int argc, char* argv[]);
 	void Proc();
 	void Quit();
@@ -42,18 +44,15 @@ private:
 	ClientApplication() = default;
 	~ClientApplication() = default;
 
-	//scene management
-	void ProcessEvents();
-	void ProcessSceneSignal(SceneSignal);
-	void ClearScene();
+	//Private access members
+	void LoadScene(SceneList sceneIndex);
+	void UnloadScene();
 
 	BaseScene* activeScene = nullptr;
 
-	//TODO: (9) build a "window" class?
-	SDL_Window* window = nullptr;
-	SDL_Renderer* renderer = nullptr;
-
-	//global scene parameters
+	//shared parameters
 	int clientIndex = -1;
 	int accountIndex = -1;
-};
+};
+
+#endif

client/client_utilities/ip_operators.cpp

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

client/client_utilities/ip_operators.hpp

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

client/client_utilities/makefile

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

client/client_utilities/terminal_error.cpp

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

client/client_utilities/terminal_error.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,13 +19,16 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef TERMINALERROR_HPP_
+#define TERMINALERROR_HPP_
 
 #include <stdexcept>
 #include <string>
 
-class fatal_error: public std::runtime_error {
+class terminal_error: public std::runtime_error {
 public:
-	explicit fatal_error(const std::string& str): runtime_error(str) {}
-	explicit fatal_error(const char* cstr): runtime_error(cstr) {}
+	explicit terminal_error(const std::string& str): runtime_error(str) {}
+	explicit terminal_error(const char* cstr): runtime_error(cstr) {}
 };
+
+#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,82 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "barrier_manager.hpp"
-
-void BarrierManager::DrawTo(SDL_Renderer* const dest, Sint16 x, Sint16 y, double scaleX, double scaleY) {
-	for (auto& it : barrierMap) {
-		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) {
-	barrierMap.emplace(index, BaseBarrier(baseImage, templateImages));
-	return &barrierMap[index];
-}
-
-void BarrierManager::Unload(int i) {
-	barrierMap.erase(i);
-}
-
-void BarrierManager::UnloadAll() {
-	barrierMap.clear();
-}
-
-int BarrierManager::Size() {
-	return barrierMap.size();
-}
-
-BaseBarrier* BarrierManager::Find(int i) {
-	std::map<int, BaseBarrier>::iterator it = barrierMap.find(i);
-
-	if (it == barrierMap.end()) {
-		return nullptr;
-	}
-
-	return &it->second;
-}
-
-std::map<int, BaseBarrier>* BarrierManager::GetContainer() {
-	return &barrierMap;
-}
-
-std::map<std::string, Image>* BarrierManager::GetTemplateContainer() {
-	return &templateImages;
-}

client/entities/barrier_manager.hpp

@@ -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.
-*/
-#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();
-
-	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> barrierMap;
-};

client/entities/base_barrier.cpp

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

client/entities/base_character.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,7 +21,6 @@
 */
 #include "base_character.hpp"
 
-//TODO: (3) remove this
 #include "config_utility.hpp"
 
 //-------------------------
@@ -31,16 +30,16 @@
 void BaseCharacter::CorrectSprite() {
 	//NOTE: These must correspond to the sprite sheet in use
 	if (motion.y > 0) {
-		sprite.SetIndexY(0);
+		sprite.SetYIndex(0);
 	}
 	else if (motion.y < 0) {
-		sprite.SetIndexY(1);
+		sprite.SetYIndex(1);
 	}
 	else if (motion.x > 0) {
-		sprite.SetIndexY(3);
+		sprite.SetYIndex(3);
 	}
 	else if (motion.x < 0) {
-		sprite.SetIndexY(2);
+		sprite.SetYIndex(2);
 	}
 
 	//animation
@@ -49,7 +48,7 @@ void BaseCharacter::CorrectSprite() {
 	}
 	else {
 		sprite.SetDelay(0);
-		sprite.SetIndexX(0);
+		sprite.SetXIndex(0);
 	}
 }
 
@@ -73,9 +72,9 @@ std::string BaseCharacter::GetHandle() const {
 	return handle;
 }
 
-std::string BaseCharacter::SetAvatar(SDL_Renderer* const renderer, std::string s) {
+std::string BaseCharacter::SetAvatar(std::string s) {
 	avatar = s;
-	sprite.Load(renderer, ConfigUtility::GetSingleton()["dir.sprites"] + avatar, CHARACTER_CELLS_X, CHARACTER_CELLS_Y);
+	sprite.LoadSurface(ConfigUtility::GetSingleton()["dir.sprites"] + avatar, CHARACTER_CELLS_X, CHARACTER_CELLS_Y);
 	return avatar;
 }
 

client/entities/base_character.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,7 +19,8 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef BASECHARACTER_HPP_
+#define BASECHARACTER_HPP_
 
 //components
 #include "character_defines.hpp"
@@ -41,7 +42,7 @@ public:
 	int GetOwner();
 	std::string SetHandle(std::string s);
 	std::string GetHandle() const;
-	std::string SetAvatar(SDL_Renderer* const, std::string s);
+	std::string SetAvatar(std::string s);
 	std::string GetAvatar() const;
 
 protected:
@@ -50,3 +51,5 @@ protected:
 	std::string handle;
 	std::string avatar;
 };
+
+#endif

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_monster.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,6 +19,5 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "fatal_error.hpp"
+#include "base_monster.hpp"
 
-//DOCS: This empty file is used to force an object file

client/entities/base_monster.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,14 +19,18 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef BASEMONSTER_HPP_
+#define BASEMONSTER_HPP_
 
-enum SceneSignal {
-	//reserved members for internal use
-	QUIT = -1,
-	CONTINUE = 0,
-	FIRST = 1,
+#include "entity.hpp"
 
-	//custom scenes
-	EXAMPLE_SCENE
-};
+class BaseMonster: public Entity {
+public:
+	BaseMonster() = default;
+	virtual ~BaseMonster() = default;
+
+protected:
+	//
+};
+
+#endif

client/entities/entity.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -26,8 +26,8 @@ void Entity::Update() {
 	sprite.Update(0.016);
 }
 
-void Entity::DrawTo(SDL_Renderer* const renderer, int camX, int camY) {
-	sprite.DrawTo(renderer, origin.x - camX, origin.y - camY);
+void Entity::DrawTo(SDL_Surface* const dest, int camX, int camY) {
+	sprite.DrawTo(dest, origin.x - camX, origin.y - camY);
 }
 
 SpriteSheet* Entity::GetSprite() {
@@ -50,14 +50,14 @@ BoundingBox Entity::SetBounds(BoundingBox b) {
 	return bounds = b;
 }
 
-Vector2 Entity::GetOrigin() const {
+Vector2 Entity::GetOrigin() {
 	return origin;
 }
 
-Vector2 Entity::GetMotion() const {
+Vector2 Entity::GetMotion() {
 	return motion;
 }
 
-BoundingBox Entity::GetBounds() const {
+BoundingBox Entity::GetBounds() {
 	return bounds;
 }

client/entities/entity.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,18 +19,18 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef ENTITY_HPP_
+#define ENTITY_HPP_
 
 #include "bounding_box.hpp"
 #include "sprite_sheet.hpp"
 #include "vector2.hpp"
 
 //The base class for all objects in the world
-//TODO: (9) write a better hierarchy
 class Entity {
 public:
 	virtual void Update();
-	virtual void DrawTo(SDL_Renderer* const, int camX, int camY);
+	virtual void DrawTo(SDL_Surface* const, int camX, int camY);
 
 	SpriteSheet* GetSprite();
 
@@ -39,9 +39,9 @@ public:
 	Vector2 SetMotion(Vector2 v);
 	BoundingBox SetBounds(BoundingBox b);
 
-	Vector2 GetOrigin() const;
-	Vector2 GetMotion() const;
-	BoundingBox GetBounds() const;
+	Vector2 GetOrigin();
+	Vector2 GetMotion();
+	BoundingBox GetBounds();
 
 protected:
 	Entity() = default;
@@ -52,3 +52,5 @@ protected:
 	Vector2 motion;
 	BoundingBox bounds;
 };
+
+#endif

client/entities/local_character.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -23,14 +23,54 @@
 
 #include <iostream>
 
-bool LocalCharacter::ProcessCollisionGrid(std::list<BoundingBox> boxList) {
+bool LocalCharacter::ProcessCollisionGrid(std::list<BoundingBox> boxList, Uint8* keyState) {
+	//skip this if there's no movement
+	if (motion == 0) {
+		return false;
+	}
+
+	//determine the simple movement based on input
+	Vector2 newMotion = {0, 0};
+	if (keyState[SDLK_w]) {
+		newMotion.y -= CHARACTER_WALKING_SPEED;
+	}
+	if (keyState[SDLK_a]) {
+		newMotion.x -= CHARACTER_WALKING_SPEED;
+	}
+	if (keyState[SDLK_s]) {
+		newMotion.y += CHARACTER_WALKING_SPEED;
+	}
+	if (keyState[SDLK_d]) {
+		newMotion.x += CHARACTER_WALKING_SPEED;
+	}
+
+	bool ret = false;
+
 	for(auto& box : boxList) {
-		if (box.CheckOverlap(origin + bounds)) {
-			//TODO: (9) write a better collision system
-			origin -= motion;
-			motion = {0, 0};
-			return true;
+		if (box.CheckCollision(origin + bounds)) {
+			//push the character to the closest non-contact position
+			Vector2 shift = box.CalcShift(origin + bounds);
+			origin += shift;
+
+			//set any motion in that direction to zero
+			if (shift.x != 0) {
+				newMotion.x = 0;
+			}
+			if (shift.y != 0) {
+				newMotion.y = 0;
+			}
+			ret = true;
 		}
 	}
-	return false;
+
+	//handle diagonals
+	if (newMotion.x != 0 && newMotion.y != 0) {
+		newMotion *= CHARACTER_WALKING_MOD;
+	}
+
+	//set the new motion
+	motion = newMotion;
+
+	//signal for updates
+	return ret;
 }

client/entities/local_character.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,7 +19,8 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef LOCALCHARACTER_HPP_
+#define LOCALCHARACTER_HPP_
 
 #include "base_character.hpp"
 #include "bounding_box.hpp"
@@ -32,8 +33,10 @@ public:
 	LocalCharacter() = default;
 	virtual ~LocalCharacter() = default;
 
-	bool ProcessCollisionGrid(std::list<BoundingBox>);
+	bool ProcessCollisionGrid(std::list<BoundingBox>, Uint8* keyState);
 
 private:
 	//NOTE: NO MEMBERS
 };
+
+#endif

client/entities/makefile

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

client/gameplay_scenes/in_world.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,7 +19,8 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef INWORLD_HPP_
+#define INWORLD_HPP_
 
 //maps
 #include "region_pager_base.hpp"
@@ -31,103 +32,82 @@
 
 //graphics
 #include "image.hpp"
+#include "raster_font.hpp"
 #include "button.hpp"
 #include "tile_sheet.hpp"
-#include "text_line.hpp"
 
 //common
 #include "frame_rate.hpp"
 
 //client
-#include "barrier_manager.hpp"
 #include "base_scene.hpp"
-#include "base_barrier.hpp"
-#include "base_creature.hpp"
+#include "base_monster.hpp"
 #include "local_character.hpp"
 
-#include "SDL2/SDL.h"
-#include "SDL2/SDL_net.h"
-#include "SDL2/SDL_ttf.h"
-
 //STL
 #include <map>
 
 #include <chrono>
 
-class World: public BaseScene {
+class InWorld : public BaseScene {
 public:
 	//Public access members
-	World(int* const argClientIndex, int* const argAccountIndex);
-	~World();
+	InWorld(int* const argClientIndex, int* const argAccountIndex);
+	~InWorld();
 
-	void RenderFrame(SDL_Renderer* renderer) override;
+protected:
+	//Frame loop
+	void FrameStart();
+	void Update();
+	void FrameEnd();
+	void RenderFrame();
+	void Render(SDL_Surface* const);
 
-private:
-	//frame phases
-	void FrameStart() override;
-	void Update() override;
-	void FrameEnd() override;
-
-	//input events
+	//Event handlers
 	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;
+	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&);
 
-	//handle incoming traffic
+	//Basic connections
 	void HandlePacket(SerialPacket* const);
+	void HandlePing(ServerPacket* const);
+	void HandlePong(ServerPacket* const);
 
-	//heartbeat system
-	void hPing(ServerPacket* const);
-	void hPong(ServerPacket* const);
+	//Connection control
+	void SendLogoutRequest();
+	void SendDisconnectRequest();
+	void SendShutdownRequest();
+
+	void HandleLogoutResponse(ClientPacket* const);
+	void HandleDisconnectResponse(ClientPacket* const);
+	void HandleDisconnectForced(ClientPacket* 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 HandleRegionContent(RegionPacket* const);
 	void UpdateMap();
 
 	//character management
-	void hCharacterUpdate(CharacterPacket* const);
-	void hCharacterCreate(CharacterPacket* const);
-	void hCharacterUnload(CharacterPacket* const);
-	void hQueryCharacterExists(CharacterPacket* const);
-	void hCharacterMovement(CharacterPacket* const);
+	void HandleCharacterCreate(CharacterPacket* const);
+	void HandleCharacterDelete(CharacterPacket* const);
+	void HandleCharacterQueryExists(CharacterPacket* const);
+	void HandleCharacterMovement(CharacterPacket* const);
+	void HandleCharacterAttack(CharacterPacket* const);
 
-	//creature management
-	void hCreatureUpdate(CreaturePacket* const);
-	void hCreatureCreate(CreaturePacket* const);
-	void hCreatureUnload(CreaturePacket* const);
-	void hQueryCreatureExists(CreaturePacket* const);
-	void hCreatureMovement(CreaturePacket* const);
+	//monster management
+	void HandleMonsterCreate(MonsterPacket* const);
+	void HandleMonsterDelete(MonsterPacket* const);
+	void HandleMonsterQueryExists(MonsterPacket* const);
+	void HandleMonsterMovement(MonsterPacket* const);
+	void HandleMonsterAttack(MonsterPacket* 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
+	//player movement
+	void ProcessLocalCharacterMovement();
 	void SendLocalCharacterMovement();
 	std::list<BoundingBox> GenerateCollisionGrid(Entity*, int tileWidth, int tileHeight);
 
@@ -138,18 +118,17 @@ private:
 	int roomIndex = -1;
 
 	//graphics
+	Image buttonImage;
+	RasterFont font;
 	TileSheet tileSheet;
 
 	//map
 	RegionPagerBase regionPager;
 
 	//UI
-	Image buttonImage;
-	TTF_Font* font = nullptr;
 	Button disconnectButton;
-	Button shutdownButton;
+	Button shutDownButton;
 	FrameRate fps;
-	TextLine fpsTextLine;
 
 	//the camera structure
 	struct {
@@ -159,13 +138,12 @@ private:
 	} camera;
 
 	//entities
-	BarrierManager barrierMgr;
 	std::map<int, BaseCharacter> characterMap;
-	std::map<int, BaseCreature> creatureMap;
+	std::map<int, BaseMonster> monsterMap;
 	LocalCharacter* localCharacter = nullptr;
 
 	//heartbeat
-	//TODO: (2) Heartbeat needs it's own utility
+	//TODO: Heartbeat needs it's own utility
 	typedef std::chrono::steady_clock Clock;
 	Clock::time_point lastBeat = Clock::now();
 	int attemptedBeats = 0;
@@ -173,4 +151,7 @@ private:
 	//ugly references; I hate this
 	ConfigUtility& config = ConfigUtility::GetSingleton();
 	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
+	Uint8* keyState = nullptr;
 };
+
+#endif

client/gameplay_scenes/in_world_entities.cpp

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

client/gameplay_scenes/in_world_networking.cpp

@@ -0,0 +1,264 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "in_world.hpp"
+
+#include "channels.hpp"
+#include "ip_operators.hpp"
+#include "terminal_error.hpp"
+
+#include <chrono>
+#include <sstream>
+#include <stdexcept>
+
+//-------------------------
+//Basic connections
+//-------------------------
+
+void InWorld::HandlePacket(SerialPacket* const argPacket) {
+	switch(argPacket->type) {
+		//heartbeat system
+		case SerialPacketType::PING:
+			HandlePing(static_cast<ServerPacket*>(argPacket));
+		break;
+		case SerialPacketType::PONG:
+			HandlePong(static_cast<ServerPacket*>(argPacket));
+		break;
+
+		//game server connections
+		case SerialPacketType::LOGOUT_RESPONSE:
+			HandleLogoutResponse(static_cast<ClientPacket*>(argPacket));
+		break;
+		case SerialPacketType::DISCONNECT_RESPONSE:
+			HandleDisconnectResponse(static_cast<ClientPacket*>(argPacket));
+		break;
+		case SerialPacketType::DISCONNECT_FORCED:
+			HandleDisconnectForced(static_cast<ClientPacket*>(argPacket));
+		break;
+
+		//map management
+		case SerialPacketType::REGION_CONTENT:
+			HandleRegionContent(static_cast<RegionPacket*>(argPacket));
+		break;
+
+		//character management
+		case SerialPacketType::CHARACTER_CREATE:
+			HandleCharacterCreate(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::CHARACTER_DELETE:
+			HandleCharacterDelete(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::QUERY_CHARACTER_EXISTS:
+			HandleCharacterQueryExists(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::CHARACTER_MOVEMENT:
+			HandleCharacterMovement(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::CHARACTER_ATTACK:
+			HandleCharacterAttack(static_cast<CharacterPacket*>(argPacket));
+		break;
+
+		//monster management
+		case SerialPacketType::MONSTER_CREATE:
+			HandleMonsterCreate(static_cast<MonsterPacket*>(argPacket));
+		break;
+		case SerialPacketType::MONSTER_DELETE:
+			HandleMonsterDelete(static_cast<MonsterPacket*>(argPacket));
+		break;
+		case SerialPacketType::QUERY_MONSTER_EXISTS:
+			HandleMonsterQueryExists(static_cast<MonsterPacket*>(argPacket));
+		break;
+		case SerialPacketType::MONSTER_MOVEMENT:
+			HandleMonsterMovement(static_cast<MonsterPacket*>(argPacket));
+		break;
+		case SerialPacketType::MONSTER_ATTACK:
+			HandleMonsterAttack(static_cast<MonsterPacket*>(argPacket));
+		break;
+
+		//rejection messages
+		case SerialPacketType::REGION_REJECTION:
+		case SerialPacketType::CHARACTER_REJECTION:
+			throw(terminal_error(static_cast<TextPacket*>(argPacket)->text));
+		break;
+		case SerialPacketType::SHUTDOWN_REJECTION:
+			throw(std::runtime_error(static_cast<TextPacket*>(argPacket)->text));
+		break;
+
+		//errors
+		default: {
+			std::ostringstream msg;
+			msg << "Unknown SerialPacketType encountered in InWorld: " << static_cast<int>(argPacket->type);
+			throw(std::runtime_error(msg.str()));
+		}
+		break;
+	}
+}
+
+void InWorld::HandlePing(ServerPacket* const argPacket) {
+	ServerPacket newPacket;
+	newPacket.type = SerialPacketType::PONG;
+	network.SendTo(argPacket->srcAddress, &newPacket);
+}
+
+void InWorld::HandlePong(ServerPacket* const argPacket) {
+	if (*network.GetIPAddress(Channels::SERVER) != argPacket->srcAddress) {
+		throw(std::runtime_error("Heartbeat message received from an unknown source"));
+	}
+	attemptedBeats = 0;
+	lastBeat = Clock::now();
+}
+
+//-------------------------
+//Connection control
+//-------------------------
+
+void InWorld::SendLogoutRequest() {
+	ClientPacket newPacket;
+
+	//send a logout request
+	newPacket.type = SerialPacketType::LOGOUT_REQUEST;
+	newPacket.accountIndex = accountIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::SendDisconnectRequest() {
+	ClientPacket newPacket;
+
+	//send a disconnect request
+	newPacket.type = SerialPacketType::DISCONNECT_REQUEST;
+	newPacket.clientIndex = clientIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::SendShutdownRequest() {
+	ClientPacket newPacket;
+
+	//send a shutdown request
+	newPacket.type = SerialPacketType::SHUTDOWN_REQUEST;
+	newPacket.accountIndex = accountIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::HandleLogoutResponse(ClientPacket* const argPacket) {
+	if (localCharacter) {
+		characterMap.erase(characterIndex);
+		localCharacter = nullptr;
+	}
+
+	accountIndex = -1;
+	characterIndex = -1;
+
+	//reset the camera
+	camera.marginX = camera.marginY = 0;
+
+	//because, why not? I guess...
+	SendDisconnectRequest();
+}
+
+void InWorld::HandleDisconnectResponse(ClientPacket* const argPacket) {
+	HandleLogoutResponse(argPacket);//shortcut
+	SetNextScene(SceneList::DISCONNECTEDSCREEN);
+	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have successfully logged out";
+}
+
+void InWorld::HandleDisconnectForced(ClientPacket* const argPacket) {
+	HandleDisconnectResponse(argPacket);//shortcut
+	SetNextScene(SceneList::DISCONNECTEDSCREEN);
+	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have been forcibly disconnected by the server";
+}
+
+void InWorld::CheckHeartBeat() {
+	//check the connection (heartbeat)
+	if (Clock::now() - lastBeat > std::chrono::seconds(3)) {
+		if (attemptedBeats > 2) {
+			//escape to the disconnect screen
+			SendDisconnectRequest();
+			SetNextScene(SceneList::DISCONNECTEDSCREEN);
+			ConfigUtility::GetSingleton()["client.disconnectMessage"] = "Error: Lost connection to the server";
+		}
+		else {
+			ServerPacket newPacket;
+			newPacket.type = SerialPacketType::PING;
+			network.SendTo(Channels::SERVER, &newPacket);
+
+			attemptedBeats++;
+			lastBeat = Clock::now();
+		}
+	}
+}
+
+//-------------------------
+//map management
+//-------------------------
+
+void InWorld::SendRegionRequest(int roomIndex, int x, int y) {
+	RegionPacket packet;
+
+	//pack the region's data
+	packet.type = SerialPacketType::REGION_REQUEST;
+	packet.roomIndex = roomIndex;
+	packet.x = x;
+	packet.y = y;
+
+	network.SendTo(Channels::SERVER, &packet);
+}
+
+void InWorld::HandleRegionContent(RegionPacket* const argPacket) {
+	//replace existing regions
+	regionPager.UnloadIf([&](Region const& region) -> bool {
+		return region.GetX() == argPacket->x && region.GetY() == argPacket->y;
+	});
+	regionPager.PushRegion(argPacket->region);
+
+	//clean up after the serial code
+	delete argPacket->region;
+	argPacket->region = nullptr;
+}
+
+void InWorld::UpdateMap() {
+	if (roomIndex == -1) {
+		return;
+	}
+
+	//these represent the zone of regions that the client needs loaded, including the mandatory buffers (+1/-1)
+	int xStart = snapToBase(REGION_WIDTH, camera.x/tileSheet.GetTileW()) - REGION_WIDTH;
+	int xEnd = snapToBase(REGION_WIDTH, (camera.x+camera.width)/tileSheet.GetTileW()) + REGION_WIDTH;
+
+	int yStart = snapToBase(REGION_HEIGHT, camera.y/tileSheet.GetTileH()) - REGION_HEIGHT;
+	int yEnd = snapToBase(REGION_HEIGHT, (camera.y+camera.height)/tileSheet.GetTileH()) + REGION_HEIGHT;
+
+	//prune distant regions
+	regionPager.GetContainer()->remove_if([&](Region const& region) -> bool {
+		return region.GetX() < xStart || region.GetX() > xEnd || region.GetY() < yStart || region.GetY() > yEnd;
+	});
+
+	//request empty regions within this zone
+	for (int i = xStart; i <= xEnd; i += REGION_WIDTH) {
+		for (int j = yStart; j <= yEnd; j += REGION_HEIGHT) {
+			if (!regionPager.FindRegion(i, j)) {
+				SendRegionRequest(roomIndex, i, j);
+			}
+		}
+	}
+}

client/gameplay_scenes/in_world_scene.cpp

@@ -0,0 +1,253 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "in_world.hpp"
+
+#include "channels.hpp"
+
+#include "terminal_error.hpp"
+#include <stdexcept>
+#include <algorithm>
+#include <cmath>
+#include <iostream>
+#include <sstream>
+
+//-------------------------
+//Public access members
+//-------------------------
+
+InWorld::InWorld(int* const argClientIndex,	int* const argAccountIndex):
+	clientIndex(*argClientIndex),
+	accountIndex(*argAccountIndex),
+	keyState(SDL_GetKeyState(nullptr))
+{
+	//setup the utility objects
+	buttonImage.LoadSurface(config["dir.interface"] + "button_menu.bmp");
+	buttonImage.SetClipH(buttonImage.GetClipH()/3);
+	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+
+	//pass the utility objects
+	disconnectButton.SetImage(&buttonImage);
+	disconnectButton.SetFont(&font);
+	shutDownButton.SetImage(&buttonImage);
+	shutDownButton.SetFont(&font);
+
+	//set the button positions
+	disconnectButton.SetX(50);
+	disconnectButton.SetY(50 + buttonImage.GetClipH() * 0);
+	shutDownButton.SetX(50);
+	shutDownButton.SetY(50 + buttonImage.GetClipH() * 1);
+
+	//set the button texts
+	disconnectButton.SetText("Disconnect");
+	shutDownButton.SetText("Shut Down");
+
+	//load the tilesheet
+	//TODO: add the tilesheet to the map system
+	//TODO: Tile size and tile sheet should be loaded elsewhere
+	tileSheet.Load(config["dir.tilesets"] + "overworld.bmp", 32, 32);
+
+	//Send the character data
+	//TODO: login scene, prompt, etc.
+	CharacterPacket newPacket;
+	newPacket.type = SerialPacketType::CHARACTER_LOAD;
+	strncpy(newPacket.handle, config["client.handle"].c_str(), PACKET_STRING_SIZE);
+	strncpy(newPacket.avatar, config["client.avatar"].c_str(), PACKET_STRING_SIZE);
+	newPacket.accountIndex = accountIndex;
+	network.SendTo(Channels::SERVER, &newPacket);
+
+	//query the world state
+	memset(&newPacket, 0, MAX_PACKET_SIZE);
+	newPacket.type = SerialPacketType::QUERY_CHARACTER_EXISTS;
+	network.SendTo(Channels::SERVER, &newPacket);
+
+	//set the camera's values
+	camera.width = GetScreen()->w;
+	camera.height = GetScreen()->h;
+
+	//debug
+	//
+}
+
+InWorld::~InWorld() {
+	//unload the local data
+	characterMap.clear();
+	monsterMap.clear();
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void InWorld::FrameStart() {
+	//
+}
+
+void InWorld::Update() {
+	//create and zero the buffer
+	SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]);
+	memset(packetBuffer, 0, MAX_PACKET_SIZE);
+
+	try {
+		//suck in and process all waiting packets
+		while(network.Receive(packetBuffer)) {
+			HandlePacket(packetBuffer);
+		}
+	}
+	catch(terminal_error& e) {
+		throw(e);
+	}
+	catch(std::exception& e) {
+		std::cerr << "HandlePacket Error: " << e.what() << std::endl;
+	}
+
+	//free the buffer
+	delete reinterpret_cast<char*>(packetBuffer);
+
+	//heartbeat system
+	CheckHeartBeat();
+
+	//update all entities
+	for (auto& it : characterMap) {
+		it.second.Update();
+	}
+	for (auto& it : monsterMap) {
+		it.second.Update();
+	}
+
+	//update the map
+	UpdateMap();
+
+	//skip the rest without a local character
+	if (!localCharacter) {
+		return;
+	}
+
+	//get the collidable boxes
+	std::list<BoundingBox> boxList = GenerateCollisionGrid(localCharacter, tileSheet.GetTileW(), tileSheet.GetTileH());
+
+	//process the collisions
+	if (localCharacter->ProcessCollisionGrid(boxList, keyState)) {
+		localCharacter->CorrectSprite();
+		SendLocalCharacterMovement();
+	}
+
+	//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 the entities
+	for (auto& it : characterMap) {
+		//TODO: depth ordering
+		it.second.DrawTo(screen, camera.x, camera.y);
+	}
+	for (auto& it : monsterMap) {
+		//TODO: depth ordering
+		it.second.DrawTo(screen, camera.x, camera.y);
+	}
+
+	//draw UI
+	disconnectButton.DrawTo(screen);
+	shutDownButton.DrawTo(screen);
+	std::ostringstream msg;
+	msg << fps.GetFrameRate();
+	font.DrawStringTo(msg.str(), screen, 0, 0);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void InWorld::QuitEvent() {
+	//two-step logout
+	SendDisconnectRequest();
+	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 && button.button == SDL_BUTTON_LEFT) {
+		SendLogoutRequest();
+	}
+	if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER && button.button == SDL_BUTTON_LEFT) {
+		SendShutdownRequest();
+	}
+}
+
+void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
+	//hotkeys & player input
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+			//TODO: the escape key should actually control menus and stuff
+			SendLogoutRequest();
+		return;
+		case SDLK_w:
+		case SDLK_a:
+		case SDLK_s:
+		case SDLK_d:
+			ProcessLocalCharacterMovement();
+		break;
+		default:
+			//DOCS: prevents wrong keys screwing with character movement
+			return;
+	}
+}
+
+void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
+	switch(key.keysym.sym) {
+		case SDLK_w:
+		case SDLK_a:
+		case SDLK_s:
+		case SDLK_d:
+			ProcessLocalCharacterMovement();
+		break;
+		default:
+			//DOCS: prevents wrong keys screwing with character movement
+			return;
+	}
+}

client/gameplay_scenes/makefile

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

client/main.cpp

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

client/makefile

@@ -1,20 +1,16 @@
 #include directories
-INCLUDES+=. entities scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
+INCLUDES+=. client_utilities entities gameplay_scenes menu_scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
 
 #libraries
 #the order of the $(LIBS) is important, at least for MinGW
-LIBS+=client.a ../common/libcommon.a -lSDL2_net
+LIBS+=client.a ../libcommon.a -lSDL_net
 ifeq ($(OS),Windows_NT)
 	LIBS+=-lwsock32 -liphlpapi -lmingw32
 endif
-LIBS+=-lSDL2main -lSDL2 -lSDL2_image -lSDL2_ttf
+LIBS+=-lSDLmain -lSDL
 
 #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,8 +25,10 @@ OUT=$(addprefix $(OUTDIR)/,client)
 
 #targets
 all: $(OBJ) $(OUT)
+	$(MAKE) -C client_utilities
 	$(MAKE) -C entities
-	$(MAKE) -C scenes
+	$(MAKE) -C gameplay_scenes
+	$(MAKE) -C menu_scenes
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)
@@ -47,12 +45,6 @@ $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
 clean:
-ifeq ($(OS),Windows_NT)
 	$(RM) *.o *.a *.exe
-else ifeq ($(shell uname), Linux)
-	find . -type f -name *.o -exec rm -f -r -v {} \;
-	find . -type f -name *.a -exec rm -f -r -v {} \;
-	rm -f -v out/client out/server
-endif
 
 rebuild: clean all

client/menu_scenes/disconnected_screen.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -25,7 +25,6 @@
 #include "config_utility.hpp"
 #include "udp_network_utility.hpp"
 
-#include <sstream>
 #include <stdexcept>
 
 //-------------------------
@@ -36,27 +35,20 @@ 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);
+	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
+	image.SetClipH(image.GetClipH()/3);
+	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
 
-	//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);
+	//pass the utility objects
+	backButton.SetImage(&image);
+	backButton.SetFont(&font);
 
 	//set the button positions
 	backButton.SetX(50);
-	backButton.SetY(50);
+	backButton.SetY(50 + image.GetClipH() * 0);
 
-	//set the disconnection message text
-	textLine.SetText(GetRenderer(), font, config["client.disconnectMessage"], {255, 255, 255, 255});
+	//set the button texts
+	backButton.SetText("Back");
 
 	//full reset
 	UDPNetworkUtility::GetSingleton().Unbind(Channels::SERVER);
@@ -66,65 +58,59 @@ DisconnectedScreen::DisconnectedScreen() {
 }
 
 DisconnectedScreen::~DisconnectedScreen() {
-	TTF_CloseFont(font);
+	//
 }
 
 //-------------------------
 //Frame loop
 //-------------------------
 
-void DisconnectedScreen::FrameStart() {
-	//
-}
-
 void DisconnectedScreen::Update() {
 	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(10)) {
-		SetSceneSignal(SceneSignal::MAINMENU);
+		SetNextScene(SceneList::MAINMENU);
 	}
 
 	//Eat incoming packets
 	while(UDPNetworkUtility::GetSingleton().Receive());
 }
 
-void DisconnectedScreen::FrameEnd() {
-	//
-}
+void DisconnectedScreen::Render(SDL_Surface* const screen) {
+	ConfigUtility& config = ConfigUtility::GetSingleton();
 
-void DisconnectedScreen::RenderFrame(SDL_Renderer* renderer) {
-	backButton.DrawTo(renderer);
-	textLine.DrawTo(renderer, 50, 30);
+	backButton.DrawTo(screen);
+	font.DrawStringTo(config["client.disconnectMessage"], screen, 50, 30);
 }
 
 //-------------------------
 //Event handlers
 //-------------------------
 
-void DisconnectedScreen::MouseMotion(SDL_MouseMotionEvent const& event) {
-	backButton.MouseMotion(event);
+void DisconnectedScreen::QuitEvent() {
+	SetNextScene(SceneList::QUIT);
 }
 
-void DisconnectedScreen::MouseButtonDown(SDL_MouseButtonEvent const& event) {
-	backButton.MouseButtonDown(event);
+void DisconnectedScreen::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	backButton.MouseMotion(motion);
 }
 
-void DisconnectedScreen::MouseButtonUp(SDL_MouseButtonEvent const& event) {
-	if (backButton.MouseButtonUp(event) == Button::State::RELEASED) {
-		SetSceneSignal(SceneSignal::MAINMENU);
+void DisconnectedScreen::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	backButton.MouseButtonDown(button);
+}
+
+void DisconnectedScreen::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
+		SetNextScene(SceneList::MAINMENU);
 	}
 }
 
-void DisconnectedScreen::MouseWheel(SDL_MouseWheelEvent const& event) {
-	//
-}
-
-void DisconnectedScreen::KeyDown(SDL_KeyboardEvent const& event) {
-	switch(event.keysym.sym) {
+void DisconnectedScreen::KeyDown(SDL_KeyboardEvent const& key) {
+	switch(key.keysym.sym) {
 		case SDLK_ESCAPE:
-			SetSceneSignal(SceneSignal::MAINMENU);
+			SetNextScene(SceneList::MAINMENU);
 		break;
 	}
 }
 
-void DisconnectedScreen::KeyUp(SDL_KeyboardEvent const& event) {
+void DisconnectedScreen::KeyUp(SDL_KeyboardEvent const& key) {
 	//
 }

client/menu_scenes/disconnected_screen.hpp

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

client/menu_scenes/lobby_menu.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -23,7 +23,6 @@
 
 #include "channels.hpp"
 
-#include <cstring>
 #include <stdexcept>
 #include <sstream>
 
@@ -40,37 +39,33 @@ LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
 	accountIndex = -1;
 
 	//setup the utility objects
-	buttonImage.Load(GetRenderer(), config["dir.interface"] + "button_blue.png");
-	font = TTF_OpenFont(config["client.font"].c_str(), 12);
+	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
+	image.SetClipH(image.GetClipH()/3);
+	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
 
-	//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()));
-	}
+	//pass the utility objects
+	search.SetImage(&image);
+	search.SetFont(&font);
+	join.SetImage(&image);
+	join.SetFont(&font);
+	back.SetImage(&image);
+	back.SetFont(&font);
 
-	//setup the buttons
-	searchButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	searchButton.SetText(GetRenderer(), font, "Search", COLOR_WHITE);
-	joinButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	joinButton.SetText(GetRenderer(), font, "Join", COLOR_WHITE);
-	backButton.SetBackgroundTexture(GetRenderer(), buttonImage.GetTexture());
-	backButton.SetText(GetRenderer(), font, "Back", COLOR_WHITE);
+	//set the button positions
+	search.SetX(50);
+	search.SetY(50 + image.GetClipH() * 0);
+	join.SetX(50);
+	join.SetY(50 + image.GetClipH() * 1);
+	back.SetX(50);
+	back.SetY(50 + image.GetClipH() * 2);
 
-	//set the button positions (assumed)
-	searchButton.SetX(50);
-	searchButton.SetY(50);
-	joinButton.SetX(50);
-	joinButton.SetY(70);
-	backButton.SetX(50);
-	backButton.SetY(90);
+	//set the button texts
+	search.SetText("Search");
+	join.SetText("Join");
+	back.SetText("Back");
 
-	//pseudo-list selection
-	boundingBox = {300, 50, 200, 12};
-
-	//hacked together a highlight box
-	highlightImage.Create(GetRenderer(), 300, 12, {49, 150, 5, 255});
+	//set the server list's position
+	listBox = {300, 50, 200, font.GetCharH()};
 
 	//Eat incoming packets
 	while(network.Receive());
@@ -80,7 +75,7 @@ LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
 }
 
 LobbyMenu::~LobbyMenu() {
-	TTF_CloseFont(font);
+	//
 }
 
 //-------------------------
@@ -104,25 +99,40 @@ void LobbyMenu::FrameEnd() {
 	//
 }
 
-void LobbyMenu::RenderFrame(SDL_Renderer* renderer) {
-	//TODO: (2) I need a proper UI system for the entire client and the editor
+void LobbyMenu::Render(SDL_Surface* const screen) {
+	//TODO: I need a proper UI system for the entire client and the editor
 
 	//UI
-	searchButton.DrawTo(renderer);
-	joinButton.DrawTo(renderer);
-	backButton.DrawTo(renderer);
+	search.DrawTo(screen);
+	join.DrawTo(screen);
+	back.DrawTo(screen);
 
-	//TODO: (3) draw headers for the server list
-	//TODO: (3) ping/delay displayed in the server list
-	for (int i = 0; i < serverVector.size(); i++) {
+	//TODO: draw headers for the server list
+	for (int i = 0; i < serverInfo.size(); i++) {
 		//draw the selected server's highlight
-		if (selection == &serverVector[i]) {
-			highlightImage.DrawTo(renderer, boundingBox.x, boundingBox.y + boundingBox.h * i);
+		if (selection == &serverInfo[i]) {
+			SDL_Rect r = {
+				(Sint16)listBox.x, (Sint16)listBox.y,
+				(Uint16)listBox.w, (Uint16)listBox.h
+			};
+			r.y += i * listBox.h;
+			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 49, 150, 5));
 		}
 
-		//draw the server's info
-		serverVector[i].nameImage.DrawTo(renderer, boundingBox.x, boundingBox.y + boundingBox.h * i);
-		serverVector[i].playerCountImage.DrawTo(renderer, boundingBox.x+276, boundingBox.y + boundingBox.h * i);
+		//draw the server name
+		font.DrawStringTo(serverInfo[i].name, screen, listBox.x, listBox.y + i*listBox.h);
+
+		//draw the player count
+		std::ostringstream msg;
+		msg << serverInfo[i].playerCount;
+		font.DrawStringTo(msg.str(), screen, listBox.x + listBox.w, listBox.y + i*listBox.h);
+
+		//compatible?
+		if (!serverInfo[i].compatible) {
+			font.DrawStringTo("?", screen, listBox.x - font.GetCharW(), listBox.y + i*listBox.h);
+		}
+
+		//TODO: ping/delay?
 	}
 }
 
@@ -130,54 +140,49 @@ void LobbyMenu::RenderFrame(SDL_Renderer* renderer) {
 //Event handlers
 //-------------------------
 
-void LobbyMenu::MouseMotion(SDL_MouseMotionEvent const& event) {
-	searchButton.MouseMotion(event);
-	joinButton.MouseMotion(event);
-	backButton.MouseMotion(event);
+void LobbyMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	search.MouseMotion(motion);
+	join.MouseMotion(motion);
+	back.MouseMotion(motion);
 }
 
-void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& event) {
-	searchButton.MouseButtonDown(event);
-	joinButton.MouseButtonDown(event);
-	backButton.MouseButtonDown(event);
+void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	search.MouseButtonDown(button);
+	join.MouseButtonDown(button);
+	back.MouseButtonDown(button);
 }
 
-void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& event) {
-	if (searchButton.MouseButtonUp(event) == Button::State::RELEASED) {
+void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	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) {
-		SetSceneSignal(SceneSignal::MAINMENU);
+	else if (back.MouseButtonUp(button) == Button::State::HOVER) {
+		SetNextScene(SceneList::MAINMENU);
 	}
 
 	//has the user selected a server on the list?
-	BoundingBox tmpBox = boundingBox;
-	tmpBox.h *= serverVector.size(); //within the list bounds
-	if (tmpBox.CheckOverlap({event.x, event.y})) {
-		//NOTE: this memory trick requires a vector
-		selection = &serverVector[(event.y - boundingBox.y)/boundingBox.h];
+	BoundingBox tmpBox = listBox;
+	tmpBox.h *= serverInfo.size();
+	if (tmpBox.CheckCollision({button.x, button.y, 0, 0})) {
+		selection = &serverInfo[(button.y - listBox.y)/listBox.h];
 	}
 	else {
 		selection = nullptr;
 	}
 }
 
-void LobbyMenu::MouseWheel(SDL_MouseWheelEvent const& event) {
-	//
-}
-
-void LobbyMenu::KeyDown(SDL_KeyboardEvent const& event) {
-	switch(event.keysym.sym) {
+void LobbyMenu::KeyDown(SDL_KeyboardEvent const& key) {
+	switch(key.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) {
 	//
 }
 
@@ -218,38 +223,17 @@ void LobbyMenu::HandlePacket(SerialPacket* const argPacket) {
 
 void LobbyMenu::HandleBroadcastResponse(ServerPacket* const argPacket) {
 	//extract the data
-	ServerInfo newServer;
+	ServerInformation server;
+	server.address = argPacket->srcAddress;
+	server.name = argPacket->name;
+	server.playerCount = argPacket->playerCount;
+	server.version = argPacket->version;
 
-	newServer.address = argPacket->srcAddress;
-	newServer.name = argPacket->name;
-	newServer.playerCount = argPacket->playerCount;
-	newServer.version = argPacket->version;
-	newServer.compatible = newServer.version == NETWORK_VERSION;
+	//Checking compatibility
+	server.compatible = server.version == NETWORK_VERSION;
 
 	//push
-	serverVector.push_back(newServer);
-
-	//BUGFIX: since TextLine lacks the memory management of Image, I'll wait until after the line is in the vector to handle these
-
-	//fancy colors
-	SDL_Color color;
-	if (newServer.compatible) {
-		color = {255, 255, 255, 255};
-	}
-	else {
-		color = {255, 0, 0, 255};
-	}
-
-	//fancy itoa
-	auto itoa_base10 = [](int i) -> std::string {
-		char str[20];
-		sprintf(str, "%d", i);
-		return std::string(str);
-	};
-
-	//text graphics
-	serverVector.back().nameImage.SetText(GetRenderer(), font, newServer.name, color);
-	serverVector.back().playerCountImage.SetText(GetRenderer(), font, itoa_base10(newServer.playerCount), color);
+	serverInfo.push_back(server);
 }
 
 void LobbyMenu::HandleJoinResponse(ClientPacket* const argPacket) {
@@ -266,15 +250,15 @@ void LobbyMenu::HandleLoginResponse(ClientPacket* const argPacket) {
 		throw(std::runtime_error("Client index invalid during login"));
 	}
 	accountIndex = argPacket->accountIndex;
-	SetSceneSignal(SceneSignal::WORLD);
+	SetNextScene(SceneList::INWORLD);
 }
 
 void LobbyMenu::HandleJoinRejection(TextPacket* const argPacket) {
-	//TODO: (9) LobbyMenu::HandleJoinRejection()
+	//TODO: Better output for join rejection
 }
 
 void LobbyMenu::HandleLoginRejection(TextPacket* const argPacket) {
-	//TODO: (9) LobbyMenu::HandleLoginRejection
+	//TODO: Better output for login rejection
 }
 
 //-------------------------
@@ -288,7 +272,7 @@ void LobbyMenu::SendBroadcastRequest() {
 		network.SendTo(config["server.host"].c_str(), config.Int("server.port"), &packet);
 
 		//reset the server list
-		serverVector.clear();
+		serverInfo.clear();
 		selection = nullptr;
 }
 
@@ -304,11 +288,10 @@ void LobbyMenu::SendJoinRequest() {
 
 void LobbyMenu::SendLoginRequest() {
 	//NOTE: high cohesion
-	//TODO: (9) have a separate login screen
 	ClientPacket packet;
 	packet.type = SerialPacketType::LOGIN_REQUEST;
 	packet.clientIndex = clientIndex;
-	strncpy(packet.username, config["client.username"].c_str(), PACKET_STRING_SIZE+1);
+	strncpy(packet.username, config["client.username"].c_str(), PACKET_STRING_SIZE);
 
 	network.SendTo(Channels::SERVER, &packet);
 }

client/menu_scenes/lobby_menu.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,15 +19,14 @@
  * 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"
@@ -46,21 +45,19 @@ public:
 	LobbyMenu(int* const argClientIndex, int* const argAccountIndex);
 	~LobbyMenu();
 
-	void RenderFrame(SDL_Renderer* renderer) override;
-
 protected:
-	//frame phases
-	void FrameStart() override;
-	void Update() override;
-	void FrameEnd() override;
+	//Frame loop
+	void FrameStart();
+	void Update();
+	void FrameEnd();
+	void Render(SDL_Surface* const);
 
-	//input events
-	void MouseMotion(SDL_MouseMotionEvent const& event) override;
-	void MouseButtonDown(SDL_MouseButtonEvent const& event) override;
-	void MouseButtonUp(SDL_MouseButtonEvent const& event) override;
-	void MouseWheel(SDL_MouseWheelEvent const& event) override;
-	void KeyDown(SDL_KeyboardEvent const& event) override;
-	void KeyUp(SDL_KeyboardEvent const& event) override;
+	//Event handlers
+	void MouseMotion(SDL_MouseMotionEvent const&);
+	void MouseButtonDown(SDL_MouseButtonEvent const&);
+	void MouseButtonUp(SDL_MouseButtonEvent const&);
+	void KeyDown(SDL_KeyboardEvent const&);
+	void KeyUp(SDL_KeyboardEvent const&);
 
 	//Network handlers
 	void HandlePacket(SerialPacket* const);
@@ -81,13 +78,15 @@ protected:
 	int& clientIndex;
 	int& accountIndex;
 
-	//define the list object
-	struct ServerInfo {
-		//graphics
-		TextLine nameImage;
-		TextLine playerCountImage;
+	//members
+	Image image;
+	RasterFont font;
+	Button search;
+	Button join;
+	Button back;
 
-		//networking
+	//server list
+	struct ServerInformation {
 		IPaddress address;
 		std::string name;
 		int playerCount;
@@ -95,16 +94,12 @@ protected:
 		bool compatible;
 	};
 
-	//members
-	Image buttonImage;
-	Image highlightImage;
-	TTF_Font* font = nullptr;
-	Button searchButton;
-	Button joinButton;
-	Button backButton;
+	std::vector<ServerInformation> serverInfo;
 
-	std::vector<ServerInfo> serverVector;
-	ServerInfo* selection = nullptr;
-
-	BoundingBox boundingBox;
+	//NOTE: a terrible hack
+	//I'd love a proper gui system for this
+	BoundingBox listBox;
+	ServerInformation* selection = nullptr;
 };
+
+#endif

client/menu_scenes/main_menu.cpp

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

client/menu_scenes/main_menu.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -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
-	void FrameStart() override;
-	void Update() override;
-	void FrameEnd() override;
+	//Frame loop
+	void FrameStart();
+	void Update();
+	void FrameEnd();
+	void Render(SDL_Surface* const);
 
-	//input events
-	void MouseMotion(SDL_MouseMotionEvent const& event) override;
-	void MouseButtonDown(SDL_MouseButtonEvent const& event) override;
-	void MouseButtonUp(SDL_MouseButtonEvent const& event) override;
-	void MouseWheel(SDL_MouseWheelEvent const& event) override;
-	void KeyDown(SDL_KeyboardEvent const& event) override;
-	void KeyUp(SDL_KeyboardEvent const& event) override;
+	//Event handlers
+	void MouseMotion(SDL_MouseMotionEvent const&);
+	void MouseButtonDown(SDL_MouseButtonEvent const&);
+	void MouseButtonUp(SDL_MouseButtonEvent const&);
+	void KeyDown(SDL_KeyboardEvent const&);
+	void KeyUp(SDL_KeyboardEvent const&);
 
 	//members
-	Image buttonImage;
-	TTF_Font* font = nullptr;
+	Image image;
+	RasterFont font;
 	Button startButton;
 	Button optionsButton;
 	Button quitButton;
-	TextBox textBox;
 };
+
+#endif

client/menu_scenes/makefile

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

client/menu_scenes/options_menu.cpp

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

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,40 +19,40 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
-
-#include "button.hpp"
-#include "image.hpp"
-#include "text_line.hpp"
+#ifndef OPTIONSMENU_HPP_
+#define OPTIONSMENU_HPP_
 
 #include "base_scene.hpp"
 
-//NOTE: The options screen needs to be USED
+#include "image.hpp"
+#include "raster_font.hpp"
+#include "button.hpp"
+
+//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:
-	//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;
+	//Event handlers
+	void MouseMotion(SDL_MouseMotionEvent const&);
+	void MouseButtonDown(SDL_MouseButtonEvent const&);
+	void MouseButtonUp(SDL_MouseButtonEvent const&);
+	void KeyDown(SDL_KeyboardEvent const&);
+	void KeyUp(SDL_KeyboardEvent const&);
 
 	//members
-	Image buttonImage;
-	TTF_Font* font = nullptr;
+	Image image;
+	RasterFont font;
 	Button backButton;
-	TextLine textLine;
 };
+
+#endif

client/menu_scenes/splash_screen.cpp

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

client/menu_scenes/splash_screen.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -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;
-
-private:
+protected:
 	//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/scene_list.hpp

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

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

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

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 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages

common/debugging/timer.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -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>
@@ -49,3 +50,5 @@ private:
 };
 
 std::ostream& operator<<(std::ostream& os, Timer& t);
+
+#endif

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/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/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 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,7 +19,8 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef CHARACTERDEFINES_HPP_
+#define CHARACTERDEFINES_HPP_
 
 #include <cmath>
 
@@ -37,3 +38,5 @@ constexpr int CHARACTER_BOUNDS_HEIGHT = 32;
 //the character's sprite format
 constexpr int CHARACTER_CELLS_X = 4;
 constexpr int CHARACTER_CELLS_Y = 4;
+
+#endif

common/gameplay/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/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/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-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -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) {
-	Free();
-
-	//load the file into a surface
-	SDL_Surface* surface = IMG_Load(fname.c_str());
-	if (!surface) {
-		std::ostringstream msg;
-		msg << "Failed to load an image file: " << fname;
-		msg << "; " << IMG_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//create a texture from this surface
-	texture = SDL_CreateTextureFromSurface(renderer, surface);
-	if (!texture) {
-		std::ostringstream msg;
-		msg << "Failed to convert a newly loaded image file: " << fname;
-		msg << "; " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//set the metadata
-	clip.x = 0;
-	clip.y = 0;
-	if (SDL_QueryTexture(texture, nullptr, nullptr, &clip.w, &clip.h)) {
-		std::ostringstream msg;
-		msg << "Failed to record metadata for a newly loaded image file: " << fname;
-		msg << "; " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
+SDL_Surface* Image::LoadSurface(std::string fname) {
+	FreeSurface();
+	SDL_Surface* p = SDL_LoadBMP(fname.c_str());
+	if (!p) {
+		std::ostringstream os;
+		os << "Failed to load file: " << fname;
+		throw(std::runtime_error(os.str()));
 	}
+	surface = p;
+	clip = {0, 0, (Uint16)surface->w, (Uint16)surface->h};
 	local = true;
-
-	//free the surface & return
-	SDL_FreeSurface(surface);
-	return texture;
+	SetTransparentColor(255, 0, 255); //default
+	return surface;
 }
 
-SDL_Texture* Image::Create(SDL_Renderer* renderer, Uint16 w, Uint16 h, SDL_Color blank) {
-	Free();
-
-	//make the texture
-	texture = SDL_CreateTexture(renderer,
-		SDL_PIXELFORMAT_RGBA8888,
-		SDL_TEXTUREACCESS_TARGET,
-		w, h);
-
-	//check
-	if (!texture) {
-		std::ostringstream msg;
-		msg << "Failed to create a texture; " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//set the metadata
-	clip.x = 0;
-	clip.y = 0;
-	if (SDL_QueryTexture(texture, nullptr, nullptr, &clip.w, &clip.h)) {
-		std::ostringstream msg;
-		msg << "Failed to record metadata for a newly created image";
-		msg << "; " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
+SDL_Surface* Image::CreateSurface(Uint16 w, Uint16 h) {
+	FreeSurface();
+	Uint32 rmask, gmask, bmask, amask;
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+    rmask = 0xff000000;
+    gmask = 0x00ff0000;
+    bmask = 0x0000ff00;
+    amask = 0x000000ff;
+#else
+    rmask = 0x000000ff;
+    gmask = 0x0000ff00;
+    bmask = 0x00ff0000;
+    amask = 0xff000000;
+#endif
+	SDL_Surface* p = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, 32, rmask, gmask, bmask, amask);
+	if (!p) {
+		throw(std::runtime_error("Failed to create Image surface"));
 	}
+	surface = p;
+	clip = {0, 0, (Uint16)surface->w, (Uint16)surface->h};
 	local = true;
-
-	//blank (black) texture
-	SDL_SetRenderTarget(renderer, texture);
-	SDL_SetRenderDrawColor(renderer, blank.r, blank.g, blank.b, blank.a);
-	SDL_RenderFillRect(renderer, nullptr);
-	SDL_SetRenderDrawColor(renderer, 0, 0, 0, 0);
-	SDL_SetRenderTarget(renderer, nullptr);
-
-	return texture;
+	SetTransparentColor(255, 0, 255); //default
+	return surface;
 }
 
-SDL_Texture* Image::CopyTexture(SDL_Renderer* renderer, SDL_Texture* ptr) {
-	Free();
-	int w = 0, h = 0;
-
-	//get the info
-	SDL_QueryTexture(ptr, nullptr, nullptr, &w, &h);
-
-	//create a texture of (w, h) size (also sets the metadata)
-	Create(renderer, w, h);
-
-	//copy the argument texture to the local texture
-	SDL_SetRenderTarget(renderer, texture);
-	SDL_RenderCopy(renderer, ptr, nullptr, nullptr);
-	SDL_SetRenderTarget(renderer, nullptr);
-
-	//return the local texture
-	return texture;
-}
-
-SDL_Texture* Image::SetTexture(SDL_Texture* ptr) {
-	Free();
-
-	texture = ptr;
-
-	//set the metadata
-	clip.x = 0;
-	clip.y = 0;
-	if (SDL_QueryTexture(texture, nullptr, nullptr, &clip.w, &clip.h)) {
-		std::ostringstream msg;
-		msg << "Failed to record metadata for a newly set image";
-		msg << "; " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
+SDL_Surface* Image::SetSurface(SDL_Surface* p) {
+	FreeSurface();
+	if (!p) {
+		throw(std::invalid_argument("No surface pointer provided"));
 	}
+	surface = p;
+	clip = {0, 0, (Uint16)surface->w, (Uint16)surface->h};
 	local = false;
-
-	return texture;
+	return surface;
 }
 
-SDL_Texture* Image::GetTexture() const {
-	return texture;
-}
-
-void Image::Free() {
+void Image::FreeSurface() {
 	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) {
-	if (!texture) {
-		throw(std::logic_error("No image texture to draw"));
+void Image::DrawTo(SDL_Surface* dest, Sint16 x, Sint16 y) {
+	if (!surface) {
+		throw(std::logic_error("No image surface to draw"));
 	}
-	SDL_Rect sclip = clip;
-	SDL_Rect dclip = {x, y, Uint16(clip.w * scaleX), Uint16(clip.h * scaleY)};
-	SDL_RenderCopy(renderer, texture, &sclip, &dclip);
+	SDL_Rect sclip = clip, dclip = {x,y};
+	SDL_BlitSurface(surface, &sclip, dest, &dclip);
 }
 
-void Image::SetAlpha(Uint8 a) {
-	if (SDL_SetTextureAlphaMod(texture, a)) {
-		std::ostringstream msg;
-		msg << "Failed to set alpha; " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
+void Image::SetTransparentColor(Uint8 r, Uint8 g, Uint8 b) {
+	if (!surface) {
+		throw(std::logic_error("Failed to set the transparent color"));
 	}
+	if (!local) {
+		throw(std::logic_error("Cannot set the transparent color of a non-local surface"));
+	}
+	SDL_SetColorKey(surface, SDL_SRCCOLORKEY, SDL_MapRGB(surface->format, r, g, b));
 }
 
-Uint8 Image::GetAlpha() {
-	Uint8 ret = 0;
-	if (SDL_GetTextureAlphaMod(texture, &ret)) {
-		std::ostringstream msg;
-		msg << "Failed to get alpha; " << SDL_GetError();
-		throw(std::runtime_error(msg.str()));
+void Image::ClearTransparentColor() {
+	if (!surface) {
+		throw(std::logic_error("Failed to clear the transparent color"));
 	}
-	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-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,10 +19,10 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
-
-#include "SDL2/SDL.h"
+#ifndef IMAGE_HPP_
+#define IMAGE_HPP_
 
+#include "SDL/SDL.h"
 #include <string>
 
 class Image {
@@ -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(SDL_Renderer* r, Uint16 w, Uint16 h) { Create(r, w, h); }
-	Image(SDL_Texture* p) { SetTexture(p); }
-	virtual ~Image() { Free(); }
+	Image(std::string fname) { LoadSurface(fname); }
+	Image(Uint16 w, Uint16 h) { CreateSurface(w, h); }
+	Image(SDL_Surface* p) { SetSurface(p); }
+	~Image() { FreeSurface(); }
 
 	Image& operator=(Image const&);
 	Image& operator=(Image&&);
 
-	SDL_Texture* Load(SDL_Renderer* renderer, std::string fname);
-	SDL_Texture* Create(SDL_Renderer* renderer, Uint16 w, Uint16 h, SDL_Color blank = {0, 0, 0, 255});
-	SDL_Texture* CopyTexture(SDL_Renderer* renderer, SDL_Texture* ptr);
-	SDL_Texture* SetTexture(SDL_Texture*);
-	SDL_Texture* GetTexture() const;
-	virtual void Free();
+	SDL_Surface* LoadSurface(std::string fname);
+	SDL_Surface* CreateSurface(Uint16 w, Uint16 h);
+	SDL_Surface* SetSurface(SDL_Surface*);
+	SDL_Surface* GetSurface() const { return surface; }
+	void FreeSurface();
 
-	void DrawTo(SDL_Renderer* const, Sint16 x, Sint16 y, double scaleX = 1.0, double scaleY = 1.0);
-
-	void SetAlpha(Uint8 a);
-	Uint8 GetAlpha();
+	void DrawTo(SDL_Surface* const, Sint16 x, Sint16 y);
 
 	//Clip handlers
 	SDL_Rect SetClip(SDL_Rect r) { return clip = r; }
@@ -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

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=.
+INCLUDES+=. ../map
 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/graphics/sprite_sheet.cpp

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

common/graphics/sprite_sheet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -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(SpriteSheet&& rhs) { *this = std::move(rhs); }
-	SpriteSheet(SDL_Renderer* r, std::string fname, Uint16 cx, Uint16 cy)
-		{ Load(r, fname, cx, cy); }
-	SpriteSheet(SDL_Renderer* r, Uint16 w, Uint16 h, Uint16 cx, Uint16 cy)
-		{ Create(r, w, h, cx, cy); }
-	SpriteSheet(SDL_Texture* p, Uint16 cx, Uint16 cy)
-		{ SetTexture(p, cx, cy); }
-	~SpriteSheet() = default;
-
-	SpriteSheet& operator=(SpriteSheet const&);
-	SpriteSheet& operator=(SpriteSheet&&);
+	SpriteSheet(std::string fname, Uint16 xCellCount, Uint16 yCellCount) { LoadSurface(fname, xCellCount, yCellCount); }
+	SpriteSheet(SDL_Surface* surface, Uint16 xCellCount, Uint16 yCellCount) { SetSurface(surface, xCellCount, yCellCount); }
+	~SpriteSheet() { FreeSurface(); };
 
 	void Update(double delta);
 
-	SDL_Texture* Load(SDL_Renderer*, std::string fname, Uint16 cx, Uint16 cy);
-	SDL_Texture* Create(SDL_Renderer*, Uint16 w, Uint16 h, Uint16 cx, Uint16 cy);
-	SDL_Texture* SetTexture(SDL_Texture*, Uint16 cx, Uint16 cy);
-	void Free() override;
+	SDL_Surface* LoadSurface(std::string fname, Uint16 xCellCount, Uint16 yCellCount);
+	SDL_Surface* SetSurface(SDL_Surface* surface, Uint16 xCellCount, Uint16 yCellCount);
+	SDL_Surface* GetSurface() { return image.GetSurface(); }
+	void FreeSurface();
 
-	Uint16 SetCountX(Uint16);
-	Uint16 SetCountY(Uint16);
-	Uint16 SetIndexX(Uint16);
-	Uint16 SetIndexY(Uint16);
+	void DrawTo(SDL_Surface* const dest, Sint16 x, Sint16 y) { image.DrawTo(dest, x, y); }
 
-	Uint16 GetCountX() const { return countX; }
-	Uint16 GetCountY() const { return countY; }
-	Uint16 GetIndexX() const { return indexX; }
-	Uint16 GetIndexY() const { return indexY; }
+	//accessors and mutators
+	Image* GetImage() { return ℑ } //OO breaker
+
+	Uint16 SetXCount(Uint16);
+	Uint16 SetYCount(Uint16);
+	Uint16 SetXIndex(Uint16);
+	Uint16 SetYIndex(Uint16);
+
+	Uint16 GetXCount() const { return xCount; }
+	Uint16 GetYCount() const { return yCount; }
+	Uint16 GetXIndex() const { return xIndex; }
+	Uint16 GetYIndex() const { return yIndex; }
 
 	double SetDelay(double d);
 	double GetDelay() const { return delay; }
 
 private:
-	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_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/graphics/tile_sheet.cpp

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

common/graphics/tile_sheet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,41 +19,36 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef TILESHEET_HPP_
+#define TILESHEET_HPP_
 
-#include "entity.hpp"
+#include "region.hpp"
 
-#include "lua.hpp"
+#include "image.hpp"
 
-#include <map>
 #include <string>
 
-class BarrierData: public Entity {
+class TileSheet {
 public:
-	BarrierData(int instanceIndex);
-	~BarrierData();
+	TileSheet() = default;
+	TileSheet(std::string f, int w, int h) { Load(f, w, h); }
+	~TileSheet() = default;
 
-	int Update(lua_State*);
+	void Load(std::string fname, int tileWidth, int tileHeight);
+	void Unload();
 
-	int SetScriptReference(int);
-	int GetScriptReference();
-
-	std::string SetTag(std::string key, std::string value);
-	std::string GetTag(std::string key);
-
-	int SetInstanceIndex(int i);
-	int GetInstanceIndex() const;
-
-	int SetStatus(int k, int v);
-	int GetStatus(int k);
-
-	int* GetStatusArray();
+	void DrawTileTo(SDL_Surface* const dest, int x, int y, Region::type_t tile);
+	void DrawRegionTo(SDL_Surface* const dest, Region* const region, int camX, int camY);
 
+	//accessors
+	Image* GetImage() { return &image; }
+	int GetXCount() { return xCount; }
+	int GetYCount() { return yCount; }
+	int GetTileW() { return image.GetClipW(); }
+	int GetTileH() { return image.GetClipH(); }
 private:
-	int scriptRef = LUA_NOREF;
-	std::map<std::string, std::string> tags;
+	Image image;
+	int xCount = 0, yCount = 0;
+};
 
-	int instanceIndex;
-
-	int status[8];
-};
+#endif

common/makefile

@@ -1,28 +1,13 @@
-#output
-export OUTDIR=..
-export OUT=$(addprefix $(OUTDIR)/,libcommon.a)
-
-all: $(OUTDIR)
+all:
 	$(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+=. ../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/map_system_api.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,29 +19,37 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "lua_utilities.hpp"
+#include "map_system_api.hpp"
 
-#include <stdexcept>
-#include <string>
+//all map API headers
+#include "region_api.hpp"
+#include "region_pager_api.hpp"
 
-//this is for functions passed to SetOnCreate & SetOnUnload
-int runHook(lua_State* L, int scriptRef, void* userdata, int index) {
-	//get the hook
-	lua_rawgeti(L, LUA_REGISTRYINDEX, scriptRef);
+//useful "globals"
+//...
 
-	if (lua_isnil(L, -1)) {
-		lua_pop(L, 1);
-		return -1;
+//This mimics linit.c to create a nested collection of all map modules.
+static const luaL_Reg funcs[] = {
+	{nullptr, nullptr}
+};
+
+static const luaL_Reg libs[] = {
+	{"Region", openRegionAPI},
+	{"RegionPager", openRegionPagerAPI},
+	{nullptr, nullptr}
+};
+
+int openMapSystemAPI(lua_State* L) {
+	//create the table
+	luaL_newlibtable(L, libs);
+
+	//push the "global" functions
+	luaL_setfuncs(L, funcs, 0);
+
+	//push the substable
+	for (const luaL_Reg* lib = libs; lib->func; lib++) {
+		lib->func(L);
+		lua_setfield(L, -2, lib->name);
 	}
-
-	//push args
-	lua_pushlightuserdata(L, userdata);
-	lua_pushinteger(L, index);
-
-	//call the function, 2 arg, 0 return
-	if (lua_pcall(L, 2, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(L, -1) ));
-	}
-
-	return 0;
+	return 1;
 }

common/map/map_system_api.hpp

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

common/map/region.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -48,7 +48,7 @@ Region::type_t Region::SetTile(int x, int y, int z, type_t v) {
 	return tiles[x][y][z] = v;
 }
 
-Region::type_t Region::GetTile(int x, int y, int z) 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"));
 	}
@@ -62,7 +62,7 @@ bool Region::SetSolid(int x, int y, bool b) {
 	return solid[x * REGION_WIDTH + y] = b;
 }
 
-bool Region::GetSolid(int x, int y) 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"));
 	}

common/map/region.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -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,10 +42,10 @@ 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;
@@ -52,11 +53,11 @@ public:
 
 	std::bitset<REGION_WIDTH*REGION_HEIGHT>* GetSolidBitset();
 private:
-	friend class TileSheet;
-
 	const int x;
 	const int y;
 
 	type_t tiles[REGION_WIDTH][REGION_HEIGHT][REGION_DEPTH];
 	std::bitset<REGION_WIDTH*REGION_HEIGHT> solid;
 };
+
+#endif

common/map/region_api.cpp

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

common/map/region_api.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -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"
 
-#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 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -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));

common/map/region_pager_api.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -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"
 
-#define TORTUGA_REGION_PAGER_API "region_pager"
+#define TORTUGA_REGION_PAGER_NAME "region_pager"
 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 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -33,7 +33,6 @@ Region::type_t RegionPagerBase::SetTile(int x, int y, int z, Region::type_t v) {
 	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);

common/map/region_pager_base.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,7 +19,8 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef REGIONPAGERBASE_HPP_
+#define REGIONPAGERBASE_HPP_
 
 #include "region.hpp"
 
@@ -56,3 +57,5 @@ public:
 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 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -23,6 +23,9 @@
 
 #include <stdexcept>
 
+//DOCS: Load, Save and Create fail unless the lua function has been set
+//DOCS: UnloadIf and UnloadAll will still continue without the function set
+
 RegionPagerLua::~RegionPagerLua() {
 	//unload all regions
 	UnloadAll();
@@ -41,7 +44,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,20 +57,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
@@ -77,7 +76,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 +83,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 +93,17 @@ 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
+//return the created region, or nullptr on failure
 Region* RegionPagerLua::CreateRegion(int x, int y) {
 	if (FindRegion(x, y)) {
 		throw(std::logic_error("Cannot overwrite an existing region"));
@@ -121,9 +115,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
-		regionList.emplace_front(x, y);
-		return &regionList.front();
+		return nullptr;
 	}
 
 	//something to work on

common/map/region_pager_lua.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,7 +19,8 @@
  * 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"
 
@@ -28,8 +29,6 @@
 #include <functional>
 #include <string>
 
-//DOCS: set the lua hook before use
-
 class RegionPagerLua : public RegionPagerBase {
 public:
 	RegionPagerLua() = default;
@@ -66,3 +65,5 @@ protected:
 	int createRef = LUA_NOREF;
 	int unloadRef = LUA_NOREF;
 };
+
+#endif

common/map/tile_sheet.cpp

@@ -1,124 +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 "tile_sheet.hpp"
-
-#include <stdexcept>
-
-TileSheet& TileSheet::operator=(TileSheet const& rhs) {
-	//don't screw yourself
-	if (this == &rhs) {
-		return *this;
-	}
-
-	Free();
-
-	//Copy the other TileSheet's stuff
-	texture = rhs.texture;
-	clip = rhs.clip;
-	local = false;
-	countX = rhs.countX;
-	countY = rhs.countY;
-}
-
-TileSheet& TileSheet::operator=(TileSheet&& rhs) {
-	//don't screw yourself
-	if (this == &rhs) {
-		return *this;
-	}
-
-	Free();
-
-	//Copy the other TileSheet's stuff
-	texture = rhs.texture;
-	clip = rhs.clip;
-	local = false;
-	countX = rhs.countX;
-	countY = rhs.countY;
-
-	rhs.texture = nullptr;
-	rhs.clip = {0, 0, 0, 0};
-	rhs.local = false;
-	rhs.countX = 0;
-	rhs.countY = 0;
-}
-
-void TileSheet::Load(SDL_Renderer* renderer, std::string fname, int tileWidth, int tileHeight) {
-	Image::Load(renderer, fname);
-	countX = clip.w / tileWidth;
-	countY = clip.h / tileHeight;
-	clip.w = tileWidth;
-	clip.h = tileHeight;
-}
-
-SDL_Texture* TileSheet::SetTexture(SDL_Texture* ptr, int tileWidth, int tileHeight) {
-	Image::SetTexture(ptr);
-	countX = clip.w / tileWidth;
-	countY = clip.h / tileHeight;
-	clip.w = tileWidth;
-	clip.h = tileHeight;
-}
-
-void TileSheet::Free() {
-	Image::Free();
-	countX = countY = 0;
-}
-
-void TileSheet::DrawLayerTo(SDL_Renderer* const renderer, Region* const region, int layer, int camX, int camY, double scaleX, double scaleY) {
-	//TODO: (2) empty
-}
-
-void TileSheet::DrawRegionTo(SDL_Renderer* const renderer, Region* const region, int camX, int camY, double scaleX, double scaleY) {
-	//NOTE: TileSheet is a friend class of Region
-	//reimplementing DrawTo() to improve performance (less indirection)
-	if (!texture) {
-		throw(std::logic_error("No image texture to draw"));
-	}
-
-	//the local variables
-	SDL_Rect sclip = {0, 0, clip.w, clip.h};
-	SDL_Rect dclip = {0, 0, Uint16(clip.w * scaleX), Uint16(clip.h * scaleY)};
-	Region::type_t tile = 0;
-
-	//for each tile
-	for (register int i = 0; i < REGION_WIDTH; ++i) {
-		for (register int j = 0; j < REGION_HEIGHT; ++j) {
-			for (register int k = 0; k < REGION_DEPTH; ++k) {
-				//get the value to skip expensive lookups
-				tile = region->tiles[i][j][k];
-
-				//0 is invisible
-				if (tile == 0) continue;
-
-				//set the sclip
-				sclip.x = (tile-1) % countX * clip.h;
-				sclip.y = (tile-1) / countX * clip.w;
-
-				//set the dclip
-				dclip.x = ((region->x + i) * clip.w - camX) * scaleX;
-				dclip.y = ((region->y + j) * clip.h - camY) * scaleY;
-
-				//draw
-				SDL_RenderCopy(renderer, texture, &sclip, &dclip);
-			}
-		}
-	}
-}

common/map/tile_sheet.hpp

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

common/network/makefile

@@ -10,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 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -36,18 +36,11 @@ void serializeCharacter(void* buffer, CharacterPacket* packet) {
 
 	//location
 	serialCopy(&buffer, &packet->roomIndex, sizeof(int));
-
 	serialCopy(&buffer, &packet->origin.x, sizeof(double));
 	serialCopy(&buffer, &packet->origin.y, sizeof(double));
-
 	serialCopy(&buffer, &packet->motion.x, sizeof(double));
 	serialCopy(&buffer, &packet->motion.y, sizeof(double));
 
-	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...
 }
 
@@ -64,17 +57,10 @@ void deserializeCharacter(void* buffer, CharacterPacket* packet) {
 
 	//location
 	deserialCopy(&buffer, &packet->roomIndex, sizeof(int));
-
 	deserialCopy(&buffer, &packet->origin.x, sizeof(double));
 	deserialCopy(&buffer, &packet->origin.y, sizeof(double));
-
 	deserialCopy(&buffer, &packet->motion.x, sizeof(double));
 	deserialCopy(&buffer, &packet->motion.y, sizeof(double));
 
-	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-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,11 +19,11 @@
  * 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"
 
 struct CharacterPacket : SerialPacketBase {
@@ -34,13 +34,17 @@ struct CharacterPacket : SerialPacketBase {
 
 	//the owner
 	int accountIndex;
+	//TODO: Authentication token?
 
 	//location
 	int roomIndex;
 	Vector2 origin;
 	Vector2 motion;
-	BoundingBox bounds;
+
+	//gameplay components: equipment, items, buffs, debuffs...
 };
 
 void serializeCharacter(void* buffer, CharacterPacket* packet);
 void deserializeCharacter(void* buffer, CharacterPacket* packet);
+
+#endif

common/network/packet_types/client_packet.cpp

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

common/network/packet_types/client_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2016
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,7 +19,8 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#pragma once
+#ifndef CLIENTPACKET_HPP_
+#define CLIENTPACKET_HPP_
 
 #include "serial_packet_base.hpp"
 
@@ -27,8 +28,9 @@ struct ClientPacket : SerialPacketBase {
 	int clientIndex;
 	int accountIndex;
 	char username[PACKET_STRING_SIZE];
-	//TODO: (3) password, auth token
 };
 
 void serializeClient(void* buffer, ClientPacket* packet);
 void deserializeClient(void* buffer, ClientPacket* packet);
+
+#endif

common/network/packet_types/makefile

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