Merge branch 'develop' into master (read more)

Following a rather educational "game jam" using components of Tortuga, I've
made a significant number of revisions.

A brief summary:

* The entirety of the map system now have lua APIs
* The ConfigUtility handles recusive config files
* Collisions are functional
* I've added a singleton template base class, which is used by the apps
* I've decided that focusing on the engine's stability is important
* I need to push through the generated TODO list

README.md

@@ -8,6 +8,7 @@ This game is inspired by classic 2D RPGs, as well as more modern sandbox MMOs. T
 
 Tortuga's full documentation can be found in a separate branch, see [Tortuga/docs](https://github.com/Ratstail91/Tortuga/tree/docs).  
 For Tortuga's primary documentation, please read the [Tortuga Game Design Document](https://github.com/Ratstail91/Tortuga/blob/docs/Tortuga%20Game%20Design%20Document.docx?raw=true).  
+For a list of known bugs, see the [GitHub bug tracker](https://github.com/Ratstail91/Tortuga/issues).
 
 ## External Dependencies
 

client/character.cpp

@@ -19,27 +19,23 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "character_data.hpp"
+#include "character.hpp"
 
-void CharacterData::Update(double delta) {
+void Character::Update(double delta) {
 	if (motion.x && motion.y) {
 		origin += motion * delta * CHARACTER_WALKING_MOD;
 	}
 	else if (motion != 0) {
 		origin += motion * delta;
 	}
-#ifdef GRAPHICS
 	sprite.Update(delta);
-#endif
 }
 
-#ifdef GRAPHICS
-
-void CharacterData::DrawTo(SDL_Surface* const dest, int camX, int camY) {
+void Character::DrawTo(SDL_Surface* const dest, int camX, int camY) {
 	sprite.DrawTo(dest, origin.x - camX, origin.y - camY);
 }
 
-void CharacterData::CorrectSprite() {
+void Character::CorrectSprite() {
 	//NOTE: These must correspond to the sprite sheet in use
 	if (motion.y > 0) {
 		sprite.SetYIndex(0);
@@ -63,5 +59,3 @@ void CharacterData::CorrectSprite() {
 		sprite.SetXIndex(0);
 	}
 }
-
-#endif

client/character.hpp

@@ -0,0 +1,95 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef CHARACTER_HPP_
+#define CHARACTER_HPP_
+
+//components
+#include "character_defines.hpp"
+#include "vector2.hpp"
+#include "bounding_box.hpp"
+#include "statistics.hpp"
+
+//graphics
+#include "sprite_sheet.hpp"
+
+//std namespace
+#include <string>
+#include <cmath>
+
+class Character {
+public:
+	Character() = default;
+	~Character() = default;
+
+	void Update(double delta);
+
+	//graphics
+	void DrawTo(SDL_Surface* const, int camX, int camY);
+	void CorrectSprite();
+	SpriteSheet* GetSprite() { return &sprite; }
+
+	//gameplay
+	Statistics* GetStats() { return &stats; }
+
+	//accessors and mutators
+
+	//metadata
+	int SetOwner(int i) { return owner = i; }
+	int GetOwner() { return owner; }
+	std::string SetHandle(std::string s) { return handle = s; }
+	std::string GetHandle() const { return handle; }
+	std::string SetAvatar(std::string s) { return avatar = s; }
+	std::string GetAvatar() const { return avatar; }
+
+	//position
+	Vector2 SetOrigin(Vector2 v) { return origin = v; }
+	Vector2 GetOrigin() const { return origin; }
+	Vector2 SetMotion(Vector2 v) { return motion = v; }
+	Vector2 GetMotion() const { return motion; }
+	BoundingBox SetBounds(BoundingBox b) { return bounds = b; }
+	BoundingBox GetBounds() { return bounds; }
+
+private:
+	//graphics
+	SpriteSheet sprite;
+
+	//base statistics
+	Statistics stats;
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs
+
+	//metadata
+	int owner;
+	std::string handle;
+	std::string avatar;
+
+	//position
+	Vector2 origin = {0.0,0.0};
+	Vector2 motion = {0.0,0.0};
+	BoundingBox bounds;
+};
+
+//tmp
+#include <map>
+typedef std::map<int, Character> CharacterMap;
+
+#endif

client/client_application.cpp

@@ -22,9 +22,11 @@
 #include "client_application.hpp"
 
 #include "serial.hpp"
+#include "config_utility.hpp"
 
 #include <stdexcept>
 #include <chrono>
+#include <iostream>
 
 //-------------------------
 //Scene headers
@@ -37,31 +39,79 @@
 #include "lobby_menu.hpp"
 #include "in_world.hpp"
 #include "in_combat.hpp"
-#include "restart.hpp"
+#include "clean_up.hpp"
 
 //-------------------------
 //Public access members
 //-------------------------
 
 void ClientApplication::Init(int argc, char** argv) {
+	std::cout << "Beginning " << argv[0] << std::endl;
+
 	//load the prerequisites
+	ConfigUtility& config = ConfigUtility::GetSingleton();
 	config.Load("rsc\\config.cfg");
 
+	//-------------------------
+	//Initialize the APIs
+	//-------------------------
+
 	//initialize SDL
 	if (SDL_Init(SDL_INIT_VIDEO)) {
 		throw(std::runtime_error("Failed to initialize SDL"));
 	}
-	int w = config.Int("client.screen.w");
-	int h = config.Int("client.screen.h");
-	int f = config.Bool("client.screen.f") ? SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_FULLSCREEN : SDL_HWSURFACE|SDL_DOUBLEBUF;
-
-	BaseScene::SetScreen(w ? w : 800, h ? h : 600, 0, f);
+	std::cout << "Initialized SDL" << std::endl;
 
 	//initialize SDL_net
 	if (SDLNet_Init()) {
 		throw(std::runtime_error("Failed to initialize SDL_net"));
 	}
 	network.Open(0);
+	std::cout << "Initialized SDL_net" << std::endl;
+
+	//-------------------------
+	//Setup the screen
+	//-------------------------
+
+	int w = config.Int("client.screen.w");
+	int h = config.Int("client.screen.h");
+	int f = config.Bool("client.screen.f") ? SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_FULLSCREEN : SDL_HWSURFACE|SDL_DOUBLEBUF;
+
+	BaseScene::SetScreen(w ? w : 800, h ? h : 600, 0, f);
+	std::cout << "Initialized the screen" << std::endl;
+
+	//-------------------------
+	//debug output
+	//-------------------------
+
+	//TODO: enable/disable these with a switch
+#define DEBUG_OUTPUT_VAR(x) std::cout << "\t" << #x << ": " << x << std::endl;
+
+	std::cout << "Internal sizes:" << std::endl;
+
+	DEBUG_OUTPUT_VAR(sizeof(Region::type_t));
+	DEBUG_OUTPUT_VAR(sizeof(Region));
+	DEBUG_OUTPUT_VAR(REGION_WIDTH);
+	DEBUG_OUTPUT_VAR(REGION_HEIGHT);
+	DEBUG_OUTPUT_VAR(REGION_DEPTH);
+	DEBUG_OUTPUT_VAR(REGION_SOLID_FOOTPRINT);
+	DEBUG_OUTPUT_VAR(REGION_FOOTPRINT);
+	DEBUG_OUTPUT_VAR(PACKET_BUFFER_SIZE);
+	DEBUG_OUTPUT_VAR(MAX_PACKET_SIZE);
+
+#undef DEBUG_OUTPUT_VAR
+
+	//-------------------------
+	//finalize the startup
+	//-------------------------
+
+	std::cout << "Startup completed successfully" << std::endl;
+
+	//-------------------------
+	//debugging
+	//-------------------------
+
+	//...
 }
 
 void ClientApplication::Proc() {
@@ -100,9 +150,11 @@ void ClientApplication::Proc() {
 }
 
 void ClientApplication::Quit() {
+	std::cout << "Shutting down" << std::endl;
 	network.Close();
 	SDLNet_Quit();
 	SDL_Quit();
+	std::cout << "Clean exit" << std::endl;
 }
 
 //-------------------------
@@ -115,25 +167,25 @@ void ClientApplication::LoadScene(SceneList sceneIndex) {
 		//add scene creation calls here
 		case SceneList::FIRST:
 		case SceneList::SPLASHSCREEN:
-			activeScene = new SplashScreen(&config);
+			activeScene = new SplashScreen();
 		break;
 		case SceneList::MAINMENU:
-			activeScene = new MainMenu(&config);
+			activeScene = new MainMenu();
 		break;
 		case SceneList::OPTIONSMENU:
-			activeScene = new OptionsMenu(&config);
+			activeScene = new OptionsMenu();
 		break;
 		case SceneList::LOBBYMENU:
-			activeScene = new LobbyMenu(&config, &network, &clientIndex, &accountIndex);
+			activeScene = new LobbyMenu(&network, &clientIndex, &accountIndex);
 		break;
 		case SceneList::INWORLD:
-			activeScene = new InWorld(&config, &network, &clientIndex, &accountIndex, &characterIndex, &combatMap, &characterMap);
+			activeScene = new InWorld(&network, &clientIndex, &accountIndex, &characterIndex, &characterMap);
 		break;
 		case SceneList::INCOMBAT:
-			activeScene = new InCombat(&config, &network, &clientIndex, &accountIndex, &characterIndex, &combatMap, &characterMap, &enemyMap);
+			activeScene = new InCombat(&network, &clientIndex, &accountIndex, &characterIndex, &characterMap);
 		break;
-		case SceneList::RESTART:
-			activeScene = new Restart(&config, &network, &clientIndex, &accountIndex, &characterIndex, &combatMap, &characterMap, &enemyMap);
+		case SceneList::CLEANUP:
+			activeScene = new CleanUp(&network, &clientIndex, &accountIndex, &characterIndex, &characterMap);
 		break;
 		default:
 			throw(std::logic_error("Failed to recognize the scene index"));

client/client_application.hpp

@@ -25,24 +25,26 @@
 #include "scene_list.hpp"
 #include "base_scene.hpp"
 
-#include "config_utility.hpp"
 #include "udp_network_utility.hpp"
-#include "character_data.hpp"
-#include "combat_data.hpp"
-#include "enemy_data.hpp"
+#include "character.hpp"
+
+#include "singleton.hpp"
 
 #include <map>
 
-class ClientApplication {
+class ClientApplication: public Singleton<ClientApplication> {
 public:
-	ClientApplication() = default;
-	~ClientApplication() = default;
-
+	//public methods
 	void Init(int argc, char** argv);
 	void Proc();
 	void Quit();
 
 private:
+	friend Singleton<ClientApplication>;
+
+	ClientApplication() = default;
+	~ClientApplication() = default;
+
 	//Private access members
 	void LoadScene(SceneList sceneIndex);
 	void UnloadScene();
@@ -50,15 +52,12 @@ private:
 	BaseScene* activeScene = nullptr;
 
 	//shared parameters
-	ConfigUtility config;
 	UDPNetworkUtility network;
 	int clientIndex = -1;
 	int accountIndex = -1;
 	int characterIndex = -1;
 
-	std::map<int, CombatData> combatMap;
-	std::map<int, CharacterData> characterMap;
-	std::map<int, EnemyData> enemyMap;
+	CharacterMap characterMap;
 };
 
 #endif

client/main.cpp

@@ -21,23 +21,33 @@
 */
 #include "client_application.hpp"
 
+//singletons
+#include "config_utility.hpp"
+
 #include <stdexcept>
 #include <iostream>
 
 using namespace std;
 
 int main(int argc, char** argv) {
-	cout << "Beginning client" << endl;
 	try {
-		ClientApplication app;
+		//create the singletons
+		ClientApplication::Create();
+		ConfigUtility::Create();
+
+		//call the server's routines
+		ClientApplication& app = ClientApplication::GetSingleton();
 		app.Init(argc, argv);
 		app.Proc();
 		app.Quit();
+
+		//delete the singletons
+		ConfigUtility::Delete();
+		ClientApplication::Delete();
 	}
 	catch(exception& e) {
 		cerr << "Fatal exception thrown: " << e.what() << endl;
 		return 1;
 	}
-	cout << "Clean exit" << endl;
 	return 0;
-}
+}

client/makefile

@@ -1,7 +1,7 @@
 #config
-INCLUDES+=. ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet ../common/network/serial ../common/ui ../common/utilities
-LIBS+=../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) -DGRAPHICS
+INCLUDES+=. scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet ../common/network/serial ../common/ui ../common/utilities
+LIBS+=client.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
 CXXSRC=$(wildcard *.cpp)
@@ -16,6 +16,7 @@ OUT=$(addprefix $(OUTDIR)/,client)
 
 #targets
 all: $(OBJ) $(OUT)
+	$(MAKE) -C scenes
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)

client/scene_list.hpp

@@ -35,7 +35,7 @@ enum class SceneList {
 	LOBBYMENU,
 	INWORLD,
 	INCOMBAT,
-	RESTART,
+	CLEANUP,
 };
 
 #endif

client/scenes/clean_up.cpp

@@ -19,9 +19,10 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "restart.hpp"
+#include "clean_up.hpp"
 
 #include "channels.hpp"
+#include "config_utility.hpp"
 
 #include <stdexcept>
 
@@ -29,25 +30,21 @@
 //Public access members
 //-------------------------
 
-Restart::Restart(
-	ConfigUtility* const argConfig,
+CleanUp::CleanUp(
 	UDPNetworkUtility* const argNetwork,
 	int* const argClientIndex,
 	int* const argAccountIndex,
 	int* const argCharacterIndex,
-	std::map<int, CombatData>* argCombatMap,
-	std::map<int, CharacterData>* argCharacterMap,
-	std::map<int, EnemyData>* argEnemyMap
+	CharacterMap* argCharacterMap
 	):
-	config(*argConfig),
 	network(*argNetwork),
 	clientIndex(*argClientIndex),
 	accountIndex(*argAccountIndex),
 	characterIndex(*argCharacterIndex),
-	combatMap(*argCombatMap),
-	characterMap(*argCharacterMap),
-	enemyMap(*argEnemyMap)
+	characterMap(*argCharacterMap)
 {
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+
 	//setup the utility objects
 	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
@@ -69,15 +66,15 @@ Restart::Restart(
 	clientIndex = -1;
 	accountIndex = -1;
 	characterIndex = -1;
-	combatMap.clear();
+//	combatMap.clear();
 	characterMap.clear();
-	enemyMap.clear();
+//	enemyMap.clear();
 
 	//auto return
 	startTick = std::chrono::steady_clock::now();
 }
 
-Restart::~Restart() {
+CleanUp::~CleanUp() {
 	//
 }
 
@@ -85,24 +82,23 @@ Restart::~Restart() {
 //Frame loop
 //-------------------------
 
-void Restart::Update(double delta) {
+void CleanUp::Update(double delta) {
 	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(10)) {
 		QuitEvent();
 	}
 
-	while(network.Receive()) {
-		//EAT INCOMING PACKETS
-	}
+	//BUGFIX: Eat incoming packets
+	while(network.Receive());
 }
 
-void Restart::RenderFrame() {
+void CleanUp::RenderFrame() {
 	SDL_FillRect(GetScreen(), 0, 0);
 	Render(GetScreen());
 	SDL_Flip(GetScreen());
 	fps.Calculate();
 }
 
-void Restart::Render(SDL_Surface* const screen) {
+void CleanUp::Render(SDL_Surface* const screen) {
 	backButton.DrawTo(screen);
 	font.DrawStringTo("You have been disconnected.", screen, 50, 30);
 }
@@ -111,32 +107,28 @@ void Restart::Render(SDL_Surface* const screen) {
 //Event handlers
 //-------------------------
 
-void Restart::QuitEvent() {
-	SetNextScene(SceneList::MAINMENU);
+void CleanUp::QuitEvent() {
+	SetNextScene(SceneList::QUIT);
 }
 
-void Restart::MouseMotion(SDL_MouseMotionEvent const& motion) {
+void CleanUp::MouseMotion(SDL_MouseMotionEvent const& motion) {
 	backButton.MouseMotion(motion);
 }
 
-void Restart::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+void CleanUp::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 	backButton.MouseButtonDown(button);
 }
 
-void Restart::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+void CleanUp::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
-		QuitEvent();
+		SetNextScene(SceneList::MAINMENU);
 	}
 }
 
-void Restart::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			QuitEvent();
-			break;
-	}
-}
-
-void Restart::KeyUp(SDL_KeyboardEvent const& key) {
+void CleanUp::KeyDown(SDL_KeyboardEvent const& key) {
+	//
+}
+
+void CleanUp::KeyUp(SDL_KeyboardEvent const& key) {
 	//
 }

client/scenes/clean_up.hpp

@@ -19,8 +19,8 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef RESTART_HPP_
-#define RESTART_HPP_
+#ifndef CLEANUP_HPP_
+#define CLEANUP_HPP_
 
 //network
 #include "udp_network_utility.hpp"
@@ -31,12 +31,9 @@
 #include "button.hpp"
 
 //common
-#include "config_utility.hpp"
 #include "frame_rate.hpp"
 
-#include "combat_data.hpp"
-#include "character_data.hpp"
-#include "enemy_data.hpp"
+#include "character.hpp"
 
 //client
 #include "base_scene.hpp"
@@ -44,20 +41,17 @@
 //std namespace
 #include <chrono>
 
-class Restart : public BaseScene {
+class CleanUp : public BaseScene {
 public:
 	//Public access members
-	Restart(
-		ConfigUtility* const argConfig,
+	CleanUp(
 		UDPNetworkUtility* const argNetwork,
 		int* const argClientIndex,
 		int* const argAccountIndex,
 		int* const argCharacterIndex,
-		std::map<int, CombatData>* argCombatMap,
-		std::map<int, CharacterData>* argCharacterMap,
-		std::map<int, EnemyData>* argEnemyMap
+		CharacterMap* argCharacterMap
 	);
-	~Restart();
+	~CleanUp();
 
 protected:
 	//Frame loop
@@ -74,14 +68,11 @@ protected:
 	void KeyUp(SDL_KeyboardEvent const&);
 
 	//shared parameters
-	ConfigUtility& config;
 	UDPNetworkUtility& network;
 	int& clientIndex;
 	int& accountIndex;
 	int& characterIndex;
-	std::map<int, CombatData>& combatMap;
-	std::map<int, CharacterData>& characterMap;
-	std::map<int, EnemyData>& enemyMap;
+	CharacterMap& characterMap;
 
 	//graphics
 	Image image;

client/scenes/in_combat.cpp

@@ -23,6 +23,7 @@
 
 #include "channels.hpp"
 #include "utility.hpp"
+#include "config_utility.hpp"
 
 #include <stdexcept>
 
@@ -31,23 +32,17 @@
 //-------------------------
 
 InCombat::InCombat(
-	ConfigUtility* const argConfig,
 	UDPNetworkUtility* const argNetwork,
 	int* const argClientIndex,
 	int* const argAccountIndex,
 	int* const argCharacterIndex,
-	std::map<int, CombatData>* argCombatMap,
-	std::map<int, CharacterData>* argCharacterMap,
-	std::map<int, EnemyData>* argEnemyMap
+	CharacterMap* argCharacterMap
 	):
-	config(*argConfig),
 	network(*argNetwork),
 	clientIndex(*argClientIndex),
 	accountIndex(*argAccountIndex),
 	characterIndex(*argCharacterIndex),
-	combatMap(*argCombatMap),
-	characterMap(*argCharacterMap),
-	enemyMap(*argEnemyMap)
+	characterMap(*argCharacterMap)
 {
 /*	//setup the utility objects
 	buttonImage.LoadSurface(config["dir.interface"] + "button_menu.bmp");
@@ -123,7 +118,7 @@ void InCombat::Render(SDL_Surface* const screen) {
 void InCombat::QuitEvent() {
 	//exit the game AND the server
 	RequestDisconnect();
-	SetNextScene(SceneList::MAINMENU);
+	SetNextScene(SceneList::QUIT);
 }
 
 void InCombat::MouseMotion(SDL_MouseMotionEvent const& motion) {
@@ -139,11 +134,7 @@ 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) {
@@ -167,7 +158,7 @@ void InCombat::HandlePacket(SerialPacket* const argPacket) {
 }
 
 void InCombat::HandleDisconnect(SerialPacket* const) {
-	SetNextScene(SceneList::RESTART);
+	SetNextScene(SceneList::CLEANUP);
 }
 
 //TODO: more network handlers
@@ -201,10 +192,7 @@ void InCombat::SendPlayerUpdate() {
 //	newPacket.motion = localCharacter->motion;
 //	newPacket.stats = localCharacter->stats;
 
-	//TODO: equipment
-	//TODO: items
-	//TODO: buffs
-	//TODO: debuffs
+	//TODO: gameplay components: equipment, items, buffs, debuffs
 
 	network.SendTo(Channels::SERVER, &newPacket);
 }

client/scenes/in_combat.hpp

@@ -31,12 +31,9 @@
 #include "button.hpp"
 
 //common
-#include "config_utility.hpp"
 #include "frame_rate.hpp"
 
-#include "combat_data.hpp"
-#include "character_data.hpp"
-#include "enemy_data.hpp"
+#include "character.hpp"
 
 //client
 #include "base_scene.hpp"
@@ -45,14 +42,11 @@ class InCombat : public BaseScene {
 public:
 	//Public access members
 	InCombat(
-		ConfigUtility* const argConfig,
 		UDPNetworkUtility* const argNetwork,
 		int* const argClientIndex,
 		int* const argAccountIndex,
 		int* const argCharacterIndex,
-		std::map<int, CombatData>* argCombatMap,
-		std::map<int, CharacterData>* argCharacterMap,
-		std::map<int, EnemyData>* argEnemyMap
+		CharacterMap* argCharacterMap
 	);
 	~InCombat();
 
@@ -75,24 +69,19 @@ protected:
 	//Network handlers
 	void HandlePacket(SerialPacket* const);
 	void HandleDisconnect(SerialPacket* const);
-	//TODO: more network handlers
 
 	//Server control
 	void RequestSynchronize();
 	void SendPlayerUpdate();
 	void RequestDisconnect();
 	void RequestShutdown();
-	//TODO: more
 
 	//shared parameters
-	ConfigUtility& config;
 	UDPNetworkUtility& network;
 	int& clientIndex;
 	int& accountIndex;
 	int& characterIndex;
-	std::map<int, CombatData>& combatMap;
-	std::map<int, CharacterData>& characterMap;
-	std::map<int, EnemyData>& enemyMap;
+	CharacterMap& characterMap;
 
 	//graphics
 	//TODO: graphics

client/scenes/in_world.cpp

@@ -23,32 +23,32 @@
 
 #include "channels.hpp"
 #include "utility.hpp"
+#include "config_utility.hpp"
 
+#include <stdexcept>
 #include <algorithm>
 #include <cmath>
-#include <stdexcept>
+#include <iostream>
 
 //-------------------------
 //Public access members
 //-------------------------
 
 InWorld::InWorld(
-	ConfigUtility* const argConfig,
 	UDPNetworkUtility* const argNetwork,
 	int* const argClientIndex,
 	int* const argAccountIndex,
 	int* const argCharacterIndex,
-	std::map<int, CombatData>* argCombatMap,
-	std::map<int, CharacterData>* argCharacterMap
+	CharacterMap* argCharacterMap
 	):
-	config(*argConfig),
 	network(*argNetwork),
 	clientIndex(*argClientIndex),
 	accountIndex(*argAccountIndex),
 	characterIndex(*argCharacterIndex),
-	combatMap(*argCombatMap),
 	characterMap(*argCharacterMap)
 {
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+
 	//setup the utility objects
 	buttonImage.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	buttonImage.SetClipH(buttonImage.GetClipH()/3);
@@ -72,7 +72,8 @@ InWorld::InWorld(
 
 	//load the tilesheet
 	//TODO: add the tilesheet to the map system?
-	tileSheet.Load(config["dir.tilesets"] + "terrain.bmp", 12, 15);
+	//TODO: Tile size and tile sheet should be loaded elsewhere
+	tileSheet.Load(config["dir.tilesets"] + "terrain.bmp", 32, 32);
 
 	//request a sync
 	RequestSynchronize();
@@ -106,14 +107,41 @@ void InWorld::Update(double delta) {
 		it.second.Update(delta);
 	}
 
-	//update the camera
-	if(localCharacter) {
-		camera.x = localCharacter->origin.x - camera.marginX;
-		camera.y = localCharacter->origin.y - camera.marginY;
-	}
-
 	//check the map
 	UpdateMap();
+
+	//skip the rest
+	if (!localCharacter) {
+		return;
+	}
+
+	//check for collisions with the map
+	BoundingBox wallBounds = {0, 0, tileSheet.GetTileW(), tileSheet.GetTileH()};
+	const int xCount = localCharacter->GetBounds().w / wallBounds.w + 1;
+	const int yCount = localCharacter->GetBounds().h / wallBounds.h + 1;
+
+	for (int i = -1; i <= xCount; ++i) {
+		for (int j = -1; j <= yCount; ++j) {
+			//set the wall's position
+			wallBounds.x = wallBounds.w * i + snapToBase((double)wallBounds.w, localCharacter->GetOrigin().x);
+			wallBounds.y = wallBounds.h * j + snapToBase((double)wallBounds.h, localCharacter->GetOrigin().y);
+
+			if (!regionPager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
+				continue;
+			}
+
+			if ((localCharacter->GetOrigin() + localCharacter->GetBounds()).CheckOverlap(wallBounds)) {
+				localCharacter->SetOrigin(localCharacter->GetOrigin() - (localCharacter->GetMotion() * delta));
+				localCharacter->SetMotion({0,0});
+				localCharacter->CorrectSprite();
+				SendPlayerUpdate();
+			}
+		}
+	}
+
+	//update the camera
+	camera.x = localCharacter->GetOrigin().x - camera.marginX;
+	camera.y = localCharacter->GetOrigin().y - camera.marginY;
 }
 
 void InWorld::FrameEnd() {
@@ -135,7 +163,7 @@ void InWorld::Render(SDL_Surface* const screen) {
 
 	//draw characters
 	for (auto& it : characterMap) {
-		//TODO: drawing order according to Y origin
+		//BUG: #29 drawing order according to Y origin
 		it.second.DrawTo(screen, camera.x, camera.y);
 	}
 
@@ -152,7 +180,7 @@ void InWorld::Render(SDL_Surface* const screen) {
 void InWorld::QuitEvent() {
 	//exit the game AND the server
 	RequestDisconnect();
-	SetNextScene(SceneList::MAINMENU);
+	SetNextScene(SceneList::QUIT);
 }
 
 void InWorld::MouseMotion(SDL_MouseMotionEvent const& motion) {
@@ -175,82 +203,60 @@ void InWorld::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 }
 
 void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE: {
-			QuitEvent();
-		}
-		break;
-
-		//player movement
-		case SDLK_LEFT:
-			if (localCharacter) {
-				localCharacter->motion.x -= CHARACTER_WALKING_SPEED;
-				localCharacter->CorrectSprite();
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_RIGHT:
-			if (localCharacter) {
-				localCharacter->motion.x += CHARACTER_WALKING_SPEED;
-				localCharacter->CorrectSprite();
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_UP:
-			if (localCharacter) {
-				localCharacter->motion.y -= CHARACTER_WALKING_SPEED;
-				localCharacter->CorrectSprite();
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_DOWN:
-			if (localCharacter) {
-				localCharacter->motion.y += CHARACTER_WALKING_SPEED;
-				localCharacter->CorrectSprite();
-				SendPlayerUpdate();
-			}
-		break;
+	if (!localCharacter) {
+		return;
 	}
+
+	//player movement
+	Vector2 motion = localCharacter->GetMotion();
+	switch(key.keysym.sym) {
+		case SDLK_LEFT:
+			motion.x -= CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_RIGHT:
+			motion.x += CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_UP:
+			motion.y -= CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_DOWN:
+			motion.y += CHARACTER_WALKING_SPEED;
+		break;
+		default:
+			return;
+	}
+	localCharacter->SetMotion(motion);
+	localCharacter->CorrectSprite();
+	SendPlayerUpdate();
 }
 
 void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		//player movement
-		case SDLK_LEFT:
-			if (localCharacter) {
-				localCharacter->motion.x += CHARACTER_WALKING_SPEED;
-				localCharacter->CorrectSprite();
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_RIGHT:
-			if (localCharacter) {
-				localCharacter->motion.x -= CHARACTER_WALKING_SPEED;
-				localCharacter->CorrectSprite();
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_UP:
-			if (localCharacter) {
-				localCharacter->motion.y += CHARACTER_WALKING_SPEED;
-				localCharacter->CorrectSprite();
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_DOWN:
-			if (localCharacter) {
-				localCharacter->motion.y -= CHARACTER_WALKING_SPEED;
-				localCharacter->CorrectSprite();
-				SendPlayerUpdate();
-			}
-		break;
+	if (!localCharacter) {
+		return;
 	}
+
+	//player movement
+	Vector2 motion = localCharacter->GetMotion();
+	switch(key.keysym.sym) {
+		//NOTE: The use of min/max here are to prevent awkward movements
+		case SDLK_LEFT:
+			motion.x = std::min(motion.x + CHARACTER_WALKING_SPEED, 0.0);
+		break;
+		case SDLK_RIGHT:
+			motion.x = std::max(motion.x - CHARACTER_WALKING_SPEED, 0.0);
+		break;
+		case SDLK_UP:
+			motion.y = std::min(motion.y + CHARACTER_WALKING_SPEED, 0.0);
+		break;
+		case SDLK_DOWN:
+			motion.y = std::max(motion.y - CHARACTER_WALKING_SPEED, 0.0);
+		break;
+		default:
+			return;
+	}
+	localCharacter->SetMotion(motion);
+	localCharacter->CorrectSprite();
+	SendPlayerUpdate();
 }
 
 //-------------------------
@@ -282,7 +288,7 @@ void InWorld::HandlePacket(SerialPacket* const argPacket) {
 }
 
 void InWorld::HandleDisconnect(SerialPacket* const argPacket) {
-	SetNextScene(SceneList::RESTART);
+	SetNextScene(SceneList::CLEANUP);
 }
 
 void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
@@ -291,36 +297,42 @@ void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
 	}
 
 	//create the character object
-	CharacterData& character = characterMap[argPacket->characterIndex];
+	Character& newCharacter = characterMap[argPacket->characterIndex];
 
-	//set the members
-	character.handle = argPacket->handle;
-	character.avatar = argPacket->avatar;
-	character.sprite.LoadSurface(config["dir.sprites"] + character.avatar, 4, 4);
-	character.roomIndex = argPacket->roomIndex;
-	character.origin = argPacket->origin;
-	character.motion = argPacket->motion;
-	character.stats = argPacket->stats;
+	//fill out the character's members
+	newCharacter.SetHandle(argPacket->handle);
+	newCharacter.SetAvatar(argPacket->avatar);
 
-	character.CorrectSprite();
+	newCharacter.GetSprite()->LoadSurface(ConfigUtility::GetSingleton()["dir.sprites"] + newCharacter.GetAvatar(), 4, 4);
+
+	newCharacter.SetOrigin(argPacket->origin);
+	newCharacter.SetMotion(argPacket->motion);
+	newCharacter.SetBounds({0, 16, 32, 32}); //TODO: magic numbers, fix this
+
+	(*newCharacter.GetStats()) = argPacket->stats;
+
+	//bookkeeping code
+	newCharacter.CorrectSprite();
 
 	//catch this client's player object
 	if (argPacket->accountIndex == accountIndex && !localCharacter) {
 		characterIndex = argPacket->characterIndex;
-		localCharacter = &character;
+		localCharacter = &newCharacter;
 
 		//setup the camera
+		//TODO: move this?
 		camera.width = GetScreen()->w;
 		camera.height = GetScreen()->h;
 
 		//center on the player's character
-		camera.marginX = (GetScreen()->w / 2 - localCharacter->sprite.GetImage()->GetClipW() / 2);
-		camera.marginY = (GetScreen()->h / 2 - localCharacter->sprite.GetImage()->GetClipH() / 2);
+		camera.marginX = (GetScreen()->w / 2 - localCharacter->GetSprite()->GetImage()->GetClipW() / 2);
+		camera.marginY = (GetScreen()->h / 2 - localCharacter->GetSprite()->GetImage()->GetClipH() / 2);
 	}
 }
 
 void InWorld::HandleCharacterDelete(CharacterPacket* const argPacket) {
 	//TODO: authenticate when own character is being deleted (linked to a TODO in the server)
+
 	//catch this client's player object
 	if (argPacket->characterIndex == characterIndex) {
 		characterIndex = -1;
@@ -332,17 +344,17 @@ void InWorld::HandleCharacterDelete(CharacterPacket* const argPacket) {
 
 void InWorld::HandleCharacterUpdate(CharacterPacket* const argPacket) {
 	if (characterMap.find(argPacket->characterIndex) == characterMap.end()) {
+		std::cout << "Warning: HandleCharacterUpdate() is passing to HandleCharacterNew()" << std::endl;
 		HandleCharacterNew(argPacket);
 		return;
 	}
 
-	CharacterData& character = characterMap[argPacket->characterIndex];
+	Character& character = characterMap[argPacket->characterIndex];
 
 	//other characters moving
 	if (argPacket->characterIndex != characterIndex) {
-		character.roomIndex = argPacket->roomIndex;
-		character.origin = argPacket->origin;
-		character.motion = argPacket->motion;
+		character.SetOrigin(argPacket->origin);
+		character.SetMotion(argPacket->motion);
 		character.CorrectSprite();
 	}
 }
@@ -369,6 +381,8 @@ void InWorld::RequestSynchronize() {
 	newPacket.clientIndex = clientIndex;
 	newPacket.accountIndex = accountIndex;
 
+	//TODO: location, range for sync request
+
 	network.SendTo(Channels::SERVER, &newPacket);
 }
 
@@ -379,17 +393,14 @@ void InWorld::SendPlayerUpdate() {
 	newPacket.type = SerialPacketType::CHARACTER_UPDATE;
 
 	newPacket.characterIndex = characterIndex;
-	//handle, avatar
+	//NOTE: omitting the handle and avatar here
 	newPacket.accountIndex = accountIndex;
-	newPacket.roomIndex = localCharacter->roomIndex;
-	newPacket.origin = localCharacter->origin;
-	newPacket.motion = localCharacter->motion;
-	newPacket.stats = localCharacter->stats;
+	newPacket.roomIndex = 0; //TODO: room index
+	newPacket.origin = localCharacter->GetOrigin();
+	newPacket.motion = localCharacter->GetMotion();
+	newPacket.stats = *localCharacter->GetStats();
 
-	//TODO: equipment
-	//TODO: items
-	//TODO: buffs
-	//TODO: debuffs
+	//TODO: gameplay components: equipment, items, buffs, debuffs
 
 	network.SendTo(Channels::SERVER, &newPacket);
 }
@@ -443,7 +454,7 @@ void InWorld::UpdateMap() {
 
 	//prune distant regions
 	for (std::list<Region>::iterator it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); /* EMPTY */) {
-		//check if the region is outside off this area
+		//check if the region is outside of this area
 		if (it->GetX() < xStart || it->GetX() > xEnd || it->GetY() < yStart || it->GetY() > yEnd) {
 
 			//clunky, but the alternative was time consuming

client/scenes/in_world.hpp

@@ -35,11 +35,9 @@
 #include "tile_sheet.hpp"
 
 //common
-#include "config_utility.hpp"
 #include "frame_rate.hpp"
 
-#include "combat_data.hpp"
-#include "character_data.hpp"
+#include "character.hpp"
 
 //client
 #include "base_scene.hpp"
@@ -51,13 +49,11 @@ class InWorld : public BaseScene {
 public:
 	//Public access members
 	InWorld(
-		ConfigUtility* const argConfig,
 		UDPNetworkUtility* const argNetwork,
 		int* const argClientIndex,
 		int* const argAccountIndex,
 		int* const argCharacterIndex,
-		std::map<int, CombatData>* argCombatMap,
-		std::map<int, CharacterData>* argCharacterMap
+		CharacterMap* argCharacterMap
 	);
 	~InWorld();
 
@@ -96,13 +92,11 @@ protected:
 	void UpdateMap();
 
 	//shared parameters
-	ConfigUtility& config;
 	UDPNetworkUtility& network;
 	int& clientIndex;
 	int& accountIndex;
 	int& characterIndex;
-	std::map<int, CombatData>& combatMap;
-	std::map<int, CharacterData>& characterMap;
+	CharacterMap& characterMap;
 
 	//graphics
 	Image buttonImage;
@@ -124,7 +118,7 @@ protected:
 	FrameRate fps;
 
 	//game
-	CharacterData* localCharacter = nullptr;
+	Character* localCharacter = nullptr;
 };
 
 #endif

client/scenes/lobby_menu.cpp

@@ -31,12 +31,10 @@
 //-------------------------
 
 LobbyMenu::LobbyMenu(
-	ConfigUtility* const argConfig,
 	UDPNetworkUtility* const argNetwork,
 	int* const argClientIndex,
 	int* const argAccountIndex
 	):
-	config(*argConfig),
 	network(*argNetwork),
 	clientIndex(*argClientIndex),
 	accountIndex(*argAccountIndex)
@@ -69,6 +67,9 @@ LobbyMenu::LobbyMenu(
 
 	//set the server list's position
 	listBox = {300, 50, 200, font.GetCharH()};
+
+	//BUGFIX: Eat incoming packets
+	while(network.Receive());
 }
 
 LobbyMenu::~LobbyMenu() {
@@ -187,11 +188,7 @@ void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 }
 
 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) {
@@ -225,7 +222,7 @@ void LobbyMenu::HandleBroadcastResponse(ServerPacket* const argPacket) {
 	server.playerCount = argPacket->playerCount;
 	server.version = argPacket->version;
 
-	//NOTE: Check compatibility here
+	//Checking compatibility
 	server.compatible = server.version == NETWORK_VERSION;
 
 	//push

client/scenes/lobby_menu.hpp

@@ -41,7 +41,6 @@ class LobbyMenu : public BaseScene {
 public:
 	//Public access members
 	LobbyMenu(
-		ConfigUtility* const argConfig,
 		UDPNetworkUtility* const argNetwork,
 		int* const argClientIndex,
 		int* const argAccountIndex
@@ -68,7 +67,7 @@ protected:
 	void HandleJoinResponse(ClientPacket* const);
 
 	//shared parameters
-	ConfigUtility& config;
+	ConfigUtility& config = ConfigUtility::GetSingleton();
 	UDPNetworkUtility& network;
 	int& clientIndex;
 	int& accountIndex;

client/scenes/main_menu.cpp

@@ -21,13 +21,15 @@
 */
 #include "main_menu.hpp"
 
+#include "config_utility.hpp"
+
 //-------------------------
 //Public access members
 //-------------------------
 
-MainMenu::MainMenu(ConfigUtility* const argConfig):
-	config(*argConfig)
-{
+MainMenu::MainMenu() {
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+
 	//setup the utility objects
 	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
@@ -101,6 +103,7 @@ void MainMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 }
 
 void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	//TODO: Buttons should only register as "selected" when the left button is used
 	if (startButton.MouseButtonUp(button) == Button::State::HOVER) {
 		SetNextScene(SceneList::LOBBYMENU);
 	}
@@ -113,11 +116,7 @@ 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

@@ -24,7 +24,6 @@
 
 #include "base_scene.hpp"
 
-#include "config_utility.hpp"
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
@@ -32,7 +31,7 @@
 class MainMenu : public BaseScene {
 public:
 	//Public access members
-	MainMenu(ConfigUtility* const);
+	MainMenu();
 	~MainMenu();
 
 protected:
@@ -49,9 +48,6 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//shared parameters
-	ConfigUtility& config;
-
 	//members
 	Image image;
 	RasterFont font;

client/scenes/makefile

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

client/scenes/options_menu.cpp

@@ -21,13 +21,15 @@
 */
 #include "options_menu.hpp"
 
+#include "config_utility.hpp"
+
 //-------------------------
 //Public access members
 //-------------------------
 
-OptionsMenu::OptionsMenu(ConfigUtility* const argConfig):
-	config(*argConfig)
-{
+OptionsMenu::OptionsMenu() {
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+
 	//setup the utility objects
 	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
@@ -90,11 +92,7 @@ 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

@@ -24,7 +24,6 @@
 
 #include "base_scene.hpp"
 
-#include "config_utility.hpp"
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
@@ -33,7 +32,7 @@
 class OptionsMenu : public BaseScene {
 public:
 	//Public access members
-	OptionsMenu(ConfigUtility* const);
+	OptionsMenu();
 	~OptionsMenu();
 
 protected:
@@ -50,9 +49,6 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//shared parameters
-	ConfigUtility& config;
-
 	//members
 	Image image;
 	RasterFont font;

client/scenes/splash_screen.cpp

@@ -21,14 +21,14 @@
 */
 #include "splash_screen.hpp"
 
+#include "config_utility.hpp"
+
 //-------------------------
 //Public access members
 //-------------------------
 
-SplashScreen::SplashScreen(ConfigUtility* const argConfig):
-	config(*argConfig)
-{
-	logo.LoadSurface(config["dir.logos"] + "krstudios.bmp");
+SplashScreen::SplashScreen() {
+	logo.LoadSurface(ConfigUtility::GetSingleton()["dir.logos"] + "krstudios.bmp");
 	startTick = std::chrono::steady_clock::now();
 }
 

client/scenes/splash_screen.hpp

@@ -24,7 +24,6 @@
 
 #include "base_scene.hpp"
 
-#include "config_utility.hpp"
 #include "image.hpp"
 
 #include <chrono>
@@ -32,7 +31,7 @@
 class SplashScreen : public BaseScene {
 public:
 	//Public access members
-	SplashScreen(ConfigUtility* const);
+	SplashScreen();
 	~SplashScreen();
 
 protected:
@@ -40,9 +39,6 @@ protected:
 	void Update(double delta);
 	void Render(SDL_Surface* const);
 
-	//shared parameters
-	ConfigUtility& config;
-
 	//members
 	std::chrono::steady_clock::time_point startTick;
 	Image logo;

common/debugging/makefile

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

common/debugging/timer.cpp

@@ -0,0 +1,45 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "timer.hpp"
+
+Timer::Timer(): start(Timer::Clock::now()) {
+	//
+}
+
+Timer::Timer(std::string s): name(s), start(Timer::Clock::now()) {
+	//
+}
+
+void Timer::Start() {
+	start = Clock::now();
+}
+
+void Timer::Stop() {
+	timeSpan = Clock::now() - start;
+}
+
+std::ostream& operator<<(std::ostream& os, Timer& t) {
+	os << t.GetName() << ": ";
+	os << std::chrono::duration_cast<std::chrono::milliseconds>(t.GetTime()).count();
+	os << "ms";
+	return os;
+}

common/debugging/timer.hpp

@@ -0,0 +1,54 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef TIMER_HPP_
+#define TIMER_HPP_
+
+#include <chrono>
+#include <string>
+#include <ostream>
+
+class Timer {
+public:
+	typedef std::chrono::high_resolution_clock Clock;
+
+	Timer();
+	Timer(std::string s);
+	~Timer() = default;
+
+	inline void Start();
+	inline void Stop();
+
+	//accessors and mutators
+	Clock::duration GetTime() { return timeSpan; }
+
+	std::string SetName(std::string s) { return name = s; }
+	std::string GetName() { return name; }
+
+private:
+	std::string name;
+	Clock::time_point start;
+	Clock::duration timeSpan;
+};
+
+std::ostream& operator<<(std::ostream& os, Timer& t);
+
+#endif

common/gameplay/character_defines.hpp

@@ -19,24 +19,17 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ENEMYFACTORYGENERIC_HPP_
-#define ENEMYFACTORYGENERIC_HPP_
+#ifndef CHARACTERDEFINES_HPP_
+#define CHARACTERDEFINES_HPP_
 
-#include "enemy_factory_interface.hpp"
+#include <cmath>
 
-#include "enemy_data.hpp"
+//the speeds that the characters move
+constexpr double CHARACTER_WALKING_SPEED = 140.0;
+constexpr double CHARACTER_WALKING_MOD = 1.0/sqrt(2.0);
 
-#include <list>
-
-//DOCS: Not really intended for use, but rather for copying and tweaking
-class EnemyFactoryGeneric : public EnemyFactoryInterface {
-public:
-	EnemyFactoryGeneric();
-	~EnemyFactoryGeneric() noexcept override;
-
-	void Generate(std::list<EnemyData>* container) override;
-private:
-	//TODO: hold the parameters specified by the room
-};
+//the bounding boxes for the characters
+constexpr double CHARACTER_BOUNDS_WIDTH = 32.0;
+constexpr double CHARACTER_BOUNDS_HEIGHT = 32.0;
 
 #endif

common/gameplay/combat_defines.hpp

@@ -19,16 +19,16 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "enemy_factory_generic.hpp"
+#ifndef COMBATDEFINES_HPP_
+#define COMBATDEFINES_HPP_
 
-EnemyFactoryGeneric::EnemyFactoryGeneric() : EnemyFactoryInterface() {
-	//EMPTY
-}
+#define COMBAT_MAX_CHARACTERS 16
+#define COMBAT_MAX_ENEMIES 16
 
-EnemyFactoryGeneric::~EnemyFactoryGeneric() noexcept {
-	//EMPTY
-}
+enum class TerrainType {
+	NONE = 0,
+	GRASSLANDS,
+	//etc.
+};
 
-void EnemyFactoryGeneric::Generate(std::list<EnemyData>* container) {
-	//TODO: fill this out
-}
+#endif

common/gameplay/makefile

@@ -1,7 +1,7 @@
 #config
-INCLUDES+=. ../utilities ../graphics
+INCLUDES+=.
 LIBS+=
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) -DGRAPHICS
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
 CXXSRC=$(wildcard *.cpp)

common/graphics/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../map
+INCLUDES+=.
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 

common/makefile

@@ -1,4 +1,5 @@
 all:
+	$(MAKE) -C debugging
 	$(MAKE) -C gameplay
 	$(MAKE) -C graphics
 	$(MAKE) -C map

common/map/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../utilities
+INCLUDES+=. ../graphics ../utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 

common/map/region.cpp

@@ -35,6 +35,7 @@ Region::Region(int argX, int argY): x(argX), y(argY) {
 
 Region::Region(Region const& rhs): x(rhs.x), y(rhs.y) {
 	memcpy(tiles, rhs.tiles, REGION_WIDTH*REGION_HEIGHT*REGION_DEPTH*sizeof(type_t));
+	solid = rhs.solid;
 }
 
 Region::type_t Region::SetTile(int x, int y, int z, type_t v) {
@@ -44,3 +45,11 @@ Region::type_t Region::SetTile(int x, int y, int z, type_t v) {
 Region::type_t Region::GetTile(int x, int y, int z) {
 	return tiles[x][y][z];
 }
+
+bool Region::SetSolid(int x, int y, bool b) {
+	return solid[x * REGION_WIDTH + y] = b;
+}
+
+bool Region::GetSolid(int x, int y) {
+	return solid[x * REGION_WIDTH + y];
+}

common/map/region.hpp

@@ -22,10 +22,17 @@
 #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;
@@ -38,14 +45,23 @@ public:
 	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

common/map/region_api.cpp

@@ -37,6 +37,20 @@ static int getTile(lua_State* L) {
 	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());
@@ -65,42 +79,44 @@ static int getDepth(lua_State* L) {
 }
 
 static int load(lua_State* L) {
-	//TODO: fill this
+	//EMPTY
 	lua_pushboolean(L, false);
 	return 1;
 }
 
 static int save(lua_State* L) {
-	//TODO: fill this
+	//EMPTY
 	return 0;
 }
 
 static int create(lua_State* L) {
-	//TODO: fill this
+	//EMPTY
 	return 0;
 }
 
 static int unload(lua_State* L) {
-	//TODO: fill this
+	//EMPTY
 	return 0;
 }
 
-static const luaL_Reg regionlib[] = {
-	{"settile",setTile},
-	{"gettile",getTile},
-	{"getx",getX},
-	{"gety",getY},
-	{"getwidth",getWidth},
-	{"getheight",getHeight},
-	{"getdepth",getDepth},
-	{"load",load},
-	{"save",save},
-	{"create",create},
-	{"unload",unload},
+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 luaopen_regionapi(lua_State* L) {
-	luaL_newlib(L, regionlib);
+LUAMOD_API int openRegionAPI(lua_State* L) {
+	luaL_newlib(L, regionLib);
 	return 1;
 }

common/map/region_api.hpp

@@ -24,7 +24,7 @@
 
 #include "lua/lua.hpp"
 
-#define LUA_REGIONLIBNAME "region"
-LUAMOD_API int luaopen_regionapi(lua_State* L);
+#define TORTUGA_REGION_NAME "Region"
+LUAMOD_API int openRegionAPI(lua_State* L);
 
 #endif

common/map/region_pager_api.cpp

@@ -19,14 +19,15 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "pager_api.hpp"
+#include "region_pager_api.hpp"
 
 #include "region_pager_lua.hpp"
 #include "region.hpp"
 
-#include <stdexcept>
 #include <string>
 
+//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));
@@ -41,6 +42,20 @@ static int getTile(lua_State* L) {
 	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));
@@ -48,109 +63,47 @@ static int getRegion(lua_State* L) {
 	return 1;
 }
 
-static int setDirectory(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	std::string s = pager->SetDirectory(lua_tostring(L, 2));
-	lua_pushstring(L, s.c_str());
-	return 1;
-}
-
-static int getDirectory(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	std::string s = pager->GetDirectory();
-	lua_pushstring(L, s.c_str());
-	return 1;
-}
-
 static int loadRegion(lua_State* L) {
-	//get the parameters
 	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	std::string s = pager->GetDirectory();
-
-	//push the parameters
-	lua_getglobal(L, "region");
-	lua_getfield(L, -1, "load");
+	Region* region = pager->LoadRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
 	lua_pushlightuserdata(L, region);
-	lua_pushstring(L, s.c_str());
-
-	//call the method
-	if (lua_pcall(L, 2, 1, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(L, -1) ));
-	}
 	return 1;
 }
 
 static int saveRegion(lua_State* L) {
-	//get the parameters
 	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	std::string s = pager->GetDirectory();
-
-	//push the parameters
-	lua_getglobal(L, "region");
-	lua_getfield(L, -1, "save");
+	Region* region = pager->SaveRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
 	lua_pushlightuserdata(L, region);
-	lua_pushstring(L, s.c_str());
-
-	//call the method
-	if (lua_pcall(L, 2, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(L, -1) ));
-	}
-	return 0;
+	return 1;
 }
 
 static int createRegion(lua_State* L) {
-	//get the parameters
 	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-
-	//push the parameters
-	lua_getglobal(L, "region");
-	lua_getfield(L, -1, "create");
+	Region* region = pager->CreateRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
 	lua_pushlightuserdata(L, region);
-	//TODO: parameters
-
-	//call the method
-	if (lua_pcall(L, 1, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(L, -1) ));
-	}
-	return 0;
+	return 1;
 }
 
 static int unloadRegion(lua_State* L) {
-	//get the parameters
 	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	std::string s = pager->GetDirectory();
-
-	//push the parameters
-	lua_getglobal(L, "region");
-	lua_getfield(L, -1, "unload");
-	lua_pushlightuserdata(L, region);
-	lua_pushstring(L, s.c_str());
-
-	//call the method
-	if (lua_pcall(L, 2, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(L, -1) ));
-	}
+	pager->UnloadRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
 	return 0;
 }
 
-static const luaL_Reg pagerlib[] = {
-	{"settile", setTile},
-	{"gettile", getTile},
-	{"getregion", getRegion},
-	{"setdirectory", setDirectory},
-	{"getdirectory", getDirectory},
-	{"loadregion", loadRegion},
-	{"saveregion", saveRegion},
-	{"createregion", createRegion},
-	{"unloadregion", unloadRegion},
+static const luaL_Reg regionPagerLib[] = {
+	{"SetTile", setTile},
+	{"GetTile", getTile},
+	{"SetSolid", setSolid},
+	{"GetSolid", getSolid},
+	{"GetRegion", getRegion},
+	{"LoadRegion", loadRegion},
+	{"SaveRegion", saveRegion},
+	{"CreateRegion", createRegion},
+	{"UnloadRegion", unloadRegion},
 	{nullptr, nullptr}
 };
 
-LUAMOD_API int luaopen_pagerapi(lua_State* L) {
-	luaL_newlib(L, pagerlib);
+LUAMOD_API int openRegionPagerAPI(lua_State* L) {
+	luaL_newlib(L, regionPagerLib);
 	return 1;
 }

common/map/region_pager_api.hpp

@@ -19,13 +19,12 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "character_data.hpp"
-#include "combat_data.hpp"
-#include "enemy_data.hpp"
-#include "statistics.hpp"
+#ifndef REGIONPAGERAPI_HPP_
+#define REGIONPAGERAPI_HPP_
 
-/* DOCS: Sanity check, read more
- * Since most/all of the files in this directory are header files, I've created
- * this source file as a "sanity check", to ensure that the above header files
- * are written correctly via make.
-*/
+#include "lua/lua.hpp"
+
+#define TORTUGA_REGION_PAGER_NAME "RegionPager"
+LUAMOD_API int openRegionPagerAPI(lua_State* L);
+
+#endif

common/map/region_pager_base.cpp

@@ -36,7 +36,20 @@ Region::type_t RegionPagerBase::GetTile(int x, int y, int z) {
 	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);

common/map/region_pager_base.hpp

@@ -35,6 +35,10 @@ public:
 	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);

common/map/region_pager_lua.cpp

@@ -29,23 +29,22 @@ Region* RegionPagerLua::LoadRegion(int x, int y) {
 	//load the region if possible
 
 	//something to work on
-	regionList.emplace_front(x, y);
+	Region tmpRegion(x, y);
 
 	//API hook
-	lua_getglobal(luaState, "region");
-	lua_getfield(luaState, -1, "load");
-	lua_pushlightuserdata(luaState, &regionList.front());
-	lua_pushstring(luaState, directory.c_str());
-	if (lua_pcall(luaState, 2, 1, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+	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(luaState, -1)) {
-		lua_pop(luaState, 2);
-		regionList.pop_front();
+	if (!lua_toboolean(lua, -1)) {
+		lua_pop(lua, 2);
 		return nullptr;
 	}
-	lua_pop(luaState, 2);
+	lua_pop(lua, 2);
+	regionList.push_front(tmpRegion);
 	return &regionList.front();
 }
 
@@ -54,14 +53,13 @@ Region* RegionPagerLua::SaveRegion(int x, int y) {
 	Region* ptr = FindRegion(x, y);
 	if (ptr) {
 		//API hook
-		lua_getglobal(luaState, "region");
-		lua_getfield(luaState, -1, "save");
-		lua_pushlightuserdata(luaState, ptr);
-		lua_pushstring(luaState, directory.c_str());
-		if (lua_pcall(luaState, 2, 0, 0) != LUA_OK) {
-			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+		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(luaState, 1);
+		lua_pop(lua, 1);
 	}
 	return ptr;
 }
@@ -72,32 +70,32 @@ Region* RegionPagerLua::CreateRegion(int x, int y) {
 	}
 
 	//something to work on
-	regionList.emplace_front(x, y);
+	Region tmpRegion(x, y);
 
 	//API hook
-	lua_getglobal(luaState, "region");
-	lua_getfield(luaState, -1, "create");
-	lua_pushlightuserdata(luaState, &regionList.front());
+	lua_getglobal(lua, "Region");
+	lua_getfield(lua, -1, "Create");
+	lua_pushlightuserdata(lua, &tmpRegion);
 	//TODO: parameters
-	if (lua_pcall(luaState, 1, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+	if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
 	}
-	lua_pop(luaState, 1);
-	return &regionList.front();;
+	lua_pop(lua, 1);
+	regionList.push_front(tmpRegion);
+	return &regionList.front();
 }
 
 void RegionPagerLua::UnloadRegion(int x, int y) {
-	lua_getglobal(luaState, "region");
+	lua_getglobal(lua, "Region");
 
 	regionList.remove_if([&](Region& region) -> bool {
 		if (region.GetX() == x && region.GetY() == y) {
 
 			//API hook
-			lua_getfield(luaState, -1, "unload");
-			lua_pushlightuserdata(luaState, &region);
-			lua_pushstring(luaState, directory.c_str());
-			if (lua_pcall(luaState, 2, 0, 0) != LUA_OK) {
-				throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+			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;
@@ -105,22 +103,21 @@ void RegionPagerLua::UnloadRegion(int x, int y) {
 		return false;
 	});
 
-	lua_pop(luaState, 1);
+	lua_pop(lua, 1);
 }
 
 void RegionPagerLua::UnloadAll() {
-	lua_getglobal(luaState, "region");
+	lua_getglobal(lua, "Region");
 
 	for (auto& it : regionList) {
 		//API hook
-		lua_getfield(luaState, -1, "unload");
-		lua_pushlightuserdata(luaState, &it);
-		lua_pushstring(luaState, directory.c_str());
-		if (lua_pcall(luaState, 2, 0, 0) != LUA_OK) {
-			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+		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(luaState, 1);
+	lua_pop(lua, 1);
 	regionList.clear();
 }

common/map/region_pager_lua.hpp

@@ -41,14 +41,11 @@ public:
 
 	void UnloadAll() override;
 
-	std::string SetDirectory(std::string s) { return directory = s; }
-	std::string GetDirectory() { return directory; }
-
-	lua_State* SetLuaState(lua_State* L) { return luaState = L; }
-	lua_State* GetLuaState() { return luaState; }
+	//accessors & mutators
+	lua_State* SetLuaState(lua_State* L) { return lua = L; }
+	lua_State* GetLuaState() { return lua; }
 protected:
-	std::string directory;
-	lua_State* luaState = nullptr;
+	lua_State* lua = nullptr;
 };
 
 #endif

common/map/tile_sheet.cpp

@@ -21,24 +21,24 @@
 */
 #include "tile_sheet.hpp"
 
-void TileSheet::Load(std::string fname, int xc, int yc) {
-	XCount = xc;
-	YCount = yc;
+void TileSheet::Load(std::string fname, int tileWidth, int tileHeight) {
 	image.LoadSurface(fname);
-	image.SetClipW(image.GetClipW()/XCount);
-	image.SetClipH(image.GetClipH()/YCount);
+	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;
+	xCount = yCount = 0;
 }
 
-void TileSheet::DrawTo(SDL_Surface* const dest, int x, int y, Region::type_t tile) {
+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.SetClipX((tile-1) % xCount * image.GetClipW());
+	image.SetClipY((tile-1) / xCount * image.GetClipH());
 	image.DrawTo(dest, x, y);
 }
 
@@ -50,8 +50,8 @@ void TileSheet::DrawRegionTo(SDL_Surface* const dest, Region* const region, int
 				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.SetClipX((tile-1) % xCount * image.GetClipW());
+				image.SetClipY((tile-1) / xCount * image.GetClipH());
 				image.DrawTo(dest,
 					(region->GetX() + i) * image.GetClipW() - camX,
 					(region->GetY() + j) * image.GetClipH() - camY);

common/map/tile_sheet.hpp

@@ -31,24 +31,24 @@
 class TileSheet {
 public:
 	TileSheet() = default;
-	TileSheet(std::string f, int x, int y) { Load(f, x, y); }
+	TileSheet(std::string f, int w, int h) { Load(f, w, h); }
 	~TileSheet() = default;
 
-	void Load(std::string fname, int XCount, int YCount);
+	void Load(std::string fname, int tileWidth, int tileHeight);
 	void Unload();
 
-	void DrawTo(SDL_Surface* const dest, int x, int y, Region::type_t tile);
+	void DrawTileTo(SDL_Surface* const dest, int x, int y, Region::type_t tile);
 	void DrawRegionTo(SDL_Surface* const dest, Region* const region, int camX, int camY);
 
 	//accessors
 	Image* GetImage() { return ℑ }
-	int GetXCount() { return XCount; }
-	int GetYCount() { return YCount; }
+	int GetXCount() { return xCount; }
+	int GetYCount() { return yCount; }
 	int GetTileW() { return image.GetClipW(); }
 	int GetTileH() { return image.GetClipH(); }
 private:
 	Image image;
-	int XCount = 0, YCount = 0;
+	int xCount = 0, yCount = 0;
 };
 
 #endif

common/map/tile_sheet_api.cpp

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

common/map/tile_sheet_api.hpp

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

common/network/packet/character_packet.hpp

@@ -44,10 +44,7 @@ struct CharacterPacket : SerialPacketBase {
 	//gameplay
 	Statistics stats;
 
-	//TODO: equipment
-	//TODO: items
-	//TODO: buffs
-	//TODO: debuffs
+	//TODO: gameplay components: equipment, items, buffs, debuffs
 };
 
 #endif

common/network/packet/combat_packet.hpp

@@ -24,13 +24,13 @@
 
 #include "serial_packet_base.hpp"
 
-#include "combat_data.hpp"
+#include "combat_defines.hpp"
 
 struct CombatPacket : SerialPacketBase {
 	//identify the combat instance
 	int combatIndex;
 	int difficulty;
-	CombatData::Terrain terrainType;
+	TerrainType terrainType;
 
 	//combatants
 	int characterArray[COMBAT_MAX_CHARACTERS];
@@ -40,7 +40,7 @@ struct CombatPacket : SerialPacketBase {
 	int mapIndex;
 	Vector2 origin;
 
-	//TODO: rewards
+	//TODO: gameplay components: rewards
 };
 
 #endif

common/network/packet/enemy_packet.hpp

@@ -33,12 +33,7 @@ struct EnemyPacket : SerialPacketBase {
 	//gameplay
 	Statistics stats;
 
-	//TODO: equipment
-	//TODO: items
-	//TODO: buffs
-	//TODO: debuffs
-
-	//TODO: rewards
+	//TODO: gameplay components: equipment, items, buffs, debuffs, rewards
 };
 
 #endif

common/network/packet/serial_packet_base.hpp

@@ -30,7 +30,7 @@
 
 #include "SDL/SDL_net.h"
 
-constexpr int NETWORK_VERSION = 20140607;
+constexpr int NETWORK_VERSION = 20140701;
 constexpr int PACKET_STRING_SIZE = 100;
 
 struct SerialPacketBase {

common/network/serial/serial.cpp

@@ -148,7 +148,6 @@ void deserializePacket(SerialPacketBase* packet, void* buffer) {
 		case SerialPacketType::COMBAT_DELETE:
 		case SerialPacketType::COMBAT_UPDATE:
 
-		//TODO: is this the best fit?
 		case SerialPacketType::COMBAT_ENTER_REQUEST:
 		case SerialPacketType::COMBAT_ENTER_RESPONSE:
 		case SerialPacketType::COMBAT_EXIT_REQUEST:

common/network/serial/serial.hpp

@@ -53,13 +53,15 @@ void deserializeRegionContent(RegionPacket*, void*);
 void deserializeServer(ServerPacket*, void*);
 void deserializeStatistics(Statistics*, void*);
 
-/* DOCS: Keep the PACKET_BUFFER_SIZE up to date
- * DOCS: REGION_CONTENT is currently the largest type of packet, read more
- *  map content: REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH * sizoeof(region::type_t)
- *  map format: sizeof(int) * 3
- *  metadata: sizeof(SerialPacket::Type)
+/* DOCS: Keep PACKET_BUFFER_SIZE up to date
+ * DOCS: SerialPacketType::REGION_CONTENT is currently the largest type of packet, read more
+ * The metadata used are:
+ *     SerialPacketType
+ *     room index
+ *     X & Y positon
+ * The rest is taken up by the Regions's content.
 */
 
-constexpr int PACKET_BUFFER_SIZE = REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH * sizeof(Region::type_t) + sizeof(int) * 3 + sizeof(SerialPacketType);
+constexpr int PACKET_BUFFER_SIZE = sizeof(SerialPacketType) + sizeof(int) * 3 + REGION_FOOTPRINT;
 
 #endif

common/network/serial/serial_character.cpp

@@ -45,10 +45,7 @@ void serializeCharacter(CharacterPacket* packet, void* buffer) {
 	serializeStatistics(&packet->stats, buffer);
 	buffer = reinterpret_cast<char*>(buffer) + sizeof(Statistics);
 
-	//TODO: equipment
-	//TODO: items
-	//TODO: buffs
-	//TODO: debuffs
+	//TODO: gameplay components: equipment, items, buffs, debuffs
 }
 
 void deserializeCharacter(CharacterPacket* packet, void* buffer) {
@@ -73,8 +70,5 @@ void deserializeCharacter(CharacterPacket* packet, void* buffer) {
 	deserializeStatistics(&packet->stats, buffer);
 	buffer = reinterpret_cast<char*>(buffer) + sizeof(Statistics);
 
-	//TODO: equipment
-	//TODO: items
-	//TODO: buffs
-	//TODO: debuffs
+	//TODO: gameplay components: equipment, items, buffs, debuffs
 }

common/network/serial/serial_combat.cpp

@@ -29,7 +29,7 @@ void serializeCombat(CombatPacket* packet, void* buffer) {
 	//identify the combat instance
 	SERIALIZE(buffer, &packet->combatIndex, sizeof(int));
 	SERIALIZE(buffer, &packet->difficulty, sizeof(int));
-	SERIALIZE(buffer, &packet->terrainType, sizeof(CombatData::Terrain));
+	SERIALIZE(buffer, &packet->terrainType, sizeof(TerrainType));
 
 	//combatants
 	SERIALIZE(buffer, &packet->characterArray, sizeof(int) * COMBAT_MAX_CHARACTERS);
@@ -40,7 +40,7 @@ void serializeCombat(CombatPacket* packet, void* buffer) {
 	SERIALIZE(buffer, &packet->origin.x, sizeof(double));
 	SERIALIZE(buffer, &packet->origin.y, sizeof(double));
 
-	//TODO: rewards
+	//TODO: gameplay components: rewards
 }
 
 void deserializeCombat(CombatPacket* packet, void* buffer) {
@@ -49,7 +49,7 @@ void deserializeCombat(CombatPacket* packet, void* buffer) {
 	//identify the combat instance
 	DESERIALIZE(buffer, &packet->combatIndex, sizeof(int));
 	DESERIALIZE(buffer, &packet->difficulty, sizeof(int));
-	DESERIALIZE(buffer, &packet->terrainType, sizeof(CombatData::Terrain));
+	DESERIALIZE(buffer, &packet->terrainType, sizeof(TerrainType));
 
 	//combatants
 	DESERIALIZE(buffer, &packet->characterArray, sizeof(int) * COMBAT_MAX_CHARACTERS);
@@ -60,5 +60,5 @@ void deserializeCombat(CombatPacket* packet, void* buffer) {
 	DESERIALIZE(buffer, &packet->origin.x, sizeof(double));
 	DESERIALIZE(buffer, &packet->origin.y, sizeof(double));
 
-	//TODO: rewards
+	//TODO: gameplay components: rewards
 }

common/network/serial/serial_enemy.cpp

@@ -37,12 +37,7 @@ void serializeEnemy(EnemyPacket* packet, void* buffer) {
 	serializeStatistics(&packet->stats, buffer);
 	buffer = reinterpret_cast<char*>(buffer) + sizeof(Statistics);
 
-	//TODO: equipment
-	//TODO: items
-	//TODO: buffs
-	//TODO: debuffs
-
-	//TODO: rewards
+	//TODO: gameplay components: equipment, items, buffs, debuffs, rewards
 }
 
 void deserializeEnemy(EnemyPacket* packet, void* buffer) {
@@ -57,10 +52,5 @@ void deserializeEnemy(EnemyPacket* packet, void* buffer) {
 	deserializeStatistics(&packet->stats, buffer);
 	buffer = reinterpret_cast<char*>(buffer) + sizeof(Statistics);
 
-	//TODO: equipment
-	//TODO: items
-	//TODO: buffs
-	//TODO: debuffs
-
-	//TODO: rewards
+	//TODO: gameplay components: equipment, items, buffs, debuffs, rewards
 }

common/network/serial/serial_region.cpp

@@ -40,7 +40,7 @@ void serializeRegionContent(RegionPacket* packet, void* buffer) {
 	SERIALIZE(buffer, &packet->x, sizeof(int));
 	SERIALIZE(buffer, &packet->y, sizeof(int));
 
-	//content
+	//tiles
 	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++) {
@@ -49,6 +49,9 @@ void serializeRegionContent(RegionPacket* packet, void* buffer) {
 			}
 		}
 	}
+
+	//solids
+	SERIALIZE(buffer, packet->region->GetSolidBitset(), REGION_SOLID_FOOTPRINT);
 }
 
 void deserializeRegionFormat(RegionPacket* packet, void* buffer) {
@@ -71,7 +74,7 @@ void deserializeRegionContent(RegionPacket* packet, void* buffer) {
 	//an object to work on
 	packet->region = new Region(packet->x, packet->y);
 
-	//content
+	//tiles
 	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++) {
@@ -80,4 +83,7 @@ void deserializeRegionContent(RegionPacket* packet, void* buffer) {
 			}
 		}
 	}
+
+	//solids
+	DESERIALIZE(buffer, packet->region->GetSolidBitset(), REGION_SOLID_FOOTPRINT);
 }

common/network/udp_network_utility.cpp

@@ -25,7 +25,7 @@
 
 #include <stdexcept>
 
-//DOCS: memset() is used before sending a packet to remove old data; you don't want to send sensitive data over the network
+//BUGFIX: memset() is used before sending a packet to remove old data; you don't want to send sensitive data over the network
 //NOTE: don't confuse SerialPacket with UDPpacket
 
 void UDPNetworkUtility::Open(int port) {

common/ui/menu_bar.hpp

@@ -36,6 +36,7 @@
  * This class needs a rewrite.
 */
 
+//TODO: This thing is fucking terrible, fix it and the button class
 class MenuBar {
 public:
 	MenuBar() = default;

common/utilities/bounding_box.hpp

@@ -0,0 +1,77 @@
+/* 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

common/utilities/config_utility.cpp

@@ -25,25 +25,37 @@
 #include <fstream>
 #include <stdexcept>
 
-using namespace std;
+void ConfigUtility::Load(std::string fname) {
+	//clear the stored configuration
+	configMap.clear();
+	//pass to the recursive method
+	configMap = Read(fname);
+}
 
-void ConfigUtility::Load(string fname) {
-	ifstream is(fname);
+ConfigUtility::table_t ConfigUtility::Read(std::string fname) {
+	//read in and return this file's data
+	table_t retTable;
+	std::ifstream is(fname);
 
 	if (!is.is_open()) {
-		throw(runtime_error("Failed to open config file"));
+		std::string msg;
+		msg += "Failed to open a config file: ";
+		msg += fname;
+		throw(std::runtime_error(msg));
 	}
 
-	string key, val;
+	std::string key, val;
 
-	for (;;) { //forever
+	while(true) { //forever
 		//eat whitespace
-		while(isspace(is.peek()))
+		while(isspace(is.peek())) {
 			is.ignore();
+		}
 
 		//end of file
-		if (is.eof())
+		if (is.eof()) {
 			break;
+		}
 
 		//skip comment lines
 		if (is.peek() == '#') {
@@ -64,41 +76,54 @@ void ConfigUtility::Load(string fname) {
 		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
+		//disallow empty/wiped values
 		if (key.size() == 0) {
 			continue;
 		}
 
 		//save the pair
-		table[key] = val;
+		retTable[key] = val;
 	}
 
 	is.close();
+
+	//load in any subordinate config files
+	//TODO: Possibility of nesting config levels?
+	if (retTable.find("config.next") != retTable.end()) {
+		table_t subTable = Read(retTable["config.next"]);
+		retTable.insert(subTable.begin(), subTable.end());
+	}
+
+	return retTable;
 }
 
+//-------------------------
+//Convert to a type
+//-------------------------
+
 std::string& ConfigUtility::String(std::string s) {
-	return table[s];
+	return configMap[s];
 }
 
 int ConfigUtility::Integer(std::string s) {
-	std::map<std::string, std::string>::iterator it = table.find(s);
-	if (it == table.end()) {
+	table_t::iterator it = configMap.find(s);
+	if (it == configMap.end()) {
 		return 0;
 	}
 	return atoi(it->second.c_str());
 }
 
 double ConfigUtility::Double(std::string s) {
-	std::map<std::string, std::string>::iterator it = table.find(s);
-	if (it == table.end()) {
+	table_t::iterator it = configMap.find(s);
+	if (it == configMap.end()) {
 		return 0.0;
 	}
 	return atof(it->second.c_str());
 }
 
 bool ConfigUtility::Boolean(std::string s) {
-	std::map<std::string, std::string>::iterator it = table.find(s);
-	if (it == table.end()) {
+	table_t::iterator it = configMap.find(s);
+	if (it == configMap.end()) {
 		return false;
 	}
 	return it->second == "true";

common/utilities/config_utility.hpp

@@ -22,14 +22,13 @@
 #ifndef CONFIGUTILITY_HPP_
 #define CONFIGUTILITY_HPP_
 
+#include "singleton.hpp"
+
 #include <map>
 #include <string>
 
-class ConfigUtility {
+class ConfigUtility : public Singleton<ConfigUtility> {
 public:
-	ConfigUtility() = default;
-	ConfigUtility(std::string s) { Load(s); }
-
 	void Load(std::string fname);
 
 	//convert to a type
@@ -39,22 +38,21 @@ public:
 	bool Boolean(std::string);
 
 	//shorthand
-	std::string& operator[](std::string s) {
-		return String(s);
-	}
-	int Int(std::string s) {
-		return Integer(s);
-	}
-	bool Bool(std::string s) {
-		return Boolean(s);
-	}
+	inline std::string& operator[](std::string s) { return configMap[s]; }
+	inline int Int(std::string s) { return Integer(s); }
+	inline bool Bool(std::string s) { return Boolean(s); }
 
-	//OO breaker
-	std::map<std::string, std::string>* GetMap() {
-		return &table;
-	}
 private:
-	std::map<std::string, std::string> table;
+	typedef std::map<std::string, std::string> table_t;
+
+	friend Singleton<ConfigUtility>;
+
+	ConfigUtility() = default;
+	~ConfigUtility() = default;
+
+	table_t Read(std::string fname);
+
+	table_t configMap;
 };
 
 #endif

common/utilities/singleton.hpp

@@ -19,30 +19,45 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ENEMYFACTORYINTERFACE_HPP_
-#define ENEMYFACTORYINTERFACE_HPP_
+#ifndef SINGLETON_HPP_
+#define SINGLETON_HPP_
 
-#include "enemy_data.hpp"
-#include "room_data.hpp"
+#include <stdexcept>
 
-#include <list>
-
-//NOTE: Based on biome, world difficulty, etc.
-class EnemyFactoryInterface {
+template<typename T>
+class Singleton {
 public:
-	EnemyFactoryInterface() = default;
-	virtual ~EnemyFactoryInterface() = default;
+	static T& GetSingleton() {
+		if (!ptr) {
+			throw(std::logic_error("This singleton has not been created"));
+		}
+		return *ptr;
+	}
+	static void Create() {
+		if (ptr) {
+			throw(std::logic_error("This singleton has already been created"));
+		}
+		ptr = new T();
+	}
+	static void Delete() {
+		if (!ptr) {
+			throw(std::logic_error("A non-existant singleton cannot be deleted"));
+		}
+		delete ptr;
+		ptr = nullptr;
+	}
 
-	virtual void Generate(std::list<EnemyData>* container) = 0;
-
-	//control the difficulty of the room
-	RoomData::RoomType SetType(RoomData::RoomType t) { return type = t; }
-	int SetDifficulty(int d) { return difficulty = d; }
-	RoomData::RoomType GetType() { return type; }
-	int GetDifficulty() { return difficulty; }
 protected:
-	RoomData::RoomType type;
-	int difficulty;
+	Singleton() = default;
+	Singleton(Singleton const&) = default;
+	Singleton(Singleton&&) = default;
+	~Singleton() = default;
+
+private:
+	static T* ptr;
 };
 
-#endif
+template<typename T>
+T* Singleton<T>::ptr = nullptr;
+
+#endif

common/utilities/utility.cpp

@@ -32,6 +32,10 @@ int snapToBase(int base, int x) {
 	return x / base * base;
 }
 
+double snapToBase(double base, double x) {
+	return floor(x / base) * base;
+}
+
 std::string truncatePath(std::string pathname) {
 	return std::string(
 		std::find_if(

common/utilities/utility.hpp

@@ -25,6 +25,8 @@
 #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++

common/utilities/vector2.hpp

@@ -41,6 +41,13 @@ 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;
+	}
 
 	//Arithmetic operators
 	Vector2 operator+(Vector2 v) const {
@@ -97,15 +104,6 @@ public:
 	template<typename T> bool operator!=(T t) { return (x != t || y != t); }
 };
 
-//non-member templates (flip the order)
-template<typename T> Vector2 operator+(T t, Vector2 v) { return v + t; }
-template<typename T> Vector2 operator-(T t, Vector2 v) { return v - t; }
-template<typename T> Vector2 operator*(T t, Vector2 v) { return v * t; }
-template<typename T> Vector2 operator/(T t, Vector2 v) { return v / t; }
-
-template<typename T> bool operator==(T t, Vector2 v) { return v == t; }
-template<typename T> bool operator!=(T t, Vector2 v) { return v != t; }
-
 //This is explicitly a POD
 static_assert(std::is_pod<Vector2>::value, "Vector2 is not a POD");
 

makefile

@@ -3,9 +3,10 @@
 #MKDIR=mkdir
 #RM=del /y
 
-CXXFLAGS+=-static-libgcc -static-libstdc++
+#CXXFLAGS+=-static-libgcc -static-libstdc++ -g -fno-inline-functions -Wall
+#CXXFLAGS+=-static-libgcc -static-libstdc++
 
-export
+#export
 
 OUTDIR=out
 
@@ -14,6 +15,12 @@ all: $(OUTDIR)
 	$(MAKE) -C server
 	$(MAKE) -C client
 
+debug: export CXXFLAGS+=-g
+debug: clean all
+
+release: export CXXFLAGS+=-static-libgcc -static-libstdc++
+release: clean all
+
 $(OUTDIR):
 	mkdir $(OUTDIR)
 

rsc/config.cfg

@@ -8,6 +8,8 @@ server.name = local
 server.dbname = database.db
 
 #client specific settings
+#client.screen.w = 800
+#client.screen.h = 600
 client.screen.f = false
 
 client.username = Kayne Ruse

rsc/scripts/setup_server.lua

@@ -1,20 +1,46 @@
-print("Lua script check (./rsc)")
+print("Lua script check")
 
--------------------------
---Map API overrides
--------------------------
+--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
 
-function region.create(r)
-	for i = 1, region.getwidth() do
-		for j = 1, region.getheight() do
-			if math.abs(region.getx(r) + i -1) == math.abs(region.gety(r) + j -1) then
-				region.settile(r, i, j, 1, 50)
+--tile macros, mapped to the 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(r, i, j, 1, 14)
+				Region.SetTile(region, i, j, 1, tiles.water)
+				Region.SetSolid(region, i, j, true)
 			end
 		end
 	end
-
-	--signal
-	region.settile(r, 4, 5, 2, 86)
 end
+
+--Get some regions
+--BUG: The server fails without this
+newRoom = RoomMgr.CreateRoom("overworld")
+pager = Room.GetPager(newRoom)
+regionTable = {
+	RegionPager.GetRegion(pager, Region.GetWidth() * 0, Region.GetHeight() * 0),
+	RegionPager.GetRegion(pager, Region.GetWidth() *-1, Region.GetHeight() * 0),
+	RegionPager.GetRegion(pager, Region.GetWidth() * 0, Region.GetHeight() *-1),
+	RegionPager.GetRegion(pager, Region.GetWidth() *-1, Region.GetHeight() *-1)
+}
+
+print("Finished the lua script")

server/accounts/makefile

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

server/characters/character_data.hpp

@@ -22,22 +22,15 @@
 #ifndef CHARACTERDATA_HPP_
 #define CHARACTERDATA_HPP_
 
+//components
+#include "character_defines.hpp"
 #include "vector2.hpp"
 #include "statistics.hpp"
 
-//graphics
-#ifdef GRAPHICS
- #include "sprite_sheet.hpp"
-#endif
-
 //std namespace
 #include <string>
 #include <cmath>
 
-//the speeds that the characters move
-constexpr double CHARACTER_WALKING_SPEED = 140.0;
-constexpr double CHARACTER_WALKING_MOD = 1.0/sqrt(2.0);
-
 struct CharacterData {
 	//metadata
 	int owner;
@@ -48,28 +41,14 @@ struct CharacterData {
 	int roomIndex = 0;
 	Vector2 origin = {0.0,0.0};
 	Vector2 motion = {0.0,0.0};
-	Vector2 bounds = {0.0,0.0};
 
 	//base statistics
 	Statistics stats;
 
-	//TODO: equipment
-	//TODO: items
-	//TODO: buffs
-	//TODO: debuffs
-
-	//methods
-	void Update(double delta);
-#ifdef GRAPHICS
-	void DrawTo(SDL_Surface* const, int camX, int camY);
-	void CorrectSprite();
-#endif
+	//TODO: gameplay components: equipment, items, buffs, debuffs
 
 	//active gameplay members
 	//NOTE: these are lost when unloaded
-#ifdef GRAPHICS
-	SpriteSheet sprite;
-#endif
 	bool inCombat = false;
 	int atbGauge = 0;
 	//TODO: stored command

server/characters/character_manager.cpp

@@ -58,7 +58,7 @@ static const char* DELETE_CHARACTER = "DELETE FROM Characters WHERE uid = ?;";
 //Define the methods
 //-------------------------
 
-//TODO: default stats as a parameter? This would be good for differing beggining states or multiple classes
+//NOTE: default stats as a parameter would be good for different beggining states or multiple classes
 int CharacterManager::CreateCharacter(int owner, std::string handle, std::string avatar) {
 	//Create the character, failing if it exists
 	sqlite3_stmt* statement = nullptr;
@@ -157,10 +157,7 @@ int CharacterManager::LoadCharacter(int owner, std::string handle, std::string a
 		newChar.stats.evasion = sqlite3_column_double(statement, 20);
 		newChar.stats.luck = sqlite3_column_double(statement, 21);
 
-		//TODO: equipment
-		//TODO: items
-		//TODO: buffs
-		//TODO: debuffs
+		//TODO: gameplay components: equipment, items, buffs, debuffs
 
 		//finish the routine
 		sqlite3_finalize(statement);
@@ -217,10 +214,7 @@ int CharacterManager::SaveCharacter(int uid) {
 	ret |= sqlite3_bind_double(statement, 17, character.stats.evasion) != SQLITE_OK;
 	ret |= sqlite3_bind_double(statement, 18, character.stats.luck) != SQLITE_OK;
 
-	//TODO: equipment
-	//TODO: items
-	//TODO: buffs
-	//TODO: debuffs
+	//TODO: gameplay components: equipment, items, buffs, debuffs
 
 	//check for binding errors
 	if (ret) {

server/characters/makefile

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

server/client_data.hpp

@@ -26,6 +26,7 @@
 
 struct ClientData {
 	IPaddress address = {0,0};
+	//TODO: ping system?
 };
 
 #endif

server/combat/combat_data.hpp

@@ -23,31 +23,18 @@
 #define COMBATDATA_HPP_
 
 #include "vector2.hpp"
+#include "combat_defines.hpp"
 
 //gameplay members
 #include "character_data.hpp"
 #include "enemy_data.hpp"
 
-//graphics
-#ifdef GRAPHICS
- #include "sprite_sheet.hpp"
-#endif
-
 //std namespace
 #include <chrono>
 #include <array>
 #include <utility>
 
-#define COMBAT_MAX_CHARACTERS 12
-#define COMBAT_MAX_ENEMIES 12
-
 struct CombatData {
-	enum class Terrain {
-		//TODO: types of combat terrains
-		NONE = 0,
-		GRASSLANDS,
-	};
-
 	typedef std::chrono::steady_clock Clock;
 
 	std::array<CharacterData, COMBAT_MAX_CHARACTERS> characterArray;
@@ -60,11 +47,6 @@ struct CombatData {
 
 	//time interval
 	Clock::time_point lastTick = Clock::now();
-
-	//graphics
-#ifdef GRAPHICS
-	SpriteSheet sprite;
-#endif
 };
 
 #endif

server/combat/makefile

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

server/enemies/enemy_data.hpp

@@ -25,11 +25,6 @@
 #include "vector2.hpp"
 #include "statistics.hpp"
 
-//graphics
-#ifdef GRAPHICS
- #include "sprite_sheet.hpp"
-#endif
-
 //std namespace
 #include <string>
 
@@ -41,20 +36,10 @@ struct EnemyData {
 	//gameplay
 	Statistics stats;
 
-	//TODO: equipment
-	//TODO: items
-	//TODO: buffs
-	//TODO: debuffs
-
-	//TODO: rewards
+	//TODO: gameplay components: equipment, items, buffs, debuffs, rewards
 
 	//active gameplay members
 	//NOTE: these are lost when unloaded
-#ifdef GRAPHICS
-	SpriteSheet sprite;
-	Vector2 origin = {0.0,0.0};
-	Vector2 bounds = {0.0,0.0};
-#endif
 	int tableIndex;
 	int atbGauge = 0;
 };

server/enemies/makefile

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

server/linit.cpp

@@ -37,7 +37,10 @@
 #include "lua/lua.hpp"
 
 #include "region_api.hpp"
-#include "pager_api.hpp"
+#include "region_pager_api.hpp"
+#include "tile_sheet_api.hpp"
+#include "room_api.hpp"
+#include "room_mgr_api.hpp"
 
 //these libs are loaded by lua.c and are readily available to any Lua program
 static const luaL_Reg loadedlibs[] = {
@@ -53,9 +56,12 @@ static const luaL_Reg loadedlibs[] = {
 	{LUA_MATHLIBNAME, luaopen_math},
 	{LUA_DBLIBNAME, luaopen_debug},
 
-	//custom libs
-	{LUA_REGIONLIBNAME, luaopen_regionapi},
-	{LUA_PAGERLIBNAME, luaopen_pagerapi},
+	//Tortuga's API
+	{TORTUGA_REGION_NAME, openRegionAPI},
+	{TORTUGA_REGION_PAGER_NAME, openRegionPagerAPI},
+	{TORTUGA_TILE_SHEET_NAME, openTileSheetAPI},
+	{TORTUGA_ROOM_NAME, openRoomAPI},
+	{TORTUGA_ROOM_MGR_NAME, openRoomMgrAPI},
 
 	{NULL, NULL}
 };

server/main.cpp

@@ -21,7 +21,8 @@
 */
 #include "server_application.hpp"
 
-#include "SDL/SDL.h"
+//singletons
+#include "config_utility.hpp"
 
 #include <stdexcept>
 #include <iostream>
@@ -29,17 +30,24 @@
 using namespace std;
 
 int main(int argc, char** argv) {
-	cout << "Beginning server" << endl;
 	try {
-		ServerApplication app;
+		//create the singletons
+		ConfigUtility::Create();
+		ServerApplication::Create();
+
+		//call the server's routines
+		ServerApplication& app = ServerApplication::GetSingleton();
 		app.Init(argc, argv);
 		app.Proc();
 		app.Quit();
+
+		//delete the singletons
+		ConfigUtility::Delete();
+		ServerApplication::Delete();
 	}
 	catch(exception& e) {
-		cerr << "Fatal error: " << e.what() << endl;
+		cerr << "Fatal exception thrown: " << e.what() << endl;
 		return 1;
 	}
-	cout << "Clean exit" << endl;
 	return 0;
 }

server/makefile

@@ -1,6 +1,6 @@
 #config
-INCLUDES+=. ../common/gameplay ../common/map ../common/network ../common/network/packet ../common/network/serial ../common/utilities
-LIBS+=../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
+INCLUDES+=. accounts characters combat enemies mapgen mapgen/generators rooms ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet ../common/network/serial ../common/utilities
+LIBS+=server.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
@@ -16,6 +16,11 @@ OUT=$(addprefix $(OUTDIR)/,server)
 
 #targets
 all: $(OBJ) $(OUT)
+	$(MAKE) -C accounts
+	$(MAKE) -C characters
+	$(MAKE) -C combat
+	$(MAKE) -C enemies
+	$(MAKE) -C rooms
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)

server/room_manager.cpp

@@ -1,72 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "room_manager.hpp"
-
-#include <stdexcept>
-
-//-------------------------
-//public access methods
-//-------------------------
-
-RoomData* RoomManager::CreateRoom(int uid) {
-	//don't overwrite existing rooms
-	std::map<int, RoomData*>::iterator it = roomMap.find(uid);
-	if (it != roomMap.end()) {
-		throw(std::runtime_error("Cannot overwrite an existing room"));
-	}
-	roomMap[uid] = new RoomData();
-	//TODO: create room in the API
-	if (luaState) {
-		roomMap[uid]->pager.SetLuaState(luaState);
-	}
-	return roomMap[uid];
-}
-
-RoomData* RoomManager::UnloadRoom(int uid) {
-	//TODO: unload room in the API
-	delete roomMap[uid];
-	roomMap.erase(uid);
-}
-
-RoomData* RoomManager::GetRoom(int uid) {
-	RoomData* ptr = FindRoom(uid);
-	if (ptr) return ptr;
-	ptr = CreateRoom(uid);
-	return ptr;
-}
-
-RoomData* RoomManager::FindRoom(int uid) {
-	std::map<int, RoomData*>::iterator it = roomMap.find(uid);
-	if (it == roomMap.end()) {
-		return nullptr;
-	}
-	return it->second;
-}
-
-RoomData* RoomManager::PushRoom(int uid, RoomData* room) {
-	//unload existing rooms with this index
-	std::map<int, RoomData*>::iterator it = roomMap.find(uid);
-	if (it != roomMap.end()) {
-		UnloadRoom(uid);
-	}
-	roomMap[uid] = room;
-}

server/rooms/makefile

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

server/rooms/room_api.cpp

@@ -0,0 +1,54 @@
+/* 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 "room_api.hpp"
+
+#include "room_data.hpp"
+
+static int getPager(lua_State* L) {
+	RoomData* room = reinterpret_cast<RoomData*>(lua_touserdata(L, 1));
+	lua_pushlightuserdata(L, reinterpret_cast<void*>(&room->pager));
+	return 1;
+}
+
+static int onCreate(lua_State* L) {
+	//TODO: onCreate()
+	return 0;
+}
+
+static int onUnload(lua_State* L) {
+	//TODO: onUnload()
+	return 0;
+}
+
+//TODO: parameters
+
+static const luaL_Reg roomLib[] = {
+	{"GetPager",getPager},
+	{"OnCreate", onCreate},
+	{"OnUnload", onUnload},
+	{nullptr, nullptr}
+};
+
+LUAMOD_API int openRoomAPI(lua_State* L) {
+	luaL_newlib(L, roomLib);
+	return 1;
+}

server/rooms/room_api.hpp

@@ -24,7 +24,7 @@
 
 #include "lua/lua.hpp"
 
-#define LUA_ROOMLIBNAME "room"
-LUAMOD_API int luaopen_roomapi(lua_State* L);
+#define TORTUGA_ROOM_NAME "Room"
+LUAMOD_API int openRoomAPI(lua_State* L);
 
 #endif

server/rooms/room_data.hpp

@@ -26,17 +26,8 @@
 #include "region_pager_lua.hpp"
 
 struct RoomData {
-	enum class RoomType {
-		OVERWORLD = 0,
-		RUINS = 1,
-		TOWERS = 2,
-		FORESTS = 3,
-		CAVE = 4,
-	};
-
 	//members
 	RegionPagerLua pager;
-	RoomType type;
 
 	//TODO: collision map
 	//TODO: NPCs?

server/rooms/room_manager.cpp

@@ -0,0 +1,108 @@
+/* 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 "room_manager.hpp"
+
+#include <stdexcept>
+
+//-------------------------
+//public access methods
+//-------------------------
+
+RoomData* RoomManager::CreateRoom() {
+	//create the room
+	RoomData* newRoom = new RoomData();
+
+	//set the state
+	if (luaState) {
+		newRoom->pager.SetLuaState(luaState);
+	}
+
+	//register the room
+	roomMap[counter++] = newRoom;
+
+	//API hook
+	lua_getglobal(luaState, "Room");
+	lua_getfield(luaState, -1, "OnCreate");
+	lua_pushlightuserdata(luaState, newRoom);
+	if (lua_pcall(luaState, 1, 0, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+	}
+	lua_pop(luaState, 1);
+
+	//finish the routine
+	return newRoom;
+}
+
+void RoomManager::UnloadRoom(int uid) {
+	//find the room
+	RoomData* room = FindRoom(uid);
+	if (!room) {
+		return;
+	}
+
+	//API hook
+	lua_getglobal(luaState, "Room");
+	lua_getfield(luaState, -1, "OnUnload");
+	lua_pushlightuserdata(luaState, room);
+	if (lua_pcall(luaState, 1, 0, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+	}
+	lua_pop(luaState, 1);
+
+	//free the memory
+	delete room;
+	roomMap.erase(uid);
+}
+
+RoomData* RoomManager::GetRoom(int uid) {
+	return FindRoom(uid);
+	//TODO: expand this to auto-create the room
+}
+
+RoomData* RoomManager::FindRoom(int uid) {
+	std::map<int, RoomData*>::iterator it = roomMap.find(uid);
+	if (it == roomMap.end()) {
+		return nullptr;
+	}
+	return it->second;
+}
+
+int RoomManager::PushRoom(RoomData* room) {
+	roomMap[counter++] = room;
+	return counter;
+}
+
+void RoomManager::UnloadAll() {
+	lua_getglobal(luaState, "Room");
+
+	for (auto& it : roomMap) {
+		//API hook
+		lua_getfield(luaState, -1, "OnUnload");
+		lua_pushlightuserdata(luaState, it.second);
+		if (lua_pcall(luaState, 1, 0, 0) != LUA_OK) {
+			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+		}
+	}
+
+	lua_pop(luaState, 1);
+	roomMap.clear();
+}

server/rooms/room_manager.hpp

@@ -36,12 +36,14 @@ public:
 	~RoomManager() = default;
 
 	//public access methods
-	RoomData* CreateRoom(int uid);
-	RoomData* UnloadRoom(int uid);
+	RoomData* CreateRoom();
+	void UnloadRoom(int uid);
 
 	RoomData* GetRoom(int uid);
 	RoomData* FindRoom(int uid);
-	RoomData* PushRoom(int uid, RoomData*);
+	int PushRoom(RoomData*);
+
+	void UnloadAll();
 
 	//accessors and mutators
 	std::map<int, RoomData*>* GetContainer() { return &roomMap; }
@@ -52,6 +54,7 @@ public:
 private:
 	std::map<int, RoomData*> roomMap;
 	lua_State* luaState = nullptr;
+	int counter = 0;
 };
 
 #endif

server/rooms/room_mgr_api.cpp

@@ -19,26 +19,14 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "room_api.hpp"
+#include "room_mgr_api.hpp"
 
+#include "room_api.hpp"
 #include "room_manager.hpp"
 #include "room_data.hpp"
 
-static int getType(lua_State* L) {
-	RoomData* room = reinterpret_cast<RoomData*>(lua_touserdata(L, 1));
-	lua_pushinteger(L, static_cast<int>(room->type));
-	return 1;
-}
+#include <string>
 
-//TODO: parameters
-
-static int getRegionPager(lua_State* L) {
-	RoomData* room = reinterpret_cast<RoomData*>(lua_touserdata(L, 1));
-	lua_pushlightuserdata(L, reinterpret_cast<void*>(&room->pager));
-	return 1;
-}
-
-//RoomManager only
 static int getRoom(lua_State* L) {
 	//get the room manager
 	lua_pushstring(L, ROOM_MANAGER_PSEUDOINDEX);
@@ -50,14 +38,42 @@ static int getRoom(lua_State* L) {
 	return 1;
 }
 
-static const luaL_Reg roomlib[] = {
-	{"gettype",getType},
-	{"getregionpager",getRegionPager},
-	{"getroom",getRoom},
+static int createRoom(lua_State* L) {
+	//TODO: check parameter count for the glue functions
+
+	//get the room manager
+	lua_pushstring(L, ROOM_MANAGER_PSEUDOINDEX);
+	lua_gettable(L, LUA_REGISTRYINDEX);
+	RoomManager* roomMgr = reinterpret_cast<RoomManager*>(lua_touserdata(L, -1));
+
+	//create the room
+	RoomData* newRoom = roomMgr->CreateRoom();
+
+	//return the new room
+	lua_pushlightuserdata(L, newRoom);
+	return 1;
+}
+
+static int unloadRoom(lua_State* L) {
+	//get the room manager
+	lua_pushstring(L, ROOM_MANAGER_PSEUDOINDEX);
+	lua_gettable(L, LUA_REGISTRYINDEX);
+	RoomManager* roomMgr = reinterpret_cast<RoomManager*>(lua_touserdata(L, -1));
+
+	//unload the specified room
+	roomMgr->UnloadRoom(lua_tointeger(L, -2));
+
+	return 0;
+}
+
+static const luaL_Reg roomMgrLib[] = {
+	{"GetRoom",getRoom},
+	{"CreateRoom",createRoom},
+	{"UnloadRoom",unloadRoom},
 	{nullptr, nullptr}
 };
 
-LUAMOD_API int luaopen_roomapi(lua_State* L) {
-	luaL_newlib(L, roomlib);
+LUAMOD_API int openRoomMgrAPI(lua_State* L) {
+	luaL_newlib(L, roomMgrLib);
 	return 1;
 }

server/rooms/room_mgr_api.hpp

@@ -19,12 +19,12 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef PAGERAPI_HPP_
-#define PAGERAPI_HPP_
+#ifndef ROOMMGRAPI_HPP_
+#define ROOMMGRAPI_HPP_
 
 #include "lua/lua.hpp"
 
-#define LUA_PAGERLIBNAME "pager"
-LUAMOD_API int luaopen_pagerapi(lua_State* L);
+#define TORTUGA_ROOM_MGR_NAME "RoomMgr"
+LUAMOD_API int openRoomMgrAPI(lua_State* L);
 
 #endif

server/server_application.cpp

@@ -21,8 +21,11 @@
 */
 #include "server_application.hpp"
 
-#include "sql_utility.hpp"
+//for PACKET_BUFFER_SIZE
 #include "serial.hpp"
+
+//utility functions
+#include "sql_utility.hpp"
 #include "utility.hpp"
 
 #include <stdexcept>
@@ -35,9 +38,9 @@
 
 void ServerApplication::Init(int argc, char** argv) {
 	//NOTE: I might need to rearrange the init process so that lua & SQL can interact with the map system as needed.
-	std::cout << "Beginning startup" << std::endl;
+	std::cout << "Beginning " << argv[0] << std::endl;
 
-	//initial setup
+	//load the prerequisites
 	config.Load("rsc\\config.cfg");
 
 	//-------------------------
@@ -80,9 +83,7 @@ void ServerApplication::Init(int argc, char** argv) {
 	accountMgr.SetDatabase(database);
 	characterMgr.SetDatabase(database);
 
-	combatMgr.SetLuaState(luaState);
 	roomMgr.SetLuaState(luaState);
-	enemyMgr.SetLuaState(luaState);
 
 	std::cout << "Internal managers set" << std::endl;
 
@@ -113,12 +114,22 @@ void ServerApplication::Init(int argc, char** argv) {
 	//debug output
 	//-------------------------
 
+	//TODO: enable/disable these with a switch
+#define DEBUG_OUTPUT_VAR(x) std::cout << "\t" << #x << ": " << x << std::endl;
+
 	std::cout << "Internal sizes:" << std::endl;
-	std::cout << "\tTile Size: " << sizeof(Region::type_t) << std::endl;
-	std::cout << "\tRegion Format: " << REGION_WIDTH << ", " << REGION_HEIGHT << ", " << REGION_DEPTH << std::endl;
-	std::cout << "\tRegion Content Footprint: " << REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH * sizeof(Region::type_t) << std::endl;
-	std::cout << "\tPACKET_BUFFER_SIZE: " << PACKET_BUFFER_SIZE << std::endl;
-	std::cout << "\tMAX_PACKET_SIZE: " << MAX_PACKET_SIZE << std::endl;
+
+	DEBUG_OUTPUT_VAR(sizeof(Region::type_t));
+	DEBUG_OUTPUT_VAR(sizeof(Region));
+	DEBUG_OUTPUT_VAR(REGION_WIDTH);
+	DEBUG_OUTPUT_VAR(REGION_HEIGHT);
+	DEBUG_OUTPUT_VAR(REGION_DEPTH);
+	DEBUG_OUTPUT_VAR(REGION_SOLID_FOOTPRINT);
+	DEBUG_OUTPUT_VAR(REGION_FOOTPRINT);
+	DEBUG_OUTPUT_VAR(PACKET_BUFFER_SIZE);
+	DEBUG_OUTPUT_VAR(MAX_PACKET_SIZE);
+
+#undef DEBUG_OUTPUT_VAR
 
 	//-------------------------
 	//finalize the startup
@@ -141,7 +152,8 @@ void ServerApplication::Proc() {
 			HandlePacket(packetBuffer);
 		}
 		//update the internals
-		//TODO: update the internals i.e. player positions
+		//BUG: #30 Update the internals i.e. player positions
+
 		//give the computer a break
 		SDL_Delay(10);
 	}
@@ -157,7 +169,7 @@ void ServerApplication::Quit() {
 	characterMgr.UnloadAll();
 	//TODO: unload combats
 	//TODO: unload enemies
-	//TODO: unload rooms
+	roomMgr.UnloadAll();
 
 	//APIs
 	lua_close(luaState);
@@ -166,7 +178,7 @@ void ServerApplication::Quit() {
 	SDLNet_Quit();
 	SDL_Quit();
 
-	std::cout << "Shutdown finished" << std::endl;
+	std::cout << "Clean exit" << std::endl;
 }
 
 //-------------------------
@@ -269,6 +281,16 @@ void ServerApplication::HandleJoinRequest(ClientPacket* const argPacket) {
 
 void ServerApplication::HandleDisconnect(ClientPacket* const argPacket) {
 	//TODO: authenticate who is disconnecting/kicking
+	/*Pseudocode:
+	if sender's account index -> client index -> address == sender's address then
+		continue
+	end
+	if sender's account index -> admin == true OR sender's account index -> mod == true then
+		continue
+	end
+	if neither of the above is true, then output a warning to the console, and return
+	*/
+
 
 	//forward to the specified client
 	network.SendTo(
@@ -296,6 +318,12 @@ void ServerApplication::HandleDisconnect(ClientPacket* const argPacket) {
 
 void ServerApplication::HandleShutdown(SerialPacket* const argPacket) {
 	//TODO: authenticate who is shutting the server down
+	/*Pseudocode:
+	if sender's account -> admin is not true then
+		print a warning
+		return
+	end
+	*/
 
 	//end the server
 	running = false;
@@ -327,17 +355,12 @@ void ServerApplication::HandleRegionRequest(RegionPacket* const argPacket) {
 	network.SendTo(&argPacket->srcAddress, static_cast<SerialPacket*>(&newPacket));
 }
 
-//-------------------------
-//combat management
-//-------------------------
-
-//TODO: combat management
-
 //-------------------------
 //Character Management
 //-------------------------
 
 void ServerApplication::HandleCharacterNew(CharacterPacket* const argPacket) {
+	//BUG: #27 Characters can be created with an invalid account index
 	//NOTE: misnomer, try to load the character first
 	int characterIndex = characterMgr.LoadCharacter(argPacket->accountIndex, argPacket->handle, argPacket->avatar);
 
@@ -398,35 +421,18 @@ void ServerApplication::HandleCharacterUpdate(CharacterPacket* const argPacket)
 		return;
 	}
 
-	/* TODO: rewrite this design flaw, read more
-	 * Slaving the client to the server here is a terrible idea, instead there
-	 * needs to be a utility function to update and send the server-side character
-	 * to the clients.
-	 *
-	 * Other things to consider include functionality to reequip the character,
-	 * apply status effects and to change the stats as well. These should all be
-	 * handled server-side.
-	*/
+	//accept client-side logic
 	character->roomIndex = argPacket->roomIndex;
 	character->origin = argPacket->origin;
 	character->motion = argPacket->motion;
 
 	character->stats = argPacket->stats;
 
-	//TODO: equipment
-	//TODO: items
-	//TODO: buffs
-	//TODO: debuffs
+	//TODO: gameplay components: equipment, items, buffs, debuffs
 
 	PumpPacket(argPacket);
 }
 
-//-------------------------
-//enemy management
-//-------------------------
-
-//TODO: enemy management
-
 //-------------------------
 //mismanagement
 //-------------------------