Builds and runs on windows

This makes it look nicer, IMO. textBox doesn't use Image, since TextBox is
more specialized.

.gitignore

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

.gitmodules

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

README.md

@@ -1,33 +0,0 @@
-The most recent stable build for Windows can be found [here](https://dl.dropboxusercontent.com/u/46669050/Tortuga.rar).
-
-Tortuga is a 2D multiplayer JRPG featuring permadeath (deletion of a character upon death). The emphasis of this game is on multiplayer cooperation, exploration and customization. The game runs on customizable server software that can support up to 150 simultaneous players or more.
-
-This game is inspired by classic 2D RPGs, as well as more modern sandbox MMOs. This project is currently independently created and funded, with the goal of creating a game that will engage user's imagination and inspire a large modding community.
-
-## Documentation
-
-Tortuga's full documentation can be found in a separate branch, see [Tortuga/docs](https://github.com/Ratstail91/Tortuga/tree/docs).  
-For Tortuga's primary documentation, please read the [Tortuga Game Design Document](https://github.com/Ratstail91/Tortuga/blob/docs/Tortuga%20Game%20Design%20Document.docx?raw=true).  
-
-## External Dependencies
-
-* [SDL 1.2](http://www.libsdl.org/) - Simple DirectMedia Layer API
-* [SDL_net 1.2](http://www.libsdl.org/projects/SDL_net/) - SDL's networking extension
-* [lua 5.2](http://www.lua.org/) - The lua programming language
-* [SQLite3](http://www.sqlite.org/) - A lightweight SQL database engine
-
-## Copyright
-
-(Future versions (to be determined) may be released under a modified version of the [Uplink Developer's License](http://www.introversion.co.uk/uplink/developer/license.html).)
-
-The current version of Tortuga is released under the [zlib license](http://en.wikipedia.org/wiki/Zlib_License).  
-
-Copyright (c) 2013, 2014 Kayne Ruse
-
-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.

client/base_scene.cpp

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

client/base_scene.hpp

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

client/channels.hpp

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

client/client_application.cpp

@@ -1,138 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial ClientApplications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * 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 "client_application.hpp"
-
-#include "serial.hpp"
-
-#include <stdexcept>
-#include <chrono>
-
-//-------------------------
-//Scene headers
-//-------------------------
-
-//Add the custom scene headers here
-#include "splash_screen.hpp"
-#include "main_menu.hpp"
-#include "options_menu.hpp"
-#include "lobby_menu.hpp"
-#include "in_world.hpp"
-#include "in_combat.hpp"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-void ClientApplication::Init(int argc, char** argv) {
-	//load the prerequisites
-	config.Load("rsc\\config.cfg");
-
-	//initialize SDL
-	if (SDL_Init(SDL_INIT_VIDEO)) {
-		throw(std::runtime_error("Failed to initialize SDL"));
-	}
-	BaseScene::SetScreen(config.Int("screen.w"), config.Int("screen.h"), 0, (config.Bool("screen.f")) ? SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_FULLSCREEN : SDL_HWSURFACE|SDL_DOUBLEBUF);
-
-	//initialize SDL_net
-	if (SDLNet_Init()) {
-		throw(std::runtime_error("Failed to initialize SDL_net"));
-	}
-	network.Open(0);
-}
-
-void ClientApplication::Proc() {
-	LoadScene(SceneList::FIRST);
-
-	//prepare the time system
-	typedef std::chrono::steady_clock Clock;
-
-	std::chrono::duration<int, std::milli> delta(16);
-	Clock::time_point simTime = Clock::now();
-	Clock::time_point realTime;
-
-	//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 game time
-		while (simTime < realTime) {
-			//call each user defined function
-			activeScene->RunFrame(double(delta.count()) / std::chrono::duration<int, std::milli>::period::den);
-			simTime += delta;
-		}
-
-		//draw the game to the screen
-		activeScene->RenderFrame();
-	}
-
-	UnloadScene();
-}
-
-void ClientApplication::Quit() {
-	network.Close();
-	SDLNet_Quit();
-	SDL_Quit();
-}
-
-//-------------------------
-//Private access members
-//-------------------------
-
-void ClientApplication::LoadScene(SceneList sceneIndex) {
-	UnloadScene();
-	switch(sceneIndex) {
-		//add scene creation calls here
-		case SceneList::FIRST:
-		case SceneList::SPLASHSCREEN:
-			activeScene = new SplashScreen(&config);
-		break;
-		case SceneList::MAINMENU:
-			activeScene = new MainMenu(&config);
-		break;
-		case SceneList::OPTIONSMENU:
-			activeScene = new OptionsMenu(&config);
-		break;
-		case SceneList::LOBBYMENU:
-			activeScene = new LobbyMenu(&config, &network, &clientIndex, &accountIndex, &characterIndex);
-		break;
-		case SceneList::INWORLD:
-			activeScene = new InWorld(&config, &network, &clientIndex, &accountIndex, &characterIndex, &combatMap, &characterMap);
-		break;
-		case SceneList::INCOMBAT:
-			activeScene = new InCombat(&config, &network, &clientIndex, &accountIndex, &characterIndex, &combatMap, &characterMap, &enemyMap);
-		break;
-		default:
-			throw(std::logic_error("Failed to recognize the scene index"));
-	}
-}
-
-void ClientApplication::UnloadScene() {
-	delete activeScene;
-	activeScene = nullptr;
-}

client/in_combat.cpp

@@ -1,125 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "in_combat.hpp"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-InCombat::InCombat(
-	ConfigUtility* const argConfig,
-	UDPNetworkUtility* const argNetwork,
-	int* const argClientIndex,
-	int* const argAccountIndex,
-	int* const argCharacterIndex,
-	std::map<int, CombatData>* argCombatMap,
-	std::map<int, CharacterData>* argCharacterMap,
-	std::map<int, EnemyData>* argEnemyMap
-	):
-	config(*argConfig),
-	network(*argNetwork),
-	clientIndex(*argClientIndex),
-	accountIndex(*argAccountIndex),
-	characterIndex(*argCharacterIndex),
-	combatMap(*argCombatMap),
-	characterMap(*argCharacterMap),
-	enemyMap(*argEnemyMap)
-{
-	//
-}
-
-InCombat::~InCombat() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void InCombat::FrameStart() {
-	//
-}
-
-void InCombat::Update(double delta) {
-	//
-}
-
-void InCombat::FrameEnd() {
-	//
-}
-
-void InCombat::RenderFrame() {
-	SDL_FillRect(GetScreen(), 0, 0);
-	Render(GetScreen());
-	SDL_Flip(GetScreen());
-	fps.Calculate();
-}
-
-void InCombat::Render(SDL_Surface* const screen) {
-	//
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void InCombat::QuitEvent() {
-	//exit the game AND the server
-//	RequestDisconnect();
-	SetNextScene(SceneList::MAINMENU);
-}
-
-void InCombat::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	//
-}
-
-void InCombat::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void InCombat::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void InCombat::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			QuitEvent();
-			break;
-	}
-}
-
-void InCombat::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}
-
-//-------------------------
-//Network handlers
-//-------------------------
-
-//TODO: network handlers
-
-//-------------------------
-//Server control
-//-------------------------
-
-//TODO: server control

client/in_combat.hpp

@@ -1,104 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef INCOMBAT_HPP_
-#define INCOMBAT_HPP_
-
-//network
-#include "udp_network_utility.hpp"
-
-//graphics
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-
-//common
-#include "config_utility.hpp"
-#include "frame_rate.hpp"
-
-#include "combat_data.hpp"
-#include "character_data.hpp"
-#include "enemy_data.hpp"
-
-//client
-#include "base_scene.hpp"
-
-class InCombat : public BaseScene {
-public:
-	//Public access members
-	InCombat(
-		ConfigUtility* const argConfig,
-		UDPNetworkUtility* const argNetwork,
-		int* const argClientIndex,
-		int* const argAccountIndex,
-		int* const argCharacterIndex,
-		std::map<int, CombatData>* argCombatMap,
-		std::map<int, CharacterData>* argCharacterMap,
-		std::map<int, EnemyData>* argEnemyMap
-	);
-	~InCombat();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update(double delta);
-	void FrameEnd();
-	void RenderFrame();
-	void Render(SDL_Surface* const);
-
-	//Event handlers
-	void QuitEvent();
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
-	void KeyDown(SDL_KeyboardEvent const&);
-	void KeyUp(SDL_KeyboardEvent const&);
-
-	//Network handlers
-	void HandlePacket(SerialPacket);
-	void HandleDisconnect(SerialPacket);
-	//TODO: more
-
-	//Server control
-	void SendPlayerUpdate();
-	void RequestDisconnect();
-	void RequestShutdown();
-	//TODO: more
-
-	//shared parameters
-	ConfigUtility& config;
-	UDPNetworkUtility& network;
-	int& clientIndex;
-	int& accountIndex;
-	int& characterIndex;
-	std::map<int, CombatData>& combatMap;
-	std::map<int, CharacterData>& characterMap;
-	std::map<int, EnemyData>& enemyMap;
-
-	//graphics
-	//TODO: graphics
-
-	//UI
-	//TODO: UI
-	FrameRate fps;
-};
-
-#endif

client/in_world.cpp

@@ -1,452 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "in_world.hpp"
-
-#include "channels.hpp"
-
-#include <algorithm>
-#include <cmath>
-#include <stdexcept>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-InWorld::InWorld(
-	ConfigUtility* const argConfig,
-	UDPNetworkUtility* const argNetwork,
-	int* const argClientIndex,
-	int* const argAccountIndex,
-	int* const argCharacterIndex,
-	std::map<int, CombatData>* argCombatMap,
-	std::map<int, CharacterData>* argCharacterMap
-	):
-	config(*argConfig),
-	network(*argNetwork),
-	clientIndex(*argClientIndex),
-	accountIndex(*argAccountIndex),
-	characterIndex(*argCharacterIndex),
-	combatMap(*argCombatMap),
-	characterMap(*argCharacterMap)
-{
-	//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?
-	tileSheet.Load(config["dir.tilesets"] + "terrain.bmp", 12, 15);
-
-	//request a sync
-	RequestSynchronize();
-
-	//debug
-//	RequestRegion(0, 0);
-}
-
-InWorld::~InWorld() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void InWorld::FrameStart() {
-	//
-}
-
-void InWorld::Update(double delta) {
-	SerialPacket packet;
-
-	//suck in all waiting packets
-	while(network.Receive(&packet)) {
-		HandlePacket(packet);
-	}
-
-	//update the characters
-	for (auto& it : characterMap) {
-		it.second.Update(delta);
-	}
-
-	//update the camera
-	if(localCharacter) {
-		camera.x = localCharacter->position.x - camera.marginX;
-		camera.y = localCharacter->position.y - camera.marginY;
-	}
-
-	//check the map
-	UpdateMap();
-}
-
-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 (auto it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); it++) {
-		tileSheet.DrawRegionTo(screen, *it, camera.x, camera.y);
-	}
-
-	//draw characters
-	for (auto& it : characterMap) {
-		//TODO: drawing order according to Y position
-		it.second.DrawTo(screen, camera.x, camera.y);
-	}
-
-	//draw UI
-	disconnectButton.DrawTo(screen);
-	shutDownButton.DrawTo(screen);
-	font.DrawStringTo(to_string_custom(fps.GetFrameRate()), screen, 0, 0);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void InWorld::QuitEvent() {
-	//exit the game AND the server
-	RequestDisconnect();
-	SetNextScene(SceneList::MAINMENU);
-}
-
-void InWorld::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	disconnectButton.MouseMotion(motion);
-	shutDownButton.MouseMotion(motion);
-}
-
-void InWorld::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	disconnectButton.MouseButtonDown(button);
-	shutDownButton.MouseButtonDown(button);
-}
-
-void InWorld::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (disconnectButton.MouseButtonUp(button) == Button::State::HOVER) {
-		RequestDisconnect();
-	}
-	if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER) {
-		RequestShutDown();
-	}
-}
-
-void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE: {
-			QuitEvent();
-		}
-		break;
-
-		//player movement
-		case SDLK_LEFT:
-			if (localCharacter) {
-				localCharacter->motion.x -= CHARACTER_WALKING_SPEED;
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_RIGHT:
-			if (localCharacter) {
-				localCharacter->motion.x += CHARACTER_WALKING_SPEED;
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_UP:
-			if (localCharacter) {
-				localCharacter->motion.y -= CHARACTER_WALKING_SPEED;
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_DOWN:
-			if (localCharacter) {
-				localCharacter->motion.y += CHARACTER_WALKING_SPEED;
-				SendPlayerUpdate();
-			}
-		break;
-	}
-}
-
-void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		//player movement
-		case SDLK_LEFT:
-			if (localCharacter) {
-				localCharacter->motion.x += CHARACTER_WALKING_SPEED;
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_RIGHT:
-			if (localCharacter) {
-				localCharacter->motion.x -= CHARACTER_WALKING_SPEED;
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_UP:
-			if (localCharacter) {
-				localCharacter->motion.y += CHARACTER_WALKING_SPEED;
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_DOWN:
-			if (localCharacter) {
-				localCharacter->motion.y -= CHARACTER_WALKING_SPEED;
-				SendPlayerUpdate();
-			}
-		break;
-	}
-}
-
-//-------------------------
-//Network handlers
-//-------------------------
-
-void InWorld::HandlePacket(SerialPacket packet) {
-	switch(packet.meta.type) {
-		case SerialPacket::Type::DISCONNECT:
-			HandleDisconnect(packet);
-		break;
-		case SerialPacket::Type::REGION_CONTENT:
-			HandleRegionContent(packet);
-		break;
-		case SerialPacket::Type::CHARACTER_UPDATE:
-			HandleCharacterUpdate(packet);
-		break;
-		case SerialPacket::Type::CHARACTER_NEW:
-			HandleCharacterNew(packet);
-		break;
-		case SerialPacket::Type::CHARACTER_DELETE:
-			HandleCharacterDelete(packet);
-		break;
-		//handle errors
-		default:
-			throw(std::runtime_error(std::string() + "Unknown SerialPacket::Type encountered in InWorld: " + to_string_custom(int(packet.meta.type))));
-		break;
-	}
-}
-
-void InWorld::HandleDisconnect(SerialPacket packet) {
-	network.Unbind(Channels::SERVER);
-	clientIndex = -1;
-	accountIndex = -1;
-	characterIndex = -1;
-	SetNextScene(SceneList::MAINMENU);
-}
-
-void InWorld::HandleRegionContent(SerialPacket packet) {
-	//replace existing regions
-	regionPager.UnloadRegion(packet.regionInfo.x, packet.regionInfo.y);
-	regionPager.PushRegion(packet.regionInfo.region);
-	packet.regionInfo.region = nullptr;
-}
-
-void InWorld::HandleCharacterUpdate(SerialPacket packet) {
-	if (characterMap.find(packet.characterInfo.characterIndex) == characterMap.end()) {
-		HandleCharacterNew(packet);
-		return;
-	}
-
-	//update only if the message didn't originate from here
-	if (packet.characterInfo.clientIndex != clientIndex) {
-		characterMap[packet.characterInfo.characterIndex].position = packet.characterInfo.position;
-		characterMap[packet.characterInfo.characterIndex].motion = packet.characterInfo.motion;
-	}
-	characterMap[packet.characterInfo.characterIndex].CorrectSprite();
-}
-
-void InWorld::HandleCharacterNew(SerialPacket packet) {
-	if (characterMap.find(packet.characterInfo.characterIndex) != characterMap.end()) {
-		throw(std::runtime_error("Cannot create duplicate characters"));
-	}
-
-	//create the character object
-	CharacterData& character = characterMap[packet.characterInfo.characterIndex];
-
-	//set the members
-	character.handle = packet.characterInfo.handle;
-	character.avatar = packet.characterInfo.avatar;
-	character.sprite.LoadSurface(config["dir.sprites"] + character.avatar, 4, 4);
-	character.mapIndex = packet.characterInfo.mapIndex;
-	character.position = packet.characterInfo.position;
-	character.motion = packet.characterInfo.motion;
-	character.stats = packet.characterInfo.stats;
-
-	character.CorrectSprite();
-
-	//catch this client's player object
-	if (packet.characterInfo.characterIndex == characterIndex && !localCharacter) {
-		localCharacter = &character;
-
-		//setup the camera
-		//TODO: can't change the screen size?
-		camera.width = GetScreen()->w;
-		camera.height = GetScreen()->h;
-
-		//center on the player's character
-		camera.marginX = (GetScreen()->w / 2 - localCharacter->sprite.GetImage()->GetClipW() / 2);
-		camera.marginY = (GetScreen()->h / 2 - localCharacter->sprite.GetImage()->GetClipH() / 2);
-	}
-}
-
-void InWorld::HandleCharacterDelete(SerialPacket packet) {
-	//TODO: authenticate when own character is being deleted (linked to a TODO in the server)
-	//catch this client's player object
-	if (packet.characterInfo.characterIndex == characterIndex) {
-		characterIndex = -1;
-		localCharacter = nullptr;
-	}
-
-	characterMap.erase(packet.characterInfo.characterIndex);
-}
-
-//-------------------------
-//Server control
-//-------------------------
-
-void InWorld::RequestSynchronize() {
-	SerialPacket packet;
-
-	//request a sync
-	packet.meta.type = SerialPacket::Type::SYNCHRONIZE;
-	packet.clientInfo.clientIndex = clientIndex;
-	packet.clientInfo.accountIndex = accountIndex;
-	packet.clientInfo.characterIndex = characterIndex;
-
-	network.SendTo(Channels::SERVER, &packet);
-}
-
-void InWorld::SendPlayerUpdate() {
-	SerialPacket packet;
-
-	//pack the packet
-	packet.meta.type = SerialPacket::Type::CHARACTER_UPDATE;
-	packet.characterInfo.clientIndex = clientIndex;
-	packet.characterInfo.accountIndex = accountIndex;
-	packet.characterInfo.characterIndex = characterIndex;
-	packet.characterInfo.position = localCharacter->position;
-	packet.characterInfo.motion = localCharacter->motion;
-
-	network.SendTo(Channels::SERVER, &packet);
-}
-
-void InWorld::RequestDisconnect() {
-	SerialPacket packet;
-
-	//send a disconnect request
-	packet.meta.type = SerialPacket::Type::DISCONNECT;
-	packet.clientInfo.clientIndex = clientIndex;
-	packet.clientInfo.accountIndex = accountIndex;
-	packet.clientInfo.characterIndex = characterIndex;
-
-	network.SendTo(Channels::SERVER, &packet);
-}
-
-void InWorld::RequestShutDown() {
-	SerialPacket packet;
-
-	//send a shutdown request
-	packet.meta.type = SerialPacket::Type::SHUTDOWN;
-	packet.clientInfo.clientIndex = clientIndex;
-	packet.clientInfo.accountIndex = accountIndex;
-	packet.clientInfo.characterIndex = characterIndex;
-
-	network.SendTo(Channels::SERVER, &packet);
-}
-
-void InWorld::RequestRegion(int mapIndex, int x, int y) {
-	SerialPacket packet;
-
-	//pack the region's data
-	packet.meta.type = SerialPacket::Type::REGION_REQUEST;
-	packet.regionInfo.mapIndex = mapIndex;
-	packet.regionInfo.x = x;
-	packet.regionInfo.y = y;
-
-	network.SendTo(Channels::SERVER, &packet);
-}
-
-//-------------------------
-//Utilities
-//-------------------------
-
-//TODO: convert this into a more generic function?; using parameters for the bounds
-void InWorld::UpdateMap() {
-	//these represent the zone of regions that the client needs loaded, including the mandatory buffers (+1/-1)
-	int xStart = snapToBase(REGION_WIDTH, camera.x/tileSheet.GetTileW()) - REGION_WIDTH;
-	int xEnd = snapToBase(REGION_WIDTH, (camera.x+camera.width)/tileSheet.GetTileW()) + REGION_WIDTH;
-
-	int yStart = snapToBase(REGION_HEIGHT, camera.y/tileSheet.GetTileH()) - REGION_HEIGHT;
-	int yEnd = snapToBase(REGION_HEIGHT, (camera.y+camera.height)/tileSheet.GetTileH()) + REGION_HEIGHT;
-
-	//prune distant regions
-	for (auto it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); /* EMPTY */) {
-		//check if the region is outside off this area
-		if ((*it)->GetX() < xStart || (*it)->GetX() > xEnd || (*it)->GetY() < yStart || (*it)->GetY() > yEnd) {
-
-			//clunky, but the alternative was time consuming
-			int tmpX = (*it)->GetX();
-			int tmpY = (*it)->GetY();
-			++it;
-
-			regionPager.UnloadRegion(tmpX, tmpY);
-			continue;
-		}
-		++it;
-	}
-
-	//request empty regions within this zone
-	for (int i = xStart; i <= xEnd; i += REGION_WIDTH) {
-		for (int j = yStart; j <= yEnd; j += REGION_HEIGHT) {
-			if (!regionPager.FindRegion(i, j)) {
-				RequestRegion(0, i, j);
-			}
-		}
-	}
-}

client/in_world.hpp

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

client/lobby_menu.cpp

@@ -1,237 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "lobby_menu.hpp"
-
-#include "channels.hpp"
-#include "utility.hpp"
-
-#include <stdexcept>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-LobbyMenu::LobbyMenu(
-	ConfigUtility* const argConfig,
-	UDPNetworkUtility* const argNetwork,
-	int* const argClientIndex,
-	int* const argAccountIndex,
-	int* const argCharacterIndex
-	):
-	config(*argConfig),
-	network(*argNetwork),
-	clientIndex(*argClientIndex),
-	accountIndex(*argAccountIndex),
-	characterIndex(*argCharacterIndex)
-{
-	//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
-	search.SetImage(&image);
-	search.SetFont(&font);
-	join.SetImage(&image);
-	join.SetFont(&font);
-	back.SetImage(&image);
-	back.SetFont(&font);
-
-	//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 texts
-	search.SetText("Search");
-	join.SetText("Join");
-	back.SetText("Back");
-
-	//set the server list's position
-	listBox = {300, 50, 200, font.GetCharH()};
-}
-
-LobbyMenu::~LobbyMenu() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void LobbyMenu::FrameStart() {
-	//
-}
-
-void LobbyMenu::Update(double delta) {
-	//suck in and process all waiting packets
-	SerialPacket packet;
-	while(network.Receive(&packet)) {
-		HandlePacket(packet);
-	}
-}
-
-void LobbyMenu::FrameEnd() {
-	//
-}
-
-void LobbyMenu::Render(SDL_Surface* const screen) {
-	//TODO: I need a proper UI system for the entire client and the editor
-
-	//UI
-	search.DrawTo(screen);
-	join.DrawTo(screen);
-	back.DrawTo(screen);
-
-	//TODO: draw headers for the server list
-	for (int i = 0; i < serverInfo.size(); i++) {
-		//draw the selected server's highlight
-		if (selection == &serverInfo[i]) {
-			SDL_Rect r = listBox;
-			r.y += i * listBox.h;
-			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 255, 127, 39));
-		}
-
-		//draw the server name
-		font.DrawStringTo(serverInfo[i].name, screen, listBox.x, listBox.y + i*listBox.h);
-
-		//draw the player count
-		font.DrawStringTo(to_string_custom(serverInfo[i].playerCount), screen, listBox.x + listBox.w, listBox.y + i*listBox.h);
-
-		//compatible?
-		if (!serverInfo[i].compatible) {
-			font.DrawStringTo("?", screen, listBox.x - font.GetCharW(), listBox.y + i*listBox.h);
-		}
-
-		//TODO: ping/delay?
-	}
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void LobbyMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	search.MouseMotion(motion);
-	join.MouseMotion(motion);
-	back.MouseMotion(motion);
-}
-
-void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	search.MouseButtonDown(button);
-	join.MouseButtonDown(button);
-	back.MouseButtonDown(button);
-}
-
-void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (search.MouseButtonUp(button) == Button::State::HOVER) {
-		//broadcast to the network, or a specific server
-		SerialPacket packet;
-		packet.meta.type = SerialPacket::Type::BROADCAST_REQUEST;
-		network.SendTo(config["server.host"].c_str(), config.Int("server.port"), &packet);
-
-		//reset the server list
-		serverInfo.clear();
-		selection = nullptr;
-	}
-
-	else if (join.MouseButtonUp(button) == Button::State::HOVER && selection != nullptr && selection->compatible) {
-		//pack the packet
-		SerialPacket packet;
-		packet.meta.type = SerialPacket::Type::JOIN_REQUEST;
-		strncpy(packet.clientInfo.username, config["client.username"].c_str(), PACKET_STRING_SIZE);
-		strncpy(packet.clientInfo.handle, config["client.handle"].c_str(), PACKET_STRING_SIZE);
-		strncpy(packet.clientInfo.avatar, config["client.avatar"].c_str(), PACKET_STRING_SIZE);
-
-		//join the selected server
-		network.SendTo(&selection->address, &packet);
-		selection = nullptr;
-	}
-
-	else if (back.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::MAINMENU);
-	}
-
-	else if (
-		//has the user selected a server on the list?
-		button.x > listBox.x &&
-		button.x < listBox.x + listBox.w &&
-		button.y > listBox.y &&
-		button.y < listBox.y + listBox.h * serverInfo.size()
-		) {
-		selection = &serverInfo[(button.y - listBox.y)/listBox.h];
-	}
-	else {
-		selection = nullptr;
-	}
-}
-
-void LobbyMenu::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			SetNextScene(SceneList::MAINMENU);
-		break;
-	}
-}
-
-void LobbyMenu::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}
-
-//-------------------------
-//Network handlers
-//-------------------------
-
-void LobbyMenu::HandlePacket(SerialPacket packet) {
-		switch(packet.meta.type) {
-		case SerialPacket::Type::BROADCAST_RESPONSE: {
-			//extract the data
-			ServerInformation server;
-			server.address = packet.meta.srcAddress;
-			server.networkVersion = packet.serverInfo.networkVersion;
-			server.name = packet.serverInfo.name;
-			server.playerCount = packet.serverInfo.playerCount;
-
-			//NOTE: Check compatibility here
-			server.compatible = server.networkVersion == NETWORK_VERSION;
-
-			//push
-			serverInfo.push_back(server);
-		}
-		break;
-		case SerialPacket::Type::JOIN_RESPONSE:
-			clientIndex = packet.clientInfo.clientIndex;
-			accountIndex = packet.clientInfo.accountIndex;
-			characterIndex = packet.clientInfo.characterIndex;
-			network.Bind(&packet.meta.srcAddress, Channels::SERVER);
-			SetNextScene(SceneList::INWORLD);
-		break;
-
-		//handle errors
-		default:
-			throw(std::runtime_error(std::string() + "Unknown SerialPacket::Type encountered in LobbyMenu: " + to_string_custom(int(packet.meta.type))));
-		break;
-	}
-}

