Added a couple files

This frog isn't quite what I had in mind for the squire, since it looks
too athletic. Instead, I gave a better description to the artist. I'm
still adding it as WIP, hopefully the copyright agreement allows that.

.gitignore

@@ -1,21 +0,0 @@
-#Editor generated files
-*.sln
-*.vcproj
-*.suo
-*.ncb
-*.user
-
-#Directories
-Release/
-Debug/
-Out/
-
-#Project generated files
-*.db
-*.o
-*.a
-*.exe
-
-#Shell files
-*.bat
-*.sh

README.md

@@ -1,34 +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).  
-For a list of known bugs, see the [GitHub bug tracker](https://github.com/Ratstail91/Tortuga/issues).
-
-## 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.

api outline.md

@@ -0,0 +1,57 @@
+--TODO: each function needs to check it's parameter count
+--TODO: Set metatables
+
+--RoomManager interface
+RoomMgr.GetRoom(index)
+RoomMgr.CreateRoom([{params}])
+RoomMgr.UnloadRoom(index)
+
+
+--RoomData interface
+Room.GetPager()
+Room.GetGenerator()
+Room.OnCreate([{params}])
+Room.OnUnload()
+
+Room.Get{params}()
+
+
+--RegionPager interface
+RegionPager.SetTile(x, y, z, v)
+RegionPager.GetTile(x, y, z)
+RegionPager.SetSolid(x, y, b)
+RegionPager.GetSolid(x, y)
+RegionPager.GetRegion(x, y)
+RegionPager.SetDirectory(directory)
+RegionPager.GetDirectory()
+RegionPager.LoadRegion(x, y)
+RegionPager.SaveRegion(x, y)
+RegionPager.CreateRegion(x, y[, {params}])
+RegionPager.UnloadRegion(x, y)
+
+
+--Region interface
+Region.SetTile(x, y, z, v)
+Region.GetTile(x, y, z)
+Region.SetSolid(x, y, b)
+Region.GetSolid(x, y)
+Region.GetX()
+Region.GetY()
+Region.GetWidth()
+Region.GetHeight()
+Region.GetDepth()
+Region.OnLoad(directory)
+Region.OnSave(directory)
+Region.OnCreate([{params}])
+Region.OnUnload([directory])
+
+
+--*Generator interface
+Generator.GetMapType()
+Generator.GetChunk(x, y)
+Generator.GetMapWidth()
+Generator.GetMapHeight()
+
+
+--Chunk interface
+??

articles/On-Permadeath-Pain-And-Loss.md

@@ -0,0 +1,19 @@
+My game Tortuga will have permadeath; it's actually one of the first design decisions I made. How to implement it, however, is another decision all together.
+
+A while ago, before the implementation of hardcore mode, I was playing on a Minecraft server that boasted something close to permadeath: your account would be banned for 15 days, so long that it's almost unavoidable that you'd lose all of your hidden items. This was a brutal server; the further you went from spawn, the more dangerous it became, not less. If the natural hazards didn't kill you, another player would.
+
+I loved it.
+
+Although I haven't been back to that server since I died for the last time, the experience will stay with me forever. I'd played and died on that server a few times, each time I had to wait for my ban to clear. I never really lost much, since I never survived for very long. Even today, in a single player world, I'm likely to die on the first night.
+
+After playing for a while, I began to understand the mentality needed to survive there. Always fear other people, never take risks, and never hoard valuable items if they could be better spent keeping you alive. One day, the last day I played, I found a hole in the ground that someone was obviously using as a "hidden" base. I tried to get in, always careful not to trigger any traps. However, while I was trying to get in, the owner came home.
+
+I was suddenly attacked from behind, I barely had enough sense to dig down, since they were wearing enchanted diamond armour. I had no chance against them. I thought I was safe, digging 10, 20, 30 meters down, but no, they poured lava down the hole and plugged it up. I was a gonner, and I knew it. I was futilely digging and thrashing around in what was now my tomb, about to lose my life. I'd survived for so long, only to lose it all by not keeping a lookout.
+
+When the game over screen flashed up, I screamed. I screamed, and screamed, and screamed. For 5 minutes, my mind was blank, nothing but hatred and pain and loss. I'm sure you've seen the video of the angry German kid who died in WoW, but have you ever actually experienced that pain? Have you ever worked so hard, and lost it all?
+
+For days afterwards, that loss was all I could think about. Even now, that experience stays with me. What about that game, that server, invoked so much pain that I almost lost consciousness from screaming? Me of all people, who thought he was invincible?
+
+I've played games that have moved me, terrified me, made me fall in love and fight for the people that I care about. But never have I played a game that has made me feel pain and loss like that. I died that day. Me.
+
+Pain and loss are part of life, but not games. Permadeath seems like the obvious choice for creating a sense of loss for the player, but there are so few games with permadeath, and even fewer multiplayer games. Pain and loss can be conveyed in other ways, I'm sure anybody who's played Final Fantasy 7 knows that, and some games are especially well suited to delivering that message. However, for a player to feel like they are the one who's died, that is a challenge.

articles/collision-logic.md

@@ -0,0 +1,125 @@
+Abstract:
+
+The goal of this pseudocode is to create a collision system that brings several
+colliding bodies to a near-contact state (no space between the bodies, but not
+overlapping), while preserving the motion of said bodies. For simplicity, I've
+decided to use a square box (BoundingBox, or BBox for short) for the collidable
+bodies.
+
+Example:
+
+My current game has a tiled-map, where the tiles are arranged on a 2D grid. The
+tiles each have a flag indicating if they are solid (i.e. collidable) or not. I
+also have characters walking around on these tile maps, that must not intersect
+with solid tiles. For stylistic reasons, I want characters moving at an angle
+to "slide" along these walls, and continue along with their original velocity
+when they've circumvented the obstacles.
+
+I'd also like to keep the possibility of non-grid collisions using this logic
+open (for objects like trees, etc.) if the code allows it.
+
+Obviously, there are many in depth issues that I will need to  take into
+account when writing this logic, that have been glossed over or omitted in this
+article.
+
+-------------------------
+
+```
+	velocity = motion + speed
+	if (collision(position + velocity)) then
+		if (collision(position + {velocity.x, 0})) then
+			velocity.x = 0
+		end
+		if (collision(position + {0, velocity.y})) then
+			velocity.y = 0
+		end
+	end
+	position = position + velocity
+```
+
+This code is a basic outline for a collision system that preserves the object's
+motion, but it still leaves several pixels of space between the bounding boxes.
+Notably, it also treats "collision" as an abstract concept, rather than as an
+event that could happen multiple times per frame.
+
+-------------------------
+
+```
+	velocity = motion + speed
+	if (collisionSimple(BOXSET, position + velocity)) then
+		velocity.x = collisionX(BOXSET, velocity.x)
+		velocity.y = collisionY(BOXSET, velocity.y)
+	end
+	position = position + velocity
+```
+
+Here, collisions are still abstract, but "BOXSET" is defined externally
+(probably as a set of solid boxes, and their positions). This does require more
+in depth calculations, as well as three specialized utility functions, but the
+results might be what I'm looking for.
+
+If there are any collisions between the player object and the given box set,
+then collisionX() and collisionY() are called to calculate the new distance
+that the character will move.
+
+-------------------------
+
+```
+	bool collisionSimple(BOXSET, newPos):
+		for_each box in BOXSET do
+			if (box.overlap(PLAYER.box + newPos)) then
+				return true
+			end
+		end
+		return false
+	end
+```
+
+collisionSimple() first runs through the BOXSET, checking if any of the given
+bounding boxes would collide with the player object's new position (just
+pretend PLAYER is accessible). In this case, non-tile bounding boxes can be
+included as part of BOXSET; they're treated just the same. The optimal outcome
+is that there are no collisions.
+
+A possible, but flawed, optimization that could be preformed here is to remove
+any elements from BOXSET that do not collide with newPos, and let the other
+utility functions operate only on what remains. However, if there are any
+collisions, than newPos is not the algorithm's final result, therefore any
+final result that the algorithm would calculate based on the remaining elements
+would not have been checked against the removed elements.
+
+Just something to note.
+
+-------------------------
+
+```
+	var collisionX(BOXSET, velocityX):
+		var ret = velocityX
+
+		for_each box in BOXSET do
+			if (box.overlap(PLAYER.box + PLAYER.position + {velocityX,0})) then
+				if (velocityX > 0) then
+					ret = min(ret, box.west - PLAYER.position.x)
+				else
+					ret = max(ret, box.east - PLAYER.position.x)
+				end
+			end
+		end
+
+		return ret
+	end
+```
+
+Two things: 1. collisionX() and collisionY() should be identical except for the
+axis of operation and 2. if a player object is "sliding" along a wall (or
+stuck), then these functions will be called every frame.
+
+collisionX() and collisionY() check the sides of the elements in BOXSET, and if
+there's a box that the player would collide with, given the current distance to
+move, than the distance is reduced, based on if the character is moving left or
+right (or up or down).
+
+An unfortunate bug I can already see is that this logic doesn't check corners;
+it might be possible to get stuck on a corner of a wall, but if this becomes an
+issue in my implementation I will update this article with that information,
+and you can promptly ignore it.

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/character.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 "character.hpp"
-
-void Character::Update() {
-	if (motion.x && motion.y) {
-		origin += motion * CHARACTER_WALKING_MOD;
-	}
-	else if (motion != 0) {
-		origin += motion;
-	}
-	sprite.Update(0.016);
-}
-
-void Character::DrawTo(SDL_Surface* const dest, int camX, int camY) {
-	sprite.DrawTo(dest, origin.x - camX, origin.y - camY);
-}
-
-void Character::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);
-	}
-}

client/character.hpp

@@ -1,95 +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 CHARACTER_HPP_
-#define CHARACTER_HPP_
-
-//components
-#include "character_defines.hpp"
-#include "vector2.hpp"
-#include "bounding_box.hpp"
-#include "statistics.hpp"
-
-//graphics
-#include "sprite_sheet.hpp"
-
-//std namespace
-#include <string>
-#include <cmath>
-
-class Character {
-public:
-	Character() = default;
-	~Character() = default;
-
-	void Update();
-
-	//graphics
-	void DrawTo(SDL_Surface* const, int camX, int camY);
-	void CorrectSprite();
-	SpriteSheet* GetSprite() { return &sprite; }
-
-	//gameplay
-	Statistics* GetStats() { return &stats; }
-
-	//accessors and mutators
-
-	//metadata
-	int SetOwner(int i) { return owner = i; }
-	int GetOwner() { return owner; }
-	std::string SetHandle(std::string s) { return handle = s; }
-	std::string GetHandle() const { return handle; }
-	std::string SetAvatar(std::string s) { return avatar = s; }
-	std::string GetAvatar() const { return avatar; }
-
-	//position
-	Vector2 SetOrigin(Vector2 v) { return origin = v; }
-	Vector2 GetOrigin() const { return origin; }
-	Vector2 SetMotion(Vector2 v) { return motion = v; }
-	Vector2 GetMotion() const { return motion; }
-	BoundingBox SetBounds(BoundingBox b) { return bounds = b; }
-	BoundingBox GetBounds() { return bounds; }
-
-private:
-	//graphics
-	SpriteSheet sprite;
-
-	//base statistics
-	Statistics stats;
-
-	//TODO: gameplay components: equipment, items, buffs, debuffs
-
-	//metadata
-	int owner;
-	std::string handle;
-	std::string avatar;
-
-	//position
-	Vector2 origin = {0.0,0.0};
-	Vector2 motion = {0.0,0.0};
-	BoundingBox bounds;
-};
-
-//tmp
-#include <map>
-typedef std::map<int, Character> CharacterMap;
-
-#endif

client/client_application.cpp

@@ -1,197 +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 "config_utility.hpp"
-
-#include <stdexcept>
-#include <chrono>
-#include <iostream>
-
-//-------------------------
-//Scene headers
-//-------------------------
-
-//Add the custom scene headers here
-#include "splash_screen.hpp"
-#include "main_menu.hpp"
-#include "options_menu.hpp"
-#include "lobby_menu.hpp"
-#include "in_world.hpp"
-//#include "in_combat.hpp"
-#include "clean_up.hpp"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-void ClientApplication::Init(int argc, char** argv) {
-	std::cout << "Beginning " << argv[0] << std::endl;
-
-	//load the prerequisites
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-	config.Load("rsc\\config.cfg");
-
-	//-------------------------
-	//Initialize the APIs
-	//-------------------------
-
-	//initialize SDL
-	if (SDL_Init(SDL_INIT_VIDEO)) {
-		throw(std::runtime_error("Failed to initialize SDL"));
-	}
-	std::cout << "Initialized SDL" << std::endl;
-
-	//initialize SDL_net
-	if (SDLNet_Init()) {
-		throw(std::runtime_error("Failed to initialize SDL_net"));
-	}
-	UDPNetworkUtility::GetSingleton().Open(0);
-	std::cout << "Initialized SDL_net" << std::endl;
-
-	//-------------------------
-	//Setup the screen
-	//-------------------------
-
-	int w = config.Int("client.screen.w");
-	int h = config.Int("client.screen.h");
-	int f = config.Bool("client.screen.f") ? SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_FULLSCREEN : SDL_HWSURFACE|SDL_DOUBLEBUF;
-
-	BaseScene::SetScreen(w ? w : 800, h ? h : 600, 0, f);
-	std::cout << "Initialized the screen" << std::endl;
-
-	//-------------------------
-	//debug output
-	//-------------------------
-
-	//TODO: enable/disable these with a switch
-#define DEBUG_OUTPUT_VAR(x) std::cout << "\t" << #x << ": " << x << std::endl;
-
-	std::cout << "Internal sizes:" << std::endl;
-
-	DEBUG_OUTPUT_VAR(sizeof(Region::type_t));
-	DEBUG_OUTPUT_VAR(sizeof(Region));
-	DEBUG_OUTPUT_VAR(REGION_WIDTH);
-	DEBUG_OUTPUT_VAR(REGION_HEIGHT);
-	DEBUG_OUTPUT_VAR(REGION_DEPTH);
-	DEBUG_OUTPUT_VAR(REGION_TILE_FOOTPRINT);
-	DEBUG_OUTPUT_VAR(REGION_SOLID_FOOTPRINT);
-	DEBUG_OUTPUT_VAR(PACKET_BUFFER_SIZE);
-	DEBUG_OUTPUT_VAR(MAX_PACKET_SIZE);
-
-#undef DEBUG_OUTPUT_VAR
-
-	//-------------------------
-	//finalize the startup
-	//-------------------------
-
-	std::cout << "Startup completed successfully" << std::endl;
-
-	//-------------------------
-	//debugging
-	//-------------------------
-
-	//...
-}
-
-void ClientApplication::Proc() {
-	LoadScene(SceneList::FIRST);
-
-	//prepare the time system
-	typedef std::chrono::steady_clock Clock;
-
-	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();
-			//~60 FPS
-			simTime += std::chrono::duration<int, std::milli>(16);
-		}
-
-		//draw the game to the screen
-		activeScene->RenderFrame();
-	}
-
-	UnloadScene();
-}
-
-void ClientApplication::Quit() {
-	std::cout << "Shutting down" << std::endl;
-	UDPNetworkUtility::GetSingleton().Close();
-	SDLNet_Quit();
-	SDL_Quit();
-	std::cout << "Clean exit" << std::endl;
-}
-
-//-------------------------
-//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();
-		break;
-		case SceneList::MAINMENU:
-			activeScene = new MainMenu();
-		break;
-		case SceneList::OPTIONSMENU:
-			activeScene = new OptionsMenu();
-		break;
-		case SceneList::LOBBYMENU:
-			activeScene = new LobbyMenu(&clientIndex, &accountIndex);
-		break;
-		case SceneList::INWORLD:
-			activeScene = new InWorld(&clientIndex, &accountIndex, &characterIndex, &characterMap);
-		break;
-//		case SceneList::INCOMBAT:
-//			activeScene = new InCombat(&clientIndex, &accountIndex, &characterIndex, &characterMap);
-//		break;
-		case SceneList::CLEANUP:
-			activeScene = new CleanUp(&clientIndex, &accountIndex, &characterIndex, &characterMap);
-		break;
-		default:
-			throw(std::logic_error("Failed to recognize the scene index"));
-	}
-}
-
-void ClientApplication::UnloadScene() {
-	delete activeScene;
-	activeScene = nullptr;
-}

