Merged network changes from branch 'develop', read more

After several days of trying, I decided to discard changes to the networking system:

> discard-encapsulated-packets

Instead, I've moved the packets and specialized serial functions into the same directory, and renamed them accordingly. The serialization code is only accessed by UDPNetworkUtility.

I've also removed the combat and enemy code from the network system, and reduced the number of packet types in SerialPacketType. These changes should make it easier to add more features in the future.

.gitignore

@@ -15,7 +15,6 @@ Out/
 *.o
 *.a
 *.exe
-*.diff
 
 #Shell files
 *.bat

client/character.cpp

@@ -21,14 +21,14 @@
 */
 #include "character.hpp"
 
-void Character::Update(double delta) {
+void Character::Update() {
 	if (motion.x && motion.y) {
-		origin += motion * delta * CHARACTER_WALKING_MOD;
+		origin += motion * CHARACTER_WALKING_MOD;
 	}
 	else if (motion != 0) {
-		origin += motion * delta;
+		origin += motion;
 	}
-	sprite.Update(delta);
+	sprite.Update(0.016);
 }
 
 void Character::DrawTo(SDL_Surface* const dest, int camX, int camY) {

client/character.hpp

@@ -26,6 +26,7 @@
 #include "character_defines.hpp"
 #include "vector2.hpp"
 #include "bounding_box.hpp"
+#include "statistics.hpp"
 
 //graphics
 #include "sprite_sheet.hpp"
@@ -39,13 +40,16 @@ public:
 	Character() = default;
 	~Character() = default;
 
-	void Update(double delta);
+	void Update();
 
 	//graphics
 	void DrawTo(SDL_Surface* const, int camX, int camY);
 	void CorrectSprite();
 	SpriteSheet* GetSprite() { return &sprite; }
 
+	//gameplay
+	Statistics* GetStats() { return &stats; }
+
 	//accessors and mutators
 
 	//metadata
@@ -61,13 +65,18 @@ public:
 	Vector2 GetOrigin() const { return origin; }
 	Vector2 SetMotion(Vector2 v) { return motion = v; }
 	Vector2 GetMotion() const { return motion; }
-	BoundingBox SetBoundingBox(BoundingBox b) { return bounds = b; }
+	BoundingBox SetBounds(BoundingBox b) { return bounds = b; }
-	BoundingBox GetBoundingBox() const { return bounds; }
+	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;

client/client_application.cpp

@@ -21,7 +21,8 @@
 */
 #include "client_application.hpp"
 
-#include "serial.hpp"
+#include "serial_packet.hpp"
+#include "config_utility.hpp"
 
 #include <stdexcept>
 #include <chrono>
@@ -37,7 +38,7 @@
 #include "options_menu.hpp"
 #include "lobby_menu.hpp"
 #include "in_world.hpp"
-#include "in_combat.hpp"
+//#include "in_combat.hpp"
 #include "clean_up.hpp"
 
 //-------------------------
@@ -47,6 +48,10 @@
 void ClientApplication::Init(int argc, char** argv) {
 	std::cout << "Beginning " << argv[0] << std::endl;
 
+	//load the prerequisites
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+	config.Load("rsc\\config.cfg");
+
 	//-------------------------
 	//Initialize the APIs
 	//-------------------------
@@ -61,83 +66,45 @@ 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;
 
-	//initialize lua
-	lua = luaL_newstate();
-	if (!lua) {
-		throw(std::runtime_error("Failed to initialize lua"));
-	}
-	luaL_openlibs(lua);
-	std::cout << "Initialized lua" << std::endl;
-
-	//run the setup script
-	if (luaL_dofile(lua, "rsc\\setup.lua")) {
-		throw(std::runtime_error("Failed to initialize lua's startup script"));
-	}
-	std::cout << "Initialized lua's setup script" << std::endl;
-
-	//place the config table onto the stack
-	lua_getglobal(lua, "config");
-
 	//-------------------------
 	//Setup the screen
 	//-------------------------
 
-	//get each field
+	int w = config.Int("client.screen.w");
-	lua_getfield(lua, -1, "client");
+	int h = config.Int("client.screen.h");
-	lua_getfield(lua, -1, "screen");
+	int f = config.Bool("client.screen.f") ? SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_FULLSCREEN : SDL_HWSURFACE|SDL_DOUBLEBUF;
-	lua_getfield(lua, -1, "width");
-	lua_getfield(lua, -2, "height");
-	lua_getfield(lua, -3, "fullscreen");
 
-	int w = lua_tointeger(lua, -3);
+	BaseScene::SetScreen(w ? w : 800, h ? h : 600, 0, f);
-	int h = lua_tointeger(lua, -2);
-	int f = lua_toboolean(lua, -1);
-
-	//pop the screen members
-	lua_pop(lua, 5);
-
-	BaseScene::SetScreen(w ? w : 800, h ? h : 600, 0, f ?
-		SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_FULLSCREEN :
-		SDL_HWSURFACE|SDL_DOUBLEBUF);
 	std::cout << "Initialized the screen" << std::endl;
 
 	//-------------------------
 	//debug output
 	//-------------------------
 
-	lua_getfield(lua, -1, "debug");
+	//TODO: enable/disable these with a switch
-
-	if (lua_toboolean(lua, -1)) {
 #define DEBUG_OUTPUT_VAR(x) std::cout << "\t" << #x << ": " << x << std::endl;
 
-		std::cout << "Internal sizes:" << std::endl;
+	std::cout << "Internal sizes:" << std::endl;
 
-		DEBUG_OUTPUT_VAR(sizeof(Region::type_t));
+	DEBUG_OUTPUT_VAR(sizeof(Region::type_t));
-		DEBUG_OUTPUT_VAR(sizeof(Region));
+	DEBUG_OUTPUT_VAR(sizeof(Region));
-		DEBUG_OUTPUT_VAR(REGION_WIDTH);
+	DEBUG_OUTPUT_VAR(REGION_WIDTH);
-		DEBUG_OUTPUT_VAR(REGION_HEIGHT);
+	DEBUG_OUTPUT_VAR(REGION_HEIGHT);
-		DEBUG_OUTPUT_VAR(REGION_DEPTH);
+	DEBUG_OUTPUT_VAR(REGION_DEPTH);
-		DEBUG_OUTPUT_VAR(REGION_SOLID_FOOTPRINT);
+	DEBUG_OUTPUT_VAR(REGION_TILE_FOOTPRINT);
-		DEBUG_OUTPUT_VAR(REGION_FOOTPRINT);
+	DEBUG_OUTPUT_VAR(REGION_SOLID_FOOTPRINT);
-		DEBUG_OUTPUT_VAR(PACKET_BUFFER_SIZE);
+	DEBUG_OUTPUT_VAR(PACKET_BUFFER_SIZE);
-		DEBUG_OUTPUT_VAR(MAX_PACKET_SIZE);
+	DEBUG_OUTPUT_VAR(MAX_PACKET_SIZE);
 
 #undef DEBUG_OUTPUT_VAR
-	}
-
-	//pop the debug value
-	lua_pop(lua, 1);
 
 	//-------------------------
 	//finalize the startup
 	//-------------------------
 
-	//pop the config table
-	lua_pop(lua, 1);
-
 	std::cout << "Startup completed successfully" << std::endl;
 
 	//-------------------------
@@ -153,7 +120,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;
 
@@ -171,8 +137,9 @@ void ClientApplication::Proc() {
 		//simulate game time
 		while (simTime < realTime) {
 			//call each user defined function
-			activeScene->RunFrame(constexpr(double(delta.count()) / std::chrono::duration<int, std::milli>::period::den));
+			activeScene->RunFrame();
-			simTime += delta;
+			//~60 FPS
+			simTime += std::chrono::duration<int, std::milli>(16);
 		}
 
 		//draw the game to the screen
@@ -184,8 +151,7 @@ void ClientApplication::Proc() {
 
 void ClientApplication::Quit() {
 	std::cout << "Shutting down" << std::endl;
-	lua_close(lua);
+	UDPNetworkUtility::GetSingleton().Close();
-	network.Close();
 	SDLNet_Quit();
 	SDL_Quit();
 	std::cout << "Clean exit" << std::endl;
@@ -201,25 +167,25 @@ void ClientApplication::LoadScene(SceneList sceneIndex) {
 		//add scene creation calls here
 		case SceneList::FIRST:
 		case SceneList::SPLASHSCREEN:
-			activeScene = new SplashScreen(lua);
+			activeScene = new SplashScreen();
 		break;
 		case SceneList::MAINMENU:
-			activeScene = new MainMenu(lua);
+			activeScene = new MainMenu();
 		break;
 		case SceneList::OPTIONSMENU:
-			activeScene = new OptionsMenu(lua);
+			activeScene = new OptionsMenu();
 		break;
 		case SceneList::LOBBYMENU:
-			activeScene = new LobbyMenu(lua, network, characterMap);
+			activeScene = new LobbyMenu(&clientIndex, &accountIndex);
 		break;
 		case SceneList::INWORLD:
-			activeScene = new InWorld(lua, network, characterMap);
+			activeScene = new InWorld(&clientIndex, &accountIndex, &characterIndex, &characterMap);
-		break;
-		case SceneList::INCOMBAT:
-			activeScene = new InCombat(lua, network, characterMap);
 		break;
+//		case SceneList::INCOMBAT:
+//			activeScene = new InCombat(&clientIndex, &accountIndex, &characterIndex, &characterMap);
+//		break;
 		case SceneList::CLEANUP:
-			activeScene = new CleanUp(lua, network, characterMap);
+			activeScene = new CleanUp(&clientIndex, &accountIndex, &characterIndex, &characterMap);
 		break;
 		default:
 			throw(std::logic_error("Failed to recognize the scene index"));

client/client_application.hpp

@@ -28,20 +28,23 @@
 #include "udp_network_utility.hpp"
 #include "character.hpp"
 
-#include "lua/lua.hpp"
+#include "singleton.hpp"
 
 #include <map>
 
-class ClientApplication {
+class ClientApplication: public Singleton<ClientApplication> {
 public:
-	ClientApplication() = default;
+	//public methods
-	~ClientApplication() = default;
-
 	void Init(int argc, char** argv);
 	void Proc();
 	void Quit();
 
 private:
+	friend Singleton<ClientApplication>;
+
+	ClientApplication() = default;
+	~ClientApplication() = default;
+
 	//Private access members
 	void LoadScene(SceneList sceneIndex);
 	void UnloadScene();
@@ -49,8 +52,6 @@ private:
 	BaseScene* activeScene = nullptr;
 
 	//shared parameters
-	lua_State* lua = nullptr;
-	UDPNetworkUtility network;
 	int clientIndex = -1;
 	int accountIndex = -1;
 	int characterIndex = -1;

client/linit.cpp

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

client/main.cpp

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

client/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet ../common/network/serial ../common/ui ../common/utilities
+INCLUDES+=. scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
 LIBS+=client.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 

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/clean_up.cpp

@@ -22,6 +22,7 @@
 #include "clean_up.hpp"
 
 #include "channels.hpp"
+#include "config_utility.hpp"
 
 #include <stdexcept>
 
@@ -29,43 +30,23 @@
 //Public access members
 //-------------------------
 
-CleanUp::CleanUp(lua_State* L, UDPNetworkUtility& aNetwork, CharacterMap& aCharacterMap):
+CleanUp::CleanUp(
-	lua(L),
+	int* const argClientIndex,
-	network(aNetwork),
+	int* const argAccountIndex,
-	characterMap(aCharacterMap)
+	int* const argCharacterIndex,
+	CharacterMap* argCharacterMap
+	):
+	clientIndex(*argClientIndex),
+	accountIndex(*argAccountIndex),
+	characterIndex(*argCharacterIndex),
+	characterMap(*argCharacterMap)
 {
-	//get the config table
+	ConfigUtility& config = ConfigUtility::GetSingleton();
-	lua_getglobal(lua, "config");
-
-	//TODO: I need to figure out an alternative to loading these over and over again
-	//get the directories
-	lua_getfield(lua, -1, "dir");
-	lua_getfield(lua, -1, "interface");
-	lua_getfield(lua, -2, "fonts");
-
-	std::string interfaceDir = lua_tostring(lua, -2);
-	std::string fontsDir = lua_tostring(lua, -1);
-
-	lua_pop(lua, 3);
-
-	//clear the indicies
-	lua_getfield(lua, -1, "client");
-
-	lua_pushnil(lua);
-	lua_pushnil(lua);
-	lua_pushnil(lua);
-
-	lua_setfield(lua, -4, "clientIndex");
-	lua_setfield(lua, -3, "accountIndex");
-	lua_setfield(lua, -2, "characterIndex");
-
-	//pop the remaining objects from the stack
-	lua_pop(lua, 2);
 
 	//setup the utility objects
-	image.LoadSurface(interfaceDir + "button_menu.bmp");
+	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(fontsDir + "pk_white_8.bmp");
+	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
 
 	//pass the utility objects
 	backButton.SetImage(&image);
@@ -80,7 +61,12 @@ CleanUp::CleanUp(lua_State* L, UDPNetworkUtility& aNetwork, CharacterMap& aChara
 
 	//full reset
 	network.Unbind(Channels::SERVER);
+	clientIndex = -1;
+	accountIndex = -1;
+	characterIndex = -1;
+//	combatMap.clear();
 	characterMap.clear();
+//	enemyMap.clear();
 
 	//auto return
 	startTick = std::chrono::steady_clock::now();
@@ -94,7 +80,7 @@ CleanUp::~CleanUp() {
 //Frame loop
 //-------------------------
 
-void CleanUp::Update(double delta) {
+void CleanUp::Update() {
 	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(10)) {
 		SetNextScene(SceneList::MAINMENU);
 	}
@@ -103,13 +89,6 @@ void CleanUp::Update(double delta) {
 	while(network.Receive());
 }
 
-void CleanUp::RenderFrame() {
-	SDL_FillRect(GetScreen(), 0, 0);
-	Render(GetScreen());
-	SDL_Flip(GetScreen());
-	fps.Calculate();
-}
-
 void CleanUp::Render(SDL_Surface* const screen) {
 	backButton.DrawTo(screen);
 	font.DrawStringTo("You have been disconnected.", screen, 50, 30);
@@ -132,14 +111,17 @@ void CleanUp::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 }
 
 void CleanUp::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (backButton.MouseButtonUp(button) == Button::State::HOVER &&
+	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
-		button.button & SDL_BUTTON_LMASK) {
 		SetNextScene(SceneList::MAINMENU);
 	}
 }
 
 void CleanUp::KeyDown(SDL_KeyboardEvent const& key) {
-	//
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+			SetNextScene(SceneList::MAINMENU);
+		break;
+	}
 }
 
 void CleanUp::KeyUp(SDL_KeyboardEvent const& key) {

client/scenes/clean_up.hpp

@@ -25,18 +25,14 @@
 //network
 #include "udp_network_utility.hpp"
 
-//graphics & ui
+//graphics
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
-#include "frame_rate.hpp"
 
 //client
-#include "base_scene.hpp"
 #include "character.hpp"
-
+#include "base_scene.hpp"
-//APIs
-#include "lua/lua.hpp"
 
 //std namespace
 #include <chrono>
@@ -44,13 +40,17 @@
 class CleanUp : public BaseScene {
 public:
 	//Public access members
-	CleanUp(lua_State*, UDPNetworkUtility&, CharacterMap&);
+	CleanUp(
+		int* const argClientIndex,
+		int* const argAccountIndex,
+		int* const argCharacterIndex,
+		CharacterMap* argCharacterMap
+	);
 	~CleanUp();
 
 protected:
 	//Frame loop
-	void Update(double delta);
+	void Update();
-	void RenderFrame();
 	void Render(SDL_Surface* const);
 
 	//Event handlers
@@ -62,15 +62,18 @@ protected:
 	void KeyUp(SDL_KeyboardEvent const&);
 
 	//shared parameters
-	lua_State* lua = nullptr;
+	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
-	UDPNetworkUtility& network;
+	int& clientIndex;
+	int& accountIndex;
+	int& characterIndex;
 	CharacterMap& characterMap;
 
-	//graphics & ui
+	//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,221 +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 <stdexcept>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-InCombat::InCombat(
-	ConfigUtility* const argConfig,
-	UDPNetworkUtility* const argNetwork,
-	int* const argClientIndex,
-	int* const argAccountIndex,
-	int* const argCharacterIndex,
-	CharacterMap* argCharacterMap
-	):
-	config(*argConfig),
-	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,97 +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 "config_utility.hpp"
-#include "frame_rate.hpp"
-
-#include "character.hpp"
-
-//client
-#include "base_scene.hpp"
-
-class InCombat : public BaseScene {
-public:
-	//Public access members
-	InCombat(
-		ConfigUtility* const argConfig,
-		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
-	ConfigUtility& config;
-	UDPNetworkUtility& network;
-	int& clientIndex;
-	int& accountIndex;
-	int& characterIndex;
-	CharacterMap& characterMap;
-
-	//graphics
-	//TODO: graphics
-
-	//UI
-	//TODO: UI
-	FrameRate fps;
-};
-
-#endif

client/scenes/in_world.cpp

@@ -23,6 +23,7 @@
 
 #include "channels.hpp"
 #include "utility.hpp"
+#include "config_utility.hpp"
 
 #include <stdexcept>
 #include <algorithm>
@@ -34,74 +35,18 @@
 //-------------------------
 
 InWorld::InWorld(
-	ConfigUtility* const argConfig,
-	UDPNetworkUtility* const argNetwork,
 	int* const argClientIndex,
 	int* const argAccountIndex,
 	int* const argCharacterIndex,
 	CharacterMap* argCharacterMap
 	):
-	config(*argConfig),
-	network(*argNetwork),
 	clientIndex(*argClientIndex),
 	accountIndex(*argAccountIndex),
 	characterIndex(*argCharacterIndex),
 	characterMap(*argCharacterMap)
 {
-	//register the pager
+	ConfigUtility& config = ConfigUtility::GetSingleton();
-	lua_pushstring(lua, TORTUGA_REGION_PAGER_PSEUDO_INDEX);
-	lua_pushlightuserdata(lua, &pager);
-	lua_settable(L, LUA_REGISTRYINDEX);
 
-	//register the tilesheet
-	lua_pushstring(lua, TORTUGA_TILE_SHEET_PSEUDO_INDEX);
-	lua_pushlightuserdata(lua, &tileSheet);
-	lua_settable(L, LUA_REGISTRYINDEX);
-
-	//setup the component objecrs
-	pager.SetLuaState(lua);
-
-	//get the config info
-	lua_getglobal(lua, "config");
-	lua_getfield(lua, -1, "dir");
-	lua_getfield(lua, -1, "fonts");
-	std::string fonts = lua_tostring(lua, -1);
-	lua_getfield(lua, -2, "interface");
-	std::string interface = lua_tostring(lua, -1);
-	lua_getfield(lua, -3, "sprites");
-	std::string sprites = lua_tostring(lua, -1);
-	lua_getfield(lua, -4, "scripts");
-	std::string scripts = lua_tostring(lua, -1);
-	lua_pop(lua, 6);
-
-	//run the additional scripts
-	if (luaL_dofile(lua, (scripts + "in_world.lua").c_str())) {
-		throw(std::runtime_error(std::string() + "Failed to run in_world.lua: " + lua_tostring(lua, -1) ));
-	}
-
-	//setup the utility objects
-	buttonImage.LoadSurface(interface + "button_menu.bmp");
-	buttonImage.SetClipH(buttonImage.GetClipH()/3);
-	font.LoadSurface(fonts + "pk_white_8.bmp");
-
-	//pass the utility objects
-	backButton.SetImage(&buttonImage);
-	backButton.SetFont(&font);
-
-	//set the button positions
-	backButton.SetX(50);
-	backButton.SetY(50 + buttonImage.GetClipH() * 0);
-
-	//set the button texts
-	backButton.SetText("Back");
-
-	//entities
-	character.GetSprite()->LoadSurface(sprites + "elliot2.bmp", 4, 4);
-	character.SetBoundingBox({0, 0,
-		character.GetSprite()->GetImage()->GetClipW(),
-		character.GetSprite()->GetImage()->GetClipH()
-	});
-//-------------------------
 	//setup the utility objects
 	buttonImage.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	buttonImage.SetClipH(buttonImage.GetClipH()/3);
@@ -125,7 +70,8 @@ InWorld::InWorld(
 
 	//load the tilesheet
 	//TODO: add the tilesheet to the map system?
-	tileSheet.Load(config["dir.tilesets"] + "terrain.bmp", 12, 15);
+	//TODO: Tile size and tile sheet should be loaded elsewhere
+	tileSheet.Load(config["dir.tilesets"] + "terrain.bmp", 32, 32);
 
 	//request a sync
 	RequestSynchronize();
@@ -135,13 +81,7 @@ InWorld::InWorld(
 }
 
 InWorld::~InWorld() {
-	//unregister the map components
+	//
-	lua_pushstring(lua, TORTUGA_REGION_PAGER_PSEUDO_INDEX);
-	lua_pushstring(lua, TORTUGA_TILE_SHEET_PSEUDO_INDEX);
-	lua_pushnil(lua);
-	lua_settable(lua, LUA_REGISTRYINDEX);
-	lua_pushnil(lua);
-	lua_settable(lua, LUA_REGISTRYINDEX);
 }
 
 //-------------------------
@@ -152,51 +92,54 @@ 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
+	UpdateMap();
+
+	//skip the rest
+	if (!localCharacter) {
+		return;
 	}
 
-	//TODO: Check collisions here
 	//check for collisions with the map
 	BoundingBox wallBounds = {0, 0, tileSheet.GetTileW(), tileSheet.GetTileH()};
-	const int xCount = character.GetBoundingBox().w / wallBounds.w + 1;
+	const int xCount = localCharacter->GetBounds().w / wallBounds.w + 1;
-	const int yCount = character.GetBoundingBox().h / wallBounds.h + 1;
+	const int yCount = localCharacter->GetBounds().h / wallBounds.h + 1;
 
 	for (int i = -1; i <= xCount; ++i) {
 		for (int j = -1; j <= yCount; ++j) {
 			//set the wall's position
-			wallBounds.x = wallBounds.w * i + snapToBase((double)wallBounds.w, character.GetOrigin().x);
+			wallBounds.x = wallBounds.w * i + snapToBase((double)wallBounds.w, localCharacter->GetOrigin().x);
-			wallBounds.y = wallBounds.h * j + snapToBase((double)wallBounds.h, character.GetOrigin().y);
+			wallBounds.y = wallBounds.h * j + snapToBase((double)wallBounds.h, localCharacter->GetOrigin().y);
 
-			if (!pager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
+			if (!regionPager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
 				continue;
 			}
 
-			if ((character.GetOrigin() + character.GetBoundingBox()).CheckOverlap(wallBounds)) {
+			if ((localCharacter->GetOrigin() + localCharacter->GetBounds()).CheckOverlap(wallBounds)) {
-				character.SetOrigin(character.GetOrigin() - (character.GetMotion() * delta));
+				localCharacter->SetOrigin(localCharacter->GetOrigin() - (localCharacter->GetMotion()));
-				character.SetMotion({0,0});
+				localCharacter->SetMotion({0,0});
-				character.CorrectSprite();
+				localCharacter->CorrectSprite();
+				SendPlayerUpdate();
 			}
 		}
 	}
 
 	//update the camera
-	if(localCharacter) {
+	camera.x = localCharacter->GetOrigin().x - camera.marginX;
-		camera.x = localCharacter->GetOrigin().x - camera.marginX;
+	camera.y = localCharacter->GetOrigin().y - camera.marginY;
-		camera.y = localCharacter->GetOrigin().y - camera.marginY;
-	}
-
-	//check the map
-	UpdateMap();
 }
 
 void InWorld::FrameEnd() {
@@ -262,6 +205,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) {
@@ -358,10 +308,16 @@ void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
 	newCharacter.SetHandle(argPacket->handle);
 	newCharacter.SetAvatar(argPacket->avatar);
 
-	newCharacter.GetSprite()->LoadSurface(config["dir.sprites"] + newCharacter.GetAvatar(), 4, 4);
+	newCharacter.GetSprite()->LoadSurface(ConfigUtility::GetSingleton()["dir.sprites"] + newCharacter.GetAvatar(), 4, 4);
 
 	newCharacter.SetOrigin(argPacket->origin);
 	newCharacter.SetMotion(argPacket->motion);
+	newCharacter.SetBounds({
+		CHARACTER_BOUNDS_X,
+		CHARACTER_BOUNDS_Y,
+		CHARACTER_BOUNDS_WIDTH,
+		CHARACTER_BOUNDS_HEIGHT
+	});
 
 	(*newCharacter.GetStats()) = argPacket->stats;
 

client/scenes/in_world.hpp

@@ -22,28 +22,26 @@
 #ifndef INWORLD_HPP_
 #define INWORLD_HPP_
 
-//map stuff
+//maps
-#include "tile_sheet.hpp"
+#include "region_pager_base.hpp"
-#include "region_pager_lua.hpp"
 
 //networking
 #include "udp_network_utility.hpp"
+#include "serial_packet.hpp"
 
-//graphics & ui
+//graphics
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
+#include "tile_sheet.hpp"
 
-//utilities
+//common
 #include "frame_rate.hpp"
-#include "timer.hpp"
+
+#include "character.hpp"
 
 //client
 #include "base_scene.hpp"
-#include "character.hpp"
-
-//APIs
-#include "lua/lua.hpp"
 
 //STL
 #include <map>
@@ -52,8 +50,6 @@ class InWorld : public BaseScene {
 public:
 	//Public access members
 	InWorld(
-		ConfigUtility* const argConfig,
-		UDPNetworkUtility* const argNetwork,
 		int* const argClientIndex,
 		int* const argAccountIndex,
 		int* const argCharacterIndex,
@@ -64,7 +60,7 @@ public:
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update(double delta);
+	void Update();
 	void FrameEnd();
 	void RenderFrame();
 	void Render(SDL_Surface* const);
@@ -95,10 +91,8 @@ protected:
 	//utilities
 	void UpdateMap();
 
-	//TODO: Streamline this with lua
 	//shared parameters
-	ConfigUtility& config;
+	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
-	UDPNetworkUtility& network;
 	int& clientIndex;
 	int& accountIndex;
 	int& characterIndex;
@@ -117,11 +111,10 @@ protected:
 	Button shutDownButton;
 	//TODO: Review the camera
 	struct {
-		struct {
+		int x = 0, y = 0;
-			int x, y;
+		int width = 0, height = 0;
-		}origin, margin;
+		int marginX = 0, marginY = 0;
-	}camera;
+	} camera;
-
 	FrameRate fps;
 
 	//game

client/scenes/lobby_menu.cpp

@@ -30,25 +30,14 @@
 //Public access members
 //-------------------------
 
-LobbyMenu::LobbyMenu(lua_State* L, UDPNetworkUtility& aNetwork):
+LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
-	lua(L),
+	clientIndex(*argClientIndex),
-	network(aNetwork)
+	accountIndex(*argAccountIndex)
 {
-	//get the config info
-	lua_getglobal(lua, "config");
-	lua_getfield(lua, -1, "dir");
-	lua_getfield(lua, -1, "interface");
-	lua_getfield(lua, -2, "fonts");
-
-	std::string interfaceDir = lua_tostring(lua, -2);
-	std::string fontsDir = lua_tostring(lua, -1);
-
-	lua_pop(lua, 4);
-
 	//setup the utility objects
-	image.LoadSurface(interfaceDir + "button_menu.bmp");
+	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(fontsDir + "pk_white_8.bmp");
+	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
 
 	//pass the utility objects
 	search.SetImage(&image);
@@ -76,6 +65,9 @@ LobbyMenu::LobbyMenu(lua_State* L, UDPNetworkUtility& aNetwork):
 
 	//BUGFIX: Eat incoming packets
 	while(network.Receive());
+
+	//Initial broadcast
+	SendBroadcastRequest();
 }
 
 LobbyMenu::~LobbyMenu() {
@@ -90,13 +82,13 @@ void LobbyMenu::FrameStart() {
 	//
 }
 
-void LobbyMenu::Update(double delta) {
+void LobbyMenu::Update() {
 	//suck in and process all waiting packets
-	SerialPacket* packetBuffer = new SerialPacket();
+	SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]);
 	while(network.Receive(packetBuffer)) {
 		HandlePacket(packetBuffer);
 	}
-	delete packetBuffer;
+	delete reinterpret_cast<char*>(packetBuffer);
 }
 
 void LobbyMenu::FrameEnd() {
@@ -115,7 +107,10 @@ 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));
 		}
@@ -152,70 +147,33 @@ void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 }
 
 void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	//prep
-	lua_getglobal(lua, "config");
-
 	if (search.MouseButtonUp(button) == Button::State::HOVER) {
-		//get the set parameters
+		SendBroadcastRequest();
-		lua_getfield(lua, -1, "server");
-		lua_getfield(lua, -1, "host");
-		lua_getfield(lua, -2, "port");
-
-		//broadcast to the network, or a specific server
-		SerialPacket packet;
-		packet.type = SerialPacketType::BROADCAST_REQUEST;
-		network.SendTo(lua_tostring(lua, -2), lua_tointeger(lua, -1), &packet);
-
-		//reset the server list
-		serverInfo.clear();
-		selection = nullptr;
-
-		//clear the parameters
-		lua_pop(lua, 3);
 	}
-
 	else if (join.MouseButtonUp(button) == Button::State::HOVER && selection != nullptr && selection->compatible) {
-		//get the parameters
+		SendJoinRequest();
-		lua_getfield(lua, -1, "client");
-		lua_getfield(lua, -1, "username");
-
-		//pack the packet
-		ClientPacket packet;
-		packet.type = SerialPacketType::JOIN_REQUEST;
-		strncpy(packet.username, lua_tostring(lua, -1), PACKET_STRING_SIZE);
-
-		//join the selected server
-		network.SendTo(&selection->address, &packet);
-		selection = nullptr;
-
-		//clear the parameters
-		lua_pop(lua, 2);
 	}
-
 	else if (back.MouseButtonUp(button) == Button::State::HOVER) {
 		SetNextScene(SceneList::MAINMENU);
 	}
 
-	else if (
+	//has the user selected a server on the list?
-		//has the user selected a server on the list?
+	BoundingBox tmpBox = listBox;
-		//TODO: replace with regular collision checker
+	tmpBox.h *= serverInfo.size();
-		button.x > listBox.x &&
+	if (tmpBox.CheckOverlap({button.x, button.y})) {
-		button.x < listBox.x + listBox.w &&
-		button.y > listBox.y &&
-		button.y < listBox.y + listBox.h * serverInfo.size()
-		) {
 		selection = &serverInfo[(button.y - listBox.y)/listBox.h];
 	}
 	else {
 		selection = nullptr;
 	}
-
-	//clear the parameters
-	lua_pop(lua, 1);
 }
 
 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) {
@@ -229,10 +187,10 @@ void LobbyMenu::KeyUp(SDL_KeyboardEvent const& key) {
 void LobbyMenu::HandlePacket(SerialPacket* const argPacket) {
 		switch(argPacket->type) {
 		case SerialPacketType::BROADCAST_RESPONSE:
-			HandleBroadcastResponse(dynamic_cast<ServerPacket*>(argPacket));
+			HandleBroadcastResponse(static_cast<ServerPacket*>(argPacket));
 		break;
 		case SerialPacketType::JOIN_RESPONSE:
-			HandleJoinResponse(dynamic_cast<ClientPacket*>(argPacket));
+			HandleJoinResponse(static_cast<ClientPacket*>(argPacket));
 		break;
 		//handle errors
 		default:
@@ -257,25 +215,42 @@ void LobbyMenu::HandleBroadcastResponse(ServerPacket* const argPacket) {
 }
 
 void LobbyMenu::HandleJoinResponse(ClientPacket* const argPacket) {
-	lua_getglobal(lua, "config");
+	clientIndex = argPacket->clientIndex;
-	lua_getfield(lua, -1, "client");
+	accountIndex = argPacket->accountIndex;
-	lua_getfield(lua, -1, "handle");
-	lua_getfield(lua, -2, "avatar");
-
-	lua_pushinteger(lua, argPacket->clientIndex);
-	lua_pushinteger(lua, argPacket->accountIndex);
-	lua_setfield(lua, -5, "accountIndex");
-	lua_setfield(lua, -4, "clientIndex");
 	network.Bind(&argPacket->srcAddress, Channels::SERVER);
 	SetNextScene(SceneList::INWORLD);
 
 	//send this player's character info
 	CharacterPacket newPacket;
 	newPacket.type = SerialPacketType::CHARACTER_NEW;
-	strncpy(newPacket.handle, lua_tostring(lua, -2), PACKET_STRING_SIZE);
+	strncpy(newPacket.handle, config["client.handle"].c_str(), PACKET_STRING_SIZE);
-	strncpy(newPacket.avatar, lua_tostring(lua, -1), PACKET_STRING_SIZE);
+	strncpy(newPacket.avatar, config["client.avatar"].c_str(), PACKET_STRING_SIZE);
-	newPacket.accountIndex = argPacket->accountIndex;
+	newPacket.accountIndex = accountIndex;
 	network.SendTo(Channels::SERVER, &newPacket);
-
+}
-	lua_pop(lua, 4);
+
+//-------------------------
+//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;
+		strncpy(packet.username, config["client.username"].c_str(), PACKET_STRING_SIZE);
+
+		//join the selected server
+		network.SendTo(&selection->address, &packet);
+		selection = nullptr;
 }

client/scenes/lobby_menu.hpp

@@ -26,29 +26,29 @@
 #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"
 
-//APIs
-#include "lua/lua.hpp"
-
 //STL
 #include <vector>
 
 class LobbyMenu : public BaseScene {
 public:
 	//Public access members
-	LobbyMenu(lua_State*, UDPNetworkUtility&);
+	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);
 
@@ -64,9 +64,15 @@ protected:
 	void HandleBroadcastResponse(ServerPacket* const);
 	void HandleJoinResponse(ClientPacket* const);
 
+	//server control
+	void SendBroadcastRequest();
+	void SendJoinRequest();
+
 	//shared parameters
-	lua_State* lua = nullptr;
+	ConfigUtility& config = ConfigUtility::GetSingleton();
-	UDPNetworkUtility& network;
+	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
+	int& clientIndex;
+	int& accountIndex;
 
 	//members
 	Image image;
@@ -86,9 +92,9 @@ protected:
 
 	std::vector<ServerInformation> serverInfo;
 
-	//a terrible hack, forgive me
+	//NOTE: a terrible hack
-	//TODO: I'd love a proper gui system for this
+	//I'd love a proper gui system for this
-	SDL_Rect listBox;
+	BoundingBox listBox;
 	ServerInformation* selection = nullptr;
 };
 

client/scenes/main_menu.cpp

@@ -21,26 +21,19 @@
 */
 #include "main_menu.hpp"
 
+#include "config_utility.hpp"
+
 //-------------------------
 //Public access members
 //-------------------------
 
-MainMenu::MainMenu(lua_State* L): lua(L) {
+MainMenu::MainMenu() {
-	//get the config info
+	ConfigUtility& config = ConfigUtility::GetSingleton();
-	lua_getglobal(lua, "config");
-	lua_getfield(lua, -1, "dir");
-	lua_getfield(lua, -1, "interface");
-	lua_getfield(lua, -2, "fonts");
-
-	std::string interfaceDir = lua_tostring(lua, -2);
-	std::string fontsDir = lua_tostring(lua, -1);
-
-	lua_pop(lua, 4);
 
 	//setup the utility objects
-	image.LoadSurface(interfaceDir + "button_menu.bmp");
+	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(fontsDir + "pk_white_8.bmp");
+	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
 
 	//pass the utility objects
 	startButton.SetImage(&image);
@@ -79,7 +72,7 @@ void MainMenu::FrameStart() {
 	//
 }
 
-void MainMenu::Update(double delta) {
+void MainMenu::Update() {
 	//
 }
 
@@ -110,14 +103,14 @@ void MainMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 }
 
 void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	//TODO: Buttons should only register as "selected" when the left button is used
 	if (startButton.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::INWORLD);
+		SetNextScene(SceneList::LOBBYMENU);
 	}
 	if (optionsButton.MouseButtonUp(button) == Button::State::HOVER) {
 		SetNextScene(SceneList::OPTIONSMENU);
 	}
-	if (quitButton.MouseButtonUp(button) == Button::State::HOVER &&
+	if (quitButton.MouseButtonUp(button) == Button::State::HOVER) {
-		button.button & SDL_BUTTON_LMASK) {
 		QuitEvent();
 	}
 }

client/scenes/main_menu.hpp

@@ -28,18 +28,16 @@
 #include "raster_font.hpp"
 #include "button.hpp"
 
-#include "lua/lua.hpp"
-
 class MainMenu : public BaseScene {
 public:
 	//Public access members
-	MainMenu(lua_State* L);
+	MainMenu();
 	~MainMenu();
 
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update(double delta);
+	void Update();
 	void FrameEnd();
 	void Render(SDL_Surface* const);
 
@@ -50,9 +48,6 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//shared parameters
-	lua_State* lua = nullptr;
-
 	//members
 	Image image;
 	RasterFont font;

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

@@ -21,26 +21,19 @@
 */
 #include "options_menu.hpp"
 
+#include "config_utility.hpp"
+
 //-------------------------
 //Public access members
 //-------------------------
 
-OptionsMenu::OptionsMenu(lua_State* L): lua(L) {
+OptionsMenu::OptionsMenu() {
-	//get the config info
+	ConfigUtility& config = ConfigUtility::GetSingleton();
-	lua_getglobal(lua, "config");
-	lua_getfield(lua, -1, "dir");
-	lua_getfield(lua, -1, "interface");
-	lua_getfield(lua, -2, "fonts");
-
-	std::string interfaceDir = lua_tostring(lua, -2);
-	std::string fontsDir = lua_tostring(lua, -1);
-
-	lua_pop(lua, 4);
 
 	//setup the utility objects
-	image.LoadSurface(interfaceDir + "button_menu.bmp");
+	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(fontsDir + "pk_white_8.bmp");
+	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
 
 	//pass the utility objects
 	backButton.SetImage(&image);
@@ -66,7 +59,7 @@ void OptionsMenu::FrameStart() {
 	//
 }
 
-void OptionsMenu::Update(double delta) {
+void OptionsMenu::Update() {
 	//
 }
 
@@ -93,14 +86,17 @@ void OptionsMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 }
 
 void OptionsMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (backButton.MouseButtonUp(button) == Button::State::HOVER &&
+	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
-		button.button & SDL_BUTTON_LMASK) {
 		SetNextScene(SceneList::MAINMENU);
 	}
 }
 
 void OptionsMenu::KeyDown(SDL_KeyboardEvent const& key) {
-	//
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+			SetNextScene(SceneList::MAINMENU);
+		break;
+	}
 }
 
 void OptionsMenu::KeyUp(SDL_KeyboardEvent const& key) {

client/scenes/options_menu.hpp

@@ -28,19 +28,17 @@
 #include "raster_font.hpp"
 #include "button.hpp"
 
-#include "lua/lua.hpp"
-
 //TODO: The options screen needs to be USED
 class OptionsMenu : public BaseScene {
 public:
 	//Public access members
-	OptionsMenu(lua_State* L);
+	OptionsMenu();
 	~OptionsMenu();
 
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update(double delta);
+	void Update();
 	void FrameEnd();
 	void Render(SDL_Surface* const);
 
@@ -51,9 +49,6 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//shared parameters
-	lua_State* lua = nullptr;
-
 	//members
 	Image image;
 	RasterFont font;

client/scenes/splash_screen.cpp

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

@@ -26,24 +26,19 @@
 
 #include "image.hpp"
 
-#include "lua/lua.hpp"
-
 #include <chrono>
 
 class SplashScreen : public BaseScene {
 public:
 	//Public access members
-	SplashScreen(lua_State* L);
+	SplashScreen();
 	~SplashScreen();
 
 protected:
 	//Frame loop
-	void Update(double delta);
+	void Update();
 	void Render(SDL_Surface* const);
 
-	//shared parameters
-	lua_State* lua = nullptr;
-
 	//members
 	std::chrono::steady_clock::time_point startTick;
 	Image logo;

common/debugging/makefile

@@ -11,7 +11,7 @@ OBJDIR=obj
 OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
 
 #output
-OUTDIR=..
+OUTDIR=../..
 OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 
 #targets

common/debugging/timer.cpp

@@ -21,9 +21,25 @@
 */
 #include "timer.hpp"
 
+Timer::Timer(): start(Timer::Clock::now()) {
+	//
+}
+
+Timer::Timer(std::string s): name(s), start(Timer::Clock::now()) {
+	//
+}
+
+void Timer::Start() {
+	start = Clock::now();
+}
+
+void Timer::Stop() {
+	timeSpan = Clock::now() - start;
+}
+
 std::ostream& operator<<(std::ostream& os, Timer& t) {
 	os << t.GetName() << ": ";
-	os << std::chrono::duration_cast<std::chrono::nanoseconds>(t.GetTime()).count();
+	os << std::chrono::duration_cast<std::chrono::milliseconds>(t.GetTime()).count();
-	os << "ns";
+	os << "ms";
 	return os;
 }

common/debugging/timer.hpp

@@ -30,15 +30,15 @@ class Timer {
 public:
 	typedef std::chrono::high_resolution_clock Clock;
 
-	Timer() = default;
+	Timer();
-	Timer(std::string s) : name(s), start(Clock::now()) {};
+	Timer(std::string s);
 	~Timer() = default;
 
-	inline void Start() { start = Clock::now(); }
+	inline void Start();
-	inline void Stop() { time = Clock::now() - start; }
+	inline void Stop();
 
 	//accessors and mutators
-	Clock::duration GetTime() { return time; }
+	Clock::duration GetTime() { return timeSpan; }
 
 	std::string SetName(std::string s) { return name = s; }
 	std::string GetName() { return name; }
@@ -46,7 +46,7 @@ public:
 private:
 	std::string name;
 	Clock::time_point start;
-	Clock::duration time;
+	Clock::duration timeSpan;
 };
 
 std::ostream& operator<<(std::ostream& os, Timer& t);

common/gameplay/character_defines.hpp

@@ -25,11 +25,13 @@
 #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);
 
-//the bounding boxes for the characters
+//the bounds for the character objects, mapped to the default sprites
-constexpr double CHARACTER_BOUNDS_WIDTH = 32.0;
+constexpr int CHARACTER_BOUNDS_X = 0;
-constexpr double CHARACTER_BOUNDS_HEIGHT = 32.0;
+constexpr int CHARACTER_BOUNDS_Y = 16;
+constexpr int CHARACTER_BOUNDS_WIDTH = 32;
+constexpr int CHARACTER_BOUNDS_HEIGHT = 32;
 
 #endif

common/graphics/makefile

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

common/map/makefile

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

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
+//utility function
-constexpr int REGION_SOLID_FOOTPRINT = ceil(REGION_WIDTH * REGION_HEIGHT / 8.0);
+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_pager_api.cpp

@@ -24,13 +24,6 @@
 #include "region_pager_lua.hpp"
 #include "region.hpp"
 
-#include <string>
-
-static int getRegionPager(lua_State* L) {
-	lua_pushstring(L, TORTUGA_REGION_PAGER_PSEUDO_INDEX);
-	lua_gettable(L, LUA_REGISTRYINDEX);
-}
-
 //DOCS: These glue functions simply wrap RegionPagerLua's methods
 
 static int setTile(lua_State* L) {
@@ -95,17 +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[] = {
-	{"GetRegionPager", getRegionPager},
+	//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

@@ -24,7 +24,6 @@
 
 #include "lua/lua.hpp"
 
-#define TORTUGA_REGION_PAGER_PSEUDO_INDEX "RegionPagerPseudoIndex"
 #define TORTUGA_REGION_PAGER_NAME "RegionPager"
 LUAMOD_API int openRegionPagerAPI(lua_State* L);
 

common/map/region_pager_base.cpp

@@ -21,8 +21,6 @@
 */
 #include "region_pager_base.hpp"
 
-#include "utility.hpp"
-
 #include <stdexcept>
 #include <algorithm>
 
@@ -73,12 +71,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 +89,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 {
-	regionList.remove_if([x, y](Region& region) -> bool { return region.GetX() == x && region.GetY() == y; });
+		return region.GetX() == x && region.GetY() == y;
+	});
 }
 
 void RegionPagerBase::UnloadAll() {

common/map/region_pager_lua.cpp

@@ -21,47 +21,71 @@
 */
 #include "region_pager_lua.hpp"
 
-#include "utility.hpp"
-
 #include <stdexcept>
 
 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)) {
+	//check the return value, success or failure
-		lua_pop(lua, 2);
+	if (lua_toboolean(lua, -1)) {
+		lua_pop(lua, 1);
+		regionList.push_front(tmpRegion);
+		return &regionList.front();
+	}
+	else {
+		lua_pop(lua, 1);
 		return nullptr;
 	}
-	lua_pop(lua, 2);
-	regionList.push_front(tmpRegion);
-	return &regionList.front();
 }
 
 Region* RegionPagerLua::SaveRegion(int x, int y) {
-	//find & save the region
+	//get the pager's function from the registry
-	Region* ptr = FindRegion(x, y);
+	lua_rawgeti(lua, LUA_REGISTRYINDEX, saveRef);
-	if (ptr) {
+
-		//API hook
+	//check if this function is available
-		lua_getglobal(lua, "Region");
+	if (lua_isnil(lua, -1)) {
-		lua_getfield(lua, -1, "Save");
-		lua_pushlightuserdata(lua, ptr);
-		if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
-			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
-		}
 		lua_pop(lua, 1);
+		return nullptr;
+	}
+
+	//find the specified region
+	Region* ptr = FindRegion(x, y);
+	if (!ptr) {
+		lua_pop(lua, 1);
+		return nullptr;
+	}
+	lua_pushlightuserdata(lua, ptr);
+
+	//call the function, 1 arg, 1 return
+	if (lua_pcall(lua, 1, 1, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+	}
+
+	//check the return value, success or failure
+	if (lua_toboolean(lua, -1)) {
+		lua_pop(lua, 1);
+		return ptr;
+	}
+	else {
+		lua_pop(lua, 1);
+		return nullptr;
 	}
-	return ptr;
 }
 
 Region* RegionPagerLua::CreateRegion(int x, int y) {
@@ -69,55 +93,87 @@ Region* RegionPagerLua::CreateRegion(int x, int 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();
 }
 
 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
+			//push a copy of the function onto the stack with the region
-			lua_getfield(lua, -1, "Unload");
+			lua_pushvalue(lua, -1);
 			lua_pushlightuserdata(lua, &region);
+
+			//call the function, 1 arg, 0 return
 			if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
 				throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
 			}
 
+			//signal to the container
 			return true;
 		}
+		//signal to the container
 		return false;
 	});
 
+	//pop the base copy of the function
 	lua_pop(lua, 1);
 }
 
 void RegionPagerLua::UnloadAll() {
-	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
+		//push a copy of the function onto the stack with the region
-		lua_getfield(lua, -1, "Unload");
+		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

@@ -44,8 +44,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.cpp

@@ -23,12 +23,6 @@
 
 #include "tile_sheet.hpp"
 
-static int getTileSheet(lua_State* L) {
-	lua_pushstring(L, TORTUGA_TILE_SHEET_PSEUDO_INDEX);
-	lua_gettable(L, LUA_REGISTRYINDEX);
-	return 1;
-}
-
 static int load(lua_State* L) {
 	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
 	sheet->Load(lua_tostring(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4));
@@ -66,7 +60,6 @@ static int getTileH(lua_State* L) {
 }
 
 static const luaL_Reg tileSheetLib[] = {
-	{"GetTileSheet",getTileSheet},
 	{"Load",load},
 	{"Unload",unload},
 	{"GetXCount",getXCount},

common/map/tile_sheet_api.hpp

@@ -24,7 +24,6 @@
 
 #include "lua/lua.hpp"
 
-#define TORTUGA_TILE_SHEET_PSEUDO_INDEX "TileSheetPseudoIndex"
 #define TORTUGA_TILE_SHEET_NAME "TileSheet"
 LUAMOD_API int openTileSheetAPI(lua_State* L);
 

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 packet_types
-	$(MAKE) -C serial
 
 $(OBJ): | $(OBJDIR)
 

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,74 @@
+/* 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"
+
+#include "serial_statistics.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));
+
+	//stats structure
+	serializeStatistics(&buffer, &packet->stats);
+
+	//TODO: 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));
+
+	//stats structure
+	deserializeStatistics(&buffer, &packet->stats);
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs
+}

common/network/packet_types/character_packet.hpp

@@ -47,4 +47,7 @@ struct CharacterPacket : SerialPacketBase {
 	//TODO: 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,36 +19,22 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "enemy_manager.hpp"
+#include "client_packet.hpp"
 
-//-------------------------
+#include "serial_utility.hpp"
-//public access methods
-//-------------------------
 
-//TODO
+void serializeClient(void* buffer, ClientPacket* packet) {
+	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
 
-//-------------------------
+	serialCopy(&buffer, &packet->clientIndex, sizeof(int));
-//accessors and mutators
+	serialCopy(&buffer, &packet->accountIndex, sizeof(int));
-//-------------------------
+	serialCopy(&buffer, packet->username, PACKET_STRING_SIZE);
-
-EnemyData* EnemyManager::GetEnemy(int uid) {
-	std::map<int, EnemyData>::iterator it = enemyMap.find(uid);
-
-	if (it == enemyMap.end()) {
-		return nullptr;
-	}
-
-	return &it->second;
 }
 
-std::map<int, EnemyData>* EnemyManager::GetContainer() {
+void deserializeClient(void* buffer, ClientPacket* packet) {
-	return &enemyMap;
+	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
-}
 
-lua_State* EnemyManager::SetLuaState(lua_State* L) {
+	deserialCopy(&buffer, &packet->clientIndex, sizeof(int));
-	return luaState = L;
+	deserialCopy(&buffer, &packet->accountIndex, sizeof(int));
-}
+	deserialCopy(&buffer, packet->username, PACKET_STRING_SIZE);
-
-lua_State* EnemyManager::GetLuaState() {
-	return luaState;
 }

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,28 +19,30 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef COMBATPACKET_HPP_
+#ifndef REGIONPACKET_HPP_
-#define COMBATPACKET_HPP_
+#define REGIONPACKET_HPP_
 
 #include "serial_packet_base.hpp"
 
-#include "combat_defines.hpp"
+#include "region.hpp"
 
-struct CombatPacket : SerialPacketBase {
+#include <cmath>
-	//identify the combat instance
-	int combatIndex;
-	int difficulty;
-	TerrainType terrainType;
 
-	//combatants
+//define the memory footprint for the region's members
-	int characterArray[COMBAT_MAX_CHARACTERS];
+constexpr int REGION_TILE_FOOTPRINT = sizeof(Region::type_t) * REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH;
-	int enemyArray[COMBAT_MAX_ENEMIES];
+constexpr int REGION_SOLID_FOOTPRINT = ceil(REGION_WIDTH * REGION_HEIGHT / 8.0);
+constexpr int REGION_METADATA_FOOTPRINT = sizeof(int) * 3;
 
-	//location
+struct RegionPacket : SerialPacketBase {
-	int mapIndex;
+	//location/identify the region
-	Vector2 origin;
+	int roomIndex;
+	int x, y;
 
-	//TODO: gameplay components: rewards
+	//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

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,20 +19,6 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGIONPACKET_HPP_
-#define REGIONPACKET_HPP_
-
 #include "serial_packet_base.hpp"
 
-#include "region.hpp"
+//sanity check
-
-struct RegionPacket : SerialPacketBase {
-	//location/identify the region
-	int roomIndex;
-	int x, y;
-
-	//the data
-	Region* region;
-};
-
-#endif

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/serial_statistics.cpp

@@ -0,0 +1,64 @@
+/* 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_statistics.hpp"
+
+#include "serial_utility.hpp"
+
+void serializeStatistics(void** buffer, Statistics* stats) {
+	//integers
+	serialCopy(buffer, &stats->level, sizeof(int));
+	serialCopy(buffer, &stats->exp, sizeof(int));
+	serialCopy(buffer, &stats->maxHP, sizeof(int));
+	serialCopy(buffer, &stats->health, sizeof(int));
+	serialCopy(buffer, &stats->maxMP, sizeof(int));
+	serialCopy(buffer, &stats->mana, sizeof(int));
+	serialCopy(buffer, &stats->attack, sizeof(int));
+	serialCopy(buffer, &stats->defence, sizeof(int));
+	serialCopy(buffer, &stats->intelligence, sizeof(int));
+	serialCopy(buffer, &stats->resistance, sizeof(int));
+	serialCopy(buffer, &stats->speed, sizeof(int));
+
+	//floats
+	serialCopy(buffer, &stats->accuracy, sizeof(float));
+	serialCopy(buffer, &stats->evasion, sizeof(float));
+	serialCopy(buffer, &stats->luck, sizeof(float));
+}
+
+void deserializeStatistics(void** buffer, Statistics* stats) {
+	//integers
+	deserialCopy(buffer, &stats->level, sizeof(int));
+	deserialCopy(buffer, &stats->exp, sizeof(int));
+	deserialCopy(buffer, &stats->maxHP, sizeof(int));
+	deserialCopy(buffer, &stats->health, sizeof(int));
+	deserialCopy(buffer, &stats->maxMP, sizeof(int));
+	deserialCopy(buffer, &stats->mana, sizeof(int));
+	deserialCopy(buffer, &stats->attack, sizeof(int));
+	deserialCopy(buffer, &stats->defence, sizeof(int));
+	deserialCopy(buffer, &stats->intelligence, sizeof(int));
+	deserialCopy(buffer, &stats->resistance, sizeof(int));
+	deserialCopy(buffer, &stats->speed, sizeof(int));
+
+	//floats
+	deserialCopy(buffer, &stats->accuracy, sizeof(float));
+	deserialCopy(buffer, &stats->evasion, sizeof(float));
+	deserialCopy(buffer, &stats->luck, sizeof(float));
+}

common/network/packet_types/serial_statistics.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,10 +19,12 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "serial_packet.hpp"
+#ifndef SERIALSTATISTICS_HPP_
+#define SERIALSTATISTICS_HPP_
 
-/* DOCS: Sanity check, read more
+#include "statistics.hpp"
- * 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
+void serializeStatistics(void** buffer, Statistics* stats);
- * are written correctly via make.
+void deserializeStatistics(void** buffer, Statistics* stats);
-*/
+
+#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) {
+void serializeServer(void* buffer, ServerPacket* packet) {
-	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
 
 	//identify the server
-	SERIALIZE(buffer, &packet->name, PACKET_STRING_SIZE);
+	serialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
-	SERIALIZE(buffer, &packet->playerCount, sizeof(int));
+	serialCopy(&buffer, &packet->playerCount, sizeof(int));
-	SERIALIZE(buffer, &packet->version, sizeof(int));
+	serialCopy(&buffer, &packet->version, sizeof(int));
 }
 
-void deserializeServer(ServerPacket* packet, void* buffer) {
+void deserializeServer(void* buffer, ServerPacket* packet) {
-	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
 
 	//identify the server
-	DESERIALIZE(buffer, &packet->name, PACKET_STRING_SIZE);
+	deserialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
-	DESERIALIZE(buffer, &packet->playerCount, sizeof(int));
+	deserialCopy(&buffer, &packet->playerCount, sizeof(int));
-	DESERIALIZE(buffer, &packet->version, 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/serial/makefile

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

common/network/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,41 @@
 #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"
 
-//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 = 20140831;
 
 union MaxPacket {
 	CharacterPacket a;
 	ClientPacket b;
-	CombatPacket c;
+	RegionPacket c;
-	EnemyPacket d;
+	ServerPacket d;
-	RegionPacket e;
-	ServerPacket f;
 };
+
 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,98 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef SERIALPACKETTYPE_HPP_
+#define SERIALPACKETTYPE_HPP_
+
+/* DOCS: The headers indicate what packet type is used for each message
+ * different messages under the same header will carry different amounts of
+ * valid data, but it will still be carried in that packet's format.
+*/
+
+enum class SerialPacketType {
+	//default: there is something wrong
+	NONE = 0,
+
+	//-------------------------
+	//ServerPacket
+	//  name, player count, version
+	//-------------------------
+
+	//heartbeat
+	PING,
+	PONG,
+
+	//Used for finding available servers
+	BROADCAST_REQUEST,
+	BROADCAST_RESPONSE,
+
+	//-------------------------
+	//ClientPacket
+	//  client index, account index, character index
+	//-------------------------
+
+	//Connecting to a server as a client
+	JOIN_REQUEST,
+	JOIN_RESPONSE,
+	JOIN_REJECTION,
+
+	//client requests all information from the server
+	SYNCHRONIZE,
+
+	//disconnect from the server
+	DISCONNECT,
+
+	//shut down the server
+	SHUTDOWN,
+
+	//-------------------------
+	//RegionPacket
+	//  room index, x, y, raw data
+	//-------------------------
+
+	//map data
+	REGION_REQUEST,
+	REGION_CONTENT,
+
+	//-------------------------
+	//CharacterPacket
+	//  handle, avatar, character index, account index,
+	//  room index, origin, motion
+	//  statistics
+	//-------------------------
+
+	//controlling characters
+	CHARACTER_NEW,
+	CHARACTER_DELETE,
+	CHARACTER_UPDATE,
+
+	//authentication, character index => character stats
+	CHARACTER_STATS_REQUEST,
+	CHARACTER_STATS_RESPONSE,
+
+	//reject a character request
+	CHARACTER_REJECTION,
+
+	//not used
+	LAST
+};
+
+#endif

common/network/serial_utility.cpp

@@ -0,0 +1,108 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "serial_utility.hpp"
+
+//packet types
+#include "character_packet.hpp"
+#include "client_packet.hpp"
+#include "region_packet.hpp"
+#include "server_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;
+}
+
+//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::JOIN_REJECTION:
+		case SerialPacketType::SYNCHRONIZE:
+		case SerialPacketType::DISCONNECT:
+		case SerialPacketType::SHUTDOWN:
+			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_NEW:
+		case SerialPacketType::CHARACTER_DELETE:
+		case SerialPacketType::CHARACTER_UPDATE:
+		case SerialPacketType::CHARACTER_STATS_REQUEST:
+		case SerialPacketType::CHARACTER_STATS_RESPONSE:
+		case SerialPacketType::CHARACTER_REJECTION:
+			serializeCharacter(buffer, static_cast<CharacterPacket*>(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(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::JOIN_REJECTION:
+		case SerialPacketType::SYNCHRONIZE:
+		case SerialPacketType::DISCONNECT:
+		case SerialPacketType::SHUTDOWN:
+			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_NEW:
+		case SerialPacketType::CHARACTER_DELETE:
+		case SerialPacketType::CHARACTER_UPDATE:
+		case SerialPacketType::CHARACTER_STATS_REQUEST:
+		case SerialPacketType::CHARACTER_STATS_RESPONSE:
+		case SerialPacketType::CHARACTER_REJECTION:
+			deserializeCharacter(buffer, static_cast<CharacterPacket*>(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_
+#ifndef SERIALIZEUTILITY_HPP_
-#define SERIALIZEUTIL_HPP_
+#define SERIALIZEUTILITY_HPP_
+
+#include "serial_packet_base.hpp"
 
 #include <cstring>
 
-//NOTE: The strange assignments here used in order to move the void* parameter
+//raw memory copy
-#define SERIALIZE(buffer, data, size) memcpy(buffer, data, size); buffer = reinterpret_cast<char*>(buffer) + size;
+void serialCopy(void** buffer, void* data, int size);
-#define DESERIALIZE(buffer, data, size) memcpy(data, buffer, size); buffer = reinterpret_cast<char*>(buffer) + 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: don't confuse SerialPacketBase with UDPpacket
 
 void UDPNetworkUtility::Open(int port) {
 	socket = SDLNet_UDP_Open(port);
@@ -152,10 +153,10 @@ 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"));
@@ -164,9 +165,9 @@ int UDPNetworkUtility::SendTo(const char* ip, int port, SerialPacket* serialPack
 	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;
 
@@ -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,15 +22,15 @@
 #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 : public Singleton<UDPNetworkUtility> {
-
-class UDPNetworkUtility {
 public:
-	UDPNetworkUtility() = default;
-	~UDPNetworkUtility() = default;
-
 	void Open(int port);
 	void Close();
 
@@ -50,12 +50,12 @@ public:
 	int SendToAllChannels(void* data, int len);
 	int Receive();
 
-	//send a SerialPacket
+	//send a SerialPacketBase
-	int SendTo(const char* ip, int port, SerialPacket* serialPacket);
+	int SendTo(const char* ip, int port, SerialPacketBase* serialPacket);
-	int SendTo(IPaddress* add, SerialPacket* serialPacket);
+	int SendTo(IPaddress* add, SerialPacketBase* serialPacket);
-	int SendTo(int channel, SerialPacket* serialPacket);
+	int SendTo(int channel, SerialPacketBase* serialPacket);
-	int SendToAllChannels(SerialPacket* serialPacket);
+	int SendToAllChannels(SerialPacketBase* serialPacket);
-	int Receive(SerialPacket* 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

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

common/utilities/config_utility.hpp

@@ -19,21 +19,40 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ENEMYPACKET_HPP_
+#ifndef CONFIGUTILITY_HPP_
-#define ENEMYPACKET_HPP_
+#define CONFIGUTILITY_HPP_
 
-#include "serial_packet_base.hpp"
+#include "singleton.hpp"
 
-struct EnemyPacket : SerialPacketBase {
+#include <map>
-	//identify the enemy
+#include <string>
-	int enemyIndex;
-	char handle[PACKET_STRING_SIZE];
-	char avatar[PACKET_STRING_SIZE];
 
-	//gameplay
+class ConfigUtility : public Singleton<ConfigUtility> {
-	Statistics stats;
+public:
+	void Load(std::string fname);
 
-	//TODO: gameplay components: equipment, items, buffs, debuffs, rewards
+	//convert to a type
+	std::string& String(std::string);
+	int Integer(std::string);
+	double Double(std::string);
+	bool Boolean(std::string);
+
+	//shorthand
+	inline std::string& operator[](std::string s) { return configMap[s]; }
+	inline int Int(std::string s) { return Integer(s); }
+	inline bool Bool(std::string s) { return Boolean(s); }
+
+private:
+	typedef std::map<std::string, std::string> table_t;
+
+	friend Singleton<ConfigUtility>;
+
+	ConfigUtility() = default;
+	~ConfigUtility() = default;
+
+	table_t Read(std::string fname);
+
+	table_t configMap;
 };
 
 #endif

common/utilities/singleton.hpp

@@ -19,33 +19,45 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ENEMYMANAGER_HPP_
+#ifndef SINGLETON_HPP_
-#define ENEMYMANAGER_HPP_
+#define SINGLETON_HPP_
 
-#include "enemy_data.hpp"
+#include <stdexcept>
 
-#include "lua/lua.hpp"
+template<typename T>
-
+class Singleton {
-#include <map>
-
-class EnemyManager {
 public:
-	EnemyManager() = default;
+	static T& GetSingleton() {
-	~EnemyManager() = default;
+		if (!ptr) {
+			throw(std::logic_error("This singleton has not been created"));
+		}
+		return *ptr;
+	}
+	static void Create() {
+		if (ptr) {
+			throw(std::logic_error("This singleton has already been created"));
+		}
+		ptr = new T();
+	}
+	static void Delete() {
+		if (!ptr) {
+			throw(std::logic_error("A non-existant singleton cannot be deleted"));
+		}
+		delete ptr;
+		ptr = nullptr;
+	}
 
-	//public access methods
+protected:
-	//TODO
+	Singleton() = default;
-
+	Singleton(Singleton const&) = default;
-	//accessors and mutators
+	Singleton(Singleton&&) = default;
-	EnemyData* GetEnemy(int uid);
+	~Singleton() = default;
-	std::map<int, EnemyData>* GetContainer();
-
-	lua_State* SetLuaState(lua_State*);
-	lua_State* GetLuaState();
 
 private:
-	std::map<int, EnemyData> enemyMap;
+	static T* ptr;
-	lua_State* luaState = nullptr;
 };
 
+template<typename T>
+T* Singleton<T>::ptr = nullptr;
+
 #endif

common/utilities/utility.cpp

@@ -23,19 +23,6 @@
 
 #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(

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)
@@ -15,6 +10,17 @@ all: $(OUTDIR)
 	$(MAKE) -C server
 	$(MAKE) -C client
 
+debug: export CXXFLAGS+=-g
+debug: clean all
+
+release: export CXXFLAGS+=-static-libgcc -static-libstdc++
+release: clean all 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
+
 $(OUTDIR):
 	mkdir $(OUTDIR)
 

rsc/config.cfg

@@ -0,0 +1,31 @@
+#configuration of the programs
+
+#server specific settings
+server.host = 255.255.255.255
+server.port = 21795
+server.name = local
+
+server.dbname = database.db
+
+#client specific settings
+#client.screen.w = 800
+#client.screen.h = 600
+client.screen.f = false
+
+client.username = Kayne Ruse
+client.handle = Ratstail91
+client.avatar = elliot2.bmp
+
+#directories
+dir.fonts = rsc/graphics/fonts/
+dir.logos = rsc/graphics/logos/
+dir.sprites = rsc/graphics/sprites/
+dir.tilesets = rsc/graphics/tilesets/
+dir.interface = rsc/graphics/interface/
+dir.scripts = rsc/scripts/
+dir.maps = rsc/maps/
+
+#map system
+map.savename = servermap
+
+#debugging

rsc/scripts/setup_server.lua

@@ -4,15 +4,7 @@ print("Lua script check")
 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
 
---objects to work on
+--tile macros, mapped to the tilesheet
---TODO: sheet is not accessable in the server
-local sheet = TileSheet.GetTileSheet()
-local pager = RegionPager.GetRegionPager()
-
---the selected tilesheet
-TileSheet.Load(sheet, config.dir.tilesets .. "terrain.bmp", 32, 32)
-
---tile macros, mapped to this tilesheet
 local base = 14
 local shift = 36
 tiles = {
@@ -23,12 +15,11 @@ tiles = {
 	water	= base + shift * 4
 }
 
---TODO: could set custom generation systems here, that differ from the global generators, etc.
+--custom generation systems here
---TODO: I need a way to allow for different generation algorithms for different pager objects
+function islandGenerator(region)
---TODO: This design requires only one pager, but this is not good.
+	io.write("Generating (", Region.GetX(region), ", ", Region.GetY(region), ")\n")
-function Region.Create(region)
+	for i = 1, Region.GetWidth(region) do
-	for i = 1, Region.GetWidth() do
+		for j = 1, Region.GetHeight(region) 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)
@@ -42,4 +33,20 @@ function Region.Create(region)
 	end
 end
 
+--Get some regions
+--BUG: The server fails without at least one room
+--TODO: Create rooms with names?
+newRoom = RoomManager.CreateRoom()
+pager = Room.GetPager(newRoom)
+RegionPager.SetOnCreate(pager, islandGenerator)
+
+--[[
+regionTable = {
+	RegionPager.GetRegion(pager, Region.GetWidth() * 0, Region.GetHeight() * 0),
+	RegionPager.GetRegion(pager, Region.GetWidth() *-1, Region.GetHeight() * 0),
+	RegionPager.GetRegion(pager, Region.GetWidth() * 0, Region.GetHeight() *-1),
+	RegionPager.GetRegion(pager, Region.GetWidth() *-1, Region.GetHeight() *-1)
+}
+]]
+
 print("Finished the lua script")

rsc/setup.lua

@@ -1,60 +0,0 @@
---[[
-	--reroute the program while in development
-	config = {debug = true}
-	dofile("../rsc/setup.lua")
---]]
-
---catch the debug signal if the program was rerouted
-local debug = false
-if config ~= nil then
-	debug = config.debug
-end
-
---the program's configuration
-config = {
-	--common stuff
-	debug = debug,
-	dir = {
-		fonts = "rsc/graphics/fonts/",
-		logos = "rsc/graphics/logos/",
-		sprites = "rsc/graphics/sprites/",
-		tilesets = "rsc/graphics/tilesets/",
-		interface = "rsc/graphics/interface/",
-		scripts = "rsc/scripts/",
-		maps = "rsc/maps/"
-	},
-
-	--client specific stuff
-	client = {
-		screen = {
-			width = 800,
-			height = 600,
-			fullscreen = false
-		},
-		username = "Kayne",
-		handle = "Ratstail91",
-		avatar = "elliot2.bmp",
-
-		--NOTE: these generally go here
---		clientIndex
---		accountIndex
---		characterIndex
-	},
-
-	--server specific stuff
-	server = {
-		mapname = "mapsave",
-		host = "255.255.255.255",
-		port = 21795,
-		name = "local",
-		dbname = "database.db"
-	}
-}
-
---development environment
-if config.debug then
-	for k, v in pairs(config.dir) do
-		config.dir[k] = string.format("../%s", v)
-	end
-end
-

server/accounts/account_data.hpp

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

server/accounts/account_manager.hpp

@@ -23,16 +23,14 @@
 #define ACCOUNTMANAGER_HPP_
 
 #include "account_data.hpp"
+#include "singleton.hpp"
 
 #include "sqlite3/sqlite3.h"
 
 #include <map>
 
-class AccountManager {
+class AccountManager : public Singleton<AccountManager> {
 public:
-	AccountManager() = default;
-	~AccountManager() { UnloadAll(); };
-
 	//public access methods
 	int CreateAccount(std::string username, int clientIndex);
 	int LoadAccount(std::string username, int clientIndex);
@@ -50,6 +48,11 @@ public:
 	sqlite3* GetDatabase();
 
 private:
+	friend Singleton<AccountManager>;
+
+	AccountManager() = default;
+	~AccountManager() = default;
+
 	std::map<int, AccountData> accountMap;
 	sqlite3* database = nullptr;
 };

server/accounts/makefile

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

server/characters/character_data.hpp

@@ -31,27 +31,41 @@
 #include <string>
 #include <cmath>
 
-struct CharacterData {
+class CharacterData {
-	//metadata
+public:
-	int owner;
+	CharacterData() = default;
-	std::string handle;
+	~CharacterData() = default;
-	std::string avatar;
+
+	//location and movement
+	int SetRoomIndex(int i) { return roomIndex = i; }
+	Vector2 SetOrigin(Vector2 v) { return origin = v; }
+	Vector2 SetMotion(Vector2 v) { return motion = v; }
+
+	int GetRoomIndex() { return roomIndex; }
+	Vector2 GetOrigin() { return origin; }
+	Vector2 GetMotion() { return motion; }
+
+	//accessors and mutators
+	Statistics* GetBaseStats() { return &baseStats; }
+
+	//database stuff
+	int GetOwner() { return owner; }
+	std::string GetHandle() { return handle; }
+	std::string GetAvatar() { return avatar; }
+
+private:
+	friend class CharacterManager;
 
 	//world position
 	int roomIndex = 0;
 	Vector2 origin = {0.0,0.0};
 	Vector2 motion = {0.0,0.0};
 
-	//base statistics
+	Statistics baseStats;
-	Statistics stats;
 
-	//TODO: gameplay components: equipment, items, buffs, debuffs
+	int owner;
-
+	std::string handle;
-	//active gameplay members
+	std::string avatar;
-	//NOTE: these are lost when unloaded
-	bool inCombat = false;
-	int atbGauge = 0;
-	//TODO: stored command
 };
 
 #endif

server/characters/character_manager.cpp

@@ -58,7 +58,7 @@ static const char* DELETE_CHARACTER = "DELETE FROM Characters WHERE uid = ?;";
 //Define the methods
 //-------------------------
 
-//NOTE: default stats as a parameter would be good for different beggining states or multiple classes
+//NOTE: default baseStats as a parameter would be good for different beggining states or multiple classes
 int CharacterManager::CreateCharacter(int owner, std::string handle, std::string avatar) {
 	//Create the character, failing if it exists
 	sqlite3_stmt* statement = nullptr;
@@ -142,20 +142,20 @@ int CharacterManager::LoadCharacter(int owner, std::string handle, std::string a
 		newChar.origin.y = (double)sqlite3_column_int(statement, 7);
 
 		//statistics
-		newChar.stats.level = sqlite3_column_int(statement, 8);
+		newChar.baseStats.level = sqlite3_column_int(statement, 8);
-		newChar.stats.exp = sqlite3_column_int(statement, 9);
+		newChar.baseStats.exp = sqlite3_column_int(statement, 9);
-		newChar.stats.maxHP = sqlite3_column_int(statement, 10);
+		newChar.baseStats.maxHP = sqlite3_column_int(statement, 10);
-		newChar.stats.health = sqlite3_column_int(statement, 11);
+		newChar.baseStats.health = sqlite3_column_int(statement, 11);
-		newChar.stats.maxMP = sqlite3_column_int(statement, 12);
+		newChar.baseStats.maxMP = sqlite3_column_int(statement, 12);
-		newChar.stats.mana = sqlite3_column_int(statement, 13);
+		newChar.baseStats.mana = sqlite3_column_int(statement, 13);
-		newChar.stats.attack = sqlite3_column_int(statement, 14);
+		newChar.baseStats.attack = sqlite3_column_int(statement, 14);
-		newChar.stats.defence = sqlite3_column_int(statement, 15);
+		newChar.baseStats.defence = sqlite3_column_int(statement, 15);
-		newChar.stats.intelligence = sqlite3_column_int(statement, 16);
+		newChar.baseStats.intelligence = sqlite3_column_int(statement, 16);
-		newChar.stats.resistance = sqlite3_column_int(statement, 17);
+		newChar.baseStats.resistance = sqlite3_column_int(statement, 17);
-		newChar.stats.speed = sqlite3_column_int(statement, 18);
+		newChar.baseStats.speed = sqlite3_column_int(statement, 18);
-		newChar.stats.accuracy = sqlite3_column_double(statement, 19);
+		newChar.baseStats.accuracy = sqlite3_column_double(statement, 19);
-		newChar.stats.evasion = sqlite3_column_double(statement, 20);
+		newChar.baseStats.evasion = sqlite3_column_double(statement, 20);
-		newChar.stats.luck = sqlite3_column_double(statement, 21);
+		newChar.baseStats.luck = sqlite3_column_double(statement, 21);
 
 		//TODO: gameplay components: equipment, items, buffs, debuffs
 
@@ -199,20 +199,20 @@ int CharacterManager::SaveCharacter(int uid) {
 	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, 5, character.baseStats.level) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 6, character.stats.exp) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 6, character.baseStats.exp) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 7, character.stats.maxHP) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 7, character.baseStats.maxHP) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 8, character.stats.health) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 8, character.baseStats.health) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 9, character.stats.maxMP) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 9, character.baseStats.maxMP) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 10, character.stats.mana) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 10, character.baseStats.mana) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 11, character.stats.attack) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 11, character.baseStats.attack) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 12, character.stats.defence) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 12, character.baseStats.defence) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 13, character.stats.intelligence) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 13, character.baseStats.intelligence) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 14, character.stats.resistance) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 14, character.baseStats.resistance) != SQLITE_OK;
-	ret |= sqlite3_bind_int(statement, 15, character.stats.speed) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 15, character.baseStats.speed) != SQLITE_OK;
-	ret |= sqlite3_bind_double(statement, 16, character.stats.accuracy) != SQLITE_OK;
+	ret |= sqlite3_bind_double(statement, 16, character.baseStats.accuracy) != SQLITE_OK;
-	ret |= sqlite3_bind_double(statement, 17, character.stats.evasion) != SQLITE_OK;
+	ret |= sqlite3_bind_double(statement, 17, character.baseStats.evasion) != SQLITE_OK;
-	ret |= sqlite3_bind_double(statement, 18, character.stats.luck) != SQLITE_OK;
+	ret |= sqlite3_bind_double(statement, 18, character.baseStats.luck) != SQLITE_OK;
 
 	//TODO: gameplay components: equipment, items, buffs, debuffs
 

server/characters/character_manager.hpp

@@ -23,17 +23,15 @@
 #define CHARACTERMANAGER_HPP_
 
 #include "character_data.hpp"
+#include "singleton.hpp"
 
 #include "sqlite3/sqlite3.h"
 
 #include <map>
 #include <functional>
 
-class CharacterManager {
+class CharacterManager : public Singleton<CharacterManager> {
 public:
-	CharacterManager() = default;
-	~CharacterManager() { UnloadAll(); };
-
 	//public access methods
 	int CreateCharacter(int owner, std::string handle, std::string avatar);
 	int LoadCharacter(int owner, std::string handle, std::string avatar);
@@ -53,6 +51,11 @@ public:
 	sqlite3* GetDatabase();
 
 private:
+	friend Singleton<CharacterManager>;
+
+	CharacterManager() = default;
+	~CharacterManager() = default;
+
 	std::map<int, CharacterData> characterMap;
 	sqlite3* database = nullptr;
 };

server/combat/combat_data.hpp

@@ -1,52 +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 COMBATDATA_HPP_
-#define COMBATDATA_HPP_
-
-#include "vector2.hpp"
-#include "combat_defines.hpp"
-
-//gameplay members
-#include "character_data.hpp"
-#include "enemy_data.hpp"
-
-//std namespace
-#include <chrono>
-#include <array>
-#include <utility>
-
-struct CombatData {
-	typedef std::chrono::steady_clock Clock;
-
-	std::array<CharacterData, COMBAT_MAX_CHARACTERS> characterArray;
-	std::array<EnemyData, COMBAT_MAX_ENEMIES> enemyArray;
-
-	//world interaction
-	int mapIndex = 0;
-	Vector2 origin = {0.0,0.0};
-	Vector2 bounds = {0.0,0.0};
-
-	//time interval
-	Clock::time_point lastTick = Clock::now();
-};
-
-#endif

server/combat/combat_manager.cpp

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

server/combat/combat_manager.hpp

@@ -1,51 +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 COMBATMANAGER_HPP_
-#define COMBATMANAGER_HPP_
-
-#include "combat_data.hpp"
-
-#include "lua/lua.hpp"
-
-#include <map>
-
-class CombatManager {
-public:
-	CombatManager() = default;
-	~CombatManager() = default;
-
-	//public access methods
-	//TODO
-
-	//accessors and mutators
-	CombatData* GetCombat(int uid);
-	std::map<int, CombatData>* GetContainer();
-
-	lua_State* SetLuaState(lua_State*);
-	lua_State* GetLuaState();
-
-private:
-	std::map<int, CombatData> combatMap;
-	lua_State* luaState = nullptr;
-};
-
-#endif

server/combat/makefile

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

server/enemies/enemy_data.hpp

@@ -1,47 +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 ENEMYDATA_HPP_
-#define ENEMYDATA_HPP_
-
-#include "vector2.hpp"
-#include "statistics.hpp"
-
-//std namespace
-#include <string>
-
-struct EnemyData {
-	//metadata
-	std::string handle;
-	std::string avatar;
-
-	//gameplay
-	Statistics stats;
-
-	//TODO: gameplay components: equipment, items, buffs, debuffs, rewards
-
-	//active gameplay members
-	//NOTE: these are lost when unloaded
-	int tableIndex;
-	int atbGauge = 0;
-};
-
-#endif

server/enemies/makefile

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

server/linit.cpp

@@ -38,8 +38,9 @@
 
 #include "region_api.hpp"
 #include "region_pager_api.hpp"
+#include "tile_sheet_api.hpp"
 #include "room_api.hpp"
-#include "room_mgr_api.hpp"
+#include "room_manager_api.hpp"
 
 //these libs are loaded by lua.c and are readily available to any Lua program
 static const luaL_Reg loadedlibs[] = {
@@ -58,8 +59,9 @@ static const luaL_Reg loadedlibs[] = {
 	//Tortuga's API
 	{TORTUGA_REGION_NAME, openRegionAPI},
 	{TORTUGA_REGION_PAGER_NAME, openRegionPagerAPI},
+	{TORTUGA_TILE_SHEET_NAME, openTileSheetAPI},
 	{TORTUGA_ROOM_NAME, openRoomAPI},
-	{TORTUGA_ROOM_MGR_NAME, openRoomMgrAPI},
+	{TORTUGA_ROOM_MANAGER_NAME, openRoomManagerAPI},
 
 	{NULL, NULL}
 };

server/main.cpp

@@ -21,6 +21,10 @@
 */
 #include "server_application.hpp"
 
+//singletons
+#include "config_utility.hpp"
+#include "udp_network_utility.hpp"
+
 #include <stdexcept>
 #include <iostream>
 
@@ -28,10 +32,29 @@ using namespace std;
 
 int main(int argc, char** argv) {
 	try {
-		ServerApplication app;
+		//create the singletons
+		AccountManager::Create();
+		CharacterManager::Create();
+		ConfigUtility::Create();
+		RoomManager::Create();
+		UDPNetworkUtility::Create();
+
+		//call the server's routines
+		ServerApplication::Create();
+		ServerApplication& app = ServerApplication::GetSingleton();
+
 		app.Init(argc, argv);
 		app.Proc();
 		app.Quit();
+
+		ServerApplication::Delete();
+
+		//delete the singletons
+		AccountManager::Delete();
+		CharacterManager::Delete();
+		ConfigUtility::Delete();
+		RoomManager::Delete();
+		UDPNetworkUtility::Delete();
 	}
 	catch(exception& e) {
 		cerr << "Fatal exception thrown: " << e.what() << endl;

server/makefile

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

server/rooms/makefile

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

server/rooms/room_api.cpp

@@ -25,26 +25,25 @@
 
 static int getPager(lua_State* L) {
 	RoomData* room = reinterpret_cast<RoomData*>(lua_touserdata(L, 1));
-	lua_pushlightuserdata(L, reinterpret_cast<void*>(&room->pager));
+	lua_pushlightuserdata(L, reinterpret_cast<void*>(room->GetPager()) );
 	return 1;
 }
 
-static int onCreate(lua_State* L) {
+static int create(lua_State* L) {
-	//TODO: onCreate()
+	//EMPTY
+	//NOTE: This can be used to set defaults for the pager
 	return 0;
 }
 
-static int onUnload(lua_State* L) {
+static int unload(lua_State* L) {
-	//TODO: onUnload()
+	//EMPTY
 	return 0;
 }
 
-//TODO: parameters
-
 static const luaL_Reg roomLib[] = {
 	{"GetPager",getPager},
-	{"OnCreate", onCreate},
+	{"Create", create},
-	{"OnUnload", onUnload},
+	{"Unload", unload},
 	{nullptr, nullptr}
 };
 

server/rooms/room_data.hpp

@@ -25,12 +25,19 @@
 //map system
 #include "region_pager_lua.hpp"
 
-struct RoomData {
+class RoomData {
+public:
+	RoomData() = default;
+	~RoomData() = default;
+
+	//accessors and mutators
+	RegionPagerLua* GetPager() { return &pager; }
+
+private:
+	friend class RoomManager;
+
 	//members
 	RegionPagerLua pager;
-
-	//TODO: collision map
-	//TODO: NPCs?
 };
 
 #endif