client/lobby_menu.hpp

@@ -1,100 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef LOBBYMENU_HPP_
-#define LOBBYMENU_HPP_
-
-//graphics & utilities
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-#include "config_utility.hpp"
-
-//network
-#include "udp_network_utility.hpp"
-
-//client
-#include "base_scene.hpp"
-
-//STL
-#include <vector>
-
-class LobbyMenu : public BaseScene {
-public:
-	//Public access members
-	LobbyMenu(
-		ConfigUtility* const argConfig,
-		UDPNetworkUtility* const argNetwork,
-		int* const argClientIndex,
-		int* const argAccountIndex,
-		int* const argCharacterIndex
-	);
-	~LobbyMenu();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update(double delta);
-	void FrameEnd();
-	void Render(SDL_Surface* const);
-
-	//Event handlers
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
-	void KeyDown(SDL_KeyboardEvent const&);
-	void KeyUp(SDL_KeyboardEvent const&);
-
-	//Network handlers
-	void HandlePacket(SerialPacket);
-
-	//shared parameters
-	ConfigUtility& config;
-	UDPNetworkUtility& network;
-	int& clientIndex;
-	int& accountIndex;
-	int& characterIndex;
-
-	//members
-	Image image;
-	RasterFont font;
-	Button search;
-	Button join;
-	Button back;
-
-	//server list
-	struct ServerInformation {
-		IPaddress address;
-		int networkVersion;
-		std::string name;
-		int playerCount;
-		bool compatible;
-	};
-
-	std::vector<ServerInformation> serverInfo;
-
-	//a terrible hack, forgive me
-	//I'd love a proper gui system for this
-	SDL_Rect listBox;
-	ServerInformation* selection = nullptr;
-};
-
-#endif

client/main.cpp