client/client_application.hpp

@@ -1,62 +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 CLIENTAPPLICATION_HPP_
-#define CLIENTAPPLICATION_HPP_
-
-#include "scene_list.hpp"
-#include "base_scene.hpp"
-
-#include "udp_network_utility.hpp"
-#include "character.hpp"
-
-#include "singleton.hpp"
-
-#include <map>
-
-class ClientApplication: public Singleton<ClientApplication> {
-public:
-	//public methods
-	void Init(int argc, char** argv);
-	void Proc();
-	void Quit();
-
-private:
-	friend Singleton<ClientApplication>;
-
-	ClientApplication() = default;
-	~ClientApplication() = default;
-
-	//Private access members
-	void LoadScene(SceneList sceneIndex);
-	void UnloadScene();
-
-	BaseScene* activeScene = nullptr;
-
-	//shared parameters
-	int clientIndex = -1;
-	int accountIndex = -1;
-	int characterIndex = -1;
-
-	CharacterMap characterMap;
-};
-
-#endif

client/main.cpp

@@ -1,58 +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"
-
-//singletons
-#include "config_utility.hpp"
-#include "udp_network_utility.hpp"
-
-#include <stdexcept>
-#include <iostream>
-
-using namespace std;
-
-int main(int argc, char** argv) {
-	try {
-		//create the singletons
-		ConfigUtility::Create();
-		UDPNetworkUtility::Create();
-
-		//call the server's routines
-		ClientApplication::Create();
-		ClientApplication& app = ClientApplication::GetSingleton();
-
-		app.Init(argc, argv);
-		app.Proc();
-		app.Quit();
-
-		ClientApplication::Delete();
-
-		//delete the singletons
-		ConfigUtility::Delete();
-		UDPNetworkUtility::Delete();
-	}
-	catch(exception& e) {
-		cerr << "Fatal exception thrown: " << e.what() << endl;
-		return 1;
-	}
-	return 0;
-}

client/makefile

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

@@ -1,41 +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,
-	CLEANUP,
-};
-
-#endif

client/scenes/base_scene.cpp

@@ -1,140 +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() {
-	FrameStart();
-	HandleEvents();
-	Update();
-	FrameEnd();
-}
-
-void BaseScene::RenderFrame() {
-	SDL_FillRect(screen, 0, 0);
-	Render(screen);
-	SDL_Flip(screen);
-	SDL_Delay(10);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void BaseScene::HandleEvents() {
-	SDL_Event event;
-
-	while(SDL_PollEvent(&event)) {
-		switch(event.type) {
-			case SDL_QUIT:
-				QuitEvent();
-			break;
-
-			case SDL_VIDEORESIZE:
-				SetScreen(event.resize.w, event.resize.h, 0, screen->flags);
-			break;
-
-			case SDL_MOUSEMOTION:
-				MouseMotion(event.motion);
-			break;
-
-			case SDL_MOUSEBUTTONDOWN:
-				MouseButtonDown(event.button);
-			break;
-
-			case SDL_MOUSEBUTTONUP:
-				MouseButtonUp(event.button);
-			break;
-
-			case SDL_KEYDOWN:
-				KeyDown(event.key);
-			break;
-
-			case SDL_KEYUP:
-				KeyUp(event.key);
-			break;
-
-#ifdef USE_EVENT_JOYSTICK
-			//TODO: joystick/gamepad support
-#endif
-
-#ifdef USE_EVENT_UNKNOWN
-			default:
-				UnknownEvent(event);
-			break;
-#endif
-		}//switch
-	}//while
-}

client/scenes/base_scene.hpp

@@ -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();
-	virtual void RenderFrame();
-
-protected:
-	virtual void FrameStart() {}
-	virtual void HandleEvents();
-	virtual void Update() {}
-	virtual void FrameEnd() {}
-	virtual void Render(SDL_Surface* const screen) {}
-
-	//Event handlers
-	virtual void QuitEvent() { SetNextScene(SceneList::QUIT); }
-	virtual void MouseMotion(SDL_MouseMotionEvent const&) {}
-	virtual void MouseButtonDown(SDL_MouseButtonEvent const&) {}
-	virtual void MouseButtonUp(SDL_MouseButtonEvent const&) {}
-	virtual void KeyDown(SDL_KeyboardEvent const&) {}
-	virtual void KeyUp(SDL_KeyboardEvent const&) {}
-
-#ifdef USE_EVENT_JOYSTICK
-	//TODO: joystick/gamepad support
-#endif
-
-#ifdef USE_EVENT_UNKNOWN
-	virtual void UnknownEvent(SDL_Event const&) {}
-#endif
-
-private:
-	static SDL_Surface* screen;
-	SceneList nextScene = SceneList::CONTINUE;
-};
-
-#endif

client/scenes/clean_up.cpp

@@ -1,129 +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 "clean_up.hpp"
-
-#include "channels.hpp"
-#include "config_utility.hpp"
-
-#include <stdexcept>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-CleanUp::CleanUp(
-	int* const argClientIndex,
-	int* const argAccountIndex,
-	int* const argCharacterIndex,
-	CharacterMap* argCharacterMap
-	):
-	clientIndex(*argClientIndex),
-	accountIndex(*argAccountIndex),
-	characterIndex(*argCharacterIndex),
-	characterMap(*argCharacterMap)
-{
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-
-	//setup the utility objects
-	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
-
-	//pass the utility objects
-	backButton.SetImage(&image);
-	backButton.SetFont(&font);
-
-	//set the button positions
-	backButton.SetX(50);
-	backButton.SetY(50 + image.GetClipH() * 0);
-
-	//set the button texts
-	backButton.SetText("Back");
-
-	//full reset
-	network.Unbind(Channels::SERVER);
-	clientIndex = -1;
-	accountIndex = -1;
-	characterIndex = -1;
-//	combatMap.clear();
-	characterMap.clear();
-//	enemyMap.clear();
-
-	//auto return
-	startTick = std::chrono::steady_clock::now();
-}
-
-CleanUp::~CleanUp() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void CleanUp::Update() {
-	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(10)) {
-		SetNextScene(SceneList::MAINMENU);
-	}
-
-	//BUGFIX: Eat incoming packets
-	while(network.Receive());
-}
-
-void CleanUp::Render(SDL_Surface* const screen) {
-	backButton.DrawTo(screen);
-	font.DrawStringTo("You have been disconnected.", screen, 50, 30);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void CleanUp::QuitEvent() {
-	SetNextScene(SceneList::QUIT);
-}
-
-void CleanUp::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	backButton.MouseMotion(motion);
-}
-
-void CleanUp::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	backButton.MouseButtonDown(button);
-}
-
-void CleanUp::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::MAINMENU);
-	}
-}
-
-void CleanUp::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			SetNextScene(SceneList::MAINMENU);
-		break;
-	}
-}
-
-void CleanUp::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}

client/scenes/clean_up.hpp

@@ -1,82 +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 CLEANUP_HPP_
-#define CLEANUP_HPP_
-
-//network
-#include "udp_network_utility.hpp"
-
-//graphics
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-
-//client
-#include "character.hpp"
-#include "base_scene.hpp"
-
-//std namespace
-#include <chrono>
-
-class CleanUp : public BaseScene {
-public:
-	//Public access members
-	CleanUp(
-		int* const argClientIndex,
-		int* const argAccountIndex,
-		int* const argCharacterIndex,
-		CharacterMap* argCharacterMap
-	);
-	~CleanUp();
-
-protected:
-	//Frame loop
-	void Update();
-	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&);
-
-	//shared parameters
-	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
-	int& clientIndex;
-	int& accountIndex;
-	int& characterIndex;
-	CharacterMap& characterMap;
-
-	//graphics
-	Image image;
-	RasterFont font;
-
-	//UI
-	Button backButton;
-
-	//auto return
-	std::chrono::steady_clock::time_point startTick;
-};
-
-#endif

client/scenes/in_world.cpp

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

client/scenes/in_world.hpp

@@ -1,123 +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 "region_pager_base.hpp"
-
-//networking
-#include "udp_network_utility.hpp"
-
-//graphics
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-#include "tile_sheet.hpp"
-
-//common
-#include "frame_rate.hpp"
-
-#include "character.hpp"
-
-//client
-#include "base_scene.hpp"
-
-//STL
-#include <map>
-
-class InWorld : public BaseScene {
-public:
-	//Public access members
-	InWorld(
-		int* const argClientIndex,
-		int* const argAccountIndex,
-		int* const argCharacterIndex,
-		CharacterMap* argCharacterMap
-	);
-	~InWorld();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update();
-	void FrameEnd();
-	void RenderFrame();
-	void Render(SDL_Surface* const);
-
-	//Event handlers
-	void QuitEvent();
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
-	void KeyDown(SDL_KeyboardEvent const&);
-	void KeyUp(SDL_KeyboardEvent const&);
-
-	//Network handlers
-	void HandlePacket(SerialPacket* const);
-	void HandleDisconnect(SerialPacket* const);
-	void HandleCharacterNew(CharacterPacket* const);
-	void HandleCharacterDelete(CharacterPacket* const);
-	void HandleCharacterUpdate(CharacterPacket* const);
-	void HandleRegionContent(RegionPacket* const);
-
-	//Server control
-	void RequestSynchronize();
-	void SendPlayerUpdate();
-	void RequestDisconnect();
-	void RequestShutDown();
-	void RequestRegion(int roomIndex, int x, int y);
-
-	//utilities
-	void UpdateMap();
-
-	//shared parameters
-	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
-	int& clientIndex;
-	int& accountIndex;
-	int& characterIndex;
-	CharacterMap& characterMap;
-
-	//graphics
-	Image buttonImage;
-	RasterFont font;
-	TileSheet tileSheet;
-
-	//map
-	RegionPagerBase regionPager;
-
-	//UI
-	Button disconnectButton;
-	Button shutDownButton;
-	//TODO: Review the camera
-	struct {
-		int x = 0, y = 0;
-		int width = 0, height = 0;
-		int marginX = 0, marginY = 0;
-	} camera;
-	FrameRate fps;
-
-	//game
-	Character* localCharacter = nullptr;
-};
-
-#endif

client/scenes/lobby_menu.cpp

@@ -1,256 +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(int* const argClientIndex, int* const argAccountIndex):
-	clientIndex(*argClientIndex),
-	accountIndex(*argAccountIndex)
-{
-	//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()};
-
-	//BUGFIX: Eat incoming packets
-	while(network.Receive());
-
-	//Initial broadcast
-	SendBroadcastRequest();
-}
-
-LobbyMenu::~LobbyMenu() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void LobbyMenu::FrameStart() {
-	//
-}
-
-void LobbyMenu::Update() {
-	//suck in and process all waiting packets
-	SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]);
-	while(network.Receive(packetBuffer)) {
-		HandlePacket(packetBuffer);
-	}
-	delete reinterpret_cast<char*>(packetBuffer);
-}
-
-void LobbyMenu::FrameEnd() {
-	//
-}
-
-void LobbyMenu::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 = {
-				(Sint16)listBox.x, (Sint16)listBox.y,
-				(Uint16)listBox.w, (Uint16)listBox.h
-			};
-			r.y += i * listBox.h;
-			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 255, 127, 39));
-		}
-
-		//draw the server 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) {
-		SendBroadcastRequest();
-	}
-	else if (join.MouseButtonUp(button) == Button::State::HOVER && selection != nullptr && selection->compatible) {
-		SendJoinRequest();
-	}
-	else if (back.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::MAINMENU);
-	}
-
-	//has the user selected a server on the list?
-	BoundingBox tmpBox = listBox;
-	tmpBox.h *= serverInfo.size();
-	if (tmpBox.CheckOverlap({button.x, button.y})) {
-		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* const argPacket) {
-		switch(argPacket->GetType()) {
-		case SerialPacketType::BROADCAST_RESPONSE:
-			HandleBroadcastResponse(static_cast<ServerPacket*>(argPacket));
-		break;
-		case SerialPacketType::JOIN_RESPONSE:
-			HandleJoinResponse(static_cast<ClientPacket*>(argPacket));
-		break;
-		//handle errors
-		default:
-			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in LobbyMenu: " + to_string_custom(static_cast<int>(argPacket->GetType())) ));
-		break;
-	}
-}
-
-void LobbyMenu::HandleBroadcastResponse(ServerPacket* const argPacket) {
-	//extract the data
-	ServerInformation server;
-	server.address = argPacket->GetAddress();
-	server.name = argPacket->GetName();
-	server.playerCount = argPacket->GetPlayerCount();
-	server.version = argPacket->GetVersion();
-
-	//Checking compatibility
-	server.compatible = server.version == NETWORK_VERSION;
-
-	//push
-	serverInfo.push_back(server);
-}
-
-void LobbyMenu::HandleJoinResponse(ClientPacket* const argPacket) {
-	clientIndex = argPacket->GetClientIndex();
-	accountIndex = argPacket->GetAccountIndex();
-	network.Bind(argPacket->GetAddressPtr(), Channels::SERVER);
-	SetNextScene(SceneList::INWORLD);
-
-	//send this player's character info
-	CharacterPacket newPacket;
-	newPacket.SetType(SerialPacketType::CHARACTER_NEW);
-	newPacket.SetHandle(config["client.handle"].c_str());
-	newPacket.SetAvatar(config["client.avatar"].c_str());
-	newPacket.SetAccountIndex(accountIndex);
-	network.SendTo(Channels::SERVER, &newPacket);
-}
-
-//-------------------------
-//server control
-//-------------------------
-
-void LobbyMenu::SendBroadcastRequest() {
-	//broadcast to the network, or a specific server
-		ServerPacket packet;
-		packet.SetType(SerialPacketType::BROADCAST_REQUEST);
-		network.SendTo(config["server.host"].c_str(), config.Int("server.port"), &packet);
-
-		//reset the server list
-		serverInfo.clear();
-		selection = nullptr;
-}
-
-void LobbyMenu::SendJoinRequest() {
-	//pack the packet
-		ClientPacket packet;
-		packet.SetType(SerialPacketType::JOIN_REQUEST);
-		packet.SetUsername(config["client.username"].c_str());
-
-		//join the selected server
-		network.SendTo(&selection->address, &packet);
-		selection = nullptr;
-}

