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.

client/channels.hpp

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

client/client_application.cpp

@@ -1,11 +1,11 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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
+ * 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
@@ -19,13 +19,16 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "application.hpp"
-
-#include "timer.hpp"
+#include "client_application.hpp"
 
 #include <stdexcept>
 #include <chrono>
-#include <iostream>
+
+//-------------------------
+//Static declarations
+//-------------------------
+
+ClientApplication ClientApplication::instance;
 
 //-------------------------
 //Scene headers
@@ -35,77 +38,46 @@
 #include "splash_screen.hpp"
 #include "main_menu.hpp"
 #include "options_menu.hpp"
+#include "lobby_menu.hpp"
 #include "in_world.hpp"
+#include "in_combat.hpp"
 
 //-------------------------
 //Public access members
 //-------------------------
 
-void Application::Init(int argc, char** argv) {
-	std::cout << "Beginning " << argv[0] << std::endl;
+ClientApplication::ClientApplication() {
+	//
+}
 
-	//-------------------------
-	//Initialize the APIs
-	//-------------------------
+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"));
 	}
-	std::cout << "Initialized SDL" << std::endl;
+	BaseScene::SetScreen(config.Int("screen.w"), config.Int("screen.h"), 0, (config.Bool("screen.f")) ? SDL_HWSURFACE|SDL_DOUBLEBUF : SDL_HWSURFACE);
 
-	//initialize lua
-	lua = luaL_newstate();
-	if (!lua) {
-		throw(std::runtime_error("Failed to initialize lua"));
+	//initialize SDL_net
+	if (SDLNet_Init()) {
+		throw(std::runtime_error("Failed to initialize SDL_net"));
 	}
-	luaL_openlibs(lua);
-	std::cout << "Initialized lua" << std::endl;
-
-	if (luaL_dofile(lua, "rsc\\setup.lua")) {
-		throw(std::runtime_error("Failed to initialize lua's startup script"));
-	}
-	std::cout << "Initialized lua's setup script" << std::endl;
-
-	//-------------------------
-	//Setup the screen
-	//-------------------------
-
-	lua_getglobal(lua, "config");
-	lua_getfield(lua, 1, "screen");
-	lua_getfield(lua, 2, "width");
-	lua_getfield(lua, 2, "height");
-	lua_getfield(lua, 2, "fullscreen");
-
-	int w = lua_tointeger(lua, 3);
-	int h = lua_tointeger(lua, 4);
-	int f = lua_toboolean(lua, 5);
-
-	lua_pop(lua, 5);
-
-	BaseScene::SetScreen(w ? w : 800, h ? h : 600, 0, f ? SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_FULLSCREEN : SDL_HWSURFACE|SDL_DOUBLEBUF);
-	std::cout << "Initialized the screen" << std::endl;
-
-	//-------------------------
-	//finalize the startup
-	//-------------------------
-
-	std::cout << "Startup completed successfully" << std::endl;
-
-	//-------------------------
-	//debugging
-	//-------------------------
-
-	//...
+	network.Open(0, sizeof(NetworkPacket));
 }
 