@@ -1,43 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "client_application.hpp"
-
-#include <stdexcept>
-#include <iostream>
-
-using namespace std;
-
-int main(int argc, char** argv) {
-	cout << "Beginning client" << endl;
-	try {
-		ClientApplication app;
-		app.Init(argc, argv);
-		app.Proc();
-		app.Quit();
-	}
-	catch(exception& e) {
-		cerr << "Fatal exception thrown: " << e.what() << endl;
-		return 1;
-	}
-	cout << "Clean exit" << endl;
-	return 0;
-}

client/main_menu.cpp

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

client/main_menu.hpp

@@ -1,63 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef MAINMENU_HPP_
-#define MAINMENU_HPP_
-
-#include "base_scene.hpp"
-
-#include "config_utility.hpp"
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-
-class MainMenu : public BaseScene {
-public:
-	//Public access members
-	MainMenu(ConfigUtility* const);
-	~MainMenu();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update(double delta);
-	void FrameEnd();
-	void Render(SDL_Surface* const);
-
-	//Event handlers
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
-	void KeyDown(SDL_KeyboardEvent const&);
-	void KeyUp(SDL_KeyboardEvent const&);
-
-	//shared parameters
-	ConfigUtility& config;
-
-	//members
-	Image image;
-	RasterFont font;
-	Button startButton;
-	Button optionsButton;
-	Button quitButton;
-};
-
-#endif

client/makefile

@@ -1,37 +0,0 @@
-#config
-INCLUDES+=. ../common/gameplay ../common/graphics ../common/map ../common/network ../common/ui ../common/utilities
-LIBS+=../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) -DGRAPHICS
-
-#source
-CXXSRC=$(wildcard *.cpp)
-
-#objects
-OBJDIR=obj
-OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-
-#output
-OUTDIR=../out
-OUT=$(addprefix $(OUTDIR)/,client)
-
-#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:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all

client/options_menu.cpp

@@ -1,102 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "options_menu.hpp"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-OptionsMenu::OptionsMenu(ConfigUtility* const argConfig):
-	config(*argConfig)
-{
-	//setup the utility objects
-	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
-
-	//pass the utility objects
-	backButton.SetImage(&image);
-	backButton.SetFont(&font);
-
-	//set the button positions
-	backButton.SetX(50);
-	backButton.SetY(50 + image.GetClipH() * 0);
-
-	//set the button texts
-	backButton.SetText("Back");
-}
-
-OptionsMenu::~OptionsMenu() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void OptionsMenu::FrameStart() {
-	//
-}
-
-void OptionsMenu::Update(double delta) {
-	//
-}
-
-void OptionsMenu::FrameEnd() {
-	//
-}
-
-void OptionsMenu::Render(SDL_Surface* const screen) {
-	backButton.DrawTo(screen);
-
-	font.DrawStringTo("Oh, were you looking for the options screen?", screen, 50, 30);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void OptionsMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	backButton.MouseMotion(motion);
-}
-
-void OptionsMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	backButton.MouseButtonDown(button);
-}
-
-void OptionsMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::MAINMENU);
-	}
-}
-
-void OptionsMenu::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			SetNextScene(SceneList::MAINMENU);
-		break;
-	}
-}
-
-void OptionsMenu::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}

client/options_menu.hpp

@@ -1,61 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef OPTIONSMENU_HPP_
-#define OPTIONSMENU_HPP_
-
-#include "base_scene.hpp"
-
-#include "config_utility.hpp"
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-
-class OptionsMenu : public BaseScene {
-public:
-	//Public access members
-	OptionsMenu(ConfigUtility* const);
-	~OptionsMenu();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update(double delta);
-	void FrameEnd();
-	void Render(SDL_Surface* const);
-
-	//Event handlers
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
-	void KeyDown(SDL_KeyboardEvent const&);
-	void KeyUp(SDL_KeyboardEvent const&);
-
-	//shared parameters
-	ConfigUtility& config;
-
-	//members
-	Image image;
-	RasterFont font;
-	Button backButton;
-};
-
-#endif

client/scene_list.hpp

@@ -1,40 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef SCENELIST_HPP_
-#define SCENELIST_HPP_
-
-enum class SceneList {
-	//these are reserved
-	QUIT,
-	CONTINUE,
-	FIRST,
-
-	//custom indexes
-	SPLASHSCREEN,
-	MAINMENU,
-	OPTIONSMENU,
-	LOBBYMENU,
-	INWORLD,
-	INCOMBAT,
-};
-
-#endif

client/splash_screen.cpp

@@ -1,51 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "splash_screen.hpp"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-SplashScreen::SplashScreen(ConfigUtility* const argConfig):
-	config(*argConfig)
-{
-	logo.LoadSurface(config["dir.logos"] + "krstudios.bmp");
-	startTick = std::chrono::steady_clock::now();
-}
-
-SplashScreen::~SplashScreen() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void SplashScreen::Update(double delta) {
-	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(1)) {
-		SetNextScene(SceneList::MAINMENU);
-	}
-}
-
-void SplashScreen::Render(SDL_Surface* const screen) {
-	logo.DrawTo(screen, (screen->w - logo.GetClipW()) / 2, (screen->h - logo.GetClipH()) / 2);
-}

client/splash_screen.hpp

@@ -1,51 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef SPLASHSCREEN_HPP_
-#define SPLASHSCREEN_HPP_
-
-#include "base_scene.hpp"
-
-#include "config_utility.hpp"
-#include "image.hpp"
-
-#include <chrono>
-
-class SplashScreen : public BaseScene {
-public:
-	//Public access members
-	SplashScreen(ConfigUtility* const);
-	~SplashScreen();
-
-protected:
-	//Frame loop
-	void Update(double delta);
-	void Render(SDL_Surface* const);
-
-	//shared parameters
-	ConfigUtility& config;
-
-	//members
-	std::chrono::steady_clock::time_point startTick;
-	Image logo;
-};
-
-#endif

common/gameplay/account_data.hpp

@@ -1,36 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef ACCOUNTDATA_HPP_
-#define ACCOUNTDATA_HPP_
-
-#include <string>
-
-struct AccountData {
-	std::string username;
-	//TODO: password
-	bool blackListed = false;
-	bool whiteListed = true;
-
-	int clientIndex;
-};
-
-#endif

common/gameplay/character_data.cpp

@@ -1,67 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "character_data.hpp"
-
-void CharacterData::Update(double delta) {
-	if (motion.x && motion.y) {
-		position += motion * delta * CHARACTER_WALKING_MOD;
-	}
-	else if (motion != 0) {
-		position += motion * delta;
-	}
-#ifdef GRAPHICS
-	sprite.Update(delta);
-#endif
-}
-
-#ifdef GRAPHICS
-
-void CharacterData::DrawTo(SDL_Surface* const dest, int camX, int camY) {
-	sprite.DrawTo(dest, position.x - camX, position.y - camY);
-}
-
-void CharacterData::CorrectSprite() {
-	//NOTE: These must correspond to the sprite sheet in use
-	if (motion.y > 0) {
-		sprite.SetYIndex(0);
-	}
-	else if (motion.y < 0) {
-		sprite.SetYIndex(1);
-	}
-	else if (motion.x > 0) {
-		sprite.SetYIndex(3);
-	}
-	else if (motion.x < 0) {
-		sprite.SetYIndex(2);
-	}
-
-	//animation
-	if (motion != 0) {
-		sprite.SetDelay(0.1);
-	}
-	else {
-		sprite.SetDelay(0);
-		sprite.SetXIndex(0);
-	}
-}
-
-#endif

common/gameplay/character_data.hpp

@@ -1,80 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef CHARACTERDATA_HPP_
-#define CHARACTERDATA_HPP_
-
-//POD members
-#include "bbox.hpp"
-#include "vector2.hpp"
-#include "statistics.hpp"
-
-//graphics
-#ifdef GRAPHICS
- #include "sprite_sheet.hpp"
-#endif
-
-//std namespace
-#include <string>
-#include <cmath>
-
-//the speeds that the characters move
-constexpr double CHARACTER_WALKING_SPEED = 140.0;
-constexpr double CHARACTER_WALKING_MOD = 1.0/sqrt(2.0);
-
-struct CharacterData {
-	//metadata
-	int owner;
-	std::string handle;
-	std::string avatar;
-
-	//world position
-	int mapIndex = 0;
-	Vector2 position = {0.0,0.0};
-	Vector2 motion = {0.0,0.0};
-
-	//base statistics
-	Statistics stats;
-
-	//TODO: equipment
-	//TODO: items
-	//TODO: buffs
-	//TODO: debuffs
-
-	//methods
-	void Update(double delta);
-#ifdef GRAPHICS
-	void DrawTo(SDL_Surface* const, int camX, int camY);
-	void CorrectSprite();
-#endif
-
-	//active gameplay members
-	//NOTE: these are lost when unloaded
-#ifdef GRAPHICS
-	SpriteSheet sprite;
-#endif
-	BBox bbox = {0,0,0,0};
-	bool inCombat = false;
-	int atbGauge = 0;
-	//TODO: stored command
-};
-
-#endif

common/gameplay/combat_data.hpp

@@ -1,64 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef COMBATDATA_HPP_
-#define COMBATDATA_HPP_
-
-//POD members
-#include "vector2.hpp"
-#include "bbox.hpp"
-
-//gameplay members
-#include "character_data.hpp"
-#include "enemy_data.hpp"
-
-//graphics
-#ifdef GRAPHICS
- #include "sprite_sheet.hpp"
-#endif
-
-//std namespace
-#include <chrono>
-#include <list>
-#include <utility>
-
-struct CombatData {
-	typedef std::chrono::steady_clock Clock;
-
-	//combatants, point to the std::map's internal pairs
-	std::list<std::pair<const int, CharacterData>*> characterList;
-	std::list<std::pair<const int, EnemyData>*> enemyList;
-
-	//world interaction
-	int mapIndex = 0;
-	Vector2 position = {0.0,0.0};
-	BBox bbox = {0,0,0,0};
-
-	//time interval
-	Clock::time_point lastTick = Clock::now();
-
-	//graphics
-#ifdef GRAPHICS
-	SpriteSheet sprite;
-#endif
-};
-
-#endif

common/gameplay/enemy_data.hpp

@@ -1,58 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef ENEMYDATA_HPP_
-#define ENEMYDATA_HPP_
-
-//gameplay
-#include "statistics.hpp"
-
-//graphics
-#ifdef GRAPHICS
- #include "sprite_sheet.hpp"
-#endif
-
-//std namespace
-#include <string>
-
-struct EnemyData {
-	//metadata
-	std::string handle;
-	std::string avatar;
-
-	//gameplay
-	Statistics stats;
-
-	//TODO: equipment
-	//TODO: items
-	//TODO: buffs
-	//TODO: debuffs
-
-	//active gameplay members
-	//NOTE: these are lost when unloaded
-#ifdef GRAPHICS
-	SpriteSheet sprite;
-#endif
-	int tableIndex;
-	int atbGauge = 0;
-};
-
-#endif

common/gameplay/makefile

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

common/gameplay/sanity_check.cpp

@@ -1,36 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "account_data.hpp"
-#include "character_data.hpp"
-#include "client_data.hpp"
-#include "combat_data.hpp"
-#include "enemy_data.hpp"
-#include "statistics.hpp"
-
-/* DOCS: Sanity check, read more
- * Since most/all of the files in this directory are header files, I've created
- * this source file as a "sanity check", to ensure that the above header files
- * are written correctly via make.
- * 
- * Oddly enough, I'm pretty sure this is the first directory compiled in a
- * clean build.
-*/

common/gameplay/statistics.hpp

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

common/graphics/image.cpp

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

common/graphics/image.hpp

@@ -1,73 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef IMAGE_HPP_
-#define IMAGE_HPP_
-
-#include "SDL/SDL.h"
-#include <string>
-
-class Image {
-public:
-	Image() = default;
-	Image(Image const& rhs) { *this = rhs; }
-	Image(Image&& rhs) { *this = std::move(rhs); }
-	Image(std::string fname) { LoadSurface(fname); }
-	Image(Uint16 w, Uint16 h) { CreateSurface(w, h); }
-	Image(SDL_Surface* p) { SetSurface(p); }
-	~Image() { FreeSurface(); }
-
-	Image& operator=(Image const&);
-	Image& operator=(Image&&);
-
-	SDL_Surface* LoadSurface(std::string fname);
-	SDL_Surface* CreateSurface(Uint16 w, Uint16 h);
-	SDL_Surface* SetSurface(SDL_Surface*);
-	SDL_Surface* GetSurface() const { return surface; }
-	void FreeSurface();
-
-	void DrawTo(SDL_Surface* const, Sint16 x, Sint16 y);
-
-	//Clip handlers
-	SDL_Rect SetClip(SDL_Rect r) { return clip = r; }
-	SDL_Rect GetClip() const { return clip; }
-
-	Sint16 SetClipX(Sint16 x) { return clip.x = x; }
-	Sint16 SetClipY(Sint16 y) { return clip.y = y; }
-	Uint16 SetClipW(Uint16 w) { return clip.w = w; }
-	Uint16 SetClipH(Uint16 h) { return clip.h = h; }
-
-	Sint16 GetClipX() const { return clip.x; }
-	Sint16 GetClipY() const { return clip.y; }
-	Uint16 GetClipW() const { return clip.w; }
-	Uint16 GetClipH() const { return clip.h; }
-
-	bool GetLocal() const { return local; }
-
-	void SetTransparentColor(Uint8 r, Uint8 g, Uint8 b);
-	void ClearTransparentColor();
-protected:
-	SDL_Surface* surface = nullptr;
-	SDL_Rect clip = {0, 0, 0, 0};
-	bool local = false;
-};
-
-#endif

common/graphics/makefile

@@ -1,37 +0,0 @@
-#config
-INCLUDES+=. ../map
-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)/,libcommon.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

common/graphics/sprite_sheet.cpp