client/scenes/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 & ui
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-#include "bounding_box.hpp"
-
-//utilities
-#include "config_utility.hpp"
-#include "udp_network_utility.hpp"
-
-//client
-#include "base_scene.hpp"
-
-//STL
-#include <vector>
-
-class LobbyMenu : public BaseScene {
-public:
-	//Public access members
-	LobbyMenu(int* const argClientIndex, int* const argAccountIndex);
-	~LobbyMenu();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update();
-	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* const);
-	void HandleBroadcastResponse(ServerPacket* const);
-	void HandleJoinResponse(ClientPacket* const);
-
-	//server control
-	void SendBroadcastRequest();
-	void SendJoinRequest();
-
-	//shared parameters
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
-	int& clientIndex;
-	int& accountIndex;
-
-	//members
-	Image image;
-	RasterFont font;
-	Button search;
-	Button join;
-	Button back;
-
-	//server list
-	struct ServerInformation {
-		IPaddress address;
-		std::string name;
-		int playerCount;
-		int version;
-		bool compatible;
-	};
-
-	std::vector<ServerInformation> serverInfo;
-
-	//NOTE: a terrible hack
-	//I'd love a proper gui system for this
-	BoundingBox listBox;
-	ServerInformation* selection = nullptr;
-};
-
-#endif

client/scenes/main_menu.cpp

@@ -1,124 +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"
-
-#include "config_utility.hpp"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-MainMenu::MainMenu() {
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-
-	//setup the utility objects
-	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
-
-	//pass the utility objects
-	startButton.SetImage(&image);
-	startButton.SetFont(&font);
-	optionsButton.SetImage(&image);
-	optionsButton.SetFont(&font);
-	quitButton.SetImage(&image);
-	quitButton.SetFont(&font);
-
-	//set the button positions
-	startButton.SetX(50);
-	startButton.SetY(50 + image.GetClipH() * 0);
-	optionsButton.SetX(50);
-	optionsButton.SetY(50 + image.GetClipH() * 1);
-	quitButton.SetX(50);
-	quitButton.SetY(50 + image.GetClipH() * 2);
-
-	//set the button texts
-	startButton.SetText("Start");
-	optionsButton.SetText("Options");
-	quitButton.SetText("Quit");
-
-	//debug
-	//
-}
-
-MainMenu::~MainMenu() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void MainMenu::FrameStart() {
-	//
-}
-
-void MainMenu::Update() {
-	//
-}
-
-void MainMenu::FrameEnd() {
-	//
-}
-
-void MainMenu::Render(SDL_Surface* const screen) {
-	startButton.DrawTo(screen);
-	optionsButton.DrawTo(screen);
-	quitButton.DrawTo(screen);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void MainMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	startButton.MouseMotion(motion);
-	optionsButton.MouseMotion(motion);
-	quitButton.MouseMotion(motion);
-}
-
-void MainMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	startButton.MouseButtonDown(button);
-	optionsButton.MouseButtonDown(button);
-	quitButton.MouseButtonDown(button);
-}
-
-void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	//TODO: Buttons should only register as "selected" when the left button is used
-	if (startButton.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::LOBBYMENU);
-	}
-	if (optionsButton.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::OPTIONSMENU);
-	}
-	if (quitButton.MouseButtonUp(button) == Button::State::HOVER) {
-		QuitEvent();
-	}
-}
-
-void MainMenu::KeyDown(SDL_KeyboardEvent const& key) {
-	//
-}
-
-void MainMenu::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}

client/scenes/main_menu.hpp

@@ -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.
-*/
-#ifndef MAINMENU_HPP_
-#define MAINMENU_HPP_
-
-#include "base_scene.hpp"
-
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-
-class MainMenu : public BaseScene {
-public:
-	//Public access members
-	MainMenu();
-	~MainMenu();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update();
-	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&);
-
-	//members
-	Image image;
-	RasterFont font;
-	Button startButton;
-	Button optionsButton;
-	Button quitButton;
-};
-
-#endif

client/scenes/makefile

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

client/scenes/options_menu.cpp

@@ -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.
-*/
-#include "options_menu.hpp"
-
-#include "config_utility.hpp"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-OptionsMenu::OptionsMenu() {
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-
-	//setup the utility objects
-	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
-
-	//pass the utility objects
-	backButton.SetImage(&image);
-	backButton.SetFont(&font);
-
-	//set the button positions
-	backButton.SetX(50);
-	backButton.SetY(50 + image.GetClipH() * 0);
-
-	//set the button texts
-	backButton.SetText("Back");
-}
-
-OptionsMenu::~OptionsMenu() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void OptionsMenu::FrameStart() {
-	//
-}
-
-void OptionsMenu::Update() {
-	//
-}
-
-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/scenes/options_menu.hpp

@@ -1,58 +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 "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-
-//TODO: The options screen needs to be USED
-class OptionsMenu : public BaseScene {
-public:
-	//Public access members
-	OptionsMenu();
-	~OptionsMenu();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update();
-	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&);
-
-	//members
-	Image image;
-	RasterFont font;
-	Button backButton;
-};
-
-#endif

client/scenes/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"
-
-#include "config_utility.hpp"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-SplashScreen::SplashScreen() {
-	logo.LoadSurface(ConfigUtility::GetSingleton()["dir.logos"] + "krstudios.bmp");
-	startTick = std::chrono::steady_clock::now();
-}
-
-SplashScreen::~SplashScreen() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void SplashScreen::Update() {
-	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/scenes/splash_screen.hpp

@@ -1,47 +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 "image.hpp"
-
-#include <chrono>
-
-class SplashScreen : public BaseScene {
-public:
-	//Public access members
-	SplashScreen();
-	~SplashScreen();
-
-protected:
-	//Frame loop
-	void Update();
-	void Render(SDL_Surface* const);
-
-	//members
-	std::chrono::steady_clock::time_point startTick;
-	Image logo;
-};
-
-#endif

common/debugging/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/debugging/timer.cpp

@@ -1,45 +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 "timer.hpp"
-
-Timer::Timer(): start(Timer::Clock::now()) {
-	//
-}
-
-Timer::Timer(std::string s): name(s), start(Timer::Clock::now()) {
-	//
-}
-
-void Timer::Start() {
-	start = Clock::now();
-}
-
-void Timer::Stop() {
-	timeSpan = Clock::now() - start;
-}
-
-std::ostream& operator<<(std::ostream& os, Timer& t) {
-	os << t.GetName() << ": ";
-	os << std::chrono::duration_cast<std::chrono::milliseconds>(t.GetTime()).count();
-	os << "ms";
-	return os;
-}

common/debugging/timer.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 TIMER_HPP_
-#define TIMER_HPP_
-
-#include <chrono>
-#include <string>
-#include <ostream>
-
-class Timer {
-public:
-	typedef std::chrono::high_resolution_clock Clock;
-
-	Timer();
-	Timer(std::string s);
-	~Timer() = default;
-
-	inline void Start();
-	inline void Stop();
-
-	//accessors and mutators
-	Clock::duration GetTime() { return timeSpan; }
-
-	std::string SetName(std::string s) { return name = s; }
-	std::string GetName() { return name; }
-
-private:
-	std::string name;
-	Clock::time_point start;
-	Clock::duration timeSpan;
-};
-
-std::ostream& operator<<(std::ostream& os, Timer& t);
-
-#endif

common/gameplay/character_defines.hpp

@@ -1,37 +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 CHARACTERDEFINES_HPP_
-#define CHARACTERDEFINES_HPP_
-
-#include <cmath>
-
-//the speeds that the characters move
-constexpr double CHARACTER_WALKING_SPEED = 2.24;
-constexpr double CHARACTER_WALKING_MOD = 1.0/sqrt(2.0);
-
-//the bounds for the character objects, mapped to the default sprites
-constexpr int CHARACTER_BOUNDS_X = 0;
-constexpr int CHARACTER_BOUNDS_Y = 16;
-constexpr int CHARACTER_BOUNDS_WIDTH = 32;
-constexpr int CHARACTER_BOUNDS_HEIGHT = 32;
-
-#endif

common/gameplay/combat_defines.hpp

@@ -1,34 +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 COMBATDEFINES_HPP_
-#define COMBATDEFINES_HPP_
-
-#define COMBAT_MAX_CHARACTERS 16
-#define COMBAT_MAX_ENEMIES 16
-
-enum class TerrainType {
-	NONE = 0,
-	GRASSLANDS,
-	//etc.
-};
-
-#endif

common/gameplay/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/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+=.
-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/makefile

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

common/map/makefile

@@ -1,37 +0,0 @@
-#config
-INCLUDES+=. ../graphics ../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/region.cpp

@@ -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.
-*/
-#include "region.hpp"
-
-#include <stdexcept>
-#include <cmath>
-#include <cstring>
-
-int snapToBase(int base, int x) {
-	return floor((double)x / base) * base;
-}
-
-Region::Region(int argX, int argY): x(argX), y(argY) {
-	if (x != snapToBase(REGION_WIDTH, x) || y != snapToBase(REGION_HEIGHT, y)) {
-		throw(std::invalid_argument("Region location is off grid"));
-	}
-	memset(tiles, 0, REGION_WIDTH*REGION_HEIGHT*REGION_DEPTH*sizeof(type_t));
-}
-
-Region::Region(Region const& rhs): x(rhs.x), y(rhs.y) {
-	memcpy(tiles, rhs.tiles, REGION_WIDTH*REGION_HEIGHT*REGION_DEPTH*sizeof(type_t));
-	solid = rhs.solid;
-}
-
-Region::type_t Region::SetTile(int x, int y, int z, type_t v) {
-	return tiles[x][y][z] = v;
-}
-
-Region::type_t Region::GetTile(int x, int y, int z) {
-	return tiles[x][y][z];
-}
-
-bool Region::SetSolid(int x, int y, bool b) {
-	return solid[x * REGION_WIDTH + y] = b;
-}
-
-bool Region::GetSolid(int x, int y) {
-	return solid[x * REGION_WIDTH + y];
-}

common/map/region.hpp

@@ -1,63 +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_
-
-#include <bitset>
-
-//the region's storage format
-constexpr int REGION_WIDTH = 20;
-constexpr int REGION_HEIGHT = 20;
-constexpr int REGION_DEPTH = 3;
-
-//utility function
-int snapToBase(int base, int x);
-
-class Region {
-public:
-	typedef unsigned char type_t;
-
-	Region() = delete;
-	Region(int x, int y);
-	Region(Region const&);
-	~Region() = default;
-
-	type_t SetTile(int x, int y, int z, type_t v);
-	type_t GetTile(int x, int y, int z);
-
-	bool SetSolid(int x, int y, bool b);
-	bool GetSolid(int x, int y);
-
-	//accessors
-	int GetX() const { return x; }
-	int GetY() const { return y; }
-
-	std::bitset<REGION_WIDTH*REGION_HEIGHT>* GetSolidBitset() { return &solid; }
-private:
-	const int x;
-	const int y;
-
-	type_t tiles[REGION_WIDTH][REGION_HEIGHT][REGION_DEPTH];
-	std::bitset<REGION_WIDTH*REGION_HEIGHT> solid;
-};
-
-#endif

common/map/region_api.cpp

@@ -1,97 +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_api.hpp"
-
-#include "region.hpp"
-
-static int setTile(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	int ret = region->SetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1, lua_tointeger(L, 5));
-	lua_pushinteger(L, ret);
-	return 1;
-}
-
-static int getTile(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	int ret = region->GetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1);
-	lua_pushinteger(L, ret);
-	return 1;
-}
-
-static int setSolid(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	bool ret = region->SetSolid(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_toboolean(L, 4));
-	lua_pushboolean(L, ret);
-	return 1;
-}
-
-static int getSolid(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	bool ret = region->GetSolid(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1);
-	lua_pushboolean(L, ret);
-	return 1;
-}
-
-static int getX(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	lua_pushinteger(L, region->GetX());
-	return 1;
-}
-
-static int getY(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	lua_pushinteger(L, region->GetY());
-	return 1;
-}
-
-static int getWidth(lua_State* L) {
-	lua_pushinteger(L, REGION_WIDTH);
-	return 1;
-}
-
-static int getHeight(lua_State* L) {
-	lua_pushinteger(L, REGION_HEIGHT);
-	return 1;
-}
-
-static int getDepth(lua_State* L) {
-	lua_pushinteger(L, REGION_DEPTH);
-	return 1;
-}
-
-static const luaL_Reg regionLib[] = {
-	{"SetTile",setTile},
-	{"GetTile",getTile},
-	{"SetSolid",setSolid},
-	{"GetSolid",getSolid},
-	{"GetX",getX},
-	{"GetY",getY},
-	{"GetWidth",getWidth},
-	{"GetHeight",getHeight},
-	{"GetDepth",getDepth},
-	{nullptr, nullptr}
-};
-
-LUAMOD_API int openRegionAPI(lua_State* L) {
-	luaL_newlib(L, regionLib);
-	return 1;
-}

common/map/region_api.hpp

@@ -1,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 REGIONAPI_HPP_
-#define REGIONAPI_HPP_
-
-#include "lua/lua.hpp"
-
-#define TORTUGA_REGION_NAME "Region"
-LUAMOD_API int openRegionAPI(lua_State* L);
-
-#endif

common/map/region_pager_api.cpp

@@ -1,146 +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_api.hpp"
-
-#include "region_pager_lua.hpp"
-#include "region.hpp"
-
-//DOCS: These glue functions simply wrap RegionPagerLua's methods
-
-static int setTile(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	int ret = pager->SetTile(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4), lua_tointeger(L, 5));
-	lua_pushinteger(L, ret);
-	return 1;
-}
-
-static int getTile(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	int ret = pager->GetTile(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4));
-	lua_pushinteger(L, ret);
-	return 1;
-}
-
-static int setSolid(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	bool ret = pager->SetSolid(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_toboolean(L, 4));
-	lua_pushboolean(L, ret);
-	return 1;
-}
-
-static int getSolid(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	bool ret = pager->GetSolid(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	lua_pushboolean(L, ret);
-	return 1;
-}
-
-static int getRegion(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	lua_pushlightuserdata(L, region);
-	return 1;
-}
-
-static int loadRegion(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->LoadRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	lua_pushlightuserdata(L, region);
-	return 1;
-}
-
-static int saveRegion(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->SaveRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	lua_pushlightuserdata(L, region);
-	return 1;
-}
-
-static int createRegion(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->CreateRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	lua_pushlightuserdata(L, region);
-	return 1;
-}
-
-static int unloadRegion(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	pager->UnloadRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	return 0;
-}
-
-static int setOnLoad(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetLoadReference());
-	pager->SetLoadReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
-static int setOnSave(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetSaveReference());
-	pager->SetSaveReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
-static int setOnCreate(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetCreateReference());
-	pager->SetCreateReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
-static int setOnUnload(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetUnloadReference());
-	pager->SetUnloadReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
-static const luaL_Reg regionPagerLib[] = {
-	//curry
-	{"SetTile", setTile},
-	{"GetTile", getTile},
-	{"SetSolid", setSolid},
-	{"GetSolid", getSolid},
-
-	//access and control
-	{"GetRegion", getRegion},
-	{"LoadRegion", loadRegion},
-	{"SaveRegion", saveRegion},
-	{"CreateRegion", createRegion},
-	{"UnloadRegion", unloadRegion},
-
-	//triggers
-	{"SetOnLoad",setOnLoad},
-	{"SetOnSave",setOnSave},
-	{"SetOnCreate",setOnCreate},
-	{"SetOnUnload",setOnUnload},
-
-	//sentinel
-	{nullptr, nullptr}
-};
-
-LUAMOD_API int openRegionPagerAPI(lua_State* L) {
-	luaL_newlib(L, regionPagerLib);
-	return 1;
-}

common/map/region_pager_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 REGIONPAGERAPI_HPP_
-#define REGIONPAGERAPI_HPP_
-
-#include "lua/lua.hpp"
-
-#define TORTUGA_REGION_PAGER_NAME "RegionPager"
-LUAMOD_API int openRegionPagerAPI(lua_State* L);
-
-#endif

common/map/region_pager_base.cpp

@@ -1,99 +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_base.hpp"
-
-#include <stdexcept>
-#include <algorithm>
-
-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);
-}
-
-bool RegionPagerBase::SetSolid(int x, int y, int b) {
-	Region* ptr = GetRegion(x, y);
-	return ptr->SetSolid(x - ptr->GetX(), y - ptr->GetY(), b);
-}
-
-bool RegionPagerBase::GetSolid(int x, int y) {
-	Region* ptr = GetRegion(x, y);
-	return ptr->GetSolid(x - ptr->GetX(), y - ptr->GetY());
-}
-
-Region* RegionPagerBase::GetRegion(int x, int y) {
-	x = snapToBase(REGION_WIDTH, x);
-	y = snapToBase(REGION_HEIGHT, y);
-
-	//get the region by various means
-	Region* ptr = nullptr;
-	ptr = FindRegion(x, y);
-	if (ptr) return ptr;
-	ptr = LoadRegion(x, y);
-	if (ptr) return ptr;
-	return CreateRegion(x, y);
-}
-
-Region* RegionPagerBase::FindRegion(int x, int y) {
-	//find the region
-	std::list<Region>::iterator it = find_if(regionList.begin(), regionList.end(), [x, y](Region& region) -> bool {
-		return region.GetX() == x && region.GetY() == y;
-	});
-	return it != regionList.end() ? &(*it) : nullptr;
-}
-
-Region* RegionPagerBase::PushRegion(Region* const ptr) {
-	regionList.push_front(*ptr);
-	return &regionList.front();
-}
-
-Region* RegionPagerBase::LoadRegion(int x, int y) {
-	//EMPTY, intended for override
-	return nullptr;
-}
-
-Region* RegionPagerBase::SaveRegion(int x, int y) {
-	//EMPTY, intended for override
-	return nullptr;
-}
-
-Region* RegionPagerBase::CreateRegion(int x, int y) {
-	if (FindRegion(x, y)) {
-		throw(std::logic_error("Cannot overwrite an existing region"));
-	}
-	regionList.emplace_front(x, y);
-	return &regionList.front();
-}
-
-void RegionPagerBase::UnloadRegion(int x, int y) {
-	regionList.remove_if([x, y](Region& region) -> bool {
-		return region.GetX() == x && region.GetY() == y;
-	});
-}
-
-void RegionPagerBase::UnloadAll() {
-	regionList.clear();
-}

