Added position data to player objects

I'm also sick of bastards on the internet.

.gitignore

@@ -0,0 +1,21 @@
+#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

@@ -0,0 +1,31 @@
+You can find the [latest nightly build here](https://dl.dropboxusercontent.com/u/46669050/Tortuga.rar).
+
+Tortuga is an open source 2D multiplayer role playing game featuring permadeath (deletion of a character upon death). The emphasis of this game is on multiplayer cooperation, competition, 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.
+
+## External Dependencies
+
+* [SDL 1.6](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
+
+## Documentation
+
+[Tortuga Game Design Document](https://docs.google.com/document/d/17SjOTdacKKWX0Z-UkaiFnVnjfEeMsc5LRmARtnjh5UI/edit?usp=sharing)  
+[Tortuga Technical Document](https://docs.google.com/document/d/1ASTfM_1e0yE1cFP-IZey_rHEC6k2kmVY56X4K407sw0/edit?usp=sharing)
+
+## Copyright
+
+The current version of Tortuga is released under the [zlib license](http://en.wikipedia.org/wiki/Zlib_License).  
+
+Copyright (c) 2013 Kayne Ruse
+
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as 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

@@ -1,57 +0,0 @@
---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

@@ -1,19 +0,0 @@
-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

@@ -1,125 +0,0 @@
-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

@@ -0,0 +1,8 @@
+#ifndef CHANNELS_HPP_
+#define CHANNELS_HPP_
+
+enum Channels {
+	SERVER = 0
+};
+
+#endif

client/client_application.cpp

@@ -0,0 +1,155 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial 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 <stdexcept>
+#include <chrono>
+
+//-------------------------
+//Static declarations
+//-------------------------
+
+ClientApplication ClientApplication::instance;
+
+//-------------------------
+//Scene headers
+//-------------------------
+
+//Add the custom scene headers here
+#include "splash_screen.hpp"
+#include "main_menu.hpp"
+#include "options_menu.hpp"
+#include "lobby_menu.hpp"
+#include "in_world.hpp"
+#include "in_combat.hpp"
+
+//-------------------------
+//Public access members
+//-------------------------
+
+ClientApplication::ClientApplication() {
+	//
+}
+
+ClientApplication::~ClientApplication() {
+	//
+}
+
+void ClientApplication::Init() {
+	//load the prerequisites
+	config.Load("rsc\\config.cfg");
+
+	//initialize SDL
+	if (SDL_Init(SDL_INIT_VIDEO)) {
+		throw(std::runtime_error("Failed to initialize SDL"));
+	}
+	BaseScene::SetScreen(config.Int("screen.w"), config.Int("screen.h"), 0, (config.Bool("screen.f")) ? SDL_HWSURFACE|SDL_DOUBLEBUF : SDL_HWSURFACE);
+
+	//initialize SDL_net
+	if (SDLNet_Init()) {
+		throw(std::runtime_error("Failed to initialize SDL_net"));
+	}
+	network.Open(0, sizeof(NetworkPacket));
+}
+
+void ClientApplication::Proc() {
+	LoadScene(SceneList::FIRST);
+
+	//prepare the time system
+	typedef std::chrono::steady_clock Clock;
+
+	Clock::duration delta(16 * Clock::duration::period::den / std::milli::den);
+	Clock::time_point simTime = Clock::now();
+	Clock::time_point realTime;
+
+	//The main loop
+	while(activeScene->GetNextScene() != SceneList::QUIT) {
+		//switch scenes when necessary
+		if (activeScene->GetNextScene() != SceneList::CONTINUE) {
+			LoadScene(activeScene->GetNextScene());
+			continue;
+		}
+
+		//update the current time
+		realTime = Clock::now();
+
+		//simulate game time
+		while (simTime < realTime) {
+			//call each user defined function
+			activeScene->RunFrame(double(delta.count()) / Clock::duration::period::den);
+			simTime += delta;
+		}
+
+		//draw the game to the screen
+		activeScene->RenderFrame();
+
+		//give the computer a break
+		SDL_Delay(10);
+	}
+
+	UnloadScene();
+}
+
+void ClientApplication::Quit() {
+	network.Close();
+	SDLNet_Quit();
+	SDL_Quit();
+}
+
+//-------------------------
+//Private access members
+//-------------------------
+
+void ClientApplication::LoadScene(SceneList sceneIndex) {
+	UnloadScene();
+
+	switch(sceneIndex) {
+		//add scene creation calls here
+		case SceneList::FIRST:
+		case SceneList::SPLASHSCREEN:
+			activeScene = new SplashScreen(&config);
+		break;
+		case SceneList::MAINMENU:
+			activeScene = new MainMenu(&config);
+		break;
+		case SceneList::OPTIONSMENU:
+			activeScene = new OptionsMenu(&config);
+		break;
+		case SceneList::LOBBYMENU:
+			activeScene = new LobbyMenu(&config, &network, &clientIndex);
+		break;
+		case SceneList::INWORLD:
+			activeScene = new InWorld(&config, &network, &clientIndex);
+		break;
+		case SceneList::INCOMBAT:
+			activeScene = new InCombat();
+		break;
+
+		default:
+			throw(std::logic_error("Failed to recognize the scene index"));
+	}
+}
+
+void ClientApplication::UnloadScene() {
+	delete activeScene;
+	activeScene = nullptr;
+}

client/client_application.hpp

@@ -0,0 +1,57 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef CLIENTAPPLICATION_HPP_
+#define CLIENTAPPLICATION_HPP_
+
+#include "scene_list.hpp"
+#include "base_scene.hpp"
+
+#include "config_utility.hpp"
+#include "network_packet.hpp"
+#include "udp_network_utility.hpp"
+
+class ClientApplication {
+private:
+	ClientApplication();
+	~ClientApplication();
+	static ClientApplication instance;
+
+public:
+	static ClientApplication* GetInstance() { return &instance; }
+
+	void Init();
+	void Proc();
+	void Quit();
+
+private:
+	//Private access members
+	void LoadScene(SceneList sceneIndex);
+	void UnloadScene();
+
+	BaseScene* activeScene = nullptr;
+
+	ConfigUtility config;
+	UDPNetworkUtility network;
+	int clientIndex = -1; //replace with a struct?
+};
+
+#endif

client/main.cpp

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

client/makefile

@@ -0,0 +1,44 @@
+#config
+INCLUDES+=. scenes ../common ../common/graphics ../common/map ../common/network ../common/ui
+LIBS+=libclient.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
+CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+
+#source
+CXXSRC=$(wildcard *.cpp)
+CSRC=$(wildcard *.c)
+
+#objects
+OBJDIR=obj
+OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
+OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.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 $@ $<
+
+$(OBJDIR)/%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all

client/player_character.cpp

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

client/player_character.hpp

@@ -0,0 +1,66 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef PLAYERCHARACTER_HPP_
+#define PLAYERCHARACTER_HPP_
+
+#include "vector2.hpp"
+#include "sprite_sheet.hpp"
+
+class PlayerCharacter {
+public:
+	enum class Direction {
+		NORTH, SOUTH, EAST, WEST
+	};
+
+	PlayerCharacter() = default;
+	~PlayerCharacter() = default;
+
+	void Update(double delta);
+
+	void DrawTo(SDL_Surface* const dest) { sprite.DrawTo(dest, position.x, position.y); }
+
+	//clunky code results in smooth movement and controls
+	void AdjustDirection(Direction);
+	void FaceDirection(Direction);
+	void ResetDirection();
+	void ResetSpeed();
+
+	//accessors and mutators
+	Vector2 SetPosition(Vector2 v) { return position = v; }
+	Vector2 ShiftPosition(Vector2 v) { return position += v; }
+	Vector2 GetPosition() { return position; }
+
+	Vector2 SetMotion(Vector2 v) { return motion = v; }
+	Vector2 ShiftMotion(Vector2 v) { return motion += v; }
+	Vector2 GetMotion() { return motion; }
+
+	SpriteSheet* GetSprite() { return &sprite; }
+private:
+	Vector2 position;
+	Vector2 motion;
+	SpriteSheet sprite;
+
+	//for moving diagonally
+	bool diagonal = false;
+};
+
+#endif

client/scene_list.hpp

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

client/scenes/base_scene.cpp

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

client/scenes/base_scene.hpp

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

client/scenes/in_combat.cpp

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

client/scenes/in_combat.hpp

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

client/scenes/in_world.cpp

@@ -0,0 +1,315 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "in_world.hpp"
+
+#include "channels.hpp"
+
+#include <stdexcept>
+
+//-------------------------
+//Public access members
+//-------------------------
+
+InWorld::InWorld(ConfigUtility* const argConfig, UDPNetworkUtility* const argNetwork, int* const argClientIndex):
+	config(*argConfig),
+	network(*argNetwork),
+	clientIndex(*argClientIndex)
+{
+	//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
+	disconnectButton.SetImage(&image);
+	disconnectButton.SetFont(&font);
+	shutDownButton.SetImage(&image);
+	shutDownButton.SetFont(&font);
+
+	//set the button positions
+	disconnectButton.SetX(50);
+	disconnectButton.SetY(50 + image.GetClipH() * 0);
+	shutDownButton.SetX(50);
+	shutDownButton.SetY(50 + image.GetClipH() * 1);
+
+	//set the button texts
+	disconnectButton.SetText("Disconnect");
+	shutDownButton.SetText("Shut Down");
+
+	//create the server-side player object
+	NetworkPacket packet;
+	packet.meta.type = NetworkPacket::Type::PLAYER_NEW;
+	packet.playerInfo.clientIndex = clientIndex;
+	snprintf(packet.playerInfo.handle, PACKET_STRING_SIZE, "%s", config["player.handle"].c_str());
+	snprintf(packet.playerInfo.avatar, PACKET_STRING_SIZE, "%s", config["player.avatar"].c_str());
+	packet.playerInfo.position = {0,0};
+	packet.playerInfo.motion = {0,0};
+
+	//send it
+	network.Send(Channels::SERVER, &packet, sizeof(NetworkPacket));
+
+	//request a sync
+	packet.meta.type = NetworkPacket::Type::SYNCHRONIZE;
+	network.Send(Channels::SERVER, &packet, sizeof(NetworkPacket));
+}
+
+InWorld::~InWorld() {
+	//
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void InWorld::FrameStart() {
+	//
+}
+
+void InWorld::Update(double delta) {
+	//suck in all waiting packets
+	NetworkPacket packet;
+	while(network.Receive()) {
+		memcpy(&packet, network.GetInData(), sizeof(NetworkPacket));
+		packet.meta.srcAddress = network.GetInPacket()->address;
+		HandlePacket(packet);
+	}
+
+	for (auto& it : playerCharacters) {
+		it.second.Update(delta);
+	}
+}
+
+void InWorld::FrameEnd() {
+	//
+}
+
+void InWorld::Render(SDL_Surface* const screen) {
+	for (auto& it : playerCharacters) {
+		it.second.DrawTo(screen);
+	}
+	disconnectButton.DrawTo(screen);
+	shutDownButton.DrawTo(screen);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void InWorld::QuitEvent() {
+	//exit the game AND the server
+	RequestDisconnect();
+}
+
+void InWorld::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	disconnectButton.MouseMotion(motion);
+	shutDownButton.MouseMotion(motion);
+}
+
+void InWorld::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	disconnectButton.MouseButtonDown(button);
+	shutDownButton.MouseButtonDown(button);
+}
+
+void InWorld::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	if (disconnectButton.MouseButtonUp(button) == Button::State::HOVER) {
+		RequestDisconnect();
+	}
+	if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER) {
+		RequestShutDown();
+	}
+}
+
+void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE: {
+			QuitEvent();
+		}
+		break;
+
+		//player movement
+		case SDLK_LEFT:
+			if (localCharacter) {
+				localCharacter->AdjustDirection(PlayerCharacter::Direction::WEST);
+				SendState();
+			}
+		break;
+
+		case SDLK_RIGHT:
+			if (localCharacter) {
+				localCharacter->AdjustDirection(PlayerCharacter::Direction::EAST);
+				SendState();
+			}
+		break;
+
+		case SDLK_UP:
+			if (localCharacter) {
+				localCharacter->AdjustDirection(PlayerCharacter::Direction::NORTH);
+				SendState();
+			}
+		break;
+
+		case SDLK_DOWN:
+			if (localCharacter) {
+				localCharacter->AdjustDirection(PlayerCharacter::Direction::SOUTH);
+				SendState();
+			}
+		break;
+	}
+}
+
+void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
+	switch(key.keysym.sym) {
+		//player movement
+		case SDLK_LEFT:
+			if (localCharacter) {
+				localCharacter->AdjustDirection(PlayerCharacter::Direction::EAST);
+				SendState();
+			}
+		break;
+
+		case SDLK_RIGHT:
+			if (localCharacter) {
+				localCharacter->AdjustDirection(PlayerCharacter::Direction::WEST);
+				SendState();
+			}
+		break;
+
+		case SDLK_UP:
+			if (localCharacter) {
+				localCharacter->AdjustDirection(PlayerCharacter::Direction::SOUTH);
+				SendState();
+			}
+		break;
+
+		case SDLK_DOWN:
+			if (localCharacter) {
+				localCharacter->AdjustDirection(PlayerCharacter::Direction::NORTH);
+				SendState();
+			}
+		break;
+	}
+}
+
+void InWorld::HandlePacket(NetworkPacket packet) {
+	switch(packet.meta.type) {
+		case NetworkPacket::Type::DISCONNECT:
+			HandleDisconnect(packet);
+		break;
+
+		case NetworkPacket::Type::PLAYER_NEW:
+			HandlePlayerNew(packet);
+		break;
+
+		case NetworkPacket::Type::PLAYER_DELETE:
+			HandlePlayerDelete(packet);
+		break;
+
+		case NetworkPacket::Type::PLAYER_UPDATE:
+			HandlePlayerUpdate(packet);
+		break;
+
+		//handle errors
+		default:
+			throw(std::runtime_error("Unknown NetworkPacket::Type encountered"));
+		break;
+	}
+}
+
+void InWorld::HandleDisconnect(NetworkPacket packet) {
+	network.Unbind(Channels::SERVER);
+	clientIndex = -1;
+	SetNextScene(SceneList::MAINMENU);
+}
+
+void InWorld::HandlePlayerNew(NetworkPacket packet) {
+	if (playerCharacters.find(packet.playerInfo.playerIndex) != playerCharacters.end()) {
+		throw(std::runtime_error("Cannot create duplicate players"));
+	}
+
+	playerCharacters[packet.playerInfo.playerIndex].GetSprite()->LoadSurface(config["dir.sprites"] + packet.playerInfo.avatar, 4, 4);
+	playerCharacters[packet.playerInfo.playerIndex].SetPosition(packet.playerInfo.position);
+	playerCharacters[packet.playerInfo.playerIndex].SetMotion(packet.playerInfo.motion);
+	playerCharacters[packet.playerInfo.playerIndex].ResetDirection();
+
+	//catch this client's player object
+	if (packet.playerInfo.clientIndex == clientIndex && !localCharacter) {
+		playerIndex = packet.playerInfo.playerIndex;
+		localCharacter = &playerCharacters[playerIndex];
+	}
+}
+
+void InWorld::HandlePlayerDelete(NetworkPacket packet) {
+	if (playerCharacters.find(packet.playerInfo.playerIndex) == playerCharacters.end()) {
+		throw(std::runtime_error("Cannot delete non-existant players"));
+	}
+
+	playerCharacters.erase(packet.playerInfo.playerIndex);
+
+	//catch this client's player object
+	if (packet.playerInfo.clientIndex == clientIndex) {
+		playerIndex = -1;
+		localCharacter = nullptr;
+	}
+}
+
+void InWorld::HandlePlayerUpdate(NetworkPacket packet) {
+	if (playerCharacters.find(packet.playerInfo.playerIndex) == playerCharacters.end()) {
+		HandlePlayerNew(packet);
+		return;
+	}
+
+	//update only if the message didn't originate from here
+	if (packet.playerInfo.clientIndex != clientIndex) {
+		playerCharacters[packet.playerInfo.playerIndex].SetPosition(packet.playerInfo.position);
+		playerCharacters[packet.playerInfo.playerIndex].SetMotion(packet.playerInfo.motion);
+	}
+	playerCharacters[packet.playerInfo.playerIndex].ResetDirection();
+}
+
+void InWorld::SendState() {
+	NetworkPacket packet;
+	packet.meta.type = NetworkPacket::Type::PLAYER_UPDATE;
+	packet.playerInfo.clientIndex = clientIndex;
+	packet.playerInfo.playerIndex = playerIndex;
+//	snprintf(packet.playerInfo.handle, PACKET_STRING_SIZE, "%s", config["player.handle"].c_str());
+//	snprintf(packet.playerInfo.avatar, PACKET_STRING_SIZE, "%s", config["player.avatar"].c_str());
+	packet.playerInfo.position = localCharacter->GetPosition();
+	packet.playerInfo.motion = localCharacter->GetMotion();
+
+	network.Send(Channels::SERVER, &packet, sizeof(NetworkPacket));
+}
+
+void InWorld::RequestDisconnect() {
+	//send a disconnect request
+	NetworkPacket packet;
+	packet.meta.type = NetworkPacket::Type::DISCONNECT;
+	packet.clientInfo.index = clientIndex;
+	network.Send(Channels::SERVER, &packet, sizeof(NetworkPacket));
+}
+
+void InWorld::RequestShutDown() {
+	//send a shutdown request
+	NetworkPacket packet;
+	packet.meta.type = NetworkPacket::Type::SHUTDOWN;
+	packet.clientInfo.index = clientIndex;
+	network.Send(Channels::SERVER, &packet, sizeof(NetworkPacket));
+}

