lobby_server.cpp compiles

Updated the ClientApplication class to help support the new design, but
it's not finished because of that module's dependence on the various
scenes.

Updated the following scenes:

* CleanUp
* MainMenu
* OptionsMenu

The following source files (in client/scenes/) compile correctly:

* base_scene.cpp
* splash_screen.cpp
* clean_up.cpp
* main_menu.cpp
* options_menu.cpp

The folling source files (in client/scenes/) do not compile:

* in_world.cpp
* in_combat.cpp
* lobby_menu.cpp

.gitignore

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

README.md

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

client/character.cpp

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

client/character.hpp

@@ -19,23 +19,34 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef BASECHARACTER_HPP_
-#define BASECHARACTER_HPP_
+#ifndef CHARACTER_HPP_
+#define CHARACTER_HPP_
 
 //components
 #include "character_defines.hpp"
-#include "renderable.hpp"
+#include "vector2.hpp"
+#include "bounding_box.hpp"
+
+//graphics
+#include "sprite_sheet.hpp"
 
 //std namespace
 #include <string>
+#include <cmath>
 
-class BaseCharacter : public Renderable {
+class Character {
 public:
-	BaseCharacter() = default;
-	virtual ~BaseCharacter() = default;
+	Character() = default;
+	~Character() = default;
+
+	void Update(double delta);
 
 	//graphics
+	void DrawTo(SDL_Surface* const, int camX, int camY);
 	void CorrectSprite();
+	SpriteSheet* GetSprite() { return &sprite; }
+
+	//accessors and mutators
 
 	//metadata
 	int SetOwner(int i) { return owner = i; }
@@ -45,11 +56,31 @@ public:
 	std::string SetAvatar(std::string s) { return avatar = s; }
 	std::string GetAvatar() const { return avatar; }
 
+	//position
+	Vector2 SetOrigin(Vector2 v) { return origin = v; }
+	Vector2 GetOrigin() const { return origin; }
+	Vector2 SetMotion(Vector2 v) { return motion = v; }
+	Vector2 GetMotion() const { return motion; }
+	BoundingBox SetBoundingBox(BoundingBox b) { return bounds = b; }
+	BoundingBox GetBoundingBox() const { return bounds; }
+
 private:
+	//graphics
+	SpriteSheet sprite;
+
 	//metadata
 	int owner;
 	std::string handle;
 	std::string avatar;
+
+	//position
+	Vector2 origin = {0.0,0.0};
+	Vector2 motion = {0.0,0.0};
+	BoundingBox bounds;
 };
 
+//tmp
+#include <map>
+typedef std::map<int, Character> CharacterMap;
+
 #endif

client/client_application.cpp

@@ -21,8 +21,7 @@
 */
 #include "client_application.hpp"
 
-#include "serial_packet.hpp"
-#include "config_utility.hpp"
+#include "serial.hpp"
 
 #include <stdexcept>
 #include <chrono>
@@ -38,19 +37,16 @@
 #include "options_menu.hpp"
 #include "lobby_menu.hpp"
 #include "in_world.hpp"
-#include "disconnected_screen.hpp"
+#include "in_combat.hpp"
+#include "clean_up.hpp"
 
 //-------------------------
 //Public access members
 //-------------------------
 
-void ClientApplication::Init(int argc, char* argv[]) {
+void ClientApplication::Init(int argc, char** argv) {
 	std::cout << "Beginning " << argv[0] << std::endl;
 
-	//load the prerequisites
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-	config.Load("rsc\\config.cfg", argc, argv);
-
 	//-------------------------
 	//Initialize the APIs
 	//-------------------------
@@ -65,48 +61,83 @@ void ClientApplication::Init(int argc, char* argv[]) {
 	if (SDLNet_Init()) {
 		throw(std::runtime_error("Failed to initialize SDL_net"));
 	}
-	UDPNetworkUtility::GetSingleton().Open(0);
+	network.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
 	//-------------------------
 
-	int w = config.Int("client.screen.w");
-	int h = config.Int("client.screen.h");
-	int f = config.Bool("client.screen.f") ? SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_FULLSCREEN : SDL_HWSURFACE|SDL_DOUBLEBUF;
+	//get each field
+	lua_getfield(lua, -1, "client");
+	lua_getfield(lua, -1, "screen");
+	lua_getfield(lua, -1, "width");
+	lua_getfield(lua, -2, "height");
+	lua_getfield(lua, -3, "fullscreen");
 
-	BaseScene::SetScreen(w ? w : 800, h ? h : 600, 0, f);
+	int w = lua_tointeger(lua, -3);
+	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
 	//-------------------------
 
-	//TODO: enable/disable these with a switch
+	lua_getfield(lua, -1, "debug");
+
+	if (lua_toboolean(lua, -1)) {
 #define DEBUG_OUTPUT_VAR(x) std::cout << "\t" << #x << ": " << x << std::endl;
 
 		std::cout << "Internal sizes:" << std::endl;
 
-	DEBUG_OUTPUT_VAR(NETWORK_VERSION);
 		DEBUG_OUTPUT_VAR(sizeof(Region::type_t));
 		DEBUG_OUTPUT_VAR(sizeof(Region));
 		DEBUG_OUTPUT_VAR(REGION_WIDTH);
 		DEBUG_OUTPUT_VAR(REGION_HEIGHT);
 		DEBUG_OUTPUT_VAR(REGION_DEPTH);
-	DEBUG_OUTPUT_VAR(REGION_TILE_FOOTPRINT);
 		DEBUG_OUTPUT_VAR(REGION_SOLID_FOOTPRINT);
-	DEBUG_OUTPUT_VAR(PACKET_STRING_SIZE);
+		DEBUG_OUTPUT_VAR(REGION_FOOTPRINT);
 		DEBUG_OUTPUT_VAR(PACKET_BUFFER_SIZE);
 		DEBUG_OUTPUT_VAR(MAX_PACKET_SIZE);
-	DEBUG_OUTPUT_VAR(static_cast<int>(SerialPacketType::LAST));
 
 #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;
 
 	//-------------------------
@@ -122,6 +153,7 @@ 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;
 
@@ -139,9 +171,8 @@ void ClientApplication::Proc() {
 		//simulate game time
 		while (simTime < realTime) {
 			//call each user defined function
-			activeScene->RunFrame();
-			//~60 FPS
-			simTime += std::chrono::duration<int, std::milli>(16);
+			activeScene->RunFrame(constexpr(double(delta.count()) / std::chrono::duration<int, std::milli>::period::den));
+			simTime += delta;
 		}
 
 		//draw the game to the screen
@@ -153,7 +184,8 @@ void ClientApplication::Proc() {
 
 void ClientApplication::Quit() {
 	std::cout << "Shutting down" << std::endl;
-	UDPNetworkUtility::GetSingleton().Close();
+	lua_close(lua);
+	network.Close();
 	SDLNet_Quit();
 	SDL_Quit();
 	std::cout << "Clean exit" << std::endl;
@@ -169,22 +201,25 @@ void ClientApplication::LoadScene(SceneList sceneIndex) {
 		//add scene creation calls here
 		case SceneList::FIRST:
 		case SceneList::SPLASHSCREEN:
-			activeScene = new SplashScreen();
+			activeScene = new SplashScreen(lua);
 		break;
 		case SceneList::MAINMENU:
-			activeScene = new MainMenu();
+			activeScene = new MainMenu(lua);
 		break;
 		case SceneList::OPTIONSMENU:
-			activeScene = new OptionsMenu();
+			activeScene = new OptionsMenu(lua);
 		break;
 		case SceneList::LOBBYMENU:
-			activeScene = new LobbyMenu(&clientIndex, &accountIndex); //TODO: can I use the ConfigUtility for these parameters?
+			activeScene = new LobbyMenu(lua, network, characterMap);
 		break;
 		case SceneList::INWORLD:
-			activeScene = new InWorld(&clientIndex, &accountIndex);
+			activeScene = new InWorld(lua, network, characterMap);
 		break;
-		case SceneList::DISCONNECTEDSCREEN:
-			activeScene = new DisconnectedScreen();
+		case SceneList::INCOMBAT:
+			activeScene = new InCombat(lua, network, characterMap);
+		break;
+		case SceneList::CLEANUP:
+			activeScene = new CleanUp(lua, network, characterMap);
 		break;
 		default:
 			throw(std::logic_error("Failed to recognize the scene index"));

client/client_application.hpp

@@ -26,24 +26,22 @@
 #include "base_scene.hpp"
 
 #include "udp_network_utility.hpp"
+#include "character.hpp"
 
-#include "singleton.hpp"
+#include "lua/lua.hpp"
 
 #include <map>
 
-class ClientApplication: public Singleton<ClientApplication> {
+class ClientApplication {
 public:
-	//public methods
-	void Init(int argc, char* argv[]);
+	ClientApplication() = default;
+	~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();
@@ -51,8 +49,13 @@ private:
 	BaseScene* activeScene = nullptr;
 
 	//shared parameters
+	lua_State* lua = nullptr;
+	UDPNetworkUtility network;
 	int clientIndex = -1;
 	int accountIndex = -1;
+	int characterIndex = -1;
+
+	CharacterMap characterMap;
 };
 
 #endif

client/linit.cpp

@@ -0,0 +1,85 @@
+/* $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,34 +21,17 @@
 */
 #include "client_application.hpp"
 
-//singletons
-#include "config_utility.hpp"
-#include "udp_network_utility.hpp"
-
 #include <stdexcept>
 #include <iostream>
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char** argv) {
 	try {
-		//create the singletons
-		ConfigUtility::CreateSingleton();
-		UDPNetworkUtility::CreateSingleton();
-
-		//call the server's routines
-		ClientApplication::CreateSingleton();
-		ClientApplication& app = ClientApplication::GetSingleton();
-
+		ClientApplication app;
 		app.Init(argc, argv);
 		app.Proc();
 		app.Quit();
-
-		ClientApplication::DeleteSingleton();
-
-		//delete the singletons
-		ConfigUtility::DeleteSingleton();
-		UDPNetworkUtility::DeleteSingleton();
 	}
 	catch(exception& e) {
 		cerr << "Fatal exception thrown: " << e.what() << endl;

client/makefile

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

client/renderable/base_monster.cpp

@@ -1,23 +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 "base_monster.hpp"
-

client/renderable/local_character.cpp

@@ -1,23 +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 "local_character.hpp"
-

client/renderable/renderable.hpp

@@ -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.
-*/
-#ifndef RENDERABLE_HPP_
-#define RENDERABLE_HPP_
-
-#include "bounding_box.hpp"
-#include "sprite_sheet.hpp"
-#include "vector2.hpp"
-
-class Renderable {
-public:
-	Renderable() = default;
-	virtual ~Renderable() = default;
-
-	virtual void Update();
-	virtual void DrawTo(SDL_Surface* const, int camX, int camY);
-
-	SpriteSheet* GetSprite() { return &sprite; }
-
-	//position
-	Vector2 SetOrigin(Vector2 v) { return origin = v; }
-	Vector2 GetOrigin() const { return origin; }
-	Vector2 SetMotion(Vector2 v) { return motion = v; }
-	Vector2 GetMotion() const { return motion; }
-
-	//collision
-	BoundingBox SetBounds(BoundingBox b) { return bounds = b; }
-	BoundingBox GetBounds() { return bounds; }
-
-protected: //TODO: should be private
-	SpriteSheet sprite;
-	Vector2 origin = {0, 0};
-	Vector2 motion = {0, 0};
-	BoundingBox bounds;
-};
-
-#endif

client/scene_list.hpp

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

client/scenes/base_scene.cpp

@@ -75,10 +75,10 @@ SceneList BaseScene::GetNextScene() const {
 //Frame loop
 //-------------------------
 
-void BaseScene::RunFrame() {
+void BaseScene::RunFrame(double delta) {
 	FrameStart();
 	HandleEvents();
-	Update();
+	Update(delta);
 	FrameEnd();
 }
 
@@ -86,7 +86,6 @@ 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();
+	virtual void RunFrame(double delta);
 	virtual void RenderFrame();
 
 protected:
 	virtual void FrameStart() {}
 	virtual void HandleEvents();
-	virtual void Update() {}
+	virtual void Update(double delta) {}
 	virtual void FrameEnd() {}
 	virtual void Render(SDL_Surface* const screen) {}
 

client/scenes/clean_up.cpp

@@ -19,11 +19,9 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "disconnected_screen.hpp"
+#include "clean_up.hpp"
 
 #include "channels.hpp"
-#include "config_utility.hpp"
-#include "udp_network_utility.hpp"
 
 #include <stdexcept>
 
@@ -31,13 +29,43 @@
 //Public access members
 //-------------------------
 
-DisconnectedScreen::DisconnectedScreen() {
-	ConfigUtility& config = ConfigUtility::GetSingleton();
+CleanUp::CleanUp(lua_State* L, UDPNetworkUtility& aNetwork, CharacterMap& aCharacterMap):
+	lua(L),
+	network(aNetwork),
+	characterMap(aCharacterMap)
+{
+	//get the config table
+	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(config["dir.interface"] + "button_menu.bmp");
+	image.LoadSurface(interfaceDir + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+	font.LoadSurface(fontsDir + "pk_white_8.bmp");
 
 	//pass the utility objects
 	backButton.SetImage(&image);
@@ -51,13 +79,14 @@ DisconnectedScreen::DisconnectedScreen() {
 	backButton.SetText("Back");
 
 	//full reset
-	UDPNetworkUtility::GetSingleton().Unbind(Channels::SERVER);
+	network.Unbind(Channels::SERVER);
+	characterMap.clear();
 
 	//auto return
 	startTick = std::chrono::steady_clock::now();
 }
 
-DisconnectedScreen::~DisconnectedScreen() {
+CleanUp::~CleanUp() {
 	//
 }
 
@@ -65,52 +94,54 @@ DisconnectedScreen::~DisconnectedScreen() {
 //Frame loop
 //-------------------------
 
-void DisconnectedScreen::Update() {
+void CleanUp::Update(double delta) {
 	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(10)) {
 		SetNextScene(SceneList::MAINMENU);
 	}
 
-	//Eat incoming packets
-	while(UDPNetworkUtility::GetSingleton().Receive());
+	//BUGFIX: Eat incoming packets
+	while(network.Receive());
 }
 
-void DisconnectedScreen::Render(SDL_Surface* const screen) {
-	ConfigUtility& config = ConfigUtility::GetSingleton();
+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(config["client.disconnectMessage"], screen, 50, 30);
+	font.DrawStringTo("You have been disconnected.", screen, 50, 30);
 }
 
 //-------------------------
 //Event handlers
 //-------------------------
 
-void DisconnectedScreen::QuitEvent() {
+void CleanUp::QuitEvent() {
 	SetNextScene(SceneList::QUIT);
 }
 
-void DisconnectedScreen::MouseMotion(SDL_MouseMotionEvent const& motion) {
+void CleanUp::MouseMotion(SDL_MouseMotionEvent const& motion) {
 	backButton.MouseMotion(motion);
 }
 
-void DisconnectedScreen::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+void CleanUp::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 	backButton.MouseButtonDown(button);
 }
 
-void DisconnectedScreen::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
+void CleanUp::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	if (backButton.MouseButtonUp(button) == Button::State::HOVER &&
+		button.button & SDL_BUTTON_LMASK) {
 		SetNextScene(SceneList::MAINMENU);
 	}
 }
 
-void DisconnectedScreen::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			SetNextScene(SceneList::MAINMENU);
-		break;
-	}
-}
-
-void DisconnectedScreen::KeyUp(SDL_KeyboardEvent const& key) {
+void CleanUp::KeyDown(SDL_KeyboardEvent const& key) {
+	//
+}
+
+void CleanUp::KeyUp(SDL_KeyboardEvent const& key) {
 	//
 }

client/scenes/clean_up.hpp

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

client/scenes/in_combat.cpp

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

@@ -0,0 +1,97 @@
+/* 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,7 +23,6 @@
 
 #include "channels.hpp"
 #include "utility.hpp"
-#include "config_utility.hpp"
 
 #include <stdexcept>
 #include <algorithm>
@@ -34,12 +33,75 @@
 //Public access members
 //-------------------------
 
-InWorld::InWorld(int* const argClientIndex,	int* const argAccountIndex):
+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)
+	accountIndex(*argAccountIndex),
+	characterIndex(*argCharacterIndex),
+	characterMap(*argCharacterMap)
 {
-	ConfigUtility& config = ConfigUtility::GetSingleton();
+	//register the pager
+	lua_pushstring(lua, TORTUGA_REGION_PAGER_PSEUDO_INDEX);
+	lua_pushlightuserdata(lua, &pager);
+	lua_settable(L, LUA_REGISTRYINDEX);
 
+	//register the tilesheet
+	lua_pushstring(lua, TORTUGA_TILE_SHEET_PSEUDO_INDEX);
+	lua_pushlightuserdata(lua, &tileSheet);
+	lua_settable(L, LUA_REGISTRYINDEX);
+
+	//setup the component objecrs
+	pager.SetLuaState(lua);
+
+	//get the config info
+	lua_getglobal(lua, "config");
+	lua_getfield(lua, -1, "dir");
+	lua_getfield(lua, -1, "fonts");
+	std::string fonts = lua_tostring(lua, -1);
+	lua_getfield(lua, -2, "interface");
+	std::string interface = lua_tostring(lua, -1);
+	lua_getfield(lua, -3, "sprites");
+	std::string sprites = lua_tostring(lua, -1);
+	lua_getfield(lua, -4, "scripts");
+	std::string scripts = lua_tostring(lua, -1);
+	lua_pop(lua, 6);
+
+	//run the additional scripts
+	if (luaL_dofile(lua, (scripts + "in_world.lua").c_str())) {
+		throw(std::runtime_error(std::string() + "Failed to run in_world.lua: " + lua_tostring(lua, -1) ));
+	}
+
+	//setup the utility objects
+	buttonImage.LoadSurface(interface + "button_menu.bmp");
+	buttonImage.SetClipH(buttonImage.GetClipH()/3);
+	font.LoadSurface(fonts + "pk_white_8.bmp");
+
+	//pass the utility objects
+	backButton.SetImage(&buttonImage);
+	backButton.SetFont(&font);
+
+	//set the button positions
+	backButton.SetX(50);
+	backButton.SetY(50 + buttonImage.GetClipH() * 0);
+
+	//set the button texts
+	backButton.SetText("Back");
+
+	//entities
+	character.GetSprite()->LoadSurface(sprites + "elliot2.bmp", 4, 4);
+	character.SetBoundingBox({0, 0,
+		character.GetSprite()->GetImage()->GetClipW(),
+		character.GetSprite()->GetImage()->GetClipH()
+	});
+//-------------------------
 	//setup the utility objects
 	buttonImage.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	buttonImage.SetClipH(buttonImage.GetClipH()/3);
@@ -63,16 +125,7 @@ InWorld::InWorld(int* const argClientIndex,	int* const argAccountIndex):
 
 	//load the tilesheet
 	//TODO: add the tilesheet to the map system?
-	//TODO: Tile size and tile sheet should be loaded elsewhere
-	tileSheet.Load(config["dir.tilesets"] + "overworld.bmp", 32, 32);
-
-	//send this player's character info
-	CharacterPacket newPacket;
-	newPacket.type = SerialPacketType::CHARACTER_NEW;
-	strncpy(newPacket.handle, config["client.handle"].c_str(), PACKET_STRING_SIZE);
-	strncpy(newPacket.avatar, config["client.avatar"].c_str(), PACKET_STRING_SIZE);
-	newPacket.accountIndex = accountIndex;
-	network.SendTo(Channels::SERVER, &newPacket);
+	tileSheet.Load(config["dir.tilesets"] + "terrain.bmp", 12, 15);
 
 	//request a sync
 	RequestSynchronize();
@@ -82,7 +135,13 @@ InWorld::InWorld(int* const argClientIndex,	int* const argAccountIndex):
 }
 
 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);
 }
 
 //-------------------------
@@ -93,70 +152,51 @@ void InWorld::FrameStart() {
 	//
 }
 
-void InWorld::Update() {
+void InWorld::Update(double delta) {
 	//suck in and process all waiting packets
-	SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]);
+	SerialPacket* packetBuffer = static_cast<SerialPacket*>(malloc(MAX_PACKET_SIZE));
 	while(network.Receive(packetBuffer)) {
 		HandlePacket(packetBuffer);
 	}
-	delete reinterpret_cast<char*>(packetBuffer);
+	free(static_cast<void*>(packetBuffer));
 
 	//update the characters
 	for (auto& it : characterMap) {
-		it.second.Update();
-	}
-
-	//check the map
-	UpdateMap();
-
-	//skip the rest
-	if (!localCharacter) {
-		return;
+		it.second.Update(delta);
 	}
 
+	//TODO: Check collisions here
 	//check for collisions with the map
 	BoundingBox wallBounds = {0, 0, tileSheet.GetTileW(), tileSheet.GetTileH()};
-	const int xCount = localCharacter->GetBounds().w / wallBounds.w + 1;
-	const int yCount = localCharacter->GetBounds().h / wallBounds.h + 1;
+	const int xCount = character.GetBoundingBox().w / wallBounds.w + 1;
+	const int yCount = character.GetBoundingBox().h / wallBounds.h + 1;
 
 	for (int i = -1; i <= xCount; ++i) {
 		for (int j = -1; j <= yCount; ++j) {
 			//set the wall's position
-			wallBounds.x = wallBounds.w * i + snapToBase((double)wallBounds.w, localCharacter->GetOrigin().x);
-			wallBounds.y = wallBounds.h * j + snapToBase((double)wallBounds.h, localCharacter->GetOrigin().y);
+			wallBounds.x = wallBounds.w * i + snapToBase((double)wallBounds.w, character.GetOrigin().x);
+			wallBounds.y = wallBounds.h * j + snapToBase((double)wallBounds.h, character.GetOrigin().y);
 
-			if (!regionPager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
+			if (!pager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
 				continue;
 			}
 
-			if ((localCharacter->GetOrigin() + localCharacter->GetBounds()).CheckOverlap(wallBounds)) {
-				localCharacter->SetOrigin(localCharacter->GetOrigin() - (localCharacter->GetMotion()));
-				localCharacter->SetMotion({0,0});
-				localCharacter->CorrectSprite();
-				SendPlayerUpdate();
+			if ((character.GetOrigin() + character.GetBoundingBox()).CheckOverlap(wallBounds)) {
+				character.SetOrigin(character.GetOrigin() - (character.GetMotion() * delta));
+				character.SetMotion({0,0});
+				character.CorrectSprite();
 			}
 		}
 	}
 
 	//update the camera
+	if(localCharacter) {
 		camera.x = localCharacter->GetOrigin().x - camera.marginX;
 		camera.y = localCharacter->GetOrigin().y - camera.marginY;
-
-	//check the connection
-	if (Clock::now() - lastBeat > std::chrono::seconds(3)) {
-		if (attemptedBeats > 2) {
-			RequestDisconnect();
-			SetNextScene(SceneList::DISCONNECTEDSCREEN);
-			ConfigUtility::GetSingleton()["client.disconnectMessage"] = "Error: Lost connection to the server";
 	}
 
-		ServerPacket newPacket;
-		newPacket.type = SerialPacketType::PING;
-		network.SendTo(Channels::SERVER, &newPacket);
-
-		attemptedBeats++;
-		lastBeat = Clock::now();
-	}
+	//check the map
+	UpdateMap();
 }
 
 void InWorld::FrameEnd() {
@@ -222,13 +262,6 @@ 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) {
@@ -287,14 +320,8 @@ void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
 
 void InWorld::HandlePacket(SerialPacket* const argPacket) {
 	switch(argPacket->type) {
-		case SerialPacketType::PING:
-			HandlePing(static_cast<ServerPacket*>(argPacket));
-		break;
-		case SerialPacketType::PONG:
-			HandlePong(static_cast<ServerPacket*>(argPacket));
-		break;
 		case SerialPacketType::DISCONNECT:
-			HandleDisconnect(static_cast<ClientPacket*>(argPacket));
+			HandleDisconnect(argPacket);
 		break;
 		case SerialPacketType::CHARACTER_NEW:
 			HandleCharacterNew(static_cast<CharacterPacket*>(argPacket));
@@ -305,9 +332,6 @@ void InWorld::HandlePacket(SerialPacket* const argPacket) {
 		case SerialPacketType::CHARACTER_UPDATE:
 			HandleCharacterUpdate(static_cast<CharacterPacket*>(argPacket));
 		break;
-		case SerialPacketType::CHARACTER_REJECTION:
-			HandleCharacterRejection(static_cast<TextPacket*>(argPacket));
-		break;
 		case SerialPacketType::REGION_CONTENT:
 			HandleRegionContent(static_cast<RegionPacket*>(argPacket));
 		break;
@@ -318,25 +342,8 @@ void InWorld::HandlePacket(SerialPacket* const argPacket) {
 	}
 }
 
-void InWorld::HandlePing(ServerPacket* const argPacket) {
-	ServerPacket newPacket;
-	newPacket.type = SerialPacketType::PONG;
-	network.SendTo(argPacket->srcAddress, &newPacket);
-}
-
-void InWorld::HandlePong(ServerPacket* const argPacket) {
-	if (network.GetIPAddress(Channels::SERVER)->host != argPacket->srcAddress.host) {
-		throw(std::runtime_error("Heartbeat message received from unknown source"));
-	}
-
-	attemptedBeats = 0;
-	lastBeat = Clock::now();
-}
-
-void InWorld::HandleDisconnect(ClientPacket* const argPacket) {
-	//TODO: More needed in the disconnection
-	SetNextScene(SceneList::DISCONNECTEDSCREEN);
-	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have been disconnected";
+void InWorld::HandleDisconnect(SerialPacket* const argPacket) {
+	SetNextScene(SceneList::CLEANUP);
 }
 
 void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
@@ -345,24 +352,18 @@ void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
 	}
 
 	//create the character object
-	BaseCharacter& newCharacter = characterMap[argPacket->characterIndex];
+	Character& newCharacter = characterMap[argPacket->characterIndex];
 
 	//fill out the character's members
 	newCharacter.SetHandle(argPacket->handle);
 	newCharacter.SetAvatar(argPacket->avatar);
 
-	newCharacter.GetSprite()->LoadSurface(ConfigUtility::GetSingleton()["dir.sprites"] + newCharacter.GetAvatar(), 4, 4);
+	newCharacter.GetSprite()->LoadSurface(config["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.GetBaseStats()) = argPacket->stats;
+	(*newCharacter.GetStats()) = argPacket->stats;
 
 	//bookkeeping code
 	newCharacter.CorrectSprite();
@@ -373,6 +374,7 @@ void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
 		localCharacter = &newCharacter;
 
 		//setup the camera
+		//TODO: move this?
 		camera.width = GetScreen()->w;
 		camera.height = GetScreen()->h;
 
@@ -396,11 +398,12 @@ void InWorld::HandleCharacterDelete(CharacterPacket* const argPacket) {
 
 void InWorld::HandleCharacterUpdate(CharacterPacket* const argPacket) {
 	if (characterMap.find(argPacket->characterIndex) == characterMap.end()) {
+		std::cout << "Warning: HandleCharacterUpdate() is passing to HandleCharacterNew()" << std::endl;
 		HandleCharacterNew(argPacket);
 		return;
 	}
 
-	BaseCharacter& character = characterMap[argPacket->characterIndex];
+	Character& character = characterMap[argPacket->characterIndex];
 
 	//other characters moving
 	if (argPacket->characterIndex != characterIndex) {
@@ -410,14 +413,6 @@ void InWorld::HandleCharacterUpdate(CharacterPacket* const argPacket) {
 	}
 }
 
-void InWorld::HandleCharacterRejection(TextPacket* const argPacket) {
-	RequestDisconnect();
-	SetNextScene(SceneList::DISCONNECTEDSCREEN);
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-	config["client.disconnectMessage"] = "Error: ";
-	config["client.disconnectMessage"] += argPacket->text;
-}
-
 void InWorld::HandleRegionContent(RegionPacket* const argPacket) {
 	//replace existing regions
 	regionPager.UnloadRegion(argPacket->x, argPacket->y);
@@ -457,7 +452,7 @@ void InWorld::SendPlayerUpdate() {
 	newPacket.roomIndex = 0; //TODO: room index
 	newPacket.origin = localCharacter->GetOrigin();
 	newPacket.motion = localCharacter->GetMotion();
-//	newPacket.stats = *localCharacter->GetBaseStats();
+	newPacket.stats = *localCharacter->GetStats();
 
 	//TODO: gameplay components: equipment, items, buffs, debuffs
 

client/scenes/in_world.hpp

@@ -22,43 +22,49 @@
 #ifndef INWORLD_HPP_
 #define INWORLD_HPP_
 
-//maps
-#include "region_pager_base.hpp"
+//map stuff
+#include "tile_sheet.hpp"
+#include "region_pager_lua.hpp"
 
 //networking
 #include "udp_network_utility.hpp"
-#include "serial_packet.hpp"
 
-//graphics
+//graphics & ui
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
-#include "tile_sheet.hpp"
 
-//common
+//utilities
 #include "frame_rate.hpp"
-
-#include "base_character.hpp"
-#include "local_character.hpp"
+#include "timer.hpp"
 
 //client
 #include "base_scene.hpp"
+#include "character.hpp"
+
+//APIs
+#include "lua/lua.hpp"
 
 //STL
 #include <map>
 
-#include <chrono>
-
 class InWorld : public BaseScene {
 public:
 	//Public access members
-	InWorld(int* const argClientIndex, int* const argAccountIndex);
+	InWorld(
+		ConfigUtility* const argConfig,
+		UDPNetworkUtility* const argNetwork,
+		int* const argClientIndex,
+		int* const argAccountIndex,
+		int* const argCharacterIndex,
+		CharacterMap* argCharacterMap
+	);
 	~InWorld();
 
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update();
+	void Update(double delta);
 	void FrameEnd();
 	void RenderFrame();
 	void Render(SDL_Surface* const);
@@ -73,13 +79,10 @@ protected:
 
 	//Network handlers
 	void HandlePacket(SerialPacket* const);
-	void HandlePing(ServerPacket* const);
-	void HandlePong(ServerPacket* const);
-	void HandleDisconnect(ClientPacket* const);
+	void HandleDisconnect(SerialPacket* const);
 	void HandleCharacterNew(CharacterPacket* const);
 	void HandleCharacterDelete(CharacterPacket* const);
 	void HandleCharacterUpdate(CharacterPacket* const);
-	void HandleCharacterRejection(TextPacket* const);
 	void HandleRegionContent(RegionPacket* const);
 
 	//Server control
@@ -92,12 +95,14 @@ protected:
 	//utilities
 	void UpdateMap();
 
+	//TODO: Streamline this with lua
 	//shared parameters
-	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
+	ConfigUtility& config;
+	UDPNetworkUtility& network;
 	int& clientIndex;
 	int& accountIndex;
-	int characterIndex = -1;
-	std::map<int, BaseCharacter> characterMap;
+	int& characterIndex;
+	CharacterMap& characterMap;
 
 	//graphics
 	Image buttonImage;
@@ -110,23 +115,17 @@ protected:
 	//UI
 	Button disconnectButton;
 	Button shutDownButton;
-
-	//the camera structure
+	//TODO: Review the camera
 	struct {
-		int x = 0, y = 0;
-		int width = 0, height = 0;
-		int marginX = 0, marginY = 0;
+		struct {
+			int x, y;
+		}origin, margin;
 	}camera;
+
 	FrameRate fps;
 
 	//game
-	BaseCharacter* localCharacter = nullptr;
-
-	//connections
-	//TODO: This needs it's own utility, for both InWorld and InCombat
-	typedef std::chrono::steady_clock Clock;
-	Clock::time_point lastBeat = Clock::now();
-	int attemptedBeats = 0;
+	Character* localCharacter = nullptr;
 };
 
 #endif

client/scenes/lobby_menu.cpp

@@ -30,18 +30,25 @@
 //Public access members
 //-------------------------
 
-LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
-	clientIndex(*argClientIndex),
-	accountIndex(*argAccountIndex)
+LobbyMenu::LobbyMenu(lua_State* L, UDPNetworkUtility& aNetwork):
+	lua(L),
+	network(aNetwork)
 {
-	//preemptive reset
-	clientIndex = -1;
-	accountIndex = -1;
+	//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(config["dir.interface"] + "button_menu.bmp");
+	image.LoadSurface(interfaceDir + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+	font.LoadSurface(fontsDir + "pk_white_8.bmp");
 
 	//pass the utility objects
 	search.SetImage(&image);
@@ -67,11 +74,8 @@ LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
 	//set the server list's position
 	listBox = {300, 50, 200, font.GetCharH()};
 
-	//Eat incoming packets
+	//BUGFIX: Eat incoming packets
 	while(network.Receive());
-
-	//Initial broadcast
-	SendBroadcastRequest();
 }
 
 LobbyMenu::~LobbyMenu() {
@@ -86,13 +90,13 @@ void LobbyMenu::FrameStart() {
 	//
 }
 
-void LobbyMenu::Update() {
+void LobbyMenu::Update(double delta) {
 	//suck in and process all waiting packets
-	SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]);
+	SerialPacket* packetBuffer = new SerialPacket();
 	while(network.Receive(packetBuffer)) {
 		HandlePacket(packetBuffer);
 	}
-	delete reinterpret_cast<char*>(packetBuffer);
+	delete packetBuffer;
 }
 
 void LobbyMenu::FrameEnd() {
@@ -111,12 +115,9 @@ 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 = {
-				(Sint16)listBox.x, (Sint16)listBox.y,
-				(Uint16)listBox.w, (Uint16)listBox.h
-			};
+			SDL_Rect r = listBox;
 			r.y += i * listBox.h;
-			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 49, 150, 5));
+			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 255, 127, 39));
 		}
 
 		//draw the server name
@@ -151,33 +152,70 @@ 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) {
-		SendBroadcastRequest();
+		//get the set parameters
+		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) {
-		SendJoinRequest();
+		//get the parameters
+		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?
-	BoundingBox tmpBox = listBox;
-	tmpBox.h *= serverInfo.size();
-	if (tmpBox.CheckOverlap({button.x, button.y})) {
+		//TODO: replace with regular collision checker
+		button.x > listBox.x &&
+		button.x < listBox.x + listBox.w &&
+		button.y > listBox.y &&
+		button.y < listBox.y + listBox.h * serverInfo.size()
+		) {
 		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) {
@@ -191,13 +229,10 @@ void LobbyMenu::KeyUp(SDL_KeyboardEvent const& key) {
 void LobbyMenu::HandlePacket(SerialPacket* const argPacket) {
 		switch(argPacket->type) {
 		case SerialPacketType::BROADCAST_RESPONSE:
-			HandleBroadcastResponse(static_cast<ServerPacket*>(argPacket));
+			HandleBroadcastResponse(dynamic_cast<ServerPacket*>(argPacket));
 		break;
 		case SerialPacketType::JOIN_RESPONSE:
-			HandleJoinResponse(static_cast<ClientPacket*>(argPacket));
-		break;
-		case SerialPacketType::JOIN_REJECTION:
-			HandleJoinRejection(static_cast<TextPacket*>(argPacket));
+			HandleJoinResponse(dynamic_cast<ClientPacket*>(argPacket));
 		break;
 		//handle errors
 		default:
@@ -222,38 +257,25 @@ void LobbyMenu::HandleBroadcastResponse(ServerPacket* const argPacket) {
 }
 
 void LobbyMenu::HandleJoinResponse(ClientPacket* const argPacket) {
-	clientIndex = argPacket->clientIndex;
-	accountIndex = argPacket->accountIndex;
-	network.Bind(argPacket->srcAddress, Channels::SERVER);
+	lua_getglobal(lua, "config");
+	lua_getfield(lua, -1, "client");
+	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);
-}
-
-void LobbyMenu::HandleJoinRejection(TextPacket* const argPacket) {
-	//TODO: Better output for join rejection
-}
-
-//-------------------------
-//server control
-//-------------------------
-
-void LobbyMenu::SendBroadcastRequest() {
-	//broadcast to the network, or a specific server
-		ClientPacket packet;
-		packet.type = SerialPacketType::BROADCAST_REQUEST;
-		network.SendTo(config["server.host"].c_str(), config.Int("server.port"), &packet);
-
-		//reset the server list
-		serverInfo.clear();
-		selection = nullptr;
-}
-
-void LobbyMenu::SendJoinRequest() {
-	//pack the packet
-		ClientPacket packet;
-		packet.type = SerialPacketType::JOIN_REQUEST;
-		strncpy(packet.username, config["client.username"].c_str(), PACKET_STRING_SIZE);
-
-		//join the selected server
-		network.SendTo(selection->address, &packet);
-		selection = nullptr;
+
+	//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.avatar, lua_tostring(lua, -1), PACKET_STRING_SIZE);
+	newPacket.accountIndex = argPacket->accountIndex;
+	network.SendTo(Channels::SERVER, &newPacket);
+
+	lua_pop(lua, 4);
 }

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(int* const argClientIndex, int* const argAccountIndex);
+	LobbyMenu(lua_State*, UDPNetworkUtility&);
 	~LobbyMenu();
 
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update();
+	void Update(double delta);
 	void FrameEnd();
 	void Render(SDL_Surface* const);
 
@@ -63,17 +63,10 @@ protected:
 	void HandlePacket(SerialPacket* const);
 	void HandleBroadcastResponse(ServerPacket* const);
 	void HandleJoinResponse(ClientPacket* const);
-	void HandleJoinRejection(TextPacket* const);
-
-	//server control
-	void SendBroadcastRequest();
-	void SendJoinRequest();
 
 	//shared parameters
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
-	int& clientIndex;
-	int& accountIndex;
+	lua_State* lua = nullptr;
+	UDPNetworkUtility& network;
 
 	//members
 	Image image;
@@ -93,9 +86,9 @@ protected:
 
 	std::vector<ServerInformation> serverInfo;
 
-	//NOTE: a terrible hack
-	//I'd love a proper gui system for this
-	BoundingBox listBox;
+	//a terrible hack, forgive me
+	//TODO: I'd love a proper gui system for this
+	SDL_Rect listBox;
 	ServerInformation* selection = nullptr;
 };
 

client/scenes/main_menu.cpp

@@ -21,19 +21,26 @@
 */
 #include "main_menu.hpp"
 
-#include "config_utility.hpp"
-
 //-------------------------
 //Public access members
 //-------------------------
 
-MainMenu::MainMenu() {
-	ConfigUtility& config = ConfigUtility::GetSingleton();
+MainMenu::MainMenu(lua_State* L): lua(L) {
+	//get the config info
+	lua_getglobal(lua, "config");
+	lua_getfield(lua, -1, "dir");
+	lua_getfield(lua, -1, "interface");
+	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(config["dir.interface"] + "button_menu.bmp");
+	image.LoadSurface(interfaceDir + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+	font.LoadSurface(fontsDir + "pk_white_8.bmp");
 
 	//pass the utility objects
 	startButton.SetImage(&image);
@@ -72,7 +79,7 @@ void MainMenu::FrameStart() {
 	//
 }
 
-void MainMenu::Update() {
+void MainMenu::Update(double delta) {
 	//
 }
 
@@ -103,14 +110,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::LOBBYMENU);
+		SetNextScene(SceneList::INWORLD);
 	}
 	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,16 +28,18 @@
 #include "raster_font.hpp"
 #include "button.hpp"
 
+#include "lua/lua.hpp"
+
 class MainMenu : public BaseScene {
 public:
 	//Public access members
-	MainMenu();
+	MainMenu(lua_State* L);
 	~MainMenu();
 
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update();
+	void Update(double delta);
 	void FrameEnd();
 	void Render(SDL_Surface* const);
 
@@ -48,6 +50,9 @@ 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+=. .. ../renderable ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/network/packet_types ../../common/ui ../../common/utilities
+INCLUDES+=. .. ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/network/packet ../../common/network/serial ../../common/ui ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 

client/scenes/options_menu.cpp

@@ -21,19 +21,26 @@
 */
 #include "options_menu.hpp"
 
-#include "config_utility.hpp"
-
 //-------------------------
 //Public access members
 //-------------------------
 
-OptionsMenu::OptionsMenu() {
-	ConfigUtility& config = ConfigUtility::GetSingleton();
+OptionsMenu::OptionsMenu(lua_State* L): lua(L) {
+	//get the config info
+	lua_getglobal(lua, "config");
+	lua_getfield(lua, -1, "dir");
+	lua_getfield(lua, -1, "interface");
+	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(config["dir.interface"] + "button_menu.bmp");
+	image.LoadSurface(interfaceDir + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+	font.LoadSurface(fontsDir + "pk_white_8.bmp");
 
 	//pass the utility objects
 	backButton.SetImage(&image);
@@ -59,7 +66,7 @@ void OptionsMenu::FrameStart() {
 	//
 }
 
-void OptionsMenu::Update() {
+void OptionsMenu::Update(double delta) {
 	//
 }
 
@@ -86,17 +93,14 @@ 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,17 +28,19 @@
 #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();
+	OptionsMenu(lua_State* L);
 	~OptionsMenu();
 
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update();
+	void Update(double delta);
 	void FrameEnd();
 	void Render(SDL_Surface* const);
 
@@ -49,6 +51,9 @@ 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,14 +21,21 @@
 */
 #include "splash_screen.hpp"
 
-#include "config_utility.hpp"
+#include <string>
 
 //-------------------------
 //Public access members
 //-------------------------
 
-SplashScreen::SplashScreen() {
-	logo.LoadSurface(ConfigUtility::GetSingleton()["dir.logos"] + "krstudios.bmp");
+SplashScreen::SplashScreen(lua_State* L): lua(L) {
+	//get the config info
+	lua_getglobal(lua, "config");
+	lua_getfield(lua, -1, "dir");
+	lua_getfield(lua, -1, "logos");
+	std::string logos = lua_tostring(lua, -1);
+	lua_pop(lua, 3);
+
+	logo.LoadSurface(logos + "krstudios.bmp");
 	startTick = std::chrono::steady_clock::now();
 }
 
@@ -40,7 +47,7 @@ SplashScreen::~SplashScreen() {
 //Frame loop
 //-------------------------
 
-void SplashScreen::Update() {
+void SplashScreen::Update(double delta) {
 	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(1)) {
 		SetNextScene(SceneList::MAINMENU);
 	}

client/scenes/splash_screen.hpp

@@ -26,19 +26,24 @@
 
 #include "image.hpp"
 
+#include "lua/lua.hpp"
+
 #include <chrono>
 
 class SplashScreen : public BaseScene {
 public:
 	//Public access members
-	SplashScreen();
+	SplashScreen(lua_State* L);
 	~SplashScreen();
 
 protected:
 	//Frame loop
-	void Update();
+	void Update(double delta);
 	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,25 +21,9 @@
 */
 #include "timer.hpp"
 
-Timer::Timer(): start(Timer::Clock::now()) {
-	//
-}
-
-Timer::Timer(std::string s): name(s), start(Timer::Clock::now()) {
-	//
-}
-
-void Timer::Start() {
-	start = Clock::now();
-}
-
-void Timer::Stop() {
-	timeSpan = Clock::now() - start;
-}
-
 std::ostream& operator<<(std::ostream& os, Timer& t) {
 	os << t.GetName() << ": ";
-	os << std::chrono::duration_cast<std::chrono::milliseconds>(t.GetTime()).count();
-	os << "ms";
+	os << std::chrono::duration_cast<std::chrono::nanoseconds>(t.GetTime()).count();
+	os << "ns";
 	return os;
 }

common/debugging/timer.hpp

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

common/gameplay/character_defines.hpp

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

common/gameplay/combat_defines.hpp

@@ -19,18 +19,16 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef BASEMONSTER_HPP_
-#define BASEMONSTER_HPP_
+#ifndef COMBATDEFINES_HPP_
+#define COMBATDEFINES_HPP_
 
-#include "renderable.hpp"
+#define COMBAT_MAX_CHARACTERS 16
+#define COMBAT_MAX_ENEMIES 16
 
-class BaseMonster {
-public:
-	BaseMonster();
-	virtual ~BaseMonster();
-
-private:
-	//
+enum class TerrainType {
+	NONE = 0,
+	GRASSLANDS,
+	//etc.
 };
 
 #endif

common/graphics/makefile

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

common/map/makefile

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

common/map/region.cpp

@@ -21,13 +21,10 @@
 */
 #include "region.hpp"
 
-#include <stdexcept>
-#include <cmath>
-#include <cstring>
+#include "utility.hpp"
 
-int snapToBase(int base, int x) {
-	return floor((double)x / base) * base;
-}
+#include <stdexcept>
+#include <cstring>
 
 Region::Region(int argX, int argY): x(argX), y(argY) {
 	if (x != snapToBase(REGION_WIDTH, x) || y != snapToBase(REGION_HEIGHT, y)) {

common/map/region.hpp

@@ -23,14 +23,15 @@
 #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;
 
-//utility function
-int snapToBase(int base, int x);
+//the size of the solid map
+constexpr int REGION_SOLID_FOOTPRINT = ceil(REGION_WIDTH * REGION_HEIGHT / 8.0);
 
 class Region {
 public:
@@ -60,4 +61,7 @@ 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,6 +78,27 @@ 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},
@@ -88,6 +109,10 @@ 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,6 +24,13 @@
 #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) {
@@ -88,55 +95,17 @@ static int unloadRegion(lua_State* L) {
 	return 0;
 }
 
-static int setOnLoad(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetLoadReference());
-	pager->SetLoadReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
-static int setOnSave(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetSaveReference());
-	pager->SetSaveReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
-static int setOnCreate(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetCreateReference());
-	pager->SetCreateReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
-static int setOnUnload(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetUnloadReference());
-	pager->SetUnloadReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	return 0;
-}
-
 static const luaL_Reg regionPagerLib[] = {
-	//curry
+	{"GetRegionPager", getRegionPager},
 	{"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,6 +24,7 @@
 
 #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,6 +21,8 @@
 */
 #include "region_pager_base.hpp"
 
+#include "utility.hpp"
+
 #include <stdexcept>
 #include <algorithm>
 
@@ -71,12 +73,12 @@ Region* RegionPagerBase::PushRegion(Region* const ptr) {
 }
 
 Region* RegionPagerBase::LoadRegion(int x, int y) {
-	//EMPTY, intended for override
+	//TODO: load the region if possible
 	return nullptr;
 }
 
 Region* RegionPagerBase::SaveRegion(int x, int y) {
-	//EMPTY, intended for override
+	//TODO: find & save the region
 	return nullptr;
 }
 
@@ -89,9 +91,8 @@ Region* RegionPagerBase::CreateRegion(int x, int y) {
 }
 
 void RegionPagerBase::UnloadRegion(int x, int y) {
-	regionList.remove_if([x, y](Region& region) -> bool {
-		return region.GetX() == x && region.GetY() == y;
-	});
+	//custom loop, not FindRegion()
+	regionList.remove_if([x, y](Region& region) -> bool { return region.GetX() == x && region.GetY() == y; });
 }
 
 void RegionPagerBase::UnloadAll() {

common/map/region_pager_lua.cpp

@@ -21,159 +21,103 @@
 */
 #include "region_pager_lua.hpp"
 
+#include "utility.hpp"
+
 #include <stdexcept>
 
 Region* RegionPagerLua::LoadRegion(int x, int y) {
-	//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;
-	}
+	//load the region if possible
 
 	//something to work on
 	Region tmpRegion(x, y);
-	lua_pushlightuserdata(lua, &tmpRegion);
 
-	//call the funtion, 1 arg, 1 return
+	//API hook
+	lua_getglobal(lua, "Region");
+	lua_getfield(lua, -1, "Load");
+	lua_pushlightuserdata(lua, &tmpRegion);
 	if (lua_pcall(lua, 1, 1, 0) != LUA_OK) {
 		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
 	}
-
-	//check the return value, success or failure
-	if (lua_toboolean(lua, -1)) {
-		lua_pop(lua, 1);
+	//success or failure
+	if (!lua_toboolean(lua, -1)) {
+		lua_pop(lua, 2);
+		return nullptr;
+	}
+	lua_pop(lua, 2);
 	regionList.push_front(tmpRegion);
 	return &regionList.front();
 }
-	else {
-		lua_pop(lua, 1);
-		return nullptr;
-	}
-}
 
 Region* RegionPagerLua::SaveRegion(int x, int y) {
-	//get the pager's function from the registry
-	lua_rawgeti(lua, LUA_REGISTRYINDEX, saveRef);
-
-	//check if this function is available
-	if (lua_isnil(lua, -1)) {
-		lua_pop(lua, 1);
-		return nullptr;
-	}
-
-	//find the specified region
+	//find & save the region
 	Region* ptr = FindRegion(x, y);
-	if (!ptr) {
-		lua_pop(lua, 1);
-		return nullptr;
-	}
+	if (ptr) {
+		//API hook
+		lua_getglobal(lua, "Region");
+		lua_getfield(lua, -1, "Save");
 		lua_pushlightuserdata(lua, ptr);
-
-	//call the function, 1 arg, 1 return
-	if (lua_pcall(lua, 1, 1, 0) != LUA_OK) {
+		if (lua_pcall(lua, 1, 0, 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;
-	}
-}
 
 Region* RegionPagerLua::CreateRegion(int x, int y) {
 	if (FindRegion(x, y)) {
 		throw(std::logic_error("Cannot overwrite an existing region"));
 	}
 
-	//get the pager's function from the registry
-	lua_rawgeti(lua, LUA_REGISTRYINDEX, createRef);
-
-	//check if this function is available
-	if (lua_isnil(lua, -1)) {
-		lua_pop(lua, 1);
-		return nullptr;
-	}
-
 	//something to work on
 	Region tmpRegion(x, y);
-	lua_pushlightuserdata(lua, &tmpRegion);
 
-	//call the function, 1 arg, 0 return
+	//API hook
+	lua_getglobal(lua, "Region");
+	lua_getfield(lua, -1, "Create");
+	lua_pushlightuserdata(lua, &tmpRegion);
+	//TODO: parameters
 	if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
 		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
 	}
-
-	//return the new region
+	lua_pop(lua, 1);
 	regionList.push_front(tmpRegion);
 	return &regionList.front();
 }
 
 void RegionPagerLua::UnloadRegion(int x, int y) {
-	//get the pager's function from the registry
-	lua_rawgeti(lua, LUA_REGISTRYINDEX, unloadRef);
+	lua_getglobal(lua, "Region");
 
-	//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) {
 
-			//push a copy of the function onto the stack with the region
-			lua_pushvalue(lua, -1);
+			//API hook
+			lua_getfield(lua, -1, "Unload");
 			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() {
-	//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;
-	}
+	lua_getglobal(lua, "Region");
 
 	for (auto& it : regionList) {
-		//push a copy of the function onto the stack with the region
-		lua_pushvalue(lua, -1);
+		//API hook
+		lua_getfield(lua, -1, "Unload");
 		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,25 +44,8 @@ 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,6 +23,12 @@
 
 #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));
@@ -60,6 +66,7 @@ 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,6 +24,7 @@
 
 #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_types ../gameplay ../map ../utilities
+INCLUDES+=. packet serial ../gameplay ../map ../utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
@@ -17,7 +17,8 @@ OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 #targets
 all: $(OBJ) $(OUT)
 	ar -crs $(OUT) $(OBJ)
-	$(MAKE) -C packet_types
+	$(MAKE) -C packet
+	$(MAKE) -C serial
 
 $(OBJ): | $(OBJDIR)
 

common/network/packet/character_packet.hpp

@@ -44,10 +44,7 @@ struct CharacterPacket : SerialPacketBase {
 	//gameplay
 	Statistics stats;
 
-	//gameplay components: equipment, items, buffs, debuffs...
+	//TODO: gameplay components: equipment, items, buffs, debuffs
 };
 
-void serializeCharacter(void* buffer, CharacterPacket* packet);
-void deserializeCharacter(void* buffer, CharacterPacket* packet);
-
 #endif

common/network/packet/client_packet.hpp

@@ -28,9 +28,7 @@ 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/combat_packet.hpp

@@ -0,0 +1,46 @@
+/* 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 COMBATPACKET_HPP_
+#define COMBATPACKET_HPP_
+
+#include "serial_packet_base.hpp"
+
+#include "combat_defines.hpp"
+
+struct CombatPacket : SerialPacketBase {
+	//identify the combat instance
+	int combatIndex;
+	int difficulty;
+	TerrainType terrainType;
+
+	//combatants
+	int characterArray[COMBAT_MAX_CHARACTERS];
+	int enemyArray[COMBAT_MAX_ENEMIES];
+
+	//location
+	int mapIndex;
+	Vector2 origin;
+
+	//TODO: gameplay components: rewards
+};
+
+#endif

common/network/packet/enemy_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* 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
@@ -19,6 +19,21 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
+#ifndef ENEMYPACKET_HPP_
+#define ENEMYPACKET_HPP_
+
 #include "serial_packet_base.hpp"
 
-//sanity check
+struct EnemyPacket : SerialPacketBase {
+	//identify the enemy
+	int enemyIndex;
+	char handle[PACKET_STRING_SIZE];
+	char avatar[PACKET_STRING_SIZE];
+
+	//gameplay
+	Statistics stats;
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs, rewards
+};
+
+#endif

common/network/packet/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/region_packet.hpp

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

common/network/packet/sanity_check.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* 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
@@ -19,13 +19,10 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "renderable.hpp"
+#include "serial_packet.hpp"
 
-void Renderable::Update() {
-	origin += motion;
-	sprite.Update(0.016);
-}
-
-void Renderable::DrawTo(SDL_Surface* const dest, int camX, int camY) {
-	sprite.DrawTo(dest, origin.x - camX, origin.y - camY);
-}
+/* DOCS: Sanity check, read more
+ * Since most/all of the files in this directory are header files, I've created
+ * this source file as a "sanity check", to ensure that the above header files
+ * are written correctly via make.
+*/

common/network/packet/serial_packet.hpp

@@ -0,0 +1,44 @@
+/* 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 SERIALPACKET_HPP_
+#define SERIALPACKET_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
+
+union MaxPacket {
+	CharacterPacket a;
+	ClientPacket b;
+	CombatPacket c;
+	EnemyPacket d;
+	RegionPacket e;
+	ServerPacket f;
+};
+constexpr int MAX_PACKET_SIZE = sizeof(MaxPacket);
+
+#endif

common/network/packet/serial_packet_base.hpp

@@ -22,10 +22,15 @@
 #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 {
@@ -36,4 +41,6 @@ struct SerialPacketBase {
 	virtual ~SerialPacketBase() {};
 };
 
+typedef SerialPacketBase SerialPacket;
+
 #endif

common/network/packet/serial_packet_type.hpp

@@ -0,0 +1,113 @@
+/* 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/server_packet.hpp

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

common/network/packet_types/character_packet.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 "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);
-
-	//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);
-
-	//gameplay components: equipment, items, buffs, debuffs...
-}

common/network/packet_types/region_packet.cpp

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

@@ -1,48 +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 REGIONPACKET_HPP_
-#define REGIONPACKET_HPP_
-
-#include "serial_packet_base.hpp"
-
-#include "region.hpp"
-
-#include <cmath>
-
-//define the memory footprint for the region's members
-constexpr int REGION_TILE_FOOTPRINT = sizeof(Region::type_t) * REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH;
-constexpr int REGION_SOLID_FOOTPRINT = ceil(REGION_WIDTH * REGION_HEIGHT / 8.0);
-constexpr int REGION_METADATA_FOOTPRINT = sizeof(int) * 3;
-
-struct RegionPacket : SerialPacketBase {
-	//location/identify the region
-	int roomIndex;
-	int x, y;
-
-	//the data
-	Region* region;
-};
-
-void serializeRegion(void* buffer, RegionPacket* packet);
-void deserializeRegion(void* buffer, RegionPacket* packet);
-
-#endif

common/network/packet_types/serial_statistics.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_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/text_packet.cpp

@@ -1,40 +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 "text_packet.hpp"
-
-#include "serial_utility.hpp"
-
-void serializeText(void* buffer, TextPacket* packet) {
-	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
-
-	//content
-	serialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
-	serialCopy(&buffer, packet->text, PACKET_STRING_SIZE);
-}
-
-void deserializeText(void* buffer, TextPacket* packet) {
-	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
-
-	//content
-	deserialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
-	deserialCopy(&buffer, packet->text, PACKET_STRING_SIZE);
-}

common/network/serial/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. .. ../../common/gameplay ../../common/graphics ../../common/utilities
+INCLUDES+=. ../packet ../../gameplay ../../map ../../utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
@@ -11,8 +11,8 @@ OBJDIR=obj
 OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
 
 #output
-OUTDIR=..
-OUT=$(addprefix $(OUTDIR)/,client.a)
+OUTDIR=../../..
+OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 
 #targets
 all: $(OBJ) $(OUT)

common/network/serial/serial.cpp

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

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

@@ -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 "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

@@ -19,22 +19,24 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "client_packet.hpp"
+#include "serial.hpp"
 
-#include "serial_utility.hpp"
+#include "serial_util.hpp"
 
-void serializeClient(void* buffer, ClientPacket* packet) {
-	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+void serializeClient(ClientPacket* packet, void* buffer) {
+	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
 
-	serialCopy(&buffer, &packet->clientIndex, sizeof(int));
-	serialCopy(&buffer, &packet->accountIndex, sizeof(int));
-	serialCopy(&buffer, packet->username, PACKET_STRING_SIZE);
+	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(void* buffer, ClientPacket* packet) {
-	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+void deserializeClient(ClientPacket* packet, void* buffer) {
+	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
 
-	deserialCopy(&buffer, &packet->clientIndex, sizeof(int));
-	deserialCopy(&buffer, &packet->accountIndex, sizeof(int));
-	deserialCopy(&buffer, packet->username, PACKET_STRING_SIZE);
+	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

@@ -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.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

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

@@ -0,0 +1,89 @@
+/* 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_server.cpp

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

common/network/serial/serial_statistics.cpp

@@ -0,0 +1,65 @@
+/* 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/serial_util.hpp

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

common/network/serial_packet.hpp

@@ -1,64 +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 SERIALPACKET_HPP_
-#define SERIALPACKET_HPP_
-
-#include "serial_packet_base.hpp"
-#include "character_packet.hpp"
-#include "client_packet.hpp"
-#include "region_packet.hpp"
-#include "server_packet.hpp"
-#include "text_packet.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 = 20140909;
-
-union MaxPacket {
-	CharacterPacket a;
-	ClientPacket b;
-	RegionPacket c;
-	ServerPacket d;
-	TextPacket e;
-};
-
-constexpr int MAX_PACKET_SIZE = sizeof(MaxPacket);
-
-/* DOCS: PACKET_BUFFER_SIZE is the memory required to store serialized data
- * DOCS: SerialPacketType::REGION_CONTENT is currently the largest packet type
- * Serialized RegionPacket structure:
- *     SerialPacketType
- *     room index (int)
- *     X & Y position (int)
- *     tile data (3 layers)
- *     solid data (bitset)
-*/
-
-constexpr int PACKET_BUFFER_SIZE =
-	sizeof(SerialPacketType) +
-	REGION_METADATA_FOOTPRINT +
-	REGION_TILE_FOOTPRINT +
-	REGION_SOLID_FOOTPRINT;
-
-#endif

common/network/serial_packet_type.hpp

@@ -1,110 +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_
-
-/* 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,
-
-	//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,
-
-	//-------------------------
-	//TextPacket
-	//  name, text
-	//-------------------------
-
-	//general speech
-	TEXT_BROADCAST,
-
-	//rejection/error messages
-	SHUTDOWN_REJECTION,
-	JOIN_REJECTION,
-	CHARACTER_REJECTION,
-
-	//-------------------------
-	//not used
-	//-------------------------
-
-	LAST
-};
-
-#endif

common/network/serial_utility.cpp

@@ -1,119 +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_utility.hpp"
-
-//packet types
-#include "character_packet.hpp"
-#include "client_packet.hpp"
-#include "region_packet.hpp"
-#include "server_packet.hpp"
-#include "text_packet.hpp"
-
-#include <cstring>
-
-//raw memory copy
-void serialCopy(void** buffer, void* data, int size) {
-	memcpy(*buffer, data, size);
-	*buffer = reinterpret_cast<char*>(*buffer) + size;
-}
-
-void deserialCopy(void** buffer, void* data, int size) {
-	memcpy(data, *buffer, size);
-	*buffer = reinterpret_cast<char*>(*buffer) + size;
-}
-
-//DOCS: The server and client MUST use the correct packet types
-
-//main switch functions
-void serializePacket(void* buffer, SerialPacketBase* packet) {
-	switch(packet->type) {
-		case SerialPacketType::PING:
-		case SerialPacketType::PONG:
-		case SerialPacketType::BROADCAST_REQUEST:
-		case SerialPacketType::BROADCAST_RESPONSE:
-			serializeServer(buffer, static_cast<ServerPacket*>(packet));
-		break;
-		case SerialPacketType::JOIN_REQUEST:
-		case SerialPacketType::JOIN_RESPONSE:
-		case SerialPacketType::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:
-			serializeCharacter(buffer, static_cast<CharacterPacket*>(packet));
-		break;
-		case SerialPacketType::TEXT_BROADCAST:
-		case SerialPacketType::JOIN_REJECTION:
-		case SerialPacketType::SHUTDOWN_REJECTION:
-		case SerialPacketType::CHARACTER_REJECTION:
-			serializeText(buffer, static_cast<TextPacket*>(packet));
-		break;
-	}
-}
-
-void deserializePacket(void* buffer, SerialPacketBase* packet) {
-	//find the type, so that you can actually deserialize the packet!
-	SerialPacketType type;
-	memcpy(&type, buffer, sizeof(SerialPacketType));
-
-	switch(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::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:
-			deserializeCharacter(buffer, static_cast<CharacterPacket*>(packet));
-		break;
-		case SerialPacketType::TEXT_BROADCAST:
-		case SerialPacketType::JOIN_REJECTION:
-		case SerialPacketType::SHUTDOWN_REJECTION:
-		case SerialPacketType::CHARACTER_REJECTION:
-			deserializeText(buffer, static_cast<TextPacket*>(packet));
-		break;
-	}
-}

common/network/udp_network_utility.cpp

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

common/network/udp_network_utility.hpp

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

common/utilities/bounding_box.hpp

@@ -32,7 +32,6 @@ 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;
@@ -63,7 +62,7 @@ public:
 };
 
 //This is explicitly a POD
-static_assert(std::is_pod<BoundingBox>::value, "BoundingBox is not a POD");
+static_assert(std::is_pod<Vector2>::value, "BoundingBox is not a POD");
 
 #include "vector2.hpp"
 

common/utilities/config_utility.cpp

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

@@ -1,58 +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 CONFIGUTILITY_HPP_
-#define CONFIGUTILITY_HPP_
-
-#include "singleton.hpp"
-
-#include <map>
-#include <string>
-
-class ConfigUtility : public Singleton<ConfigUtility> {
-public:
-	void Load(std::string fname, int argc = 0, char* argv[] = nullptr);
-
-	//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

@@ -1,63 +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 SINGLETON_HPP_
-#define SINGLETON_HPP_
-
-#include <stdexcept>
-
-template<typename T>
-class Singleton {
-public:
-	static T& GetSingleton() {
-		if (!ptr) {
-			throw(std::logic_error("This singleton has not been created"));
-		}
-		return *ptr;
-	}
-	static void CreateSingleton() {
-		if (ptr) {
-			throw(std::logic_error("This singleton has already been created"));
-		}
-		ptr = new T();
-	}
-	static void DeleteSingleton() {
-		if (!ptr) {
-			throw(std::logic_error("A non-existant singleton cannot be deleted"));
-		}
-		delete ptr;
-		ptr = nullptr;
-	}
-
-protected:
-	Singleton() = default;
-	Singleton(Singleton const&) = default;
-	Singleton(Singleton&&) = default;
-	~Singleton() = default;
-
-private:
-	static T* ptr;
-};
-
-template<typename T>
-T* Singleton<T>::ptr = nullptr;
-
-#endif

common/utilities/sql_utility.cpp

@@ -19,7 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "sql_tools.hpp"
+#include "sql_utility.hpp"
 
 #include "utility.hpp"
 

common/utilities/utility.cpp

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

@@ -1,15 +0,0 @@
-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,6 +3,11 @@
 #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)
@@ -10,17 +15,6 @@ 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

@@ -1,31 +0,0 @@
-#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/map_maker.lua

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

rsc/scripts/setup_server.lua

@@ -1,12 +1,45 @@
 print("Lua script check")
 
-mapMaker = require "map_maker"
-mapSaver = require "map_saver"
+--uber lazy declarations
+function math.sqr(x) return x*x end
+function math.dist(x, y, i, j) return math.sqrt(math.sqr(x - i) + math.sqr(y - j)) end
 
---BUG: #35 The server fails without at least one room
---TODO: Create rooms with names?
-newRoom = RoomManager.CreateRoom("overworld", "overworld.bmp")
-pager = Room.GetPager(newRoom)
-RegionPager.SetOnCreate(pager, mapMaker.debugIsland)
+--objects to work on
+--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 = {
+	plains	= base + shift * 0,
+	grass	= base + shift * 1,
+	dirt	= base + shift * 2,
+	sand	= base + shift * 3,
+	water	= base + shift * 4
+}
+
+--TODO: could set custom generation systems here, that differ from the global generators, etc.
+--TODO: I need a way to allow for different generation algorithms for different pager objects
+--TODO: This design requires only one pager, but this is not good.
+function Region.Create(region)
+	for i = 1, Region.GetWidth() do
+		for j = 1, Region.GetHeight() do
+			local dist = math.dist(0, 0, i + Region.GetX(region) -1, j + Region.GetY(region) -1)
+			if dist < 10 then
+				Region.SetTile(region, i, j, 1, tiles.plains)
+			elseif dist < 12 then
+				Region.SetTile(region, i, j, 1, tiles.sand)
+			else
+				Region.SetTile(region, i, j, 1, tiles.water)
+				Region.SetSolid(region, i, j, true)
+			end
+		end
+	end
+end
 
 print("Finished the lua script")

rsc/scripts/setup_server.sql

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

rsc/setup.lua

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