common/map/region_pager_base.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 REGIONPAGERBASE_HPP_
-#define REGIONPAGERBASE_HPP_
-
-#include "region.hpp"
-
-#include <list>
-
-class RegionPagerBase {
-public:
-	RegionPagerBase() = default;
-	virtual ~RegionPagerBase() { UnloadAll(); };
-
-	//tile manipulation
-	virtual Region::type_t SetTile(int x, int y, int z, Region::type_t v);
-	virtual Region::type_t GetTile(int x, int y, int z);
-
-	//solid manipulation
-	virtual bool SetSolid(int x, int y, int b);
-	virtual bool GetSolid(int x, int y);
-
-	//region manipulation
-	virtual Region* GetRegion(int x, int y);
-	virtual Region* FindRegion(int x, int y);
-	virtual Region* PushRegion(Region* const);
-
-	virtual Region* LoadRegion(int x, int y);
-	virtual Region* SaveRegion(int x, int y);
-	virtual Region* CreateRegion(int x, int y);
-	virtual void UnloadRegion(int x, int y);
-
-	virtual void UnloadAll();
-
-	//accessors & mutators
-	std::list<Region>* GetContainer() { return &regionList; }
-protected:
-	std::list<Region> regionList;
-};
-
-#endif

common/map/region_pager_lua.cpp

@@ -1,179 +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_lua.hpp"
-
-#include <stdexcept>
-
-Region* RegionPagerLua::LoadRegion(int x, int y) {
-	//get the pager's function from the registry
-	lua_rawgeti(lua, LUA_REGISTRYINDEX, loadRef);
-
-	//check if this function is available
-	if (lua_isnil(lua, -1)) {
-		lua_pop(lua, 1);
-		return nullptr;
-	}
-
-	//something to work on
-	Region tmpRegion(x, y);
-	lua_pushlightuserdata(lua, &tmpRegion);
-
-	//call the funtion, 1 arg, 1 return
-	if (lua_pcall(lua, 1, 1, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
-	}
-
-	//check the return value, success or failure
-	if (lua_toboolean(lua, -1)) {
-		lua_pop(lua, 1);
-		regionList.push_front(tmpRegion);
-		return &regionList.front();
-	}
-	else {
-		lua_pop(lua, 1);
-		return nullptr;
-	}
-}
-
-Region* RegionPagerLua::SaveRegion(int x, int y) {
-	//get the pager's function from the registry
-	lua_rawgeti(lua, LUA_REGISTRYINDEX, saveRef);
-
-	//check if this function is available
-	if (lua_isnil(lua, -1)) {
-		lua_pop(lua, 1);
-		return nullptr;
-	}
-
-	//find the specified region
-	Region* ptr = FindRegion(x, y);
-	if (!ptr) {
-		lua_pop(lua, 1);
-		return nullptr;
-	}
-	lua_pushlightuserdata(lua, ptr);
-
-	//call the function, 1 arg, 1 return
-	if (lua_pcall(lua, 1, 1, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
-	}
-
-	//check the return value, success or failure
-	if (lua_toboolean(lua, -1)) {
-		lua_pop(lua, 1);
-		return ptr;
-	}
-	else {
-		lua_pop(lua, 1);
-		return nullptr;
-	}
-}
-
-Region* RegionPagerLua::CreateRegion(int x, int y) {
-	if (FindRegion(x, y)) {
-		throw(std::logic_error("Cannot overwrite an existing region"));
-	}
-
-	//get the pager's function from the registry
-	lua_rawgeti(lua, LUA_REGISTRYINDEX, createRef);
-
-	//check if this function is available
-	if (lua_isnil(lua, -1)) {
-		lua_pop(lua, 1);
-		return nullptr;
-	}
-
-	//something to work on
-	Region tmpRegion(x, y);
-	lua_pushlightuserdata(lua, &tmpRegion);
-
-	//call the function, 1 arg, 0 return
-	if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
-	}
-
-	//return the new region
-	regionList.push_front(tmpRegion);
-	return &regionList.front();
-}
-
-void RegionPagerLua::UnloadRegion(int x, int y) {
-	//get the pager's function from the registry
-	lua_rawgeti(lua, LUA_REGISTRYINDEX, unloadRef);
-
-	//check if this function is available
-	if (lua_isnil(lua, -1)) {
-		lua_pop(lua, 1);
-		return;
-	}
-
-	//run each region through this lambda
-	regionList.remove_if([&](Region& region) -> bool {
-		if (region.GetX() == x && region.GetY() == y) {
-
-			//push a copy of the function onto the stack with the region
-			lua_pushvalue(lua, -1);
-			lua_pushlightuserdata(lua, &region);
-
-			//call the function, 1 arg, 0 return
-			if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
-				throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
-			}
-
-			//signal to the container
-			return true;
-		}
-		//signal to the container
-		return false;
-	});
-
-	//pop the base copy of the function
-	lua_pop(lua, 1);
-}
-
-void RegionPagerLua::UnloadAll() {
-	//get the pager's function from the registry
-	lua_rawgeti(lua, LUA_REGISTRYINDEX, unloadRef);
-
-	//check if this function is available
-	if (lua_isnil(lua, -1)) {
-		lua_pop(lua, 1);
-		return;
-	}
-
-	for (auto& it : regionList) {
-		//push a copy of the function onto the stack with the region
-		lua_pushvalue(lua, -1);
-		lua_pushlightuserdata(lua, &it);
-
-		//call the function, 1 arg, 0 return
-		if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
-			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
-		}
-	}
-
-	//pop the base copy of the function
-	lua_pop(lua, 1);
-
-	//remove from memory
-	regionList.clear();
-}

common/map/region_pager_lua.hpp

@@ -1,68 +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 REGIONPAGERLUA_HPP_
-#define REGIONPAGERLUA_HPP_
-
-#include "region_pager_base.hpp"
-
-#include "lua/lua.hpp"
-
-#include <string>
-
-class RegionPagerLua : public RegionPagerBase {
-public:
-	RegionPagerLua() = default;
-	~RegionPagerLua() = default;
-
-	//region manipulation
-	Region* LoadRegion(int x, int y) override;
-	Region* SaveRegion(int x, int y) override;
-	Region* CreateRegion(int x, int y) override;
-	void UnloadRegion(int x, int y) override;
-
-	void UnloadAll() override;
-
-	//accessors & mutators
-	lua_State* SetLuaState(lua_State* L) { return lua = L; }
-	lua_State* GetLuaState() { return lua; }
-
-	//utilities for the API
-	int SetLoadReference(int i) { return loadRef = i; }
-	int SetSaveReference(int i) { return saveRef = i; }
-	int SetCreateReference(int i) { return createRef = i; }
-	int SetUnloadReference(int i) { return unloadRef = i; }
-
-	int GetLoadReference() { return loadRef; }
-	int GetSaveReference() { return saveRef; }
-	int GetCreateReference() { return createRef; }
-	int GetUnloadReference() { return unloadRef; }
-
-protected:
-	lua_State* lua = nullptr;
-
-	int loadRef = LUA_NOREF;
-	int saveRef = LUA_NOREF;
-	int createRef = LUA_NOREF;
-	int unloadRef = LUA_NOREF;
-};
-
-#endif

common/map/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 tileWidth, int tileHeight) {
-	image.LoadSurface(fname);
-	image.SetClipW(tileWidth);
-	image.SetClipH(tileHeight);
-	xCount = image.GetSurface()->w / image.GetClipW();
-	yCount = image.GetSurface()->h / image.GetClipH();
-}
-
-void TileSheet::Unload() {
-	image.FreeSurface();
-	xCount = yCount = 0;
-}
-
-void TileSheet::DrawTileTo(SDL_Surface* const dest, int x, int y, Region::type_t tile) {
-	//0 is invisible
-	if (tile == 0) return;
-	image.SetClipX((tile-1) % xCount * image.GetClipW());
-	image.SetClipY((tile-1) / xCount * image.GetClipH());
-	image.DrawTo(dest, x, y);
-}
-
-void TileSheet::DrawRegionTo(SDL_Surface* const dest, Region* const region, int camX, int camY) {
-	Region::type_t tile = 0;
-	for (register int i = 0; i < REGION_WIDTH; ++i) {
-		for (register int j = 0; j < REGION_HEIGHT; ++j) {
-			for (register int k = 0; k < REGION_DEPTH; ++k) {
-				tile = region->GetTile(i, j, k);
-				//0 is invisible
-				if (tile == 0) continue;
-				image.SetClipX((tile-1) % xCount * image.GetClipW());
-				image.SetClipY((tile-1) / xCount * image.GetClipH());
-				image.DrawTo(dest,
-					(region->GetX() + i) * image.GetClipW() - camX,
-					(region->GetY() + j) * image.GetClipH() - camY);
-			}
-		}
-	}
-}

common/map/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 w, int h) { Load(f, w, h); }
-	~TileSheet() = default;
-
-	void Load(std::string fname, int tileWidth, int tileHeight);
-	void Unload();
-
-	void DrawTileTo(SDL_Surface* const dest, int x, int y, Region::type_t tile);
-	void DrawRegionTo(SDL_Surface* const dest, Region* const region, int camX, int camY);
-
-	//accessors
-	Image* GetImage() { return &image; }
-	int GetXCount() { return xCount; }
-	int GetYCount() { return yCount; }
-	int GetTileW() { return image.GetClipW(); }
-	int GetTileH() { return image.GetClipH(); }
-private:
-	Image image;
-	int xCount = 0, yCount = 0;
-};
-
-#endif

common/map/tile_sheet_api.cpp

@@ -1,75 +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_api.hpp"
-
-#include "tile_sheet.hpp"
-
-static int load(lua_State* L) {
-	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
-	sheet->Load(lua_tostring(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4));
-	return 0;
-}
-
-static int unload(lua_State* L) {
-	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
-	sheet->Unload();
-	return 0;
-}
-
-static int getXCount(lua_State* L) {
-	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
-	lua_pushinteger(L, sheet->GetXCount());
-	return 1;
-}
-
-static int getYCount(lua_State* L) {
-	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
-	lua_pushinteger(L, sheet->GetYCount());
-	return 1;
-}
-
-static int getTileW(lua_State* L) {
-	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
-	lua_pushinteger(L, sheet->GetTileW());
-	return 1;
-}
-
-static int getTileH(lua_State* L) {
-	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
-	lua_pushinteger(L, sheet->GetTileH());
-	return 1;
-}
-
-static const luaL_Reg tileSheetLib[] = {
-	{"Load",load},
-	{"Unload",unload},
-	{"GetXCount",getXCount},
-	{"GetYCount",getYCount},
-	{"GetTileW",getTileW},
-	{"GetTileH",getTileH},
-	{nullptr, nullptr}
-};
-
-LUAMOD_API int openTileSheetAPI(lua_State* L) {
-	luaL_newlib(L, tileSheetLib);
-	return 1;
-}

common/map/tile_sheet_api.hpp

@@ -1,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 TILESHEETAPI_HPP_
-#define TILESHEETAPI_HPP_
-
-#include "lua/lua.hpp"
-
-#define TORTUGA_TILE_SHEET_NAME "TileSheet"
-LUAMOD_API int openTileSheetAPI(lua_State* L);
-
-#endif

common/network/makefile

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

common/network/packet_types/character_packet.cpp

@@ -1,72 +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_packet.hpp"
-
-#include "serial_utility.hpp"
-
-void CharacterPacket::Serialize(void* buffer) {
-	serializeCopy(&buffer, &type, sizeof(SerialPacketType));
-
-	//identify the character
-	serializeCopy(&buffer, &characterIndex, sizeof(int));
-	serializeCopy(&buffer, handle, PACKET_STRING_SIZE);
-	serializeCopy(&buffer, avatar, PACKET_STRING_SIZE);
-
-	//the owner
-	serializeCopy(&buffer, &accountIndex, sizeof(int));
-
-	//location
-	serializeCopy(&buffer, &roomIndex, sizeof(int));
-	serializeCopy(&buffer, &origin.x, sizeof(double));
-	serializeCopy(&buffer, &origin.y, sizeof(double));
-	serializeCopy(&buffer, &motion.x, sizeof(double));
-	serializeCopy(&buffer, &motion.y, sizeof(double));
-
-	//stats structure
-	serializeCopyStatistics(&buffer, &stats);
-
-	//TODO: gameplay components: equipment, items, buffs, debuffs
-}
-
-void CharacterPacket::Deserialize(void* buffer) {
-	deserializeCopy(&buffer, &type, sizeof(SerialPacketType));
-
-	//identify the character
-	deserializeCopy(&buffer, &characterIndex, sizeof(int));
-	deserializeCopy(&buffer, handle, PACKET_STRING_SIZE);
-	deserializeCopy(&buffer, avatar, PACKET_STRING_SIZE);
-
-	//the owner
-	deserializeCopy(&buffer, &accountIndex, sizeof(int));
-
-	//location
-	deserializeCopy(&buffer, &roomIndex, sizeof(int));
-	deserializeCopy(&buffer, &origin.x, sizeof(double));
-	deserializeCopy(&buffer, &origin.y, sizeof(double));
-	deserializeCopy(&buffer, &motion.x, sizeof(double));
-	deserializeCopy(&buffer, &motion.y, sizeof(double));
-
-	//stats structure
-	deserializeCopyStatistics(&buffer, &stats);
-
-	//TODO: gameplay components: equipment, items, buffs, debuffs
-}