client/scenes/in_world.hpp

@@ -0,0 +1,83 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef INWORLD_HPP_
+#define INWORLD_HPP_
+
+#include "base_scene.hpp"
+
+#include "config_utility.hpp"
+#include "udp_network_utility.hpp"
+#include "network_packet.hpp"
+#include "image.hpp"
+#include "raster_font.hpp"
+#include "button.hpp"
+#include "player_character.hpp"
+
+#include <map>
+
+class InWorld : public BaseScene {
+public:
+	//Public access members
+	InWorld(ConfigUtility* const, UDPNetworkUtility* const, int* const);
+	~InWorld();
+
+protected:
+	//Frame loop
+	void FrameStart();
+	void Update(double delta);
+	void FrameEnd();
+	void Render(SDL_Surface* const);
+
+	//Event handlers
+	void QuitEvent();
+	void MouseMotion(SDL_MouseMotionEvent const&);
+	void MouseButtonDown(SDL_MouseButtonEvent const&);
+	void MouseButtonUp(SDL_MouseButtonEvent const&);
+	void KeyDown(SDL_KeyboardEvent const&);
+	void KeyUp(SDL_KeyboardEvent const&);
+
+	void HandlePacket(NetworkPacket);
+	void HandleDisconnect(NetworkPacket);
+	void HandlePlayerNew(NetworkPacket);
+	void HandlePlayerDelete(NetworkPacket);
+	void HandlePlayerUpdate(NetworkPacket);
+
+	void SendState();
+	void RequestDisconnect();
+	void RequestShutDown();
+
+	//global
+	ConfigUtility& config;
+	UDPNetworkUtility& network;
+	int& clientIndex;
+
+	//members
+	Image image;
+	RasterFont font;
+	Button disconnectButton;
+	Button shutDownButton;
+	std::map<int, PlayerCharacter> playerCharacters;
+	PlayerCharacter* localCharacter = nullptr;
+	int playerIndex = -1;
+};
+
+#endif