-void Application::Proc() {
+void ClientApplication::Proc() {
 	LoadScene(SceneList::FIRST);
 
 	//prepare the time system
 	typedef std::chrono::steady_clock Clock;
 
-	std::chrono::duration<int, std::milli> delta(16);
+	Clock::duration delta(16 * Clock::duration::period::den / std::milli::den);
 	Clock::time_point simTime = Clock::now();
 	Clock::time_point realTime;
 
@@ -120,66 +92,64 @@ void Application::Proc() {
 		//update the current time
 		realTime = Clock::now();
 
-		Timer runTimer("run");
-
 		//simulate game time
 		while (simTime < realTime) {
 			//call each user defined function
-			activeScene->RunFrame(double(delta.count()) / std::chrono::duration<int, std::milli>::period::den);
+			activeScene->RunFrame(double(delta.count()) / Clock::duration::period::den);
 			simTime += delta;
 		}
 
-		runTimer.Stop();
-
-		Timer renderTimer("render");
-
 		//draw the game to the screen
 		activeScene->RenderFrame();
 
-		renderTimer.Stop();
-
-		//debugging output
-//		std::cout << runTimer << std::endl;
-//		std::cout << renderTimer << std::endl;
+		//give the computer a break
+		SDL_Delay(10);
 	}
 
 	UnloadScene();
 }
 
-void Application::Quit() {
-	std::cout << "Shutting down" << std::endl;
-	lua_close(lua);
+void ClientApplication::Quit() {
+	network.Close();
+	SDLNet_Quit();
 	SDL_Quit();
-	std::cout << "Clean exit" << std::endl;
 }
 
 //-------------------------
 //Private access members
 //-------------------------
 
-void Application::LoadScene(SceneList sceneIndex) {
+void ClientApplication::LoadScene(SceneList sceneIndex) {
 	UnloadScene();
+
 	switch(sceneIndex) {
 		//add scene creation calls here
 		case SceneList::FIRST:
 		case SceneList::SPLASHSCREEN:
-			activeScene = new SplashScreen(lua);
+			activeScene = new SplashScreen(&config);
 		break;
 		case SceneList::MAINMENU:
-			activeScene = new MainMenu(lua);
+			activeScene = new MainMenu(&config);
 		break;
 		case SceneList::OPTIONSMENU:
-			activeScene = new OptionsMenu(lua);
+			activeScene = new OptionsMenu(&config);
+		break;
+		case SceneList::LOBBYMENU:
+			activeScene = new LobbyMenu(&config, &network, &clientIndex);
 		break;
 		case SceneList::INWORLD:
-			activeScene = new InWorld(lua);
+			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 Application::UnloadScene() {
+void ClientApplication::UnloadScene() {
 	delete activeScene;
 	activeScene = nullptr;
 }

client/client_application.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* 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
@@ -19,33 +19,39 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGIONPAGERLUA_HPP_
-#define REGIONPAGERLUA_HPP_
+#ifndef CLIENTAPPLICATION_HPP_
+#define CLIENTAPPLICATION_HPP_
 
-#include "region_pager_base.hpp"
+#include "scene_list.hpp"
+#include "base_scene.hpp"
 
-#include "lua/lua.hpp"
+#include "config_utility.hpp"
+#include "network_packet.hpp"
+#include "udp_network_utility.hpp"
 
-#include <string>
+class ClientApplication {
+private:
+	ClientApplication();
+	~ClientApplication();
+	static ClientApplication instance;
 
-class RegionPagerLua : public RegionPagerBase {
 public:
-	RegionPagerLua() = default;
-	~RegionPagerLua() = default;
+	static ClientApplication* GetInstance() { return &instance; }
 
-	//region manipulation
-	Region* LoadRegion(int x, int y) override;
-	Region* SaveRegion(int x, int y) override;
-	Region* CreateRegion(int x, int y) override;
-	void UnloadRegion(int x, int y) override;
+	void Init();
+	void Proc();
+	void Quit();
 
-	void UnloadAll() override;
+private:
+	//Private access members
+	void LoadScene(SceneList sceneIndex);
+	void UnloadScene();
 
-	//accessors & mutators
-	lua_State* SetLuaState(lua_State* L) { return lua = L; }
-	lua_State* GetLuaState() { return lua; }
-protected:
-	lua_State* lua = nullptr;
+	BaseScene* activeScene = nullptr;
+
+	ConfigUtility config;
+	UDPNetworkUtility network;
+	int clientIndex = -1; //replace with a struct?
 };
 
 #endif

client/main.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* 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
@@ -19,13 +19,24 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGIONPAGERAPI_HPP_
-#define REGIONPAGERAPI_HPP_
+#include "client_application.hpp"
 
-#include "lua/lua.hpp"
+#include <stdexcept>
+#include <iostream>
 
-#define TORTUGA_REGION_PAGER_PSEUDO_INDEX "RegionPagerPseudoIndex"
-#define TORTUGA_REGION_PAGER_NAME "RegionPager"
-LUAMOD_API int openRegionPagerAPI(lua_State* L);
+using namespace std;
 
-#endif
+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

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* 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
@@ -19,51 +19,48 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CHARACTER_HPP_
-#define CHARACTER_HPP_
+#ifndef PLAYERCHARACTER_HPP_
+#define PLAYERCHARACTER_HPP_
 
-//components
 #include "vector2.hpp"
-#include "bounding_box.hpp"
-
-//graphics
 #include "sprite_sheet.hpp"
 
-//std namespace
-#include <cmath>
-
-//the speeds that the characters move
-constexpr double CHARACTER_WALKING_SPEED = 140.0;
-constexpr double CHARACTER_WALKING_MOD = 1.0/sqrt(2.0);
-
-class Character {
+class PlayerCharacter {
 public:
-	Character() = default;
-	~Character() = default;
+	enum class Direction {
+		NORTH, SOUTH, EAST, WEST
+	};
+
+	PlayerCharacter() = default;
+	~PlayerCharacter() = default;
 
 	void Update(double delta);
 
-	//graphics
-	void DrawTo(SDL_Surface* const, int camX, int camY);
-	void CorrectSprite();
-	SpriteSheet* GetSprite() { return &sprite; }
+	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 SetOrigin(Vector2 v) { return origin = v; }
-	Vector2 GetOrigin() const { return origin; }
-	Vector2 SetMotion(Vector2 v) { return motion = v; }
-	Vector2 GetMotion() const { return motion; }
-	BoundingBox SetBoundingBox(BoundingBox b) { return bounds = b; }
-	BoundingBox GetBoundingBox() const { return bounds; }
+	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:
-	//graphics
+	Vector2 position;
+	Vector2 motion;
 	SpriteSheet sprite;
 
-	//position
-	Vector2 origin = {0.0,0.0};
-	Vector2 motion = {0.0,0.0};
-	BoundingBox bounds;
+	//for moving diagonally
+	bool diagonal = false;
 };
 
 #endif

client/scene_list.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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
@@ -32,7 +32,9 @@ enum class SceneList {
 	SPLASHSCREEN,
 	MAINMENU,
 	OPTIONSMENU,
+	LOBBYMENU,
 	INWORLD,
+	INCOMBAT,
 };
 
 #endif

client/scenes/base_scene.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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

client/scenes/base_scene.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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

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

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* 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
@@ -19,30 +19,30 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef FRAMERATE_HPP_
-#define FRAMERATE_HPP_
+#ifndef INCOMBAT_HPP_
+#define INCOMBAT_HPP_
 
-#include <chrono>
+#include "base_scene.hpp"
 
-class FrameRate {
+class InCombat : public BaseScene {
 public:
-	typedef std::chrono::high_resolution_clock Clock;
+	//Public access members
+	InCombat();
+	~InCombat();
 
-	FrameRate() = default;
-	int Calculate() {
-		frameCount++;
-		if (Clock::now() - tick >= std::chrono::duration<int>(1)) {
-			lastFrameRate = frameCount;
-			frameCount = 0;
-			tick = Clock::now();
-		}
-		return lastFrameRate;
-	}
-	int GetFrameRate() { return lastFrameRate; }
-private:
-	int frameCount = 0;
-	int lastFrameRate = 0;
-	Clock::time_point tick = Clock::now();
+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

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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
@@ -25,20 +25,13 @@
 //Public access members
 //-------------------------
 
-MainMenu::MainMenu(lua_State* L): lua(L) {
-	//get the config info
-	lua_getglobal(lua, "config");
-	lua_getfield(lua, -1, "dir");
-	lua_getfield(lua, -1, "interface");
-	std::string interface = lua_tostring(lua, -1);
-	lua_getfield(lua, -2, "fonts");
-	std::string fonts = lua_tostring(lua, -1);
-	lua_pop(lua, 4);
-
+MainMenu::MainMenu(ConfigUtility* const argConfig):
+	config(*argConfig)
+{
 	//setup the utility objects
-	image.LoadSurface(interface + "button_menu.bmp");
+	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(fonts + "pk_white_8.bmp");
+	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
 
 	//pass the utility objects
 	startButton.SetImage(&image);
@@ -60,9 +53,6 @@ MainMenu::MainMenu(lua_State* L): lua(L) {
 	startButton.SetText("Start");
 	optionsButton.SetText("Options");
 	quitButton.SetText("Quit");
-
-	//debug
-	//
 }
 
 MainMenu::~MainMenu() {
@@ -109,7 +99,7 @@ void MainMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 
 void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 	if (startButton.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::INWORLD);
+		SetNextScene(SceneList::LOBBYMENU);
 	}
 	if (optionsButton.MouseButtonUp(button) == Button::State::HOVER) {
 		SetNextScene(SceneList::OPTIONSMENU);
@@ -120,7 +110,11 @@ void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 }
 
 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

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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
@@ -24,16 +24,15 @@
 
 #include "base_scene.hpp"
 
+#include "config_utility.hpp"
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
 
-#include "lua/lua.hpp"
-
 class MainMenu : public BaseScene {
 public:
 	//Public access members
-	MainMenu(lua_State* L);
+	MainMenu(ConfigUtility* const);
 	~MainMenu();
 
 protected:
@@ -50,8 +49,8 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//shared parameters
-	lua_State* lua = nullptr;
+	//globals
+	ConfigUtility& config;
 
 	//members
 	Image image;

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

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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
@@ -25,20 +25,13 @@
 //Public access members
 //-------------------------
 
-OptionsMenu::OptionsMenu(lua_State* L): lua(L) {
-	//get the config info
-	lua_getglobal(lua, "config");
-	lua_getfield(lua, -1, "dir");
-	lua_getfield(lua, -1, "interface");
-	std::string interface = lua_tostring(lua, -1);
-	lua_getfield(lua, -2, "fonts");
-	std::string fonts = lua_tostring(lua, -1);
-	lua_pop(lua, 4);
-
+OptionsMenu::OptionsMenu(ConfigUtility* const argConfig):
+	config(*argConfig)
+{
 	//setup the utility objects
-	image.LoadSurface(interface + "button_menu.bmp");
+	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(fonts + "pk_white_8.bmp");
+	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
 
 	//pass the utility objects
 	backButton.SetImage(&image);
@@ -97,7 +90,11 @@ void OptionsMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 }
 
 void OptionsMenu::KeyDown(SDL_KeyboardEvent const& key) {
-	//
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+			SetNextScene(SceneList::MAINMENU);
+		break;
+	}
 }
 
 void OptionsMenu::KeyUp(SDL_KeyboardEvent const& key) {

client/scenes/options_menu.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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
@@ -24,17 +24,15 @@
 
 #include "base_scene.hpp"
 
+#include "config_utility.hpp"
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
 
-#include "lua/lua.hpp"
-
-//TODO: The options screen needs to be USED
 class OptionsMenu : public BaseScene {
 public:
 	//Public access members
-	OptionsMenu(lua_State* L);
+	OptionsMenu(ConfigUtility* const);
 	~OptionsMenu();
 
 protected:
@@ -51,8 +49,8 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//shared parameters
-	lua_State* lua = nullptr;
+	//globals
+	ConfigUtility& config;
 
 	//members
 	Image image;

client/scenes/splash_screen.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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
@@ -21,21 +21,14 @@
 */
 #include "splash_screen.hpp"
 
-#include <string>
-
 //-------------------------
 //Public access members
 //-------------------------
 
-SplashScreen::SplashScreen(lua_State* L): lua(L) {
-	//get the config info
-	lua_getglobal(lua, "config");
-	lua_getfield(lua, -1, "dir");
-	lua_getfield(lua, -1, "logos");
-	std::string logos = lua_tostring(lua, -1);
-	lua_pop(lua, 3);
-
-	logo.LoadSurface(logos + "krstudios.bmp");
+SplashScreen::SplashScreen(ConfigUtility* const argConfig):
+	config(*argConfig)
+{
+	logo.LoadSurface(config["dir.logos"] + "krstudios.bmp");
 	startTick = std::chrono::steady_clock::now();
 }
 

client/scenes/splash_screen.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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
@@ -24,16 +24,15 @@
 
 #include "base_scene.hpp"
 
+#include "config_utility.hpp"
 #include "image.hpp"
 
-#include "lua/lua.hpp"
-
 #include <chrono>
 
 class SplashScreen : public BaseScene {
 public:
 	//Public access members
-	SplashScreen(lua_State* L);
+	SplashScreen(ConfigUtility* const);
 	~SplashScreen();
 
 protected:
@@ -41,8 +40,8 @@ protected:
 	void Update(double delta);
 	void Render(SDL_Surface* const);
 
-	//shared parameters
-	lua_State* lua = nullptr;
+	//globals
+	ConfigUtility& config;
 
 	//members
 	std::chrono::steady_clock::time_point startTick;

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

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* 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
@@ -19,36 +19,42 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef TIMER_HPP_
-#define TIMER_HPP_
+#ifndef CONFIGUTILITY_HPP_
+#define CONFIGUTILITY_HPP_
 
-#include <chrono>
+#include <map>
 #include <string>
-#include <ostream>
 
-class Timer {
+class ConfigUtility {
 public:
-	typedef std::chrono::high_resolution_clock Clock;
+	ConfigUtility() = default;
+	ConfigUtility(std::string s) { Load(s); }
 
-	Timer() = default;
-	Timer(std::string s) : name(s), start(Clock::now()) {};
-	~Timer() = default;
+	void Load(std::string fname);
 
-	inline void Start() { start = Clock::now(); }
-	inline void Stop() { time = Clock::now() - start; }
+	//convert to a type
+	std::string& String(std::string);
+	int Integer(std::string);
+	double Double(std::string);
+	bool Boolean(std::string);
 
-	//accessors and mutators
-	Clock::duration GetTime() { return time; }
-
-	std::string SetName(std::string s) { return name = s; }
-	std::string GetName() { return name; }
+	//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::string name;
-	Clock::time_point start;
-	Clock::duration time;
+	std::map<std::string, std::string> table;
 };
 
-std::ostream& operator<<(std::ostream& os, Timer& t);
-
 #endif

common/graphics/image.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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

common/graphics/image.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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

common/graphics/makefile

@@ -1,17 +1,20 @@
 #config
-INCLUDES+=. ../graphics
+INCLUDES+=. ..
 LIBS+=
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
+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=..
+OUTDIR=../..
 OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 
 #targets
@@ -31,6 +34,9 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
+$(OBJDIR)/%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
 clean:
 	$(RM) *.o *.a *.exe
 

common/graphics/sprite_sheet.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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

common/graphics/sprite_sheet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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

common/makefile

@@ -1,14 +1,17 @@
 #config
 INCLUDES+=.
 LIBS+=
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
+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=..
@@ -17,6 +20,10 @@ 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)
 
@@ -31,6 +38,9 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
+$(OBJDIR)/%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
 clean:
 	$(RM) *.o *.a *.exe
 

common/map/makefile

@@ -1,17 +1,20 @@
 #config
-INCLUDES+=.
+INCLUDES+=. .. ../graphics
 LIBS+=
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
+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=..
+OUTDIR=../..
 OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 
 #targets
@@ -31,6 +34,9 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
+$(OBJDIR)/%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
 clean:
 	$(RM) *.o *.a *.exe
 

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

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* 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
@@ -19,37 +19,41 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "region.hpp"
-
-#include "utility.hpp"
+#include "tile_sheet.hpp"
 
 #include <stdexcept>
-#include <cstring>
 
-Region::Region(int argX, int argY): x(argX), y(argY) {
-	if (x != snapToBase(REGION_WIDTH, x) || y != snapToBase(REGION_HEIGHT, y)) {
-		throw(std::invalid_argument("Region location is off grid"));
+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"));
 	}
-	memset(tiles, 0, REGION_WIDTH*REGION_HEIGHT*REGION_DEPTH*sizeof(type_t));
-}
+	Sint16 clipX = (tileIndex-begin) % xCount * image.GetClipW();
+	Sint16 clipY = (tileIndex-begin) / xCount * image.GetClipH();
 
-Region::Region(Region const& rhs): x(rhs.x), y(rhs.y) {
-	memcpy(tiles, rhs.tiles, REGION_WIDTH*REGION_HEIGHT*REGION_DEPTH*sizeof(type_t));
-	solid = rhs.solid;
-}
+	image.SetClipX(clipX);
+	image.SetClipY(clipY);
 
-Region::type_t Region::SetTile(int x, int y, int z, type_t v) {
-	return tiles[x][y][z] = v;
+	image.DrawTo(dest, x, y);
 }
-
-Region::type_t Region::GetTile(int x, int y, int z) {
-	return tiles[x][y][z];
-}
-
-bool Region::SetSolid(int x, int y, bool b) {
-	return solid[x * REGION_WIDTH + y] = b;
-}
-
-bool Region::GetSolid(int x, int y) {
-	return solid[x * REGION_WIDTH + y];
-}

common/map/tile_sheet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* 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
@@ -22,33 +22,49 @@
 #ifndef TILESHEET_HPP_
 #define TILESHEET_HPP_
 
-#include "region.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(std::string f, int w, int h) { Load(f, w, h); }
 	~TileSheet() = default;
 
-	void Load(std::string fname, int tileWidth, int tileHeight);
+	//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 DrawTileTo(SDL_Surface* const dest, int x, int y, Region::type_t tile);
-	void DrawRegionTo(SDL_Surface* const dest, Region* const region, int camX, int camY);
+	void DrawTo(SDL_Surface* const dest, int x, int y, int tileIndex);
 
-	//accessors
+	bool InRange(int i) { return i >= begin && i < end; }
+
+	//accessors and mutators
 	Image* GetImage() { return &image; }
-	int GetXCount() { return xCount; }
-	int GetYCount() { return yCount; }
-	int GetTileW() { return image.GetClipW(); }
-	int GetTileH() { return image.GetClipH(); }
+
+	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;
-	int xCount = 0, yCount = 0;
+
+	//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

@@ -1,17 +1,20 @@
 #config
-INCLUDES+=. ../graphics ../utilities
+INCLUDES+=. ..
 LIBS+=
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
+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=..
+OUTDIR=../..
 OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 
 #targets
@@ -31,6 +34,9 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
+$(OBJDIR)/%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
 clean:
 	$(RM) *.o *.a *.exe
 

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

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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

common/ui/button.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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

common/ui/makefile

@@ -1,17 +1,20 @@
 #config
-INCLUDES+=.
+INCLUDES+=. .. ../graphics
 LIBS+=
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
+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=..
+OUTDIR=../..
 OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 
 #targets
@@ -31,6 +34,9 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
+$(OBJDIR)/%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
 clean:
 	$(RM) *.o *.a *.exe
 

common/ui/menu_bar.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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

common/ui/menu_bar.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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
@@ -36,7 +36,6 @@
  * This class needs a rewrite.
 */
 
-//TODO: This thing is fucking terrible, fix it and the button class
 class MenuBar {
 public:
 	MenuBar() = default;

common/ui/raster_font.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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

common/ui/raster_font.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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

common/utility.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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
@@ -26,14 +26,10 @@
 int snapToBase(int base, int x) {
 	//snap to a grid
 	if (x < 0) {
-		++x;
-		return x / base * base - base;
+		x++;
+		return x - x % base - base;
 	}
-	return x / base * base;
-}
-
-double snapToBase(double base, double x) {
-	return floor(x / base) * base;
+	return x - x % base;
 }
 
 std::string truncatePath(std::string pathname) {

common/utility.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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
@@ -25,8 +25,6 @@
 #include <string>
 
 int snapToBase(int base, int x);
-double snapToBase(double base, double x);
-
 std::string truncatePath(std::string pathname);
 
 //fixing known bugs in g++
@@ -34,4 +32,17 @@ 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

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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
@@ -22,7 +22,6 @@
 #ifndef VECTOR2_HPP_
 #define VECTOR2_HPP_
 
-#include <type_traits>
 #include <stdexcept>
 #include <cmath>
 
@@ -30,6 +29,7 @@ class Vector2 {
 public:
 	double x, y;
 
+	//This is explicitly a POD
 	Vector2() = default;
 	Vector2(double i, double j): x(i), y(j) {};
 	~Vector2() = default;
@@ -41,12 +41,11 @@ public:
 	double SquaredLength() const {
 		return x*x+y*y;
 	}
-	void Normalize() {
-		double l = Length();
-		if (l == 0)
-			throw(std::domain_error("Divide by zero"));
-		x /= l;
-		y /= l;
+
+	double operator[](size_t i) {
+		if (i >= 2)
+			throw(std::domain_error("Out of range"));
+		return *(&x+i);
 	}
 
 	//Arithmetic operators
@@ -104,7 +103,13 @@ public:
 	template<typename T> bool operator!=(T t) { return (x != t || y != t); }
 };
 
-//This is explicitly a POD
-static_assert(std::is_pod<Vector2>::value, "Vector2 is not a POD");
+//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

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

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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
@@ -19,20 +19,23 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef APPLICATION_HPP_
-#define APPLICATION_HPP_
+#ifndef EDITORAPPLICATION_HPP_
+#define EDITORAPPLICATION_HPP_
 
 #include "scene_list.hpp"
 #include "base_scene.hpp"
+#include "config_utility.hpp"
 
-#include "lua/lua.hpp"
+class EditorApplication {
+private:
+	EditorApplication();
+	~EditorApplication();
+	static EditorApplication instance;
 
-class Application {
 public:
-	Application() = default;
-	~Application() = default;
+	static EditorApplication* GetInstance() { return &instance; }
 
-	void Init(int argc, char** argv);
+	void Init();
 	void Proc();
 	void Quit();
 
@@ -41,9 +44,10 @@ private:
 	void LoadScene(SceneList sceneIndex);
 	void UnloadScene();
 
-	BaseScene* activeScene = nullptr;
+	//globals
+	ConfigUtility config;
 
-	lua_State* lua = nullptr;
+	BaseScene* activeScene = nullptr;
 };
 
-#endif
+#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

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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
@@ -19,75 +19,62 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef INWORLD_HPP_
-#define INWORLD_HPP_
+#ifndef EDITORSCENE_HPP_
+#define EDITORSCENE_HPP_
 
-//graphics & ui
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-
-//map stuff
-#include "tile_sheet.hpp"
-#include "region_pager_lua.hpp"
-
-//entities
-#include "character.hpp"
-
-//utilities
-#include "frame_rate.hpp"
-
-//framework
 #include "base_scene.hpp"
 
-//APIs
-#include "lua/lua.hpp"
+#include "region_pager.hpp"
+#include "tile_sheet_manager.hpp"
 
-class InWorld : public BaseScene {
+#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
-	InWorld(lua_State* L);
-	~InWorld();
+	EditorScene(ConfigUtility* const);
+	~EditorScene();
 
 protected:
 	//Frame loop
 	void FrameStart();
 	void Update(double delta);
 	void FrameEnd();
-	void RenderFrame();
 	void Render(SDL_Surface* const);
 
 	//Event handlers
-	void QuitEvent();
 	void MouseMotion(SDL_MouseMotionEvent const&);
 	void MouseButtonDown(SDL_MouseButtonEvent const&);
 	void MouseButtonUp(SDL_MouseButtonEvent const&);
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	struct {
-		struct {
-			int x, y;
-		}origin, margin;
-	}camera;
+	//globals
+	ConfigUtility& config;
 
-	//shared parameters
-	lua_State* lua = nullptr;
+	//debugging tools
+	void DrawToDebugInfo(std::string, int line);
+	Image debugInfo;
+	bool debugOpen = true;
+
+	RegionPager pager;
+	TileSheetManager sheetMgr;
 
-	//graphics
-	Image buttonImage;
 	RasterFont font;
+	Image buttonImage;
 
-	//map stuff
-	TileSheet tileSheet;
-	RegionPagerLua pager;
+	MenuBar menuBar;
 
-	//entities
-	Character character;
+	struct {
+		int x = 0, y = 0;
+	} camera;
 
-	//UI
-	Button backButton;
-	FrameRate fps;
+	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

@@ -1,26 +1,24 @@
 #config
-INCLUDES+=. debugging graphics map ui utilities
-LIBS+=libcommon.a -lmingw32 -lSDLmain -lSDL -llua
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
+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)/,jam)
+OUT=$(addprefix $(OUTDIR)/,editor)
 
 #targets
 all: $(OBJ) $(OUT)
-	$(MAKE) -C debugging
-	$(MAKE) -C graphics
-	$(MAKE) -C map
-	$(MAKE) -C ui
-	$(MAKE) -C utilities
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)
@@ -36,6 +34,9 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
+$(OBJDIR)/%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
 clean:
 	$(RM) *.o *.a *.exe
 

editor/scene_list.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* 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
@@ -19,12 +19,18 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGIONAPI_HPP_
-#define REGIONAPI_HPP_
+#ifndef SCENELIST_HPP_
+#define SCENELIST_HPP_
 
-#include "lua/lua.hpp"
+enum class SceneList {
+	//these are reserved
+	QUIT,
+	CONTINUE,
+	FIRST,
 
-#define TORTUGA_REGION_NAME "Region"
-LUAMOD_API int openRegionAPI(lua_State* L);
+	//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

makefile

@@ -3,15 +3,18 @@
 #MKDIR=mkdir
 #RM=del /y
 
-#CXXFLAGS+=-static-libgcc -static-libstdc++ -g -fno-inline-functions -Wall
-#CXXFLAGS+=-static-libgcc -static-libstdc++
+CXXFLAGS+=-static-libgcc -static-libstdc++
+CFLAGS+=-static-libgcc
 
-#export
+export
 
 OUTDIR=out
 
 all: $(OUTDIR)
-	$(MAKE) -C src
+	$(MAKE) -C common
+	$(MAKE) -C server
+	$(MAKE) -C client
+	$(MAKE) -C editor
 
 $(OUTDIR):
 	mkdir $(OUTDIR)

out/rsc/setup.lua

@@ -1,3 +0,0 @@
---reroute the program while in development
-config = {debug = true}
-dofile("../rsc/setup.lua")

rsc/config.cfg

@@ -0,0 +1,24 @@
+#configuration of the programs
+server.host = 255.255.255.255
+server.port = 21795
+server.name = local
+
+server.dbname = database.db
+
+screen.w = 800
+screen.h = 600
+screen.f = false
+
+#directories
+dir.fonts = rsc/graphics/fonts/
+dir.logos = rsc/graphics/logos/
+dir.sprites = rsc/graphics/sprites/
+dir.tilesets = rsc/graphics/tilesets/
+dir.interface = rsc/graphics/interface/
+dir.scripts = rsc/scripts/
+
+#player options
+player.handle = username
+player.avatar = elliot2.bmp
+
+#debugging

rsc/scripts/file_format.lua

@@ -1,9 +0,0 @@
---overwriting the existing hard coded methods
-function Region.Load(region)
-	--the return value signals if this succeeded or failed
-	return false
-end
-
-function Region.Save(region)
-	--
-end

rsc/scripts/generator.lua

@@ -1,16 +0,0 @@
---uber lazy declarations
-function math.sqr(x) return x*x end
-function math.dist(x, y, i, j) return math.sqrt(math.sqr(x-i) + math.sqr(y-j)) end
-
---define these
-function Region.Create(region)
-	for i = 1, Region.GetWidth() do
-		for j = 1, Region.GetHeight() do
-			Region.SetTile(region, i, j, 1, 1) --to show the basics are working
-		end
-	end
-end
-
-function Region.Unload(region)
-	--
-end

rsc/scripts/in_world.lua

@@ -1,33 +0,0 @@
-local sheet = TileSheet.GetTileSheet()
-local pager = RegionPager.GetRegionPager()
-
---the selected tilesheet
-TileSheet.Load(sheet, config.dir.tilesets .. "terrain.bmp", 32, 32)
-
---tile macros, mapped to this tilesheet
-local base = 14
-local shift = 36
-tiles = {
-	plains	= base + shift * 0,
-	grass	= base + shift * 1,
-	dirt	= base + shift * 2,
-	sand	= base + shift * 3,
-	water	= base + shift * 4
-}
-
---could set custom generation systems here, that differ from the global generators, etc.
-function Region.Create(region)
-	for i = 1, Region.GetWidth() do
-		for j = 1, Region.GetHeight() do
-			local dist = math.dist(0, 0, i + Region.GetX(region) -1, j + Region.GetY(region) -1)
-			if dist < 10 then
-				Region.SetTile(region, i, j, 1, tiles.plains)
-			elseif dist < 12 then
-				Region.SetTile(region, i, j, 1, tiles.sand)
-			else
-				Region.SetTile(region, i, j, 1, tiles.water)
-				Region.SetSolid(region, i, j, true)
-			end
-		end
-	end
-end

rsc/scripts/setup_server.sql

@@ -0,0 +1,73 @@
+-------------------------
+--Server
+-------------------------
+
+CREATE TABLE IF NOT EXISTS UserAccounts (
+	userAccountID INTEGER PRIMARY KEY AUTOINCREMENT,
+	username varchar(30) UNIQUE,
+	password varchar(30),
+	blacklisted BIT DEFAULT 0,
+	whitelisted BIT DEFAULT 1
+);
+
+-------------------------
+--Items
+-------------------------
+
+CREATE TABLE IF NOT EXISTS GlobalItemList (
+	globalItemListID INTEGER PRIMARY KEY AUTOINCREMENT,
+	itemName varchar(30) UNIQUE,
+	itemImage varchar(30),
+	type varchar(15), --{'mundane', 'consumable', 'equipment'}
+	maxStackSize INTEGER, --{1-max; 0 for non-stackable}
+	maxUniqueCopies INTEGER --{1-max; 0 for unlimited}
+);
+
+CREATE TABLE IF NOT EXISTS MundaneItems (
+	mundaneItemID INTEGER PRIMARY KEY AUTOINCREMENT,
+	globalItemListID INTEGER REFERENCES GlobalItemList(globalItemListID)
+	--holds whatever
+);
+
+CREATE TABLE IF NOT EXISTS Consumables (
+	consumableID INTEGER PRIMARY KEY AUTOINCREMENT,
+	globalItemListID INTEGER REFERENCES GlobalItemList(globalItemListID)
+	--holds all consumable items info (food, potions, etc.)
+);
+
+CREATE TABLE IF NOT EXISTS Equipment (
+	equipmentID INTEGER PRIMARY KEY AUTOINCREMENT,
+	globalItemListID INTEGER REFERENCES GlobalItemList(globalItemListID)
+	--hold all equipment info
+);
+
+-------------------------
+--Players
+-------------------------
+
+CREATE TABLE IF NOT EXISTS PlayerCharacters (
+	playerCharacterID INTEGER PRIMARY KEY AUTOINCREMENT,
+	name varchar(30) UNIQUE,
+
+	--stats
+	currentLevel		INTEGER DEFAULT 0,
+	currentExperience	INTEGER DEFAULT 0,
+	maxHealth			INTEGER DEFAULT 0,
+	maxMana				INTEGER DEFAULT 0,
+	currentHealth		INTEGER DEFAULT 0,
+	currentMana			INTEGER DEFAULT 0,
+	attack				INTEGER DEFAULT 0,
+	defence				INTEGER DEFAULT 0,
+	--etc.
+
+	--equipment
+	weapon INTEGER REFERENCES Equipment(equipmentID),
+	helmet INTEGER REFERENCES Equipment(equipmentID),
+	armour INTEGER REFERENCES Equipment(equipmentID)
+	--etc.
+);
+
+CREATE TABLE IF NOT EXISTS PlayerInventoryItems (
+	characterID INTEGER REFERENCES PlayerCharacters(characterID),
+	globalItemListID INTEGER REFERENCES GlobalItemList(globalItemListID)
+);

rsc/setup.lua

@@ -1,42 +0,0 @@
---[[
-	--reroute the program while in development
-	config = {debug = true}
-	dofile("../rsc/setup.lua")
---]]
-
---catch the debug signal if the program was rerouted
-local debug = false
-if config ~= nil then
-	debug = config.debug
-end
-
---the program's configuration
-config = {
-	debug = debug,
-	screen = {
-		width = 800,
-		height = 600,
-		fullscreen = false
-	},
-	dir = {
-		fonts = "rsc/graphics/fonts/",
-		logos = "rsc/graphics/logos/",
-		sprites = "rsc/graphics/sprites/",
-		tilesets = "rsc/graphics/tilesets/",
-		interface = "rsc/graphics/interface/",
-		scripts = "rsc/scripts/",
-		maps = "rsc/maps/"
-	},
-	mapname = "mapname"
-}
-
---development environment
-if config.debug then
-	for k, v in pairs(config.dir) do
-		config.dir[k] = string.format("../%s", v)
-	end
-end
-
---"load" the scripted systems
-dofile(config.dir.scripts .. "file_format.lua")
-dofile(config.dir.scripts .. "generator.lua")

server/client.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* 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
@@ -19,11 +19,20 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "timer.hpp"
+#ifndef CLIENT_HPP_
+#define CLIENT_HPP_
 
-std::ostream& operator<<(std::ostream& os, Timer& t) {
-	os << t.GetName() << ": ";
-	os << std::chrono::duration_cast<std::chrono::nanoseconds>(t.GetTime()).count();
-	os << "ns";
-	return os;
-}
+#include "SDL/SDL_net.h"
+
+#include <map>
+
+/* Hold the client info.
+*/
+
+struct Client {
+	IPaddress address;
+};
+
+typedef std::map<int, Client> ClientMap;
+
+#endif

server/main.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* 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
@@ -19,7 +19,9 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "application.hpp"
+#include "server_application.hpp"
+
+#include "SDL/SDL.h"
 
 #include <stdexcept>
 #include <iostream>
@@ -27,15 +29,17 @@
 using namespace std;
 
 int main(int argc, char** argv) {
+	cout << "Beginning server" << endl;
 	try {
-		Application app;
+		ServerApplication app;
 		app.Init(argc, argv);
-		app.Proc();
+		app.Loop();
 		app.Quit();
 	}
 	catch(exception& e) {
-		cerr << "Fatal exception thrown: " << e.what() << endl;
+		cerr << "Fatal error: " << e.what() << endl;
 		return 1;
 	}
+	cout << "Clean exit" << endl;
 	return 0;
-}
+}

server/makefile

@@ -0,0 +1,43 @@
+#config
+INCLUDES+=. ../common ../common/map ../common/network
+LIBS+=../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)/,server)
+
+#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

server/player.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* 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
@@ -19,13 +19,25 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef TILESHEETAPI_HPP_
-#define TILESHEETAPI_HPP_
+#ifndef PLAYER_HPP_
+#define PLAYER_HPP_
 
-#include "lua/lua.hpp"
+#include "vector2.hpp"
 
-#define TORTUGA_TILE_SHEET_PSEUDO_INDEX "TileSheetPseudoIndex"
-#define TORTUGA_TILE_SHEET_NAME "TileSheet"
-LUAMOD_API int openTileSheetAPI(lua_State* L);
+#include <string>
+#include <map>
+
+/* Hold the player info.
+*/
+
+struct Player {
+	int clientIndex;
+	std::string handle;
+	std::string avatar;
+	Vector2 position;
+	Vector2 motion;
+};
+
+typedef std::map<int, Player> PlayerMap;
 
 #endif

server/server_application.cpp

@@ -0,0 +1,300 @@
+/* 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 "server_application.hpp"
+
+#include "utility.hpp"
+
+#include <stdexcept>
+#include <iostream>
+#include <string>
+#include <fstream>
+
+using namespace std;
+
+//-------------------------
+//Define the ServerApplication
+//-------------------------
+
+ServerApplication::ServerApplication() {
+	//
+}
+
+ServerApplication::~ServerApplication() {
+	//
+}
+
+void ServerApplication::Init(int argc, char** argv) {
+	//TODO: proper command line option parsing
+
+	//load config
+	config.Load("rsc\\config.cfg");
+
+	//Init SDL
+	if (SDL_Init(0)) {
+		throw(runtime_error("Failed to initialize SDL"));
+	}
+	cout << "initialized SDL" << endl;
+
+	//Init SDL_net
+	if (SDLNet_Init()) {
+		throw(runtime_error("Failed to init SDL_net"));
+	}
+	network.Open(config.Int("server.port"), sizeof(NetworkPacket));
+	cout << "initialized SDL_net" << endl;
+
+	//Init SQL
+	string dbname = (config["server.dbname"].size()) ? config["server.dbname"] : std::string(argv[0]) + ".db"; //fancy and unnecessary
+	int ret = sqlite3_open_v2(dbname.c_str(), &database, SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE|SQLITE_OPEN_FULLMUTEX, nullptr);
+	if (ret != SQLITE_OK || !database) {
+		throw(runtime_error("Failed to open the server database"));
+	}
+	cout << "initialized SQL" << endl;
+	cout << "Database filename: " << dbname << endl;
+
+	//TODO: move this into a function?
+	//Run setup scripts
+	ifstream is("rsc\\scripts\\setup_server.sql");
+	if (!is.is_open()) {
+		throw(runtime_error("Failed to run database setup script"));
+	}
+	string script;
+	getline(is, script, '\0');
+	is.close();
+	sqlite3_exec(database, script.c_str(), nullptr, nullptr, nullptr);
+}
+
+void ServerApplication::Loop() {
+	NetworkPacket packet;
+
+	while(running) {
+		//suck in the waiting packets & process them
+		try {
+			while(network.Receive()) {
+				memcpy(&packet, network.GetInData(), sizeof(NetworkPacket));
+				packet.meta.srcAddress = network.GetInPacket()->address;
+				HandlePacket(packet);
+			}
+		}
+		catch(exception& e) {
+			cerr << "Network Error: " << e.what() << endl;
+		}
+
+		//give the computer a break
+		SDL_Delay(10);
+	}
+}
+
+void ServerApplication::Quit() {
+	//members
+	network.Close();
+
+	//APIs
+	sqlite3_close_v2(database);
+	SDLNet_Quit();
+	SDL_Quit();
+}
+
+void ServerApplication::HandlePacket(NetworkPacket packet) {
+	switch(packet.meta.type) {
+		case NetworkPacket::Type::BROADCAST_REQUEST:
+			HandleBroadcastRequest(packet);
+		break;
+
+		case NetworkPacket::Type::JOIN_REQUEST:
+			HandleJoinRequest(packet);
+		break;
+
+		case NetworkPacket::Type::DISCONNECT:
+			HandleDisconnect(packet);
+		break;
+
+		case NetworkPacket::Type::SYNCHRONIZE:
+			HandleSynchronize(packet);
+		break;
+
+		case NetworkPacket::Type::SHUTDOWN:
+			HandleShutdown(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(runtime_error("Unknown NetworkPacket::Type encountered"));
+		break;
+	}
+}
+
+void ServerApplication::HandleBroadcastRequest(NetworkPacket packet) {
+	//send back the server's name
+	packet.meta.type = NetworkPacket::Type::BROADCAST_RESPONSE;
+	snprintf(packet.serverInfo.name, PACKET_STRING_SIZE, "%s", config["server.name"].c_str());
+	network.Send(&packet.meta.srcAddress, &packet, sizeof(NetworkPacket));
+}
+
+void ServerApplication::HandleJoinRequest(NetworkPacket packet) {
+	//TODO: prevent duplicate logins from the same address?
+
+	//create the new client, filling it with the correct info
+	Client newClient;
+	newClient.address = packet.meta.srcAddress;
+
+	//push the new client
+	clientMap[clientCounter] = newClient;
+
+	//send the client their info
+	packet.meta.type = NetworkPacket::Type::JOIN_RESPONSE;
+	packet.clientInfo.index = clientCounter;
+	network.Send(&newClient.address, &packet, sizeof(NetworkPacket));
+
+	//finished this routine
+	clientCounter++;
+	cout << "connect, total: " << clientMap.size() << endl;
+}
+
+void ServerApplication::HandleDisconnect(NetworkPacket packet) {
+	//disconnect the specified client
+	network.Send(&clientMap[packet.clientInfo.index].address, &packet, sizeof(NetworkPacket));
+	clientMap.erase(packet.clientInfo.index);
+
+	//delete players
+	erase_if(playerMap, [&](pair<int, Player> it) -> bool {
+		if (it.second.clientIndex == packet.clientInfo.index) {
+			NetworkPacket delPacket;
+
+			//data to delete one specific player
+			delPacket.meta.type = NetworkPacket::Type::PLAYER_DELETE;
+			delPacket.playerInfo.playerIndex = it.first;
+
+			//send to all
+			PumpPacket(delPacket);
+
+			return true;
+		}
+		return false;
+	});
+
+	cout << "disconnect, total: " << clientMap.size() << endl;
+}
+
+void ServerApplication::HandleSynchronize(NetworkPacket packet) {
+	//send all the server's data to this client
+	NetworkPacket newPacket;
+
+	//players
+	newPacket.meta.type = NetworkPacket::Type::PLAYER_UPDATE;
+	for (auto& it : playerMap) {
+		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;
+		network.Send(&clientMap[packet.clientInfo.index].address, &newPacket, sizeof(NetworkPacket));
+	}
+}
+
+void ServerApplication::HandleShutdown(NetworkPacket packet) {
+	//end the server
+	running = false;
+
+	//disconnect all clients
+	packet.meta.type = NetworkPacket::Type::DISCONNECT;
+	PumpPacket(packet);
+
+	cout << "shutting down" << endl;
+}
+
+void ServerApplication::HandlePlayerNew(NetworkPacket packet) {
+	//create the new player object
+	Player newPlayer;
+	newPlayer.clientIndex = packet.playerInfo.clientIndex;
+	newPlayer.handle = packet.playerInfo.handle;
+	newPlayer.avatar = packet.playerInfo.avatar;
+	newPlayer.position = {0,0};
+	newPlayer.motion = {0,0};
+
+	//push this player
+	playerMap[playerCounter] = newPlayer;
+
+	//send the client their info
+	packet.playerInfo.playerIndex = playerCounter;
+	packet.playerInfo.position = playerMap[playerCounter].position;
+	packet.playerInfo.motion = playerMap[playerCounter].motion;
+
+	//actually send to everyone
+	PumpPacket(packet);
+
+	//finish this routine
+	playerCounter++;
+}
+
+void ServerApplication::HandlePlayerDelete(NetworkPacket packet) {
+	if (playerMap.find(packet.playerInfo.playerIndex) == playerMap.end()) {
+		throw(std::runtime_error("Cannot delete a non-existant player"));
+	}
+
+	//delete players
+	erase_if(playerMap, [&](pair<int, Player> it) -> bool {
+		if (it.first == packet.playerInfo.playerIndex) {
+			NetworkPacket delPacket;
+
+			//data to delete one specific player
+			delPacket.meta.type = NetworkPacket::Type::PLAYER_DELETE;
+			delPacket.playerInfo.playerIndex = it.first;
+
+			//send to all
+			PumpPacket(delPacket);
+
+			return true;
+		}
+		return false;
+	});
+}
+
+void ServerApplication::HandlePlayerUpdate(NetworkPacket packet) {
+	if (playerMap.find(packet.playerInfo.playerIndex) == playerMap.end()) {
+		throw(std::runtime_error("Cannot update a non-existant player"));
+	}
+
+	//server is the slave to the clients, but only for now
+	playerMap[packet.playerInfo.playerIndex].position = packet.playerInfo.position;
+	playerMap[packet.playerInfo.playerIndex].motion = packet.playerInfo.motion;
+
+	PumpPacket(packet);
+}
+
+void ServerApplication::PumpPacket(NetworkPacket packet) {
+	//send this packet to all clients
+	for (auto& it : clientMap) {
+		network.Send(&it.second.address, &packet, sizeof(NetworkPacket));
+	}
+}

server/server_application.hpp

@@ -0,0 +1,88 @@
+/* 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 SERVERAPPLICATION_HPP_
+#define SERVERAPPLICATION_HPP_
+
+//networking
+#include "network_packet.hpp"
+#include "udp_network_utility.hpp"
+
+//APIs
+#include "sqlite3/sqlite3.h"
+#include "SDL/SDL.h"
+
+//misc
+#include "config_utility.hpp"
+#include "vector2.hpp"
+
+#include "client.hpp"
+#include "player.hpp"
+
+//STL
+#include <map>
+#include <string>
+
+//The main application class
+class ServerApplication {
+public:
+	//standard functions
+	ServerApplication();
+	~ServerApplication();
+
+	void Init(int argc, char** argv);
+	void Loop();
+	void Quit();
+
+private:
+	void HandlePacket(NetworkPacket);
+
+	//high cohesion utility functions
+	void HandleBroadcastRequest(NetworkPacket);
+	void HandleJoinRequest(NetworkPacket);
+	void HandleDisconnect(NetworkPacket);
+	void HandleSynchronize(NetworkPacket);
+	void HandleShutdown(NetworkPacket);
+	void HandlePlayerNew(NetworkPacket);
+	void HandlePlayerDelete(NetworkPacket);
+	void HandlePlayerUpdate(NetworkPacket);
+
+	void PumpPacket(NetworkPacket);
+
+	//networking
+	UDPNetworkUtility network;
+
+	//database
+	sqlite3* database = nullptr;
+
+	//misc
+	bool running = true;
+	ConfigUtility config;
+
+	//global lists
+	ClientMap clientMap;
+	PlayerMap playerMap;
+
+	int clientCounter = 0;
+	int playerCounter = 0;
+};
+
+#endif

src/character.cpp

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

src/in_world.cpp

@@ -1,257 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "in_world.hpp"
-
-#include "timer.hpp"
-
-#include "utility.hpp"
-
-#include "region_pager_api.hpp"
-#include "tile_sheet_api.hpp"
-
-#include <iostream>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-InWorld::InWorld(lua_State* L): lua(L) {
-	//register the pager
-	lua_pushstring(lua, TORTUGA_REGION_PAGER_PSEUDO_INDEX);
-	lua_pushlightuserdata(lua, &pager);
-	lua_settable(L, LUA_REGISTRYINDEX);
-
-	//register the tilesheet
-	lua_pushstring(lua, TORTUGA_TILE_SHEET_PSEUDO_INDEX);
-	lua_pushlightuserdata(lua, &tileSheet);
-	lua_settable(L, LUA_REGISTRYINDEX);
-
-	//setup the component objecrs
-	pager.SetLuaState(lua);
-
-	//get the config info
-	lua_getglobal(lua, "config");
-	lua_getfield(lua, -1, "dir");
-	lua_getfield(lua, -1, "fonts");
-	std::string fonts = lua_tostring(lua, -1);
-	lua_getfield(lua, -2, "interface");
-	std::string interface = lua_tostring(lua, -1);
-	lua_getfield(lua, -3, "sprites");
-	std::string sprites = lua_tostring(lua, -1);
-	lua_getfield(lua, -4, "scripts");
-	std::string scripts = lua_tostring(lua, -1);
-	lua_pop(lua, 6);
-
-	//run the additional scripts
-	if (luaL_dofile(lua, (scripts + "in_world.lua").c_str())) {
-		throw(std::runtime_error(std::string() + "Failed to run in_world.lua: " + lua_tostring(lua, -1) ));
-	}
-
-	//setup the utility objects
-	buttonImage.LoadSurface(interface + "button_menu.bmp");
-	buttonImage.SetClipH(buttonImage.GetClipH()/3);
-	font.LoadSurface(fonts + "pk_white_8.bmp");
-
-	//pass the utility objects
-	backButton.SetImage(&buttonImage);
-	backButton.SetFont(&font);
-
-	//set the button positions
-	backButton.SetX(50);
-	backButton.SetY(50 + buttonImage.GetClipH() * 0);
-
-	//set the button texts
-	backButton.SetText("Back");
-
-	//entities
-	character.GetSprite()->LoadSurface(sprites + "elliot2.bmp", 4, 4);
-	character.SetBoundingBox({0, 0,
-		character.GetSprite()->GetImage()->GetClipW(),
-		character.GetSprite()->GetImage()->GetClipH()
-	});
-
-	//setup the camera
-	camera.margin.x = GetScreen()->w / 2 - character.GetSprite()->GetImage()->GetClipW() / 2;
-	camera.margin.y = GetScreen()->h / 2 - character.GetSprite()->GetImage()->GetClipH() / 2;
-
-	//debug
-	//
-}
-
-InWorld::~InWorld() {
-	//unregister the map components
-	lua_pushstring(lua, TORTUGA_REGION_PAGER_PSEUDO_INDEX);
-	lua_pushstring(lua, TORTUGA_TILE_SHEET_PSEUDO_INDEX);
-	lua_pushnil(lua);
-	lua_settable(lua, LUA_REGISTRYINDEX);
-	lua_pushnil(lua);
-	lua_settable(lua, LUA_REGISTRYINDEX);
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void InWorld::FrameStart() {
-	//
-}
-
-void InWorld::Update(double delta) {
-	//update the entities
-	character.Update(delta);
-
-	//check for collisions with the map
-	BoundingBox wallBounds = {0, 0, tileSheet.GetTileW(), tileSheet.GetTileH()};
-	const int xCount = character.GetBoundingBox().w / wallBounds.w + 1;
-	const int yCount = character.GetBoundingBox().h / wallBounds.h + 1;
-
-	for (int i = -1; i <= xCount; ++i) {
-		for (int j = -1; j <= yCount; ++j) {
-			//set the wall's position
-			wallBounds.x = wallBounds.w * i + snapToBase((double)wallBounds.w, character.GetOrigin().x);
-			wallBounds.y = wallBounds.h * j + snapToBase((double)wallBounds.h, character.GetOrigin().y);
-
-			if (!pager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
-				continue;
-			}
-
-			if ((character.GetOrigin() + character.GetBoundingBox()).CheckOverlap(wallBounds)) {
-				character.SetOrigin(character.GetOrigin() - (character.GetMotion() * delta));
-				character.SetMotion({0,0});
-				character.CorrectSprite();
-			}
-		}
-	}
-
-	//update the camera
-	camera.origin.x = character.GetOrigin().x - camera.margin.x;
-	camera.origin.y = character.GetOrigin().y - camera.margin.y;
-
-	//TODO: prune distant regions
-
-	//summon nearby unloaded regions
-	const int left = snapToBase(REGION_WIDTH, camera.origin.x / tileSheet.GetTileW());
-	const int top = snapToBase(REGION_HEIGHT, camera.origin.y / tileSheet.GetTileH());
-	const int right = snapToBase(REGION_WIDTH, (camera.origin.x + GetScreen()->w) / tileSheet.GetTileW());
-	const int bottom = snapToBase(REGION_HEIGHT, (camera.origin.y + GetScreen()->h) / tileSheet.GetTileH());
-
-	for (int i = left - REGION_WIDTH; i <= right + REGION_WIDTH; i += REGION_WIDTH) {
-		for (int j = top - REGION_HEIGHT; j <= bottom + REGION_HEIGHT; j += REGION_HEIGHT) {
-			pager.GetRegion(i, j);
-		}
-	}
-}
-
-void InWorld::FrameEnd() {
-	//
-}
-
-void InWorld::RenderFrame() {
-//	SDL_FillRect(GetScreen(), 0, 0);
-	Render(GetScreen());
-	SDL_Flip(GetScreen());
-	fps.Calculate();
-}
-
-void InWorld::Render(SDL_Surface* const screen) {
-	//draw all regions
-	for (std::list<Region>::iterator it = pager.GetContainer()->begin(); it != pager.GetContainer()->end(); it++) {
-		tileSheet.DrawRegionTo(screen, &(*it), camera.origin.x, camera.origin.y);
-	}
-
-	//draw the characters
-	character.DrawTo(screen, camera.origin.x, camera.origin.y);
-
-	//draw the UI
-	backButton.DrawTo(screen);
-	font.DrawStringTo(to_string_custom(fps.GetFrameRate()), screen, 0, 0);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void InWorld::QuitEvent() {
-	//exit the game
-	SetNextScene(SceneList::QUIT);
-}
-
-void InWorld::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	backButton.MouseMotion(motion);
-}
-
-void InWorld::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	backButton.MouseButtonDown(button);
-}
-
-void InWorld::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::MAINMENU);
-	}
-}
-
-void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
-	//player movement
-	Vector2 motion = character.GetMotion();
-	switch(key.keysym.sym) {
-		case SDLK_LEFT:
-			motion.x -= CHARACTER_WALKING_SPEED;
-		break;
-		case SDLK_RIGHT:
-			motion.x += CHARACTER_WALKING_SPEED;
-		break;
-		case SDLK_UP:
-			motion.y -= CHARACTER_WALKING_SPEED;
-		break;
-		case SDLK_DOWN:
-			motion.y += CHARACTER_WALKING_SPEED;
-		break;
-	}
-	if (character.GetMotion() != motion) {
-		character.SetMotion(motion);
-		character.CorrectSprite();
-	}
-}
-
-void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
-	//player movement
-	Vector2 motion = character.GetMotion();
-	switch(key.keysym.sym) {
-		//NOTE: The use of min/max here are to prevent awkward movements
-		case SDLK_LEFT:
-			motion.x = std::min(motion.x + CHARACTER_WALKING_SPEED, 0.0);
-		break;
-		case SDLK_RIGHT:
-			motion.x = std::max(motion.x - CHARACTER_WALKING_SPEED, 0.0);
-		break;
-		case SDLK_UP:
-			motion.y = std::min(motion.y + CHARACTER_WALKING_SPEED, 0.0);
-		break;
-		case SDLK_DOWN:
-			motion.y = std::max(motion.y - CHARACTER_WALKING_SPEED, 0.0);
-		break;
-	}
-	if (character.GetMotion() != motion) {
-		character.SetMotion(motion);
-		character.CorrectSprite();
-	}
-}

src/linit.cpp

@@ -1,85 +0,0 @@
-/* $Id: linit.c,v 1.32, modified
- * Initialization of libraries for lua.c and other clients
- * See Copyright Notice in lua.h
- * 
- * If you embed Lua in your program and need to open the standard
- * libraries, call luaL_openlibs in your program. If you need a
- * different set of libraries, copy this file to your project and edit
- * it to suit your needs.
- * 
- * Modified for use in Tortuga, renamed to linit.cpp
- * Modifications are released under the zlib license:
- * 
- * Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#define linit_c
-#define LUA_LIB
-
-#include "lua/lua.hpp"
-
-#include "region_api.hpp"
-#include "region_pager_api.hpp"
-#include "tile_sheet_api.hpp"
-
-//these libs are loaded by lua.c and are readily available to any Lua program
-static const luaL_Reg loadedlibs[] = {
-	//Standard libs
-	{"_G", luaopen_base},
-	{LUA_LOADLIBNAME, luaopen_package},
-	{LUA_COLIBNAME, luaopen_coroutine},
-	{LUA_TABLIBNAME, luaopen_table},
-	{LUA_IOLIBNAME, luaopen_io},
-	{LUA_OSLIBNAME, luaopen_os},
-	{LUA_STRLIBNAME, luaopen_string},
-	{LUA_BITLIBNAME, luaopen_bit32},
-	{LUA_MATHLIBNAME, luaopen_math},
-	{LUA_DBLIBNAME, luaopen_debug},
-
-	//Tortuga's API
-	{TORTUGA_REGION_NAME, openRegionAPI},
-	{TORTUGA_REGION_PAGER_NAME, openRegionPagerAPI},
-	{TORTUGA_TILE_SHEET_NAME, openTileSheetAPI},
-
-	{NULL, NULL}
-};
-
-
-//these libs are preloaded and must be required before used
-static const luaL_Reg preloadedlibs[] = {
-	{NULL, NULL}
-};
-
-LUALIB_API void luaL_openlibs (lua_State *L) {
-	const luaL_Reg *lib;
-	//call open functions from 'loadedlibs' and set results to global table
-	for (lib = loadedlibs; lib->func; lib++) {
-		luaL_requiref(L, lib->name, lib->func, 1);
-		lua_pop(L, 1); //remove lib
-	}
-	//add open functions from 'preloadedlibs' into 'package.preload' table
-	luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD");
-	for (lib = preloadedlibs; lib->func; lib++) {
-		lua_pushcfunction(L, lib->func);
-		lua_setfield(L, -2, lib->name);
-	}
-	lua_pop(L, 1); //remove _PRELOAD table
-}

src/map/region.hpp

@@ -1,67 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef REGION_HPP_
-#define REGION_HPP_
-
-#include <bitset>
-#include <cmath>
-
-//the region's storage format
-constexpr int REGION_WIDTH = 20;
-constexpr int REGION_HEIGHT = 20;
-constexpr int REGION_DEPTH = 3;
-
-//the size of the solid map
-constexpr int REGION_SOLID_FOOTPRINT = ceil(REGION_WIDTH * REGION_HEIGHT / 8.0);
-
-class Region {
-public:
-	typedef unsigned char type_t;
-
-	Region() = delete;
-	Region(int x, int y);
-	Region(Region const&);
-	~Region() = default;
-
-	type_t SetTile(int x, int y, int z, type_t v);
-	type_t GetTile(int x, int y, int z);
-
-	bool SetSolid(int x, int y, bool b);
-	bool GetSolid(int x, int y);
-
-	//accessors
-	int GetX() const { return x; }
-	int GetY() const { return y; }
-
-	std::bitset<REGION_WIDTH*REGION_HEIGHT>* GetSolidBitset() { return &solid; }
-private:
-	const int x;
-	const int y;
-
-	type_t tiles[REGION_WIDTH][REGION_HEIGHT][REGION_DEPTH];
-	std::bitset<REGION_WIDTH*REGION_HEIGHT> solid;
-};
-
-//the memory footprint of the tile and solid data; not including any metadata
-constexpr int REGION_FOOTPRINT = REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH * sizeof(Region::type_t) + REGION_SOLID_FOOTPRINT;
-
-#endif

src/map/region_api.cpp

@@ -1,122 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "region_api.hpp"
-
-#include "region.hpp"
-
-static int setTile(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	int ret = region->SetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1, lua_tointeger(L, 5));
-	lua_pushinteger(L, ret);
-	return 1;
-}
-
-static int getTile(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	int ret = region->GetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1);
-	lua_pushinteger(L, ret);
-	return 1;
-}
-
-static int setSolid(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	bool ret = region->SetSolid(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_toboolean(L, 4));
-	lua_pushboolean(L, ret);
-	return 1;
-}
-
-static int getSolid(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	bool ret = region->GetSolid(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1);
-	lua_pushboolean(L, ret);
-	return 1;
-}
-
-static int getX(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	lua_pushinteger(L, region->GetX());
-	return 1;
-}
-
-static int getY(lua_State* L) {
-	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
-	lua_pushinteger(L, region->GetY());
-	return 1;
-}
-
-static int getWidth(lua_State* L) {
-	lua_pushinteger(L, REGION_WIDTH);
-	return 1;
-}
-
-static int getHeight(lua_State* L) {
-	lua_pushinteger(L, REGION_HEIGHT);
-	return 1;
-}
-
-static int getDepth(lua_State* L) {
-	lua_pushinteger(L, REGION_DEPTH);
-	return 1;
-}
-
-static int load(lua_State* L) {
-	//EMPTY
-	lua_pushboolean(L, false);
-	return 1;
-}
-
-static int save(lua_State* L) {
-	//EMPTY
-	return 0;
-}
-
-static int create(lua_State* L) {
-	//EMPTY
-	return 0;
-}
-
-static int unload(lua_State* L) {
-	//EMPTY
-	return 0;
-}
-
-static const luaL_Reg regionLib[] = {
-	{"SetTile",setTile},
-	{"GetTile",getTile},
-	{"SetSolid",setSolid},
-	{"GetSolid",getSolid},
-	{"GetX",getX},
-	{"GetY",getY},
-	{"GetWidth",getWidth},
-	{"GetHeight",getHeight},
-	{"GetDepth",getDepth},
-	{"Load",load},
-	{"Save",save},
-	{"Create",create},
-	{"Unload",unload},
-	{nullptr, nullptr}
-};
-
-LUAMOD_API int openRegionAPI(lua_State* L) {
-	luaL_newlib(L, regionLib);
-	return 1;
-}

src/map/region_pager_api.cpp

@@ -1,115 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "region_pager_api.hpp"
-
-#include "region_pager_lua.hpp"
-#include "region.hpp"
-
-#include <string>
-
-static int getRegionPager(lua_State* L) {
-	lua_pushstring(L, TORTUGA_REGION_PAGER_PSEUDO_INDEX);
-	lua_gettable(L, LUA_REGISTRYINDEX);
-}
-
-//DOCS: These glue functions simply wrap RegionPagerLua's methods
-
-static int setTile(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	int ret = pager->SetTile(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4), lua_tointeger(L, 5));
-	lua_pushinteger(L, ret);
-	return 1;
-}
-
-static int getTile(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	int ret = pager->GetTile(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4));
-	lua_pushinteger(L, ret);
-	return 1;
-}
-
-static int setSolid(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	bool ret = pager->SetSolid(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_toboolean(L, 4));
-	lua_pushboolean(L, ret);
-	return 1;
-}
-
-static int getSolid(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	bool ret = pager->GetSolid(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	lua_pushboolean(L, ret);
-	return 1;
-}
-
-static int getRegion(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	lua_pushlightuserdata(L, region);
-	return 1;
-}
-
-static int loadRegion(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->LoadRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	lua_pushlightuserdata(L, region);
-	return 1;
-}
-
-static int saveRegion(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->SaveRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	lua_pushlightuserdata(L, region);
-	return 1;
-}
-
-static int createRegion(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->CreateRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	lua_pushlightuserdata(L, region);
-	return 1;
-}
-
-static int unloadRegion(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	pager->UnloadRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	return 0;
-}
-
-static const luaL_Reg regionPagerLib[] = {
-	{"GetRegionPager", getRegionPager},
-	{"SetTile", setTile},
-	{"GetTile", getTile},
-	{"SetSolid", setSolid},
-	{"GetSolid", getSolid},
-	{"GetRegion", getRegion},
-	{"LoadRegion", loadRegion},
-	{"SaveRegion", saveRegion},
-	{"CreateRegion", createRegion},
-	{"UnloadRegion", unloadRegion},
-	{nullptr, nullptr}
-};
-
-LUAMOD_API int openRegionPagerAPI(lua_State* L) {
-	luaL_newlib(L, regionPagerLib);
-	return 1;
-}

src/map/region_pager_base.cpp

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

src/map/region_pager_base.hpp

@@ -1,60 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef REGIONPAGERBASE_HPP_
-#define REGIONPAGERBASE_HPP_
-
-#include "region.hpp"
-
-#include <list>
-
-class RegionPagerBase {
-public:
-	RegionPagerBase() = default;
-	virtual ~RegionPagerBase() { UnloadAll(); };
-
-	//tile manipulation
-	virtual Region::type_t SetTile(int x, int y, int z, Region::type_t v);
-	virtual Region::type_t GetTile(int x, int y, int z);
-
-	//solid manipulation
-	virtual bool SetSolid(int x, int y, int b);
-	virtual bool GetSolid(int x, int y);
-
-	//region manipulation
-	virtual Region* GetRegion(int x, int y);
-	virtual Region* FindRegion(int x, int y);
-	virtual Region* PushRegion(Region* const);
-
-	virtual Region* LoadRegion(int x, int y);
-	virtual Region* SaveRegion(int x, int y);
-	virtual Region* CreateRegion(int x, int y);
-	virtual void UnloadRegion(int x, int y);
-
-	virtual void UnloadAll();
-
-	//accessors & mutators
-	std::list<Region>* GetContainer() { return &regionList; }
-protected:
-	std::list<Region> regionList;
-};
-
-#endif

src/map/region_pager_lua.cpp

@@ -1,123 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "region_pager_lua.hpp"
-
-#include "utility.hpp"
-
-#include <stdexcept>
-
-Region* RegionPagerLua::LoadRegion(int x, int y) {
-	//load the region if possible
-
-	//something to work on
-	Region tmpRegion(x, y);
-
-	//API hook
-	lua_getglobal(lua, "Region");
-	lua_getfield(lua, -1, "Load");
-	lua_pushlightuserdata(lua, &tmpRegion);
-	if (lua_pcall(lua, 1, 1, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
-	}
-	//success or failure
-	if (!lua_toboolean(lua, -1)) {
-		lua_pop(lua, 2);
-		return nullptr;
-	}
-	lua_pop(lua, 2);
-	regionList.push_front(tmpRegion);
-	return &regionList.front();
-}
-
-Region* RegionPagerLua::SaveRegion(int x, int y) {
-	//find & save the region
-	Region* ptr = FindRegion(x, y);
-	if (ptr) {
-		//API hook
-		lua_getglobal(lua, "Region");
-		lua_getfield(lua, -1, "Save");
-		lua_pushlightuserdata(lua, ptr);
-		if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
-			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
-		}
-		lua_pop(lua, 1);
-	}
-	return ptr;
-}
-
-Region* RegionPagerLua::CreateRegion(int x, int y) {
-	if (FindRegion(x, y)) {
-		throw(std::logic_error("Cannot overwrite an existing region"));
-	}
-
-	//something to work on
-	Region tmpRegion(x, y);
-
-	//API hook
-	lua_getglobal(lua, "Region");
-	lua_getfield(lua, -1, "Create");
-	lua_pushlightuserdata(lua, &tmpRegion);
-	//TODO: parameters
-	if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
-	}
-	lua_pop(lua, 1);
-	regionList.push_front(tmpRegion);
-	return &regionList.front();
-}
-
-void RegionPagerLua::UnloadRegion(int x, int y) {
-	lua_getglobal(lua, "Region");
-
-	regionList.remove_if([&](Region& region) -> bool {
-		if (region.GetX() == x && region.GetY() == y) {
-
-			//API hook
-			lua_getfield(lua, -1, "Unload");
-			lua_pushlightuserdata(lua, &region);
-			if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
-				throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
-			}
-
-			return true;
-		}
-		return false;
-	});
-
-	lua_pop(lua, 1);
-}
-
-void RegionPagerLua::UnloadAll() {
-	lua_getglobal(lua, "Region");
-
-	for (auto& it : regionList) {
-		//API hook
-		lua_getfield(lua, -1, "Unload");
-		lua_pushlightuserdata(lua, &it);
-		if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
-			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
-		}
-	}
-
-	lua_pop(lua, 1);
-	regionList.clear();
-}

src/map/tile_sheet.cpp

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

src/map/tile_sheet_api.cpp

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

src/utilities/bounding_box.hpp

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

src/utilities/simple_rng.hpp

@@ -1,42 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef SIMPLERNG_HPP_
-#define SIMPLERNG_HPP_
-
-//a simple, stateless, random number generator
-class SimpleRNG {
-public:
-	SimpleRNG() { SetSeed(8891.0); }
-	SimpleRNG(double x) { SetSeed(x); }
-
-	double SetSeed(double s) { return seed = s; }
-	double GetSeed() { return seed; }
-
-	double operator()(double x) {
-		return (x + seed) * 11235.0 + 81321.0;
-	};
-
-private:
-	double seed;
-};
-
-#endif