common/network/packet_types/character_packet.hpp

@@ -1,87 +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 CHARACTERPACKET_HPP_
-#define CHARACTERPACKET_HPP_
-
-#include "serial_packet_base.hpp"
-
-#include "vector2.hpp"
-#include "statistics.hpp"
-
-#include <cstring>
-
-class CharacterPacket : public SerialPacketBase {
-public:
-	CharacterPacket() {}
-	~CharacterPacket() {}
-
-	//indentity
-	int SetCharacterIndex(int i) { return characterIndex = i; }
-	const char* SetHandle(const char* s)
-	{ return strncpy(handle, s, PACKET_STRING_SIZE); }
-	const char* SetAvatar(const char* s)
-	{ return strncpy(handle, s, PACKET_STRING_SIZE); }
-
-	int SetAccountIndex(int i) { return accountIndex = i; }
-
-	int GetCharacterIndex() { return characterIndex; }
-	const char* GetHandle() { return handle; }
-	const char* GetAvatar() { return avatar; }
-
-	int GetAccountIndex() { return accountIndex; }
-
-	//location
-	int SetRoomIndex(int i) { return roomIndex = i; }
-	Vector2 SetOrigin(Vector2 v) { return origin = v; }
-	Vector2 SetMotion(Vector2 v) { return motion = v; }
-
-	int GetRoomIndex() { return roomIndex; }
-	Vector2 GetOrigin() { return origin; }
-	Vector2 GetMotion() { return motion; }
-
-	//gameplay
-	Statistics* GetStatistics() { return &stats; }
-
-	virtual void Serialize(void* buffer) override;
-	virtual void Deserialize(void* buffer) override;
-
-private:
-	//identify the character
-	int characterIndex;
-	char handle[PACKET_STRING_SIZE+1];
-	char avatar[PACKET_STRING_SIZE+1];
-
-	//the owner
-	int accountIndex;
-
-	//location
-	int roomIndex;
-	Vector2 origin;
-	Vector2 motion;
-
-	//gameplay
-	Statistics stats;
-
-	//TODO: gameplay components: equipment, items, buffs, debuffs
-};
-
-#endif

common/network/packet_types/client_packet.cpp

@@ -1,40 +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 "client_packet.hpp"
-
-#include "serial_utility.hpp"
-
-void ClientPacket::Serialize(void* buffer) {
-	serializeCopy(&buffer, &type, sizeof(SerialPacketType));
-
-	serializeCopy(&buffer, &clientIndex, sizeof(int));
-	serializeCopy(&buffer, &accountIndex, sizeof(int));
-	serializeCopy(&buffer, username, PACKET_STRING_SIZE);
-}
-
-void ClientPacket::Deserialize(void* buffer) {
-	deserializeCopy(&buffer, &type, sizeof(SerialPacketType));
-
-	deserializeCopy(&buffer, &clientIndex, sizeof(int));
-	deserializeCopy(&buffer, &accountIndex, sizeof(int));
-	deserializeCopy(&buffer, username, PACKET_STRING_SIZE);
-}

common/network/packet_types/client_packet.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 CLIENTPACKET_HPP_
-#define CLIENTPACKET_HPP_
-
-#include "serial_packet_base.hpp"
-
-#include <cstring>
-
-class ClientPacket : public SerialPacketBase {
-public:
-	ClientPacket() {}
-	~ClientPacket() {}
-
-	//accessors & mutators
-	int SetClientIndex(int i) { return clientIndex = i; }
-	int SetAccountIndex(int i) { return accountIndex = i; }
-	const char* SetUsername(const char* s)
-	{ return strncpy(username, s, PACKET_STRING_SIZE); }
-
-	int GetClientIndex() { return clientIndex; }
-	int GetAccountIndex() { return accountIndex; }
-	const char* GetUsername() { return username; }
-
-	virtual void Serialize(void* buffer) override;
-	virtual void Deserialize(void* buffer) override;
-
-private:
-	int clientIndex;
-	int accountIndex;
-	char username[PACKET_STRING_SIZE+1];
-//	char password[PACKET_STRING_SIZE]; //hashed, not currently used
-};
-
-#endif

common/network/packet_types/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/packet_types/region_packet.cpp

@@ -1,79 +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_packet.hpp"
-
-#include "serial_utility.hpp"
-
-void RegionPacket::Serialize(void* buffer) {
-	serializeCopy(&buffer, &type, sizeof(SerialPacketType));
-
-	//format
-	serializeCopy(&buffer, &roomIndex, sizeof(int));
-	serializeCopy(&buffer, &x, sizeof(int));
-	serializeCopy(&buffer, &y, sizeof(int));
-
-	if (type != SerialPacketType::REGION_CONTENT) {
-		return;
-	}
-
-	//tiles
-	for (int i = 0; i < REGION_WIDTH; i++) {
-		for (int j = 0; j < REGION_HEIGHT; j++) {
-			for (int k = 0; k < REGION_DEPTH; k++) {
-				*reinterpret_cast<Region::type_t*>(buffer) = region->GetTile(i, j, k);
-				buffer = reinterpret_cast<char*>(buffer) + sizeof(Region::type_t);
-			}
-		}
-	}
-
-	//solids
-	serializeCopy(&buffer, region->GetSolidBitset(), REGION_SOLID_FOOTPRINT);
-}
-
-void RegionPacket::Deserialize(void* buffer) {
-	deserializeCopy(&buffer, &type, sizeof(SerialPacketType));
-
-	//format
-	deserializeCopy(&buffer, &roomIndex, sizeof(int));
-	deserializeCopy(&buffer, &x, sizeof(int));
-	deserializeCopy(&buffer, &y, sizeof(int));
-
-	if (type != SerialPacketType::REGION_CONTENT) {
-		return;
-	}
-
-	//an object to work on
-	region = new Region(x, y);
-
-	//tiles
-	for (int i = 0; i < REGION_WIDTH; i++) {
-		for (int j = 0; j < REGION_HEIGHT; j++) {
-			for (int k = 0; k < REGION_DEPTH; k++) {
-				region->SetTile(i, j, k, *reinterpret_cast<Region::type_t*>(buffer));
-				buffer = reinterpret_cast<char*>(buffer) + sizeof(Region::type_t);
-			}
-		}
-	}
-
-	//solids
-	deserializeCopy(&buffer, region->GetSolidBitset(), REGION_SOLID_FOOTPRINT);
-}

common/network/packet_types/region_packet.hpp

@@ -1,67 +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 REGIONPACKET_HPP_
-#define REGIONPACKET_HPP_
-
-#include "serial_packet_base.hpp"
-
-#include "region.hpp"
-
-#include <cmath>
-#include <cstring>
-
-//define the memory footprint for the region's members
-constexpr int REGION_TILE_FOOTPRINT = sizeof(Region::type_t) * REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH;
-constexpr int REGION_SOLID_FOOTPRINT = ceil(REGION_WIDTH * REGION_HEIGHT / 8.0);
-constexpr int REGION_METADATA_FOOTPRINT = sizeof(int) * 3;
-
-class RegionPacket : public SerialPacketBase {
-public:
-	RegionPacket() {}
-	~RegionPacket() {}
-
-	//location
-	int SetRoomIndex(int i) { return roomIndex = i; }
-	int SetX(int i) { return x = i; }
-	int SetY(int i) { return y = i; }
-
-	int GetRoomIndex() { return roomIndex; }
-	int GetX() { return x; }
-	int GetY() { return y; }
-
-	//the region itself
-	Region* SetRegion(Region* r) { return region = r; }
-	Region* GetRegion() { return region; }
-
-	virtual void Serialize(void* buffer) override;
-	virtual void Deserialize(void* buffer) override;
-
-private:
-	//location/identify the region
-	int roomIndex;
-	int x, y;
-
-	//the data
-	Region* region;
-};
-
-#endif

common/network/packet_types/serial_packet_base.cpp

@@ -1,24 +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 "serial_packet_base.hpp"
-
-//NOTE: This is a sanity check

common/network/packet_types/serial_packet_base.hpp

@@ -1,53 +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 SERIALPACKETBASE_HPP_
-#define SERIALPACKETBASE_HPP_
-
-#include "serial_packet_type.hpp"
-
-#include "SDL/SDL_net.h"
-
-//The packets use a char array for string storage
-constexpr int PACKET_STRING_SIZE = 100;
-
-class SerialPacketBase {
-public:
-	SerialPacketType SetType(SerialPacketType t) { return type = t; }
-	SerialPacketType GetType() { return type; }
-
-	IPaddress GetAddress() { return srcAddress; }
-	IPaddress* GetAddressPtr() { return &srcAddress; }
-
-	SerialPacketBase() {};
-	virtual ~SerialPacketBase() {};
-
-	virtual void Serialize(void* buffer) = 0;
-	virtual void Deserialize(void* buffer) = 0;
-
-protected:
-	friend class UDPNetworkUtility;
-
-	SerialPacketType type;
-	IPaddress srcAddress;
-};
-
-#endif

common/network/packet_types/server_packet.cpp

@@ -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.
-*/
-#include "server_packet.hpp"
-
-#include "serial_utility.hpp"
-
-void ServerPacket::Serialize(void* buffer) {
-	serializeCopy(&buffer, &type, sizeof(SerialPacketType));
-
-	//identify the server
-	serializeCopy(&buffer, name, PACKET_STRING_SIZE);
-	serializeCopy(&buffer, &playerCount, sizeof(int));
-	serializeCopy(&buffer, &version, sizeof(int));
-}
-
-void ServerPacket::Deserialize(void* buffer) {
-	deserializeCopy(&buffer, &type, sizeof(SerialPacketType));
-
-	//identify the server
-	deserializeCopy(&buffer, name, PACKET_STRING_SIZE);
-	deserializeCopy(&buffer, &playerCount, sizeof(int));
-	deserializeCopy(&buffer, &version, sizeof(int));
-}

common/network/packet_types/server_packet.hpp

@@ -1,53 +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 SERVERPACKET_HPP_
-#define SERVERPACKET_HPP_
-
-#include "serial_packet_base.hpp"
-
-#include <cstring>
-
-class ServerPacket : public SerialPacketBase {
-public:
-	ServerPacket() {}
-	~ServerPacket() {}
-
-	const char* SetName(const char* s)
-	{ return strncpy(name, s, PACKET_STRING_SIZE); }
-	int SetPlayerCount(int i) { return playerCount = i; }
-	int SetVersion(int i) { return version = i; }
-
-	const char* GetName() { return name; }
-	int GetPlayerCount() { return playerCount; }
-	int GetVersion() { return version; }
-
-	virtual void Serialize(void* buffer) override;
-	virtual void Deserialize(void* buffer) override;
-
-private:
-	//identify the server
-	char name[PACKET_STRING_SIZE+1];
-	int playerCount;
-	int version;
-};
-
-#endif

common/network/serial_packet.hpp

@@ -1,67 +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_
-
-/* DOCS: serial_packet.hpp is used to define a number of required constants.
- * These are used extensively by the server and client
-*/
-
-#include "serial_packet_base.hpp"
-#include "character_packet.hpp"
-#include "client_packet.hpp"
-#include "region_packet.hpp"
-#include "server_packet.hpp"
-
-//SerialPacketBase is defined in serial_packet_base.hpp
-typedef SerialPacketBase SerialPacket;
-
-//DOCS: NETWORK_VERSION is used to discern compatible servers and clients
-constexpr int NETWORK_VERSION = 20140831;
-
-//_MaxPacket Should not be used
-union _MaxPacket {
-	CharacterPacket a;
-	ClientPacket b;
-	RegionPacket c;
-	ServerPacket d;
-};
-
-constexpr int MAX_PACKET_SIZE = sizeof(_MaxPacket);
-
-/* DOCS: PACKET_BUFFER_SIZE is the memory required to store serialized data
- * DOCS: SerialPacketType::REGION_CONTENT is currently the largest packet type
- * Serialized RegionPacket structure:
- *     SerialPacketType
- *     room index (int)
- *     X & Y position (int)
- *     tile data (3 layers)
- *     solid data (bitset)
-*/
-
-constexpr int PACKET_BUFFER_SIZE =
-	sizeof(SerialPacketType) +
-	REGION_METADATA_FOOTPRINT +
-	REGION_TILE_FOOTPRINT +
-	REGION_SOLID_FOOTPRINT;
-
-#endif

common/network/serial_packet_type.hpp

@@ -1,98 +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 SERIALPACKETTYPE_HPP_
-#define SERIALPACKETTYPE_HPP_
-
-/* DOCS: The headers indicate what packet type is used for each message
- * different messages under the same header will carry different amounts of
- * valid data, but it will still be carried in that packet's format.
-*/
-
-enum class SerialPacketType {
-	//default: there is something wrong
-	NONE = 0,
-
-	//-------------------------
-	//ServerPacket
-	//  name, player count, version
-	//-------------------------
-
-	//heartbeat
-	PING,
-	PONG,
-
-	//Used for finding available servers
-	BROADCAST_REQUEST,
-	BROADCAST_RESPONSE,
-
-	//-------------------------
-	//ClientPacket
-	//  client index, account index, character index
-	//-------------------------
-
-	//Connecting to a server as a client
-	JOIN_REQUEST,
-	JOIN_RESPONSE,
-	JOIN_REJECTION,
-
-	//client requests all information from the server
-	SYNCHRONIZE,
-
-	//disconnect from the server
-	DISCONNECT,
-
-	//shut down the server
-	SHUTDOWN,
-
-	//-------------------------
-	//RegionPacket
-	//  room index, x, y, raw data
-	//-------------------------
-
-	//map data
-	REGION_REQUEST,
-	REGION_CONTENT,
-
-	//-------------------------
-	//CharacterPacket
-	//  handle, avatar, character index, account index,
-	//  room index, origin, motion
-	//  statistics
-	//-------------------------
-
-	//controlling characters
-	CHARACTER_NEW,
-	CHARACTER_DELETE,
-	CHARACTER_UPDATE,
-
-	//authentication, character index => character stats
-	CHARACTER_STATS_REQUEST,
-	CHARACTER_STATS_RESPONSE,
-
-	//reject a character request
-	CHARACTER_REJECTION,
-
-	//not used
-	LAST
-};
-
-#endif

common/network/serial_utility.cpp