client/scenes/lobby_menu.cpp

@@ -0,0 +1,196 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "lobby_menu.hpp"
+
+#include "channels.hpp"
+
+#include <stdexcept>
+
+//-------------------------
+//Public access members
+//-------------------------
+
+LobbyMenu::LobbyMenu(ConfigUtility* const argConfig, UDPNetworkUtility* const argNetwork, int* const argClientIndex):
+	config(*argConfig),
+	network(*argNetwork),
+	clientIndex(*argClientIndex)
+{
+	//setup the utility objects
+	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
+	image.SetClipH(image.GetClipH()/3);
+	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+
+	//pass the utility objects
+	search.SetImage(&image);
+	search.SetFont(&font);
+	join.SetImage(&image);
+	join.SetFont(&font);
+	back.SetImage(&image);
+	back.SetFont(&font);
+
+	//set the button positions
+	search.SetX(50);
+	search.SetY(50 + image.GetClipH() * 0);
+	join.SetX(50);
+	join.SetY(50 + image.GetClipH() * 1);
+	back.SetX(50);
+	back.SetY(50 + image.GetClipH() * 2);
+
+	//set the button texts
+	search.SetText("Search");
+	join.SetText("Join");
+	back.SetText("Back");
+
+	//set the server list's position
+	listBox = {300, 50, 200, font.GetCharH()};
+}
+
+LobbyMenu::~LobbyMenu() {
+	//
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void LobbyMenu::FrameStart() {
+	//
+}
+
+void LobbyMenu::Update(double delta) {
+	//suck in all waiting packets
+	NetworkPacket packet;
+	while(network.Receive()) {
+		memcpy(&packet, network.GetInData(), sizeof(NetworkPacket));
+		packet.meta.srcAddress = network.GetInPacket()->address;
+		HandlePacket(packet);
+	}
+}
+
+void LobbyMenu::FrameEnd() {
+	//
+}
+
+void LobbyMenu::Render(SDL_Surface* const screen) {
+	search.DrawTo(screen);
+	join.DrawTo(screen);
+	back.DrawTo(screen);
+	for (int i = 0; i < serverInfo.size(); i++) {
+		//draw the selected server's highlight
+		if (selection == &serverInfo[i]) {
+			SDL_Rect r = listBox;
+			r.y += i * listBox.h;
+			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 255, 127, 39));
+		}
+
+		//draw the server name
+		font.DrawStringTo(serverInfo[i].name, screen, listBox.x, listBox.y + i*listBox.h);
+	}
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void LobbyMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	search.MouseMotion(motion);
+	join.MouseMotion(motion);
+	back.MouseMotion(motion);
+}
+
+void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	search.MouseButtonDown(button);
+	join.MouseButtonDown(button);
+	back.MouseButtonDown(button);
+}
+
+void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	if (search.MouseButtonUp(button) == Button::State::HOVER) {
+		//broadcast to the network, or a specific server
+		NetworkPacket packet;
+		packet.meta.type = NetworkPacket::Type::BROADCAST_REQUEST;
+		network.Send(config["server.host"].c_str(), config.Int("server.port"), reinterpret_cast<void*>(&packet), sizeof(NetworkPacket));
+
+		//reset the server list
+		serverInfo.clear();
+		selection = nullptr;
+	}
+
+	else if (join.MouseButtonUp(button) == Button::State::HOVER && selection != nullptr) {
+		//join the selected server
+		NetworkPacket packet;
+		packet.meta.type = NetworkPacket::Type::JOIN_REQUEST;
+		network.Send(&selection->address, &packet, sizeof(NetworkPacket));
+		selection = nullptr;
+	}
+
+	else if (back.MouseButtonUp(button) == Button::State::HOVER) {
+		SetNextScene(SceneList::MAINMENU);
+	}
+
+	else if (
+		//has the user selected a server on the list?
+		button.x > listBox.x &&
+		button.x < listBox.x + listBox.w &&
+		button.y > listBox.y &&
+		button.y < listBox.y + listBox.h * serverInfo.size()
+		) {
+		selection = &serverInfo[(button.y - listBox.y)/listBox.h];
+	}
+	else {
+		selection = nullptr;
+	}
+}
+
+void LobbyMenu::KeyDown(SDL_KeyboardEvent const& key) {
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+			SetNextScene(SceneList::MAINMENU);
+		break;
+	}
+}
+
+void LobbyMenu::KeyUp(SDL_KeyboardEvent const& key) {
+	//
+}
+
+void LobbyMenu::HandlePacket(NetworkPacket packet) {
+		switch(packet.meta.type) {
+		case NetworkPacket::Type::BROADCAST_RESPONSE: {
+			ServerInformation server;
+			server.name = packet.serverInfo.name;
+			server.address = packet.meta.srcAddress;
+			serverInfo.push_back(server);
+		}
+		break;
+		case NetworkPacket::Type::JOIN_RESPONSE:
+			clientIndex = packet.clientInfo.index;
+			network.Bind(&packet.meta.srcAddress, Channels::SERVER);
+			SetNextScene(SceneList::INWORLD);
+		break;
+
+		//handle errors
+		default:
+			throw(std::runtime_error("Unknown NetworkPacket::Type encountered"));
+		break;
+	}
+}

client/scenes/lobby_menu.hpp

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

client/scenes/main_menu.cpp

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

client/scenes/main_menu.hpp

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

client/scenes/makefile