@@ -1,102 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "sprite_sheet.hpp"
-
-#include <stdexcept>
-#include <sstream>
-
-void SpriteSheet::Update(double delta) {
-	if (delay && (tick += delta) >= delay) {
-		if (++xIndex >= xCount) {
-			xIndex = 0;
-		}
-		tick = 0;
-	}
-	image.SetClipX(xIndex * image.GetClipW());
-	image.SetClipY(yIndex * image.GetClipH());
-}
-
-SDL_Surface* SpriteSheet::LoadSurface(std::string fname, Uint16 xCellCount, Uint16 yCellCount) {
-	image.LoadSurface(fname);
-
-	xCount = xCellCount;
-	yCount = yCellCount;
-
-	image.SetClipW(image.GetSurface()->w / xCount);
-	image.SetClipH(image.GetSurface()->h / yCount);
-
-	xIndex = yIndex = 0;
-	delay = tick = 0.0;
-}
-
-SDL_Surface* SpriteSheet::SetSurface(SDL_Surface* surface, Uint16 xCellCount, Uint16 yCellCount) {
-	image.SetSurface(surface);
-
-	xCount = xCellCount;
-	yCount = yCellCount;
-
-	image.SetClipW(image.GetSurface()->w / xCount);
-	image.SetClipH(image.GetSurface()->h / yCount);
-
-	xIndex = yIndex = 0;
-	delay = tick = 0.0;
-}
-
-void SpriteSheet::FreeSurface() {
-	image.FreeSurface();
-	xCount = yCount = 0;
-	xIndex = yIndex = 0;
-	delay = tick = 0.0;
-}
-
-Uint16 SpriteSheet::SetXCount(Uint16 i) {
-	xIndex = 0;
-	return xCount = i;
-}
-
-Uint16 SpriteSheet::SetYCount(Uint16 i) {
-	yIndex = 0;
-	return yCount = i;
-}
-
-Uint16 SpriteSheet::SetXIndex(Uint16 i) {
-	if (i > xCount) {
-		std::ostringstream os;
-		os << "Cannot set x index to " << i;
-		throw(std::invalid_argument(os.str()));
-	}
-	return xIndex = i;
-}
-
-Uint16 SpriteSheet::SetYIndex(Uint16 i) {
-	if (i > yCount) {
-		std::ostringstream os;
-		os << "Cannot set y index to " << i;
-		throw(std::invalid_argument(os.str()));
-	}
-	return yIndex = i;
-}
-
-double SpriteSheet::SetDelay(double d) {
-	tick = 0;
-	return delay = d;
-}

common/graphics/sprite_sheet.hpp

@@ -1,66 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef SPRITESHEET_HPP_
-#define SPRITESHEET_HPP_
-
-#include "image.hpp"
-
-class SpriteSheet {
-public:
-	SpriteSheet() = default;
-	SpriteSheet(std::string fname, Uint16 xCellCount, Uint16 yCellCount) { LoadSurface(fname, xCellCount, yCellCount); }
-	SpriteSheet(SDL_Surface* surface, Uint16 xCellCount, Uint16 yCellCount) { SetSurface(surface, xCellCount, yCellCount); }
-	~SpriteSheet() { FreeSurface(); };
-
-	void Update(double delta);
-
-	SDL_Surface* LoadSurface(std::string fname, Uint16 xCellCount, Uint16 yCellCount);
-	SDL_Surface* SetSurface(SDL_Surface* surface, Uint16 xCellCount, Uint16 yCellCount);
-	SDL_Surface* GetSurface() { return image.GetSurface(); }
-	void FreeSurface();
-
-	void DrawTo(SDL_Surface* const dest, Sint16 x, Sint16 y) { image.DrawTo(dest, x, y); }
-
-	//accessors and mutators
-	Image* GetImage() { return ℑ } //OO breaker
-
-	Uint16 SetXCount(Uint16);
-	Uint16 SetYCount(Uint16);
-	Uint16 SetXIndex(Uint16);
-	Uint16 SetYIndex(Uint16);
-
-	Uint16 GetXCount() const { return xCount; }
-	Uint16 GetYCount() const { return yCount; }
-	Uint16 GetXIndex() const { return xIndex; }
-	Uint16 GetYIndex() const { return yIndex; }
-
-	double SetDelay(double d);
-	double GetDelay() const { return delay; }
-
-private:
-	Image image;
-	Uint16 xCount = 0, yCount = 0; //number of cells
-	Uint16 xIndex = 0, yIndex = 0; //current cell being drawn
-	double delay = 0.0, tick = 0.0;
-};
-
-#endif

common/graphics/tile_sheet.cpp

@@ -1,61 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "tile_sheet.hpp"
-
-void TileSheet::Load(std::string fname, int xc, int yc) {
-	XCount = xc;
-	YCount = yc;
-	image.LoadSurface(fname);
-	image.SetClipW(image.GetClipW()/XCount);
-	image.SetClipH(image.GetClipH()/YCount);
-}
-
-void TileSheet::Unload() {
-	image.FreeSurface();
-	XCount = YCount = 0;
-}
-
-void TileSheet::DrawTo(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,54 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef TILESHEET_HPP_
-#define TILESHEET_HPP_
-
-#include "region.hpp"
-
-#include "image.hpp"
-
-#include <string>
-
-class TileSheet {
-public:
-	TileSheet() = default;
-	TileSheet(std::string f, int x, int y) { Load(f, x, y); }
-	~TileSheet() = default;
-
-	void Load(std::string fname, int XCount, int YCount);
-	void Unload();
-
-	void DrawTo(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:
-	Image image;
-	int XCount = 0, YCount = 0;
-};
-
-#endif

common/makefile

@@ -1,13 +0,0 @@
-all:
-	$(MAKE) -C gameplay
-	$(MAKE) -C graphics
-	$(MAKE) -C map
-	$(MAKE) -C network
-	$(MAKE) -C script
-	$(MAKE) -C ui
-	$(MAKE) -C utilities
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all

common/map/makefile

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

common/map/map_allocator.cpp

@@ -1,60 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "map_allocator.hpp"
-
-#include <stdexcept>
-
-void BlankAllocator::Create(Region** const ptr, int x, int y) {
-	(*ptr) = new Region(x, y);
-}
-
-void BlankAllocator::Unload(Region* const ptr) {
-	delete ptr;
-}
-
-void LuaAllocator::Create(Region** const ptr, int x, int y) {
-	//something to work on
-	(*ptr) = new Region(x, y);
-
-	//API hook
-	lua_getglobal(state, "map");
-	lua_getfield(state, -1, "create");
-	lua_pushlightuserdata(state, *ptr);
-	if (lua_pcall(state, 1, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));
-	}
-	lua_pop(state, 1);
-}
-
-void LuaAllocator::Unload(Region* const ptr) {
-	//API hook
-	lua_getglobal(state, "map");
-	lua_getfield(state, -1, "unload");
-	lua_pushlightuserdata(state, ptr);
-	if (lua_pcall(state, 1, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));
-	}
-	lua_pop(state, 1);
-
-	//clean up the memory
-	delete ptr;
-}

common/map/map_allocator.hpp

@@ -1,48 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef MAPALLOCATOR_HPP_
-#define MAPALLOCATOR_HPP_
-
-#include "region.hpp"
-
-#include "lua/lua.hpp"
-
-class BlankAllocator {
-public:
-	void Create(Region** const, int x, int y);
-	void Unload(Region* const);
-private:
-	//
-};
-
-class LuaAllocator {
-public:
-	void Create(Region** const, int x, int y);
-	void Unload(Region* const);
-
-	lua_State* SetLuaState(lua_State* L) { return state = L; }
-	lua_State* GetLuaState() { return state; }
-private:
-	lua_State* state = nullptr;
-};
-
-#endif

common/map/map_file_format.cpp

@@ -1,66 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "map_file_format.hpp"
-
-#include <stdexcept>
-
-void DummyFormat::Load(Region** const ptr, int x, int y) {
-	//EMPTY
-}
-
-void DummyFormat::Save(Region* const ptr) {
-	//EMPTY
-}
-
-void LuaFormat::Load(Region** const ptr, int x, int y) {
-	//something to load into
-
-	if (!(*ptr)) {
-		(*ptr) = new Region(x, y);
-	}
-
-	//API hook
-	lua_getglobal(state, "map");
-	lua_getfield(state, -1, "load");
-	lua_pushlightuserdata(state, *ptr);
-	lua_pushstring(state, saveDir.c_str());
-	if (lua_pcall(state, 2, 1, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));
-	}
-	if (lua_toboolean(state, -1) == false) {
-		delete (*ptr);
-		(*ptr) = nullptr;
-	}
-	lua_pop(state, 2);
-}
-
-void LuaFormat::Save(Region* const ptr) {
-	//API hook
-	lua_getglobal(state, "map");
-	lua_getfield(state, -1, "save");
-	lua_pushlightuserdata(state, ptr);
-	lua_pushstring(state, saveDir.c_str());
-	if (lua_pcall(state, 2, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));
-	}
-	lua_pop(state, 1);
-}

common/map/map_file_format.hpp

@@ -1,60 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef MAPFILEFORMAT_HPP_
-#define MAPFILEFORMAT_HPP_
-
-#include "region.hpp"
-
-#include "lua/lua.hpp"
-
-#include <string>
-
-class DummyFormat {
-public:
-	void Load(Region** const, int x, int y);
-	void Save(Region* const);
-
-	std::string SetSaveDir(std::string s) { return saveDir = s; }
-	std::string GetSaveDir() { return saveDir; }
-private:
-	std::string saveDir;
-};
-
-//TODO: verbose save file format
-//TODO: compact save file format
-
-class LuaFormat {
-public:
-	void Load(Region** const, int x, int y);
-	void Save(Region* const);
-
-	std::string SetSaveDir(std::string s) { return saveDir = s; }
-	std::string GetSaveDir() { return saveDir; }
-
-	lua_State* SetLuaState(lua_State* L) { return state = L; }
-	lua_State* GetLuaState() { return state; }
-private:
-	std::string saveDir;
-	lua_State* state = nullptr;
-};
-
-#endif

common/map/region.cpp

@@ -1,39 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "region.hpp"
-
-Region::Region(int argX, int argY):
-	x(argX),
-	y(argY)
-{
-	for (register int i = 0; i < REGION_WIDTH*REGION_HEIGHT*REGION_DEPTH; ++i) {
-		*(reinterpret_cast<type_t*>(tiles) + i) = 0;
-	}
-}
-
-Region::type_t Region::SetTile(int x, int y, int z, type_t v) {
-	return tiles[x][y][z] = v;
-}
-
-Region::type_t Region::GetTile(int x, int y, int z) {
-	return tiles[x][y][z];
-}

common/map/region.hpp

@@ -1,50 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef REGION_HPP_
-#define REGION_HPP_
-
-#define REGION_WIDTH 20
-#define REGION_HEIGHT 20
-#define REGION_DEPTH 3
-
-class Region {
-public:
-	typedef unsigned short type_t;
-
-	Region() = delete;
-	Region(int x, int y);
-	~Region() = default;
-
-	type_t SetTile(int x, int y, int z, type_t v);
-	type_t GetTile(int x, int y, int z);
-
-	//accessors
-	int GetX() const { return x; }
-	int GetY() const { return y; }
-private:
-	const int x;
-	const int y;
-
-	type_t tiles[REGION_WIDTH][REGION_HEIGHT][REGION_DEPTH];
-};
-
-#endif

common/map/region_pager.cpp

@@ -1,67 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "region_pager.hpp"
-
-#include "utility.hpp"
-
-Region::type_t RegionPagerBase::SetTile(int x, int y, int z, Region::type_t v) {
-	Region* ptr = GetRegion(x, y);
-	return ptr->SetTile(x - ptr->GetX(), y - ptr->GetY(), z, v);
-}
-
-Region::type_t RegionPagerBase::GetTile(int x, int y, int z) {
-	Region* ptr = GetRegion(x, y);
-	return ptr->GetTile(x - ptr->GetX(), y - ptr->GetY(), z);
-}
-
-Region* RegionPagerBase::GetRegion(int x, int y) {
-	//snap the coords
-	x = snapToBase(REGION_WIDTH, x);
-	y = snapToBase(REGION_HEIGHT, y);
-
-	//get the region by various means
-	Region* ptr = nullptr;
-	ptr = FindRegion(x, y);
-	if (ptr) return ptr;
-	ptr = LoadRegion(x, y);
-	if (ptr) return ptr;
-	return CreateRegion(x, y);
-}
-
-Region* RegionPagerBase::FindRegion(int x, int y) {
-	//snap the coords
-	x = snapToBase(REGION_WIDTH, x);
-	y = snapToBase(REGION_HEIGHT, y);
-
-	//find the region
-	for (std::list<Region*>::iterator it = regionList.begin(); it != regionList.end(); it++) {
-		if ((*it)->GetX() == x && (*it)->GetY() == y) {
-			return *it;
-		}
-	}
-	return nullptr;
-}
-
-Region* RegionPagerBase::PushRegion(Region* ptr) {
-	regionList.push_front(ptr);
-	return regionList.front();
-}

common/map/region_pager.hpp

@@ -1,133 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef REGIONPAGER_HPP_
-#define REGIONPAGER_HPP_
-
-#include "region.hpp"
-#include "utility.hpp"
-
-#include <list>
-
-class RegionPagerBase {
-public:
-	RegionPagerBase() {};
-	virtual ~RegionPagerBase() {};
-
-	//tile manipulation
-	Region::type_t SetTile(int x, int y, int z, Region::type_t v);
-	Region::type_t GetTile(int x, int y, int z);
-
-	//region manipulation
-	Region* GetRegion(int x, int y);
-	Region* FindRegion(int x, int y);
-	Region* PushRegion(Region*);
-
-	//interface
-	virtual Region* LoadRegion(int x, int y) = 0;
-	virtual Region* SaveRegion(int x, int y) = 0;
-	virtual Region* CreateRegion(int x, int y) = 0;
-	virtual void UnloadRegion(int x, int y) = 0;
-	//TODO: delete existing regions
-
-	//accessors & mutators
-	std::list<Region*>* GetContainer() { return &regionList; }
-protected:
-	std::list<Region*> regionList;
-};
-
-template<typename Allocator, typename FileFormat>
-class RegionPager : public RegionPagerBase {
-public:
-	RegionPager() {};
-	~RegionPager() {
-		UnloadAll();
-	}
-
-	Region* LoadRegion(int x, int y) {
-		//snap the coords
-		x = snapToBase(REGION_WIDTH, x);
-		y = snapToBase(REGION_HEIGHT, y);
-
-		//load the region if possible
-		Region* ptr = nullptr;
-		format.Load(&ptr, x, y);
-		if (ptr) {
-			return PushRegion(ptr);
-		}
-		return nullptr;
-	}
-
-	Region* SaveRegion(int x, int y) {
-		//snap the coords
-		x = snapToBase(REGION_WIDTH, x);
-		y = snapToBase(REGION_HEIGHT, y);
-
-		//find & save the region
-		Region* ptr = FindRegion(x, y);
-		if (ptr) {
-			format.Save(ptr);
-		}
-		return ptr;
-	}
-
-	Region* CreateRegion(int x, int y) {
-		//snap the coords
-		x = snapToBase(REGION_WIDTH, x);
-		y = snapToBase(REGION_HEIGHT, y);
-
-		//create and push the object
-		Region* ptr = nullptr;
-		allocator.Create(&ptr, x, y);
-		return PushRegion(ptr);
-	}
-
-	void UnloadRegion(int x, int y) {
-		//snap the coords
-		x = snapToBase(REGION_WIDTH, x);
-		y = snapToBase(REGION_HEIGHT, y);
-
-		//custom loop
-		for (std::list<Region*>::iterator it = regionList.begin(); it != regionList.end(); /* EMPTY */) {
-			if ((*it)->GetX() == x && (*it)->GetY() == y) {
-				allocator.Unload(*it);
-				it = regionList.erase(it);
-				continue;
-			}
-			++it;
-		}
-	}
-	void UnloadAll() {
-		for (auto& it : regionList) {
-			allocator.Unload(it);
-		}
-		regionList.clear();
-	}
-
-	//accessors
-	Allocator* GetAllocator() { return &allocator; }
-	FileFormat* GetFormat() { return &format; }
-protected:
-	Allocator allocator;
-	FileFormat format;
-};
-
-#endif

