Problems with lambdas and references

OK, so I think I was working on the parameters for CreateRoom() in lua,
but then shit just got ot of control. IDK, I'm probably going about this
all wrong anyway. I just want to finish this stage, and reach the high
water mark again.

README.md

@@ -1,14 +1,17 @@
+## Outline
+
+Tortuga is a 2D multiplayer JRPG featuring permadeath, with an emphasis on multiplayer cooperation, exploration and customization. The game runs on customizable public and private servers.
+
+This game is inspired by classic 2D RPGs (Final Fantasy, The Legend of Zelda), as well as more modern sandboxes amd MMOs (Minecraft, EVE Online). This project is currently independently created and funded, with the goal of creating a game that will engage the players and inspire a large community.
+
+## Releases
+
 The most recent stable build for Windows can be found [here](https://dl.dropboxusercontent.com/u/46669050/Tortuga.rar).
 
-Tortuga is a 2D multiplayer JRPG featuring permadeath (deletion of a character upon death). The emphasis of this game is on multiplayer cooperation, exploration and customization. The game runs on customizable server software that can support up to 150 simultaneous players or more.
-
-This game is inspired by classic 2D RPGs, as well as more modern sandbox MMOs. This project is currently independently created and funded, with the goal of creating a game that will engage user's imagination and inspire a large modding community.
-
 ## Documentation
 
-Tortuga's full documentation can be found in a separate branch, see [Tortuga/docs](https://github.com/Ratstail91/Tortuga/tree/docs).  
-For Tortuga's primary documentation, please read the [Tortuga Game Design Document](https://github.com/Ratstail91/Tortuga/blob/docs/Tortuga%20Game%20Design%20Document.docx?raw=true).  
-For a list of known bugs, see the [GitHub bug tracker](https://github.com/Ratstail91/Tortuga/issues).
+* [Tortuga Wiki](https://github.com/Ratstail91/Tortuga/wiki) - Full documentation
+* [Tortuga Bug Tracker](https://github.com/Ratstail91/Tortuga/issues) - A list of all known bugs and issues
 
 ## External Dependencies
 

README.txt

@@ -0,0 +1,34 @@
+This is the README for Tortuga's demo build. The source code is available at:
+
+   https://github.com/Ratstail91/Tortuga
+
+The current build may have bugs, missing features, bugs masquerading as
+features, etc. You can report a bug/feature here:
+
+   https://github.com/Ratstail91/Tortuga/issues
+
+Please note that this game requires a functioning server to operate correctly.
+Both a game server and game client are included in this package.
+
+-------------------------
+Instructions For Setup
+-------------------------
+
+1. To create a server, simply run server.exe.
+2. To join that server, run client.exe with config settings not already in use.
+    (Note: This process will be streamlined later).
+3. To change the config settings, open rsc/config.cfg
+4. These settings must be unique for each player:
+
+* client.username
+* client.handle
+
+5. There are currently two options for 'client.avatar':
+
+* client.avatar = elliot2.bmp #male
+* client.avatar = coa2.bmp    #female
+
+6. When you've correctly set these values (good luck), select 'Start' from the
+    main menu; this displays the list of available servers.
+7. Select the name of your server (default is 'local') and select 'Join'.
+8. Welcome to Tortuga, enjoy your stay.

client/character.hpp

@@ -1,95 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef CHARACTER_HPP_
-#define CHARACTER_HPP_
-
-//components
-#include "character_defines.hpp"
-#include "vector2.hpp"
-#include "bounding_box.hpp"
-#include "statistics.hpp"
-
-//graphics
-#include "sprite_sheet.hpp"
-
-//std namespace
-#include <string>
-#include <cmath>
-
-class Character {
-public:
-	Character() = default;
-	~Character() = default;
-
-	void Update(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

@@ -21,7 +21,7 @@
 */
 #include "client_application.hpp"
 
-#include "serial.hpp"
+#include "serial_packet.hpp"
 #include "config_utility.hpp"
 
 #include <stdexcept>
@@ -38,19 +38,18 @@
 #include "options_menu.hpp"
 #include "lobby_menu.hpp"
 #include "in_world.hpp"
-#include "in_combat.hpp"
-#include "clean_up.hpp"
+#include "disconnected_screen.hpp"
 
 //-------------------------
 //Public access members
 //-------------------------
 
-void ClientApplication::Init(int argc, char** argv) {
+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");
+	config.Load("rsc/config.cfg", argc, argv);
 
 	//-------------------------
 	//Initialize the APIs
@@ -66,7 +65,7 @@ void ClientApplication::Init(int argc, char** argv) {
 	if (SDLNet_Init()) {
 		throw(std::runtime_error("Failed to initialize SDL_net"));
 	}
-	network.Open(0);
+	UDPNetworkUtility::GetSingleton().Open(0);
 	std::cout << "Initialized SDL_net" << std::endl;
 
 	//-------------------------
@@ -89,15 +88,18 @@ void ClientApplication::Init(int argc, char** argv) {
 
 	std::cout << "Internal sizes:" << std::endl;
 
+	DEBUG_OUTPUT_VAR(NETWORK_VERSION);
 	DEBUG_OUTPUT_VAR(sizeof(Region::type_t));
 	DEBUG_OUTPUT_VAR(sizeof(Region));
 	DEBUG_OUTPUT_VAR(REGION_WIDTH);
 	DEBUG_OUTPUT_VAR(REGION_HEIGHT);
 	DEBUG_OUTPUT_VAR(REGION_DEPTH);
+	DEBUG_OUTPUT_VAR(REGION_TILE_FOOTPRINT);
 	DEBUG_OUTPUT_VAR(REGION_SOLID_FOOTPRINT);
-	DEBUG_OUTPUT_VAR(REGION_FOOTPRINT);
+	DEBUG_OUTPUT_VAR(PACKET_STRING_SIZE);
 	DEBUG_OUTPUT_VAR(PACKET_BUFFER_SIZE);
 	DEBUG_OUTPUT_VAR(MAX_PACKET_SIZE);
+	DEBUG_OUTPUT_VAR(static_cast<int>(SerialPacketType::LAST));
 
 #undef DEBUG_OUTPUT_VAR
 
@@ -120,7 +122,6 @@ void ClientApplication::Proc() {
 	//prepare the time system
 	typedef std::chrono::steady_clock Clock;
 
-	std::chrono::duration<int, std::milli> delta(16);
 	Clock::time_point simTime = Clock::now();
 	Clock::time_point realTime;
 
@@ -138,8 +139,9 @@ void ClientApplication::Proc() {
 		//simulate game time
 		while (simTime < realTime) {
 			//call each user defined function
-			activeScene->RunFrame(double(delta.count()) / std::chrono::duration<int, std::milli>::period::den);
-			simTime += delta;
+			activeScene->RunFrame();
+			//~60 FPS
+			simTime += std::chrono::duration<int, std::milli>(16);
 		}
 
 		//draw the game to the screen
@@ -151,7 +153,7 @@ void ClientApplication::Proc() {
 
 void ClientApplication::Quit() {
 	std::cout << "Shutting down" << std::endl;
-	network.Close();
+	UDPNetworkUtility::GetSingleton().Close();
 	SDLNet_Quit();
 	SDL_Quit();
 	std::cout << "Clean exit" << std::endl;
@@ -176,16 +178,13 @@ void ClientApplication::LoadScene(SceneList sceneIndex) {
 			activeScene = new OptionsMenu();
 		break;
 		case SceneList::LOBBYMENU:
-			activeScene = new LobbyMenu(&network, &clientIndex, &accountIndex);
+			activeScene = new LobbyMenu(&clientIndex, &accountIndex); //TODO: can I use the ConfigUtility for these parameters?
 		break;
 		case SceneList::INWORLD:
-			activeScene = new InWorld(&network, &clientIndex, &accountIndex, &characterIndex, &characterMap);
+			activeScene = new InWorld(&clientIndex, &accountIndex);
 		break;
-		case SceneList::INCOMBAT:
-			activeScene = new InCombat(&network, &clientIndex, &accountIndex, &characterIndex, &characterMap);
-		break;
-		case SceneList::CLEANUP:
-			activeScene = new CleanUp(&network, &clientIndex, &accountIndex, &characterIndex, &characterMap);
+		case SceneList::DISCONNECTEDSCREEN:
+			activeScene = new DisconnectedScreen();
 		break;
 		default:
 			throw(std::logic_error("Failed to recognize the scene index"));

client/client_application.hpp

@@ -26,7 +26,6 @@
 #include "base_scene.hpp"
 
 #include "udp_network_utility.hpp"
-#include "character.hpp"
 
 #include "singleton.hpp"
 
@@ -35,7 +34,7 @@
 class ClientApplication: public Singleton<ClientApplication> {
 public:
 	//public methods
-	void Init(int argc, char** argv);
+	void Init(int argc, char* argv[]);
 	void Proc();
 	void Quit();
 
@@ -52,12 +51,8 @@ private:
 	BaseScene* activeScene = nullptr;
 
 	//shared parameters
-	UDPNetworkUtility network;
 	int clientIndex = -1;
 	int accountIndex = -1;
-	int characterIndex = -1;
-
-	CharacterMap characterMap;
 };
 
 #endif

client/entities/base_character.cpp

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

client/entities/base_character.hpp

@@ -19,34 +19,37 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef COMBATDATA_HPP_
-#define COMBATDATA_HPP_
+#ifndef BASECHARACTER_HPP_
+#define BASECHARACTER_HPP_
 
-#include "vector2.hpp"
-#include "combat_defines.hpp"
-
-//gameplay members
-#include "character_data.hpp"
-#include "enemy_data.hpp"
+//components
+#include "character_defines.hpp"
+#include "entity.hpp"
 
 //std namespace
-#include <chrono>
-#include <array>
-#include <utility>
+#include <string>
 
-struct CombatData {
-	typedef std::chrono::steady_clock Clock;
+class BaseCharacter : public Entity {
+public:
+	BaseCharacter() = default;
+	virtual ~BaseCharacter() = default;
 
-	std::array<CharacterData, COMBAT_MAX_CHARACTERS> characterArray;
-	std::array<EnemyData, COMBAT_MAX_ENEMIES> enemyArray;
+	//graphics
+	void CorrectSprite();
 
-	//world interaction
-	int mapIndex = 0;
-	Vector2 origin = {0.0,0.0};
-	Vector2 bounds = {0.0,0.0};
+	//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; }
 
-	//time interval
-	Clock::time_point lastTick = Clock::now();
+private:
+	//metadata
+	int owner;
+	std::string handle;
+	std::string avatar;
 };
 
 #endif

client/entities/base_monster.cpp

@@ -19,14 +19,5 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CLIENTDATA_HPP_
-#define CLIENTDATA_HPP_
+#include "base_monster.hpp"
 
-#include "SDL/SDL_net.h"
-
-struct ClientData {
-	IPaddress address = {0,0};
-	//TODO: ping system?
-};
-
-#endif

client/entities/base_monster.hpp

@@ -0,0 +1,36 @@
+/* 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 BASEMONSTER_HPP_
+#define BASEMONSTER_HPP_
+
+#include "entity.hpp"
+
+class BaseMonster : public Entity {
+public:
+	BaseMonster() = default;
+	virtual ~BaseMonster() = default;
+
+private:
+	//
+};
+
+#endif

client/entities/entity.cpp

@@ -19,36 +19,44 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "combat_manager.hpp"
+#include "entity.hpp"
 
-//-------------------------
-//public access methods
-//-------------------------
-
-//TODO
-
-//-------------------------
-//accessors and mutators
-//-------------------------
-
-CombatData* CombatManager::GetCombat(int uid) {
-	std::map<int, CombatData>::iterator it = combatMap.find(uid);
-
-	if (it == combatMap.end()) {
-		return nullptr;
+void Entity::Update() {
+	origin += motion;
+	sprite.Update(0.016);
 }
 
-	return &it->second;
+void Entity::DrawTo(SDL_Surface* const dest, int camX, int camY) {
+	sprite.DrawTo(dest, origin.x - camX, origin.y - camY);
 }
 
-std::map<int, CombatData>* CombatManager::GetContainer() {
-	return &combatMap;
+int Entity::SetEntityIndex(int i) {
+	return entityIndex = i;
 }
 
-lua_State* CombatManager::SetLuaState(lua_State* L) {
-	return luaState = L;
+int Entity::SetRoomIndex(int i) {
+	return roomIndex = i;
 }
 
-lua_State* CombatManager::GetLuaState() {
-	return luaState;
+Vector2 Entity::SetOrigin(Vector2 v) {
+	return origin = v;
+}
+
+Vector2 Entity::SetMotion(Vector2 v) {
+	return motion = v;
+}
+int Entity::GetEntityIndex() {
+	return entityIndex;
+}
+
+int Entity::GetRoomIndex() {
+	return roomIndex;
+}
+
+Vector2 Entity::GetOrigin() {
+	return origin;
+}
+
+Vector2 Entity::GetMotion() {
+	return motion;
 }

client/entities/entity.hpp

@@ -0,0 +1,62 @@
+/* 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 ENTITY_HPP_
+#define ENTITY_HPP_
+
+#include "bounding_box.hpp"
+#include "sprite_sheet.hpp"
+#include "vector2.hpp"
+
+//The base class for all objects in the world
+class Entity {
+public:
+	virtual void Update();
+	virtual void DrawTo(SDL_Surface* const, int camX, int camY);
+
+	SpriteSheet* GetSprite() { return &sprite; }
+
+	//accessors & mutators
+	int SetEntityIndex(int i);
+	int SetRoomIndex(int i);
+	Vector2 SetOrigin(Vector2 v);
+	Vector2 SetMotion(Vector2 v);
+	BoundingBox SetBounds(BoundingBox b) { return bounds = b; }
+
+	int GetEntityIndex();
+	int GetRoomIndex();
+	Vector2 GetOrigin();
+	Vector2 GetMotion();
+	BoundingBox GetBounds() { return bounds; }
+
+protected:
+	Entity() = default;
+	~Entity() = default;
+
+	SpriteSheet sprite;
+	int entityIndex = -1;
+	int roomIndex = -1;
+	Vector2 origin;
+	Vector2 motion;
+	BoundingBox bounds;
+};
+
+#endif

client/entities/makefile

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

@@ -23,27 +23,32 @@
 
 //singletons
 #include "config_utility.hpp"
+#include "udp_network_utility.hpp"
 
 #include <stdexcept>
 #include <iostream>
 
 using namespace std;
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
 	try {
 		//create the singletons
-		ClientApplication::Create();
-		ConfigUtility::Create();
+		ConfigUtility::CreateSingleton();
+		UDPNetworkUtility::CreateSingleton();
 
 		//call the server's routines
+		ClientApplication::CreateSingleton();
 		ClientApplication& app = ClientApplication::GetSingleton();
+
 		app.Init(argc, argv);
 		app.Proc();
 		app.Quit();
 
+		ClientApplication::DeleteSingleton();
+
 		//delete the singletons
-		ConfigUtility::Delete();
-		ClientApplication::Delete();
+		ConfigUtility::DeleteSingleton();
+		UDPNetworkUtility::DeleteSingleton();
 	}
 	catch(exception& e) {
 		cerr << "Fatal exception thrown: " << e.what() << endl;

client/makefile

@@ -1,6 +1,15 @@
-#config
-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
+#include directories
+INCLUDES+=. entities scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
+
+#libraries
+#the order of the $(LIBS) is important, at least for MinGW
+LIBS+=client.a ../libcommon.a -lSDL_net
+ifeq ($(OS),Windows_NT)
+	LIBS+=-lwsock32 -liphlpapi -lmingw32
+endif
+LIBS+=-lSDLmain -lSDL
+
+#flags
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
@@ -16,6 +25,7 @@ OUT=$(addprefix $(OUTDIR)/,client)
 
 #targets
 all: $(OBJ) $(OUT)
+	$(MAKE) -C entities
 	$(MAKE) -C scenes
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 

client/scene_list.hpp

@@ -34,8 +34,7 @@ enum class SceneList {
 	OPTIONSMENU,
 	LOBBYMENU,
 	INWORLD,
-	INCOMBAT,
-	CLEANUP,
+	DISCONNECTEDSCREEN,
 };
 
 #endif

client/scenes/base_scene.cpp

@@ -75,10 +75,10 @@ SceneList BaseScene::GetNextScene() const {
 //Frame loop
 //-------------------------
 
-void BaseScene::RunFrame(double delta) {
+void BaseScene::RunFrame() {
 	FrameStart();
 	HandleEvents();
-	Update(delta);
+	Update();
 	FrameEnd();
 }
 
@@ -86,6 +86,7 @@ void BaseScene::RenderFrame() {
 	SDL_FillRect(screen, 0, 0);
 	Render(screen);
 	SDL_Flip(screen);
+	SDL_Delay(10);
 }
 
 //-------------------------

client/scenes/base_scene.hpp

@@ -40,13 +40,13 @@ public:
 	SceneList GetNextScene() const;
 
 	//Frame loop
-	virtual void RunFrame(double delta);
+	virtual void RunFrame();
 	virtual void RenderFrame();
 
 protected:
 	virtual void FrameStart() {}
 	virtual void HandleEvents();
-	virtual void Update(double delta) {}
+	virtual void Update() {}
 	virtual void FrameEnd() {}
 	virtual void Render(SDL_Surface* const screen) {}
 

client/scenes/disconnected_screen.cpp

@@ -19,10 +19,11 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "clean_up.hpp"
+#include "disconnected_screen.hpp"
 
 #include "channels.hpp"
 #include "config_utility.hpp"
+#include "udp_network_utility.hpp"
 
 #include <stdexcept>
 
@@ -30,19 +31,7 @@
 //Public access members
 //-------------------------
 
-CleanUp::CleanUp(
-	UDPNetworkUtility* const argNetwork,
-	int* const argClientIndex,
-	int* const argAccountIndex,
-	int* const argCharacterIndex,
-	CharacterMap* argCharacterMap
-	):
-	network(*argNetwork),
-	clientIndex(*argClientIndex),
-	accountIndex(*argAccountIndex),
-	characterIndex(*argCharacterIndex),
-	characterMap(*argCharacterMap)
-{
+DisconnectedScreen::DisconnectedScreen() {
 	ConfigUtility& config = ConfigUtility::GetSingleton();
 
 	//setup the utility objects
@@ -62,19 +51,13 @@ CleanUp::CleanUp(
 	backButton.SetText("Back");
 
 	//full reset
-	network.Unbind(Channels::SERVER);
-	clientIndex = -1;
-	accountIndex = -1;
-	characterIndex = -1;
-//	combatMap.clear();
-	characterMap.clear();
-//	enemyMap.clear();
+	UDPNetworkUtility::GetSingleton().Unbind(Channels::SERVER);
 
 	//auto return
 	startTick = std::chrono::steady_clock::now();
 }
 
-CleanUp::~CleanUp() {
+DisconnectedScreen::~DisconnectedScreen() {
 	//
 }
 
@@ -82,53 +65,52 @@ CleanUp::~CleanUp() {
 //Frame loop
 //-------------------------
 
-void CleanUp::Update(double delta) {
+void DisconnectedScreen::Update() {
 	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(10)) {
-		QuitEvent();
+		SetNextScene(SceneList::MAINMENU);
 	}
 
-	//BUGFIX: Eat incoming packets
-	while(network.Receive());
+	//Eat incoming packets
+	while(UDPNetworkUtility::GetSingleton().Receive());
 }
 
-void CleanUp::RenderFrame() {
-	SDL_FillRect(GetScreen(), 0, 0);
-	Render(GetScreen());
-	SDL_Flip(GetScreen());
-	fps.Calculate();
-}
+void DisconnectedScreen::Render(SDL_Surface* const screen) {
+	ConfigUtility& config = ConfigUtility::GetSingleton();
 
-void CleanUp::Render(SDL_Surface* const screen) {
 	backButton.DrawTo(screen);
-	font.DrawStringTo("You have been disconnected.", screen, 50, 30);
+	font.DrawStringTo(config["client.disconnectMessage"], screen, 50, 30);
 }
 
 //-------------------------
 //Event handlers
 //-------------------------
 
-void CleanUp::QuitEvent() {
+void DisconnectedScreen::QuitEvent() {
 	SetNextScene(SceneList::QUIT);
 }
 
-void CleanUp::MouseMotion(SDL_MouseMotionEvent const& motion) {
+void DisconnectedScreen::MouseMotion(SDL_MouseMotionEvent const& motion) {
 	backButton.MouseMotion(motion);
 }
 
-void CleanUp::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+void DisconnectedScreen::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 	backButton.MouseButtonDown(button);
 }
 
-void CleanUp::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+void DisconnectedScreen::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
 		SetNextScene(SceneList::MAINMENU);
 	}
 }
 
-void CleanUp::KeyDown(SDL_KeyboardEvent const& key) {
-	//
+void DisconnectedScreen::KeyDown(SDL_KeyboardEvent const& key) {
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+			SetNextScene(SceneList::MAINMENU);
+		break;
+	}
 }
 
-void CleanUp::KeyUp(SDL_KeyboardEvent const& key) {
+void DisconnectedScreen::KeyUp(SDL_KeyboardEvent const& key) {
 	//
 }

client/scenes/disconnected_screen.hpp

@@ -19,44 +19,29 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CLEANUP_HPP_
-#define CLEANUP_HPP_
-
-//network
-#include "udp_network_utility.hpp"
+#ifndef DISCONNECTEDSCREEN_HPP_
+#define DISCONNECTEDSCREEN_HPP_
 
 //graphics
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
 
-//common
-#include "frame_rate.hpp"
-
-#include "character.hpp"
-
 //client
 #include "base_scene.hpp"
 
 //std namespace
 #include <chrono>
 
-class CleanUp : public BaseScene {
+class DisconnectedScreen : public BaseScene {
 public:
 	//Public access members
-	CleanUp(
-		UDPNetworkUtility* const argNetwork,
-		int* const argClientIndex,
-		int* const argAccountIndex,
-		int* const argCharacterIndex,
-		CharacterMap* argCharacterMap
-	);
-	~CleanUp();
+	DisconnectedScreen();
+	~DisconnectedScreen();
 
 protected:
 	//Frame loop
-	void Update(double delta);
-	void RenderFrame();
+	void Update();
 	void Render(SDL_Surface* const);
 
 	//Event handlers
@@ -67,20 +52,12 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//shared parameters
-	UDPNetworkUtility& network;
-	int& clientIndex;
-	int& accountIndex;
-	int& characterIndex;
-	CharacterMap& characterMap;
-
 	//graphics
 	Image image;
 	RasterFont font;
 
 	//UI
 	Button backButton;
-	FrameRate fps;
 
 	//auto return
 	std::chrono::steady_clock::time_point startTick;

client/scenes/in_combat.cpp

@@ -1,220 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "in_combat.hpp"
-
-#include "channels.hpp"
-#include "utility.hpp"
-#include "config_utility.hpp"
-
-#include <stdexcept>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-InCombat::InCombat(
-	UDPNetworkUtility* const argNetwork,
-	int* const argClientIndex,
-	int* const argAccountIndex,
-	int* const argCharacterIndex,
-	CharacterMap* argCharacterMap
-	):
-	network(*argNetwork),
-	clientIndex(*argClientIndex),
-	accountIndex(*argAccountIndex),
-	characterIndex(*argCharacterIndex),
-	characterMap(*argCharacterMap)
-{
-/*	//setup the utility objects
-	buttonImage.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	buttonImage.SetClipH(buttonImage.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
-
-	//pass the utility objects
-	backButton.SetImage(&buttonImage);
-	backButton.SetFont(&font);
-
-	//set the button positions
-	backButton.SetX(50);
-	backButton.SetY(50 + buttonImage.GetClipH() * 0);
-
-	//set the button texts
-	backButton.SetText("Back");
-
-	//request a sync
-	RequestSynchronize();
-*/
-	//debug
-	//
-}
-
-InCombat::~InCombat() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void InCombat::FrameStart() {
-	//
-}
-
-void InCombat::Update(double delta) {
-	//suck in and process all waiting packets
-	SerialPacket* packetBuffer = static_cast<SerialPacket*>(malloc(MAX_PACKET_SIZE));
-	while(network.Receive(packetBuffer)) {
-		HandlePacket(packetBuffer);
-	}
-	free(static_cast<void*>(packetBuffer));
-
-	//TODO: more
-}
-
-void InCombat::FrameEnd() {
-	//
-}
-
-void InCombat::RenderFrame() {
-	SDL_FillRect(GetScreen(), 0, 0);
-	Render(GetScreen());
-	SDL_Flip(GetScreen());
-	fps.Calculate();
-}
-
-void InCombat::Render(SDL_Surface* const screen) {
-	//TODO: draw the background
-
-	//TODO: draw the characters
-
-	//TODO: draw the enemies
-
-	//TODO: draw the UI
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void InCombat::QuitEvent() {
-	//exit the game AND the server
-	RequestDisconnect();
-	SetNextScene(SceneList::QUIT);
-}
-
-void InCombat::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	//
-}
-
-void InCombat::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void InCombat::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void InCombat::KeyDown(SDL_KeyboardEvent const& key) {
-	//
-}
-
-void InCombat::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}
-
-//-------------------------
-//Network handlers
-//-------------------------
-
-void InCombat::HandlePacket(SerialPacket* const argPacket) {
-	switch(argPacket->type) {
-		case SerialPacketType::DISCONNECT:
-			HandleDisconnect(argPacket);
-		break;
-		//handle errors
-		default:
-			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in InCombat: " + to_string_custom(static_cast<int>(argPacket->type)) ));
-		break;
-	}
-}
-
-void InCombat::HandleDisconnect(SerialPacket* const) {
-	SetNextScene(SceneList::CLEANUP);
-}
-
-//TODO: more network handlers
-
-//-------------------------
-//Server control
-//-------------------------
-
-void InCombat::RequestSynchronize() {
-	ClientPacket newPacket;
-
-	//request a sync
-	newPacket.type = SerialPacketType::SYNCHRONIZE;
-	newPacket.clientIndex = clientIndex;
-	newPacket.accountIndex = accountIndex;
-
-	network.SendTo(Channels::SERVER, &newPacket);
-}
-
-void InCombat::SendPlayerUpdate() {
-	CharacterPacket newPacket;
-
-	//pack the packet
-	newPacket.type = SerialPacketType::CHARACTER_UPDATE;
-
-	newPacket.characterIndex = characterIndex;
-	//handle, avatar
-	newPacket.accountIndex = accountIndex;
-//	newPacket.roomIndex = localCharacter->roomIndex;
-//	newPacket.origin = localCharacter->origin;
-//	newPacket.motion = localCharacter->motion;
-//	newPacket.stats = localCharacter->stats;
-
-	//TODO: gameplay components: equipment, items, buffs, debuffs
-
-	network.SendTo(Channels::SERVER, &newPacket);
-}
-
-void InCombat::RequestDisconnect() {
-	ClientPacket newPacket;
-
-	//send a disconnect request
-	newPacket.type = SerialPacketType::DISCONNECT;
-	newPacket.clientIndex = clientIndex;
-	newPacket.accountIndex = accountIndex;
-
-	network.SendTo(Channels::SERVER, &newPacket);
-}
-
-void InCombat::RequestShutdown() {
-	ClientPacket newPacket;
-
-	//send a shutdown request
-	newPacket.type = SerialPacketType::SHUTDOWN;
-	newPacket.clientIndex = clientIndex;
-	newPacket.accountIndex = accountIndex;
-
-	network.SendTo(Channels::SERVER, &newPacket);
-}

client/scenes/in_combat.hpp

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

client/scenes/in_world.cpp

@@ -34,18 +34,9 @@
 //Public access members
 //-------------------------
 
-InWorld::InWorld(
-	UDPNetworkUtility* const argNetwork,
-	int* const argClientIndex,
-	int* const argAccountIndex,
-	int* const argCharacterIndex,
-	CharacterMap* argCharacterMap
-	):
-	network(*argNetwork),
+InWorld::InWorld(int* const argClientIndex,	int* const argAccountIndex):
 	clientIndex(*argClientIndex),
-	accountIndex(*argAccountIndex),
-	characterIndex(*argCharacterIndex),
-	characterMap(*argCharacterMap)
+	accountIndex(*argAccountIndex)
 {
 	ConfigUtility& config = ConfigUtility::GetSingleton();
 
@@ -73,10 +64,18 @@ InWorld::InWorld(
 	//load the tilesheet
 	//TODO: add the tilesheet to the map system?
 	//TODO: Tile size and tile sheet should be loaded elsewhere
-	tileSheet.Load(config["dir.tilesets"] + "terrain.bmp", 32, 32);
+	tileSheet.Load(config["dir.tilesets"] + "overworld.bmp", 32, 32);
+
+	//send this player's character info
+//	CharacterPacket newPacket;
+//	newPacket.type = SerialPacketType::CHARACTER_NEW;
+//	strncpy(newPacket.handle, config["client.handle"].c_str(), PACKET_STRING_SIZE);
+//	strncpy(newPacket.avatar, config["client.avatar"].c_str(), PACKET_STRING_SIZE);
+//	newPacket.accountIndex = accountIndex;
+//	network.SendTo(Channels::SERVER, &newPacket);
 
 	//request a sync
-	RequestSynchronize();
+//	RequestSynchronize();
 
 	//debug
 	//
@@ -94,17 +93,17 @@ void InWorld::FrameStart() {
 	//
 }
 
-void InWorld::Update(double delta) {
+void InWorld::Update() {
 	//suck in and process all waiting packets
-	SerialPacket* packetBuffer = static_cast<SerialPacket*>(malloc(MAX_PACKET_SIZE));
+	SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]);
 	while(network.Receive(packetBuffer)) {
 		HandlePacket(packetBuffer);
 	}
-	free(static_cast<void*>(packetBuffer));
+	delete reinterpret_cast<char*>(packetBuffer);
 
 	//update the characters
 	for (auto& it : characterMap) {
-		it.second.Update(delta);
+		it.second.Update();
 	}
 
 	//check the map
@@ -131,7 +130,7 @@ void InWorld::Update(double delta) {
 			}
 
 			if ((localCharacter->GetOrigin() + localCharacter->GetBounds()).CheckOverlap(wallBounds)) {
-				localCharacter->SetOrigin(localCharacter->GetOrigin() - (localCharacter->GetMotion() * delta));
+				localCharacter->SetOrigin(localCharacter->GetOrigin() - (localCharacter->GetMotion()));
 				localCharacter->SetMotion({0,0});
 				localCharacter->CorrectSprite();
 				SendPlayerUpdate();
@@ -139,9 +138,25 @@ void InWorld::Update(double delta) {
 		}
 	}
 
-	//update the camera
+	//update the camera (following the player)
 	camera.x = localCharacter->GetOrigin().x - camera.marginX;
 	camera.y = localCharacter->GetOrigin().y - camera.marginY;
+
+	//check the connection
+	if (Clock::now() - lastBeat > std::chrono::seconds(3)) {
+		if (attemptedBeats > 2) {
+			RequestDisconnect();
+			SetNextScene(SceneList::DISCONNECTEDSCREEN);
+			ConfigUtility::GetSingleton()["client.disconnectMessage"] = "Error: Lost connection to the server";
+		}
+
+		ServerPacket newPacket;
+		newPacket.type = SerialPacketType::PING;
+		network.SendTo(Channels::SERVER, &newPacket);
+
+		attemptedBeats++;
+		lastBeat = Clock::now();
+	}
 }
 
 void InWorld::FrameEnd() {
@@ -164,6 +179,7 @@ void InWorld::Render(SDL_Surface* const screen) {
 	//draw characters
 	for (auto& it : characterMap) {
 		//BUG: #29 drawing order according to Y origin
+		//TODO: use a list of renderable objects
 		it.second.DrawTo(screen, camera.x, camera.y);
 	}
 
@@ -194,10 +210,10 @@ void InWorld::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 }
 
 void InWorld::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (disconnectButton.MouseButtonUp(button) == Button::State::HOVER) {
+	if (disconnectButton.MouseButtonUp(button) == Button::State::HOVER && button.button == SDL_BUTTON_LEFT) {
 		RequestDisconnect();
 	}
-	if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER) {
+	if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER && button.button == SDL_BUTTON_LEFT) {
 		RequestShutDown();
 	}
 }
@@ -207,6 +223,13 @@ void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
 		return;
 	}
 
+	//hotkeys
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+			RequestDisconnect();
+		break;
+	}
+
 	//player movement
 	Vector2 motion = localCharacter->GetMotion();
 	switch(key.keysym.sym) {
@@ -265,21 +288,55 @@ void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
 
 void InWorld::HandlePacket(SerialPacket* const argPacket) {
 	switch(argPacket->type) {
-		case SerialPacketType::DISCONNECT:
-			HandleDisconnect(argPacket);
+		//heartbeat system
+		case SerialPacketType::PING: {
+			ServerPacket newPacket;
+			newPacket.type = SerialPacketType::PONG;
+			network.SendTo(argPacket->srcAddress, &newPacket);
+		}
 		break;
-		case SerialPacketType::CHARACTER_NEW:
-			HandleCharacterNew(static_cast<CharacterPacket*>(argPacket));
+		case SerialPacketType::PONG:
+//			HandlePong(static_cast<ServerPacket*>(argPacket));
 		break;
-		case SerialPacketType::CHARACTER_DELETE:
-			HandleCharacterDelete(static_cast<CharacterPacket*>(argPacket));
+
+		//game server connections
+		case SerialPacketType::LOGOUT_RESPONSE:
+//			HandleLogoutResponse(static_cast<ClientPacket*>(argPacket));
 		break;
-		case SerialPacketType::CHARACTER_UPDATE:
-			HandleCharacterUpdate(static_cast<CharacterPacket*>(argPacket));
+		case SerialPacketType::DISCONNECT_REQUEST:
+//			HandleDisconnectRequest(static_cast<ClientPacket*>(argPacket));
 		break;
+		case SerialPacketType::DISCONNECT_FORCED:
+//			HandleDisconnectForced(static_cast<ClientPacket*>(argPacket));
+		break;
+
+		//data management
 		case SerialPacketType::REGION_CONTENT:
-			HandleRegionContent(static_cast<RegionPacket*>(argPacket));
+//			HandleRegionContent(static_cast<RegionPacket*>(argPacket));
 		break;
+//		case SerialPacketType::QUERY_CHARACTER_EXISTS:
+//		case SerialPacketType::QUERY_CHARACTER_STATS:
+//		case SerialPacketType::QUERY_CHARACTER_LOCATION:
+
+		//character management
+//		case SerialPacketType::CHARACTER_NEW:
+//			HandleCharacterNew(static_cast<CharacterPacket*>(argPacket));
+//		break;
+//		case SerialPacketType::CHARACTER_DELETE:
+//			HandleCharacterDelete(static_cast<CharacterPacket*>(argPacket));
+//		break;
+//		case SerialPacketType::CHARACTER_UPDATE:
+//			HandleCharacterUpdate(static_cast<CharacterPacket*>(argPacket));
+//		break;
+//		case SerialPacketType::CHARACTER_REJECTION:
+//			HandleCharacterRejection(static_cast<TextPacket*>(argPacket));
+//		break;
+
+		//enemy management
+		//TODO: enemy management
+
+		//TODO: text
+
 		//handle errors
 		default:
 			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in InWorld: " + to_string_custom(static_cast<int>(argPacket->type)) ));
@@ -287,8 +344,19 @@ void InWorld::HandlePacket(SerialPacket* const argPacket) {
 	}
 }
 
-void InWorld::HandleDisconnect(SerialPacket* const argPacket) {
-	SetNextScene(SceneList::CLEANUP);
+void InWorld::HandlePong(ServerPacket* const argPacket) {
+	if (network.GetIPAddress(Channels::SERVER)->host != argPacket->srcAddress.host) {
+		throw(std::runtime_error("Heartbeat message received from an unknown source"));
+	}
+
+	attemptedBeats = 0;
+	lastBeat = Clock::now();
+}
+
+void InWorld::HandleDisconnect(ClientPacket* const argPacket) {
+	//TODO: More needed in the disconnection
+	SetNextScene(SceneList::DISCONNECTEDSCREEN);
+	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have been disconnected";
 }
 
 void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
@@ -297,7 +365,7 @@ void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
 	}
 
 	//create the character object
-	Character& newCharacter = characterMap[argPacket->characterIndex];
+	BaseCharacter& newCharacter = characterMap[argPacket->characterIndex];
 
 	//fill out the character's members
 	newCharacter.SetHandle(argPacket->handle);
@@ -307,9 +375,14 @@ void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
 
 	newCharacter.SetOrigin(argPacket->origin);
 	newCharacter.SetMotion(argPacket->motion);
-	newCharacter.SetBounds({0, 16, 32, 32}); //TODO: magic numbers, fix this
+	newCharacter.SetBounds({
+		CHARACTER_BOUNDS_X,
+		CHARACTER_BOUNDS_Y,
+		CHARACTER_BOUNDS_WIDTH,
+		CHARACTER_BOUNDS_HEIGHT
+	});
 
-	(*newCharacter.GetStats()) = argPacket->stats;
+//	(*newCharacter.GetBaseStats()) = argPacket->stats;
 
 	//bookkeeping code
 	newCharacter.CorrectSprite();
@@ -320,7 +393,6 @@ void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
 		localCharacter = &newCharacter;
 
 		//setup the camera
-		//TODO: move this?
 		camera.width = GetScreen()->w;
 		camera.height = GetScreen()->h;
 
@@ -344,12 +416,11 @@ 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;
 	}
 
-	Character& character = characterMap[argPacket->characterIndex];
+	BaseCharacter& character = characterMap[argPacket->characterIndex];
 
 	//other characters moving
 	if (argPacket->characterIndex != characterIndex) {
@@ -359,6 +430,14 @@ void InWorld::HandleCharacterUpdate(CharacterPacket* const argPacket) {
 	}
 }
 
+void InWorld::HandleCharacterRejection(TextPacket* const argPacket) {
+	RequestDisconnect();
+	SetNextScene(SceneList::DISCONNECTEDSCREEN);
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+	config["client.disconnectMessage"] = "Error: ";
+	config["client.disconnectMessage"] += argPacket->text;
+}
+
 void InWorld::HandleRegionContent(RegionPacket* const argPacket) {
 	//replace existing regions
 	regionPager.UnloadRegion(argPacket->x, argPacket->y);
@@ -374,23 +453,23 @@ void InWorld::HandleRegionContent(RegionPacket* const argPacket) {
 //-------------------------
 
 void InWorld::RequestSynchronize() {
-	ClientPacket newPacket;
+//	ClientPacket newPacket;
 
 	//request a sync
-	newPacket.type = SerialPacketType::SYNCHRONIZE;
-	newPacket.clientIndex = clientIndex;
-	newPacket.accountIndex = accountIndex;
+//	newPacket.type = SerialPacketType::SYNCHRONIZE;
+//	newPacket.clientIndex = clientIndex;
+//	newPacket.accountIndex = accountIndex;
 
 	//TODO: location, range for sync request
 
-	network.SendTo(Channels::SERVER, &newPacket);
+//	network.SendTo(Channels::SERVER, &newPacket);
 }
 
 void InWorld::SendPlayerUpdate() {
 	CharacterPacket newPacket;
 
 	//pack the packet
-	newPacket.type = SerialPacketType::CHARACTER_UPDATE;
+//	newPacket.type = SerialPacketType::CHARACTER_UPDATE;
 
 	newPacket.characterIndex = characterIndex;
 	//NOTE: omitting the handle and avatar here
@@ -398,7 +477,7 @@ void InWorld::SendPlayerUpdate() {
 	newPacket.roomIndex = 0; //TODO: room index
 	newPacket.origin = localCharacter->GetOrigin();
 	newPacket.motion = localCharacter->GetMotion();
-	newPacket.stats = *localCharacter->GetStats();
+//	newPacket.stats = *localCharacter->GetBaseStats();
 
 	//TODO: gameplay components: equipment, items, buffs, debuffs
 
@@ -409,7 +488,7 @@ void InWorld::RequestDisconnect() {
 	ClientPacket newPacket;
 
 	//send a disconnect request
-	newPacket.type = SerialPacketType::DISCONNECT;
+	newPacket.type = SerialPacketType::DISCONNECT_REQUEST;
 	newPacket.clientIndex = clientIndex;
 	newPacket.accountIndex = accountIndex;
 
@@ -420,7 +499,7 @@ void InWorld::RequestShutDown() {
 	ClientPacket newPacket;
 
 	//send a shutdown request
-	newPacket.type = SerialPacketType::SHUTDOWN;
+	newPacket.type = SerialPacketType::SHUTDOWN_REQUEST;
 	newPacket.clientIndex = clientIndex;
 	newPacket.accountIndex = accountIndex;
 

client/scenes/in_world.hpp

@@ -27,6 +27,7 @@
 
 //networking
 #include "udp_network_utility.hpp"
+#include "serial_packet.hpp"
 
 //graphics
 #include "image.hpp"
@@ -37,7 +38,8 @@
 //common
 #include "frame_rate.hpp"
 
-#include "character.hpp"
+#include "base_character.hpp"
+#include "base_monster.hpp"
 
 //client
 #include "base_scene.hpp"
@@ -45,22 +47,18 @@
 //STL
 #include <map>
 
+#include <chrono>
+
 class InWorld : public BaseScene {
 public:
 	//Public access members
-	InWorld(
-		UDPNetworkUtility* const argNetwork,
-		int* const argClientIndex,
-		int* const argAccountIndex,
-		int* const argCharacterIndex,
-		CharacterMap* argCharacterMap
-	);
+	InWorld(int* const argClientIndex, int* const argAccountIndex);
 	~InWorld();
 
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update(double delta);
+	void Update();
 	void FrameEnd();
 	void RenderFrame();
 	void Render(SDL_Surface* const);
@@ -75,10 +73,12 @@ protected:
 
 	//Network handlers
 	void HandlePacket(SerialPacket* const);
-	void HandleDisconnect(SerialPacket* const);
+	void HandlePong(ServerPacket* const);
+	void HandleDisconnect(ClientPacket* const);
 	void HandleCharacterNew(CharacterPacket* const);
 	void HandleCharacterDelete(CharacterPacket* const);
 	void HandleCharacterUpdate(CharacterPacket* const);
+	void HandleCharacterRejection(TextPacket* const);
 	void HandleRegionContent(RegionPacket* const);
 
 	//Server control
@@ -91,12 +91,13 @@ protected:
 	//utilities
 	void UpdateMap();
 
-	//shared parameters
-	UDPNetworkUtility& network;
+	//singleton shortcut
+	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
+
+	//indexes
 	int& clientIndex;
 	int& accountIndex;
-	int& characterIndex;
-	CharacterMap& characterMap;
+	int characterIndex = -1;
 
 	//graphics
 	Image buttonImage;
@@ -109,16 +110,25 @@ protected:
 	//UI
 	Button disconnectButton;
 	Button shutDownButton;
-	//TODO: Review the camera
+	FrameRate fps;
+
+	//the camera structure
 	struct {
 		int x = 0, y = 0;
 		int width = 0, height = 0;
 		int marginX = 0, marginY = 0;
 	} camera;
-	FrameRate fps;
 
-	//game
-	Character* localCharacter = nullptr;
+	//game components
+	BaseCharacter* localCharacter = nullptr;
+	std::map<int, BaseCharacter> characterMap;
+	std::map<int, BaseMonster> monsterMap;
+
+	//heartbeat
+	//TODO: This needs it's own utility, for both InWorld and InCombat
+	typedef std::chrono::steady_clock Clock;
+	Clock::time_point lastBeat = Clock::now();
+	int attemptedBeats = 0;
 };
 
 #endif

client/scenes/lobby_menu.cpp

@@ -30,15 +30,14 @@
 //Public access members
 //-------------------------
 
-LobbyMenu::LobbyMenu(
-	UDPNetworkUtility* const argNetwork,
-	int* const argClientIndex,
-	int* const argAccountIndex
-	):
-	network(*argNetwork),
+LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
 	clientIndex(*argClientIndex),
 	accountIndex(*argAccountIndex)
 {
+	//preemptive reset
+	clientIndex = -1;
+	accountIndex = -1;
+
 	//setup the utility objects
 	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
@@ -68,8 +67,11 @@ LobbyMenu::LobbyMenu(
 	//set the server list's position
 	listBox = {300, 50, 200, font.GetCharH()};
 
-	//BUGFIX: Eat incoming packets
+	//Eat incoming packets
 	while(network.Receive());
+
+	//Initial broadcast
+	SendBroadcastRequest();
 }
 
 LobbyMenu::~LobbyMenu() {
@@ -84,13 +86,13 @@ void LobbyMenu::FrameStart() {
 	//
 }
 
-void LobbyMenu::Update(double delta) {
+void LobbyMenu::Update() {
 	//suck in and process all waiting packets
-	SerialPacket* packetBuffer = static_cast<SerialPacket*>(malloc(MAX_PACKET_SIZE));
+	SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]);
 	while(network.Receive(packetBuffer)) {
 		HandlePacket(packetBuffer);
 	}
-	free(static_cast<void*>(packetBuffer));
+	delete reinterpret_cast<char*>(packetBuffer);
 }
 
 void LobbyMenu::FrameEnd() {
@@ -109,9 +111,12 @@ void LobbyMenu::Render(SDL_Surface* const screen) {
 	for (int i = 0; i < serverInfo.size(); i++) {
 		//draw the selected server's highlight
 		if (selection == &serverInfo[i]) {
-			SDL_Rect r = listBox;
+			SDL_Rect r = {
+				(Sint16)listBox.x, (Sint16)listBox.y,
+				(Uint16)listBox.w, (Uint16)listBox.h
+			};
 			r.y += i * listBox.h;
-			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 255, 127, 39));
+			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 49, 150, 5));
 		}
 
 		//draw the server name
@@ -147,39 +152,19 @@ void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 
 void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 	if (search.MouseButtonUp(button) == Button::State::HOVER) {
-		//broadcast to the network, or a specific server
-		SerialPacket packet;
-		packet.type = SerialPacketType::BROADCAST_REQUEST;
-		network.SendTo(config["server.host"].c_str(), config.Int("server.port"), &packet);
-
-		//reset the server list
-		serverInfo.clear();
-		selection = nullptr;
+		SendBroadcastRequest();
 	}
-
 	else if (join.MouseButtonUp(button) == Button::State::HOVER && selection != nullptr && selection->compatible) {
-		//pack the packet
-		ClientPacket packet;
-		packet.type = SerialPacketType::JOIN_REQUEST;
-		strncpy(packet.username, config["client.username"].c_str(), PACKET_STRING_SIZE);
-
-		//join the selected server
-		network.SendTo(&selection->address, &packet);
-		selection = nullptr;
+		SendJoinRequest();
 	}
-
 	else if (back.MouseButtonUp(button) == Button::State::HOVER) {
 		SetNextScene(SceneList::MAINMENU);
 	}
 
-	else if (
 	//has the user selected a server on the list?
-		//TODO: replace with regular collision checker
-		button.x > listBox.x &&
-		button.x < listBox.x + listBox.w &&
-		button.y > listBox.y &&
-		button.y < listBox.y + listBox.h * serverInfo.size()
-		) {
+	BoundingBox tmpBox = listBox;
+	tmpBox.h *= serverInfo.size();
+	if (tmpBox.CheckOverlap({button.x, button.y})) {
 		selection = &serverInfo[(button.y - listBox.y)/listBox.h];
 	}
 	else {
@@ -188,7 +173,11 @@ 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) {
@@ -201,12 +190,25 @@ void LobbyMenu::KeyUp(SDL_KeyboardEvent const& key) {
 
 void LobbyMenu::HandlePacket(SerialPacket* const argPacket) {
 		switch(argPacket->type) {
+			//responses
 		case SerialPacketType::BROADCAST_RESPONSE:
 			HandleBroadcastResponse(static_cast<ServerPacket*>(argPacket));
 		break;
 		case SerialPacketType::JOIN_RESPONSE:
 			HandleJoinResponse(static_cast<ClientPacket*>(argPacket));
 		break;
+		case SerialPacketType::LOGIN_RESPONSE:
+			HandleLoginResponse(static_cast<ClientPacket*>(argPacket));
+		break;
+
+		//rejections
+		case SerialPacketType::JOIN_REJECTION:
+			HandleJoinRejection(static_cast<TextPacket*>(argPacket));
+		break;
+		case SerialPacketType::LOGIN_REJECTION:
+			HandleLoginRejection(static_cast<TextPacket*>(argPacket));
+		break;
+
 		//handle errors
 		default:
 			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in LobbyMenu: " + to_string_custom(static_cast<int>(argPacket->type)) ));
@@ -230,16 +232,61 @@ void LobbyMenu::HandleBroadcastResponse(ServerPacket* const argPacket) {
 }
 
 void LobbyMenu::HandleJoinResponse(ClientPacket* const argPacket) {
+	//save the server's data
 	clientIndex = argPacket->clientIndex;
-	accountIndex = argPacket->accountIndex;
-	network.Bind(&argPacket->srcAddress, Channels::SERVER);
-	SetNextScene(SceneList::INWORLD);
+	network.Bind(argPacket->srcAddress, Channels::SERVER);
 
-	//send this player's character info
-	CharacterPacket newPacket;
-	newPacket.type = SerialPacketType::CHARACTER_NEW;
-	strncpy(newPacket.handle, config["client.handle"].c_str(), PACKET_STRING_SIZE);
-	strncpy(newPacket.avatar, config["client.avatar"].c_str(), PACKET_STRING_SIZE);
-	newPacket.accountIndex = accountIndex;
-	network.SendTo(Channels::SERVER, &newPacket);
+	//request login data
+	SendLoginRequest();
+}
+
+void LobbyMenu::HandleLoginResponse(ClientPacket* const argPacket) {
+	if (argPacket->clientIndex != clientIndex) {
+		throw(std::runtime_error("Client index invalid during login"));
+	}
+	accountIndex = argPacket->accountIndex;
+	SetNextScene(SceneList::INWORLD);
+}
+
+void LobbyMenu::HandleJoinRejection(TextPacket* const argPacket) {
+	//TODO: Better output for join rejection
+}
+
+void LobbyMenu::HandleLoginRejection(TextPacket* const argPacket) {
+	//TODO: Better output for login rejection
+}
+
+//-------------------------
+//server control
+//-------------------------
+
+void LobbyMenu::SendBroadcastRequest() {
+	//broadcast to the network, or a specific server
+		ClientPacket packet;
+		packet.type = SerialPacketType::BROADCAST_REQUEST;
+		network.SendTo(config["server.host"].c_str(), config.Int("server.port"), &packet);
+
+		//reset the server list
+		serverInfo.clear();
+		selection = nullptr;
+}
+
+void LobbyMenu::SendJoinRequest() {
+	//pack the packet
+		ClientPacket packet;
+		packet.type = SerialPacketType::JOIN_REQUEST;
+
+		//join the selected server
+		network.SendTo(selection->address, &packet);
+		selection = nullptr;
+}
+
+void LobbyMenu::SendLoginRequest() {
+	//NOTE: high cohesion
+	ClientPacket packet;
+	packet.type = SerialPacketType::LOGIN_REQUEST;
+	packet.clientIndex = clientIndex;
+	strncpy(packet.username, config["client.username"].c_str(), PACKET_STRING_SIZE);
+
+	network.SendTo(Channels::SERVER, &packet);
 }

client/scenes/lobby_menu.hpp

@@ -26,10 +26,12 @@
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
+#include "bounding_box.hpp"
 
 //utilities
 #include "config_utility.hpp"
 #include "udp_network_utility.hpp"
+#include "serial_packet.hpp"
 
 //client
 #include "base_scene.hpp"
@@ -40,17 +42,13 @@
 class LobbyMenu : public BaseScene {
 public:
 	//Public access members
-	LobbyMenu(
-		UDPNetworkUtility* const argNetwork,
-		int* const argClientIndex,
-		int* const argAccountIndex
-	);
+	LobbyMenu(int* const argClientIndex, int* const argAccountIndex);
 	~LobbyMenu();
 
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update(double delta);
+	void Update();
 	void FrameEnd();
 	void Render(SDL_Surface* const);
 
@@ -65,10 +63,18 @@ protected:
 	void HandlePacket(SerialPacket* const);
 	void HandleBroadcastResponse(ServerPacket* const);
 	void HandleJoinResponse(ClientPacket* const);
+	void HandleLoginResponse(ClientPacket* const);
+	void HandleJoinRejection(TextPacket* const);
+	void HandleLoginRejection(TextPacket* const);
+
+	//server control
+	void SendBroadcastRequest();
+	void SendJoinRequest();
+	void SendLoginRequest();
 
 	//shared parameters
 	ConfigUtility& config = ConfigUtility::GetSingleton();
-	UDPNetworkUtility& network;
+	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
 	int& clientIndex;
 	int& accountIndex;
 
@@ -90,9 +96,9 @@ protected:
 
 	std::vector<ServerInformation> serverInfo;
 
-	//a terrible hack, forgive me
+	//NOTE: a terrible hack
 	//I'd love a proper gui system for this
-	SDL_Rect listBox;
+	BoundingBox listBox;
 	ServerInformation* selection = nullptr;
 };
 

client/scenes/main_menu.cpp

@@ -72,7 +72,7 @@ void MainMenu::FrameStart() {
 	//
 }
 
-void MainMenu::Update(double delta) {
+void MainMenu::Update() {
 	//
 }
 

client/scenes/main_menu.hpp

@@ -37,7 +37,7 @@ public:
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update(double delta);
+	void Update();
 	void FrameEnd();
 	void Render(SDL_Surface* const);
 

client/scenes/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. .. ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/network/packet ../../common/network/serial ../../common/ui ../../common/utilities
+INCLUDES+=. .. ../entities ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/network/packet_types ../../common/ui ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 

client/scenes/options_menu.cpp

@@ -59,7 +59,7 @@ void OptionsMenu::FrameStart() {
 	//
 }
 
-void OptionsMenu::Update(double delta) {
+void OptionsMenu::Update() {
 	//
 }
 
@@ -92,7 +92,11 @@ void OptionsMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 }
 
 void OptionsMenu::KeyDown(SDL_KeyboardEvent const& key) {
-	//
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+			SetNextScene(SceneList::MAINMENU);
+		break;
+	}
 }
 
 void OptionsMenu::KeyUp(SDL_KeyboardEvent const& key) {

client/scenes/options_menu.hpp

@@ -38,7 +38,7 @@ public:
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update(double delta);
+	void Update();
 	void FrameEnd();
 	void Render(SDL_Surface* const);
 

client/scenes/splash_screen.cpp

@@ -40,7 +40,7 @@ SplashScreen::~SplashScreen() {
 //Frame loop
 //-------------------------
 
-void SplashScreen::Update(double delta) {
+void SplashScreen::Update() {
 	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(1)) {
 		SetNextScene(SceneList::MAINMENU);
 	}

client/scenes/splash_screen.hpp

@@ -36,7 +36,7 @@ public:
 
 protected:
 	//Frame loop
-	void Update(double delta);
+	void Update();
 	void Render(SDL_Surface* const);
 
 	//members

common/gameplay/character_defines.hpp

@@ -25,11 +25,14 @@
 #include <cmath>
 
 //the speeds that the characters move
-constexpr double CHARACTER_WALKING_SPEED = 140.0;
+constexpr double CHARACTER_WALKING_SPEED = 2.24;
 constexpr double CHARACTER_WALKING_MOD = 1.0/sqrt(2.0);
+constexpr double CHARACTER_WALKING_NEGATIVE_MOD = 1.0 - CHARACTER_WALKING_MOD;
 
-//the bounding boxes for the characters
-constexpr double CHARACTER_BOUNDS_WIDTH = 32.0;
-constexpr double CHARACTER_BOUNDS_HEIGHT = 32.0;
+//the bounds for the character objects, mapped to the default sprites
+constexpr int CHARACTER_BOUNDS_X = 0;
+constexpr int CHARACTER_BOUNDS_Y = 16;
+constexpr int CHARACTER_BOUNDS_WIDTH = 32;
+constexpr int CHARACTER_BOUNDS_HEIGHT = 32;
 
 #endif

common/map/map_system_api.cpp

@@ -0,0 +1,77 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "map_system_api.hpp"
+
+//all map API headers
+#include "region_api.hpp"
+#include "region_pager_api.hpp"
+#include "tile_sheet_api.hpp"
+
+//macros
+#include "region.hpp"
+
+//useful "globals"
+static int getRegionWidth(lua_State* L) {
+	lua_pushinteger(L, REGION_WIDTH);
+	return 1;
+}
+
+static int getRegionHeight(lua_State* L) {
+	lua_pushinteger(L, REGION_HEIGHT);
+	return 1;
+}
+
+static int getRegionDepth(lua_State* L) {
+	lua_pushinteger(L, REGION_DEPTH);
+	return 1;
+}
+
+//This mimics linit.c to create a nested collection of all map modules.
+static const luaL_Reg funcs[] = {
+	//synonyms
+	{"GetRegionWidth", getRegionWidth},
+	{"GetRegionHeight", getRegionHeight},
+	{"GetRegionDepth", getRegionDepth},
+	{nullptr, nullptr}
+};
+
+static const luaL_Reg libs[] = {
+	{"Region", openRegionAPI},
+	{"RegionPager", openRegionPagerAPI},
+//	{"TileSheet", openTileSheetAPI},
+	{nullptr, nullptr}
+};
+
+int openMapSystemAPI(lua_State* L) {
+	//create the table
+	luaL_newlibtable(L, libs);
+
+	//push the "global" functions
+	luaL_setfuncs(L, funcs, 0);
+
+	//push the substable
+	for (const luaL_Reg* lib = libs; lib->func; lib++) {
+		lua_pushcfunction(L, lib->func);
+		lua_setfield(L, -2, lib->name);
+	}
+	return 1;
+}

common/map/map_system_api.hpp

@@ -0,0 +1,34 @@
+/* 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 MAPSYSTEMAPI_HPP_
+#define MAPSYSTEMAPI_APP_
+
+#if defined(__MINGW32__)
+ #include "lua/lua.hpp"
+#else
+ #include "lua.hpp"
+#endif
+
+#define TORTUGA_MAP_SYSTEM_API "map_system"
+LUAMOD_API int openMapSystemAPI(lua_State* L);
+
+#endif

common/map/region.cpp

@@ -21,11 +21,14 @@
 */
 #include "region.hpp"
 
-#include "utility.hpp"
-
 #include <stdexcept>
+#include <cmath>
 #include <cstring>
 
+int snapToBase(int base, int x) {
+	return floor((double)x / base) * base;
+}
+
 Region::Region(int argX, int argY): x(argX), y(argY) {
 	if (x != snapToBase(REGION_WIDTH, x) || y != snapToBase(REGION_HEIGHT, y)) {
 		throw(std::invalid_argument("Region location is off grid"));

common/map/region.hpp

@@ -23,15 +23,14 @@
 #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);
+//utility function
+int snapToBase(int base, int x);
 
 class Region {
 public:
@@ -61,7 +60,4 @@ private:
 	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

@@ -78,27 +78,6 @@ static int getDepth(lua_State* L) {
 	return 1;
 }
 
-static int load(lua_State* L) {
-	//EMPTY
-	lua_pushboolean(L, false);
-	return 1;
-}
-
-static int save(lua_State* L) {
-	//EMPTY
-	return 0;
-}
-
-static int create(lua_State* L) {
-	//EMPTY
-	return 0;
-}
-
-static int unload(lua_State* L) {
-	//EMPTY
-	return 0;
-}
-
 static const luaL_Reg regionLib[] = {
 	{"SetTile",setTile},
 	{"GetTile",getTile},
@@ -109,10 +88,6 @@ static const luaL_Reg regionLib[] = {
 	{"GetWidth",getWidth},
 	{"GetHeight",getHeight},
 	{"GetDepth",getDepth},
-	{"Load",load},
-	{"Save",save},
-	{"Create",create},
-	{"Unload",unload},
 	{nullptr, nullptr}
 };
 

common/map/region_api.hpp

@@ -22,9 +22,13 @@
 #ifndef REGIONAPI_HPP_
 #define REGIONAPI_HPP_
 
+#if defined(__MINGW32__)
  #include "lua/lua.hpp"
+#else
+ #include "lua.hpp"
+#endif
 
-#define TORTUGA_REGION_NAME "Region"
+#define TORTUGA_REGION_NAME "region"
 LUAMOD_API int openRegionAPI(lua_State* L);
 
 #endif

common/map/region_pager_api.cpp

@@ -24,8 +24,6 @@
 #include "region_pager_lua.hpp"
 #include "region.hpp"
 
-#include <string>
-
 //DOCS: These glue functions simply wrap RegionPagerLua's methods
 
 static int setTile(lua_State* L) {
@@ -90,16 +88,55 @@ static int unloadRegion(lua_State* L) {
 	return 0;
 }
 
+static int setOnLoad(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetLoadReference());
+	pager->SetLoadReference(luaL_ref(L, LUA_REGISTRYINDEX));
+	return 0;
+}
+
+static int setOnSave(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetSaveReference());
+	pager->SetSaveReference(luaL_ref(L, LUA_REGISTRYINDEX));
+	return 0;
+}
+
+static int setOnCreate(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetCreateReference());
+	pager->SetCreateReference(luaL_ref(L, LUA_REGISTRYINDEX));
+	return 0;
+}
+
+static int setOnUnload(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetUnloadReference());
+	pager->SetUnloadReference(luaL_ref(L, LUA_REGISTRYINDEX));
+	return 0;
+}
+
 static const luaL_Reg regionPagerLib[] = {
+	//curry
 	{"SetTile", setTile},
 	{"GetTile", getTile},
 	{"SetSolid", setSolid},
 	{"GetSolid", getSolid},
+
+	//access and control
 	{"GetRegion", getRegion},
 	{"LoadRegion", loadRegion},
 	{"SaveRegion", saveRegion},
 	{"CreateRegion", createRegion},
 	{"UnloadRegion", unloadRegion},
+
+	//triggers
+	{"SetOnLoad",setOnLoad},
+	{"SetOnSave",setOnSave},
+	{"SetOnCreate",setOnCreate},
+	{"SetOnUnload",setOnUnload},
+
+	//sentinel
 	{nullptr, nullptr}
 };
 

common/map/region_pager_api.hpp

@@ -22,9 +22,13 @@
 #ifndef REGIONPAGERAPI_HPP_
 #define REGIONPAGERAPI_HPP_
 
+#if defined(__MINGW32__)
  #include "lua/lua.hpp"
+#else
+ #include "lua.hpp"
+#endif
 
-#define TORTUGA_REGION_PAGER_NAME "RegionPager"
+#define TORTUGA_REGION_PAGER_NAME "region_pager"
 LUAMOD_API int openRegionPagerAPI(lua_State* L);
 
 #endif

common/map/region_pager_base.cpp

@@ -21,11 +21,21 @@
 */
 #include "region_pager_base.hpp"
 
-#include "utility.hpp"
-
 #include <stdexcept>
 #include <algorithm>
 
+RegionPagerBase::RegionPagerBase() {
+	//
+}
+
+RegionPagerBase::RegionPagerBase(RegionPagerBase&& rhs) {
+	regionList = std::move(rhs.regionList);
+}
+
+RegionPagerBase::~RegionPagerBase() {
+	UnloadAll();
+}
+
 Region::type_t RegionPagerBase::SetTile(int x, int y, int z, Region::type_t v) {
 	Region* ptr = GetRegion(x, y);
 	return ptr->SetTile(x - ptr->GetX(), y - ptr->GetY(), z, v);
@@ -73,12 +83,12 @@ Region* RegionPagerBase::PushRegion(Region* const ptr) {
 }
 
 Region* RegionPagerBase::LoadRegion(int x, int y) {
-	//TODO: load the region if possible
+	//EMPTY, intended for override
 	return nullptr;
 }
 
 Region* RegionPagerBase::SaveRegion(int x, int y) {
-	//TODO: find & save the region
+	//EMPTY, intended for override
 	return nullptr;
 }
 
@@ -91,8 +101,9 @@ Region* RegionPagerBase::CreateRegion(int x, int y) {
 }
 
 void RegionPagerBase::UnloadRegion(int x, int y) {
-	//custom loop, not FindRegion()
-	regionList.remove_if([x, y](Region& region) -> bool { return region.GetX() == x && region.GetY() == y; });
+	regionList.remove_if([x, y](Region& region) -> bool {
+		return region.GetX() == x && region.GetY() == y;
+	});
 }
 
 void RegionPagerBase::UnloadAll() {

common/map/region_pager_base.hpp

@@ -28,8 +28,9 @@
 
 class RegionPagerBase {
 public:
-	RegionPagerBase() = default;
-	virtual ~RegionPagerBase() { UnloadAll(); };
+	RegionPagerBase();
+	RegionPagerBase(RegionPagerBase&&);
+	virtual ~RegionPagerBase();
 
 	//tile manipulation
 	virtual Region::type_t SetTile(int x, int y, int z, Region::type_t v);

common/map/region_pager_lua.cpp

@@ -21,103 +21,186 @@
 */
 #include "region_pager_lua.hpp"
 
-#include "utility.hpp"
-
 #include <stdexcept>
 
+RegionPagerLua::RegionPagerLua() {
+	//
+}
+
+RegionPagerLua::RegionPagerLua(RegionPagerLua&& rhs) {
+	lua = rhs.lua;
+	loadRef = rhs.loadRef;
+	saveRef = rhs.saveRef;
+	createRef = rhs.createRef;
+	unloadRef = rhs.unloadRef;
+}
+
+RegionPagerLua::~RegionPagerLua() {
+	//unload all regions
+	UnloadAll();
+	//clear any stored functions
+	luaL_unref(lua, LUA_REGISTRYINDEX, loadRef);
+	luaL_unref(lua, LUA_REGISTRYINDEX, saveRef);
+	luaL_unref(lua, LUA_REGISTRYINDEX, createRef);
+	luaL_unref(lua, LUA_REGISTRYINDEX, unloadRef);
+}
+
+//return the loaded region, or nullptr on failure
 Region* RegionPagerLua::LoadRegion(int x, int y) {
-	//load the region if possible
+	//get the pager's function from the registry
+	lua_rawgeti(lua, LUA_REGISTRYINDEX, loadRef);
+
+	//check if this function is available
+	if (lua_isnil(lua, -1)) {
+		lua_pop(lua, 1);
+		return nullptr;
+	}
 
 	//something to work on
 	Region tmpRegion(x, y);
-
-	//API hook
-	lua_getglobal(lua, "Region");
-	lua_getfield(lua, -1, "Load");
 	lua_pushlightuserdata(lua, &tmpRegion);
+
+	//call the funtion, 1 arg, 1 return
 	if (lua_pcall(lua, 1, 1, 0) != LUA_OK) {
 		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
 	}
-	//success or failure
-	if (!lua_toboolean(lua, -1)) {
-		lua_pop(lua, 2);
-		return nullptr;
-	}
-	lua_pop(lua, 2);
+
+	//check the return value, success or failure
+	if (lua_toboolean(lua, -1)) {
+		lua_pop(lua, 1);
 		regionList.push_front(tmpRegion);
 		return &regionList.front();
 	}
+	else {
+		lua_pop(lua, 1);
+		return nullptr;
+	}
+}
 
+//return the saved region, or nullptr on failure
 Region* RegionPagerLua::SaveRegion(int x, int y) {
-	//find & save the region
+	//get the pager's function from the registry
+	lua_rawgeti(lua, LUA_REGISTRYINDEX, saveRef);
+
+	//check if this function is available
+	if (lua_isnil(lua, -1)) {
+		lua_pop(lua, 1);
+		return nullptr;
+	}
+
+	//find the specified region
 	Region* ptr = FindRegion(x, y);
-	if (ptr) {
-		//API hook
-		lua_getglobal(lua, "Region");
-		lua_getfield(lua, -1, "Save");
+	if (!ptr) {
+		lua_pop(lua, 1);
+		return nullptr;
+	}
 	lua_pushlightuserdata(lua, ptr);
-		if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
+
+	//call the function, 1 arg, 1 return
+	if (lua_pcall(lua, 1, 1, 0) != LUA_OK) {
 		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
 	}
+
+	//check the return value, success or failure
+	if (lua_toboolean(lua, -1)) {
 		lua_pop(lua, 1);
-	}
 		return ptr;
 	}
+	else {
+		lua_pop(lua, 1);
+		return nullptr;
+	}
+}
 
+//return the created region, or nullptr on failure
 Region* RegionPagerLua::CreateRegion(int x, int y) {
 	if (FindRegion(x, y)) {
 		throw(std::logic_error("Cannot overwrite an existing region"));
 	}
 
+	//get the pager's function from the registry
+	lua_rawgeti(lua, LUA_REGISTRYINDEX, createRef);
+
+	//check if this function is available
+	if (lua_isnil(lua, -1)) {
+		lua_pop(lua, 1);
+		return nullptr;
+	}
+
 	//something to work on
 	Region tmpRegion(x, y);
-
-	//API hook
-	lua_getglobal(lua, "Region");
-	lua_getfield(lua, -1, "Create");
 	lua_pushlightuserdata(lua, &tmpRegion);
-	//TODO: parameters
+
+	//call the function, 1 arg, 0 return
 	if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
 		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
 	}
-	lua_pop(lua, 1);
+
+	//return the new region
 	regionList.push_front(tmpRegion);
 	return &regionList.front();
 }
 
+//no return
 void RegionPagerLua::UnloadRegion(int x, int y) {
-	lua_getglobal(lua, "Region");
+	//get the pager's function from the registry
+	lua_rawgeti(lua, LUA_REGISTRYINDEX, unloadRef);
 
+	//check if this function is available
+	if (lua_isnil(lua, -1)) {
+		lua_pop(lua, 1);
+		return;
+	}
+
+	//run each region through this lambda
 	regionList.remove_if([&](Region& region) -> bool {
 		if (region.GetX() == x && region.GetY() == y) {
 
-			//API hook
-			lua_getfield(lua, -1, "Unload");
+			//push a copy of the function onto the stack with the region
+			lua_pushvalue(lua, -1);
 			lua_pushlightuserdata(lua, &region);
+
+			//call the function, 1 arg, 0 return
 			if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
 				throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
 			}
 
+			//signal to the container
 			return true;
 		}
+		//signal to the container
 		return false;
 	});
 
+	//pop the base copy of the function
 	lua_pop(lua, 1);
 }
 
+//no return
 void RegionPagerLua::UnloadAll() {
-	lua_getglobal(lua, "Region");
+	//get the pager's function from the registry
+	lua_rawgeti(lua, LUA_REGISTRYINDEX, unloadRef);
+
+	//check if this function is available
+	if (lua_isnil(lua, -1)) {
+		lua_pop(lua, 1);
+		return;
+	}
 
 	for (auto& it : regionList) {
-		//API hook
-		lua_getfield(lua, -1, "Unload");
+		//push a copy of the function onto the stack with the region
+		lua_pushvalue(lua, -1);
 		lua_pushlightuserdata(lua, &it);
+
+		//call the function, 1 arg, 0 return
 		if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
 			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
 		}
 	}
 
+	//pop the base copy of the function
 	lua_pop(lua, 1);
+
+	//remove from memory
 	regionList.clear();
 }

common/map/region_pager_lua.hpp

@@ -24,14 +24,19 @@
 
 #include "region_pager_base.hpp"
 
+#if defined(__MINGW32__)
  #include "lua/lua.hpp"
+#else
+ #include "lua.hpp"
+#endif
 
 #include <string>
 
 class RegionPagerLua : public RegionPagerBase {
 public:
-	RegionPagerLua() = default;
-	~RegionPagerLua() = default;
+	RegionPagerLua();
+	RegionPagerLua(RegionPagerLua&&);
+	~RegionPagerLua();
 
 	//region manipulation
 	Region* LoadRegion(int x, int y) override;
@@ -44,8 +49,25 @@ public:
 	//accessors & mutators
 	lua_State* SetLuaState(lua_State* L) { return lua = L; }
 	lua_State* GetLuaState() { return lua; }
+
+	//utilities for the API
+	int SetLoadReference(int i) { return loadRef = i; }
+	int SetSaveReference(int i) { return saveRef = i; }
+	int SetCreateReference(int i) { return createRef = i; }
+	int SetUnloadReference(int i) { return unloadRef = i; }
+
+	int GetLoadReference() { return loadRef; }
+	int GetSaveReference() { return saveRef; }
+	int GetCreateReference() { return createRef; }
+	int GetUnloadReference() { return unloadRef; }
+
 protected:
 	lua_State* lua = nullptr;
+
+	int loadRef = LUA_NOREF;
+	int saveRef = LUA_NOREF;
+	int createRef = LUA_NOREF;
+	int unloadRef = LUA_NOREF;
 };
 
 #endif

common/map/tile_sheet_api.hpp

@@ -22,9 +22,13 @@
 #ifndef TILESHEETAPI_HPP_
 #define TILESHEETAPI_HPP_
 
+#if defined(__MINGW32__)
  #include "lua/lua.hpp"
+#else
+ #include "lua.hpp"
+#endif
 
-#define TORTUGA_TILE_SHEET_NAME "TileSheet"
+#define TORTUGA_TILE_SHEET_NAME "tile_sheet"
 LUAMOD_API int openTileSheetAPI(lua_State* L);
 
 #endif

common/network/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. packet serial ../gameplay ../map ../utilities
+INCLUDES+=. packet_types ../gameplay ../map ../utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
@@ -17,8 +17,7 @@ OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 #targets
 all: $(OBJ) $(OUT)
 	ar -crs $(OUT) $(OBJ)
-	$(MAKE) -C packet
-	$(MAKE) -C serial
+	$(MAKE) -C packet_types
 
 $(OBJ): | $(OBJDIR)
 

common/network/packet/sanity_check.cpp

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

common/network/packet/serial_packet_type.hpp

@@ -1,113 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef SERIALPACKETTYPE_HPP_
-#define SERIALPACKETTYPE_HPP_
-
-/* Key for the comments:
- * request => response
-*/
-
-enum class SerialPacketType {
-	//default: there is something wrong
-	NONE = 0,
-
-	//keep alive
-	//ping => pong
-	PING = 1,
-	PONG = 2,
-
-	//search for the server list
-	//none => server name, player count, version info (and source address)
-	BROADCAST_REQUEST = 3,
-	BROADCAST_RESPONSE = 4,
-
-	//try to join the server
-	//username, and password => client index, account index
-	JOIN_REQUEST = 5,
-	JOIN_RESPONSE = 6,
-	JOIN_REJECTION = 7,
-
-	//mass update of all surrounding content
-	//character.x, character.y => packet barrage
-	SYNCHRONIZE = 8,
-
-	//disconnect from the server
-	//autentication, account index => disconnect that account
-	DISCONNECT = 9,
-
-	//shut down the server
-	//autentication => disconnect, shutdown
-	SHUTDOWN = 10,
-
-	//map data
-	//room index, region.x, region.y => room index, region.x, region.y, region content
-	REGION_REQUEST = 11,
-	REGION_CONTENT = 12,
-
-	//combat data
-	//TODO: system incomplete
-	COMBAT_NEW = 13,
-	COMBAT_DELETE = 14,
-	COMBAT_UPDATE = 15,
-
-	COMBAT_ENTER_REQUEST = 16,
-	COMBAT_ENTER_RESPONSE = 17,
-
-	COMBAT_EXIT_REQUEST = 18,
-	COMBAT_EXIT_RESPONSE = 19,
-
-	//TODO: COMBAT info
-
-	COMBAT_REJECTION = 20,
-
-	//character data
-	//character data => etc.
-	CHARACTER_NEW = 21,
-	CHARACTER_DELETE = 22,
-	CHARACTER_UPDATE = 23,
-
-	//authentication, character index => character stats
-	CHARACTER_STATS_REQUEST= 24,
-	CHARACTER_STATS_RESPONSE = 25,
-
-	//character new => character rejection, disconnect?
-	CHARACTER_REJECTION = 26,
-
-	//enemy data
-	//enemy data => etc.
-	ENEMY_NEW = 27,
-	ENEMY_DELETE = 28,
-	ENEMY_UPDATE = 29,
-
-	ENEMY_STATS_REQUEST = 30,
-	ENEMY_STATS_RESPONSE = 31,
-
-	//enemy index => enemy doens't exist
-	ENEMY_REJECTION= 32,
-
-	//NOTE: more packet types go here
-
-	//not used
-	LAST
-};
-
-#endif

common/network/packet_types/character_packet.cpp

@@ -0,0 +1,66 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "character_packet.hpp"
+
+#include "serial_utility.hpp"
+
+void serializeCharacter(void* buffer, CharacterPacket* packet) {
+	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the character
+	serialCopy(&buffer, &packet->characterIndex, sizeof(int));
+	serialCopy(&buffer, packet->handle, PACKET_STRING_SIZE);
+	serialCopy(&buffer, packet->avatar, PACKET_STRING_SIZE);
+
+	//the owner
+	serialCopy(&buffer, &packet->accountIndex, sizeof(int));
+
+	//location
+	serialCopy(&buffer, &packet->roomIndex, sizeof(int));
+	serialCopy(&buffer, &packet->origin.x, sizeof(double));
+	serialCopy(&buffer, &packet->origin.y, sizeof(double));
+	serialCopy(&buffer, &packet->motion.x, sizeof(double));
+	serialCopy(&buffer, &packet->motion.y, sizeof(double));
+
+	//gameplay components: equipment, items, buffs, debuffs...
+}
+
+void deserializeCharacter(void* buffer, CharacterPacket* packet) {
+	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	//identify the character
+	deserialCopy(&buffer, &packet->characterIndex, sizeof(int));
+	deserialCopy(&buffer, packet->handle, PACKET_STRING_SIZE);
+	deserialCopy(&buffer, packet->avatar, PACKET_STRING_SIZE);
+
+	//the owner
+	deserialCopy(&buffer, &packet->accountIndex, sizeof(int));
+
+	//location
+	deserialCopy(&buffer, &packet->roomIndex, sizeof(int));
+	deserialCopy(&buffer, &packet->origin.x, sizeof(double));
+	deserialCopy(&buffer, &packet->origin.y, sizeof(double));
+	deserialCopy(&buffer, &packet->motion.x, sizeof(double));
+	deserialCopy(&buffer, &packet->motion.y, sizeof(double));
+
+	//gameplay components: equipment, items, buffs, debuffs...
+}

common/network/packet_types/character_packet.hpp

@@ -25,7 +25,6 @@
 #include "serial_packet_base.hpp"
 
 #include "vector2.hpp"
-#include "statistics.hpp"
 
 struct CharacterPacket : SerialPacketBase {
 	//identify the character
@@ -35,16 +34,17 @@ struct CharacterPacket : SerialPacketBase {
 
 	//the owner
 	int accountIndex;
+	//TODO: Authentication token?
 
 	//location
 	int roomIndex;
 	Vector2 origin;
 	Vector2 motion;
 
-	//gameplay
-	Statistics stats;
-
-	//TODO: gameplay components: equipment, items, buffs, debuffs
+	//gameplay components: equipment, items, buffs, debuffs...
 };
 
+void serializeCharacter(void* buffer, CharacterPacket* packet);
+void deserializeCharacter(void* buffer, CharacterPacket* packet);
+
 #endif

common/network/packet_types/client_packet.cpp

@@ -19,22 +19,22 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "check_bounds.hpp"
+#include "client_packet.hpp"
 
-bool checkPoint(Vector2 const& origin, Vector2 const& bound, Vector2 const& point) {
-	return !(
-		point.x < origin.x ||
-		point.y < origin.y ||
-		point.x >= origin.x + bound.x ||
-		point.y >= origin.y + bound.y
-	);
+#include "serial_utility.hpp"
+
+void serializeClient(void* buffer, ClientPacket* packet) {
+	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	serialCopy(&buffer, &packet->clientIndex, sizeof(int));
+	serialCopy(&buffer, &packet->accountIndex, sizeof(int));
+	serialCopy(&buffer, packet->username, PACKET_STRING_SIZE);
 }
 
-bool checkOverlap(Vector2 const& originOne, Vector2 const& boundOne, Vector2 const& originTwo, Vector2 const& boundTwo) {
-	return !(
-		originOne.x >= originTwo.x + boundTwo.x ||
-		originOne.x + boundOne.x >= originTwo.x ||
-		originOne.y >= originTwo.y + boundTwo.y ||
-		originOne.y + boundOne.y >= originTwo.y
-	);
+void deserializeClient(void* buffer, ClientPacket* packet) {
+	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	deserialCopy(&buffer, &packet->clientIndex, sizeof(int));
+	deserialCopy(&buffer, &packet->accountIndex, sizeof(int));
+	deserialCopy(&buffer, packet->username, PACKET_STRING_SIZE);
 }

common/network/packet_types/client_packet.hpp

@@ -28,7 +28,9 @@ struct ClientPacket : SerialPacketBase {
 	int clientIndex;
 	int accountIndex;
 	char username[PACKET_STRING_SIZE];
-//	char password[PACKET_STRING_SIZE]; //hashed, not currently used
 };
 
+void serializeClient(void* buffer, ClientPacket* packet);
+void deserializeClient(void* buffer, ClientPacket* packet);
+
 #endif

common/network/packet_types/makefile

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

common/network/packet_types/region_packet.cpp

@@ -0,0 +1,79 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "region_packet.hpp"
+
+#include "serial_utility.hpp"
+
+void serializeRegion(void* buffer, RegionPacket* packet) {
+	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	//format
+	serialCopy(&buffer, &packet->roomIndex, sizeof(int));
+	serialCopy(&buffer, &packet->x, sizeof(int));
+	serialCopy(&buffer, &packet->y, sizeof(int));
+
+	if (packet->type != SerialPacketType::REGION_CONTENT) {
+		return;
+	}
+
+	//tiles
+	for (int i = 0; i < REGION_WIDTH; i++) {
+		for (int j = 0; j < REGION_HEIGHT; j++) {
+			for (int k = 0; k < REGION_DEPTH; k++) {
+				*reinterpret_cast<Region::type_t*>(buffer) = packet->region->GetTile(i, j, k);
+				buffer = reinterpret_cast<char*>(buffer) + sizeof(Region::type_t);
+			}
+		}
+	}
+
+	//solids
+	serialCopy(&buffer, packet->region->GetSolidBitset(), REGION_SOLID_FOOTPRINT);
+}
+
+void deserializeRegion(void* buffer, RegionPacket* packet) {
+	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	//format
+	deserialCopy(&buffer, &packet->roomIndex, sizeof(int));
+	deserialCopy(&buffer, &packet->x, sizeof(int));
+	deserialCopy(&buffer, &packet->y, sizeof(int));
+
+	if (packet->type != SerialPacketType::REGION_CONTENT) {
+		return;
+	}
+
+	//an object to work on
+	packet->region = new Region(packet->x, packet->y);
+
+	//tiles
+	for (int i = 0; i < REGION_WIDTH; i++) {
+		for (int j = 0; j < REGION_HEIGHT; j++) {
+			for (int k = 0; k < REGION_DEPTH; k++) {
+				packet->region->SetTile(i, j, k, *reinterpret_cast<Region::type_t*>(buffer));
+				buffer = reinterpret_cast<char*>(buffer) + sizeof(Region::type_t);
+			}
+		}
+	}
+
+	//solids
+	deserialCopy(&buffer, packet->region->GetSolidBitset(), REGION_SOLID_FOOTPRINT);
+}

common/network/packet_types/region_packet.hpp

@@ -19,21 +19,30 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ENEMYPACKET_HPP_
-#define ENEMYPACKET_HPP_
+#ifndef REGIONPACKET_HPP_
+#define REGIONPACKET_HPP_
 
 #include "serial_packet_base.hpp"
 
-struct EnemyPacket : SerialPacketBase {
-	//identify the enemy
-	int enemyIndex;
-	char handle[PACKET_STRING_SIZE];
-	char avatar[PACKET_STRING_SIZE];
+#include "region.hpp"
 
-	//gameplay
-	Statistics stats;
+#include <cmath>
 
-	//TODO: gameplay components: equipment, items, buffs, debuffs, rewards
+//define the memory footprint for the region's members
+constexpr int REGION_TILE_FOOTPRINT = sizeof(Region::type_t) * REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH;
+constexpr int REGION_SOLID_FOOTPRINT = ceil(REGION_WIDTH * REGION_HEIGHT / 8.0);
+constexpr int REGION_METADATA_FOOTPRINT = sizeof(int) * 3;
+
+struct RegionPacket : SerialPacketBase {
+	//location/identify the region
+	int roomIndex;
+	int x, y;
+
+	//the data
+	Region* region;
 };
 
+void serializeRegion(void* buffer, RegionPacket* packet);
+void deserializeRegion(void* buffer, RegionPacket* packet);
+
 #endif

common/network/packet_types/serial_packet_base.cpp

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

common/network/packet_types/serial_packet_base.hpp

@@ -22,15 +22,10 @@
 #ifndef SERIALPACKETBASE_HPP_
 #define SERIALPACKETBASE_HPP_
 
-#ifndef SERIALPACKET_HPP_
- #error Cannot include this file without 'serial_packet.hpp'
-#endif
-
 #include "serial_packet_type.hpp"
 
 #include "SDL/SDL_net.h"
 
-constexpr int NETWORK_VERSION = 20140701;
 constexpr int PACKET_STRING_SIZE = 100;
 
 struct SerialPacketBase {
@@ -41,6 +36,4 @@ struct SerialPacketBase {
 	virtual ~SerialPacketBase() {};
 };
 
-typedef SerialPacketBase SerialPacket;
-
 #endif

common/network/packet_types/server_packet.cpp

@@ -19,24 +19,24 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "serial.hpp"
+#include "server_packet.hpp"
 
-#include "serial_util.hpp"
+#include "serial_utility.hpp"
 
-void serializeServer(ServerPacket* packet, void* buffer) {
-	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+void serializeServer(void* buffer, ServerPacket* packet) {
+	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
 
 	//identify the server
-	SERIALIZE(buffer, &packet->name, PACKET_STRING_SIZE);
-	SERIALIZE(buffer, &packet->playerCount, sizeof(int));
-	SERIALIZE(buffer, &packet->version, sizeof(int));
+	serialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
+	serialCopy(&buffer, &packet->playerCount, sizeof(int));
+	serialCopy(&buffer, &packet->version, sizeof(int));
 }
 
-void deserializeServer(ServerPacket* packet, void* buffer) {
-	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+void deserializeServer(void* buffer, ServerPacket* packet) {
+	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
 
 	//identify the server
-	DESERIALIZE(buffer, &packet->name, PACKET_STRING_SIZE);
-	DESERIALIZE(buffer, &packet->playerCount, sizeof(int));
-	DESERIALIZE(buffer, &packet->version, sizeof(int));
+	deserialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
+	deserialCopy(&buffer, &packet->playerCount, sizeof(int));
+	deserialCopy(&buffer, &packet->version, sizeof(int));
 }

common/network/packet_types/server_packet.hpp

@@ -31,4 +31,7 @@ struct ServerPacket : SerialPacketBase {
 	int version;
 };
 
+void serializeServer(void* buffer, ServerPacket* packet);
+void deserializeServer(void* buffer, ServerPacket* packet);
+
 #endif

common/network/packet_types/text_packet.cpp

@@ -19,28 +19,22 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef COMBATPACKET_HPP_
-#define COMBATPACKET_HPP_
+#include "text_packet.hpp"
 
-#include "serial_packet_base.hpp"
+#include "serial_utility.hpp"
 
-#include "combat_defines.hpp"
+void serializeText(void* buffer, TextPacket* packet) {
+	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
 
-struct CombatPacket : SerialPacketBase {
-	//identify the combat instance
-	int combatIndex;
-	int difficulty;
-	TerrainType terrainType;
+	//content
+	serialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
+	serialCopy(&buffer, packet->text, PACKET_STRING_SIZE);
+}
 
-	//combatants
-	int characterArray[COMBAT_MAX_CHARACTERS];
-	int enemyArray[COMBAT_MAX_ENEMIES];
+void deserializeText(void* buffer, TextPacket* packet) {
+	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
 
-	//location
-	int mapIndex;
-	Vector2 origin;
-
-	//TODO: gameplay components: rewards
-};
-
-#endif
+	//content
+	deserialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
+	deserialCopy(&buffer, packet->text, PACKET_STRING_SIZE);
+}

common/network/packet_types/text_packet.hpp

@@ -19,20 +19,17 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGIONPACKET_HPP_
-#define REGIONPACKET_HPP_
+#ifndef TEXTPACKET_HPP_
+#define TEXTPACKET_HPP_
 
 #include "serial_packet_base.hpp"
 
-#include "region.hpp"
-
-struct RegionPacket : SerialPacketBase {
-	//location/identify the region
-	int roomIndex;
-	int x, y;
-
-	//the data
-	Region* region;
+struct TextPacket : SerialPacketBase {
+	char name[PACKET_STRING_SIZE];
+	char text[PACKET_STRING_SIZE];
 };
 
+void serializeText(void* buffer, TextPacket* packet);
+void deserializeText(void* buffer, TextPacket* packet);
+
 #endif

common/network/serial/serial.cpp

@@ -1,182 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "serial.hpp"
-
-#include "serial_util.hpp"
-
-//simple type functions
-void serializeType(SerialPacketBase* packet, void* buffer) {
-	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
-}
-
-void deserializeType(SerialPacketBase* packet, void* buffer) {
-	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
-}
-
-//main switch functions
-void serializePacket(SerialPacketBase* packet, void* buffer) {
-	switch(packet->type) {
-		//no extra data
-		case SerialPacketType::NONE:
-		case SerialPacketType::PING:
-		case SerialPacketType::PONG:
-		case SerialPacketType::BROADCAST_REQUEST:
-
-		//all rejections
-		case SerialPacketType::JOIN_REJECTION:
-		case SerialPacketType::CHARACTER_REJECTION:
-		case SerialPacketType::ENEMY_REJECTION:
-		case SerialPacketType::COMBAT_REJECTION:
-
-			serializeType(packet, buffer);
-		break;
-
-		//character info
-		case SerialPacketType::CHARACTER_NEW:
-		case SerialPacketType::CHARACTER_DELETE:
-		case SerialPacketType::CHARACTER_UPDATE:
-		case SerialPacketType::CHARACTER_STATS_REQUEST:
-		case SerialPacketType::CHARACTER_STATS_RESPONSE:
-			serializeCharacter(static_cast<CharacterPacket*>(packet), buffer);
-		break;
-
-		//client info
-		case SerialPacketType::JOIN_REQUEST:
-		case SerialPacketType::JOIN_RESPONSE:
-		case SerialPacketType::SYNCHRONIZE:
-		case SerialPacketType::DISCONNECT:
-		case SerialPacketType::SHUTDOWN:
-			serializeClient(static_cast<ClientPacket*>(packet), buffer);
-		break;
-
-		//combat info
-		case SerialPacketType::COMBAT_NEW:
-		case SerialPacketType::COMBAT_DELETE:
-		case SerialPacketType::COMBAT_UPDATE:
-
-		case SerialPacketType::COMBAT_ENTER_REQUEST:
-		case SerialPacketType::COMBAT_ENTER_RESPONSE:
-		case SerialPacketType::COMBAT_EXIT_REQUEST:
-		case SerialPacketType::COMBAT_EXIT_RESPONSE:
-
-			serializeCombat(static_cast<CombatPacket*>(packet), buffer);
-		break;
-
-		//enemy info
-		case SerialPacketType::ENEMY_NEW:
-		case SerialPacketType::ENEMY_DELETE:
-		case SerialPacketType::ENEMY_UPDATE:
-		case SerialPacketType::ENEMY_STATS_REQUEST:
-		case SerialPacketType::ENEMY_STATS_RESPONSE:
-			serializeEnemy(static_cast<EnemyPacket*>(packet), buffer);
-		break;
-
-		//region info
-		case SerialPacketType::REGION_REQUEST:
-			serializeRegionFormat(static_cast<RegionPacket*>(packet), buffer);
-		break;
-
-		case SerialPacketType::REGION_CONTENT:
-			serializeRegionContent(static_cast<RegionPacket*>(packet), buffer);
-		break;
-
-		//server info
-		case SerialPacketType::BROADCAST_RESPONSE:
-			serializeServer(static_cast<ServerPacket*>(packet), buffer);
-		break;
-	}
-}
-
-void deserializePacket(SerialPacketBase* packet, void* buffer) {
-	//find the type, so that you can actually deserialize the packet!
-	deserializeType(packet, buffer);
-	switch(packet->type) {
-		//no extra data
-		case SerialPacketType::NONE:
-		case SerialPacketType::PING:
-		case SerialPacketType::PONG:
-		case SerialPacketType::BROADCAST_REQUEST:
-
-		//all rejections
-		case SerialPacketType::JOIN_REJECTION:
-		case SerialPacketType::CHARACTER_REJECTION:
-		case SerialPacketType::ENEMY_REJECTION:
-		case SerialPacketType::COMBAT_REJECTION:
-
-			//NOTHING
-		break;
-
-		//character info
-		case SerialPacketType::CHARACTER_NEW:
-		case SerialPacketType::CHARACTER_DELETE:
-		case SerialPacketType::CHARACTER_UPDATE:
-		case SerialPacketType::CHARACTER_STATS_REQUEST:
-		case SerialPacketType::CHARACTER_STATS_RESPONSE:
-			deserializeCharacter(static_cast<CharacterPacket*>(packet), buffer);
-		break;
-
-		//client info
-		case SerialPacketType::JOIN_REQUEST:
-		case SerialPacketType::JOIN_RESPONSE:
-		case SerialPacketType::SYNCHRONIZE:
-		case SerialPacketType::DISCONNECT:
-		case SerialPacketType::SHUTDOWN:
-			deserializeClient(static_cast<ClientPacket*>(packet), buffer);
-		break;
-
-		//combat info
-		case SerialPacketType::COMBAT_NEW:
-		case SerialPacketType::COMBAT_DELETE:
-		case SerialPacketType::COMBAT_UPDATE:
-
-		case SerialPacketType::COMBAT_ENTER_REQUEST:
-		case SerialPacketType::COMBAT_ENTER_RESPONSE:
-		case SerialPacketType::COMBAT_EXIT_REQUEST:
-		case SerialPacketType::COMBAT_EXIT_RESPONSE:
-
-			serializeCombat(static_cast<CombatPacket*>(packet), buffer);
-		break;
-
-		//enemy info
-		case SerialPacketType::ENEMY_NEW:
-		case SerialPacketType::ENEMY_DELETE:
-		case SerialPacketType::ENEMY_UPDATE:
-		case SerialPacketType::ENEMY_STATS_REQUEST:
-		case SerialPacketType::ENEMY_STATS_RESPONSE:
-			serializeEnemy(static_cast<EnemyPacket*>(packet), buffer);
-		break;
-
-		//region info
-		case SerialPacketType::REGION_REQUEST:
-			deserializeRegionFormat(static_cast<RegionPacket*>(packet), buffer);
-		break;
-
-		case SerialPacketType::REGION_CONTENT:
-			deserializeRegionContent(static_cast<RegionPacket*>(packet), buffer);
-		break;
-
-		//server info
-		case SerialPacketType::BROADCAST_RESPONSE:
-			deserializeServer(static_cast<ServerPacket*>(packet), buffer);
-		break;
-	}
-}

common/network/serial/serial.hpp

@@ -1,67 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef SERIALIZE_HPP_
-#define SERIALIZE_HPP_
-
-#include "serial_packet.hpp"
-
-#include "region.hpp"
-#include "statistics.hpp"
-
-//Primary interface functions
-void serializePacket(SerialPacketBase*, void* dest);
-void deserializePacket(SerialPacketBase*, void* src);
-
-void serializeType(SerialPacketBase*, void*);
-void deserializeType(SerialPacketBase*, void*);
-
-//utility functions, exposed
-void serializeCharacter(CharacterPacket*, void*);
-void serializeClient(ClientPacket*, void*);
-void serializeCombat(CombatPacket*, void*);
-void serializeEnemy(EnemyPacket*, void*);
-void serializeRegionFormat(RegionPacket*, void*);
-void serializeRegionContent(RegionPacket*, void*);
-void serializeServer(ServerPacket*, void*);
-void serializeStatistics(Statistics*, void*);
-
-void deserializeCharacter(CharacterPacket*, void*);
-void deserializeClient(ClientPacket*, void*);
-void deserializeCombat(CombatPacket*, void*);
-void deserializeEnemy(EnemyPacket*, void*);
-void deserializeRegionFormat(RegionPacket*, void*);
-void deserializeRegionContent(RegionPacket*, void*);
-void deserializeServer(ServerPacket*, void*);
-void deserializeStatistics(Statistics*, void*);
-
-/* 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 = sizeof(SerialPacketType) + sizeof(int) * 3 + REGION_FOOTPRINT;
-
-#endif

common/network/serial/serial_character.cpp

@@ -1,74 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "serial.hpp"
-
-#include "serial_util.hpp"
-
-void serializeCharacter(CharacterPacket* packet, void* buffer) {
-	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
-
-	//identify the character
-	SERIALIZE(buffer, &packet->characterIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->handle, PACKET_STRING_SIZE);
-	SERIALIZE(buffer, &packet->avatar, PACKET_STRING_SIZE);
-
-	//the owner
-	SERIALIZE(buffer, &packet->accountIndex, sizeof(int));
-
-	//location
-	SERIALIZE(buffer, &packet->roomIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->origin.x, sizeof(double));
-	SERIALIZE(buffer, &packet->origin.y, sizeof(double));
-	SERIALIZE(buffer, &packet->motion.x, sizeof(double));
-	SERIALIZE(buffer, &packet->motion.y, sizeof(double));
-
-	//stats structure
-	serializeStatistics(&packet->stats, buffer);
-	buffer = reinterpret_cast<char*>(buffer) + sizeof(Statistics);
-
-	//TODO: gameplay components: equipment, items, buffs, debuffs
-}
-
-void deserializeCharacter(CharacterPacket* packet, void* buffer) {
-	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
-
-	//identify the character
-	DESERIALIZE(buffer, &packet->characterIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->handle, PACKET_STRING_SIZE);
-	DESERIALIZE(buffer, &packet->avatar, PACKET_STRING_SIZE);
-
-	//the owner
-	DESERIALIZE(buffer, &packet->accountIndex, sizeof(int));
-
-	//location
-	DESERIALIZE(buffer, &packet->roomIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->origin.x, sizeof(double));
-	DESERIALIZE(buffer, &packet->origin.y, sizeof(double));
-	DESERIALIZE(buffer, &packet->motion.x, sizeof(double));
-	DESERIALIZE(buffer, &packet->motion.y, sizeof(double));
-
-	//stats structure
-	deserializeStatistics(&packet->stats, buffer);
-	buffer = reinterpret_cast<char*>(buffer) + sizeof(Statistics);
-
-	//TODO: gameplay components: equipment, items, buffs, debuffs
-}

common/network/serial/serial_client.cpp

@@ -1,42 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "serial.hpp"
-
-#include "serial_util.hpp"
-
-void serializeClient(ClientPacket* packet, void* buffer) {
-	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
-
-	SERIALIZE(buffer, &packet->clientIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->accountIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->username, PACKET_STRING_SIZE);
-//	SERIALIZE(buffer, &packet->password, PACKET_STRING_SIZE);
-}
-
-void deserializeClient(ClientPacket* packet, void* buffer) {
-	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
-
-	DESERIALIZE(buffer, &packet->clientIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->accountIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->username, PACKET_STRING_SIZE);
-//	DESERIALIZE(buffer, &packet->password, PACKET_STRING_SIZE);
-}

common/network/serial/serial_combat.cpp

@@ -1,64 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "serial.hpp"
-
-#include "serial_util.hpp"
-
-void serializeCombat(CombatPacket* packet, void* buffer) {
-	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
-
-	//identify the combat instance
-	SERIALIZE(buffer, &packet->combatIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->difficulty, sizeof(int));
-	SERIALIZE(buffer, &packet->terrainType, sizeof(TerrainType));
-
-	//combatants
-	SERIALIZE(buffer, &packet->characterArray, sizeof(int) * COMBAT_MAX_CHARACTERS);
-	SERIALIZE(buffer, &packet->enemyArray, sizeof(int) * COMBAT_MAX_ENEMIES);
-
-	//location
-	SERIALIZE(buffer, &packet->mapIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->origin.x, sizeof(double));
-	SERIALIZE(buffer, &packet->origin.y, sizeof(double));
-
-	//TODO: gameplay components: rewards
-}
-
-void deserializeCombat(CombatPacket* packet, void* buffer) {
-	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
-
-	//identify the combat instance
-	DESERIALIZE(buffer, &packet->combatIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->difficulty, sizeof(int));
-	DESERIALIZE(buffer, &packet->terrainType, sizeof(TerrainType));
-
-	//combatants
-	DESERIALIZE(buffer, &packet->characterArray, sizeof(int) * COMBAT_MAX_CHARACTERS);
-	DESERIALIZE(buffer, &packet->enemyArray, sizeof(int) * COMBAT_MAX_ENEMIES);
-
-	//location
-	DESERIALIZE(buffer, &packet->mapIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->origin.x, sizeof(double));
-	DESERIALIZE(buffer, &packet->origin.y, sizeof(double));
-
-	//TODO: gameplay components: rewards
-}

common/network/serial/serial_enemy.cpp

@@ -1,56 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "serial.hpp"
-
-#include "serial_util.hpp"
-
-void serializeEnemy(EnemyPacket* packet, void* buffer) {
-	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
-
-	//identify the enemy
-	SERIALIZE(buffer, &packet->enemyIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->handle, PACKET_STRING_SIZE);
-	SERIALIZE(buffer, &packet->avatar, PACKET_STRING_SIZE);
-
-	//gameplay
-
-	//stats structure
-	serializeStatistics(&packet->stats, buffer);
-	buffer = reinterpret_cast<char*>(buffer) + sizeof(Statistics);
-
-	//TODO: gameplay components: equipment, items, buffs, debuffs, rewards
-}
-
-void deserializeEnemy(EnemyPacket* packet, void* buffer) {
-	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
-
-	//identify the enemy
-	DESERIALIZE(buffer, &packet->enemyIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->handle, PACKET_STRING_SIZE);
-	DESERIALIZE(buffer, &packet->avatar, PACKET_STRING_SIZE);
-
-	//stats structure
-	deserializeStatistics(&packet->stats, buffer);
-	buffer = reinterpret_cast<char*>(buffer) + sizeof(Statistics);
-
-	//TODO: gameplay components: equipment, items, buffs, debuffs, rewards
-}

common/network/serial/serial_region.cpp

@@ -1,89 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "serial.hpp"
-
-#include "serial_util.hpp"
-
-void serializeRegionFormat(RegionPacket* packet, void* buffer) {
-	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
-
-	//format
-	SERIALIZE(buffer, &packet->roomIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->x, sizeof(int));
-	SERIALIZE(buffer, &packet->y, sizeof(int));
-}
-
-void serializeRegionContent(RegionPacket* packet, void* buffer) {
-	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
-
-	//format
-	SERIALIZE(buffer, &packet->roomIndex, sizeof(int));
-	SERIALIZE(buffer, &packet->x, sizeof(int));
-	SERIALIZE(buffer, &packet->y, sizeof(int));
-
-	//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++) {
-				*reinterpret_cast<Region::type_t*>(buffer) = packet->region->GetTile(i, j, k);
-				buffer = reinterpret_cast<char*>(buffer) + sizeof(Region::type_t);
-			}
-		}
-	}
-
-	//solids
-	SERIALIZE(buffer, packet->region->GetSolidBitset(), REGION_SOLID_FOOTPRINT);
-}
-
-void deserializeRegionFormat(RegionPacket* packet, void* buffer) {
-	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
-
-	//format
-	DESERIALIZE(buffer, &packet->roomIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->x, sizeof(int));
-	DESERIALIZE(buffer, &packet->y, sizeof(int));
-}
-
-void deserializeRegionContent(RegionPacket* packet, void* buffer) {
-	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
-
-	//format
-	DESERIALIZE(buffer, &packet->roomIndex, sizeof(int));
-	DESERIALIZE(buffer, &packet->x, sizeof(int));
-	DESERIALIZE(buffer, &packet->y, sizeof(int));
-
-	//an object to work on
-	packet->region = new Region(packet->x, packet->y);
-
-	//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++) {
-				packet->region->SetTile(i, j, k, *reinterpret_cast<Region::type_t*>(buffer));
-				buffer = reinterpret_cast<char*>(buffer) + sizeof(Region::type_t);
-			}
-		}
-	}
-
-	//solids
-	DESERIALIZE(buffer, packet->region->GetSolidBitset(), REGION_SOLID_FOOTPRINT);
-}

common/network/serial/serial_statistics.cpp

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

common/network/serial_packet.hpp

@@ -22,23 +22,43 @@
 #ifndef SERIALPACKET_HPP_
 #define SERIALPACKET_HPP_
 
+#include "serial_packet_base.hpp"
 #include "character_packet.hpp"
 #include "client_packet.hpp"
-#include "combat_packet.hpp"
-#include "enemy_packet.hpp"
 #include "region_packet.hpp"
 #include "server_packet.hpp"
+#include "text_packet.hpp"
 
-//NOTE: SerialPacket is defined in serial_packet_base.hpp
+//SerialPacketBase is defined in serial_packet_base.hpp
+typedef SerialPacketBase SerialPacket;
+
+//DOCS: NETWORK_VERSION is used to discern compatible servers and clients
+constexpr int NETWORK_VERSION = -1;
 
 union MaxPacket {
 	CharacterPacket a;
 	ClientPacket b;
-	CombatPacket c;
-	EnemyPacket d;
-	RegionPacket e;
-	ServerPacket f;
+	RegionPacket c;
+	ServerPacket d;
+	TextPacket e;
 };
+
 constexpr int MAX_PACKET_SIZE = sizeof(MaxPacket);
 
+/* DOCS: PACKET_BUFFER_SIZE is the memory required to store serialized data
+ * DOCS: SerialPacketType::REGION_CONTENT is currently the largest packet type
+ * Serialized RegionPacket structure:
+ *     SerialPacketType
+ *     room index (int)
+ *     X & Y position (int)
+ *     tile data (3 layers)
+ *     solid data (bitset)
+*/
+
+constexpr int PACKET_BUFFER_SIZE =
+	sizeof(SerialPacketType) +
+	REGION_METADATA_FOOTPRINT +
+	REGION_TILE_FOOTPRINT +
+	REGION_SOLID_FOOTPRINT;
+
 #endif

common/network/serial_packet_type.hpp

@@ -0,0 +1,130 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef SERIALPACKETTYPE_HPP_
+#define SERIALPACKETTYPE_HPP_
+
+/* DOCS: The headers indicate what packet type is used for each message
+ * different messages under the same header will carry different amounts of
+ * valid data, but it will still be carried in that packet's format.
+*/
+
+//TODO: This needs to be smoothed out
+enum class SerialPacketType {
+	//default: there is something wrong
+	NONE = 0,
+
+	//-------------------------
+	//ServerPacket
+	//  name, player count, version
+	//-------------------------
+
+	//heartbeat
+	PING,
+	PONG,
+
+	//Used for finding available servers
+	BROADCAST_REQUEST,
+	BROADCAST_RESPONSE,
+
+	//-------------------------
+	//ClientPacket
+	//  client index, account index, username
+	//-------------------------
+
+	//Connecting to a server as a client
+	JOIN_REQUEST,
+	JOIN_RESPONSE,
+
+	//disconnect from the server
+	DISCONNECT_REQUEST,
+	DISCONNECT_RESPONSE,
+	DISCONNECT_FORCED,
+
+	//load the account
+	LOGIN_REQUEST,
+	LOGIN_RESPONSE,
+
+	//unload the account
+	LOGOUT_REQUEST,
+	LOGOUT_RESPONSE,
+
+	//shut down the server
+	SHUTDOWN_REQUEST,
+
+	//-------------------------
+	//RegionPacket
+	//  room index, x, y, raw data
+	//-------------------------
+
+	//map data
+	REGION_REQUEST, //NOTE: technically a query
+	REGION_CONTENT,
+
+	//-------------------------
+	//CharacterPacket
+	//  character index,
+	//  handle, avatar,
+	//  account index (owner),
+	//  room index, origin, motion,
+	//  statistics
+	//-------------------------
+
+	//character management
+	CHARACTER_CREATE,
+	CHARACTER_DELETE,
+	CHARACTER_LOAD,
+	CHARACTER_UNLOAD,
+
+	//find out info from the server
+	QUERY_CHARACTER_EXISTS,
+	QUERY_CHARACTER_STATS,
+	QUERY_CHARACTER_LOCATION,
+
+	//set the info in the server
+	CHARACTER_SET_ROOM,
+	CHARACTER_SET_ORIGIN,
+	CHARACTER_SET_MOTION,
+
+	//TODO: enemy management
+
+	//-------------------------
+	//TextPacket
+	//  name, text
+	//-------------------------
+
+	//general speech
+	TEXT_BROADCAST,
+
+	//rejection/error messages
+	JOIN_REJECTION,
+	LOGIN_REJECTION,
+	CHARACTER_REJECTION,
+	SHUTDOWN_REJECTION,
+
+	//-------------------------
+	//not used
+	//-------------------------
+
+	LAST
+};
+
+#endif

common/network/serial_utility.cpp

@@ -0,0 +1,141 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "serial_utility.hpp"
+
+//packet types
+#include "character_packet.hpp"
+#include "client_packet.hpp"
+#include "region_packet.hpp"
+#include "server_packet.hpp"
+#include "text_packet.hpp"
+
+#include <cstring>
+
+//raw memory copy
+void serialCopy(void** buffer, void* data, int size) {
+	memcpy(*buffer, data, size);
+	*buffer = reinterpret_cast<char*>(*buffer) + size;
+}
+
+void deserialCopy(void** buffer, void* data, int size) {
+	memcpy(data, *buffer, size);
+	*buffer = reinterpret_cast<char*>(*buffer) + size;
+}
+
+//DOCS: The server and client MUST use the correct packet types
+
+//main switch functions
+void serializePacket(void* buffer, SerialPacketBase* packet) {
+	switch(packet->type) {
+		case SerialPacketType::PING:
+		case SerialPacketType::PONG:
+		case SerialPacketType::BROADCAST_REQUEST:
+		case SerialPacketType::BROADCAST_RESPONSE:
+			serializeServer(buffer, static_cast<ServerPacket*>(packet));
+		break;
+		case SerialPacketType::JOIN_REQUEST:
+		case SerialPacketType::JOIN_RESPONSE:
+		case SerialPacketType::DISCONNECT_REQUEST:
+		case SerialPacketType::DISCONNECT_RESPONSE:
+		case SerialPacketType::DISCONNECT_FORCED:
+		case SerialPacketType::LOGIN_REQUEST:
+		case SerialPacketType::LOGIN_RESPONSE:
+		case SerialPacketType::LOGOUT_REQUEST:
+		case SerialPacketType::LOGOUT_RESPONSE:
+		case SerialPacketType::SHUTDOWN_REQUEST:
+			serializeClient(buffer, static_cast<ClientPacket*>(packet));
+		break;
+		case SerialPacketType::REGION_REQUEST:
+		case SerialPacketType::REGION_CONTENT:
+			serializeRegion(buffer, static_cast<RegionPacket*>(packet));
+		break;
+		case SerialPacketType::CHARACTER_CREATE:
+		case SerialPacketType::CHARACTER_DELETE:
+		case SerialPacketType::CHARACTER_LOAD:
+		case SerialPacketType::CHARACTER_UNLOAD:
+		case SerialPacketType::QUERY_CHARACTER_EXISTS:
+		case SerialPacketType::QUERY_CHARACTER_STATS:
+		case SerialPacketType::QUERY_CHARACTER_LOCATION:
+		case SerialPacketType::CHARACTER_SET_ROOM:
+		case SerialPacketType::CHARACTER_SET_ORIGIN:
+		case SerialPacketType::CHARACTER_SET_MOTION:
+			serializeCharacter(buffer, static_cast<CharacterPacket*>(packet));
+		break;
+		case SerialPacketType::TEXT_BROADCAST:
+		case SerialPacketType::JOIN_REJECTION:
+		case SerialPacketType::LOGIN_REJECTION:
+		case SerialPacketType::CHARACTER_REJECTION:
+		case SerialPacketType::SHUTDOWN_REJECTION:
+			serializeText(buffer, static_cast<TextPacket*>(packet));
+		break;
+	}
+}
+
+void deserializePacket(void* buffer, SerialPacketBase* packet) {
+	//find the type, so that you can actually deserialize the packet!
+	SerialPacketType type;
+	memcpy(&type, buffer, sizeof(SerialPacketType));
+
+	switch(packet->type) {
+		case SerialPacketType::PING:
+		case SerialPacketType::PONG:
+		case SerialPacketType::BROADCAST_REQUEST:
+		case SerialPacketType::BROADCAST_RESPONSE:
+			deserializeServer(buffer, static_cast<ServerPacket*>(packet));
+		break;
+		case SerialPacketType::JOIN_REQUEST:
+		case SerialPacketType::JOIN_RESPONSE:
+		case SerialPacketType::DISCONNECT_REQUEST:
+		case SerialPacketType::DISCONNECT_RESPONSE:
+		case SerialPacketType::DISCONNECT_FORCED:
+		case SerialPacketType::LOGIN_REQUEST:
+		case SerialPacketType::LOGIN_RESPONSE:
+		case SerialPacketType::LOGOUT_REQUEST:
+		case SerialPacketType::LOGOUT_RESPONSE:
+		case SerialPacketType::SHUTDOWN_REQUEST:
+			deserializeClient(buffer, static_cast<ClientPacket*>(packet));
+		break;
+		case SerialPacketType::REGION_REQUEST:
+		case SerialPacketType::REGION_CONTENT:
+			deserializeRegion(buffer, static_cast<RegionPacket*>(packet));
+		break;
+		case SerialPacketType::CHARACTER_CREATE:
+		case SerialPacketType::CHARACTER_DELETE:
+		case SerialPacketType::CHARACTER_LOAD:
+		case SerialPacketType::CHARACTER_UNLOAD:
+		case SerialPacketType::QUERY_CHARACTER_EXISTS:
+		case SerialPacketType::QUERY_CHARACTER_STATS:
+		case SerialPacketType::QUERY_CHARACTER_LOCATION:
+		case SerialPacketType::CHARACTER_SET_ROOM:
+		case SerialPacketType::CHARACTER_SET_ORIGIN:
+		case SerialPacketType::CHARACTER_SET_MOTION:
+			deserializeCharacter(buffer, static_cast<CharacterPacket*>(packet));
+		break;
+		case SerialPacketType::TEXT_BROADCAST:
+		case SerialPacketType::JOIN_REJECTION:
+		case SerialPacketType::LOGIN_REJECTION:
+		case SerialPacketType::CHARACTER_REJECTION:
+		case SerialPacketType::SHUTDOWN_REJECTION:
+			deserializeText(buffer, static_cast<TextPacket*>(packet));
+		break;
+	}
+}

common/network/serial_utility.hpp

@@ -19,13 +19,19 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SERIALIZEUTIL_HPP_
-#define SERIALIZEUTIL_HPP_
+#ifndef SERIALIZEUTILITY_HPP_
+#define SERIALIZEUTILITY_HPP_
+
+#include "serial_packet_base.hpp"
 
 #include <cstring>
 
-//NOTE: The strange assignments here used in order to move the void* parameter
-#define SERIALIZE(buffer, data, size) memcpy(buffer, data, size); buffer = reinterpret_cast<char*>(buffer) + size;
-#define DESERIALIZE(buffer, data, size) memcpy(data, buffer, size); buffer = reinterpret_cast<char*>(buffer) + size;
+//raw memory copy
+void serialCopy(void** buffer, void* data, int size);
+void deserialCopy(void** buffer, void* data, int size);
+
+//primary functions
+void serializePacket(void* buffer, SerialPacketBase* packet);
+void deserializePacket(void* buffer, SerialPacketBase* packet);
 
 #endif

common/network/udp_network_utility.cpp

@@ -21,12 +21,13 @@
 */
 #include "udp_network_utility.hpp"
 
-#include "serial.hpp"
+#include "serial_packet.hpp"
+#include "serial_utility.hpp"
 
 #include <stdexcept>
 
-//BUGFIX: memset() is used before sending a packet to remove old data; you don't want to send sensitive data over the network
-//NOTE: don't confuse SerialPacket with UDPpacket
+//NOTE: 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 SerialPacketBase with UDPpacket
 
 void UDPNetworkUtility::Open(int port) {
 	socket = SDLNet_UDP_Open(port);
@@ -54,11 +55,11 @@ int UDPNetworkUtility::Bind(const char* ip, int port, int channel) {
 		throw(std::runtime_error("Failed to resolve a host"));
 	}
 
-	return Bind(&add, channel);
+	return Bind(add, channel);
 }
 
-int UDPNetworkUtility::Bind(IPaddress* add, int channel) {
-	int ret = SDLNet_UDP_Bind(socket, channel, add);
+int UDPNetworkUtility::Bind(IPaddress add, int channel) {
+	int ret = SDLNet_UDP_Bind(socket, channel, &add);
 
 	if (ret < 0) {
 		throw(std::runtime_error("Failed to bind to a channel"));
@@ -81,17 +82,17 @@ int UDPNetworkUtility::SendTo(const char* ip, int port, void* data, int len) {
 		throw(std::runtime_error("Failed to resolve a host"));
 	}
 
-	SendTo(&add, data, len);
+	SendTo(add, data, len);
 }
 
-int UDPNetworkUtility::SendTo(IPaddress* add, void* data, int len) {
+int UDPNetworkUtility::SendTo(IPaddress add, void* data, int len) {
 	if (len > packet->maxlen) {
 		throw(std::runtime_error("The buffer is to large for the UDPpacket"));
 	}
 	memset(packet->data, 0, packet->maxlen);
 	memcpy(packet->data, data, len);
 	packet->len = len;
-	packet->address = *add;
+	packet->address = add;
 
 	int ret = SDLNet_UDP_Send(socket, -1, packet);
 
@@ -152,23 +153,23 @@ int UDPNetworkUtility::Receive() {
 }
 
 //-------------------------
-//send a SerialPacket
+//send a SerialPacketBase
 //-------------------------
 
-int UDPNetworkUtility::SendTo(const char* ip, int port, SerialPacket* serialPacket) {
+int UDPNetworkUtility::SendTo(const char* ip, int port, SerialPacketBase* serialPacket) {
 	IPaddress add;
 	if (SDLNet_ResolveHost(&add, ip, port) == -1) {
 		throw(std::runtime_error("Failed to resolve a host"));
 	}
 
-	SendTo(&add, serialPacket);
+	SendTo(add, serialPacket);
 }
 
-int UDPNetworkUtility::SendTo(IPaddress* add, SerialPacket* serialPacket) {
+int UDPNetworkUtility::SendTo(IPaddress add, SerialPacketBase* serialPacket) {
 	memset(packet->data, 0, packet->maxlen);
-	serializePacket(serialPacket, packet->data);
+	serializePacket(packet->data, serialPacket);
 	packet->len = PACKET_BUFFER_SIZE;
-	packet->address = *add;
+	packet->address = add;
 
 	int ret = SDLNet_UDP_Send(socket, -1, packet);
 
@@ -179,9 +180,9 @@ int UDPNetworkUtility::SendTo(IPaddress* add, SerialPacket* serialPacket) {
 	return ret;
 }
 
-int UDPNetworkUtility::SendTo(int channel, SerialPacket* serialPacket) {
+int UDPNetworkUtility::SendTo(int channel, SerialPacketBase* serialPacket) {
 	memset(packet->data, 0, packet->maxlen);
-	serializePacket(serialPacket, packet->data);
+	serializePacket(packet->data, serialPacket);
 	packet->len = PACKET_BUFFER_SIZE;
 
 	int ret = SDLNet_UDP_Send(socket, channel, packet);
@@ -193,9 +194,9 @@ int UDPNetworkUtility::SendTo(int channel, SerialPacket* serialPacket) {
 	return ret;
 }
 
-int UDPNetworkUtility::SendToAllChannels(SerialPacket* serialPacket) {
+int UDPNetworkUtility::SendToAllChannels(SerialPacketBase* serialPacket) {
 	memset(packet->data, 0, packet->maxlen);
-	serializePacket(serialPacket, packet->data);
+	serializePacket(packet->data, serialPacket);
 	packet->len = PACKET_BUFFER_SIZE;
 
 	int sent = 0;
@@ -210,10 +211,10 @@ int UDPNetworkUtility::SendToAllChannels(SerialPacket* serialPacket) {
 	return sent;
 }
 
-int UDPNetworkUtility::Receive(SerialPacket* serialPacket) {
+int UDPNetworkUtility::Receive(SerialPacketBase* serialPacket) {
 	memset(packet->data, 0, packet->maxlen);
 	int ret = SDLNet_UDP_Recv(socket, packet);
-	deserializePacket(serialPacket, packet->data);
+	deserializePacket(packet->data, serialPacket);
 	serialPacket->srcAddress = packet->address;
 
 	if (ret < 0) {

common/network/udp_network_utility.hpp

@@ -22,21 +22,21 @@
 #ifndef UDPNETWORKUTILITY_HPP_
 #define UDPNETWORKUTILITY_HPP_
 
+//common
+#include "serial_packet_base.hpp"
+#include "singleton.hpp"
+
+//APIs
 #include "SDL/SDL_net.h"
 
-#include "serial_packet.hpp"
-
-class UDPNetworkUtility {
+class UDPNetworkUtility : public Singleton<UDPNetworkUtility> {
 public:
-	UDPNetworkUtility() = default;
-	~UDPNetworkUtility() = default;
-
 	void Open(int port);
 	void Close();
 
 	//bind to a channel
 	int Bind(const char* ip, int port, int channel = -1);
-	int Bind(IPaddress* add, int channel = -1);
+	int Bind(IPaddress add, int channel = -1);
 	void Unbind(int channel);
 
 	IPaddress* GetIPAddress(int channel) {
@@ -45,17 +45,17 @@ public:
 
 	//send a buffer
 	int SendTo(const char* ip, int port, void* data, int len);
-	int SendTo(IPaddress* add, void* data, int len);
+	int SendTo(IPaddress add, void* data, int len);
 	int SendTo(int channel, void* data, int len);
 	int SendToAllChannels(void* data, int len);
 	int Receive();
 
-	//send a SerialPacket
-	int SendTo(const char* ip, int port, SerialPacket* serialPacket);
-	int SendTo(IPaddress* add, SerialPacket* serialPacket);
-	int SendTo(int channel, SerialPacket* serialPacket);
-	int SendToAllChannels(SerialPacket* serialPacket);
-	int Receive(SerialPacket* serialPacket);
+	//send a SerialPacketBase
+	int SendTo(const char* ip, int port, SerialPacketBase* serialPacket);
+	int SendTo(IPaddress add, SerialPacketBase* serialPacket);
+	int SendTo(int channel, SerialPacketBase* serialPacket);
+	int SendToAllChannels(SerialPacketBase* serialPacket);
+	int Receive(SerialPacketBase* serialPacket);
 
 	//accessors
 	UDPpacket* GetPacket() const {
@@ -65,6 +65,11 @@ public:
 		return socket;
 	}
 private:
+	friend Singleton<UDPNetworkUtility>;
+
+	UDPNetworkUtility() = default;
+	~UDPNetworkUtility() = default;
+
 	UDPsocket socket = nullptr;
 	UDPpacket* packet = nullptr;
 };

common/utilities/bounding_box.hpp

@@ -32,6 +32,7 @@ public:
 	int w, h;
 
 	BoundingBox() = default;
+	BoundingBox(int i, int j): x(i), y(j), w(0), h(0) {};
 	BoundingBox(int i, int j, int k, int l): x(i), y(j), w(k), h(l) {};
 	~BoundingBox() = default;
 	BoundingBox& operator=(BoundingBox const&) = default;
@@ -62,7 +63,7 @@ public:
 };
 
 //This is explicitly a POD
-static_assert(std::is_pod<Vector2>::value, "BoundingBox is not a POD");
+static_assert(std::is_pod<BoundingBox>::value, "BoundingBox is not a POD");
 
 #include "vector2.hpp"
 

common/utilities/config_utility.cpp

@@ -22,14 +22,61 @@
 #include "config_utility.hpp"
 
 #include <cstdlib>
+#include <cstring>
 #include <fstream>
+#include <sstream>
 #include <stdexcept>
 
-void ConfigUtility::Load(std::string fname) {
+void ConfigUtility::Load(std::string fname, int argc, char* argv[]) {
 	//clear the stored configuration
 	configMap.clear();
-	//pass to the recursive method
+
+	//use the default file
+	if (argc < 2) {
 		configMap = Read(fname);
+		return;
+	}
+
+	//some variables to use
+	table_t redirectedFile;
+	table_t cmdLineParams;
+	char key[256], val[256];
+	bool redirectUsed = false;
+
+	//reading from the command line
+	for (int i = 1; i < argc; ++i) {
+		//read from a specified config file
+		if (!strncmp(argv[i], "-config=", 8)) {
+			redirectedFile = Read(argv[i] + 8);
+			redirectUsed = true;
+			continue;
+		}
+
+		//set some specific values
+		if (!strncmp(argv[i], "-", 1)) {
+			//wipe the variables
+			memset(key, 0, 256);
+			memset(key, 0, 256);
+
+			//read the key-value pair
+			if (sscanf(argv[i], "-%[^=]=%[^\0]", key, val) != 2) {
+				std::ostringstream os;
+				os << "Failed to read a command line config argument (expected -%s=%s):" << std::endl;
+				os << "\targv[" << i << "]: " << argv[i] << std::endl;
+				os << "\tkey: " << key << std::endl;
+				os << "\tval: " << val << std::endl;
+				throw(std::runtime_error( os.str() ));
+			}
+			cmdLineParams[key] = val;
+		}
+	}
+
+	//finally, construct the final config table
+	if (!redirectUsed) {
+		redirectedFile = Read(fname);
+	}
+	configMap.insert(cmdLineParams.begin(), cmdLineParams.end());
+	configMap.insert(redirectedFile.begin(), redirectedFile.end());
 }
 
 ConfigUtility::table_t ConfigUtility::Read(std::string fname) {
@@ -38,10 +85,9 @@ ConfigUtility::table_t ConfigUtility::Read(std::string fname) {
 	std::ifstream is(fname);
 
 	if (!is.is_open()) {
-		std::string msg;
-		msg += "Failed to open a config file: ";
-		msg += fname;
-		throw(std::runtime_error(msg));
+		std::ostringstream os;
+		os << "Failed to open a config file: " << fname;
+		throw(std::runtime_error( os.str() ));
 	}
 
 	std::string key, val;
@@ -69,15 +115,23 @@ ConfigUtility::table_t ConfigUtility::Read(std::string fname) {
 		getline(is, key,'=');
 		getline(is, val);
 
-		//trim the strings at the start & end
-		while(key.size() && isspace(*key.begin())) key.erase(0, 1);
-		while(val.size() && isspace(*val.begin())) val.erase(0, 1);
+		//eat the whitespace at the start & end
+		while(key.size() && isspace( *key.begin() )) {
+			key.erase(0, 1);
+		}
+		while(val.size() && isspace( *val.begin() )) {
+			val.erase(0, 1);
+		}
 
-		while(key.size() && isspace(*(key.end()-1))) key.erase(key.end() - 1);
-		while(val.size() && isspace(*(val.end()-1))) val.erase(val.end() - 1);
+		while(key.size() && isspace( *(key.end()-1) )) {
+			key.erase(key.end() - 1);
+		}
+		while(val.size() && isspace( *(val.end()-1) )) {
+			val.erase(val.end() - 1);
+		}
 
-		//disallow empty/wiped values
-		if (key.size() == 0) {
+		//disallow empty/wiped pairs
+		if (key.size() == 0 || val.size() == 0) {
 			continue;
 		}
 
@@ -88,7 +142,6 @@ ConfigUtility::table_t ConfigUtility::Read(std::string fname) {
 	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());

common/utilities/config_utility.hpp

@@ -29,7 +29,7 @@
 
 class ConfigUtility : public Singleton<ConfigUtility> {
 public:
-	void Load(std::string fname);
+	void Load(std::string fname, int argc = 0, char* argv[] = nullptr);
 
 	//convert to a type
 	std::string& String(std::string);

common/utilities/singleton.hpp

@@ -33,13 +33,13 @@ public:
 		}
 		return *ptr;
 	}
-	static void Create() {
+	static void CreateSingleton() {
 		if (ptr) {
 			throw(std::logic_error("This singleton has already been created"));
 		}
 		ptr = new T();
 	}
-	static void Delete() {
+	static void DeleteSingleton() {
 		if (!ptr) {
 			throw(std::logic_error("A non-existant singleton cannot be deleted"));
 		}

common/utilities/utility.cpp

@@ -23,29 +23,14 @@
 
 #include <algorithm>
 
-int snapToBase(int base, int x) {
-	//snap to a grid
-	if (x < 0) {
-		++x;
-		return x / base * base - base;
-	}
-	return x / base * base;
-}
-
-double snapToBase(double base, double x) {
-	return floor(x / base) * base;
-}
-
 std::string truncatePath(std::string pathname) {
 	return std::string(
 		std::find_if(
 			pathname.rbegin(),
 			pathname.rend(),
 			[](char ch) -> bool {
-				//windows only
+				//windows & unix tested
 				return ch == '/' || ch == '\\';
-//				//unix only
-//				return ch == '/';
 			}).base(),
 		pathname.end());
 }

common/utilities/utility.hpp

@@ -24,9 +24,6 @@
 
 #include <string>
 
-int snapToBase(int base, int x);
-double snapToBase(double base, double x);
-
 std::string truncatePath(std::string pathname);
 
 //fixing known bugs in g++

copyright.txt

@@ -0,0 +1,15 @@
+Future versions (to be determined) may be released under a modified version of the Uplink Developer's License.
+
+The current version of Tortuga is released under the zlib license.
+
+Copyright (c) 2013, 2014 Kayne Ruse
+
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.

makefile

@@ -3,11 +3,6 @@
 #MKDIR=mkdir
 #RM=del /y
 
-#CXXFLAGS+=-static-libgcc -static-libstdc++ -g -fno-inline-functions -Wall
-#CXXFLAGS+=-static-libgcc -static-libstdc++
-
-#export
-
 OUTDIR=out
 
 all: $(OUTDIR)
@@ -19,7 +14,12 @@ debug: export CXXFLAGS+=-g
 debug: clean all
 
 release: export CXXFLAGS+=-static-libgcc -static-libstdc++
-release: clean all
+release: clean all package
+
+#For use on my machine ONLY
+package:
+	rar a -r -ep Tortuga.rar $(OUTDIR)/*.exe  $(OUTDIR)/*.dll
+	rar a -r Tortuga.rar rsc/* copyright.txt README.txt
 
 $(OUTDIR):
 	mkdir $(OUTDIR)

rsc/scripts/map_maker.lua

@@ -0,0 +1,39 @@
+local mapSystem = require "map_system"
+
+local mapMaker = {}
+
+--utility functions
+function mapMaker.sqr(x) return x*x end
+function mapMaker.dist(x, y, i, j) return math.sqrt(mapMaker.sqr(x - i) + mapMaker.sqr(y - j)) end
+
+--tile macros, mapped to the tilesheet "overworld.bmp"
+mapMaker.edges = {}
+mapMaker.edges.north = -16
+mapMaker.edges.south = 16
+mapMaker.edges.east = 1
+mapMaker.edges.west = -1
+
+mapMaker.water	= 18 + 3 * 0
+mapMaker.sand	= 18 + 3 * 1
+mapMaker.plains	= 18 + 3 * 2
+mapMaker.grass	= 18 + 3 * 3
+mapMaker.dirt	= 18 + 3 * 4
+
+--custom generation systems here
+function mapMaker.debugIsland(region)
+	for i = 1, mapSystem.Region.GetWidth(region) do
+		for j = 1, mapSystem.Region.GetHeight(region) do
+			local dist = mapMaker.dist(0, 0, i + mapSystem.Region.GetX(region) -1, j + mapSystem.Region.GetY(region) -1)
+			if dist < 10 then
+				mapSystem.Region.SetTile(region, i, j, 1, mapMaker.plains)
+			elseif dist < 12 then
+				mapSystem.Region.SetTile(region, i, j, 1, mapMaker.sand)
+			else
+				mapSystem.Region.SetTile(region, i, j, 1, mapMaker.water)
+				mapSystem.Region.SetSolid(region, i, j, true)
+			end
+		end
+	end
+end
+
+return mapMaker

rsc/scripts/map_saver.lua

@@ -0,0 +1,3 @@
+local mapSaver = {}
+--TODO: create a flexible saving & loading system
+return mapSaver

rsc/scripts/setup_server.lua

@@ -1,46 +1,30 @@
 print("Lua script check")
 
---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
+mapMaker = require "map_maker"
+mapSaver = require "map_saver"
+roomSystem = require "room_system"
 
---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(region, i, j, 1, tiles.water)
-				Region.SetSolid(region, i, j, true)
-			end
-		end
+local function dumpTable(t)
+	print(t)
+	for k, v in pairs(t) do
+		print("",k, v)
 	end
 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)
-}
+--create the overworld, set it's generator, loader & saver
+--[[
+local t = {
+	"overworld.bmp", --tileset name
+	mapSaver.load, --load function
+	mapSaver.save, --save function
+	mapMaker.debugIsland, --create function
+	mapSaver.save --unload function
+}]]
+
+dumpTable(roomSystem)
+dumpTable(roomSystem.RoomManager)
+dumpTable(roomSystem.Room)
+
+local overworld = roomSystem.RoomManager.CreateRoom("overworld")
 
 print("Finished the lua script")

rsc/scripts/setup_server.sql

@@ -1,12 +1,14 @@
---TODO: why is the database setup script scripted, while accessing, etc. hardcoded?
---there should be a way to control the database more directly
---TODO: move this script into a hardocded Init() method?
+--TODO: An archive table of all dead characters
 
 CREATE TABLE IF NOT EXISTS Accounts (
 	uid			INTEGER PRIMARY KEY AUTOINCREMENT,
 	username	varchar(100) UNIQUE,
+
 	--TODO: server-client security
---	password varchar(100),
+--	passhash	varchar(100),
+--	passsalt	varchar(100),
+
+	--server controls
 	blacklisted	BIT DEFAULT 0,
 	whitelisted	BIT DEFAULT 1,
 	mod			BIT DEFAULT 0,
@@ -22,12 +24,30 @@ CREATE TABLE IF NOT EXISTS Characters (
 	avatar		varchar(100),
 	birth		timestamp NOT NULL DEFAULT (datetime()),
 
-	--position
+	--position in the world
 	roomIndex	INTEGER DEFAULT 0,
 	originX		INTEGER DEFAULT 0,
 	originY		INTEGER DEFAULT 0,
 
 	--statistics
+	baseStats	INTEGER REFERENCES StatisticSets(uid),
+
+	--equipment
+	weapon		INTEGER REFERENCES WornEquipment(uid),
+	helmet		INTEGER REFERENCES WornEquipment(uid),
+	armour		INTEGER REFERENCES WornEquipment(uid)
+	--etc.
+);
+
+-------------------------
+--Utility tables
+-------------------------
+
+CREATE TABLE IF NOT EXISTS StatisticSets (
+	--metadata
+	uid				INTEGER PRIMARY KEY AUTOINCREMENT,
+
+	--general use statistics
 	level			INTEGER DEFAULT 0,
 	exp				INTEGER DEFAULT 0,
 	maxHP			INTEGER DEFAULT 0,
@@ -41,28 +61,45 @@ CREATE TABLE IF NOT EXISTS Characters (
 	speed			INTEGER DEFAULT 0,
 	accuracy		REAL DEFAULT 0.0,
 	evasion			REAL DEFAULT 0.0,
-	luck			REAL DEFAULT 0.0,
+	luck			REAL DEFAULT 0.0
+);
 
-	--equipment
-	weapon INTEGER REFERENCES WornEquipment(uid),
-	helmet INTEGER REFERENCES WornEquipment(uid),
-	armour INTEGER REFERENCES WornEquipment(uid)
-	--etc.
+CREATE TABLE IF NOT EXISTS InWorldItems (
+	--metadata
+	uid			INTEGER PRIMARY KEY AUTOINCREMENT,
+	itemType	INTEGER,
+
+	--position in the world
+	roomIndex	INTEGER DEFAULT 0,
+	originX		INTEGER DEFAULT 0,
+	originY		INTEGER DEFAULT 0,
+
+	--unique information
+	stackSize	INTEGER DEFAULT 0,
+	durability	INTEGER DEFAULT 0,
+	stats		INTEGER REFERENCES StatisticSets(uid)
 );
 
 CREATE TABLE IF NOT EXISTS InventoryItems (
 	--metadata
 	uid			INTEGER PRIMARY KEY AUTOINCREMENT,
-	itemID INTEGER, --type
+	owner		INTEGER REFERENCES Characters(uid),
+	itemType	INTEGER,
+
+	--unique information
 	stackSize	INTEGER DEFAULT 0,
-	owner INTEGER REFERENCES Characters(uid)
+	durability	INTEGER DEFAULT 0,
+	stats		INTEGER REFERENCES StatisticSets(uid)
 );
 
 CREATE TABLE IF NOT EXISTS WornEquipment (
 	--metadata
 	uid			INTEGER PRIMARY KEY AUTOINCREMENT,
-	itemID INTEGER, --type
-	owner INTEGER REFERENCES Characters(uid)
-	--hold all equipment info
-	--stat mods, special effects, etc.
+	owner		INTEGER REFERENCES Characters(uid),
+	itemType	INTEGER,
+
+	--unique information
+	durability	INTEGER DEFAULT 0,
+	stats		INTEGER REFERENCES StatisticSets(uid)
+	--TODO: attached script?
 );

server/accounts/account_data.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 "account_data.hpp"
+
+int AccountData::SetClientIndex(int i) {
+	return clientIndex = i;
+}
+
+int AccountData::GetClientIndex() {
+	return clientIndex;
+}
+
+std::string AccountData::SetUsername(std::string s) {
+	return username = s;
+}
+
+std::string AccountData::GetUsername() {
+	return username;
+}
+
+bool AccountData::GetBlackListed() {
+	return blackListed;
+}
+
+bool AccountData::GetWhiteListed() {
+	return whiteListed;
+}
+
+bool AccountData::GetModerator() {
+	return mod;
+}
+
+bool AccountData::GetAdministrator() {
+	return admin;
+}

server/accounts/account_data.hpp

@@ -24,15 +24,36 @@
 
 #include <string>
 
-struct AccountData {
+class AccountData {
+public:
+	AccountData() = default;
+	~AccountData() = default;
+
+	//accessors and mutators
+	int SetClientIndex(int i);
+	int GetClientIndex();
+
+	std::string SetUsername(std::string s);
+	std::string GetUsername();
+
+	//database stuff
+	bool GetBlackListed();
+	bool GetWhiteListed();
+	bool GetModerator();
+	bool GetAdministrator();
+
+private:
+	friend class AccountManager;
+
+	int clientIndex;
 	std::string username;
 	//TODO: password
+
+	//bit fields?
 	bool blackListed = false;
 	bool whiteListed = true;
 	bool mod = false;
 	bool admin = false;
-
-	int clientIndex;
 };
 
 #endif

server/accounts/account_manager.cpp

@@ -31,12 +31,13 @@ static const char* CREATE_USER_ACCOUNT = "INSERT INTO Accounts (username) VALUES
 static const char* LOAD_USER_ACCOUNT = "SELECT * FROM Accounts WHERE username = ?;";
 static const char* SAVE_USER_ACCOUNT = "UPDATE OR FAIL Accounts SET blacklisted = ?2, whitelisted = ?3, mod = ?4, admin = ?5 WHERE uid = ?1;";
 static const char* DELETE_USER_ACCOUNT = "DELETE FROM Accounts WHERE uid = ?;";
+static const char* COUNT_USER_ACCOUNT_RECORDS = "SELECT COUNT(*) FROM Accounts;";
 
 //-------------------------
 //Define the public methods
 //-------------------------
 
-int AccountManager::CreateAccount(std::string username, int clientIndex) {
+int AccountManager::Create(std::string username, int clientIndex) {
 	//create this user account, failing if it exists, leave this account in memory
 	sqlite3_stmt* statement = nullptr;
 
@@ -60,10 +61,10 @@ int AccountManager::CreateAccount(std::string username, int clientIndex) {
 	sqlite3_finalize(statement);
 
 	//load this account into memory
-	return LoadAccount(username, clientIndex);
+	return Load(username, clientIndex);
 }
 
-int AccountManager::LoadAccount(std::string username, int clientIndex) {
+int AccountManager::Load(std::string username, int clientIndex) {
 	//load this user account, failing if it is in memory, creating it if it doesn't exist
 	sqlite3_stmt* statement = nullptr;
 
@@ -86,13 +87,13 @@ int AccountManager::LoadAccount(std::string username, int clientIndex) {
 		int uid = sqlite3_column_int(statement, 0);
 
 		//check to see if this account is already loaded
-		if (accountMap.find(uid) != accountMap.end()) {
+		if (elementMap.find(uid) != elementMap.end()) {
 			sqlite3_finalize(statement);
 			return -1;
 		}
 
 		//extract the data into memory
-		AccountData& newAccount = accountMap[uid];
+		AccountData& newAccount = elementMap[uid];
 		newAccount.username = reinterpret_cast<const char*>(sqlite3_column_text(statement, 1));
 		newAccount.blackListed = sqlite3_column_int(statement, 2);
 		newAccount.whiteListed = sqlite3_column_int(statement, 3);
@@ -109,22 +110,22 @@ int AccountManager::LoadAccount(std::string username, int clientIndex) {
 
 	if (ret == SQLITE_DONE) {
 		//create the non-existant account instead
-		return CreateAccount(username, clientIndex);
+		return Create(username, clientIndex);
 	}
 
 	throw(std::runtime_error(std::string() + "Unknown SQL error in LoadAccount: " + sqlite3_errmsg(database) ));
 }
 
-int AccountManager::SaveAccount(int uid) {
+int AccountManager::Save(int uid) {
 	//save this user account from memory, replacing it if it exists in the database
 	//DOCS: To use this method, change the in-memory copy, and then call this function using that object's UID.
 
 	//this method fails if this account is not loaded
-	if (accountMap.find(uid) == accountMap.end()) {
+	if (elementMap.find(uid) == elementMap.end()) {
 		return -1;
 	}
 
-	AccountData& account = accountMap[uid];
+	AccountData& account = elementMap[uid];
 	sqlite3_stmt* statement = nullptr;
 
 	//prep
@@ -158,14 +159,14 @@ int AccountManager::SaveAccount(int uid) {
 	return 0;
 }
 
-void AccountManager::UnloadAccount(int uid) {
+void AccountManager::Unload(int uid) {
 	//save this user account, and then unload it
 	//NOTE: the associated characters are unloaded externally
-	SaveAccount(uid);
-	accountMap.erase(uid);
+	Save(uid);
+	elementMap.erase(uid);
 }
 
-void AccountManager::DeleteAccount(int uid) {
+void AccountManager::Delete(int uid) {
 	//delete a user account from the database, and remove it from memory
 	//NOTE: the associated characters should be deleted externally
 	sqlite3_stmt* statement = nullptr;
@@ -189,32 +190,69 @@ void AccountManager::DeleteAccount(int uid) {
 
 	//finish the routine
 	sqlite3_finalize(statement);
-	accountMap.erase(uid);
+	elementMap.erase(uid);
 }
 
 void AccountManager::UnloadAll() {
-	for (auto& it : accountMap) {
-		SaveAccount(it.first);
+	for (auto& it : elementMap) {
+		Save(it.first);
+	}
+	elementMap.clear();
+}
+
+void AccountManager::UnloadIf(std::function<bool(std::pair<const int, AccountData>&)> fn) {
+	//replicate std::remove_if, using custom code
+	std::map<int, AccountData>::iterator it = elementMap.begin();
+	while (it != elementMap.end()) {
+		if (fn(*it)) {
+			Save(it->first);
+			it = elementMap.erase(it);
+		}
+		else {
+			++it;
+		}
 	}
-	accountMap.clear();
 }
 
 //-------------------------
 //Define the accessors and mutators
 //-------------------------
 
-AccountData* AccountManager::GetAccount(int uid) {
-	std::map<int, AccountData>::iterator it = accountMap.find(uid);
+AccountData* AccountManager::Get(int uid) {
+	//TODO: could this load an account first?
+	std::map<int, AccountData>::iterator it = elementMap.find(uid);
 
-	if (it == accountMap.end()) {
+	if (it == elementMap.end()) {
 		return nullptr;
 	}
 
 	return &it->second;
 }
 
+int AccountManager::GetLoadedCount() {
+	return elementMap.size();
+}
+
+int AccountManager::GetTotalCount() {
+	//a lot just to count something.
+	sqlite3_stmt* statement = nullptr;
+
+	//prep
+	if (sqlite3_prepare_v2(database, COUNT_USER_ACCOUNT_RECORDS, -1, &statement, nullptr) != SQLITE_OK) {
+		throw( std::runtime_error(std::string() + "Failed to prepare an SQL statement: " + sqlite3_errmsg(database)) );
+	}
+
+	//execute & retrieve the result
+	sqlite3_step(statement);
+	int ret = sqlite3_column_int(statement, 0);
+
+	//finish the routine
+	sqlite3_finalize(statement);
+	return ret;
+}
+
 std::map<int, AccountData>* AccountManager::GetContainer() {
-	return &accountMap;
+	return &elementMap;
 }
 
 sqlite3* AccountManager::SetDatabase(sqlite3* db) {

server/accounts/account_manager.hpp

@@ -23,34 +23,48 @@
 #define ACCOUNTMANAGER_HPP_
 
 #include "account_data.hpp"
+#include "singleton.hpp"
+#include "manager_interface.hpp"
 
+#if defined(__MINGW32__)
  #include "sqlite3/sqlite3.h"
+#else
+ #include "sqlite3.h"
+#endif
 
+#include <functional>
 #include <map>
 
-class AccountManager {
+class AccountManager:
+	public Singleton<AccountManager>,
+	public ManagerInterface<AccountData, std::string, int>
+{
 public:
-	AccountManager() = default;
-	~AccountManager() { UnloadAll(); };
+	//common public methods
+	int Create(std::string username, int clientIndex) override;
+	int Load(std::string username, int clientIndex) override;
+	int Save(int uid) override;
+	void Unload(int uid) override;
+	void Delete(int uid) override;
 
-	//public access methods
-	int CreateAccount(std::string username, int clientIndex);
-	int LoadAccount(std::string username, int clientIndex);
-	int SaveAccount(int uid);
-	void UnloadAccount(int uid);
-	void DeleteAccount(int uid);
-
-	void UnloadAll();
+	void UnloadAll() override;
+	void UnloadIf(std::function<bool(std::pair<const int, AccountData>&)> fn) override;
 
 	//accessors and mutators
-	AccountData* GetAccount(int uid);
-	std::map<int, AccountData>* GetContainer();
+	AccountData* Get(int uid) override;
+	int GetLoadedCount() override;
+	int GetTotalCount() override;
+	std::map<int, AccountData>* GetContainer() override;
 
 	sqlite3* SetDatabase(sqlite3* db);
 	sqlite3* GetDatabase();
 
 private:
-	std::map<int, AccountData> accountMap;
+	friend Singleton<AccountManager>;
+
+	AccountManager() = default;
+	~AccountManager() = default;
+
 	sqlite3* database = nullptr;
 };
 

server/accounts/makefile

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

server/characters/character_data.cpp

@@ -19,16 +19,16 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef COMBATDEFINES_HPP_
-#define COMBATDEFINES_HPP_
+#include "character_data.hpp"
 
-#define COMBAT_MAX_CHARACTERS 16
-#define COMBAT_MAX_ENEMIES 16
+int CharacterData::GetOwner() {
+	return owner;
+}
 
-enum class TerrainType {
-	NONE = 0,
-	GRASSLANDS,
-	//etc.
-};
+std::string CharacterData::GetHandle() {
+	return handle;
+}
 
-#endif
+std::string CharacterData::GetAvatar() {
+	return avatar;
+}

server/characters/character_data.hpp

@@ -24,34 +24,31 @@
 
 //components
 #include "character_defines.hpp"
-#include "vector2.hpp"
-#include "statistics.hpp"
+#include "entity.hpp"
 
 //std namespace
 #include <string>
 #include <cmath>
 
-struct CharacterData {
-	//metadata
+class CharacterData: public Entity {
+public:
+	CharacterData() = default;
+	~CharacterData() = default;
+
+	//accessors and mutators
+	//...
+
+	//database stuff
+	int GetOwner();
+	std::string GetHandle();
+	std::string GetAvatar();
+
+private:
+	friend class CharacterManager;
+
 	int owner;
 	std::string handle;
 	std::string avatar;
-
-	//world position
-	int roomIndex = 0;
-	Vector2 origin = {0.0,0.0};
-	Vector2 motion = {0.0,0.0};
-
-	//base statistics
-	Statistics stats;
-
-	//TODO: gameplay components: equipment, items, buffs, debuffs
-
-	//active gameplay members
-	//NOTE: these are lost when unloaded
-	bool inCombat = false;
-	int atbGauge = 0;
-	//TODO: stored command
 };
 
 #endif

server/characters/character_manager.cpp

@@ -21,8 +21,13 @@
 */
 #include "character_manager.hpp"
 
+#if defined(__MINGW32__)
  #include "sqlite3/sqlite3.h"
+#else
+ #include "sqlite3.h"
+#endif
 
+#include <algorithm>
 #include <stdexcept>
 
 //-------------------------
@@ -31,35 +36,16 @@
 
 static const char* CREATE_CHARACTER = "INSERT INTO Characters (owner, handle, avatar) VALUES (?, ?, ?);";
 static const char* LOAD_CHARACTER = "SELECT * FROM Characters WHERE handle = ?;";
-
-static const char* SAVE_CHARACTER = "UPDATE OR FAIL Characters SET "
-	"roomIndex = ?2,"
-	"originX = ?3,"
-	"originY = ?4,"
-	"level = ?5,"
-	"exp = ?6,"
-	"maxHP = ?7,"
-	"health = ?8,"
-	"maxMP = ?9,"
-	"mana = ?10,"
-	"attack = ?11,"
-	"defence = ?12,"
-	"intelligence = ?13,"
-	"resistance = ?14,"
-	"speed = ?15,"
-	"accuracy = ?16,"
-	"evasion = ?17,"
-	"luck = ?18"
-" WHERE uid = ?1;";
-
+static const char* SAVE_CHARACTER = "UPDATE OR FAIL Characters SET roomIndex = ?2, originX = ?3, originY = ?4 WHERE uid = ?1;";
 static const char* DELETE_CHARACTER = "DELETE FROM Characters WHERE uid = ?;";
+static const char* COUNT_CHARACTER_RECORDS = "SELECT COUNT(*) FROM Characters;";
 
 //-------------------------
 //Define the methods
 //-------------------------
 
-//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) {
+//NOTE: default baseStats as a parameter would be good for different beggining states or multiple classes
+int CharacterManager::Create(int owner, std::string handle, std::string avatar) {
 	//Create the character, failing if it exists
 	sqlite3_stmt* statement = nullptr;
 
@@ -89,10 +75,10 @@ int CharacterManager::CreateCharacter(int owner, std::string handle, std::string
 	sqlite3_finalize(statement);
 
 	//load this character into memory
-	return LoadCharacter(owner, handle, avatar);
+	return Load(owner, handle, avatar);
 }
 
-int CharacterManager::LoadCharacter(int owner, std::string handle, std::string avatar) {
+int CharacterManager::Load(int owner, std::string handle, std::string avatar) {
 	//load the specified character, creating it if it doesn't exist
 	//fail if it is already loaded, or does not belong to this account
 	sqlite3_stmt* statement = nullptr;
@@ -116,7 +102,7 @@ int CharacterManager::LoadCharacter(int owner, std::string handle, std::string a
 		int uid = sqlite3_column_int(statement, 0);
 
 		//check to see if this character is already loaded
-		if (characterMap.find(uid) != characterMap.end()) {
+		if (elementMap.find(uid) != elementMap.end()) {
 			sqlite3_finalize(statement);
 			return -1;
 		}
@@ -128,7 +114,7 @@ int CharacterManager::LoadCharacter(int owner, std::string handle, std::string a
 		}
 
 		//extract the data into memory
-		CharacterData& newChar = characterMap[uid];
+		CharacterData& newChar = elementMap[uid];
 
 		//metadata
 		newChar.owner = owner;
@@ -141,23 +127,7 @@ int CharacterManager::LoadCharacter(int owner, std::string handle, std::string a
 		newChar.origin.x = (double)sqlite3_column_int(statement, 6);
 		newChar.origin.y = (double)sqlite3_column_int(statement, 7);
 
-		//statistics
-		newChar.stats.level = sqlite3_column_int(statement, 8);
-		newChar.stats.exp = sqlite3_column_int(statement, 9);
-		newChar.stats.maxHP = sqlite3_column_int(statement, 10);
-		newChar.stats.health = sqlite3_column_int(statement, 11);
-		newChar.stats.maxMP = sqlite3_column_int(statement, 12);
-		newChar.stats.mana = sqlite3_column_int(statement, 13);
-		newChar.stats.attack = sqlite3_column_int(statement, 14);
-		newChar.stats.defence = sqlite3_column_int(statement, 15);
-		newChar.stats.intelligence = sqlite3_column_int(statement, 16);
-		newChar.stats.resistance = sqlite3_column_int(statement, 17);
-		newChar.stats.speed = sqlite3_column_int(statement, 18);
-		newChar.stats.accuracy = sqlite3_column_double(statement, 19);
-		newChar.stats.evasion = sqlite3_column_double(statement, 20);
-		newChar.stats.luck = sqlite3_column_double(statement, 21);
-
-		//TODO: gameplay components: equipment, items, buffs, debuffs
+		//gameplay components: equipment, items, buffs, debuffs...
 
 		//finish the routine
 		sqlite3_finalize(statement);
@@ -168,22 +138,22 @@ int CharacterManager::LoadCharacter(int owner, std::string handle, std::string a
 
 	if (ret == SQLITE_DONE) {
 		//create the non-existant character instead
-		return CreateCharacter(owner, handle, avatar);
+		return Create(owner, handle, avatar);
 	}
 
 	throw(std::runtime_error(std::string() + "Unknown SQL error in LoadCharacter: " + sqlite3_errmsg(database) ));
 }
 
-int CharacterManager::SaveCharacter(int uid) {
+int CharacterManager::Save(int uid) {
 	//save this character from memory, replacing it if it exists in the database
 	//DOCS: To use this method, change the in-memory copy, and then call this function using that object's UID.
 
 	//this method fails if this character is not loaded
-	if (characterMap.find(uid) == characterMap.end()) {
+	if (elementMap.find(uid) == elementMap.end()) {
 		return -1;
 	}
 
-	CharacterData& character = characterMap[uid];
+	CharacterData& character = elementMap[uid];
 	sqlite3_stmt* statement = nullptr;
 
 	//prep
@@ -198,23 +168,7 @@ int CharacterManager::SaveCharacter(int uid) {
 	ret |= sqlite3_bind_int(statement, 3, (int)character.origin.x) != SQLITE_OK;
 	ret |= sqlite3_bind_int(statement, 4, (int)character.origin.y) != SQLITE_OK;
 
-	//statistics
-	ret |= sqlite3_bind_int(statement, 5, character.stats.level) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 6, character.stats.exp) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 7, character.stats.maxHP) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 8, character.stats.health) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 9, character.stats.maxMP) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 10, character.stats.mana) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 11, character.stats.attack) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 12, character.stats.defence) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 13, character.stats.intelligence) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 14, character.stats.resistance) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 15, character.stats.speed) != SQLITE_OK;
-	ret |= sqlite3_bind_double(statement, 16, character.stats.accuracy) != SQLITE_OK;
-	ret |= sqlite3_bind_double(statement, 17, character.stats.evasion) != SQLITE_OK;
-	ret |= sqlite3_bind_double(statement, 18, character.stats.luck) != SQLITE_OK;
-
-	//TODO: gameplay components: equipment, items, buffs, debuffs
+	//gameplay components: equipment, items, buffs, debuffs...
 
 	//check for binding errors
 	if (ret) {
@@ -225,7 +179,7 @@ int CharacterManager::SaveCharacter(int uid) {
 	if (sqlite3_step(statement) != SQLITE_DONE) {
 		//if this fails, than something went horribly wrong
 		sqlite3_finalize(statement);
-		throw( std::runtime_error(std::string() + "Unknown SQL error when saving an account: " + sqlite3_errmsg(database)) );
+		throw( std::runtime_error(std::string() + "Unknown SQL error when saving a character: " + sqlite3_errmsg(database)) );
 	}
 
 	sqlite3_finalize(statement);
@@ -234,13 +188,13 @@ int CharacterManager::SaveCharacter(int uid) {
 	return 0;
 }
 
-void CharacterManager::UnloadCharacter(int uid) {
+void CharacterManager::Unload(int uid) {
 	//save this character, then unload it
-	SaveCharacter(uid);
-	characterMap.erase(uid);
+	Save(uid);
+	elementMap.erase(uid);
 }
 
-void CharacterManager::DeleteCharacter(int uid) {
+void CharacterManager::Delete(int uid) {
 	//delete this character from the database, then remove it from memory
 	sqlite3_stmt* statement = nullptr;
 
@@ -258,49 +212,72 @@ void CharacterManager::DeleteCharacter(int uid) {
 	if (sqlite3_step(statement) != SQLITE_DONE) {
 		//if this fails, than something went horribly wrong
 		sqlite3_finalize(statement);
-		throw( std::runtime_error(std::string() + "Unknown SQL error when deleting an account: " + sqlite3_errmsg(database)) );
+		throw( std::runtime_error(std::string() + "Unknown SQL error when deleting a character: " + sqlite3_errmsg(database)) );
 	}
 
 	//finish the routine
 	sqlite3_finalize(statement);
-	characterMap.erase(uid);
-}
-
-void CharacterManager::UnloadCharacterIf(std::function<bool(std::map<int, CharacterData>::iterator)> f) {
-	//save this character, then unload it if the parameter returns true
-	for (std::map<int, CharacterData>::iterator it = characterMap.begin(); it != characterMap.end(); /* EMPTY */ ) {
-		if (f(it)) {
-			SaveCharacter(it->first);
-			it = characterMap.erase(it);
-			continue;
-		}
-		it++;
-	}
+	elementMap.erase(uid);
 }
 
 void CharacterManager::UnloadAll() {
-	for (auto& it : characterMap) {
-		SaveCharacter(it.first);
+	for (auto& it : elementMap) {
+		Save(it.first);
+	}
+	elementMap.clear();
+}
+
+void CharacterManager::UnloadIf(std::function<bool(std::pair<const int, CharacterData>&)> fn) {
+	std::map<int, CharacterData>::iterator it = elementMap.begin();
+	while (it != elementMap.end()) {
+		if (fn(*it)) {
+			Save(it->first);
+			it = elementMap.erase(it);
+		}
+		else {
+			++it;
+		}
 	}
-	characterMap.clear();
 }
 
 //-------------------------
 //Define the accessors and mutators
 //-------------------------
 
-CharacterData* CharacterManager::GetCharacter(int uid) {
-	std::map<int, CharacterData>::iterator it = characterMap.find(uid);
+CharacterData* CharacterManager::Get(int uid) {
+	std::map<int, CharacterData>::iterator it = elementMap.find(uid);
 
-	if (it == characterMap.end()) {
+	if (it == elementMap.end()) {
 		return nullptr;
 	}
 
 	return &it->second;
 }
 
+int CharacterManager::GetLoadedCount() {
+	return elementMap.size();
+}
+
+int CharacterManager::GetTotalCount() {
+	//a lot just to count something.
+	sqlite3_stmt* statement = nullptr;
+
+	//prep
+	if (sqlite3_prepare_v2(database, COUNT_CHARACTER_RECORDS, -1, &statement, nullptr) != SQLITE_OK) {
+		throw( std::runtime_error(std::string() + "Failed to prepare an SQL statement: " + sqlite3_errmsg(database)) );
+	}
+
+	//execute & retrieve the result
+	sqlite3_step(statement);
+	int ret = sqlite3_column_int(statement, 0);
+
+	//finish the routine
+	sqlite3_finalize(statement);
+	return ret;
+}
+
 std::map<int, CharacterData>* CharacterManager::GetContainer() {
-	return &characterMap;
+	return &elementMap;
 }
 
 sqlite3* CharacterManager::SetDatabase(sqlite3* db) {

server/characters/character_manager.hpp

@@ -23,37 +23,48 @@
 #define CHARACTERMANAGER_HPP_
 
 #include "character_data.hpp"
+#include "singleton.hpp"
+#include "manager_interface.hpp"
 
+#if defined(__MINGW32__)
  #include "sqlite3/sqlite3.h"
+#else
+ #include "sqlite3.h"
+#endif
 
-#include <map>
 #include <functional>
+#include <map>
 
-class CharacterManager {
+class CharacterManager:
+	public Singleton<CharacterManager>,
+	public ManagerInterface<CharacterData, int, std::string, std::string>
+{
 public:
-	CharacterManager() = default;
-	~CharacterManager() { UnloadAll(); };
+	//common public methods
+	int Create(int owner, std::string handle, std::string avatar) override;
+	int Load(int owner, std::string handle, std::string avatar) override;
+	int Save(int uid) override;
+	void Unload(int uid) override;
+	void Delete(int uid) override;
 
-	//public access methods
-	int CreateCharacter(int owner, std::string handle, std::string avatar);
-	int LoadCharacter(int owner, std::string handle, std::string avatar);
-	int SaveCharacter(int uid);
-	void UnloadCharacter(int uid);
-	void DeleteCharacter(int uid);
-
-	void UnloadCharacterIf(std::function<bool(std::map<int, CharacterData>::iterator)> f);
-
-	void UnloadAll();
+	void UnloadAll() override;
+	void UnloadIf(std::function<bool(std::pair<const int, CharacterData>&)> fn) override;
 
 	//accessors and mutators
-	CharacterData* GetCharacter(int uid);
-	std::map<int, CharacterData>* GetContainer();
+	CharacterData* Get(int uid) override;
+	int GetLoadedCount() override;
+	int GetTotalCount() override;
+	std::map<int, CharacterData>* GetContainer() override;
 
 	sqlite3* SetDatabase(sqlite3* db);
 	sqlite3* GetDatabase();
 
 private:
-	std::map<int, CharacterData> characterMap;
+	friend Singleton<CharacterManager>;
+
+	CharacterManager() = default;
+	~CharacterManager() = default;
+
 	sqlite3* database = nullptr;
 };