@@ -1,147 +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_utility.hpp"
-
-#include "serial_packet_type.hpp"
-
-#include "server_packet.hpp"
-#include "client_packet.hpp"
-#include "region_packet.hpp"
-#include "character_packet.hpp"
-
-#include <cstring>
-
-void serializePacket(SerialPacketBase* packet, void* data) {
-	switch(packet->GetType()) {
-		case SerialPacketType::PING:
-		case SerialPacketType::PONG:
-		case SerialPacketType::BROADCAST_REQUEST:
-		case SerialPacketType::BROADCAST_RESPONSE:
-			static_cast<ServerPacket*>(packet)->Serialize(data);
-		break;
-		case SerialPacketType::JOIN_REQUEST:
-		case SerialPacketType::JOIN_RESPONSE:
-		case SerialPacketType::JOIN_REJECTION:
-		case SerialPacketType::SYNCHRONIZE:
-		case SerialPacketType::DISCONNECT:
-		case SerialPacketType::SHUTDOWN:
-			static_cast<ClientPacket*>(packet)->Serialize(data);
-		break;
-		case SerialPacketType::REGION_REQUEST:
-		case SerialPacketType::REGION_CONTENT:
-			static_cast<RegionPacket*>(packet)->Serialize(data);
-		break;
-		case SerialPacketType::CHARACTER_NEW:
-		case SerialPacketType::CHARACTER_DELETE:
-		case SerialPacketType::CHARACTER_UPDATE:
-		case SerialPacketType::CHARACTER_STATS_REQUEST:
-		case SerialPacketType::CHARACTER_STATS_RESPONSE:
-		case SerialPacketType::CHARACTER_REJECTION:
-			static_cast<CharacterPacket*>(packet)->Serialize(data);
-		break;
-	}
-}
-
-void deserializePacket(SerialPacketBase* packet, void* data) {
-	//get the type
-	SerialPacketType type;
-	memcpy(&type, data, sizeof(SerialPacketType));
-
-	switch(type) {
-		case SerialPacketType::PING:
-		case SerialPacketType::PONG:
-		case SerialPacketType::BROADCAST_REQUEST:
-		case SerialPacketType::BROADCAST_RESPONSE:
-			static_cast<ServerPacket*>(packet)->Deserialize(data);
-		break;
-		case SerialPacketType::JOIN_REQUEST:
-		case SerialPacketType::JOIN_RESPONSE:
-		case SerialPacketType::JOIN_REJECTION:
-		case SerialPacketType::SYNCHRONIZE:
-		case SerialPacketType::DISCONNECT:
-		case SerialPacketType::SHUTDOWN:
-			static_cast<ClientPacket*>(packet)->Deserialize(data);
-		break;
-		case SerialPacketType::REGION_REQUEST:
-		case SerialPacketType::REGION_CONTENT:
-			static_cast<RegionPacket*>(packet)->Deserialize(data);
-		break;
-		case SerialPacketType::CHARACTER_NEW:
-		case SerialPacketType::CHARACTER_DELETE:
-		case SerialPacketType::CHARACTER_UPDATE:
-		case SerialPacketType::CHARACTER_STATS_REQUEST:
-		case SerialPacketType::CHARACTER_STATS_RESPONSE:
-		case SerialPacketType::CHARACTER_REJECTION:
-			static_cast<CharacterPacket*>(packet)->Deserialize(data);
-		break;
-	}
-}
-
-void serializeCopy(void** bufferHead, void* data, int size) {
-	memcpy(*bufferHead, data, size);
-	(*bufferHead) = static_cast<void*>(static_cast<char*>(*bufferHead) + size);
-}
-
-void deserializeCopy(void** bufferHead, void* data, int size) {
-	memcpy(data, *bufferHead, size);
-	(*bufferHead) = static_cast<void*>(static_cast<char*>(*bufferHead) + size);
-}
-
-void serializeCopyStatistics(void** bufferHead, Statistics* stats) {
-	//integers
-	serializeCopy(bufferHead, &stats->level, sizeof(int));
-	serializeCopy(bufferHead, &stats->exp, sizeof(int));
-	serializeCopy(bufferHead, &stats->maxHP, sizeof(int));
-	serializeCopy(bufferHead, &stats->health, sizeof(int));
-	serializeCopy(bufferHead, &stats->maxMP, sizeof(int));
-	serializeCopy(bufferHead, &stats->mana, sizeof(int));
-	serializeCopy(bufferHead, &stats->attack, sizeof(int));
-	serializeCopy(bufferHead, &stats->defence, sizeof(int));
-	serializeCopy(bufferHead, &stats->intelligence, sizeof(int));
-	serializeCopy(bufferHead, &stats->resistance, sizeof(int));
-	serializeCopy(bufferHead, &stats->speed, sizeof(int));
-
-	//floats
-	serializeCopy(bufferHead, &stats->accuracy, sizeof(float));
-	serializeCopy(bufferHead, &stats->evasion, sizeof(float));
-	serializeCopy(bufferHead, &stats->luck, sizeof(float));
-}
-
-void deserializeCopyStatistics(void** bufferHead, Statistics* stats) {
-	//integers
-	deserializeCopy(bufferHead, &stats->level, sizeof(int));
-	deserializeCopy(bufferHead, &stats->exp, sizeof(int));
-	deserializeCopy(bufferHead, &stats->maxHP, sizeof(int));
-	deserializeCopy(bufferHead, &stats->health, sizeof(int));
-	deserializeCopy(bufferHead, &stats->maxMP, sizeof(int));
-	deserializeCopy(bufferHead, &stats->mana, sizeof(int));
-	deserializeCopy(bufferHead, &stats->attack, sizeof(int));
-	deserializeCopy(bufferHead, &stats->defence, sizeof(int));
-	deserializeCopy(bufferHead, &stats->intelligence, sizeof(int));
-	deserializeCopy(bufferHead, &stats->resistance, sizeof(int));
-	deserializeCopy(bufferHead, &stats->speed, sizeof(int));
-
-	//floats
-	deserializeCopy(bufferHead, &stats->accuracy, sizeof(float));
-	deserializeCopy(bufferHead, &stats->evasion, sizeof(float));
-	deserializeCopy(bufferHead, &stats->luck, sizeof(float));
-}

common/network/serial_utility.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 SERIALIZEUTILITY_HPP_
-#define SERIALIZEUTILITY_HPP_
-
-#include "serial_packet_base.hpp"
-
-#include "statistics.hpp"
-
-//NOTE: The naming conventions here are fucking terrible
-
-//BUGFIX: There's really no way to escape this :(
-void serializePacket(SerialPacketBase* packet, void* data);
-void deserializePacket(SerialPacketBase* packet, void* data);
-
-//raw memcpy
-void serializeCopy(void** bufferHead, void* data, int size);
-void deserializeCopy(void** bufferHead, void* data, int size);
-
-void serializeCopyStatistics(void** bufferHead, Statistics* stats);
-void deserializeCopyStatistics(void** bufferHead, Statistics* stats);
-
-#endif

common/network/udp_network_utility.cpp

@@ -1,227 +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_utility.hpp"
-
-#include <stdexcept>
-
-//BUGFIX: 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);
-	serializePacket(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);
-	serializePacket(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);
-	serializePacket(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);
-	if (ret > 0) {
-		//BUG: This simply fails
-		deserializePacket(serialPacket, packet->data);
-		serialPacket->srcAddress = packet->address;
-	}
-
-	if (ret < 0) {
-		throw(std::runtime_error("Unknown network error occured"));
-	}
-
-	return ret;
-}

common/network/udp_network_utility.hpp

@@ -1,77 +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_
-
-//common
-#include "serial_packet.hpp"
-#include "singleton.hpp"
-
-//APIs
-#include "SDL/SDL_net.h"
-
-class UDPNetworkUtility : public Singleton<UDPNetworkUtility> {
-public:
-	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:
-	friend Singleton<UDPNetworkUtility>;
-
-	UDPNetworkUtility() = default;
-	~UDPNetworkUtility() = default;
-
-	UDPsocket socket = nullptr;
-	UDPpacket* packet = nullptr;
-};
-
-#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,92 +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.
-*/
-
-//TODO: This thing is fucking terrible, fix it and the button class
-class MenuBar {
-public:
-	MenuBar() = default;
-	~MenuBar() = default;
-
-	//yet another draw function
-	void DrawTo(SDL_Surface* const dest);
-
-	//user inputs
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&, int* entry, int* button);
-
-	//manage the entries & buttons
-	void SetEntries(std::vector<std::vector<std::string>> info);
-	void ClearEntries() { entries.clear(); }
-
-	//Accessors and mutators
-	Image* SetImage(Image* const ptr) { return image = ptr; }
-	Image* GetImage() { return image; }
-	RasterFont* SetFont(RasterFont* const ptr) { return font = ptr; }
-	RasterFont* GetFont() { return font; }
-
-private:
-	class MenuBarEntry;
-
-	std::vector<MenuBarEntry> entries;
-
-	Image* image = nullptr;
-	RasterFont* font = nullptr;
-};
-
-class MenuBar::MenuBarEntry {
-public:
-	MenuBarEntry() = default;
-	~MenuBarEntry() = default;
-
-	void DrawTo(SDL_Surface* const dest);
-
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	int MouseButtonUp(SDL_MouseButtonEvent const&);
-
-private:
-	Button mainButton;
-
-	std::vector<Button> dropButtons;
-	bool open = false;
-
-	friend class MenuBar;
-};
-
-#endif

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

@@ -1,78 +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 BOUNDINGBOX_HPP_
-#define BOUNDINGBOX_HPP_
-
-#include <type_traits>
-#include <algorithm>
-
-class BoundingBox {
-public:
-	//This is explicitly a POD
-	int x, y;
-	int w, h;
-
-	BoundingBox() = default;
-	BoundingBox(int i, int j): x(i), y(j), w(0), h(0) {};
-	BoundingBox(int i, int j, int k, int l): x(i), y(j), w(k), h(l) {};
-	~BoundingBox() = default;
-	BoundingBox& operator=(BoundingBox const&) = default;
-
-	int Size() {
-		return std::max(w*h,0);
-	}
-
-	bool CheckOverlap(BoundingBox rhs) {
-		return !(
-			x >= rhs.x + rhs.w ||
-			y >= rhs.y + rhs.h ||
-			rhs.x >= x + w ||
-			rhs.y >= y + h);
-	}
-
-	BoundingBox CalcOverlap(BoundingBox rhs) {
-		if (!CheckOverlap(rhs)) {
-			return {0, 0, 0, 0};
-		}
-		BoundingBox 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;
-	}
-};
-
-//This is explicitly a POD
-static_assert(std::is_pod<BoundingBox>::value, "BoundingBox is not a POD");
-
-#include "vector2.hpp"
-
-//operators
-inline BoundingBox operator+(BoundingBox b, Vector2 v) {
-	return {b.x + (int)v.x, b.y + (int)v.y, b.w, b.h};
-}
-inline BoundingBox operator+(Vector2 v, BoundingBox b) {
-	return b + v;
-}
-
-#endif

common/utilities/config_utility.cpp

@@ -1,130 +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>
-
-void ConfigUtility::Load(std::string fname) {
-	//clear the stored configuration
-	configMap.clear();
-	//pass to the recursive method
-	configMap = Read(fname);
-}
-
-ConfigUtility::table_t ConfigUtility::Read(std::string fname) {
-	//read in and return this file's data
-	table_t retTable;
-	std::ifstream is(fname);
-
-	if (!is.is_open()) {
-		std::string msg;
-		msg += "Failed to open a config file: ";
-		msg += fname;
-		throw(std::runtime_error(msg));
-	}
-
-	std::string key, val;
-
-	while(true) { //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);
-
-		//disallow empty/wiped values
-		if (key.size() == 0) {
-			continue;
-		}
-
-		//save the pair
-		retTable[key] = val;
-	}
-
-	is.close();
-
-	//load in any subordinate config files
-	//TODO: Possibility of nesting config levels?
-	if (retTable.find("config.next") != retTable.end()) {
-		table_t subTable = Read(retTable["config.next"]);
-		retTable.insert(subTable.begin(), subTable.end());
-	}
-
-	return retTable;
-}
-
-//-------------------------
-//Convert to a type
-//-------------------------
-
-std::string& ConfigUtility::String(std::string s) {
-	return configMap[s];
-}
-
-int ConfigUtility::Integer(std::string s) {
-	table_t::iterator it = configMap.find(s);
-	if (it == configMap.end()) {
-		return 0;
-	}
-	return atoi(it->second.c_str());
-}
-
-double ConfigUtility::Double(std::string s) {
-	table_t::iterator it = configMap.find(s);
-	if (it == configMap.end()) {
-		return 0.0;
-	}
-	return atof(it->second.c_str());
-}
-
-bool ConfigUtility::Boolean(std::string s) {
-	table_t::iterator it = configMap.find(s);
-	if (it == configMap.end()) {
-		return false;
-	}
-	return it->second == "true";
-}

common/utilities/config_utility.hpp

@@ -1,58 +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 "singleton.hpp"
-
-#include <map>
-#include <string>
-
-class ConfigUtility : public Singleton<ConfigUtility> {
-public:
-	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
-	inline std::string& operator[](std::string s) { return configMap[s]; }
-	inline int Int(std::string s) { return Integer(s); }
-	inline bool Bool(std::string s) { return Boolean(s); }
-
-private:
-	typedef std::map<std::string, std::string> table_t;
-
-	friend Singleton<ConfigUtility>;
-
-	ConfigUtility() = default;
-	~ConfigUtility() = default;
-
-	table_t Read(std::string fname);
-
-	table_t configMap;
-};
-
-#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/singleton.hpp

@@ -1,63 +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 SINGLETON_HPP_
-#define SINGLETON_HPP_
-
-#include <stdexcept>
-
-template<typename T>
-class Singleton {
-public:
-	static T& GetSingleton() {
-		if (!ptr) {
-			throw(std::logic_error("This singleton has not been created"));
-		}
-		return *ptr;
-	}
-	static void Create() {
-		if (ptr) {
-			throw(std::logic_error("This singleton has already been created"));
-		}
-		ptr = new T();
-	}
-	static void Delete() {
-		if (!ptr) {
-			throw(std::logic_error("A non-existant singleton cannot be deleted"));
-		}
-		delete ptr;
-		ptr = nullptr;
-	}
-
-protected:
-	Singleton() = default;
-	Singleton(Singleton const&) = default;
-	Singleton(Singleton&&) = default;
-	~Singleton() = default;
-
-private:
-	static T* ptr;
-};
-
-template<typename T>
-T* Singleton<T>::ptr = nullptr;
-
-#endif

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,50 +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>
-
-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,34 +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>
-
-std::string truncatePath(std::string pathname);
-
-//fixing known bugs in g++
-std::string to_string_custom(int i);
-
-int to_integer_custom(std::string);
-
-#endif

common/utilities/vector2.hpp

@@ -1,110 +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;
-	}
-	void Normalize() {
-		double l = Length();
-		if (l == 0)
-			throw(std::domain_error("Divide by zero"));
-		x /= l;
-		y /= l;
-	}
-
-	//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); }
-};
-
-//This is explicitly a POD
-static_assert(std::is_pod<Vector2>::value, "Vector2 is not a POD");
-
-#endif

copyright.txt

@@ -1,15 +0,0 @@
-Future versions (to be determined) may be released under a modified version of the Uplink Developer's License.
-
-The current version of Tortuga is released under the 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.

deprecated/deprecated map system 1.txt