@@ -0,0 +1,43 @@
+#config
+INCLUDES+=. .. ../../common ../../common/graphics ../../common/map ../../common/network ../../common/ui
+LIBS+=
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
+CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+
+#source
+CXXSRC=$(wildcard *.cpp)
+CSRC=$(wildcard *.c)
+
+#objects
+OBJDIR=obj
+OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
+OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.o))
+
+#output
+OUTDIR=..
+OUT=$(addprefix $(OUTDIR)/,libclient.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 $@ $<
+
+$(OBJDIR)/%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all

client/scenes/options_menu.cpp

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

client/scenes/options_menu.hpp

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

client/scenes/splash_screen.cpp

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

client/scenes/splash_screen.hpp

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

common/config_utility.cpp

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

common/config_utility.hpp

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

common/graphics/image.cpp

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

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

@@ -0,0 +1,43 @@
+#config
+INCLUDES+=. ..
+LIBS+=
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
+CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+
+#source
+CXXSRC=$(wildcard *.cpp)
+CSRC=$(wildcard *.c)
+
+#objects
+OBJDIR=obj
+OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
+OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.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 $@ $<
+
+$(OBJDIR)/%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all

common/graphics/sprite_sheet.cpp

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

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

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

common/map/makefile

@@ -0,0 +1,43 @@
+#config
+INCLUDES+=. .. ../graphics
+LIBS+=
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
+CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+
+#source
+CXXSRC=$(wildcard *.cpp)
+CSRC=$(wildcard *.c)
+
+#objects
+OBJDIR=obj
+OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
+OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.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 $@ $<
+
+$(OBJDIR)/%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all

common/map/region.cpp

@@ -0,0 +1,123 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "region.hpp"
+
+#include "utility.hpp"
+
+#include <stdexcept>
+#include <sstream>
+
+Region::Region(int _x, int _y, int _w, int _h):
+	x(_x),
+	y(_y),
+	width(_w),
+	height(_h)
+{
+	//make sure that the region's position lines up
+	if (x != snapToBase(width, x) || y != snapToBase(height, y)) {
+		std::ostringstream os;
+		os << "Region is unaligned; x: " << x << ", y: " << y << ", width: " << width << ", height: " << height;
+		throw(std::runtime_error(os.str()));
+	}
+}
+
+int Region::NewTileR(Tile const& tile) {
+	//return 1 for overwrite, 0 for insert
+	if (!InBoundsR(tile.x, tile.y)) {
+		std::ostringstream os;
+		os << "New tile location out of bounds: " <<
+			"(" << x << "," << y << ")->" <<
+			"(" << tile.x << "," << tile.y << ")"
+		;
+		throw(std::runtime_error(os.str()));
+	}
+
+	int ret = tiles.erase(tile);
+	tiles.insert(tile);
+	return ret;
+}
+
+Tile Region::GetTileR(int tx, int ty, int minDepth) {
+	std::set<Tile>::iterator ptr = tiles.begin();
+
+	//skip the tiles that are too deep
+	while(ptr != tiles.end()) {
+		if (ptr->depth >= minDepth) {
+			break;
+		}
+		ptr++;
+	}
+
+	//find the first tile here
+	while(ptr != tiles.end()) {
+		//bounds
+		if ((ptr->x <= tx) && (ptr->y <= ty) && (ptr->x + ptr->width > tx) && (ptr->y + ptr->height > ty)) {
+			break;
+		}
+		ptr++;
+	}
+
+	//found it
+	if (ptr != tiles.end()) {
+		return *ptr;
+	}
+
+	//a tileIndex of -1 is an error code, the rest is for show
+	return {0,0,0,-1,-1,-1};
+}
+
+int Region::DeleteTileR(Tile const& tile) {
+	if (!InBoundsR(tile.x, tile.y)) {
+		throw(std::runtime_error("Deleted tile location out of bounds"));
+
+		std::ostringstream os;
+		os << "Deleted tile location out of bounds: " <<
+			"(" << x << "," << y << ")->" <<
+			"(" << tile.x << "," << tile.y << ")"
+		;
+		throw(std::runtime_error(os.str()));
+	}
+	//sentinel/error code
+	if (tile.tileIndex == -1) {
+		return 0;
+	}
+	return tiles.erase(tile);
+}
+
+bool operator<(Region const& lhs, Region const& rhs) {
+	//sort by y -> x
+	if (lhs.y == rhs.y) {
+		return lhs.x < rhs.x;
+	}
+	return lhs.y < rhs.y;
+}
+
+inline bool operator>(Region const& lhs, Region const& rhs) {
+	//wrap the other operator
+	return rhs < lhs;
+}
+
+inline bool operator==(Region const& lhs, Region const& rhs) {
+	//comparisons work on the location ONLY
+	//this function is redundant as far as the std::set object is concerned
+	return (lhs.x == rhs.x) && (lhs.y == rhs.y);
+}

common/map/region.hpp

@@ -0,0 +1,112 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef REGION_HPP_
+#define REGION_HPP_
+
+#include "tile.hpp"
+
+#include <set>
+
+/* A single section of the map.
+ * This class stores the tiles relative to it's own position, but
+ * there are functions for referencing the tiles' absolute position.
+ * These functions simply wrap the normal functions.
+*/
+class Region {
+public:
+	Region() = delete;
+	Region(int x, int y, int width, int height);
+	~Region() = default;
+
+	//create and insert a new tile, overwriting an existing tile at that location
+	int NewTileR(Tile const& tile);
+	int NewTileA(Tile const& tile) {
+		//these can change, if the Tile class is changed
+		return NewTileR({
+			tile.x - x,
+			tile.y - y,
+			tile.depth,
+			tile.width,
+			tile.height,
+			tile.tileIndex
+		});
+	}
+
+	//find the first tile at this location, with the specified minimum depth
+	Tile GetTileR(int tx, int ty, int minDepth);
+	Tile GetTileA(int tx, int ty, int minDepth) {
+		return GetTileR(tx - x, ty - y, minDepth);
+	}
+
+	//wrap the other delete functions
+	int DeleteTileR(int tx, int ty, int minDepth) {
+		return DeleteTileR(GetTileR(tx, ty, minDepth));
+	}
+	int DeleteTileA(int tx, int ty, int minDepth) {
+		//explicitly skip one function call by adjusting from A to R
+		return DeleteTileR(GetTileR(tx - x, ty - y, minDepth));
+	}
+
+	//delete the specified tile
+	int DeleteTileR(Tile const& tile);
+	int DeleteTileA(Tile const& tile) {
+		//these can change, if the Tile class is changed
+		return DeleteTileR({
+			tile.x - x,
+			tile.y - y,
+			tile.depth,
+			tile.width,
+			tile.height,
+			tile.tileIndex
+		});
+	}
+
+	//find if the specified location exists within the region's bounds
+	bool InBoundsR(int i, int j) {
+		return (i >= 0) && (j >= 0) && (i < width) && (j < height);
+	}
+	bool InBoundsA(int i, int j) {
+		return InBoundsR(i - x, j - y);
+	}
+
+	//Raw accessors & mutators
+	int GetX() const { return x; }
+	int GetY() const { return y; }
+	int GetWidth() const { return width; }
+	int GetHeight() const { return height; }
+
+	std::set<Tile>* GetTiles() { return &tiles; }
+
+	//sorting the regions by the locations
+	friend bool operator<(Region const& lhs, Region const& rhs);
+	friend bool operator>(Region const& lhs, Region const& rhs);
+	friend bool operator==(Region const& lhs, Region const& rhs);
+
+private:
+	int const x;
+	int const y;
+	int const width;
+	int const height;
+	std::set<Tile> tiles;
+};
+
+#endif

common/map/region_pager.cpp

@@ -0,0 +1,121 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "region_pager.hpp"
+
+#include "utility.hpp"
+
+#include <stdexcept>
+#include <string>
+
+RegionPager::RegionPager() {
+	//
+}
+
+RegionPager::~RegionPager() {
+	if (onDelete) {
+		for (auto& i : regionList) {
+			onDelete(&i);
+		}
+	}
+}
+
+Region* RegionPager::NewRegion(int x, int y) {
+	for (auto& i : regionList) {
+		if (i.GetX() == x && i.GetY() == y) {
+			throw(std::runtime_error("Duplicate Regions detected"));
+		}
+	}
+
+	regionList.push_front({x, y, regionWidth, regionHeight});
+	if (onNew) {
+		onNew(&regionList.front());
+	}
+	return &regionList.front();
+}
+
+Region* RegionPager::GetRegion(int x, int y) {
+	for (auto& i : regionList) {
+		if (i.GetX() == x && i.GetY() == y) {
+			return &i;
+		}
+	}
+	//create, insert and return
+	regionList.push_front({x, y, regionWidth, regionHeight});
+	if (onNew) {
+		onNew(&regionList.front());
+	}
+	return &regionList.front();
+}
+
+void RegionPager::DeleteRegion(int x, int y) {
+	for (std::list<Region>::iterator i = regionList.begin(); i != regionList.end(); i++) {
+		if (i->GetX() == x && i->GetY() == y) {
+			if (onDelete) {
+				onDelete(&(*i));
+			}
+			regionList.erase(i);
+			break;
+		}
+	}
+}
+
+void RegionPager::DrawTo(SDL_Surface* const dest, TileSheetManager* const sheetMgr, int camX, int camY) {
+	for (auto& regionIter : regionList) {
+
+#ifdef DEBUG
+		//draw the region's location
+		SDL_Rect box = {
+			Sint16(regionIter.GetX() - camX),
+			Sint16(regionIter.GetY() - camY),
+			Uint16(regionIter.GetWidth()),
+			Uint16(regionIter.GetHeight())
+		};
+		SDL_FillRect(dest, &box, SDL_MapRGB(dest->format, 10, 10, 20));
+#endif
+
+		//draw each tile
+		for (auto& tileIter : *regionIter.GetTiles()) {
+			sheetMgr->DrawTo(
+				dest,
+				tileIter.x + regionIter.GetX() - camX,
+				tileIter.y + regionIter.GetY() - camY,
+				tileIter.tileIndex
+			);
+		}
+	}
+}
+
+void RegionPager::Prune(int left, int top, int right, int bottom) {
+	std::list<Region>::iterator it = regionList.begin();
+
+	while(it != regionList.end()) {
+		if (it->GetX() >= right || it->GetY() >= bottom || it->GetX() + it->GetWidth() < left || it->GetY() + it->GetHeight() < top) {
+			if (onDelete) {
+				onDelete(&(*it));
+			}
+			regionList.erase(it);
+			it = regionList.begin();
+			continue;
+		}
+		it++;
+	}
+}

common/map/region_pager.hpp

@@ -0,0 +1,69 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef REGIONPAGER_HPP_
+#define REGIONPAGER_HPP_
+
+#include "region.hpp"
+#include "tile_sheet_manager.hpp"
+
+#include <list>
+
+class RegionPager {
+public:
+	//for simplicity and consistency
+	typedef void (*regionCallback_t)(Region* const);
+
+	RegionPager();
+	~RegionPager();
+
+	//these parameters MUST be multiples of the width & height
+	Region* NewRegion(int x, int y);
+	Region* GetRegion(int x, int y);
+	void DeleteRegion(int x, int y);
+
+	//call this to draw to the screen
+	void DrawTo(SDL_Surface* const, TileSheetManager* const, int camX, int camY);
+
+	//callback hooks
+	void SetOnNew(regionCallback_t f) { onNew = f; }
+	void SetOnDelete(regionCallback_t f) { onDelete = f; }
+
+	//params: Absolute values
+	void Prune(int left, int top, int right, int bottom);
+
+	//accessors and mutators
+	int SetWidth(int i) { return regionWidth = i; }
+	int SetHeight(int i) { return regionHeight = i; }
+
+	int GetWidth() const { return regionWidth; }
+	int GetHeight() const { return regionHeight; }
+
+	std::list<Region>* GetRegions() { return &regionList; }
+private:
+	std::list<Region> regionList;
+	int regionWidth = 0, regionHeight = 0;
+
+	regionCallback_t onNew = nullptr;
+	regionCallback_t onDelete = nullptr;
+};
+
+#endif

common/map/tile.cpp

@@ -0,0 +1,44 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "tile.hpp"
+
+bool operator<(Tile const& lhs, Tile const& rhs) {
+	//sort by depth -> y -> x
+	if (lhs.depth == rhs.depth) {
+		if (lhs.y == rhs.y) {
+			return lhs.x < rhs.x;
+		}
+		return lhs.y < rhs.y;
+	}
+	return lhs.depth < rhs.depth;
+}
+
+inline bool operator>(Tile const& lhs, Tile const& rhs) {
+	//wrap the other operator
+	return rhs < lhs;
+}
+
+inline bool operator==(Tile const& lhs, Tile const& rhs) {
+	//comparisons work on the location ONLY
+	//this function is redundant as far as the std::set object is concerned
+	return (lhs.x == rhs.x) && (lhs.y == rhs.y) && (lhs.depth == rhs.depth);
+}

common/map/tile.hpp

@@ -0,0 +1,50 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef TILE_HPP_
+#define TILE_HPP_
+
+//explicitly a POD
+struct Tile {
+	//position relative to the Region
+	int x, y, depth;
+
+	//graphics
+	int width, height;
+	int tileIndex;
+
+	Tile() = default;
+	Tile(int _x, int _y, int _depth, int _width, int _height, int _tileIndex) {
+		//The order of the arguments should be explicit
+		x = _x;
+		y = _y;
+		depth = _depth;
+		width = _width;
+		height = _height;
+		tileIndex = _tileIndex;
+	}
+};
+
+bool operator<(Tile const& lhs, Tile const& rhs);
+bool operator>(Tile const& lhs, Tile const& rhs);
+bool operator==(Tile const& lhs, Tile const& rhs);
+
+#endif

common/map/tile_sheet.cpp

@@ -0,0 +1,59 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "tile_sheet.hpp"
+
+#include <stdexcept>
+
+void TileSheet::Load(std::string fname, Uint16 w, Uint16 h) {
+	//setup the image
+	image.LoadSurface(fname);
+	image.SetClipW(w);
+	image.SetClipH(h);
+
+	//get the tile counts
+	xCount = image.GetSurface()->w / w;
+	yCount = image.GetSurface()->h / h;
+	totalCount = xCount * yCount;
+
+	//set begin & end (usually temporary)
+	begin = 0;
+	end = totalCount;
+}
+
+void TileSheet::Unload() {
+	image.FreeSurface();
+	totalCount = xCount = yCount = 0;
+	begin = end = -1;
+}
+
+void TileSheet::DrawTo(SDL_Surface* const dest, int x, int y, int tileIndex) {
+	if (!InRange(tileIndex)) {
+		throw(std::invalid_argument("Tile index out of range"));
+	}
+	Sint16 clipX = (tileIndex-begin) % xCount * image.GetClipW();
+	Sint16 clipY = (tileIndex-begin) / xCount * image.GetClipH();
+
+	image.SetClipX(clipX);
+	image.SetClipY(clipY);
+
+	image.DrawTo(dest, x, y);
+}

common/map/tile_sheet.hpp

@@ -0,0 +1,70 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef TILESHEET_HPP_
+#define TILESHEET_HPP_
+
+#include "image.hpp"
+
+#include <string>
+
+/* The TileSheet class is used for drawing tiles of the map to the screen.
+ * This class also tracks the range of the tile images.
+*/
+class TileSheet {
+public:
+	TileSheet() = default;
+	~TileSheet() = default;
+
+	//these load/set functions need to be followed by bookkeeping code
+	//w & h are the width & height of individual tiles
+	//TODO: rename these
+	void Load(std::string fname, Uint16 w, Uint16 h);
+	void Unload();
+
+	void DrawTo(SDL_Surface* const dest, int x, int y, int tileIndex);
+
+	bool InRange(int i) { return i >= begin && i < end; }
+
+	//accessors and mutators
+	Image* GetImage() { return &image; }
+
+	int GetTileW() const { return image.GetClipW(); }
+	int GetTileH() const { return image.GetClipH(); }
+
+	int GetTotalCount() const { return totalCount; }
+	int GetXCount() const { return xCount; }
+	int GetYCount() const { return yCount; }
+
+	int SetBegin(int i) { return begin = i; }
+	int SetEnd(int i) { return end = i; }
+
+	int GetBegin() const { return begin; }
+	int GetEnd() const { return end; }
+private:
+	Image image;
+
+	//these are generated and used by internal processes
+	int totalCount = 0, xCount = 0, yCount = 0;
+	int begin = -1, end = -1;
+};
+
+#endif

common/map/tile_sheet_manager.cpp

@@ -0,0 +1,73 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "tile_sheet_manager.hpp"
+
+#include "utility.hpp"
+
+#include <stdexcept>
+
+TileSheet* TileSheetManager::LoadSheet(std::string fname, Uint16 w, Uint16 h) {
+	//get the key
+	std::string key = truncatePath(fname);
+
+	//don't override what's already here
+	if (sheetMap.find(key) != sheetMap.end()) {
+		throw(std::runtime_error("Cannot load duplicate tile sheets"));
+	}
+
+	//load & setup the sheet object
+	sheetMap[key].Load(fname, w, h);
+	sheetMap[key].SetBegin(rangeEnd);
+	rangeEnd += sheetMap[key].GetTotalCount();
+	sheetMap[key].SetEnd(rangeEnd);
+
+	//you can modify the object, say, during the save & load routines...
+	return &sheetMap[key];
+}
+
+TileSheet* TileSheetManager::GetSheet(std::string name) {
+	return &sheetMap.at(name);
+}
+
+TileSheet* TileSheetManager::GetSheetByIndex(int tileIndex) {
+	for (auto& it : sheetMap) {
+		if (it.second.InRange(tileIndex)) {
+			return &it.second;
+		}
+	}
+	return nullptr;
+}
+
+void TileSheetManager::UnloadSheet(std::string name) {
+	sheetMap.erase(name);
+}
+
+void TileSheetManager::DrawTo(SDL_Surface* const dest, int x, int y, int tileIndex) {
+	for (auto& it : sheetMap) {
+		if (it.second.InRange(tileIndex)) {
+			it.second.DrawTo(dest, x, y, tileIndex);
+			return;
+		}
+	}
+	//No matching tile index
+	throw(std::invalid_argument("Tile index is out of range of all tile sheets"));
+}

common/map/tile_sheet_manager.hpp

@@ -0,0 +1,51 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef TILESHEETMANAGER_HPP_
+#define TILESHEETMANAGER_HPP_
+
+#include "tile_sheet.hpp"
+
+#include <map>
+#include <string>
+
+class TileSheetManager {
+public:
+	TileSheetManager() = default;
+	~TileSheetManager() = default;
+
+	TileSheet* LoadSheet(std::string fname, Uint16 w, Uint16 h);
+	TileSheet* GetSheet(std::string name);
+	TileSheet* GetSheetByIndex(int tileIndex);
+	void UnloadSheet(std::string name);
+
+	void DrawTo(SDL_Surface* const, int x, int y, int tileIndex);
+
+	int SetRangeEnd(int i) { return rangeEnd += i; }
+	int GetRangeEnd() const { return rangeEnd; }
+
+	std::map<std::string, TileSheet>* GetSheetMap() { return &sheetMap; }
+private:
+	std::map<std::string, TileSheet> sheetMap;
+	int rangeEnd = 0;
+};
+
+#endif

common/network/makefile

@@ -0,0 +1,43 @@
+#config
+INCLUDES+=. ..
+LIBS+=
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
+CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+
+#source
+CXXSRC=$(wildcard *.cpp)
+CSRC=$(wildcard *.c)
+
+#objects
+OBJDIR=obj
+OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
+OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.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 $@ $<
+
+$(OBJDIR)/%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all

common/network/network_packet.hpp

@@ -0,0 +1,106 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef NETWORKPACKET_HPP_
+#define NETWORKPACKET_HPP_
+
+#include "SDL/SDL_net.h"
+
+#include "vector2.hpp"
+
+#define PACKET_STRING_SIZE 100
+
+#pragma pack(push, 0)
+
+union NetworkPacket {
+	//types of packets
+	enum class Type {
+		//default: there is something wrong
+		NONE = 0,
+
+		//not used
+		PING = 1,
+		PONG = 2,
+
+		//Searching for a server to join
+		BROADCAST_REQUEST = 3,
+		BROADCAST_RESPONSE = 4,
+
+		//try to join the server
+		JOIN_REQUEST = 5,
+		JOIN_RESPONSE = 6,
+
+		//disconnect from the server
+		DISCONNECT = 7,
+
+		//mass update
+		SYNCHRONIZE = 8,
+
+		//shut down the server
+		SHUTDOWN = 9,
+
+		//Player movement, etc.
+		PLAYER_NEW = 10,
+		PLAYER_DELETE = 11,
+		PLAYER_UPDATE = 12,
+	};
+
+	//metadata on the packet itself
+	struct Metadata {
+		Type type;
+		IPaddress srcAddress;
+	}meta;
+
+	//information about the server
+	struct ServerInformation {
+		Metadata meta;
+		//TODO: version info
+		char name[PACKET_STRING_SIZE];
+		//TODO: player count
+	}serverInfo;
+
+	//information about the client
+	struct ClientInformation {
+		Metadata meta;
+		int index;
+	}clientInfo;
+
+	//information about a player
+	struct PlayerInformation {
+		Metadata meta;
+		int clientIndex;
+		int playerIndex;
+		char handle[PACKET_STRING_SIZE];
+		char avatar[PACKET_STRING_SIZE];
+		Vector2 position;
+		Vector2 motion;
+	}playerInfo;
+
+	//defaults
+	NetworkPacket() {
+		meta.type = Type::NONE;
+		meta.srcAddress = {0,0};
+	}
+};
+
+#pragma pack(pop)
+
+#endif

common/network/udp_network_utility.cpp

@@ -0,0 +1,148 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "udp_network_utility.hpp"
+
+#include <stdexcept>
+
+void UDPNetworkUtility::Open(int port, int packSize) {
+	if (!(socket = SDLNet_UDP_Open(port))) {
+		Close();
+		throw(std::runtime_error("Failed to open a UDP socket"));
+	}
+
+	if (!(packOut = SDLNet_AllocPacket(packSize))) {
+		Close();
+		throw(std::runtime_error("Failed to allocate the out packet"));
+	}
+
+	if (!(packIn = SDLNet_AllocPacket(packSize))) {
+		Close();
+		throw(std::runtime_error("Failed to allocate the in packet"));
+	}
+}
+
+void UDPNetworkUtility::Close() {
+	SDLNet_UDP_Close(socket);
+	SDLNet_FreePacket(packOut);
+	SDLNet_FreePacket(packIn);
+	socket = nullptr;
+	packOut = nullptr;
+	packIn = nullptr;
+}
+
+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 == -1) {
+		throw(std::runtime_error("Failed to bind to a channel"));
+	}
+
+	return ret;
+}
+
+void UDPNetworkUtility::Unbind(int channel) {
+	SDLNet_UDP_Unbind(socket, channel);
+}
+
+int UDPNetworkUtility::Send(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"));
+	}
+
+	Send(&add, data, len);
+}
+
+int UDPNetworkUtility::Send(IPaddress* add, void* data, int len) {
+	if (len > packOut->maxlen) {
+		throw(std::runtime_error("Failed to copy the data into the packet"));
+	}
+	memset(packOut->data, 0, packOut->maxlen);
+	memcpy(packOut->data, data, len);
+	packOut->len = len;
+	packOut->address = *add;
+
+	int ret = SDLNet_UDP_Send(socket, -1, packOut);
+
+	if (ret <= 0) {
+		throw(std::runtime_error("Failed to send a packet"));
+	}
+
+	return ret;
+}
+
+int UDPNetworkUtility::Send(int channel, void* data, int len) {
+	if (len > packOut->maxlen) {
+		throw(std::runtime_error("Failed to copy the data into the packet"));
+	}
+	memset(packOut->data, 0, packOut->maxlen);
+	memcpy(packOut->data, data, len);
+	packOut->len = len;
+
+	int ret = SDLNet_UDP_Send(socket, channel, packOut);
+
+	if (ret <= 0) {
+		throw(std::runtime_error("Failed to send a packet"));
+	}
+
+	return ret;
+}
+
+int UDPNetworkUtility::SendAll(void* data, int len) {
+	if (len > packOut->maxlen) {
+		throw(std::runtime_error("Failed to copy the data into the packet"));
+	}
+	memset(packOut->data, 0, packOut->maxlen);
+	memcpy(packOut->data, data, len);
+	packOut->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, packOut);
+		}
+	}
+
+	return sent;
+}
+
+int UDPNetworkUtility::Receive() {
+	memset(packIn->data, 0, packIn->maxlen);
+	int ret = SDLNet_UDP_Recv(socket, packIn);
+
+	if (ret < 0) {
+		throw(std::runtime_error("Unknown network error occured"));
+	}
+
+	return ret;
+}