common/network/makefile

@@ -1,37 +0,0 @@
-#config
-INCLUDES+=. ../gameplay ../map ../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)/,libcommon.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

common/network/serial.cpp

@@ -1,433 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "serial.hpp"
-
-#include "map_allocator.hpp"
-#include "statistics.hpp"
-
-#include <cstring>
-
-//-------------------------
-//Convenience Macros
-//-------------------------
-
-#define SERIALIZE(buffer, data, size) memcpy(buffer, data, size); buffer += size;
-#define DESERIALIZE(buffer, data, size) memcpy(data, buffer, size); buffer += size;
-
-//-------------------------
-//internal serialization functions
-//-------------------------
-
-void serializeType(SerialPacket* packet, char* buffer) {
-	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-}
-
-void serializeServer(SerialPacket* packet, char* buffer) {
-	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//server info
-	SERIALIZE(buffer, &packet->serverInfo.networkVersion, sizeof(int));
-	SERIALIZE(buffer, packet->serverInfo.name, PACKET_STRING_SIZE);
-	SERIALIZE(buffer, &packet->serverInfo.playerCount, sizeof(int));
-}
-
-void serializeClient(SerialPacket* packet, char* buffer) {
-	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//indexes
-	SERIALIZE(buffer, &packet->clientInfo.clientIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->clientInfo.accountIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->clientInfo.characterIndex, sizeof(int));
-
-	//texts
-	SERIALIZE(buffer, packet->clientInfo.username, PACKET_STRING_SIZE);
-	//TODO: password
-	SERIALIZE(buffer, packet->clientInfo.handle, PACKET_STRING_SIZE);
-	SERIALIZE(buffer, packet->clientInfo.avatar, PACKET_STRING_SIZE);
-}
-
-void serializeRegionFormat(SerialPacket* packet, char* buffer) {
-	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//format
-	SERIALIZE(buffer, &packet->regionInfo.mapIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->regionInfo.x, sizeof(int));
-	SERIALIZE(buffer, &packet->regionInfo.y, sizeof(int));
-}
-
-void serializeRegionContent(SerialPacket* packet, char* buffer) {
-	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//format
-	SERIALIZE(buffer, &packet->regionInfo.mapIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->regionInfo.x, sizeof(int));
-	SERIALIZE(buffer, &packet->regionInfo.y, sizeof(int));
-
-	//content
-	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++) {
-				*reinterpret_cast<Region::type_t*>(buffer) = packet->regionInfo.region->GetTile(i, j, k);
-				buffer += sizeof(Region::type_t);
-			}
-		}
-	}
-}
-
-void serializeCombat(SerialPacket* packet, char* buffer) {
-	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//integers
-	SERIALIZE(buffer, &packet->combatInfo.combatIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->combatInfo.difficulty, sizeof(int));
-	//TODO: more comabat info
-}
-
-void serializeStatistics(Statistics* stats, char* buffer) {
-	//integers
-	SERIALIZE(buffer, &stats->level, sizeof(int));
-	SERIALIZE(buffer, &stats->exp, sizeof(int));
-	SERIALIZE(buffer, &stats->maxHP, sizeof(int));
-	SERIALIZE(buffer, &stats->health, sizeof(int));
-	SERIALIZE(buffer, &stats->maxMP, sizeof(int));
-	SERIALIZE(buffer, &stats->mana, sizeof(int));
-	SERIALIZE(buffer, &stats->attack, sizeof(int));
-	SERIALIZE(buffer, &stats->defence, sizeof(int));
-	SERIALIZE(buffer, &stats->intelligence, sizeof(int));
-	SERIALIZE(buffer, &stats->resistance, sizeof(int));
-	SERIALIZE(buffer, &stats->speed, sizeof(int));
-
-	//floats
-	SERIALIZE(buffer, &stats->accuracy, sizeof(float));
-	SERIALIZE(buffer, &stats->evasion, sizeof(float));
-	SERIALIZE(buffer, &stats->luck, sizeof(float));
-}
-
-void serializeCharacter(SerialPacket* packet, char* buffer) {
-	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//indexes
-	SERIALIZE(buffer, &packet->characterInfo.clientIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->characterInfo.accountIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->characterInfo.characterIndex, sizeof(int));
-
-	//texts
-	SERIALIZE(buffer, packet->clientInfo.handle, PACKET_STRING_SIZE);
-	SERIALIZE(buffer, packet->clientInfo.avatar, PACKET_STRING_SIZE);
-
-	//vectors
-	SERIALIZE(buffer, &packet->characterInfo.position.x, sizeof(double));
-	SERIALIZE(buffer, &packet->characterInfo.position.y, sizeof(double));
-	SERIALIZE(buffer, &packet->characterInfo.motion.x, sizeof(double));
-	SERIALIZE(buffer, &packet->characterInfo.motion.y, sizeof(double));
-
-	//stats structure
-	serializeStatistics(&packet->characterInfo.stats, buffer);
-	buffer += sizeof(Statistics);
-}
-
-void serializeEnemy(SerialPacket* packet, char* buffer) {
-	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//texts
-	SERIALIZE(buffer, packet->clientInfo.handle, PACKET_STRING_SIZE);
-	SERIALIZE(buffer, packet->clientInfo.avatar, PACKET_STRING_SIZE);
-
-	//stats structure
-	serializeStatistics(&packet->characterInfo.stats, buffer);
-	buffer += sizeof(Statistics);
-}
-
-//-------------------------
-//internal deserialization functions
-//-------------------------
-
-void deserializeType(SerialPacket* packet, char* buffer) {
-	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-}
-
-void deserializeServer(SerialPacket* packet, char* buffer) {
-	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//server info
-	DESERIALIZE(buffer, &packet->serverInfo.networkVersion, sizeof(int));
-	DESERIALIZE(buffer, packet->serverInfo.name, PACKET_STRING_SIZE);
-	DESERIALIZE(buffer, &packet->serverInfo.playerCount, sizeof(int));
-}
-
-void deserializeClient(SerialPacket* packet, char* buffer) {
-	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//indexes
-	DESERIALIZE(buffer, &packet->clientInfo.clientIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->clientInfo.accountIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->clientInfo.characterIndex, sizeof(int));
-
-	//texts
-	DESERIALIZE(buffer, packet->clientInfo.username, PACKET_STRING_SIZE);
-	//TODO: password
-	DESERIALIZE(buffer, packet->clientInfo.handle, PACKET_STRING_SIZE);
-	DESERIALIZE(buffer, packet->clientInfo.avatar, PACKET_STRING_SIZE);
-}
-
-void deserializeRegionFormat(SerialPacket* packet, char* buffer) {
-	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//format
-	DESERIALIZE(buffer, &packet->regionInfo.mapIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->regionInfo.x, sizeof(int));
-	DESERIALIZE(buffer, &packet->regionInfo.y, sizeof(int));
-}
-
-void deserializeRegionContent(SerialPacket* packet, char* buffer) {
-	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//format
-	DESERIALIZE(buffer, &packet->regionInfo.mapIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->regionInfo.x, sizeof(int));
-	DESERIALIZE(buffer, &packet->regionInfo.y, sizeof(int));
-
-	//an object to work on
-	BlankAllocator().Create(
-		&packet->regionInfo.region,
-		packet->regionInfo.x,
-		packet->regionInfo.y
-	);
-
-	//content
-	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++) {
-				packet->regionInfo.region->SetTile(i, j, k, *reinterpret_cast<Region::type_t*>(buffer));
-				buffer += sizeof(Region::type_t);
-			}
-		}
-	}
-}
-
-
-void deserializeCombat(SerialPacket* packet, char* buffer) {
-	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//integers
-	DESERIALIZE(buffer, &packet->combatInfo.combatIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->combatInfo.difficulty, sizeof(int));
-	//TODO: more comabat info
-}
-
-
-void deserializeStatistics(Statistics* stats, char* buffer) {
-	//integers
-	DESERIALIZE(buffer, &stats->level, sizeof(int));
-	DESERIALIZE(buffer, &stats->exp, sizeof(int));
-	DESERIALIZE(buffer, &stats->maxHP, sizeof(int));
-	DESERIALIZE(buffer, &stats->health, sizeof(int));
-	DESERIALIZE(buffer, &stats->maxMP, sizeof(int));
-	DESERIALIZE(buffer, &stats->mana, sizeof(int));
-	DESERIALIZE(buffer, &stats->attack, sizeof(int));
-	DESERIALIZE(buffer, &stats->defence, sizeof(int));
-	DESERIALIZE(buffer, &stats->intelligence, sizeof(int));
-	DESERIALIZE(buffer, &stats->resistance, sizeof(int));
-	DESERIALIZE(buffer, &stats->speed, sizeof(int));
-
-	//floats
-	DESERIALIZE(buffer, &stats->accuracy, sizeof(float));
-	DESERIALIZE(buffer, &stats->evasion, sizeof(float));
-	DESERIALIZE(buffer, &stats->luck, sizeof(float));
-}
-
-void deserializeCharacter(SerialPacket* packet, char* buffer) {
-	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//indexes
-	DESERIALIZE(buffer, &packet->characterInfo.clientIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->characterInfo.accountIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->characterInfo.characterIndex, sizeof(int));
-
-	//texts
-	DESERIALIZE(buffer, packet->clientInfo.handle, PACKET_STRING_SIZE);
-	DESERIALIZE(buffer, packet->clientInfo.avatar, PACKET_STRING_SIZE);
-
-	//vectors
-	DESERIALIZE(buffer, &packet->characterInfo.position.x, sizeof(double));
-	DESERIALIZE(buffer, &packet->characterInfo.position.y, sizeof(double));
-	DESERIALIZE(buffer, &packet->characterInfo.motion.x, sizeof(double));
-	DESERIALIZE(buffer, &packet->characterInfo.motion.y, sizeof(double));
-
-	//stats structure
-	deserializeStatistics(&packet->characterInfo.stats, buffer);
-	buffer += sizeof(Statistics);
-}
-
-void deserializeEnemy(SerialPacket* packet, char* buffer) {
-	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-
-	//texts
-	DESERIALIZE(buffer, packet->clientInfo.handle, PACKET_STRING_SIZE);
-	DESERIALIZE(buffer, packet->clientInfo.avatar, PACKET_STRING_SIZE);
-
-	//stats structure
-	deserializeStatistics(&packet->characterInfo.stats, buffer);
-	buffer += sizeof(Statistics);
-}
-
-//-------------------------
-//the interface functions
-//-------------------------
-
-void serialize(SerialPacket* packet, void* buffer) {
-	switch(packet->meta.type) {
-		//no extra data
-		case SerialPacket::Type::NONE:
-		case SerialPacket::Type::PING:
-		case SerialPacket::Type::PONG:
-		case SerialPacket::Type::BROADCAST_REQUEST:
-
-		//all rejections
-		case SerialPacket::Type::BROADCAST_REJECTION:
-		case SerialPacket::Type::JOIN_REJECTION:
-		case SerialPacket::Type::REGION_REJECTION:
-		case SerialPacket::Type::CHARACTER_REJECTION:
-		case SerialPacket::Type::ENEMY_REJECTION:
-		case SerialPacket::Type::COMBAT_REJECTION:
-
-			serializeType(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//server info
-		case SerialPacket::Type::BROADCAST_RESPONSE:
-			serializeServer(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//client info
-		case SerialPacket::Type::JOIN_REQUEST:
-		case SerialPacket::Type::JOIN_RESPONSE:
-		case SerialPacket::Type::SYNCHRONIZE:
-		case SerialPacket::Type::DISCONNECT:
-		case SerialPacket::Type::SHUTDOWN:
-			serializeClient(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//region info
-		case SerialPacket::Type::REGION_REQUEST:
-			serializeRegionFormat(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		case SerialPacket::Type::REGION_CONTENT:
-			serializeRegionContent(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//combat info
-		case SerialPacket::Type::COMBAT_ENTER:
-		case SerialPacket::Type::COMBAT_EXIT:
-			serializeCombat(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//character info
-		case SerialPacket::Type::CHARACTER_NEW:
-		case SerialPacket::Type::CHARACTER_DELETE:
-		case SerialPacket::Type::CHARACTER_UPDATE:
-		case SerialPacket::Type::CHARACTER_STATS_REQUEST:
-		case SerialPacket::Type::CHARACTER_STATS_RESPONSE:
-			serializeCharacter(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//enemy info
-		case SerialPacket::Type::ENEMY_NEW:
-		case SerialPacket::Type::ENEMY_DELETE:
-		case SerialPacket::Type::ENEMY_UPDATE:
-		case SerialPacket::Type::ENEMY_STATS_REQUEST:
-		case SerialPacket::Type::ENEMY_STATS_RESPONSE:
-			serializeEnemy(packet, reinterpret_cast<char*>(buffer));
-		break;
-	}
-}
-
-void deserialize(SerialPacket* packet, void* buffer) {
-	//find the type, so that you can actually deserialize the packet!
-	deserializeType(packet, reinterpret_cast<char*>(buffer));
-	switch(packet->meta.type) {
-		//no extra data
-		case SerialPacket::Type::NONE:
-		case SerialPacket::Type::PING:
-		case SerialPacket::Type::PONG:
-		case SerialPacket::Type::BROADCAST_REQUEST:
-
-		//all rejections
-		case SerialPacket::Type::BROADCAST_REJECTION:
-		case SerialPacket::Type::JOIN_REJECTION:
-		case SerialPacket::Type::REGION_REJECTION:
-		case SerialPacket::Type::CHARACTER_REJECTION:
-		case SerialPacket::Type::ENEMY_REJECTION:
-		case SerialPacket::Type::COMBAT_REJECTION:
-
-			//NOTHING
-		break;
-
-		//server info
-		case SerialPacket::Type::BROADCAST_RESPONSE:
-			deserializeServer(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//client info
-		case SerialPacket::Type::JOIN_REQUEST:
-		case SerialPacket::Type::JOIN_RESPONSE:
-		case SerialPacket::Type::SYNCHRONIZE:
-		case SerialPacket::Type::DISCONNECT:
-		case SerialPacket::Type::SHUTDOWN:
-			deserializeClient(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//region info
-		case SerialPacket::Type::REGION_REQUEST:
-			deserializeRegionFormat(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		case SerialPacket::Type::REGION_CONTENT:
-			deserializeRegionContent(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//combat info
-		case SerialPacket::Type::COMBAT_ENTER:
-		case SerialPacket::Type::COMBAT_EXIT:
-			serializeCombat(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//character info
-		case SerialPacket::Type::CHARACTER_NEW:
-		case SerialPacket::Type::CHARACTER_DELETE:
-		case SerialPacket::Type::CHARACTER_UPDATE:
-		case SerialPacket::Type::CHARACTER_STATS_REQUEST:
-		case SerialPacket::Type::CHARACTER_STATS_RESPONSE:
-			deserializeCharacter(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//enemy info
-		case SerialPacket::Type::ENEMY_NEW:
-		case SerialPacket::Type::ENEMY_DELETE:
-		case SerialPacket::Type::ENEMY_UPDATE:
-		case SerialPacket::Type::ENEMY_STATS_REQUEST:
-		case SerialPacket::Type::ENEMY_STATS_RESPONSE:
-			serializeEnemy(packet, reinterpret_cast<char*>(buffer));
-		break;
-	}
-}

common/network/serial.hpp

@@ -1,38 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef SERIAL_HPP_
-#define SERIAL_HPP_
-
-#include "serial_packet.hpp"
-
-/* NOTE: Keep the PACKET_BUFFER_SIZE up to date
- * NOTE: REGION_CONTENT is currently the largest type of packet
- *  map content: REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH * sizoeof(region::type_t)
- *  map format: sizeof(int) * 3
- *  metadata: sizeof(SerialPacket::Type)
-*/
-#define PACKET_BUFFER_SIZE REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH * sizeof(Region::type_t) + sizeof(int) * 3 + sizeof(SerialPacket::Type)
-
-void serialize(SerialPacket* const, void* dest);
-void deserialize(SerialPacket* const, void* src);
-
-#endif

common/network/serial_packet.hpp

@@ -1,175 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef SERIALPACKET_HPP_
-#define SERIALPACKET_HPP_
-
-#include "vector2.hpp"
-#include "region.hpp"
-#include "statistics.hpp"
-
-#include "SDL/SDL_net.h"
-
-#define NETWORK_VERSION 20140528
-#define PACKET_STRING_SIZE 100
-
-union SerialPacket {
-	//types of packets
-	enum class Type {
-		//default: there is something wrong
-		NONE = 0,
-
-		//keep alive
-		PING = 1,
-		PONG = 2,
-
-		//searching for a server to join
-		BROADCAST_REQUEST = 3,
-		BROADCAST_RESPONSE = 4,
-		BROADCAST_REJECTION = 5,
-
-		//try to join the server
-		JOIN_REQUEST = 6,
-		JOIN_RESPONSE = 7,
-		JOIN_REJECTION = 8,
-
-		//mass update
-		SYNCHRONIZE = 9,
-
-		//disconnect from the server
-		DISCONNECT = 10,
-
-		//shut down the server
-		SHUTDOWN = 11,
-
-		//map data
-		REGION_REQUEST = 12,
-		REGION_CONTENT = 13,
-		REGION_REJECTION = 14,
-
-		//combat data
-		COMBAT_ENTER = 15,
-		COMBAT_EXIT = 16,
-
-		COMBAT_UPDATE = 17,
-
-		COMBAT_REJECTION = 18,
-
-		//character data
-		CHARACTER_NEW = 19,
-		CHARACTER_DELETE = 20,
-		CHARACTER_UPDATE = 21,
-
-		CHARACTER_STATS_REQUEST = 22,
-		CHARACTER_STATS_RESPONSE = 23,
-
-		CHARACTER_REJECTION = 24,
-
-		//enemy data
-		ENEMY_NEW = 25,
-		ENEMY_DELETE = 26,
-		ENEMY_UPDATE = 27,
-
-		ENEMY_STATS_REQUEST = 28,
-		ENEMY_STATS_RESPONSE = 29,
-
-		ENEMY_REJECTION = 30,
-
-		//more packet types go here
-
-		//not used
-		LAST,
-	};
-
-	//metadata on the packet itself
-	struct Metadata {
-		Type type;
-		IPaddress srcAddress;
-	}meta;
-
-	//info about the server
-	struct ServerInformation {
-		Metadata meta;
-		int networkVersion;
-		char name[PACKET_STRING_SIZE];
-		int playerCount;
-	}serverInfo;
-
-	//info about the client
-	struct ClientInformation {
-		Metadata meta;
-		int clientIndex;
-		int accountIndex;
-		int characterIndex;
-		char username[PACKET_STRING_SIZE];
-		//TODO: password
-		char handle[PACKET_STRING_SIZE];
-		char avatar[PACKET_STRING_SIZE];
-	}clientInfo;
-
-	//info about a region
-	struct RegionInformation {
-		Metadata meta;
-		int mapIndex;
-		int x, y;
-		Region* region;
-	}regionInfo;
-
-	//info about a combat scenario
-	struct CombatInformation {
-		Metadata meta;
-		int combatIndex;
-		int difficulty;
-		//TODO: background image, based on terrain type
-		//TODO: array of combatants
-		//TODO: rewards
-	}combatInfo;
-
-	//info about a character
-	struct CharacterInformation {
-		Metadata meta;
-		int clientIndex;
-		int accountIndex;
-		int characterIndex;
-		char handle[PACKET_STRING_SIZE];
-		char avatar[PACKET_STRING_SIZE];
-		int mapIndex;
-		Vector2 position;
-		Vector2 motion;
-		Statistics stats;
-	}characterInfo;
-
-	//info about an enemy
-	struct EnemyInformation {
-		Metadata meta;
-		char handle[PACKET_STRING_SIZE];
-		char avatar[PACKET_STRING_SIZE];
-		Statistics stats;
-	}enemyInfo;
-
-	//defaults
-	SerialPacket() {
-		meta.type = Type::NONE;
-		meta.srcAddress = {0,0};
-	}
-};
-
-#endif

common/network/udp_network_utility.cpp

@@ -1,224 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "udp_network_utility.hpp"
-
-#include "serial.hpp"
-
-#include <stdexcept>
-
-//DOCS: memset() is used before sending a packet to remove old data; you don't want to send sensitive data over the network
-//NOTE: don't confuse SerialPacket with UDPpacket
-
-void UDPNetworkUtility::Open(int port) {
-	socket = SDLNet_UDP_Open(port);
-	packet = SDLNet_AllocPacket(PACKET_BUFFER_SIZE);
-	if (!socket || !packet) {
-		Close();
-		throw(std::runtime_error("Failed to open UDPNetworkUtility"));
-	}
-}
-
-void UDPNetworkUtility::Close() {
-	SDLNet_UDP_Close(socket);
-	SDLNet_FreePacket(packet);
-	socket = nullptr;
-	packet = nullptr;
-}
-
-//-------------------------
-//bind to a channel
-//-------------------------
-
-int UDPNetworkUtility::Bind(const char* ip, int port, int channel) {
-	IPaddress add;
-	if (SDLNet_ResolveHost(&add, ip, port) == -1) {
-		throw(std::runtime_error("Failed to resolve a host"));
-	}
-
-	return Bind(&add, channel);
-}
-
-int UDPNetworkUtility::Bind(IPaddress* add, int channel) {
-	int ret = SDLNet_UDP_Bind(socket, channel, add);
-
-	if (ret < 0) {
-		throw(std::runtime_error("Failed to bind to a channel"));
-	}
-
-	return ret;
-}
-
-void UDPNetworkUtility::Unbind(int channel) {
-	SDLNet_UDP_Unbind(socket, channel);
-}
-
-//-------------------------
-//send a buffer
-//-------------------------
-
-int UDPNetworkUtility::SendTo(const char* ip, int port, void* data, int len) {
-	IPaddress add;
-	if (SDLNet_ResolveHost(&add, ip, port) == -1) {
-		throw(std::runtime_error("Failed to resolve a host"));
-	}
-
-	SendTo(&add, data, len);
-}
-
-int UDPNetworkUtility::SendTo(IPaddress* add, void* data, int len) {
-	if (len > packet->maxlen) {
-		throw(std::runtime_error("The buffer is to large for the UDPpacket"));
-	}
-	memset(packet->data, 0, packet->maxlen);
-	memcpy(packet->data, data, len);
-	packet->len = len;
-	packet->address = *add;
-
-	int ret = SDLNet_UDP_Send(socket, -1, packet);
-
-	if (ret <= 0) {
-		throw(std::runtime_error("Failed to send a packet"));
-	}
-
-	return ret;
-}
-
-int UDPNetworkUtility::SendTo(int channel, void* data, int len) {
-	if (len > packet->maxlen) {
-		throw(std::runtime_error("The buffer is to large for the UDPpacket"));
-	}
-	memset(packet->data, 0, packet->maxlen);
-	memcpy(packet->data, data, len);
-	packet->len = len;
-
-	int ret = SDLNet_UDP_Send(socket, channel, packet);
-
-	if (ret <= 0) {
-		throw(std::runtime_error("Failed to send a packet"));
-	}
-
-	return ret;
-}
-
-int UDPNetworkUtility::SendToAllChannels(void* data, int len) {
-	if (len > packet->maxlen) {
-		throw(std::runtime_error("The buffer is to large for the UDPpacket"));
-	}
-	memset(packet->data, 0, packet->maxlen);
-	memcpy(packet->data, data, len);
-	packet->len = len;
-
-	int sent = 0;
-
-	//send to all bound channels
-	for (int i = 0; i < SDLNET_MAX_UDPCHANNELS; i++) {
-		if (SDLNet_UDP_GetPeerAddress(socket, i)) {
-			sent += SDLNet_UDP_Send(socket, i, packet);
-		}
-	}
-
-	return sent;
-}
-
-//TODO: put a void* and int* parameter list here
-int UDPNetworkUtility::Receive() {
-	memset(packet->data, 0, packet->maxlen);
-	int ret = SDLNet_UDP_Recv(socket, packet);
-
-	if (ret < 0) {
-		throw(std::runtime_error("Unknown network error occured"));
-	}
-
-	return ret;
-}
-
-//-------------------------
-//send a SerialPacket
-//-------------------------
-
-int UDPNetworkUtility::SendTo(const char* ip, int port, SerialPacket* serialPacket) {
-	IPaddress add;
-	if (SDLNet_ResolveHost(&add, ip, port) == -1) {
-		throw(std::runtime_error("Failed to resolve a host"));
-	}
-
-	SendTo(&add, serialPacket);
-}
-
-int UDPNetworkUtility::SendTo(IPaddress* add, SerialPacket* serialPacket) {
-	memset(packet->data, 0, packet->maxlen);
-	serialize(serialPacket, packet->data);
-	packet->len = PACKET_BUFFER_SIZE;
-	packet->address = *add;
-
-	int ret = SDLNet_UDP_Send(socket, -1, packet);
-
-	if (ret <= 0) {
-		throw(std::runtime_error("Failed to send a packet"));
-	}
-
-	return ret;
-}
-
-int UDPNetworkUtility::SendTo(int channel, SerialPacket* serialPacket) {
-	memset(packet->data, 0, packet->maxlen);
-	serialize(serialPacket, packet->data);
-	packet->len = PACKET_BUFFER_SIZE;
-
-	int ret = SDLNet_UDP_Send(socket, channel, packet);
-
-	if (ret <= 0) {
-		throw(std::runtime_error("Failed to send a packet"));
-	}
-
-	return ret;
-}
-
-int UDPNetworkUtility::SendToAllChannels(SerialPacket* serialPacket) {
-	memset(packet->data, 0, packet->maxlen);
-	serialize(serialPacket, packet->data);
-	packet->len = PACKET_BUFFER_SIZE;
-
-	int sent = 0;
-
-	//send to all bound channels
-	for (int i = 0; i < SDLNET_MAX_UDPCHANNELS; i++) {
-		if (SDLNet_UDP_GetPeerAddress(socket, i)) {
-			sent += SDLNet_UDP_Send(socket, i, packet);
-		}
-	}
-
-	return sent;
-}
-
-int UDPNetworkUtility::Receive(SerialPacket* serialPacket) {
-	memset(packet->data, 0, packet->maxlen);
-	int ret = SDLNet_UDP_Recv(socket, packet);
-	deserialize(serialPacket, packet->data);
-	serialPacket->meta.srcAddress = packet->address;
-
-	if (ret < 0) {
-		throw(std::runtime_error("Unknown network error occured"));
-	}
-
-	return ret;
-}

common/network/udp_network_utility.hpp

@@ -1,72 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef UDPNETWORKUTILITY_HPP_
-#define UDPNETWORKUTILITY_HPP_
-
-#include "SDL/SDL_net.h"
-
-#include "serial_packet.hpp"
-
-class UDPNetworkUtility {
-public:
-	UDPNetworkUtility() = default;
-	~UDPNetworkUtility() = default;
-
-	void Open(int port);
-	void Close();
-
-	//bind to a channel
-	int Bind(const char* ip, int port, int channel = -1);
-	int Bind(IPaddress* add, int channel = -1);
-	void Unbind(int channel);
-
-	IPaddress* GetIPAddress(int channel) {
-		return SDLNet_UDP_GetPeerAddress(socket, channel);
-	}
-
-	//send a buffer
-	int SendTo(const char* ip, int port, void* data, int len);
-	int SendTo(IPaddress* add, void* data, int len);
-	int SendTo(int channel, void* data, int len);
-	int SendToAllChannels(void* data, int len);
-	int Receive();
-
-	//send a SerialPacket
-	int SendTo(const char* ip, int port, SerialPacket* serialPacket);
-	int SendTo(IPaddress* add, SerialPacket* serialPacket);
-	int SendTo(int channel, SerialPacket* serialPacket);
-	int SendToAllChannels(SerialPacket* serialPacket);
-	int Receive(SerialPacket* serialPacket);
-
-	//accessors
-	UDPpacket* GetPacket() const {
-		return packet;
-	}
-	UDPsocket GetSocket() const {
-		return socket;
-	}
-private:
-	UDPsocket socket = nullptr;
-	UDPpacket* packet = nullptr;
-};
-
-#endif

common/script/makefile

@@ -1,37 +0,0 @@
-#config
-INCLUDES+=. ../map ../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)/,libcommon.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

common/script/map_api.cpp

@@ -1,126 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "map_api.hpp"
-
-//map headers
-#include "map_allocator.hpp"
-#include "map_file_format.hpp"
-#include "region_pager.hpp"
-
-//NOTE: When operating on a region, setTile() & getTile() *are not* zero indexed, but when operating on the entire map they *are* zero indexed.
-
-static int setTile(lua_State* L) {
-	if (lua_gettop(L) == 5) {
-		//operating on a region
-		Region* ptr = (Region*)lua_touserdata(L, 1);
-		ptr->SetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1, lua_tointeger(L, 5));
-	}
-	else {
-		//operating on the whole map
-		lua_pushstring(L, "pager");
-		lua_gettable(L, LUA_REGISTRYINDEX);
-
-		//assume the pager is using lua
-		RegionPager<LuaAllocator, LuaFormat>* pager = reinterpret_cast<RegionPager<LuaAllocator, LuaFormat>*>(lua_touserdata(L, -1));
-
-		//balance the stack
-		lua_pop(L, 1);
-
-		pager->SetTile(lua_tointeger(L, 1), lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4));
-	}
-	return 0;
-}
-
-static int getTile(lua_State* L) {
-	if (lua_gettop(L) == 4) {
-		//operating on a region
-		Region* ptr = (Region*)lua_touserdata(L, 1);
-		int ret = ptr->GetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1);
-		lua_pushnumber(L, ret);
-	}
-	else {
-		//operating on the whole map
-		lua_pushstring(L, "pager");
-		lua_gettable(L, LUA_REGISTRYINDEX);
-
-		//assume the pager is using lua
-		RegionPager<LuaAllocator, LuaFormat>* pager = reinterpret_cast<RegionPager<LuaAllocator, LuaFormat>*>(lua_touserdata(L, -1));
-
-		//balance the stack
-		lua_pop(L, 1);
-
-		int ret = pager->GetTile(lua_tointeger(L, 1), lua_tointeger(L, 2), lua_tointeger(L, 3));
-		lua_pushnumber(L, ret);
-	}
-	return 1;
-}
-
-static int getX(lua_State* L) {
-	Region* ptr = (Region*)lua_touserdata(L, 1);
-	lua_pushinteger(L, ptr->GetX());
-	return 1;
-}
-
-static int getY(lua_State* L) {
-	Region* ptr = (Region*)lua_touserdata(L, 1);
-	lua_pushinteger(L, ptr->GetY());
-	return 1;
-}
-
-static int getRegionWidth(lua_State* L) {
-	lua_pushinteger(L, REGION_WIDTH);
-	return 1;
-}
-
-static int getRegionHeight(lua_State* L) {
-	lua_pushinteger(L, REGION_HEIGHT);
-	return 1;
-}
-
-static int getRegionDepth(lua_State* L) {
-	lua_pushinteger(L, REGION_DEPTH);
-	return 1;
-}
-
-static int dummy(lua_State* L) {
-	return 0;
-}
-
-static const luaL_Reg regionlib[] = {
-	{"create", dummy},
-	{"unload", dummy},
-	{"load", dummy},
-	{"save", dummy},
-	{"settile",setTile},
-	{"gettile",getTile},
-	{"getx",getX},
-	{"gety",getY},
-	{"getregionwidth",getRegionWidth},
-	{"getregionheight",getRegionHeight},
-	{"getregiondepth",getRegionDepth},
-	{nullptr, nullptr}
-};
-
-LUAMOD_API int luaopen_mapapi(lua_State* L) {
-	luaL_newlib(L, regionlib);
-	return 1;
-}

common/script/map_api.hpp

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

common/ui/button.cpp

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

common/ui/button.hpp

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

common/ui/makefile

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

common/ui/menu_bar.cpp

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

common/ui/menu_bar.hpp

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

common/ui/raster_font.cpp

@@ -1,60 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "raster_font.hpp"
-
-#include <stdexcept>
-
-/* It might be more efficient to render to a different surface (like an Image)
- * rather than calling this function with all of it's '%' and '/'.
-*/
-
-void RasterFont::DrawStringTo(std::string s, SDL_Surface* const dest, Sint16 x, Sint16 y) {
-	if (!image.GetSurface()) {
-		throw(std::runtime_error("RasterFont not loaded"));
-	}
-	const Uint16 w = image.GetClipW();
-	const Uint16 h = image.GetClipH();
-	for (int i = 0; i < s.size(); i++) {
-		image.SetClipX(s[i] % 16 * w);
-		image.SetClipY(s[i] / 16 * h);
-		image.DrawTo(dest, x + i * w, y);
-	}
-}
-
-/* Note: This class can only take a raster font with 16*16 characters, and the
- * indevidual characters must have the same dimensions. Overall this class is too
- * restrictive; I suggest using a 3rd party library.
-*/
-
-SDL_Surface* RasterFont::LoadSurface(std::string fname) {
-	image.LoadSurface(fname);
-	image.SetClipW(image.GetSurface()->w/16);
-	image.SetClipH(image.GetSurface()->h/16);
-	return image.GetSurface();
-}
-
-SDL_Surface* RasterFont::SetSurface(SDL_Surface* p) {
-	image.SetSurface(p);
-	image.SetClipW(image.GetSurface()->w/16);
-	image.SetClipH(image.GetSurface()->h/16);
-	return image.GetSurface();
-}

common/ui/raster_font.hpp

@@ -1,54 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef RASTERFONT_HPP_
-#define RASTERFONT_HPP_
-
-#include "image.hpp"
-
-class RasterFont {
-public:
-	RasterFont() = default;
-	RasterFont(RasterFont const& rhs) { *this = rhs; }
-	RasterFont(RasterFont&& rhs) { *this = std::move(rhs); }
-	RasterFont(std::string fname) { LoadSurface(fname); }
-	RasterFont(SDL_Surface* p) { SetSurface(p); }
-	~RasterFont() = default;
-
-	RasterFont& operator=(RasterFont const& rhs) { image = rhs.image; }
-	RasterFont& operator=(RasterFont&& rhs) { image = std::move(rhs.image); }
-
-	void DrawStringTo(std::string, SDL_Surface* const, Sint16 x, Sint16 y);
-
-	//Accessors and Mutators
-	SDL_Surface* LoadSurface(std::string);
-	SDL_Surface* SetSurface(SDL_Surface*);
-	SDL_Surface* GetSurface() const { return image.GetSurface(); }
-	void FreeSurface() { image.FreeSurface(); }
-
-	Uint16 GetCharW() const { return image.GetClipW(); }
-	Uint16 GetCharH() const { return image.GetClipH(); }
-
-private:
-	Image image;
-};
-
-#endif

common/utilities/bbox.hpp

@@ -1,75 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef BBOX_HPP_
-#define BBOX_HPP_
-
-#include <type_traits>
-#include <stdexcept>
-#include <algorithm>
-
-//TODO: This is supposed to interact with the vector
-class BBox {
-public:
-	double x, y;
-	double w, h;
-
-	BBox() = default;
-	BBox(double i, double j, double k, double l): x(i), y(j), w(k), h(l) {};
-	~BBox() = default;
-	BBox& operator=(BBox const&) = default;
-
-	double Size() {
-		return std::max(w*h,0.0);
-	}
-
-	bool IsCollision(BBox rhs) {
-		return not (
-			x >= rhs.x + rhs.w ||
-			y >= rhs.y + rhs.h ||
-			rhs.x >= x + w ||
-			rhs.y >= y + h
-		);
-	}
-
-	BBox Intersection(BBox rhs) {
-		if (!IsCollision(rhs)) {
-			return {0, 0, 0, 0};
-		}
-		BBox ret;
-		ret.x = std::max(x, rhs.x);
-		ret.y = std::max(y, rhs.y);
-		ret.w = std::min(x+w, rhs.x+rhs.w) - ret.x;
-		ret.h = std::min(y+h, rhs.y+rhs.h) - ret.y;
-		return ret;
-	}
-
-	double operator[](size_t i) {
-		if (i >= 4)
-			throw(std::domain_error("Out of range"));
-		return *(&x+i);
-	}
-};
-
-//This is explicitly a POD
-static_assert(std::is_pod<BBox>::value, "BBox is not a POD");
-
-#endif

common/utilities/config_utility.cpp

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

common/utilities/config_utility.hpp

@@ -1,60 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef CONFIGUTILITY_HPP_
-#define CONFIGUTILITY_HPP_
-
-#include <map>
-#include <string>
-
-class ConfigUtility {
-public:
-	ConfigUtility() = default;
-	ConfigUtility(std::string s) { Load(s); }
-
-	void Load(std::string fname);
-
-	//convert to a type
-	std::string& String(std::string);
-	int Integer(std::string);
-	double Double(std::string);
-	bool Boolean(std::string);
-
-	//shorthand
-	std::string& operator[](std::string s) {
-		return String(s);
-	}
-	int Int(std::string s) {
-		return Integer(s);
-	}
-	bool Bool(std::string s) {
-		return Boolean(s);
-	}
-
-	//OO breaker
-	std::map<std::string, std::string>* GetMap() {
-		return &table;
-	}
-private:
-	std::map<std::string, std::string> table;
-};
-
-#endif

common/utilities/frame_rate.hpp

@@ -1,48 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef FRAMERATE_HPP_
-#define FRAMERATE_HPP_
-
-#include <chrono>
-
-class FrameRate {
-public:
-	typedef std::chrono::high_resolution_clock Clock;
-
-	FrameRate() = default;
-	int Calculate() {
-		frameCount++;
-		if (Clock::now() - tick >= std::chrono::duration<int>(1)) {
-			lastFrameRate = frameCount;
-			frameCount = 0;
-			tick = Clock::now();
-		}
-		return lastFrameRate;
-	}
-	int GetFrameRate() { return lastFrameRate; }
-private:
-	int frameCount = 0;
-	int lastFrameRate = 0;
-	Clock::time_point tick = Clock::now();
-};
-
-#endif

common/utilities/makefile

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

common/utilities/sql_utility.cpp

@@ -1,50 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "sql_utility.hpp"
-
-#include "utility.hpp"
-
-#include <stdexcept>
-#include <fstream>
-#include <cstdlib>
-
-int runSQLScript(sqlite3* db, std::string fname, int (*callback)(void*,int,char**,char**), void* argPtr) {
-	//load the file into a string
-	std::ifstream is(fname);
-	if (!is.is_open()) {
-		return -1;
-	}
-	std::string script;
-	getline(is, script, '\0');
-	is.close();
-
-	//run the SQL loaded from the file
-	char* errmsg = nullptr;
-	int ret = sqlite3_exec(db, script.c_str(), callback, argPtr, &errmsg);
-	if (ret != SQLITE_OK) {
-		//handle any errors received from the SQL
-		std::runtime_error e(std::string() + "SQL Script Error " + to_string_custom(ret) + ": " + errmsg);
-		free(errmsg);
-		throw(e);
-	}
-	return ret;
-}

common/utilities/sql_utility.hpp

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

common/utilities/utility.cpp

@@ -1,59 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "utility.hpp"
-
-#include <algorithm>
-
-int snapToBase(int base, int x) {
-	//snap to a grid
-	if (x < 0) {
-		x++;
-		return x / base * base - base;
-	}
-	return x / base * base;
-}
-
-std::string truncatePath(std::string pathname) {
-	return std::string(
-		std::find_if(
-			pathname.rbegin(),
-			pathname.rend(),
-			[](char ch) -> bool {
-				//windows only
-				return ch == '/' || ch == '\\';
-//				//unix only
-//				return ch == '/';
-			}).base(),
-		pathname.end());
-}
-
-std::string to_string_custom(int i) {
-	char buffer[20];
-	snprintf(buffer, 20, "%d", i);
-	return std::string(buffer);
-}
-
-int to_integer_custom(std::string s) {
-	int ret = 0;
-	sscanf(s.c_str(), "%d", &ret);
-	return ret;
-}

common/utilities/utility.hpp

@@ -1,48 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef UTILITY_HPP_
-#define UTILITY_HPP_
-
-#include <string>
-
-int snapToBase(int base, int x);
-std::string truncatePath(std::string pathname);
-
-//fixing known bugs in g++
-std::string to_string_custom(int i);
-
-int to_integer_custom(std::string);
-
-//wow
-template<typename ContainerT, typename PredicateT>
-void erase_if(ContainerT& items, const PredicateT& predicate) {
-	for(auto it = items.begin(); it != items.end(); /* empty */) {
-		if(predicate(*it)) {
-			it = items.erase(it);
-		}
-		else {
-			++it;
-		}
-	}
-};
-
-#endif

common/utilities/vector2.hpp

@@ -1,118 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef VECTOR2_HPP_
-#define VECTOR2_HPP_
-
-#include <type_traits>
-#include <stdexcept>
-#include <cmath>
-
-class Vector2 {
-public:
-	double x, y;
-
-	Vector2() = default;
-	Vector2(double i, double j): x(i), y(j) {};
-	~Vector2() = default;
-	Vector2& operator=(Vector2 const&) = default;
-
-	double Length() const {
-		return sqrt(x*x+y*y);
-	}
-	double SquaredLength() const {
-		return x*x+y*y;
-	}
-
-	double operator[](size_t i) {
-		if (i >= 2)
-			throw(std::domain_error("Out of range"));
-		return *(&x+i);
-	}
-
-	//Arithmetic operators
-	Vector2 operator+(Vector2 v) const {
-		Vector2 ret;
-		ret.x = x + v.x;
-		ret.y = y + v.y;
-		return ret;
-	}
-	Vector2 operator-(Vector2 v) const {
-		Vector2 ret;
-		ret.x = x - v.x;
-		ret.y = y - v.y;
-		return ret;
-	}
-	Vector2 operator*(Vector2 v) const {
-		Vector2 ret;
-		ret.x = x * v.x;
-		ret.y = y * v.y;
-		return ret;
-	}
-	Vector2 operator*(double d) const {
-		Vector2 ret;
-		ret.x = x * d;
-		ret.y = y * d;
-		return ret;
-	}
-
-	Vector2 operator/(Vector2 v) {
-		if (!v.x || !v.y)
-			throw(std::domain_error("Divide by zero"));
-		Vector2 ret;
-		ret.x = x / v.x;
-		ret.y = y / v.y;
-		return ret;
-	}
-	Vector2 operator/(double d) {
-		if (!d)
-			throw(std::domain_error("Divide by zero"));
-		Vector2 ret;
-		ret.x = x / d;
-		ret.y = y / d;
-		return ret;
-	}
-
-	bool operator==(Vector2 v) { return (x == v.x && y == v.y); }
-	bool operator!=(Vector2 v) { return (x != v.x || y != v.y); }
-
-	//member templates (curry the above operators)
-	template<typename T> Vector2 operator+=(T t) { return *this = *this + t; }
-	template<typename T> Vector2 operator-=(T t) { return *this = *this - t; }
-	template<typename T> Vector2 operator*=(T t) { return *this = *this * t; }
-	template<typename T> Vector2 operator/=(T t) { return *this = *this / t; }
-	template<typename T> bool operator==(T t) { return (x == t && y == t); }
-	template<typename T> bool operator!=(T t) { return (x != t || y != t); }
-};
-
-//non-member templates (flip the order)
-template<typename T> Vector2 operator+(T t, Vector2 v) { return v + t; }
-template<typename T> Vector2 operator-(T t, Vector2 v) { return v - t; }
-template<typename T> Vector2 operator*(T t, Vector2 v) { return v * t; }
-template<typename T> Vector2 operator/(T t, Vector2 v) { return v / t; }
-
-template<typename T> bool operator==(T t, Vector2 v) { return v == t; }
-template<typename T> bool operator!=(T t, Vector2 v) { return v != t; }
-
-//This is explicitly a POD
-static_assert(std::is_pod<Vector2>::value, "Vector2 is not a POD");
-
-#endif

makefile

@@ -1,24 +1,23 @@
-#for use on Windows:
-
-#MKDIR=mkdir
-#RM=del /y
-
-CXXFLAGS+=-static-libgcc -static-libstdc++
-CFLAGS+=-static-libgcc
-
-export
-
 OUTDIR=out
 
 all: $(OUTDIR)
 	$(MAKE) -C common
-	$(MAKE) -C server
-	$(MAKE) -C client
+	$(MAKE) -C src
+
+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)
+	find . -empty -type d -delete
+endif
 
 rebuild: clean all

rsc/config.cfg

@@ -1,30 +0,0 @@
-#configuration of the programs
-server.host = 255.255.255.255
-server.port = 21795
-server.name = local
-
-server.dbname = database.db
-
-screen.w = 800
-screen.h = 600
-screen.f = false
-
-#directories
-dir.fonts = rsc/graphics/fonts/
-dir.logos = rsc/graphics/logos/
-dir.sprites = rsc/graphics/sprites/
-dir.tilesets = rsc/graphics/tilesets/
-dir.interface = rsc/graphics/interface/
-dir.scripts = rsc/scripts/
-
-#map system
-map.pager.width = 20
-map.pager.height = 20
-map.pager.depth = 3
-
-#player options
-client.username = Kayne Ruse
-client.handle = Ratstail91
-client.avatar = elliot2.bmp
-
-#debugging

rsc/roguegenerator.lua

@@ -0,0 +1,139 @@
+--generate a roguelike map
+
+--[[ DOCS: Game design theory, read more
+
+As a basic starting point, I can create a list of "seed" tiles, which are the
+center of rooms. The rooms can be any size, as long as they don't overlap. From
+There, a tunnel can be "carved" from each seed tile to the next. Finally, the 
+map is populated, but that is beyond this exercise.
+
+This specification isn't ironclad, as the current implementation has no overlap
+prevention, resulting in some strange dungeon designs.
+
+--]]
+
+print("Beginning generator...")
+
+function newroom(northBound, eastBound, southBound, westBound)
+	--place the room within proximity of the center, so that they're not too far apart.
+	local x = math.random(westBound, eastBound)
+	local y = math.random(northBound, southBound)
+	local w = math.random(2, 5)
+	local h = math.random(2, 5)
+
+	--return this new room
+	return {
+		seedX = x,
+		seedY = y,
+		--give it a decent size
+		north = y - h,
+		south = y + h,
+		east = x + w,
+		west = x - w,
+	}
+end
+
+function newpath(x1, y1, x2, y2)
+	--NOTE: a path is an ordered list of {x, y} pairs
+	local path = {}
+	local step = 0
+
+	--vertical
+	if y1 > y2 then
+		step = -1
+	else
+		step = 1
+	end
+	for i = y1, y2, step do
+		table.insert(path, {x = x1, y = i})
+	end
+
+	--horizontal
+	if x1 > x2 then
+		step = -1
+	else
+		step = 1
+	end
+	for i = x1, x2, step do
+		table.insert(path, {x = i, y = y2})
+	end
+	
+	--NOTE: {x, y} pairs are duplicated at the corners
+	--TODO: improve the pathing system
+	return path
+end
+
+function buildpaths(roomlist)
+	local roomcount = #roomlist
+	local pathlist = {}
+	--tunnel the shortest paths
+	for i = 1, roomcount-1 do
+		table.insert(pathlist, newpath(
+			roomlist[i].seedX,
+			roomlist[i].seedY,
+			roomlist[i+1].seedX,
+			roomlist[i+1].seedY))
+	end
+
+	--return the new paths
+	return pathlist
+end
+
+print("Populating lists")
+
+math.randomseed(os.time())
+
+roomlist = {}
+pathlist = {}
+
+--populate the roomlist
+roomcount = math.random(10, 15)
+for i = 1, roomcount do
+	table.insert(roomlist, newroom(-30, 0, 30, -60)) --60x60
+end
+
+roomcount = math.random(5, 10)
+for i = 1, roomcount do
+	table.insert(roomlist, newroom(-30, 50, 30, -10)) --60x60
+end
+
+print("Building boss room")
+--boss room
+local bossRoom = {
+	seedX = math.random(60, 90),
+	seedY = math.random(-30, 30),
+}
+bossRoom.north = bossRoom.seedY - 5
+bossRoom.south = bossRoom.seedY + 5
+bossRoom.east = bossRoom.seedX + 5
+bossRoom.west = bossRoom.seedX - 5
+
+table.insert(roomlist, bossRoom)
+
+--paths
+pathlist = buildpaths(roomlist)
+
+--pass the data onto the pager
+pager = ... --called as a chunk
+
+--create the rooms
+for k, iter in next, roomlist do
+	--for each tile in the room
+	for i = iter.west, iter.east do
+		for j = iter.north, iter.south do
+			--set
+			region_pager.SetTile(pager, i, j, 0, 14)
+		end
+	end
+end
+
+--create the paths
+iter = nil
+for k, path in next, pathlist do --multiple paths in the lsit
+	for k, iter in next, path do
+		--for each tile in the path, set
+		region_pager.SetTile(pager, iter.x, iter.y, 0, 14)
+	end
+end
+
+print("Generator finished")

rsc/roguetileset.lua

@@ -0,0 +1,80 @@
+--the indeces of tiles from an associated tileset
+--this file is intended for use with a generator
+
+--store the tilesheet's format
+local format = {
+	fname = "roguetileset.png",
+	sheetWidth = 256,
+	sheetHeight = 256,
+	tileWidth = 16,
+	tileHeight = 16,
+	countX = 16,
+	countY = 16
+}
+
+--define the walls of the simple "walls" set
+local walls = {
+	--concave
+	nw = format.countX * 0 + 1,	n = format.countX * 0 + 2,	ne = format.countX * 0 + 3,
+	w  = format.countX * 1 + 1,								e  = format.countX * 1 + 3,
+	sw = format.countX * 2 + 1,	s = format.countX * 2 + 2,	se = format.countX * 2 + 3,
+	--convex (corner pieces jutting out)
+	--DOCS: These are named according to the corresponding tile they fit
+	sec = format.countX * 0 + 7, swc = format.countX * 0 + 9,
+	nec = format.countX * 2 + 7, nwc = format.countX * 2 + 9
+}
+
+--define the corridor pieces
+--named for their door locations in the order nesw
+local corridors = {
+	--straight
+	ns = 10, ew = 11,
+
+	--dead ends
+	s = format.countX * 0 + 8,
+	w = format.countX * 1 + 9,
+	n = format.countX * 2 + 8,
+	e = format.countX * 1 + 7,
+
+	--loop (compass)
+	es  = format.countX * 0 + 4, esw  = format.countX * 0 + 5, sw  = format.countX * 0 + 6,
+	nes = format.countX * 1 + 4, nesw = format.countX * 1 + 5, nsw = format.countX * 1 + 6,
+	ne  = format.countX * 2 + 4, new  = format.countX * 2 + 5, nw  = format.countX * 2 + 6
+}
+
+--DEBUG: dump the values
+--[[
+print("walls:")
+for k, v in pairs(walls) do
+	print("", k, v)
+end
+print("corridors:")
+for k, v in pairs(corridors) do
+	print("", k, v)
+end
+--]]
+
+--DEBUG: test the values
+--[[
+local test = {}
+
+for k, v in pairs(walls) do
+	if test[v] then
+		print("Error found: ", k)
+		return
+	end
+	test[v] = true
+end
+
+for k, v in pairs(corridors) do
+	if test[v] then
+		print("Error found: ", k)
+		return
+	end
+	test[v] = true
+end
+
+print("No errors detected")
+--]]
+
+return {format, walls, corridors}

rsc/scripts/setup_server.lua

@@ -1,36 +0,0 @@
-print("Lua script check (./rsc)")
-
--------------------------
---Map API overrides
--------------------------
-
-function map.create(region)
-	for i = 1, map.getregionwidth() do
-		for j = 1, map.getregionheight() do
-			if math.abs(map.getx(region) + i -1) == math.abs(map.gety(region) + j -1) then
-				map.settile(region, i, j, 1, 50)
-			else
-				map.settile(region, i, j, 1, 14)
-			end
-		end
-	end
-end
-
-function map.unload(region)
-	--
-end
-
-function map.load(region, dir)
-	--return true if file loaded, otherwise return false
-	return false
-end
-
-function map.save(region, dir)
-	--
-end
-
--------------------------
---Enemy API
--------------------------
-
---TODO

rsc/scripts/setup_server.sql

@@ -1,63 +0,0 @@
-CREATE TABLE IF NOT EXISTS Accounts (
-	uid INTEGER PRIMARY KEY AUTOINCREMENT,
-	username varchar(100) UNIQUE,
-	--TODO: server-client security
---	password varchar(100),
-	blacklisted BIT DEFAULT 0,
-	whitelisted BIT DEFAULT 1,
-	administrator BIT DEFAULT 0
-);
-
-CREATE TABLE IF NOT EXISTS Characters (
-	uid INTEGER PRIMARY KEY AUTOINCREMENT,
-
-	--metadata
-	owner INTEGER REFERENCES Accounts(uid),
-	handle varchar(100) UNIQUE,
-	avatar varchar(100),
-	birth timestamp NOT NULL DEFAULT (datetime()),
-
-	--position
-	mapIndex		INTEGER DEFAULT 0,
-	positionX		INTEGER DEFAULT 0,
-	positionY		INTEGER DEFAULT 0,
-
-	--statistics
-	level			INTEGER DEFAULT 0,
-	exp				INTEGER DEFAULT 0,
-	maxHP			INTEGER DEFAULT 0,
-	health			INTEGER DEFAULT 0,
-	maxMP			INTEGER DEFAULT 0,
-	mana			INTEGER DEFAULT 0,
-	attack			INTEGER DEFAULT 0,
-	defence			INTEGER DEFAULT 0,
-	intelligence	INTEGER DEFAULT 0,
-	resistance		INTEGER DEFAULT 0,
-	speed			INTEGER DEFAULT 0,
-	accuracy		REAL DEFAULT 0.0,
-	evasion			REAL DEFAULT 0.0,
-	luck			REAL DEFAULT 0.0,
-
-	--equipment
-	weapon INTEGER REFERENCES WornEquipment(uid),
-	helmet INTEGER REFERENCES WornEquipment(uid),
-	armour INTEGER REFERENCES WornEquipment(uid)
-	--etc.
-);
-
-CREATE TABLE IF NOT EXISTS InventoryItems (
-	--metadata
-	uid INTEGER PRIMARY KEY AUTOINCREMENT,
-	itemID INTEGER, --type
-	stackSize INTEGER DEFAULT 0,
-	owner INTEGER REFERENCES Characters(uid)
-);
-
-CREATE TABLE IF NOT EXISTS WornEquipment (
-	--metadata
-	uid INTEGER PRIMARY KEY AUTOINCREMENT,
-	itemID INTEGER, --type
-	owner INTEGER REFERENCES Characters(uid)
-	--hold all equipment info
-	--stat mods, special effects, etc.
-);

rsc/startup.lua

@@ -0,0 +1,35 @@
+--args are: userdata RegionPagerLua;
+
+print("Running startup script")
+
+pager = ...
+
+--[[
+
+--DOCS: These lambdas should return true or false, depending on if the operation succeeded or not
+--DOCS: No return value given is recognized as a failure
+--DOCS: OnCreate() and OnUnload() return values are currently ignored
+region_pager.SetOnLoad(pager, function(r)
+	print("Calling SetOnLoad's lambda")
+end)
+region_pager.SetOnSave(pager, function(r)
+	print("Calling SetOnSave's lambda")
+end)
+region_pager.SetOnCreate(pager, function(r)
+	print("Calling SetOnCreate's lambda")
+end)
+region_pager.SetOnUnload(pager, function(r)
+	print("Calling SetOnUnload's lambda")
+end)
+
+--]]
+
+generator, msg = loadfile("../rsc/roguegenerator.lua")
+
+if generator == nil then
+	print("error: ", msg)
+else
+	generator(pager)
+end
+
+print("Finished startup script")