@@ -0,0 +1,84 @@
+The Game Map
+
+This section outlines the game’s map system. This system utilizes pagination to create a theoretically infinite game map, as well as supporting multiple tilesets in the same map. The goal of this design is to create a system with as much flexibility as possible, and simply enforcing a more rigid approach higher in the tool chain.
+
+Tile
+
+The Tile class is the basic unit of the map system, and is explicitly a POD (plain old data) structure. A tile has these members:
+
+X Position
+Y Position
+Depth
+Width
+Height
+Tile Index
+
+The tile’s X and Y positions are relative to their container region’s location. A tile’s depth allows multiple tiles to be drawn at the same location, and in the correct order; tiles with lower depths (including below zero) are drawn first. If a new tile has the same X position, Y position and depth as an existing tile, the old tile is overwritten.
+
+The width and height members indicate the graphical size of the tile (not actually used when drawing), while the tile index is the specific tile for the sheet manager to draw. A negative value here is considered an error message.
+
+Region
+
+The region class has these members:
+
+X Position
+Y Position
+Width
+Height
+Tile Container
+
+Each region in a certain map must have the same width and height, and it’s X and Y positions must be multiples of those width and height values, respectfully. The outcome of this restriction is a theoretically infinite grid of region objects.
+
+Each region holds a set of tiles corresponding to the region’s bounds. The tiles’ X and Y positions are relative to the regions’, so moving the region will move the tiles as well. A region object is created or loaded when a tile is place in it’s bounds; similarly, if a region has no tiles it should be deleted or removed from memory.
+
+The exact width and height of a region has no significant impact, other than loading or transmission costs. The width and height of a map can be adjusted as needed.
+
+Region Pager
+
+The region pager class has these members:
+
+Region Width
+Region Height
+On New Callback
+On Delete Callback
+Region Container
+
+The Region Pager class holds a series of region objects, as well as creating and deleting them as needed. Every region theoretically exists at any time, so if a non-existent region object is requested, it is created and then returned. This class also has the Prune() method, which removes all regions out of bounds from memory, and the DrawTo method, which takes (among other things) the sheet manager for the map.
+
+The width and height members must be set before the pager is used, and must not be changed while it still has regions loaded. These are used to create region objects as needed.
+
+Each pager can also have two different callbacks set: “on new” and “on delete”. If either of these are set (that is, not null) then each region object’s address is passed to these after it is created or before it is destroyed, respectfully. The callbacks are intended to be used for domain specific processes, such as loading or saving data, or even requesting data from a remote server.
+
+Tile Sheet
+
+A tileset is a series of tile graphics stored in a single file. The tile sheet class loads a tile set into memory, and provides utilities for drawing them to the screen. The tile sheet class has these members:
+
+Image
+X Count
+Y Count
+Total Count
+Begin
+End
+
+The Image class is utilized heavily here by storing the graphical data and the tile size. Any file loaded into a sheet object must have all tile images arranged in a grid pattern, and they must all have the same width and height. The width and height must be provided when the file is loaded.
+
+The X and Y counts are the number of tiles along the X and Y axis of the sheet’s image, and the total count is the number of tiles in the whole sheet (which is equal to the product of the X and Y counts).
+
+Begin is the index of the first tile on the sheet (default is zero), and end is the index after the last tile (defaults to the value of total count). These indicate the range of the tiles, and are mostly used by the sheet manager. They are also used by the InRange() method, which checks to see if a certain tile is in that sheet.
+
+Tile Sheet Manager
+
+This class has these members:
+
+Tile Sheet Container
+Range End
+
+This class is a wrapper around a key-value container, using strings as the keys. Given a specific tile index, this class will draw the correct tile from the loaded sheets, or it throws an error.
+
+Also, this class keeps track of the end of the sheet’s ranges.
+
+TODO
+
+Map File Format
+
+TODO

deprecated/refactoring fun/README.md

@@ -0,0 +1,3 @@
+This particular refactoring stage was absolute hell, mostly because I was wrestling with a severe bout of depression too. So, I've added the diffs, and a scary screenshot of the git console.
+
+There are three diff files because server/server_application.cpp was split into two files: server/server_internals.cpp and server/server_connections.cpp, each with it's own diff.

deprecated/refactoring fun/server_connections.diff