common/network/udp_network_utility.hpp

@@ -0,0 +1,71 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef UDPNETWORKUTILITY_HPP_
+#define UDPNETWORKUTILITY_HPP_
+
+#include "SDL/SDL_net.h"
+
+class UDPNetworkUtility {
+public:
+	UDPNetworkUtility() = default;
+	~UDPNetworkUtility() = default;
+
+	void Open(int port, int packSize);
+	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);
+	}
+
+	int Send(const char* ip, int port, void* data, int len);
+	int Send(IPaddress* add, void* data, int len);
+	int Send(int channel, void* data, int len);
+	int SendAll(void* data, int len);
+	int Receive();
+
+	void* GetOutData() const {
+		return reinterpret_cast<void*>(packOut->data);
+	};
+	void* GetInData() const {
+		return reinterpret_cast<void*>(packIn->data);
+	};
+	UDPpacket* GetOutPacket() const {
+		return packOut;
+	}
+	UDPpacket* GetInPacket() const {
+		return packIn;
+	}
+	UDPsocket GetSocket() const {
+		return socket;
+	}
+private:
+	UDPsocket socket = nullptr;
+	UDPpacket* packOut = nullptr;
+	UDPpacket* packIn = nullptr;
+};
+
+#endif

common/ui/button.cpp

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

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

@@ -0,0 +1,43 @@
+#config
+INCLUDES+=. .. ../graphics
+LIBS+=
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
+CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+
+#source
+CXXSRC=$(wildcard *.cpp)
+CSRC=$(wildcard *.c)
+
+#objects
+OBJDIR=obj
+OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
+OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.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 $@ $<
+
+$(OBJDIR)/%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all

common/ui/menu_bar.cpp

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

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

common/ui/raster_font.cpp

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

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

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

common/utility.hpp

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

common/vector2.hpp

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

deprecated/deprecated map system 1.txt

@@ -1,84 +0,0 @@
-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

@@ -1,3 +0,0 @@
-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

@@ -1,394 +0,0 @@
-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

@@ -1,284 +0,0 @@
-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);
--	}
--}

editor/base_scene.cpp

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

editor/base_scene.hpp

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

editor/editor_application.cpp

@@ -0,0 +1,130 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial EditorApplications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as 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 "editor_application.hpp"
+
+#include <stdexcept>
+#include <chrono>
+
+//-------------------------
+//Static declarations
+//-------------------------
+
+EditorApplication EditorApplication::instance;
+
+//-------------------------
+//Scene headers
+//-------------------------
+
+//Add the custom scene headers here
+#include "editor_scene.hpp"
+#include "testificate_scene.hpp"
+
+//-------------------------
+//Public access members
+//-------------------------
+
+EditorApplication::EditorApplication() {
+	//
+}
+
+EditorApplication::~EditorApplication() {
+	//
+}
+
+void EditorApplication::Init() {
+	config.Load("rsc\\config.cfg");
+	if (SDL_Init(SDL_INIT_VIDEO))
+		throw(std::runtime_error("Failed to initialize SDL"));
+
+	BaseScene::SetScreen(config.Int("screen.w"), config.Int("screen.h"));
+}
+
+void EditorApplication::Proc() {
+	LoadScene(SceneList::FIRST);
+
+	//prepare the time system
+	typedef std::chrono::steady_clock Clock;
+
+	Clock::duration delta(16 * Clock::duration::period::den / std::milli::den);
+	Clock::time_point simTime = Clock::now();
+	Clock::time_point realTime;
+
+	//The main loop
+	while(activeScene->GetNextScene() != SceneList::QUIT) {
+		//switch scenes when necessary
+		if (activeScene->GetNextScene() != SceneList::CONTINUE) {
+			LoadScene(activeScene->GetNextScene());
+			continue;
+		}
+
+		//update the current time
+		realTime = Clock::now();
+
+		//simulate game time
+		while (simTime < realTime) {
+			//call each user defined function
+			activeScene->RunFrame(double(delta.count()) / Clock::duration::period::den);
+			simTime += delta;
+		}
+
+		//draw the game to the screen
+		activeScene->RenderFrame();
+
+		//give the computer a break
+		SDL_Delay(10);
+	}
+
+	UnloadScene();
+}
+
+void EditorApplication::Quit() {
+	SDL_Quit();
+}
+
+//-------------------------
+//Private access members
+//-------------------------
+
+void EditorApplication::LoadScene(SceneList sceneIndex) {
+	UnloadScene();
+
+	switch(sceneIndex) {
+		//add scene creation calls here
+		case SceneList::FIRST:
+		case SceneList::EDITORSCENE:
+			activeScene = new EditorScene(&config);
+		break;
+
+		case SceneList::TESTIFICATESCENE:
+			activeScene = new TestificateScene(&config);
+		break;
+
+
+		default:
+			throw(std::logic_error("Failed to recognize the scene index"));
+	}
+}
+
+void EditorApplication::UnloadScene() {
+	delete activeScene;
+	activeScene = nullptr;
+}