@@ -0,0 +1,394 @@
+diff --git a/server/server_connections.cpp b/server/server_connections.cpp
+index 1a96d5b..2f35566 100644
+--- a/server/server_connections.cpp
++++ b/server/server_connections.cpp
+@@ -21,212 +21,106 @@
+ */
+ #include "server_application.hpp"
+ 
+-#include "utility.hpp"
+-
+ #include <stdexcept>
+ #include <iostream>
+-#include <string>
+-
+-//-------------------------
+-//Define the public members
+-//-------------------------
+-
+-void ServerApplication::Init(int argc, char** argv) {
+-	//NOTE: I might need to rearrange the init process so that lua & SQL can interact with the map system as needed.
+-	std::cout << "Beginning startup" << std::endl;
+-
+-	//initial setup
+-	ClientEntry::uidCounter = 0;
+-	PlayerEntry::uidCounter = 0;
+-	config.Load("rsc\\config.cfg");
+-
+-	//Init SDL
+-	if (SDL_Init(0)) {
+-		throw(std::runtime_error("Failed to initialize SDL"));
+-	}
+-	std::cout << "Initialized SDL" << std::endl;
+-
+-	//Init SDL_net
+-	if (SDLNet_Init()) {
+-		throw(std::runtime_error("Failed to initialize SDL_net"));
+-	}
+-	network.Open(config.Int("server.port"), PACKET_BUFFER_SIZE);
+-	std::cout << "Initialized SDL_net" << std::endl;
+-
+-	//Init SQL
+-	int ret = sqlite3_open_v2(config["server.dbname"].c_str(), &database, SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE, nullptr);
+-	if (ret != SQLITE_OK || !database) {
+-		throw(std::runtime_error(std::string() + "Failed to initialize SQL: " + sqlite3_errmsg(database) ));
+-	}
+-	std::cout << "Initialized SQL" << std::endl;
+-
+-	//setup the database
+-	if (runSQLScript(database, config["dir.scripts"] + "setup_server.sql")) {
+-		throw(std::runtime_error("Failed to initialize SQL's setup script"));
+-	}
+-	std::cout << "Initialized SQL's setup script" << std::endl;
+-
+-	//lua
+-	luaState = luaL_newstate();
+-	if (!luaState) {
+-		throw(std::runtime_error("Failed to initialize lua"));
+-	}
+-	luaL_openlibs(luaState);
+-	std::cout << "Initialized lua" << std::endl;
+-
+-	//run the startup script
+-	if (luaL_dofile(luaState, (config["dir.scripts"] + "setup_server.lua").c_str())) {
+-		throw(std::runtime_error(std::string() + "Failed to initialize lua's setup script: " + lua_tostring(luaState, -1) ));
+-	}
+-	std::cout << "Initialized lua's setup script" << std::endl;
+-
+-	//setup the map object
+-	regionPager.GetAllocator()->SetLuaState(luaState);
+-	regionPager.GetFormat()->SetLuaState(luaState);
+-	//TODO: config parameter
+-	regionPager.GetFormat()->SetSaveDir("save/mapname/");
+-
+-	std::cout << "Initialized the map system" << std::endl;
+-	std::cout << "\tsizeof(SerialPacket): " << sizeof(SerialPacket) << std::endl;
+-	std::cout << "\tPACKET_BUFFER_SIZE: " << PACKET_BUFFER_SIZE << std::endl;
+-
+-	//finalize the startup
+-	std::cout << "Startup completed successfully" << std::endl;
+-
+-	//debugging
+-	//
+-}
+-
+-void ServerApplication::Proc() {
+-	SerialPacket packet;
+-	while(running) {
+-		//suck in the waiting packets & process them
+-		while(network.Receive()) {
+-			//get the packet
+-			deserialize(&packet, network.GetInData());
+-			//cache the source address
+-			packet.meta.srcAddress = network.GetInPacket()->address;
+-			//we need to go deeper
+-			HandlePacket(packet);
+-		}
+-		//give the computer a break
+-		SDL_Delay(10);
+-	}
+-}
+-
+-void ServerApplication::Quit() {
+-	std::cout << "Shutting down" << std::endl;
+-	//empty the members
+-	regionPager.UnloadAll();
+-
+-	//APIs
+-	lua_close(luaState);
+-	sqlite3_close_v2(database);
+-	network.Close();
+-	SDLNet_Quit();
+-	SDL_Quit();
+-	std::cout << "Shutdown finished" << std::endl;
+-}
+-
+-//-------------------------
+-//Define the uber switch
+-//-------------------------
+-
+-void ServerApplication::HandlePacket(SerialPacket packet) {
+-	switch(packet.meta.type) {
+-		case SerialPacket::Type::BROADCAST_REQUEST:
+-			HandleBroadcastRequest(packet);
+-		break;
+-		case SerialPacket::Type::JOIN_REQUEST:
+-			HandleJoinRequest(packet);
+-		break;
+-		case SerialPacket::Type::DISCONNECT:
+-			HandleDisconnect(packet);
+-		break;
+-		case SerialPacket::Type::SYNCHRONIZE:
+-			HandleSynchronize(packet);
+-		break;
+-		case SerialPacket::Type::SHUTDOWN:
+-			HandleShutdown(packet);
+-		break;
+-		case SerialPacket::Type::PLAYER_NEW:
+-			HandlePlayerNew(packet);
+-		break;
+-		case SerialPacket::Type::PLAYER_DELETE:
+-			HandlePlayerDelete(packet);
+-		break;
+-		case SerialPacket::Type::PLAYER_UPDATE:
+-			HandlePlayerUpdate(packet);
+-		break;
+-		case SerialPacket::Type::REGION_REQUEST:
+-			HandleRegionRequest(packet);
+-		break;
+-		//handle errors
+-		default:
+-			throw(std::runtime_error("Unknown SerialPacket::Type encountered"));
+-		break;
+-	}
+-}
+ 
+ //-------------------------
+ //Handle various network input
+ //-------------------------
+ 
+ void ServerApplication::HandleBroadcastRequest(SerialPacket packet) {
+-	//send back the server's metadata
++	//pack the server's data
+ 	packet.meta.type = SerialPacket::Type::BROADCAST_RESPONSE;
+-
+-	//pack the data
++	packet.serverInfo.networkVersion = NETWORK_VERSION;
+ 	snprintf(packet.serverInfo.name, PACKET_STRING_SIZE, "%s", config["server.name"].c_str());
+ 	packet.serverInfo.playerCount = playerMap.size();
+-	packet.serverInfo.regionWidth = REGION_WIDTH;
+-	packet.serverInfo.regionHeight = REGION_HEIGHT;
+-	packet.serverInfo.regionDepth = REGION_DEPTH;
+ 
+-	//send the data
++	//bounce this packet
+ 	char buffer[PACKET_BUFFER_SIZE];
+ 	serialize(&packet, buffer);
+ 	network.Send(&packet.meta.srcAddress, buffer, PACKET_BUFFER_SIZE);
+ }
+ 
+ void ServerApplication::HandleJoinRequest(SerialPacket packet) {
+-	//register the new client
++	//create the new client
+ 	ClientEntry newClient;
+ 	newClient.address = packet.meta.srcAddress;
+-	clientMap[ClientEntry::uidCounter] = newClient;
+ 
+-	//send the client their index
+-	char buffer[PACKET_BUFFER_SIZE];
++	//TODO: move this into the player management code
++	//create the new player
++	PlayerEntry newPlayer;
++	newPlayer.clientIndex = ClientEntry::uidCounter;
++	newPlayer.player = packet.clientInfo.player;
++	newPlayer.handle = packet.clientInfo.handle;
++	newPlayer.avatar = packet.clientInfo.avatar;
++
++	//send the client their info
+ 	packet.meta.type = SerialPacket::Type::JOIN_RESPONSE;
+-	packet.clientInfo.index = ClientEntry::uidCounter;
+-	serialize(&packet, buffer);
++	packet.clientInfo.clientIndex = ClientEntry::uidCounter;
++	packet.clientInfo.playerIndex = PlayerEntry::uidCounter;
+ 
+ 	//bounce this packet
++	char buffer[PACKET_BUFFER_SIZE];
++	serialize(&packet, buffer);
+ 	network.Send(&newClient.address, buffer, PACKET_BUFFER_SIZE);
+ 
++	//send the new player to all clients
++	packet.meta.type = SerialPacket::Type::PLAYER_NEW;
++	packet.playerInfo.playerIndex = PlayerEntry::uidCounter;
++	strncpy(packet.playerInfo.handle, newPlayer.handle.c_str(), PACKET_STRING_SIZE);
++	strncpy(packet.playerInfo.avatar, newPlayer.avatar.c_str(), PACKET_STRING_SIZE);
++	packet.playerInfo.position = newPlayer.position;
++	packet.playerInfo.motion = newPlayer.motion;
++	PumpPacket(packet);
++
+ 	//finished this routine
++	clientMap[ClientEntry::uidCounter] = newClient;
++	playerMap[PlayerEntry::uidCounter] = newPlayer;
+ 	ClientEntry::uidCounter++;
++	PlayerEntry::uidCounter++;
+ 	std::cout << "Connect, total: " << clientMap.size() << std::endl;
+ }
+ 
++void ServerApplication::HandleSynchronize(SerialPacket packet) {
++	//TODO: compensate for large distances
++
++	//send all the server's data to this client
++	SerialPacket newPacket;
++	char buffer[PACKET_BUFFER_SIZE];
++
++	//players
++	newPacket.meta.type = SerialPacket::Type::PLAYER_UPDATE;
++	for (auto& it : playerMap) {
++		//TODO: update this for the expanded PlayerEntry structure
++		newPacket.playerInfo.playerIndex = it.first;
++		snprintf(newPacket.playerInfo.handle, PACKET_STRING_SIZE, "%s", it.second.handle.c_str());
++		snprintf(newPacket.playerInfo.avatar, PACKET_STRING_SIZE, "%s", it.second.avatar.c_str());
++		newPacket.playerInfo.mapIndex = it.second.mapIndex;
++		newPacket.playerInfo.position = it.second.position;
++		newPacket.playerInfo.motion = it.second.motion;
++		serialize(&newPacket, buffer);
++		network.Send(&clientMap[packet.clientInfo.clientIndex].address, buffer, PACKET_BUFFER_SIZE);
++	}
++}
++
+ void ServerApplication::HandleDisconnect(SerialPacket packet) {
+ 	//TODO: authenticate who is disconnecting/kicking
++	//TODO: define the difference between unloading and deletng a player
+ 
+ 	//disconnect the specified client
+ 	char buffer[PACKET_BUFFER_SIZE];
+ 	serialize(&packet, buffer);
+-	network.Send(&clientMap[packet.clientInfo.index].address, buffer, PACKET_BUFFER_SIZE);
+-	clientMap.erase(packet.clientInfo.index);
++	network.Send(&clientMap[packet.clientInfo.clientIndex].address, buffer, PACKET_BUFFER_SIZE);
++	clientMap.erase(packet.clientInfo.clientIndex);
+ 
+ 	//prep the delete packet
+ 	SerialPacket delPacket;
+ 	delPacket.meta.type = SerialPacket::Type::PLAYER_DELETE;
+ 
+-	//TODO: can this use DeletePlayer() instead?
+ 	//delete server and client side players
+-	erase_if(playerMap, [&](std::pair<unsigned int, PlayerEntry> it) -> bool {
++	erase_if(playerMap, [&](std::pair<int, PlayerEntry> it) -> bool {
+ 		//find the internal players to delete
+-		if (it.second.clientIndex == packet.clientInfo.index) {
++		if (it.second.clientIndex == packet.clientInfo.clientIndex) {
+ 			//send the delete player command to all clients
+ 			delPacket.playerInfo.playerIndex = it.first;
+ 			PumpPacket(delPacket);
+@@ -243,102 +137,23 @@ void ServerApplication::HandleDisconnect(SerialPacket packet) {
+ 	std::cout << "Disconnect, total: " << clientMap.size() << std::endl;
+ }
+ 
+-void ServerApplication::HandleSynchronize(SerialPacket packet) {
+-	//TODO: compensate for large distances
+-
+-	//send all the server's data to this client
+-	SerialPacket newPacket;
+-	char buffer[PACKET_BUFFER_SIZE];
+-
+-	//players
+-	newPacket.meta.type = SerialPacket::Type::PLAYER_UPDATE;
+-	for (auto& it : playerMap) {
+-		//TODO: update this for the expanded PlayerEntry structure
+-		newPacket.playerInfo.playerIndex = it.first;
+-		snprintf(newPacket.playerInfo.handle, PACKET_STRING_SIZE, "%s", it.second.handle.c_str());
+-		snprintf(newPacket.playerInfo.avatar, PACKET_STRING_SIZE, "%s", it.second.avatar.c_str());
+-		newPacket.playerInfo.position = it.second.position;
+-		newPacket.playerInfo.motion = it.second.motion;
+-		serialize(&newPacket, buffer);
+-		network.Send(&clientMap[packet.clientInfo.index].address, buffer, PACKET_BUFFER_SIZE);
+-	}
+-}
+-
+ void ServerApplication::HandleShutdown(SerialPacket packet) {
++	//TODO: authenticate who is shutting the server down
++
+ 	//end the server
+ 	running = false;
+ 
+ 	//disconnect all clients
+ 	packet.meta.type = SerialPacket::Type::DISCONNECT;
++	packet.clientInfo.clientIndex = -1;
+ 	PumpPacket(packet);
+ 
+ 	//finished this routine
+ 	std::cout << "Shutdown signal accepted" << std::endl;
+ }
+ 
+-void ServerApplication::HandlePlayerNew(SerialPacket packet) {
+-	//register the new PlayerEntry
+-	//NOTE: assigning each field one-by-one so adding or moving a field doesn't break this code
+-	PlayerEntry newPlayer;
+-
+-	//metadata
+-	newPlayer.clientIndex = packet.playerInfo.clientIndex;
+-	newPlayer.handle = packet.playerInfo.handle;
+-	newPlayer.avatar = packet.playerInfo.avatar;
+-
+-	//position
+-	newPlayer.mapIndex = 0;
+-	newPlayer.position = {0,0};
+-	newPlayer.motion = {0,0};
+-	newPlayer.bbox = {0, 0, 0, 0};
+-
+-	//TODO: Add the statistic creation code here
+-
+-	//push this player
+-	playerMap[PlayerEntry::uidCounter] = newPlayer;
+-
+-	//send the client their info
+-	packet.playerInfo.playerIndex = PlayerEntry::uidCounter;
+-	packet.playerInfo.position = newPlayer.position;
+-	packet.playerInfo.motion = newPlayer.motion;
+-
+-	//actually send to everyone
+-	PumpPacket(packet);
+-
+-	//finish this routine
+-	PlayerEntry::uidCounter++;
+-}
+-
+-//TODO: differentiate between delete and unload
+-void ServerApplication::HandlePlayerDelete(SerialPacket packet) {
+-	//TODO: authenticate who is deleting this player
+-	if (playerMap.find(packet.playerInfo.playerIndex) == playerMap.end()) {
+-		throw(std::runtime_error("Cannot delete a non-existant player"));
+-	}
+-
+-	//TODO: remove the deleted player from the database?
+-
+-	//prep the delete packet
+-	SerialPacket delPacket;
+-	delPacket.meta.type = SerialPacket::Type::PLAYER_DELETE;
+-
+-	//delete the specified playerEntry
+-	erase_if(playerMap, [&](std::pair<unsigned int, PlayerEntry> it) -> bool {
+-		//find the specified PlayerEntry
+-		if (it.first == packet.playerInfo.playerIndex) {
+-			//send to all
+-			delPacket.playerInfo.playerIndex = it.first;
+-			PumpPacket(delPacket);
+-
+-			//delete this player
+-			return true;
+-		}
+-		//skip this player
+-		return false;
+-	});
+-}
+-
+ void ServerApplication::HandlePlayerUpdate(SerialPacket packet) {
++	//TODO: this should be moved elsewhere
+ 	if (playerMap.find(packet.playerInfo.playerIndex) == playerMap.end()) {
+ 		throw(std::runtime_error("Cannot update a non-existant player"));
+ 	}
+@@ -351,9 +166,12 @@ void ServerApplication::HandlePlayerUpdate(SerialPacket packet) {
+ }
+ 
+ void ServerApplication::HandleRegionRequest(SerialPacket packet) {
+-	char buffer[PACKET_BUFFER_SIZE];
++	//TODO: this should be moved elsewhere
+ 	packet.meta.type = SerialPacket::Type::REGION_CONTENT;
+ 	packet.regionInfo.region = regionPager.GetRegion(packet.regionInfo.x, packet.regionInfo.y);
++
++	//send the content
++	char buffer[PACKET_BUFFER_SIZE];
+ 	serialize(&packet, buffer);
+ 	network.Send(&packet.meta.srcAddress, buffer, PACKET_BUFFER_SIZE);
+ }

deprecated/refactoring fun/server_internals.diff

@@ -0,0 +1,284 @@
+diff --git a/server/server_internals.cpp b/server/server_internals.cpp
+index 1a96d5b..e1a9cb9 100644
+--- a/server/server_internals.cpp
++++ b/server/server_internals.cpp
+@@ -1,4 +1,4 @@
+-/* Copyright: (c) Kayne Ruse 2013, 2014
++/* Copyright: (c) Kayne Ruse 2014
+  * 
+  * This software is provided 'as-is', without any express or implied
+  * warranty. In no event will the authors be held liable for any damages
+@@ -21,7 +21,7 @@
+ */
+ #include "server_application.hpp"
+ 
+-#include "utility.hpp"
++#include "server_utility.hpp"
+ 
+ #include <stdexcept>
+ #include <iostream>
+@@ -36,8 +36,6 @@ void ServerApplication::Init(int argc, char** argv) {
+ 	std::cout << "Beginning startup" << std::endl;
+ 
+ 	//initial setup
+-	ClientEntry::uidCounter = 0;
+-	PlayerEntry::uidCounter = 0;
+ 	config.Load("rsc\\config.cfg");
+ 
+ 	//Init SDL
+@@ -109,6 +107,8 @@ void ServerApplication::Proc() {
+ 			//we need to go deeper
+ 			HandlePacket(packet);
+ 		}
++		//update the internals
++		//TODO: update the internals i.e. player positions
+ 		//give the computer a break
+ 		SDL_Delay(10);
+ 	}
+@@ -116,6 +116,10 @@ void ServerApplication::Proc() {
+ 
+ void ServerApplication::Quit() {
+ 	std::cout << "Shutting down" << std::endl;
++
++	//save the server state
++	//TODO: save the existing players
++
+ 	//empty the members
+ 	regionPager.UnloadAll();
+ 
+@@ -125,6 +129,7 @@ void ServerApplication::Quit() {
+ 	network.Close();
+ 	SDLNet_Quit();
+ 	SDL_Quit();
++
+ 	std::cout << "Shutdown finished" << std::endl;
+ }
+ 
+@@ -140,21 +145,15 @@ void ServerApplication::HandlePacket(SerialPacket packet) {
+ 		case SerialPacket::Type::JOIN_REQUEST:
+ 			HandleJoinRequest(packet);
+ 		break;
+-		case SerialPacket::Type::DISCONNECT:
+-			HandleDisconnect(packet);
+-		break;
+ 		case SerialPacket::Type::SYNCHRONIZE:
+ 			HandleSynchronize(packet);
+ 		break;
++		case SerialPacket::Type::DISCONNECT:
++			HandleDisconnect(packet);
++		break;
+ 		case SerialPacket::Type::SHUTDOWN:
+ 			HandleShutdown(packet);
+ 		break;
+-		case SerialPacket::Type::PLAYER_NEW:
+-			HandlePlayerNew(packet);
+-		break;
+-		case SerialPacket::Type::PLAYER_DELETE:
+-			HandlePlayerDelete(packet);
+-		break;
+ 		case SerialPacket::Type::PLAYER_UPDATE:
+ 			HandlePlayerUpdate(packet);
+ 		break;
+@@ -167,202 +166,3 @@ void ServerApplication::HandlePacket(SerialPacket packet) {
+ 		break;
+ 	}
+ }
+-
+-//-------------------------
+-//Handle various network input
+-//-------------------------
+-
+-void ServerApplication::HandleBroadcastRequest(SerialPacket packet) {
+-	//send back the server's metadata
+-	packet.meta.type = SerialPacket::Type::BROADCAST_RESPONSE;
+-
+-	//pack the data
+-	snprintf(packet.serverInfo.name, PACKET_STRING_SIZE, "%s", config["server.name"].c_str());
+-	packet.serverInfo.playerCount = playerMap.size();
+-	packet.serverInfo.regionWidth = REGION_WIDTH;
+-	packet.serverInfo.regionHeight = REGION_HEIGHT;
+-	packet.serverInfo.regionDepth = REGION_DEPTH;
+-
+-	//send the data
+-	char buffer[PACKET_BUFFER_SIZE];
+-	serialize(&packet, buffer);
+-	network.Send(&packet.meta.srcAddress, buffer, PACKET_BUFFER_SIZE);
+-}
+-
+-void ServerApplication::HandleJoinRequest(SerialPacket packet) {
+-	//register the new client
+-	ClientEntry newClient;
+-	newClient.address = packet.meta.srcAddress;
+-	clientMap[ClientEntry::uidCounter] = newClient;
+-
+-	//send the client their index
+-	char buffer[PACKET_BUFFER_SIZE];
+-	packet.meta.type = SerialPacket::Type::JOIN_RESPONSE;
+-	packet.clientInfo.index = ClientEntry::uidCounter;
+-	serialize(&packet, buffer);
+-
+-	//bounce this packet
+-	network.Send(&newClient.address, buffer, PACKET_BUFFER_SIZE);
+-
+-	//finished this routine
+-	ClientEntry::uidCounter++;
+-	std::cout << "Connect, total: " << clientMap.size() << std::endl;
+-}
+-
+-void ServerApplication::HandleDisconnect(SerialPacket packet) {
+-	//TODO: authenticate who is disconnecting/kicking
+-
+-	//disconnect the specified client
+-	char buffer[PACKET_BUFFER_SIZE];
+-	serialize(&packet, buffer);
+-	network.Send(&clientMap[packet.clientInfo.index].address, buffer, PACKET_BUFFER_SIZE);
+-	clientMap.erase(packet.clientInfo.index);
+-
+-	//prep the delete packet
+-	SerialPacket delPacket;
+-	delPacket.meta.type = SerialPacket::Type::PLAYER_DELETE;
+-
+-	//TODO: can this use DeletePlayer() instead?
+-	//delete server and client side players
+-	erase_if(playerMap, [&](std::pair<unsigned int, PlayerEntry> it) -> bool {
+-		//find the internal players to delete
+-		if (it.second.clientIndex == packet.clientInfo.index) {
+-			//send the delete player command to all clients
+-			delPacket.playerInfo.playerIndex = it.first;
+-			PumpPacket(delPacket);
+-
+-			//delete this player object
+-			return true;
+-		}
+-
+-		//don't delete this player object
+-		return false;
+-	});
+-
+-	//finished this routine
+-	std::cout << "Disconnect, total: " << clientMap.size() << std::endl;
+-}
+-
+-void ServerApplication::HandleSynchronize(SerialPacket packet) {
+-	//TODO: compensate for large distances
+-
+-	//send all the server's data to this client
+-	SerialPacket newPacket;
+-	char buffer[PACKET_BUFFER_SIZE];
+-
+-	//players
+-	newPacket.meta.type = SerialPacket::Type::PLAYER_UPDATE;
+-	for (auto& it : playerMap) {
+-		//TODO: update this for the expanded PlayerEntry structure
+-		newPacket.playerInfo.playerIndex = it.first;
+-		snprintf(newPacket.playerInfo.handle, PACKET_STRING_SIZE, "%s", it.second.handle.c_str());
+-		snprintf(newPacket.playerInfo.avatar, PACKET_STRING_SIZE, "%s", it.second.avatar.c_str());
+-		newPacket.playerInfo.position = it.second.position;
+-		newPacket.playerInfo.motion = it.second.motion;
+-		serialize(&newPacket, buffer);
+-		network.Send(&clientMap[packet.clientInfo.index].address, buffer, PACKET_BUFFER_SIZE);
+-	}
+-}
+-
+-void ServerApplication::HandleShutdown(SerialPacket packet) {
+-	//end the server
+-	running = false;
+-
+-	//disconnect all clients
+-	packet.meta.type = SerialPacket::Type::DISCONNECT;
+-	PumpPacket(packet);
+-
+-	//finished this routine
+-	std::cout << "Shutdown signal accepted" << std::endl;
+-}
+-
+-void ServerApplication::HandlePlayerNew(SerialPacket packet) {
+-	//register the new PlayerEntry
+-	//NOTE: assigning each field one-by-one so adding or moving a field doesn't break this code
+-	PlayerEntry newPlayer;
+-
+-	//metadata
+-	newPlayer.clientIndex = packet.playerInfo.clientIndex;
+-	newPlayer.handle = packet.playerInfo.handle;
+-	newPlayer.avatar = packet.playerInfo.avatar;
+-
+-	//position
+-	newPlayer.mapIndex = 0;
+-	newPlayer.position = {0,0};
+-	newPlayer.motion = {0,0};
+-	newPlayer.bbox = {0, 0, 0, 0};
+-
+-	//TODO: Add the statistic creation code here
+-
+-	//push this player
+-	playerMap[PlayerEntry::uidCounter] = newPlayer;
+-
+-	//send the client their info
+-	packet.playerInfo.playerIndex = PlayerEntry::uidCounter;
+-	packet.playerInfo.position = newPlayer.position;
+-	packet.playerInfo.motion = newPlayer.motion;
+-
+-	//actually send to everyone
+-	PumpPacket(packet);
+-
+-	//finish this routine
+-	PlayerEntry::uidCounter++;
+-}
+-
+-//TODO: differentiate between delete and unload
+-void ServerApplication::HandlePlayerDelete(SerialPacket packet) {
+-	//TODO: authenticate who is deleting this player
+-	if (playerMap.find(packet.playerInfo.playerIndex) == playerMap.end()) {
+-		throw(std::runtime_error("Cannot delete a non-existant player"));
+-	}
+-
+-	//TODO: remove the deleted player from the database?
+-
+-	//prep the delete packet
+-	SerialPacket delPacket;
+-	delPacket.meta.type = SerialPacket::Type::PLAYER_DELETE;
+-
+-	//delete the specified playerEntry
+-	erase_if(playerMap, [&](std::pair<unsigned int, PlayerEntry> it) -> bool {
+-		//find the specified PlayerEntry
+-		if (it.first == packet.playerInfo.playerIndex) {
+-			//send to all
+-			delPacket.playerInfo.playerIndex = it.first;
+-			PumpPacket(delPacket);
+-
+-			//delete this player
+-			return true;
+-		}
+-		//skip this player
+-		return false;
+-	});
+-}
+-
+-void ServerApplication::HandlePlayerUpdate(SerialPacket packet) {
+-	if (playerMap.find(packet.playerInfo.playerIndex) == playerMap.end()) {
+-		throw(std::runtime_error("Cannot update a non-existant player"));
+-	}
+-
+-	//TODO: the server needs it's own movement system too
+-	playerMap[packet.playerInfo.playerIndex].position = packet.playerInfo.position;
+-	playerMap[packet.playerInfo.playerIndex].motion = packet.playerInfo.motion;
+-
+-	PumpPacket(packet);
+-}
+-
+-void ServerApplication::HandleRegionRequest(SerialPacket packet) {
+-	char buffer[PACKET_BUFFER_SIZE];
+-	packet.meta.type = SerialPacket::Type::REGION_CONTENT;
+-	packet.regionInfo.region = regionPager.GetRegion(packet.regionInfo.x, packet.regionInfo.y);
+-	serialize(&packet, buffer);
+-	network.Send(&packet.meta.srcAddress, buffer, PACKET_BUFFER_SIZE);
+-}
+-
+-void ServerApplication::PumpPacket(SerialPacket packet) {
+-	//NOTE: I don't really like this, but it'll do for now
+-	char buffer[PACKET_BUFFER_SIZE];
+-	serialize(&packet, buffer);
+-	for (auto& it : clientMap) {
+-		network.Send(&it.second.address, buffer, PACKET_BUFFER_SIZE);
+-	}
+-}