editor/editor_application.hpp

@@ -0,0 +1,53 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef EDITORAPPLICATION_HPP_
+#define EDITORAPPLICATION_HPP_
+
+#include "scene_list.hpp"
+#include "base_scene.hpp"
+#include "config_utility.hpp"
+
+class EditorApplication {
+private:
+	EditorApplication();
+	~EditorApplication();
+	static EditorApplication instance;
+
+public:
+	static EditorApplication* GetInstance() { return &instance; }
+
+	void Init();
+	void Proc();
+	void Quit();
+
+private:
+	//Private access members
+	void LoadScene(SceneList sceneIndex);
+	void UnloadScene();
+
+	//globals
+	ConfigUtility config;
+
+	BaseScene* activeScene = nullptr;
+};
+
+#endif

editor/editor_scene.cpp

@@ -0,0 +1,282 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "editor_scene.hpp"
+
+#include "utility.hpp"
+
+#include <cstdio>
+#include <iostream>
+#include <stdexcept>
+
+using namespace std;
+
+//-------------------------
+//Public access members
+//-------------------------
+
+EditorScene::EditorScene(ConfigUtility* const arg1):
+	config(*arg1)
+{
+	//create the debugging "window"
+	debugInfo.CreateSurface(256, 256);
+
+	//setup the utility objects
+	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+
+	buttonImage.LoadSurface(config["dir.interface"] + "button_menu.bmp");
+	buttonImage.SetClipH(buttonImage.GetClipH()/3);
+
+	//setup the menu bar
+	menuBar.SetFont(&font);
+	menuBar.SetImage(&buttonImage);
+
+	menuBar.SetEntries({
+		{"File", "-New", "-Open", "-Save", "-Save As...", "-Close", "Exit"},
+		{"Edit", "-Set Tile", "-Load Sheet", "-Delete Sheet", "-Metadata", "-Run Script"},
+		{"Debugging", "Debug On", "Debug Off", "Toggle Debug", "Testificate"}
+	});
+
+	//setup the pager
+	pager.SetOnNew([](Region* const ptr){
+		printf("New Region: %d, %d\n", ptr->GetX(), ptr->GetY());
+	});
+
+	pager.SetOnDelete([](Region* const ptr){
+		printf("Delete Region: %d, %d\n", ptr->GetX(), ptr->GetY());
+	});
+
+	//Set a resonable size for the regions
+	pager.SetWidth(32*4);
+	pager.SetHeight(32*4);
+
+	sheetMgr.LoadSheet(config["dir.tilesets"] + "terrain.bmp", 32, 32);
+}
+
+EditorScene::~EditorScene() {
+	//
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void EditorScene::FrameStart() {
+	//
+}
+
+void EditorScene::Update(double delta) {
+	pager.Prune(camera.x, camera.y, camera.x + GetScreen()->w, camera.y + GetScreen()->h);
+}
+
+void EditorScene::FrameEnd() {
+	//
+}
+
+void EditorScene::Render(SDL_Surface* const screen) {
+	//draw the map
+	pager.DrawTo(screen, &sheetMgr, camera.x, camera.y);
+
+	//draw a big bar across the top
+	buttonImage.SetClipY(0);
+	for (int i = 0; i < screen->w; i += buttonImage.GetClipW()) {
+		buttonImage.DrawTo(screen, i, 0);
+	}
+
+	//draw the menu bar
+	menuBar.DrawTo(screen);
+
+	//draw some debugging info
+	if (debugOpen) {
+		SDL_FillRect(debugInfo.GetSurface(), 0, 0);
+		DrawToDebugInfo(string("camera.x: ") + to_string_custom(camera.x), 0);
+		DrawToDebugInfo(string("camera.y: ") + to_string_custom(camera.y), 1);
+		debugInfo.DrawTo(screen, screen->w - debugInfo.GetClipW(), buttonImage.GetClipH());
+	}
+}
+
+void EditorScene::DrawToDebugInfo(std::string str, int line) {
+	//draw the debug info on the right
+	font.DrawStringTo(
+		str,
+		debugInfo.GetSurface(),
+		debugInfo.GetClipW() - str.size() * font.GetCharW(),
+		font.GetCharH() * line
+	);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void EditorScene::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	menuBar.MouseMotion(motion);
+
+	if (motion.state & SDL_BUTTON_LMASK && motion.y >= buttonImage.GetClipH()) {
+		Region* regionPtr = pager.GetRegion(
+			snapToBase(pager.GetWidth(), motion.x + camera.x),
+			snapToBase(pager.GetHeight(), motion.y + camera.y)
+		);
+
+		TileSheet* sheetPtr = sheetMgr.GetSheetByIndex(tileCounter);
+
+		regionPtr->NewTileA({
+			snapToBase(sheetPtr->GetTileW(), motion.x + camera.x), //x
+			snapToBase(sheetPtr->GetTileH(), motion.y + camera.y), //y
+			0, //depth
+			sheetPtr->GetTileW(), //width
+			sheetPtr->GetTileH(), //height
+			tileCounter++ //value
+		});
+	}
+
+	if (motion.state & SDL_BUTTON_RMASK) {
+		camera.x -= motion.xrel;
+		camera.y -= motion.yrel;
+	}
+}
+
+void EditorScene::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	menuBar.MouseButtonDown(button);
+
+	if (button.button == SDL_BUTTON_LEFT && button.y >= buttonImage.GetClipH()) {
+		Region* regionPtr = pager.GetRegion(
+			snapToBase(pager.GetWidth(), button.x + camera.x),
+			snapToBase(pager.GetHeight(), button.y + camera.y)
+		);
+
+		TileSheet* sheetPtr = sheetMgr.GetSheetByIndex(tileCounter);
+
+		regionPtr->NewTileA({
+			snapToBase(sheetPtr->GetTileW(), button.x + camera.x), //x
+			snapToBase(sheetPtr->GetTileH(), button.y + camera.y), //y
+			0, //depth
+			sheetPtr->GetTileW(), //width
+			sheetPtr->GetTileH(), //height
+			tileCounter++ //value
+		});
+	}
+}
+
+void EditorScene::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	int entry, drop;
+	menuBar.MouseButtonUp(button, &entry, &drop);
+
+	//manage input from the menu bar
+	switch(entry) {
+		case 0: //File
+			switch(drop) {
+				case 0:
+					//TODO: NEW
+				break;
+
+				case 1:
+					//TODO: OPEN
+				break;
+
+				case 2:
+					//TODO: SAVE
+				break;
+
+				case 3:
+					//TODO: SAVE AS
+				break;
+
+				case 4:
+					//TODO: CLOSE
+				break;
+
+				case 5: {
+					//Quit
+					SDL_Event e;
+					e.type = SDL_QUIT;
+					SDL_PushEvent(&e);
+				}
+				break;
+			}
+		break;
+
+		case 1: //Edit
+			switch(drop) {
+				case 0:
+					//TODO: SET TILE
+				break;
+
+				case 1:
+					//TODO: LOAD SHEET
+				break;
+
+				case 2:
+					//TODO: DELETE SHEET
+				break;
+
+				case 3:
+					//TODO: METADATA
+				break;
+
+				case 4:
+					//TODO: RUN SCRIPT
+				break;
+			}
+		break;
+
+		case 2: //Debug
+			switch(drop) {
+				case 0:
+					debugOpen = true;
+				break;
+
+				case 1:
+					debugOpen = false;
+				break;
+
+				case 2:
+					debugOpen = !debugOpen;
+				break;
+
+				case 3:
+					SetNextScene(SceneList::TESTIFICATESCENE);
+				break;
+			}
+		break;
+	}
+}
+
+void EditorScene::KeyDown(SDL_KeyboardEvent const& key) {
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+			QuitEvent();
+		break;
+
+		case SDLK_SPACE:
+			camera.x = 0;
+			camera.y = 0;
+		break;
+
+		case SDLK_TAB:
+			debugOpen = !debugOpen;
+		break;
+	}
+}
+
+void EditorScene::KeyUp(SDL_KeyboardEvent const& key) {
+	//
+}

editor/editor_scene.hpp

@@ -0,0 +1,80 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef EDITORSCENE_HPP_
+#define EDITORSCENE_HPP_
+
+#include "base_scene.hpp"
+
+#include "region_pager.hpp"
+#include "tile_sheet_manager.hpp"
+
+#include "config_utility.hpp"
+#include "image.hpp"
+#include "raster_font.hpp"
+#include "menu_bar.hpp"
+
+//#include "map_loader.hpp"
+
+class EditorScene : public BaseScene {
+public:
+	//Public access members
+	EditorScene(ConfigUtility* const);
+	~EditorScene();
+
+protected:
+	//Frame loop
+	void FrameStart();
+	void Update(double delta);
+	void FrameEnd();
+	void Render(SDL_Surface* const);
+
+	//Event handlers
+	void MouseMotion(SDL_MouseMotionEvent const&);
+	void MouseButtonDown(SDL_MouseButtonEvent const&);
+	void MouseButtonUp(SDL_MouseButtonEvent const&);
+	void KeyDown(SDL_KeyboardEvent const&);
+	void KeyUp(SDL_KeyboardEvent const&);
+
+	//globals
+	ConfigUtility& config;
+
+	//debugging tools
+	void DrawToDebugInfo(std::string, int line);
+	Image debugInfo;
+	bool debugOpen = true;
+
+	RegionPager pager;
+	TileSheetManager sheetMgr;
+
+	RasterFont font;
+	Image buttonImage;
+
+	MenuBar menuBar;
+
+	struct {
+		int x = 0, y = 0;
+	} camera;
+
+	int tileCounter = 0;
+};
+
+#endif

editor/main.cpp

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

editor/makefile

@@ -0,0 +1,43 @@
+#config
+INCLUDES+=../common ../common/graphics ../common/map ../common/ui
+LIBS+=../libcommon.a -lmingw32 -lSDLmain -lSDL
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
+CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+
+#source
+CXXSRC=$(wildcard *.cpp)
+CSRC=$(wildcard *.c)
+
+#objects
+OBJDIR=obj
+OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
+OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.o))
+
+#output
+OUTDIR=../out
+OUT=$(addprefix $(OUTDIR)/,editor)
+
+#targets
+all: $(OBJ) $(OUT)
+	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
+
+$(OBJ): | $(OBJDIR)
+
+$(OUT): | $(OUTDIR)
+
+$(OBJDIR):
+	mkdir $(OBJDIR)
+
+$(OUTDIR):
+	mkdir $(OUTDIR)
+
+$(OBJDIR)/%.o: %.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ $<
+
+$(OBJDIR)/%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all

editor/scene_list.hpp

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

editor/testificate_scene.cpp

@@ -0,0 +1,107 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "testificate_scene.hpp"
+
+#include <iostream>
+
+using std::cout;
+using std::endl;
+
+//-------------------------
+//Public access members
+//-------------------------
+
+TestificateScene::TestificateScene(ConfigUtility* const arg1):
+	config(*arg1)
+{
+	sheetMgr.LoadSheet(config["dir.tilesets"] + "grass.bmp", 32, 32);
+	sheetMgr.LoadSheet(config["dir.tilesets"] + "longgrass.bmp", 32, 32);
+	sheetMgr.LoadSheet(config["dir.tilesets"] + "sand.bmp", 32, 32);
+	sheetMgr.LoadSheet(config["dir.tilesets"] + "dirt.bmp", 32, 32);
+	sheetMgr.LoadSheet(config["dir.tilesets"] + "water.bmp", 32, 32);
+
+	cout << "Range End: " << sheetMgr.GetRangeEnd() << endl;
+
+	pager.SetWidth(128);
+	pager.SetHeight(128);
+
+	pager.GetRegion(0, 0)->NewTileR({0, 0, 0, 32, 32, 0});
+}
+
+TestificateScene::~TestificateScene() {
+	//
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void TestificateScene::FrameStart() {
+	//
+}
+
+void TestificateScene::Update(double delta) {
+	//
+}
+
+void TestificateScene::FrameEnd() {
+	//
+}
+
+void TestificateScene::Render(SDL_Surface* const screen) {
+	//dump all tile graphics to the screen
+	for (int i = 0; i < sheetMgr.GetRangeEnd(); i++) {
+		sheetMgr.DrawTo(screen, i * 32 % screen->w, i * 32 / screen->w * 32, i);
+	}
+
+//	pager.DrawTo(screen, &sheetMgr, 0, 0);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void TestificateScene::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	//
+}
+
+
+void TestificateScene::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	//
+}
+
+void TestificateScene::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	//
+}
+
+void TestificateScene::KeyDown(SDL_KeyboardEvent const& key) {
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+//			QuitEvent();
+		SetNextScene(SceneList::EDITORSCENE);
+		break;
+	}
+}
+
+void TestificateScene::KeyUp(SDL_KeyboardEvent const& key) {
+	//
+}

editor/testificate_scene.hpp

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

hacky unit tests/serialize_experiment.cpp

@@ -1,76 +0,0 @@
-#include <iostream>
-
-#include <cstring>
-
-using namespace std;
-
-union Foo {
-	enum class Type {
-		INT,
-		FLOAT
-	}type;
-	struct {
-		Type type;
-		int i;
-	}i;
-	struct {
-		Type type;
-		float f;
-	}f;
-};
-
-void serialize(Foo* f, void* buffer) {
-	int len = 0;
-	memcpy((void*)((int)buffer + len), &f->type, sizeof(Foo::Type));
-	len += sizeof(Foo::Type);
-	switch(f->type) {
-		case Foo::Type::INT:
-			memcpy((void*)((int)buffer + len), &f->i.i, sizeof(int));
-			len += sizeof(int);
-		break;
-		case Foo::Type::FLOAT:
-			memcpy((void*)((int)buffer + len), &f->f.f, sizeof(float));
-			len += sizeof(float);
-		break;
-	}
-}
-
-void deserialize(Foo* f, void* buffer) {
-	int len = 0;
-	memcpy(&f->type, (void*)((int)buffer + len), sizeof(Foo::Type));
-	len += sizeof(Foo::Type);
-	switch(f->type) {
-		case Foo::Type::INT:
-			memcpy(&f->i.i, (void*)((int)buffer + len), sizeof(int));
-			len += sizeof(int);
-		break;
-		case Foo::Type::FLOAT:
-			memcpy(&f->f.f, (void*)((int)buffer + len), sizeof(float));
-			len += sizeof(float);
-		break;
-	}
-}
-
-int main() {
-	Foo f;
-	f.type = Foo::Type::FLOAT;
-	f.f.f = 3.14;
-	Foo i;
-	i.type = Foo::Type::INT;
-	i.i.i = 42;
-
-	char buffer[sizeof(Foo)];
-	serialize(&f, buffer);
-	deserialize(&i, buffer);
-
-	switch(i.type) {
-		case Foo::Type::INT:
-			cout << i.i.i << endl;
-		break;
-		case Foo::Type::FLOAT:
-			cout << i.f.f << endl;
-		break;
-	}
-
-	return 0;
-}

images/concepts/frogs/WIP/palette index.txt

@@ -1,12 +0,0 @@
-The palette is extracted from the frog images. It's only meant as areference, and can change later. Hot pink (255, 0, 255) is used to fill the gaps.
-
-[blank], mid highlight, high highlight
-low base, mid base, high base
-[blank], mid shadow, high shadow
-inner cheek
-tongue outline, tongue shadow, tongue base
-leather shadow, leather base, leather hightlight
-wood shadow, wood base, wood highlight
-sharp shadow, sharp base, [blank]
-dull shadow, dull base, [blank]
-frog outline, metal outline, wood outline

images/concepts/frogs/initial sketches/description.txt

@@ -1,7 +0,0 @@
-pay attention to each frog's eyes
-
-frogs are green
-bog toad is yellow/orange with spots (gradient?)
-princess dress is an ugly pink
-frog king wears a gold crown and red cape with gold trimmings
-the knight's helmet has a purple plume, and it's wearing boxer shorts with loveheart patterns