I fucking hate collisions

Conflicts:
	server/server_logic.cpp

Finally merging the changes to develop. This is only the ConfigUtility
skipping missing files, and something with the Timer class, that I'll need
to test the collisions.

README.md

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

README.txt

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

client/channels.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages

client/client_application.cpp

@@ -1,11 +1,11 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * 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 ClientApplications, and to alter it and redistribute it
+ * 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
@@ -21,10 +21,12 @@
 */
 #include "client_application.hpp"
 
-#include "serial.hpp"
+#include "serial_packet.hpp"
+#include "config_utility.hpp"
 
 #include <stdexcept>
 #include <chrono>
+#include <iostream>
 
 //-------------------------
 //Scene headers
@@ -36,32 +38,82 @@
 #include "options_menu.hpp"
 #include "lobby_menu.hpp"
 #include "in_world.hpp"
-#include "in_combat.hpp"
-#include "restart.hpp"
+#include "disconnected_screen.hpp"
 
 //-------------------------
 //Public access members
 //-------------------------
 
-void ClientApplication::Init(int argc, char** argv) {
+void ClientApplication::Init(int argc, char* argv[]) {
+	std::cout << "Beginning " << argv[0] << std::endl;
+
 	//load the prerequisites
-	config.Load("rsc\\config.cfg");
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+	config.Load("rsc/config.cfg", false, argc, argv);
+
+	//-------------------------
+	//Initialize the APIs
+	//-------------------------
 
 	//initialize SDL
 	if (SDL_Init(SDL_INIT_VIDEO)) {
 		throw(std::runtime_error("Failed to initialize SDL"));
 	}
-	int w = config.Int("client.screen.w");
-	int h = config.Int("client.screen.h");
-	int f = config.Bool("client.screen.f") ? SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_FULLSCREEN : SDL_HWSURFACE|SDL_DOUBLEBUF;
-
-	BaseScene::SetScreen(w ? w : 800, h ? h : 600, 0, f);
+	std::cout << "Initialized SDL" << std::endl;
 
 	//initialize SDL_net
 	if (SDLNet_Init()) {
 		throw(std::runtime_error("Failed to initialize SDL_net"));
 	}
-	network.Open(0);
+	UDPNetworkUtility::GetSingleton().Open(0);
+	std::cout << "Initialized SDL_net" << std::endl;
+
+	//-------------------------
+	//Setup the screen
+	//-------------------------
+
+	int w = config.Int("client.screen.w");
+	int h = config.Int("client.screen.h");
+	int f = config.Bool("client.screen.f") ? SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_FULLSCREEN : SDL_HWSURFACE|SDL_DOUBLEBUF;
+
+	BaseScene::SetScreen(w ? w : 800, h ? h : 600, 0, f);
+	std::cout << "Initialized the screen" << std::endl;
+
+	//-------------------------
+	//debug output
+	//-------------------------
+
+	//TODO: enable/disable these with a switch
+#define DEBUG_OUTPUT_VAR(x) std::cout << "\t" << #x << ": " << x << std::endl;
+
+	std::cout << "Internal sizes:" << std::endl;
+
+	DEBUG_OUTPUT_VAR(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(PACKET_BUFFER_SIZE);
+	DEBUG_OUTPUT_VAR(MAX_PACKET_SIZE);
+	DEBUG_OUTPUT_VAR(static_cast<int>(SerialPacketType::LAST));
+
+#undef DEBUG_OUTPUT_VAR
+
+	//-------------------------
+	//finalize the startup
+	//-------------------------
+
+	std::cout << "Startup completed successfully" << std::endl;
+
+	//-------------------------
+	//debugging
+	//-------------------------
+
+	//...
 }
 
 void ClientApplication::Proc() {
@@ -70,7 +122,6 @@ void ClientApplication::Proc() {
 	//prepare the time system
 	typedef std::chrono::steady_clock Clock;
 
-	std::chrono::duration<int, std::milli> delta(16);
 	Clock::time_point simTime = Clock::now();
 	Clock::time_point realTime;
 
@@ -88,8 +139,9 @@ void ClientApplication::Proc() {
 		//simulate game time
 		while (simTime < realTime) {
 			//call each user defined function
-			activeScene->RunFrame(double(delta.count()) / std::chrono::duration<int, std::milli>::period::den);
-			simTime += delta;
+			activeScene->RunFrame();
+			//~60 FPS
+			simTime += std::chrono::duration<int, std::milli>(16);
 		}
 
 		//draw the game to the screen
@@ -100,9 +152,11 @@ void ClientApplication::Proc() {
 }
 
 void ClientApplication::Quit() {
-	network.Close();
+	std::cout << "Shutting down" << std::endl;
+	UDPNetworkUtility::GetSingleton().Close();
 	SDLNet_Quit();
 	SDL_Quit();
+	std::cout << "Clean exit" << std::endl;
 }
 
 //-------------------------
@@ -115,25 +169,22 @@ void ClientApplication::LoadScene(SceneList sceneIndex) {
 		//add scene creation calls here
 		case SceneList::FIRST:
 		case SceneList::SPLASHSCREEN:
-			activeScene = new SplashScreen(&config);
+			activeScene = new SplashScreen();
 		break;
 		case SceneList::MAINMENU:
-			activeScene = new MainMenu(&config);
+			activeScene = new MainMenu();
 		break;
 		case SceneList::OPTIONSMENU:
-			activeScene = new OptionsMenu(&config);
+			activeScene = new OptionsMenu();
 		break;
 		case SceneList::LOBBYMENU:
-			activeScene = new LobbyMenu(&config, &network, &clientIndex, &accountIndex);
+			activeScene = new LobbyMenu(&clientIndex, &accountIndex);
 		break;
 		case SceneList::INWORLD:
-			activeScene = new InWorld(&config, &network, &clientIndex, &accountIndex, &characterIndex, &combatMap, &characterMap);
+			activeScene = new InWorld(&clientIndex, &accountIndex);
 		break;
-		case SceneList::INCOMBAT:
-			activeScene = new InCombat(&config, &network, &clientIndex, &accountIndex, &characterIndex, &combatMap, &characterMap, &enemyMap);
-		break;
-		case SceneList::RESTART:
-			activeScene = new Restart(&config, &network, &clientIndex, &accountIndex, &characterIndex, &combatMap, &characterMap, &enemyMap);
+		case SceneList::DISCONNECTEDSCREEN:
+			activeScene = new DisconnectedScreen();
 		break;
 		default:
 			throw(std::logic_error("Failed to recognize the scene index"));

client/client_application.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -25,24 +25,25 @@
 #include "scene_list.hpp"
 #include "base_scene.hpp"
 
-#include "config_utility.hpp"
 #include "udp_network_utility.hpp"
-#include "character_data.hpp"
-#include "combat_data.hpp"
-#include "enemy_data.hpp"
+
+#include "singleton.hpp"
 
 #include <map>
 
-class ClientApplication {
+class ClientApplication: public Singleton<ClientApplication> {
 public:
-	ClientApplication() = default;
-	~ClientApplication() = default;
-
-	void Init(int argc, char** argv);
+	//public methods
+	void Init(int argc, char* argv[]);
 	void Proc();
 	void Quit();
 
 private:
+	friend Singleton<ClientApplication>;
+
+	ClientApplication() = default;
+	~ClientApplication() = default;
+
 	//Private access members
 	void LoadScene(SceneList sceneIndex);
 	void UnloadScene();
@@ -50,15 +51,8 @@ private:
 	BaseScene* activeScene = nullptr;
 
 	//shared parameters
-	ConfigUtility config;
-	UDPNetworkUtility network;
 	int clientIndex = -1;
 	int accountIndex = -1;
-	int characterIndex = -1;
-
-	std::map<int, CombatData> combatMap;
-	std::map<int, CharacterData> characterMap;
-	std::map<int, EnemyData> enemyMap;
 };
 
 #endif

client/client_utilities/makefile

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

client/client_utilities/terminal_error.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * 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,5 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CLIENTDATA_HPP_
-#define CLIENTDATA_HPP_
+#include "terminal_error.hpp"
 
-#include "SDL/SDL_net.h"
-
-struct ClientData {
-	IPaddress address = {0,0};
-};
-
-#endif

client/client_utilities/terminal_error.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * 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,27 +19,16 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ROOMDATA_HPP_
-#define ROOMDATA_HPP_
+#ifndef TERMINALERROR_HPP_
+#define TERMINALERROR_HPP_
 
-//map system
-#include "region_pager_lua.hpp"
+#include <stdexcept>
+#include <string>
 
-struct RoomData {
-	enum class RoomType {
-		OVERWORLD = 0,
-		RUINS = 1,
-		TOWERS = 2,
-		FORESTS = 3,
-		CAVE = 4,
-	};
-
-	//members
-	RegionPagerLua pager;
-	RoomType type;
-
-	//TODO: collision map
-	//TODO: NPCs?
+class terminal_error: public std::runtime_error {
+public:
+	explicit terminal_error(const std::string& str): runtime_error(str) {}
+	explicit terminal_error(const char* cstr): runtime_error(cstr) {}
 };
 
 #endif

client/entities/base_character.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * 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,27 +19,15 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "character_data.hpp"
+#include "base_character.hpp"
 
-void CharacterData::Update(double delta) {
-	if (motion.x && motion.y) {
-		origin += motion * delta * CHARACTER_WALKING_MOD;
-	}
-	else if (motion != 0) {
-		origin += motion * delta;
-	}
-#ifdef GRAPHICS
-	sprite.Update(delta);
-#endif
-}
+#include "config_utility.hpp"
 
-#ifdef GRAPHICS
+//-------------------------
+//graphics
+//-------------------------
 
-void CharacterData::DrawTo(SDL_Surface* const dest, int camX, int camY) {
-	sprite.DrawTo(dest, origin.x - camX, origin.y - camY);
-}
-
-void CharacterData::CorrectSprite() {
+void BaseCharacter::CorrectSprite() {
 	//NOTE: These must correspond to the sprite sheet in use
 	if (motion.y > 0) {
 		sprite.SetYIndex(0);
@@ -64,4 +52,32 @@ void CharacterData::CorrectSprite() {
 	}
 }
 
-#endif
+//-------------------------
+//metadata
+//-------------------------
+
+int BaseCharacter::SetOwner(int i) {
+	return owner = i;
+}
+
+int BaseCharacter::GetOwner() {
+	return owner;
+}
+
+std::string BaseCharacter::SetHandle(std::string s) {
+	return handle = s;
+}
+
+std::string BaseCharacter::GetHandle() const {
+	return handle;
+}
+
+std::string BaseCharacter::SetAvatar(std::string s) {
+	avatar = s;
+	sprite.LoadSurface(ConfigUtility::GetSingleton()["dir.sprites"] + avatar, CHARACTER_CELLS_X, CHARACTER_CELLS_Y);
+	return avatar;
+}
+
+std::string BaseCharacter::GetAvatar() const {
+	return avatar;
+}

client/entities/base_character.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * 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,44 +19,37 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ENEMYDATA_HPP_
-#define ENEMYDATA_HPP_
+#ifndef BASECHARACTER_HPP_
+#define BASECHARACTER_HPP_
 
-#include "vector2.hpp"
-#include "statistics.hpp"
-
-//graphics
-#ifdef GRAPHICS
- #include "sprite_sheet.hpp"
-#endif
+//components
+#include "character_defines.hpp"
+#include "entity.hpp"
 
 //std namespace
 #include <string>
 
-struct EnemyData {
+class BaseCharacter: public Entity {
+public:
+	BaseCharacter() = default;
+	virtual ~BaseCharacter() = default;
+
+	//graphics
+	void CorrectSprite();
+
 	//metadata
+	int SetOwner(int i);
+	int GetOwner();
+	std::string SetHandle(std::string s);
+	std::string GetHandle() const;
+	std::string SetAvatar(std::string s);
+	std::string GetAvatar() const;
+
+protected:
+	//metadata
+	int owner;
 	std::string handle;
 	std::string avatar;
-
-	//gameplay
-	Statistics stats;
-
-	//TODO: equipment
-	//TODO: items
-	//TODO: buffs
-	//TODO: debuffs
-
-	//TODO: rewards
-
-	//active gameplay members
-	//NOTE: these are lost when unloaded
-#ifdef GRAPHICS
-	SpriteSheet sprite;
-	Vector2 origin = {0.0,0.0};
-	Vector2 bounds = {0.0,0.0};
-#endif
-	int tableIndex;
-	int atbGauge = 0;
 };
 
 #endif

client/entities/base_monster.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,12 +19,5 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef PAGERAPI_HPP_
-#define PAGERAPI_HPP_
+#include "base_monster.hpp"
 
-#include "lua/lua.hpp"
-
-#define LUA_PAGERLIBNAME "pager"
-LUAMOD_API int luaopen_pagerapi(lua_State* L);
-
-#endif

client/entities/base_monster.hpp

@@ -0,0 +1,36 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef BASEMONSTER_HPP_
+#define BASEMONSTER_HPP_
+
+#include "entity.hpp"
+
+class BaseMonster: public Entity {
+public:
+	BaseMonster() = default;
+	virtual ~BaseMonster() = default;
+
+protected:
+	//
+};
+
+#endif

client/entities/entity.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,36 +19,45 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "enemy_manager.hpp"
+#include "entity.hpp"
 
-//-------------------------
-//public access methods
-//-------------------------
-
-//TODO
-
-//-------------------------
-//accessors and mutators
-//-------------------------
-
-EnemyData* EnemyManager::GetEnemy(int uid) {
-	std::map<int, EnemyData>::iterator it = enemyMap.find(uid);
-
-	if (it == enemyMap.end()) {
-		return nullptr;
-	}
-
-	return &it->second;
+void Entity::Update() {
+	origin += motion;
+	sprite.Update(0.016);
 }
 
-std::map<int, EnemyData>* EnemyManager::GetContainer() {
-	return &enemyMap;
+void Entity::DrawTo(SDL_Surface* const dest, int camX, int camY) {
+	sprite.DrawTo(dest, origin.x - camX, origin.y - camY);
 }
 
-lua_State* EnemyManager::SetLuaState(lua_State* L) {
-	return luaState = L;
+SpriteSheet* Entity::GetSprite() {
+	return &sprite;
 }
 
-lua_State* EnemyManager::GetLuaState() {
-	return luaState;
+//-------------------------
+//accessors & mutators
+//-------------------------
+
+Vector2 Entity::SetOrigin(Vector2 v) {
+	return origin = v;
 }
+
+Vector2 Entity::SetMotion(Vector2 v) {
+	return motion = v;
+}
+
+BoundingBox Entity::SetBounds(BoundingBox b) {
+	return bounds = b;
+}
+
+Vector2 Entity::GetOrigin() {
+	return origin;
+}
+
+Vector2 Entity::GetMotion() {
+	return motion;
+}
+
+BoundingBox Entity::GetBounds() {
+	return bounds;
+}

client/entities/entity.hpp

@@ -0,0 +1,56 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef ENTITY_HPP_
+#define ENTITY_HPP_
+
+#include "bounding_box.hpp"
+#include "sprite_sheet.hpp"
+#include "vector2.hpp"
+
+//The base class for all objects in the world
+class Entity {
+public:
+	virtual void Update();
+	virtual void DrawTo(SDL_Surface* const, int camX, int camY);
+
+	SpriteSheet* GetSprite();
+
+	//accessors & mutators
+	Vector2 SetOrigin(Vector2 v);
+	Vector2 SetMotion(Vector2 v);
+	BoundingBox SetBounds(BoundingBox b);
+
+	Vector2 GetOrigin();
+	Vector2 GetMotion();
+	BoundingBox GetBounds();
+
+protected:
+	Entity() = default;
+	virtual ~Entity() = default;
+
+	SpriteSheet sprite;
+	Vector2 origin;
+	Vector2 motion;
+	BoundingBox bounds;
+};
+
+#endif

client/entities/local_character.cpp

@@ -0,0 +1,79 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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"
+
+bool LocalCharacter::ProcessCollisions(std::list<BoundingBox>& boxList) {
+	if (CheckCollisionSimple(boxList, origin + motion)) {
+		Vector2 velocity;
+		velocity.x = CorrectVelocityX(boxList, motion.x);
+		velocity.y = CorrectVelocityY(boxList, motion.y);
+		origin += velocity;
+		return true;
+	}
+	else {
+		origin += motion;
+		return false;
+	}
+}
+
+bool LocalCharacter::CheckCollisionSimple(std::list<BoundingBox>& boxList, Vector2 newPos) {
+	for (auto& it : boxList) {
+		if (it.CheckOverlap(bounds + newPos)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+double LocalCharacter::CorrectVelocityX(std::list<BoundingBox>& boxList, double velocityX) {
+	double ret = velocityX;
+	for (auto& it : boxList) {
+		if (it.CheckOverlap(bounds + origin + Vector2(velocityX, 0) )) {
+			if (velocityX > 0) {
+				ret = std::min(ret, it.x - (origin.x + bounds.x + bounds.w -1));
+				ret = std::min(ret, 0.0);
+			}
+			else if (velocityX < 0) {
+				ret = std::max(ret, (it.x + it.w) - (origin.x + bounds.x));
+				ret = std::max(ret, 0.0);
+			}
+		}
+	}
+	return ret;
+}
+
+double LocalCharacter::CorrectVelocityY(std::list<BoundingBox>& boxList, double velocityY) {
+	double ret = velocityY;
+	for (auto& it : boxList) {
+		if (it.CheckOverlap(bounds + origin + Vector2(0, velocityY) )) {
+			if (velocityY > 0) {
+				ret = std::min(ret, it.y - (origin.y + bounds.y + bounds.h -1));
+				ret = std::min(ret, 0.0);
+			}
+			else if (velocityY < 0) {
+				ret = std::max(ret, (it.y + it.h) - (origin.y + bounds.y));
+				ret = std::max(ret, 0.0);
+			}
+		}
+	}
+	return ret;
+}

client/entities/local_character.hpp

@@ -0,0 +1,44 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 LOCALCHARACTER_HPP_
+#define LOCALCHARACTER_HPP_
+
+#include "base_character.hpp"
+#include "bounding_box.hpp"
+#include "vector2.hpp"
+
+#include <list>
+
+class LocalCharacter: public BaseCharacter {
+public:
+	LocalCharacter() = default;
+	virtual ~LocalCharacter() = default;
+
+	bool ProcessCollisions(std::list<BoundingBox>& boxList);
+
+protected:
+	bool CheckCollisionSimple(std::list<BoundingBox>& boxList, Vector2 newPos);
+	double CorrectVelocityX(std::list<BoundingBox>& boxList, double velocityX);
+	double CorrectVelocityY(std::list<BoundingBox>& boxList, double velocityY);
+};
+
+#endif

client/entities/makefile

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

client/in_combat.cpp

@@ -1,232 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "in_combat.hpp"
-
-#include "channels.hpp"
-#include "utility.hpp"
-
-#include <stdexcept>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-InCombat::InCombat(
-	ConfigUtility* const argConfig,
-	UDPNetworkUtility* const argNetwork,
-	int* const argClientIndex,
-	int* const argAccountIndex,
-	int* const argCharacterIndex,
-	std::map<int, CombatData>* argCombatMap,
-	std::map<int, CharacterData>* argCharacterMap,
-	std::map<int, EnemyData>* argEnemyMap
-	):
-	config(*argConfig),
-	network(*argNetwork),
-	clientIndex(*argClientIndex),
-	accountIndex(*argAccountIndex),
-	characterIndex(*argCharacterIndex),
-	combatMap(*argCombatMap),
-	characterMap(*argCharacterMap),
-	enemyMap(*argEnemyMap)
-{
-/*	//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::MAINMENU);
-}
-
-void InCombat::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	//
-}
-
-void InCombat::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void InCombat::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void InCombat::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			QuitEvent();
-			break;
-	}
-}
-
-void InCombat::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}
-
-//-------------------------
-//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::RESTART);
-}
-
-//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: equipment
-	//TODO: items
-	//TODO: buffs
-	//TODO: 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/in_combat.hpp

@@ -1,105 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef INCOMBAT_HPP_
-#define INCOMBAT_HPP_
-
-//network
-#include "udp_network_utility.hpp"
-
-//graphics
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-
-//common
-#include "config_utility.hpp"
-#include "frame_rate.hpp"
-
-#include "combat_data.hpp"
-#include "character_data.hpp"
-#include "enemy_data.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,
-		std::map<int, CombatData>* argCombatMap,
-		std::map<int, CharacterData>* argCharacterMap,
-		std::map<int, EnemyData>* argEnemyMap
-	);
-	~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);
-	//TODO: more network handlers
-
-	//Server control
-	void RequestSynchronize();
-	void SendPlayerUpdate();
-	void RequestDisconnect();
-	void RequestShutdown();
-	//TODO: more
-
-	//shared parameters
-	ConfigUtility& config;
-	UDPNetworkUtility& network;
-	int& clientIndex;
-	int& accountIndex;
-	int& characterIndex;
-	std::map<int, CombatData>& combatMap;
-	std::map<int, CharacterData>& characterMap;
-	std::map<int, EnemyData>& enemyMap;
-
-	//graphics
-	//TODO: graphics
-
-	//UI
-	//TODO: UI
-	FrameRate fps;
-};
-
-#endif

client/in_world.cpp

@@ -1,468 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "in_world.hpp"
-
-#include "channels.hpp"
-#include "utility.hpp"
-
-#include <algorithm>
-#include <cmath>
-#include <stdexcept>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-InWorld::InWorld(
-	ConfigUtility* const argConfig,
-	UDPNetworkUtility* const argNetwork,
-	int* const argClientIndex,
-	int* const argAccountIndex,
-	int* const argCharacterIndex,
-	std::map<int, CombatData>* argCombatMap,
-	std::map<int, CharacterData>* argCharacterMap
-	):
-	config(*argConfig),
-	network(*argNetwork),
-	clientIndex(*argClientIndex),
-	accountIndex(*argAccountIndex),
-	characterIndex(*argCharacterIndex),
-	combatMap(*argCombatMap),
-	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
-	disconnectButton.SetImage(&buttonImage);
-	disconnectButton.SetFont(&font);
-	shutDownButton.SetImage(&buttonImage);
-	shutDownButton.SetFont(&font);
-
-	//set the button positions
-	disconnectButton.SetX(50);
-	disconnectButton.SetY(50 + buttonImage.GetClipH() * 0);
-	shutDownButton.SetX(50);
-	shutDownButton.SetY(50 + buttonImage.GetClipH() * 1);
-
-	//set the button texts
-	disconnectButton.SetText("Disconnect");
-	shutDownButton.SetText("Shut Down");
-
-	//load the tilesheet
-	//TODO: add the tilesheet to the map system?
-	tileSheet.Load(config["dir.tilesets"] + "terrain.bmp", 12, 15);
-
-	//request a sync
-	RequestSynchronize();
-
-	//debug
-	//
-}
-
-InWorld::~InWorld() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void InWorld::FrameStart() {
-	//
-}
-
-void InWorld::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));
-
-	//update the characters
-	for (auto& it : characterMap) {
-		it.second.Update(delta);
-	}
-
-	//update the camera
-	if(localCharacter) {
-		camera.x = localCharacter->origin.x - camera.marginX;
-		camera.y = localCharacter->origin.y - camera.marginY;
-	}
-
-	//check the map
-	UpdateMap();
-}
-
-void InWorld::FrameEnd() {
-	//
-}
-
-void InWorld::RenderFrame() {
-//	SDL_FillRect(GetScreen(), 0, 0);
-	Render(GetScreen());
-	SDL_Flip(GetScreen());
-	fps.Calculate();
-}
-
-void InWorld::Render(SDL_Surface* const screen) {
-	//draw the map
-	for (std::list<Region>::iterator it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); it++) {
-		tileSheet.DrawRegionTo(screen, &(*it), camera.x, camera.y);
-	}
-
-	//draw characters
-	for (auto& it : characterMap) {
-		//TODO: drawing order according to Y origin
-		it.second.DrawTo(screen, camera.x, camera.y);
-	}
-
-	//draw UI
-	disconnectButton.DrawTo(screen);
-	shutDownButton.DrawTo(screen);
-	font.DrawStringTo(to_string_custom(fps.GetFrameRate()), screen, 0, 0);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void InWorld::QuitEvent() {
-	//exit the game AND the server
-	RequestDisconnect();
-	SetNextScene(SceneList::MAINMENU);
-}
-
-void InWorld::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	disconnectButton.MouseMotion(motion);
-	shutDownButton.MouseMotion(motion);
-}
-
-void InWorld::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	disconnectButton.MouseButtonDown(button);
-	shutDownButton.MouseButtonDown(button);
-}
-
-void InWorld::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (disconnectButton.MouseButtonUp(button) == Button::State::HOVER) {
-		RequestDisconnect();
-	}
-	if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER) {
-		RequestShutDown();
-	}
-}
-
-void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE: {
-			QuitEvent();
-		}
-		break;
-
-		//player movement
-		case SDLK_LEFT:
-			if (localCharacter) {
-				localCharacter->motion.x -= CHARACTER_WALKING_SPEED;
-				localCharacter->CorrectSprite();
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_RIGHT:
-			if (localCharacter) {
-				localCharacter->motion.x += CHARACTER_WALKING_SPEED;
-				localCharacter->CorrectSprite();
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_UP:
-			if (localCharacter) {
-				localCharacter->motion.y -= CHARACTER_WALKING_SPEED;
-				localCharacter->CorrectSprite();
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_DOWN:
-			if (localCharacter) {
-				localCharacter->motion.y += CHARACTER_WALKING_SPEED;
-				localCharacter->CorrectSprite();
-				SendPlayerUpdate();
-			}
-		break;
-	}
-}
-
-void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		//player movement
-		case SDLK_LEFT:
-			if (localCharacter) {
-				localCharacter->motion.x += CHARACTER_WALKING_SPEED;
-				localCharacter->CorrectSprite();
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_RIGHT:
-			if (localCharacter) {
-				localCharacter->motion.x -= CHARACTER_WALKING_SPEED;
-				localCharacter->CorrectSprite();
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_UP:
-			if (localCharacter) {
-				localCharacter->motion.y += CHARACTER_WALKING_SPEED;
-				localCharacter->CorrectSprite();
-				SendPlayerUpdate();
-			}
-		break;
-
-		case SDLK_DOWN:
-			if (localCharacter) {
-				localCharacter->motion.y -= CHARACTER_WALKING_SPEED;
-				localCharacter->CorrectSprite();
-				SendPlayerUpdate();
-			}
-		break;
-	}
-}
-
-//-------------------------
-//Network handlers
-//-------------------------
-
-void InWorld::HandlePacket(SerialPacket* const argPacket) {
-	switch(argPacket->type) {
-		case SerialPacketType::DISCONNECT:
-			HandleDisconnect(argPacket);
-		break;
-		case SerialPacketType::CHARACTER_NEW:
-			HandleCharacterNew(static_cast<CharacterPacket*>(argPacket));
-		break;
-		case SerialPacketType::CHARACTER_DELETE:
-			HandleCharacterDelete(static_cast<CharacterPacket*>(argPacket));
-		break;
-		case SerialPacketType::CHARACTER_UPDATE:
-			HandleCharacterUpdate(static_cast<CharacterPacket*>(argPacket));
-		break;
-		case SerialPacketType::REGION_CONTENT:
-			HandleRegionContent(static_cast<RegionPacket*>(argPacket));
-		break;
-		//handle errors
-		default:
-			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in InWorld: " + to_string_custom(static_cast<int>(argPacket->type)) ));
-		break;
-	}
-}
-
-void InWorld::HandleDisconnect(SerialPacket* const argPacket) {
-	SetNextScene(SceneList::RESTART);
-}
-
-void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
-	if (characterMap.find(argPacket->characterIndex) != characterMap.end()) {
-		throw(std::runtime_error("Cannot create duplicate characters"));
-	}
-
-	//create the character object
-	CharacterData& character = characterMap[argPacket->characterIndex];
-
-	//set the members
-	character.handle = argPacket->handle;
-	character.avatar = argPacket->avatar;
-	character.sprite.LoadSurface(config["dir.sprites"] + character.avatar, 4, 4);
-	character.roomIndex = argPacket->roomIndex;
-	character.origin = argPacket->origin;
-	character.motion = argPacket->motion;
-	character.stats = argPacket->stats;
-
-	character.CorrectSprite();
-
-	//catch this client's player object
-	if (argPacket->accountIndex == accountIndex && !localCharacter) {
-		characterIndex = argPacket->characterIndex;
-		localCharacter = &character;
-
-		//setup the camera
-		camera.width = GetScreen()->w;
-		camera.height = GetScreen()->h;
-
-		//center on the player's character
-		camera.marginX = (GetScreen()->w / 2 - localCharacter->sprite.GetImage()->GetClipW() / 2);
-		camera.marginY = (GetScreen()->h / 2 - localCharacter->sprite.GetImage()->GetClipH() / 2);
-	}
-}
-
-void InWorld::HandleCharacterDelete(CharacterPacket* const argPacket) {
-	//TODO: authenticate when own character is being deleted (linked to a TODO in the server)
-	//catch this client's player object
-	if (argPacket->characterIndex == characterIndex) {
-		characterIndex = -1;
-		localCharacter = nullptr;
-	}
-
-	characterMap.erase(argPacket->characterIndex);
-}
-
-void InWorld::HandleCharacterUpdate(CharacterPacket* const argPacket) {
-	if (characterMap.find(argPacket->characterIndex) == characterMap.end()) {
-		HandleCharacterNew(argPacket);
-		return;
-	}
-
-	CharacterData& character = characterMap[argPacket->characterIndex];
-
-	//other characters moving
-	if (argPacket->characterIndex != characterIndex) {
-		character.roomIndex = argPacket->roomIndex;
-		character.origin = argPacket->origin;
-		character.motion = argPacket->motion;
-		character.CorrectSprite();
-	}
-}
-
-void InWorld::HandleRegionContent(RegionPacket* const argPacket) {
-	//replace existing regions
-	regionPager.UnloadRegion(argPacket->x, argPacket->y);
-	regionPager.PushRegion(argPacket->region);
-
-	//clean up after the serial code
-	delete argPacket->region;
-	argPacket->region = nullptr;
-}
-
-//-------------------------
-//Server control
-//-------------------------
-
-void InWorld::RequestSynchronize() {
-	ClientPacket newPacket;
-
-	//request a sync
-	newPacket.type = SerialPacketType::SYNCHRONIZE;
-	newPacket.clientIndex = clientIndex;
-	newPacket.accountIndex = accountIndex;
-
-	network.SendTo(Channels::SERVER, &newPacket);
-}
-
-void InWorld::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: equipment
-	//TODO: items
-	//TODO: buffs
-	//TODO: debuffs
-
-	network.SendTo(Channels::SERVER, &newPacket);
-}
-
-void InWorld::RequestDisconnect() {
-	ClientPacket newPacket;
-
-	//send a disconnect request
-	newPacket.type = SerialPacketType::DISCONNECT;
-	newPacket.clientIndex = clientIndex;
-	newPacket.accountIndex = accountIndex;
-
-	network.SendTo(Channels::SERVER, &newPacket);
-}
-
-void InWorld::RequestShutDown() {
-	ClientPacket newPacket;
-
-	//send a shutdown request
-	newPacket.type = SerialPacketType::SHUTDOWN;
-	newPacket.clientIndex = clientIndex;
-	newPacket.accountIndex = accountIndex;
-
-	network.SendTo(Channels::SERVER, &newPacket);
-}
-
-void InWorld::RequestRegion(int roomIndex, int x, int y) {
-	RegionPacket packet;
-
-	//pack the region's data
-	packet.type = SerialPacketType::REGION_REQUEST;
-	packet.roomIndex = roomIndex;
-	packet.x = x;
-	packet.y = y;
-
-	network.SendTo(Channels::SERVER, &packet);
-}
-
-//-------------------------
-//Utilities
-//-------------------------
-
-//TODO: convert this into a more generic function?; using parameters for the bounds
-void InWorld::UpdateMap() {
-	//these represent the zone of regions that the client needs loaded, including the mandatory buffers (+1/-1)
-	int xStart = snapToBase(REGION_WIDTH, camera.x/tileSheet.GetTileW()) - REGION_WIDTH;
-	int xEnd = snapToBase(REGION_WIDTH, (camera.x+camera.width)/tileSheet.GetTileW()) + REGION_WIDTH;
-
-	int yStart = snapToBase(REGION_HEIGHT, camera.y/tileSheet.GetTileH()) - REGION_HEIGHT;
-	int yEnd = snapToBase(REGION_HEIGHT, (camera.y+camera.height)/tileSheet.GetTileH()) + REGION_HEIGHT;
-
-	//prune distant regions
-	for (std::list<Region>::iterator it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); /* EMPTY */) {
-		//check if the region is outside off this area
-		if (it->GetX() < xStart || it->GetX() > xEnd || it->GetY() < yStart || it->GetY() > yEnd) {
-
-			//clunky, but the alternative was time consuming
-			int tmpX = it->GetX();
-			int tmpY = it->GetY();
-			++it;
-
-			regionPager.UnloadRegion(tmpX, tmpY);
-			continue;
-		}
-		++it;
-	}
-
-	//request empty regions within this zone
-	for (int i = xStart; i <= xEnd; i += REGION_WIDTH) {
-		for (int j = yStart; j <= yEnd; j += REGION_HEIGHT) {
-			if (!regionPager.FindRegion(i, j)) {
-				RequestRegion(0, i, j);
-			}
-		}
-	}
-}

client/main.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,23 +21,38 @@
 */
 #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) {
-	cout << "Beginning client" << endl;
+int main(int argc, char* argv[]) {
 	try {
-		ClientApplication app;
+		//create the singletons
+		ConfigUtility::CreateSingleton();
+		UDPNetworkUtility::CreateSingleton();
+
+		//call the client's routines
+		ClientApplication::CreateSingleton();
+		ClientApplication& app = ClientApplication::GetSingleton();
+
 		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;
 		return 1;
 	}
-	cout << "Clean exit" << endl;
 	return 0;
-}
+}

client/makefile

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

client/scene_list.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -34,8 +34,7 @@ enum class SceneList {
 	OPTIONSMENU,
 	LOBBYMENU,
 	INWORLD,
-	INCOMBAT,
-	RESTART,
+	DISCONNECTEDSCREEN,
 };
 
 #endif

client/scenes/base_scene.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -75,10 +75,10 @@ SceneList BaseScene::GetNextScene() const {
 //Frame loop
 //-------------------------
 
-void BaseScene::RunFrame(double delta) {
+void BaseScene::RunFrame() {
 	FrameStart();
 	HandleEvents();
-	Update(delta);
+	Update();
 	FrameEnd();
 }
 
@@ -86,6 +86,7 @@ void BaseScene::RenderFrame() {
 	SDL_FillRect(screen, 0, 0);
 	Render(screen);
 	SDL_Flip(screen);
+	SDL_Delay(10);
 }
 
 //-------------------------

client/scenes/base_scene.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -40,13 +40,13 @@ public:
 	SceneList GetNextScene() const;
 
 	//Frame loop
-	virtual void RunFrame(double delta);
+	virtual void RunFrame();
 	virtual void RenderFrame();
 
 protected:
 	virtual void FrameStart() {}
 	virtual void HandleEvents();
-	virtual void Update(double delta) {}
+	virtual void Update() {}
 	virtual void FrameEnd() {}
 	virtual void Render(SDL_Surface* const screen) {}
 

client/scenes/disconnected_screen.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * 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,9 +19,11 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "restart.hpp"
+#include "disconnected_screen.hpp"
 
 #include "channels.hpp"
+#include "config_utility.hpp"
+#include "udp_network_utility.hpp"
 
 #include <stdexcept>
 
@@ -29,25 +31,9 @@
 //Public access members
 //-------------------------
 
-Restart::Restart(
-	ConfigUtility* const argConfig,
-	UDPNetworkUtility* const argNetwork,
-	int* const argClientIndex,
-	int* const argAccountIndex,
-	int* const argCharacterIndex,
-	std::map<int, CombatData>* argCombatMap,
-	std::map<int, CharacterData>* argCharacterMap,
-	std::map<int, EnemyData>* argEnemyMap
-	):
-	config(*argConfig),
-	network(*argNetwork),
-	clientIndex(*argClientIndex),
-	accountIndex(*argAccountIndex),
-	characterIndex(*argCharacterIndex),
-	combatMap(*argCombatMap),
-	characterMap(*argCharacterMap),
-	enemyMap(*argEnemyMap)
-{
+DisconnectedScreen::DisconnectedScreen() {
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+
 	//setup the utility objects
 	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
@@ -65,19 +51,13 @@ Restart::Restart(
 	backButton.SetText("Back");
 
 	//full reset
-	network.Unbind(Channels::SERVER);
-	clientIndex = -1;
-	accountIndex = -1;
-	characterIndex = -1;
-	combatMap.clear();
-	characterMap.clear();
-	enemyMap.clear();
+	UDPNetworkUtility::GetSingleton().Unbind(Channels::SERVER);
 
 	//auto return
 	startTick = std::chrono::steady_clock::now();
 }
 
-Restart::~Restart() {
+DisconnectedScreen::~DisconnectedScreen() {
 	//
 }
 
@@ -85,58 +65,52 @@ Restart::~Restart() {
 //Frame loop
 //-------------------------
 
-void Restart::Update(double delta) {
+void DisconnectedScreen::Update() {
 	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(10)) {
-		QuitEvent();
+		SetNextScene(SceneList::MAINMENU);
 	}
 
-	while(network.Receive()) {
-		//EAT INCOMING PACKETS
-	}
+	//Eat incoming packets
+	while(UDPNetworkUtility::GetSingleton().Receive());
 }
 
-void Restart::RenderFrame() {
-	SDL_FillRect(GetScreen(), 0, 0);
-	Render(GetScreen());
-	SDL_Flip(GetScreen());
-	fps.Calculate();
-}
+void DisconnectedScreen::Render(SDL_Surface* const screen) {
+	ConfigUtility& config = ConfigUtility::GetSingleton();
 
-void Restart::Render(SDL_Surface* const screen) {
 	backButton.DrawTo(screen);
-	font.DrawStringTo("You have been disconnected.", screen, 50, 30);
+	font.DrawStringTo(config["client.disconnectMessage"], screen, 50, 30);
 }
 
 //-------------------------
 //Event handlers
 //-------------------------
 
-void Restart::QuitEvent() {
-	SetNextScene(SceneList::MAINMENU);
+void DisconnectedScreen::QuitEvent() {
+	SetNextScene(SceneList::QUIT);
 }
 
-void Restart::MouseMotion(SDL_MouseMotionEvent const& motion) {
+void DisconnectedScreen::MouseMotion(SDL_MouseMotionEvent const& motion) {
 	backButton.MouseMotion(motion);
 }
 
-void Restart::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+void DisconnectedScreen::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 	backButton.MouseButtonDown(button);
 }
 
-void Restart::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+void DisconnectedScreen::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
-		QuitEvent();
+		SetNextScene(SceneList::MAINMENU);
 	}
 }
 
-void Restart::KeyDown(SDL_KeyboardEvent const& key) {
+void DisconnectedScreen::KeyDown(SDL_KeyboardEvent const& key) {
 	switch(key.keysym.sym) {
 		case SDLK_ESCAPE:
-			QuitEvent();
-			break;
+			SetNextScene(SceneList::MAINMENU);
+		break;
 	}
 }
 
-void Restart::KeyUp(SDL_KeyboardEvent const& key) {
+void DisconnectedScreen::KeyUp(SDL_KeyboardEvent const& key) {
 	//
 }

client/scenes/disconnected_screen.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * 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,50 +19,29 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef RESTART_HPP_
-#define RESTART_HPP_
-
-//network
-#include "udp_network_utility.hpp"
+#ifndef DISCONNECTEDSCREEN_HPP_
+#define DISCONNECTEDSCREEN_HPP_
 
 //graphics
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
 
-//common
-#include "config_utility.hpp"
-#include "frame_rate.hpp"
-
-#include "combat_data.hpp"
-#include "character_data.hpp"
-#include "enemy_data.hpp"
-
 //client
 #include "base_scene.hpp"
 
 //std namespace
 #include <chrono>
 
-class Restart : public BaseScene {
+class DisconnectedScreen : public BaseScene {
 public:
 	//Public access members
-	Restart(
-		ConfigUtility* const argConfig,
-		UDPNetworkUtility* const argNetwork,
-		int* const argClientIndex,
-		int* const argAccountIndex,
-		int* const argCharacterIndex,
-		std::map<int, CombatData>* argCombatMap,
-		std::map<int, CharacterData>* argCharacterMap,
-		std::map<int, EnemyData>* argEnemyMap
-	);
-	~Restart();
+	DisconnectedScreen();
+	~DisconnectedScreen();
 
 protected:
 	//Frame loop
-	void Update(double delta);
-	void RenderFrame();
+	void Update();
 	void Render(SDL_Surface* const);
 
 	//Event handlers
@@ -73,23 +52,12 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//shared parameters
-	ConfigUtility& config;
-	UDPNetworkUtility& network;
-	int& clientIndex;
-	int& accountIndex;
-	int& characterIndex;
-	std::map<int, CombatData>& combatMap;
-	std::map<int, CharacterData>& characterMap;
-	std::map<int, EnemyData>& enemyMap;
-
 	//graphics
 	Image image;
 	RasterFont font;
 
 	//UI
 	Button backButton;
-	FrameRate fps;
 
 	//auto return
 	std::chrono::steady_clock::time_point startTick;

client/scenes/in_world.cpp

@@ -0,0 +1,731 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "in_world.hpp"
+
+#include "channels.hpp"
+#include "utility.hpp"
+
+#include "terminal_error.hpp"
+#include <stdexcept>
+#include <algorithm>
+#include <cmath>
+#include <iostream>
+#include <sstream>
+
+//-------------------------
+//these should've come standard
+//-------------------------
+
+bool operator==(IPaddress lhs, IPaddress rhs) {
+	return lhs.host == rhs.host && lhs.port == rhs.port;
+}
+
+bool operator!=(IPaddress lhs, IPaddress rhs) {
+	return !(lhs == rhs);
+}
+
+//-------------------------
+//Public access members
+//-------------------------
+
+InWorld::InWorld(int* const argClientIndex,	int* const argAccountIndex):
+	clientIndex(*argClientIndex),
+	accountIndex(*argAccountIndex)
+{
+	//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
+	disconnectButton.SetImage(&buttonImage);
+	disconnectButton.SetFont(&font);
+	shutDownButton.SetImage(&buttonImage);
+	shutDownButton.SetFont(&font);
+
+	//set the button positions
+	disconnectButton.SetX(50);
+	disconnectButton.SetY(50 + buttonImage.GetClipH() * 0);
+	shutDownButton.SetX(50);
+	shutDownButton.SetY(50 + buttonImage.GetClipH() * 1);
+
+	//set the button texts
+	disconnectButton.SetText("Disconnect");
+	shutDownButton.SetText("Shut Down");
+
+	//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 the character data
+	//TODO: login scene, prompt, etc.
+	CharacterPacket newPacket;
+	newPacket.type = SerialPacketType::CHARACTER_LOAD;
+	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);
+
+	//query the world state
+	memset(&newPacket, 0, MAX_PACKET_SIZE);
+	newPacket.type = SerialPacketType::QUERY_CHARACTER_EXISTS;
+	network.SendTo(Channels::SERVER, &newPacket);
+
+	//set the camera's values
+	camera.width = GetScreen()->w;
+	camera.height = GetScreen()->h;
+
+	//debug
+	//
+}
+
+InWorld::~InWorld() {
+	//unload the local data
+	characterMap.clear();
+	monsterMap.clear();
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void InWorld::FrameStart() {
+	//
+}
+
+void InWorld::Update() {
+	//create and zero the buffer
+	SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]);
+	memset(packetBuffer, 0, MAX_PACKET_SIZE);
+
+	try {
+		//suck in and process all waiting packets
+		while(network.Receive(packetBuffer)) {
+			HandlePacket(packetBuffer);
+		}
+	}
+	catch(terminal_error& e) {
+		throw(e);
+	}
+	catch(std::exception& e) {
+		std::cerr << "HandlePacket Error: " << e.what() << std::endl;
+	}
+
+	//free the buffer
+	delete reinterpret_cast<char*>(packetBuffer);
+
+	//check the connection (heartbeat)
+	if (Clock::now() - lastBeat > std::chrono::seconds(3)) {
+		if (attemptedBeats > 2) {
+			//escape to the disconnect screen
+			SendDisconnectRequest();
+			SetNextScene(SceneList::DISCONNECTEDSCREEN);
+			ConfigUtility::GetSingleton()["client.disconnectMessage"] = "Error: Lost connection to the server";
+		}
+		else {
+			ServerPacket newPacket;
+			newPacket.type = SerialPacketType::PING;
+			network.SendTo(Channels::SERVER, &newPacket);
+
+			attemptedBeats++;
+			lastBeat = Clock::now();
+		}
+	}
+
+	//update all entities
+	for (auto& it : characterMap) {
+//		it.second.Update();
+	}
+	for (auto& it : monsterMap) {
+		it.second.Update();
+	}
+
+	//update the map
+	UpdateMap();
+
+	//skip the rest without a local character
+	if (!localCharacter) {
+		return;
+	}
+
+	//prepare for collisions
+	BoundingBox wallBounds = {0, 0, tileSheet.GetTileW(), tileSheet.GetTileH()};
+	std::list<BoundingBox> boxList;
+
+	//NOTE: for loops were too dense to work with, so I've just used while loops
+	//NOTE: this code is complex, and can be replaced with hard-coded relative positions, at the cost of variable-sized sprites/bounding boxes
+
+	//outer loop
+	wallBounds.x = snapToBase((double)wallBounds.w, localCharacter->GetOrigin().x) - wallBounds.w;
+	while(wallBounds.x < (localCharacter->GetOrigin() + localCharacter->GetBounds()).x + localCharacter->GetBounds().w) {
+		//inner loop
+		wallBounds.y = snapToBase((double)wallBounds.h, localCharacter->GetOrigin().y) - wallBounds.h;
+		while(wallBounds.y < (localCharacter->GetOrigin() + localCharacter->GetBounds()).y + localCharacter->GetBounds().h) {
+			//check to see if this tile is solid
+			if (regionPager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
+				//push onto the box set
+				boxList.push_front(wallBounds);
+			}
+
+			//increment
+			wallBounds.y += wallBounds.h;
+		}
+
+		//increment
+		wallBounds.x += wallBounds.w;
+	}
+
+	//process the collisions
+	localCharacter->ProcessCollisions(boxList);
+
+	//update the camera
+	camera.x = localCharacter->GetOrigin().x - camera.marginX;
+	camera.y = localCharacter->GetOrigin().y - camera.marginY;
+}
+
+void InWorld::FrameEnd() {
+	//
+}
+
+void InWorld::RenderFrame() {
+	SDL_FillRect(GetScreen(), 0, 0);
+	Render(GetScreen());
+	SDL_Flip(GetScreen());
+	fps.Calculate();
+}
+
+void InWorld::Render(SDL_Surface* const screen) {
+	//draw the map
+	for (std::list<Region>::iterator it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); it++) {
+		tileSheet.DrawRegionTo(screen, &(*it), camera.x, camera.y);
+	}
+
+	//draw the entities
+	for (auto& it : characterMap) {
+		//TODO: depth ordering
+		it.second.DrawTo(screen, camera.x, camera.y);
+	}
+	for (auto& it : monsterMap) {
+		//TODO: depth ordering
+		it.second.DrawTo(screen, camera.x, camera.y);
+	}
+
+	//draw UI
+	disconnectButton.DrawTo(screen);
+	shutDownButton.DrawTo(screen);
+	font.DrawStringTo(to_string_custom(fps.GetFrameRate()), screen, 0, 0);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void InWorld::QuitEvent() {
+	//two-step logout
+	SendDisconnectRequest();
+	SetNextScene(SceneList::QUIT);
+}
+
+void InWorld::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	disconnectButton.MouseMotion(motion);
+	shutDownButton.MouseMotion(motion);
+}
+
+void InWorld::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	disconnectButton.MouseButtonDown(button);
+	shutDownButton.MouseButtonDown(button);
+}
+
+void InWorld::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	if (disconnectButton.MouseButtonUp(button) == Button::State::HOVER && button.button == SDL_BUTTON_LEFT) {
+		SendLogoutRequest();
+	}
+	if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER && button.button == SDL_BUTTON_LEFT) {
+		SendShutdownRequest();
+	}
+}
+
+void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
+	//hotkeys
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+			//TODO: the escape key should actually control menus and stuff
+			SendLogoutRequest();
+		return;
+	}
+
+	//character movement
+	if (!localCharacter) {
+		return;
+	}
+	Vector2 motion = localCharacter->GetMotion();
+	switch(key.keysym.sym) {
+		case SDLK_w:
+			motion.y -= CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_a:
+			motion.x -= CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_s:
+			motion.y += CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_d:
+			motion.x += CHARACTER_WALKING_SPEED;
+		break;
+		default:
+			//DOCS: prevents wrong keys screwing with character movement
+			return;
+	}
+	//handle diagonals
+	if (motion.x != 0 && motion.y != 0) {
+		motion *= CHARACTER_WALKING_MOD;
+	}
+	//set the info
+	localCharacter->SetMotion(motion);
+	localCharacter->CorrectSprite();
+	SendLocalCharacterMotion();
+}
+
+void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
+	//character movement
+	if (!localCharacter) {
+		return;
+	}
+	Vector2 motion = localCharacter->GetMotion();
+	switch(key.keysym.sym) {
+		case SDLK_w:
+			motion.y = std::min(0.0, motion.y += CHARACTER_WALKING_SPEED);
+		break;
+		case SDLK_a:
+			motion.x = std::min(0.0, motion.x += CHARACTER_WALKING_SPEED);
+		break;
+		case SDLK_s:
+			motion.y = std::max(0.0, motion.y -= CHARACTER_WALKING_SPEED);
+		break;
+		case SDLK_d:
+			motion.x = std::max(0.0, motion.x -= CHARACTER_WALKING_SPEED);
+		break;
+		default:
+			//DOCS: prevents wrong keys screwing with character movement
+			return;
+	}
+	//BUGFIX: reset cardinal direction speed on key release
+	if (motion.x > 0) {
+		motion.x = CHARACTER_WALKING_SPEED;
+	}
+	else if (motion.x < 0) {
+		motion.x = -CHARACTER_WALKING_SPEED;
+	}
+	if (motion.y > 0) {
+		motion.y = CHARACTER_WALKING_SPEED;
+	}
+	else if (motion.y < 0) {
+		motion.y = -CHARACTER_WALKING_SPEED;
+	}
+	//handle diagonals
+	if (motion.x != 0 && motion.y != 0) {
+		motion *= CHARACTER_WALKING_MOD;
+	}
+	//set the info
+	localCharacter->SetMotion(motion);
+	localCharacter->CorrectSprite();
+	SendLocalCharacterMotion();
+}
+
+//-------------------------
+//Basic connections
+//-------------------------
+
+void InWorld::HandlePacket(SerialPacket* const argPacket) {
+	switch(argPacket->type) {
+		//heartbeat system
+		case SerialPacketType::PING:
+			HandlePing(static_cast<ServerPacket*>(argPacket));
+		break;
+		case SerialPacketType::PONG:
+			HandlePong(static_cast<ServerPacket*>(argPacket));
+		break;
+
+		//game server connections
+		case SerialPacketType::LOGOUT_RESPONSE:
+			HandleLogoutResponse(static_cast<ClientPacket*>(argPacket));
+		break;
+		case SerialPacketType::DISCONNECT_RESPONSE:
+			HandleDisconnectResponse(static_cast<ClientPacket*>(argPacket));
+		break;
+		case SerialPacketType::DISCONNECT_FORCED:
+			HandleDisconnectForced(static_cast<ClientPacket*>(argPacket));
+		break;
+
+		//map management
+		case SerialPacketType::REGION_CONTENT:
+			HandleRegionContent(static_cast<RegionPacket*>(argPacket));
+		break;
+
+		//character management
+		case SerialPacketType::CHARACTER_CREATE:
+			HandleCharacterCreate(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::CHARACTER_DELETE:
+			HandleCharacterDelete(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::QUERY_CHARACTER_EXISTS:
+			HandleCharacterQueryExists(static_cast<CharacterPacket*>(argPacket));
+		break;
+
+		//character movement
+		case SerialPacketType::CHARACTER_SET_ROOM:
+			HandleCharacterSetRoom(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::CHARACTER_SET_ORIGIN:
+			HandleCharacterSetOrigin(static_cast<CharacterPacket*>(argPacket));
+		break;
+		case SerialPacketType::CHARACTER_SET_MOTION:
+			HandleCharacterSetMotion(static_cast<CharacterPacket*>(argPacket));
+		break;
+
+		//rejection messages
+		case SerialPacketType::REGION_REJECTION:
+		case SerialPacketType::CHARACTER_REJECTION:
+			throw(terminal_error(static_cast<TextPacket*>(argPacket)->text));
+		break;
+		case SerialPacketType::SHUTDOWN_REJECTION:
+			throw(std::runtime_error(static_cast<TextPacket*>(argPacket)->text));
+		break;
+
+		//errors
+		default: {
+			std::ostringstream msg;
+			msg << "Unknown SerialPacketType encountered in InWorld: " << static_cast<int>(argPacket->type);
+			throw(std::runtime_error(msg.str()));
+		}
+		break;
+	}
+}
+
+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) != argPacket->srcAddress) {
+		throw(std::runtime_error("Heartbeat message received from an unknown source"));
+	}
+	attemptedBeats = 0;
+	lastBeat = Clock::now();
+}
+
+//-------------------------
+//Connection control
+//-------------------------
+
+void InWorld::SendLogoutRequest() {
+	ClientPacket newPacket;
+
+	//send a logout request
+	newPacket.type = SerialPacketType::LOGOUT_REQUEST;
+	newPacket.accountIndex = accountIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::SendDisconnectRequest() {
+	ClientPacket newPacket;
+
+	//send a disconnect request
+	newPacket.type = SerialPacketType::DISCONNECT_REQUEST;
+	newPacket.clientIndex = clientIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::SendShutdownRequest() {
+	ClientPacket newPacket;
+
+	//send a shutdown request
+	newPacket.type = SerialPacketType::SHUTDOWN_REQUEST;
+	newPacket.accountIndex = accountIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::HandleLogoutResponse(ClientPacket* const argPacket) {
+	if (localCharacter) {
+		characterMap.erase(characterIndex);
+		localCharacter = nullptr;
+	}
+
+	accountIndex = -1;
+	characterIndex = -1;
+
+	//reset the camera
+	camera.marginX = camera.marginY = 0;
+
+	//because, why not? I guess...
+	SendDisconnectRequest();
+}
+
+void InWorld::HandleDisconnectResponse(ClientPacket* const argPacket) {
+	HandleLogoutResponse(argPacket);//shortcut
+	SetNextScene(SceneList::DISCONNECTEDSCREEN);
+	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have successfully logged out";
+}
+
+void InWorld::HandleDisconnectForced(ClientPacket* const argPacket) {
+	HandleDisconnectResponse(argPacket);//shortcut
+	SetNextScene(SceneList::DISCONNECTEDSCREEN);
+	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have been forcibly disconnected by the server";
+}
+
+//-------------------------
+//map management
+//-------------------------
+
+void InWorld::SendRegionRequest(int roomIndex, int x, int y) {
+	RegionPacket packet;
+
+	//pack the region's data
+	packet.type = SerialPacketType::REGION_REQUEST;
+	packet.roomIndex = roomIndex;
+	packet.x = x;
+	packet.y = y;
+
+	network.SendTo(Channels::SERVER, &packet);
+}
+
+void InWorld::HandleRegionContent(RegionPacket* const argPacket) {
+	//replace existing regions
+	regionPager.UnloadRegion(argPacket->x, argPacket->y);
+	regionPager.PushRegion(argPacket->region);
+
+	//clean up after the serial code
+	delete argPacket->region;
+	argPacket->region = nullptr;
+}
+
+void InWorld::UpdateMap() {
+	if (roomIndex == -1) {
+		return;
+	}
+
+	//these represent the zone of regions that the client needs loaded, including the mandatory buffers (+1/-1)
+	int xStart = snapToBase(REGION_WIDTH, camera.x/tileSheet.GetTileW()) - REGION_WIDTH;
+	int xEnd = snapToBase(REGION_WIDTH, (camera.x+camera.width)/tileSheet.GetTileW()) + REGION_WIDTH;
+
+	int yStart = snapToBase(REGION_HEIGHT, camera.y/tileSheet.GetTileH()) - REGION_HEIGHT;
+	int yEnd = snapToBase(REGION_HEIGHT, (camera.y+camera.height)/tileSheet.GetTileH()) + REGION_HEIGHT;
+
+	//prune distant regions
+	regionPager.GetContainer()->remove_if([&](Region const& region) -> bool {
+		return region.GetX() < xStart || region.GetX() > xEnd || region.GetY() < yStart || region.GetY() > yEnd;
+	});
+
+	//request empty regions within this zone
+	for (int i = xStart; i <= xEnd; i += REGION_WIDTH) {
+		for (int j = yStart; j <= yEnd; j += REGION_HEIGHT) {
+			if (!regionPager.FindRegion(i, j)) {
+				SendRegionRequest(roomIndex, i, j);
+			}
+		}
+	}
+}
+
+//-------------------------
+//entity management
+//-------------------------
+
+//NOTE: preexisting characters will result in query responses
+//NOTE: new characters will result in create messages
+//NOTE: this client's character will exist in both (skipped)
+
+void InWorld::HandleCharacterCreate(CharacterPacket* const argPacket) {
+	//prevent double message
+	if (characterMap.find(argPacket->characterIndex) != characterMap.end()) {
+		std::ostringstream msg;
+		msg << "Double character creation event; ";
+		msg << "Index: " << argPacket->characterIndex << "; ";
+		msg << "Handle: " << argPacket->handle;
+		throw(std::runtime_error(msg.str()));
+	}
+
+	//implicity create and retrieve the entity
+	BaseCharacter* character = &characterMap[argPacket->characterIndex];
+
+	//fill the character's info
+	character->SetOrigin(argPacket->origin);
+	character->SetMotion(argPacket->motion);
+	character->SetBounds({CHARACTER_BOUNDS_X, CHARACTER_BOUNDS_Y, CHARACTER_BOUNDS_WIDTH, CHARACTER_BOUNDS_HEIGHT});
+	character->SetHandle(argPacket->handle);
+	character->SetAvatar(argPacket->avatar);
+	character->SetOwner(argPacket->accountIndex);
+	character->CorrectSprite();
+
+	//check for this player's character
+	if (character->GetOwner() == accountIndex) {
+		localCharacter = static_cast<LocalCharacter*>(character);
+
+		//focus the camera on this character
+		camera.marginX = (camera.width / 2 - localCharacter->GetSprite()->GetImage()->GetClipW() / 2);
+		camera.marginY = (camera.height/ 2 - localCharacter->GetSprite()->GetImage()->GetClipH() / 2);
+
+		//focus on this character's info
+		characterIndex = argPacket->characterIndex;
+		roomIndex = argPacket->roomIndex;
+	}
+
+	//debug
+	std::cout << "Create, total: " << characterMap.size() << std::endl;
+}
+
+void InWorld::HandleCharacterDelete(CharacterPacket* const argPacket) {
+	//ignore if this character doesn't exist
+	std::map<int, BaseCharacter>::iterator characterIt = characterMap.find(argPacket->characterIndex);
+	if (characterIt == characterMap.end()) {
+		//debug
+		std::cout << "Ignoring character deletion" << std::endl;
+		return;
+	}
+
+	//check for this player's character
+	if ((*characterIt).second.GetOwner() == accountIndex) {
+		localCharacter = nullptr;
+
+		//clear the camera
+		camera.marginX = 0;
+		camera.marginY = 0;
+
+		//clear the room
+		roomIndex = -1;
+	}
+
+	//remove this character
+	characterMap.erase(characterIt);
+
+	//debug
+	std::cout << "Delete, total: " << characterMap.size() << std::endl;
+}
+
+void InWorld::HandleCharacterQueryExists(CharacterPacket* const argPacket) {
+	//prevent a double message about this player's character
+	if (argPacket->accountIndex == accountIndex) {
+		return;
+	}
+
+	//ignore characters in a different room (sub-optimal)
+	if (argPacket->roomIndex != roomIndex) {
+		return;
+	}
+
+	//implicitly construct the character if it doesn't exist
+	BaseCharacter* character = &characterMap[argPacket->characterIndex];
+
+	//set/update the character's info
+	character->SetOrigin(argPacket->origin);
+	character->SetMotion(argPacket->motion);
+	character->SetBounds({CHARACTER_BOUNDS_X, CHARACTER_BOUNDS_Y, CHARACTER_BOUNDS_WIDTH, CHARACTER_BOUNDS_HEIGHT});
+	character->SetHandle(argPacket->handle);
+	character->SetAvatar(argPacket->avatar);
+	character->SetOwner(argPacket->accountIndex);
+	character->CorrectSprite();
+
+	//debug
+	std::cout << "Query, total: " << characterMap.size() << std::endl;
+}
+
+void InWorld::HandleCharacterSetRoom(CharacterPacket* const argPacket) {
+	//someone else's character
+	if (argPacket->characterIndex != characterIndex) {
+		characterMap.erase(argPacket->characterIndex);
+		return;
+	}
+
+	//this character is moving between rooms
+	roomIndex = argPacket->roomIndex;
+
+	//set the character's info
+	localCharacter->SetOrigin(argPacket->origin);
+	localCharacter->SetMotion(argPacket->motion);
+	localCharacter->CorrectSprite();
+
+	//clear the old room's data
+	regionPager.UnloadAll();
+	monsterMap.clear();
+
+	//use the jenky pattern for std::map to skip this player's character
+	for (std::map<int, BaseCharacter>::iterator it = characterMap.begin(); it != characterMap.end(); /* EMPTY */ ) {
+		if (it->first != characterIndex) {
+			it = characterMap.erase(it);
+		}
+		else {
+			++it;
+		}
+	}
+
+	//request the info on characters in this room
+	CharacterPacket newPacket;
+	newPacket.type = SerialPacketType::QUERY_CHARACTER_EXISTS;
+	newPacket.roomIndex = roomIndex;
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::HandleCharacterSetOrigin(CharacterPacket* const argPacket) {
+	//check that this character exists
+	std::map<int, BaseCharacter>::iterator characterIt = characterMap.find(argPacket->characterIndex);
+	if (characterIt != characterMap.end()) {
+		//set the origin and motion
+		characterIt->second.SetOrigin(argPacket->origin);
+		characterIt->second.SetMotion(argPacket->motion);
+		characterIt->second.CorrectSprite();
+	}
+}
+
+void InWorld::HandleCharacterSetMotion(CharacterPacket* const argPacket) {
+	//check that this character exists
+	std::map<int, BaseCharacter>::iterator characterIt = characterMap.find(argPacket->characterIndex);
+	if (characterIt != characterMap.end()) {
+		//set the origin and motion
+		characterIt->second.SetOrigin(argPacket->origin);
+		characterIt->second.SetMotion(argPacket->motion);
+		characterIt->second.CorrectSprite();
+	}
+}
+
+//-------------------------
+//player movement
+//-------------------------
+
+//TODO: add a "movement" packet type
+void InWorld::SendLocalCharacterMotion() {
+	CharacterPacket newPacket;
+	newPacket.type = SerialPacketType::CHARACTER_SET_MOTION;
+
+	newPacket.accountIndex = accountIndex;
+	newPacket.characterIndex = characterIndex;
+	newPacket.roomIndex = roomIndex;
+	newPacket.origin = localCharacter->GetOrigin();
+	newPacket.motion = localCharacter->GetMotion();
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}

client/scenes/in_world.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -25,8 +25,10 @@
 //maps
 #include "region_pager_base.hpp"
 
-//networking
+//utilities
 #include "udp_network_utility.hpp"
+#include "serial_packet.hpp"
+#include "config_utility.hpp"
 
 //graphics
 #include "image.hpp"
@@ -35,36 +37,28 @@
 #include "tile_sheet.hpp"
 
 //common
-#include "config_utility.hpp"
 #include "frame_rate.hpp"
 
-#include "combat_data.hpp"
-#include "character_data.hpp"
-
 //client
 #include "base_scene.hpp"
+#include "base_monster.hpp"
+#include "local_character.hpp"
 
 //STL
 #include <map>
 
+#include <chrono>
+
 class InWorld : public BaseScene {
 public:
 	//Public access members
-	InWorld(
-		ConfigUtility* const argConfig,
-		UDPNetworkUtility* const argNetwork,
-		int* const argClientIndex,
-		int* const argAccountIndex,
-		int* const argCharacterIndex,
-		std::map<int, CombatData>* argCombatMap,
-		std::map<int, CharacterData>* argCharacterMap
-	);
+	InWorld(int* const argClientIndex, int* const argAccountIndex);
 	~InWorld();
 
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update(double delta);
+	void Update();
 	void FrameEnd();
 	void RenderFrame();
 	void Render(SDL_Surface* const);
@@ -77,32 +71,41 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//Network handlers
+	//Basic connections
 	void HandlePacket(SerialPacket* const);
-	void HandleDisconnect(SerialPacket* const);
-	void HandleCharacterNew(CharacterPacket* const);
-	void HandleCharacterDelete(CharacterPacket* const);
-	void HandleCharacterUpdate(CharacterPacket* const);
+	void HandlePing(ServerPacket* const);
+	void HandlePong(ServerPacket* const);
+
+	//Connection control
+	void SendLogoutRequest();
+	void SendDisconnectRequest();
+	void SendShutdownRequest();
+
+	void HandleLogoutResponse(ClientPacket* const);
+	void HandleDisconnectResponse(ClientPacket* const);
+	void HandleDisconnectForced(ClientPacket* const);
+
+	//map management
+	void SendRegionRequest(int roomIndex, int x, int y);
 	void HandleRegionContent(RegionPacket* const);
-
-	//Server control
-	void RequestSynchronize();
-	void SendPlayerUpdate();
-	void RequestDisconnect();
-	void RequestShutDown();
-	void RequestRegion(int roomIndex, int x, int y);
-
-	//utilities
 	void UpdateMap();
 
-	//shared parameters
-	ConfigUtility& config;
-	UDPNetworkUtility& network;
+	//character management
+	void HandleCharacterCreate(CharacterPacket* const);
+	void HandleCharacterDelete(CharacterPacket* const);
+	void HandleCharacterQueryExists(CharacterPacket* const);
+	void HandleCharacterSetRoom(CharacterPacket* const);
+	void HandleCharacterSetOrigin(CharacterPacket* const);
+	void HandleCharacterSetMotion(CharacterPacket* const);
+
+	//player movement
+	void SendLocalCharacterMotion();
+
+	//indexes
 	int& clientIndex;
 	int& accountIndex;
-	int& characterIndex;
-	std::map<int, CombatData>& combatMap;
-	std::map<int, CharacterData>& characterMap;
+	int characterIndex = -1;
+	int roomIndex = -1;
 
 	//graphics
 	Image buttonImage;
@@ -115,16 +118,29 @@ protected:
 	//UI
 	Button disconnectButton;
 	Button shutDownButton;
-	//TODO: Review the camera
+	FrameRate fps;
+
+	//the camera structure
 	struct {
 		int x = 0, y = 0;
 		int width = 0, height = 0;
 		int marginX = 0, marginY = 0;
 	} camera;
-	FrameRate fps;
 
-	//game
-	CharacterData* localCharacter = nullptr;
+	//entities
+	std::map<int, BaseCharacter> characterMap;
+	std::map<int, BaseMonster> monsterMap;
+	LocalCharacter* localCharacter = nullptr;
+
+	//heartbeat
+	//TODO: Heartbeat needs it's own utility
+	typedef std::chrono::steady_clock Clock;
+	Clock::time_point lastBeat = Clock::now();
+	int attemptedBeats = 0;
+
+	//ugly references; I hate this
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
 };
 
 #endif

client/scenes/lobby_menu.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -30,17 +30,14 @@
 //Public access members
 //-------------------------
 
-LobbyMenu::LobbyMenu(
-	ConfigUtility* const argConfig,
-	UDPNetworkUtility* const argNetwork,
-	int* const argClientIndex,
-	int* const argAccountIndex
-	):
-	config(*argConfig),
-	network(*argNetwork),
+LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
 	clientIndex(*argClientIndex),
 	accountIndex(*argAccountIndex)
 {
+	//preemptive reset
+	clientIndex = -1;
+	accountIndex = -1;
+
 	//setup the utility objects
 	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
@@ -69,6 +66,12 @@ LobbyMenu::LobbyMenu(
 
 	//set the server list's position
 	listBox = {300, 50, 200, font.GetCharH()};
+
+	//Eat incoming packets
+	while(network.Receive());
+
+	//Initial broadcast
+	SendBroadcastRequest();
 }
 
 LobbyMenu::~LobbyMenu() {
@@ -83,13 +86,13 @@ void LobbyMenu::FrameStart() {
 	//
 }
 
-void LobbyMenu::Update(double delta) {
+void LobbyMenu::Update() {
 	//suck in and process all waiting packets
-	SerialPacket* packetBuffer = static_cast<SerialPacket*>(malloc(MAX_PACKET_SIZE));
+	SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]);
 	while(network.Receive(packetBuffer)) {
 		HandlePacket(packetBuffer);
 	}
-	free(static_cast<void*>(packetBuffer));
+	delete reinterpret_cast<char*>(packetBuffer);
 }
 
 void LobbyMenu::FrameEnd() {
@@ -108,9 +111,12 @@ void LobbyMenu::Render(SDL_Surface* const screen) {
 	for (int i = 0; i < serverInfo.size(); i++) {
 		//draw the selected server's highlight
 		if (selection == &serverInfo[i]) {
-			SDL_Rect r = listBox;
+			SDL_Rect r = {
+				(Sint16)listBox.x, (Sint16)listBox.y,
+				(Uint16)listBox.w, (Uint16)listBox.h
+			};
 			r.y += i * listBox.h;
-			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 255, 127, 39));
+			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 49, 150, 5));
 		}
 
 		//draw the server name
@@ -146,39 +152,19 @@ void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 
 void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 	if (search.MouseButtonUp(button) == Button::State::HOVER) {
-		//broadcast to the network, or a specific server
-		SerialPacket packet;
-		packet.type = SerialPacketType::BROADCAST_REQUEST;
-		network.SendTo(config["server.host"].c_str(), config.Int("server.port"), &packet);
-
-		//reset the server list
-		serverInfo.clear();
-		selection = nullptr;
+		SendBroadcastRequest();
 	}
-
 	else if (join.MouseButtonUp(button) == Button::State::HOVER && selection != nullptr && selection->compatible) {
-		//pack the packet
-		ClientPacket packet;
-		packet.type = SerialPacketType::JOIN_REQUEST;
-		strncpy(packet.username, config["client.username"].c_str(), PACKET_STRING_SIZE);
-
-		//join the selected server
-		network.SendTo(&selection->address, &packet);
-		selection = nullptr;
+		SendJoinRequest();
 	}
-
 	else if (back.MouseButtonUp(button) == Button::State::HOVER) {
 		SetNextScene(SceneList::MAINMENU);
 	}
 
-	else if (
-		//has the user selected a server on the list?
-		//TODO: replace with regular collision checker
-		button.x > listBox.x &&
-		button.x < listBox.x + listBox.w &&
-		button.y > listBox.y &&
-		button.y < listBox.y + listBox.h * serverInfo.size()
-		) {
+	//has the user selected a server on the list?
+	BoundingBox tmpBox = listBox;
+	tmpBox.h *= serverInfo.size();
+	if (tmpBox.CheckOverlap({button.x, button.y})) {
 		selection = &serverInfo[(button.y - listBox.y)/listBox.h];
 	}
 	else {
@@ -204,12 +190,25 @@ void LobbyMenu::KeyUp(SDL_KeyboardEvent const& key) {
 
 void LobbyMenu::HandlePacket(SerialPacket* const argPacket) {
 		switch(argPacket->type) {
+			//responses
 		case SerialPacketType::BROADCAST_RESPONSE:
 			HandleBroadcastResponse(static_cast<ServerPacket*>(argPacket));
 		break;
 		case SerialPacketType::JOIN_RESPONSE:
 			HandleJoinResponse(static_cast<ClientPacket*>(argPacket));
 		break;
+		case SerialPacketType::LOGIN_RESPONSE:
+			HandleLoginResponse(static_cast<ClientPacket*>(argPacket));
+		break;
+
+		//rejections
+		case SerialPacketType::JOIN_REJECTION:
+			HandleJoinRejection(static_cast<TextPacket*>(argPacket));
+		break;
+		case SerialPacketType::LOGIN_REJECTION:
+			HandleLoginRejection(static_cast<TextPacket*>(argPacket));
+		break;
+
 		//handle errors
 		default:
 			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in LobbyMenu: " + to_string_custom(static_cast<int>(argPacket->type)) ));
@@ -225,7 +224,7 @@ void LobbyMenu::HandleBroadcastResponse(ServerPacket* const argPacket) {
 	server.playerCount = argPacket->playerCount;
 	server.version = argPacket->version;
 
-	//NOTE: Check compatibility here
+	//Checking compatibility
 	server.compatible = server.version == NETWORK_VERSION;
 
 	//push
@@ -233,16 +232,61 @@ void LobbyMenu::HandleBroadcastResponse(ServerPacket* const argPacket) {
 }
 
 void LobbyMenu::HandleJoinResponse(ClientPacket* const argPacket) {
+	//save the server's data
 	clientIndex = argPacket->clientIndex;
-	accountIndex = argPacket->accountIndex;
-	network.Bind(&argPacket->srcAddress, Channels::SERVER);
-	SetNextScene(SceneList::INWORLD);
+	network.Bind(argPacket->srcAddress, Channels::SERVER);
 
-	//send this player's character info
-	CharacterPacket newPacket;
-	newPacket.type = SerialPacketType::CHARACTER_NEW;
-	strncpy(newPacket.handle, config["client.handle"].c_str(), PACKET_STRING_SIZE);
-	strncpy(newPacket.avatar, config["client.avatar"].c_str(), PACKET_STRING_SIZE);
-	newPacket.accountIndex = accountIndex;
-	network.SendTo(Channels::SERVER, &newPacket);
-}
+	//request login data
+	SendLoginRequest();
+}
+
+void LobbyMenu::HandleLoginResponse(ClientPacket* const argPacket) {
+	if (argPacket->clientIndex != clientIndex) {
+		throw(std::runtime_error("Client index invalid during login"));
+	}
+	accountIndex = argPacket->accountIndex;
+	SetNextScene(SceneList::INWORLD);
+}
+
+void LobbyMenu::HandleJoinRejection(TextPacket* const argPacket) {
+	//TODO: Better output for join rejection
+}
+
+void LobbyMenu::HandleLoginRejection(TextPacket* const argPacket) {
+	//TODO: Better output for login rejection
+}
+
+//-------------------------
+//server control
+//-------------------------
+
+void LobbyMenu::SendBroadcastRequest() {
+	//broadcast to the network, or a specific server
+		ClientPacket packet;
+		packet.type = SerialPacketType::BROADCAST_REQUEST;
+		network.SendTo(config["server.host"].c_str(), config.Int("server.port"), &packet);
+
+		//reset the server list
+		serverInfo.clear();
+		selection = nullptr;
+}
+
+void LobbyMenu::SendJoinRequest() {
+	//pack the packet
+		ClientPacket packet;
+		packet.type = SerialPacketType::JOIN_REQUEST;
+
+		//join the selected server
+		network.SendTo(selection->address, &packet);
+		selection = nullptr;
+}
+
+void LobbyMenu::SendLoginRequest() {
+	//NOTE: high cohesion
+	ClientPacket packet;
+	packet.type = SerialPacketType::LOGIN_REQUEST;
+	packet.clientIndex = clientIndex;
+	strncpy(packet.username, config["client.username"].c_str(), PACKET_STRING_SIZE);
+
+	network.SendTo(Channels::SERVER, &packet);
+}

client/scenes/lobby_menu.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -26,10 +26,12 @@
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
+#include "bounding_box.hpp"
 
 //utilities
 #include "config_utility.hpp"
 #include "udp_network_utility.hpp"
+#include "serial_packet.hpp"
 
 //client
 #include "base_scene.hpp"
@@ -40,18 +42,13 @@
 class LobbyMenu : public BaseScene {
 public:
 	//Public access members
-	LobbyMenu(
-		ConfigUtility* const argConfig,
-		UDPNetworkUtility* const argNetwork,
-		int* const argClientIndex,
-		int* const argAccountIndex
-	);
+	LobbyMenu(int* const argClientIndex, int* const argAccountIndex);
 	~LobbyMenu();
 
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update(double delta);
+	void Update();
 	void FrameEnd();
 	void Render(SDL_Surface* const);
 
@@ -66,10 +63,18 @@ protected:
 	void HandlePacket(SerialPacket* const);
 	void HandleBroadcastResponse(ServerPacket* const);
 	void HandleJoinResponse(ClientPacket* const);
+	void HandleLoginResponse(ClientPacket* const);
+	void HandleJoinRejection(TextPacket* const);
+	void HandleLoginRejection(TextPacket* const);
+
+	//server control
+	void SendBroadcastRequest();
+	void SendJoinRequest();
+	void SendLoginRequest();
 
 	//shared parameters
-	ConfigUtility& config;
-	UDPNetworkUtility& network;
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
 	int& clientIndex;
 	int& accountIndex;
 
@@ -91,9 +96,9 @@ protected:
 
 	std::vector<ServerInformation> serverInfo;
 
-	//a terrible hack, forgive me
+	//NOTE: a terrible hack
 	//I'd love a proper gui system for this
-	SDL_Rect listBox;
+	BoundingBox listBox;
 	ServerInformation* selection = nullptr;
 };
 

client/scenes/main_menu.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,13 +21,15 @@
 */
 #include "main_menu.hpp"
 
+#include "config_utility.hpp"
+
 //-------------------------
 //Public access members
 //-------------------------
 
-MainMenu::MainMenu(ConfigUtility* const argConfig):
-	config(*argConfig)
-{
+MainMenu::MainMenu() {
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+
 	//setup the utility objects
 	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
@@ -70,7 +72,7 @@ void MainMenu::FrameStart() {
 	//
 }
 
-void MainMenu::Update(double delta) {
+void MainMenu::Update() {
 	//
 }
 
@@ -101,6 +103,7 @@ void MainMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 }
 
 void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	//TODO: Buttons should only register as "selected" when the left button is used
 	if (startButton.MouseButtonUp(button) == Button::State::HOVER) {
 		SetNextScene(SceneList::LOBBYMENU);
 	}
@@ -113,11 +116,7 @@ void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 }
 
 void MainMenu::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			QuitEvent();
-		break;
-	}
+	//
 }
 
 void MainMenu::KeyUp(SDL_KeyboardEvent const& key) {

client/scenes/main_menu.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -24,7 +24,6 @@
 
 #include "base_scene.hpp"
 
-#include "config_utility.hpp"
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
@@ -32,13 +31,13 @@
 class MainMenu : public BaseScene {
 public:
 	//Public access members
-	MainMenu(ConfigUtility* const);
+	MainMenu();
 	~MainMenu();
 
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update(double delta);
+	void Update();
 	void FrameEnd();
 	void Render(SDL_Surface* const);
 
@@ -49,9 +48,6 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//shared parameters
-	ConfigUtility& config;
-
 	//members
 	Image image;
 	RasterFont font;

client/scenes/makefile

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

client/scenes/options_menu.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,13 +21,15 @@
 */
 #include "options_menu.hpp"
 
+#include "config_utility.hpp"
+
 //-------------------------
 //Public access members
 //-------------------------
 
-OptionsMenu::OptionsMenu(ConfigUtility* const argConfig):
-	config(*argConfig)
-{
+OptionsMenu::OptionsMenu() {
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+
 	//setup the utility objects
 	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
@@ -57,7 +59,7 @@ void OptionsMenu::FrameStart() {
 	//
 }
 
-void OptionsMenu::Update(double delta) {
+void OptionsMenu::Update() {
 	//
 }
 

client/scenes/options_menu.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -24,7 +24,6 @@
 
 #include "base_scene.hpp"
 
-#include "config_utility.hpp"
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
@@ -33,13 +32,13 @@
 class OptionsMenu : public BaseScene {
 public:
 	//Public access members
-	OptionsMenu(ConfigUtility* const);
+	OptionsMenu();
 	~OptionsMenu();
 
 protected:
 	//Frame loop
 	void FrameStart();
-	void Update(double delta);
+	void Update();
 	void FrameEnd();
 	void Render(SDL_Surface* const);
 
@@ -50,9 +49,6 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//shared parameters
-	ConfigUtility& config;
-
 	//members
 	Image image;
 	RasterFont font;

client/scenes/splash_screen.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,14 +21,14 @@
 */
 #include "splash_screen.hpp"
 
+#include "config_utility.hpp"
+
 //-------------------------
 //Public access members
 //-------------------------
 
-SplashScreen::SplashScreen(ConfigUtility* const argConfig):
-	config(*argConfig)
-{
-	logo.LoadSurface(config["dir.logos"] + "krstudios.bmp");
+SplashScreen::SplashScreen() {
+	logo.LoadSurface(ConfigUtility::GetSingleton()["dir.logos"] + "krstudios.bmp");
 	startTick = std::chrono::steady_clock::now();
 }
 
@@ -40,7 +40,7 @@ SplashScreen::~SplashScreen() {
 //Frame loop
 //-------------------------
 
-void SplashScreen::Update(double delta) {
+void SplashScreen::Update() {
 	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(1)) {
 		SetNextScene(SceneList::MAINMENU);
 	}

client/scenes/splash_screen.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -24,7 +24,6 @@
 
 #include "base_scene.hpp"
 
-#include "config_utility.hpp"
 #include "image.hpp"
 
 #include <chrono>
@@ -32,17 +31,14 @@
 class SplashScreen : public BaseScene {
 public:
 	//Public access members
-	SplashScreen(ConfigUtility* const);
+	SplashScreen();
 	~SplashScreen();
 
 protected:
 	//Frame loop
-	void Update(double delta);
+	void Update();
 	void Render(SDL_Surface* const);
 
-	//shared parameters
-	ConfigUtility& config;
-
 	//members
 	std::chrono::steady_clock::time_point startTick;
 	Image logo;

common/debugging/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../packet ../../gameplay ../../map ../../utilities
+INCLUDES+=.
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
@@ -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

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

common/debugging/timer.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,33 +19,36 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ENEMYMANAGER_HPP_
-#define ENEMYMANAGER_HPP_
+#ifndef TIMER_HPP_
+#define TIMER_HPP_
 
-#include "enemy_data.hpp"
+#include <chrono>
+#include <string>
+#include <ostream>
 
-#include "lua/lua.hpp"
-
-#include <map>
-
-class EnemyManager {
+class Timer {
 public:
-	EnemyManager() = default;
-	~EnemyManager() = default;
+	typedef std::chrono::high_resolution_clock Clock;
 
-	//public access methods
-	//TODO
+	Timer();
+	Timer(std::string s);
+	~Timer() = default;
+
+	void Start();
+	void Stop();
 
 	//accessors and mutators
-	EnemyData* GetEnemy(int uid);
-	std::map<int, EnemyData>* GetContainer();
+	Clock::duration GetTime() { return timeSpan; }
 
-	lua_State* SetLuaState(lua_State*);
-	lua_State* GetLuaState();
+	std::string SetName(std::string s) { return name = s; }
+	std::string GetName() { return name; }
 
 private:
-	std::map<int, EnemyData> enemyMap;
-	lua_State* luaState = nullptr;
+	std::string name;
+	Clock::time_point start;
+	Clock::duration timeSpan;
 };
 
-#endif
+std::ostream& operator<<(std::ostream& os, Timer& t);
+
+#endif

common/gameplay/character_data.hpp

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

common/gameplay/character_defines.hpp

@@ -0,0 +1,42 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 CHARACTERDEFINES_HPP_
+#define CHARACTERDEFINES_HPP_
+
+#include <cmath>
+
+//the speeds that the characters move
+constexpr double CHARACTER_WALKING_SPEED = 2.24;
+constexpr double CHARACTER_WALKING_MOD = 1.0/sqrt(2.0);
+constexpr double CHARACTER_WALKING_NEGATIVE_MOD = 1.0 - CHARACTER_WALKING_MOD;
+
+//the 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 character's sprite format
+constexpr int CHARACTER_CELLS_X = 4;
+constexpr int CHARACTER_CELLS_Y = 4;
+
+#endif

common/gameplay/combat_data.hpp

@@ -1,70 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef COMBATDATA_HPP_
-#define COMBATDATA_HPP_
-
-#include "vector2.hpp"
-
-//gameplay members
-#include "character_data.hpp"
-#include "enemy_data.hpp"
-
-//graphics
-#ifdef GRAPHICS
- #include "sprite_sheet.hpp"
-#endif
-
-//std namespace
-#include <chrono>
-#include <array>
-#include <utility>
-
-#define COMBAT_MAX_CHARACTERS 12
-#define COMBAT_MAX_ENEMIES 12
-
-struct CombatData {
-	enum class Terrain {
-		//TODO: types of combat terrains
-		NONE = 0,
-		GRASSLANDS,
-	};
-
-	typedef std::chrono::steady_clock Clock;
-
-	std::array<CharacterData, COMBAT_MAX_CHARACTERS> characterArray;
-	std::array<EnemyData, COMBAT_MAX_ENEMIES> enemyArray;
-
-	//world interaction
-	int mapIndex = 0;
-	Vector2 origin = {0.0,0.0};
-	Vector2 bounds = {0.0,0.0};
-
-	//time interval
-	Clock::time_point lastTick = Clock::now();
-
-	//graphics
-#ifdef GRAPHICS
-	SpriteSheet sprite;
-#endif
-};
-
-#endif

common/gameplay/makefile

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

common/gameplay/sanity_check.cpp

@@ -1,31 +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_data.hpp"
-#include "combat_data.hpp"
-#include "enemy_data.hpp"
-#include "statistics.hpp"
-
-/* DOCS: Sanity check, read more
- * Since most/all of the files in this directory are header files, I've created
- * this source file as a "sanity check", to ensure that the above header files
- * are written correctly via make.
-*/

common/gameplay/statistics.hpp

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

common/graphics/image.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages

common/graphics/image.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages

common/graphics/makefile

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

common/graphics/sprite_sheet.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages

common/graphics/sprite_sheet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages

common/makefile

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

common/map/makefile

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

common/map/map_system_api.cpp

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

common/map/map_system_api.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,20 +19,16 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ACCOUNTDATA_HPP_
-#define ACCOUNTDATA_HPP_
-
-#include <string>
-
-struct AccountData {
-	std::string username;
-	//TODO: password
-	bool blackListed = false;
-	bool whiteListed = true;
-	bool mod = false;
-	bool admin = false;
-
-	int clientIndex;
-};
+#ifndef MAPSYSTEMAPI_HPP_
+#define MAPSYSTEMAPI_APP_
 
+#if defined(__MINGW32__)
+ #include "lua/lua.hpp"
+#else
+ #include "lua.hpp"
 #endif
+
+#define TORTUGA_MAP_SYSTEM_API "map_system"
+LUAMOD_API int openMapSystemAPI(lua_State* L);
+
+#endif

common/map/region.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,11 +21,14 @@
 */
 #include "region.hpp"
 
-#include "utility.hpp"
-
 #include <stdexcept>
+#include <cmath>
 #include <cstring>
 
+int snapToBase(int base, int x) {
+	return floor((double)x / base) * base;
+}
+
 Region::Region(int argX, int argY): x(argX), y(argY) {
 	if (x != snapToBase(REGION_WIDTH, x) || y != snapToBase(REGION_HEIGHT, y)) {
 		throw(std::invalid_argument("Region location is off grid"));
@@ -35,6 +38,7 @@ Region::Region(int argX, int argY): x(argX), y(argY) {
 
 Region::Region(Region const& rhs): x(rhs.x), y(rhs.y) {
 	memcpy(tiles, rhs.tiles, REGION_WIDTH*REGION_HEIGHT*REGION_DEPTH*sizeof(type_t));
+	solid = rhs.solid;
 }
 
 Region::type_t Region::SetTile(int x, int y, int z, type_t v) {
@@ -44,3 +48,11 @@ Region::type_t Region::SetTile(int x, int y, int z, type_t v) {
 Region::type_t Region::GetTile(int x, int y, int z) {
 	return tiles[x][y][z];
 }
+
+bool Region::SetSolid(int x, int y, bool b) {
+	return solid[x * REGION_WIDTH + y] = b;
+}
+
+bool Region::GetSolid(int x, int y) {
+	return solid[x * REGION_WIDTH + y];
+}

common/map/region.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -22,10 +22,16 @@
 #ifndef REGION_HPP_
 #define REGION_HPP_
 
+#include <bitset>
+
+//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);
+
 class Region {
 public:
 	typedef unsigned char type_t;
@@ -38,14 +44,20 @@ public:
 	type_t SetTile(int x, int y, int z, type_t v);
 	type_t GetTile(int x, int y, int z);
 
+	bool SetSolid(int x, int y, bool b);
+	bool GetSolid(int x, int y);
+
 	//accessors
 	int GetX() const { return x; }
 	int GetY() const { return y; }
+
+	std::bitset<REGION_WIDTH*REGION_HEIGHT>* GetSolidBitset() { return &solid; }
 private:
 	const int x;
 	const int y;
 
 	type_t tiles[REGION_WIDTH][REGION_HEIGHT][REGION_DEPTH];
+	std::bitset<REGION_WIDTH*REGION_HEIGHT> solid;
 };
 
 #endif

common/map/region_api.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -37,6 +37,20 @@ static int getTile(lua_State* L) {
 	return 1;
 }
 
+static int setSolid(lua_State* L) {
+	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
+	bool ret = region->SetSolid(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_toboolean(L, 4));
+	lua_pushboolean(L, ret);
+	return 1;
+}
+
+static int getSolid(lua_State* L) {
+	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
+	bool ret = region->GetSolid(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1);
+	lua_pushboolean(L, ret);
+	return 1;
+}
+
 static int getX(lua_State* L) {
 	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
 	lua_pushinteger(L, region->GetX());
@@ -64,43 +78,20 @@ static int getDepth(lua_State* L) {
 	return 1;
 }
 
-static int load(lua_State* L) {
-	//TODO: fill this
-	lua_pushboolean(L, false);
-	return 1;
-}
-
-static int save(lua_State* L) {
-	//TODO: fill this
-	return 0;
-}
-
-static int create(lua_State* L) {
-	//TODO: fill this
-	return 0;
-}
-
-static int unload(lua_State* L) {
-	//TODO: fill this
-	return 0;
-}
-
-static const luaL_Reg regionlib[] = {
-	{"settile",setTile},
-	{"gettile",getTile},
-	{"getx",getX},
-	{"gety",getY},
-	{"getwidth",getWidth},
-	{"getheight",getHeight},
-	{"getdepth",getDepth},
-	{"load",load},
-	{"save",save},
-	{"create",create},
-	{"unload",unload},
+static const luaL_Reg regionLib[] = {
+	{"SetTile",setTile},
+	{"GetTile",getTile},
+	{"SetSolid",setSolid},
+	{"GetSolid",getSolid},
+	{"GetX",getX},
+	{"GetY",getY},
+	{"GetWidth",getWidth},
+	{"GetHeight",getHeight},
+	{"GetDepth",getDepth},
 	{nullptr, nullptr}
 };
 
-LUAMOD_API int luaopen_regionapi(lua_State* L) {
-	luaL_newlib(L, regionlib);
+LUAMOD_API int openRegionAPI(lua_State* L) {
+	luaL_newlib(L, regionLib);
 	return 1;
 }

common/map/region_api.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -22,9 +22,13 @@
 #ifndef REGIONAPI_HPP_
 #define REGIONAPI_HPP_
 
-#include "lua/lua.hpp"
+#if defined(__MINGW32__)
+ #include "lua/lua.hpp"
+#else
+ #include "lua.hpp"
+#endif
 
-#define LUA_REGIONLIBNAME "region"
-LUAMOD_API int luaopen_regionapi(lua_State* L);
+#define TORTUGA_REGION_NAME "region"
+LUAMOD_API int openRegionAPI(lua_State* L);
 
 #endif

common/map/region_pager_api.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * 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,12 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "pager_api.hpp"
+#include "region_pager_api.hpp"
 
 #include "region_pager_lua.hpp"
 #include "region.hpp"
 
-#include <stdexcept>
-#include <string>
+//DOCS: These glue functions simply wrap RegionPagerLua's methods
 
 static int setTile(lua_State* L) {
 	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
@@ -41,6 +40,20 @@ static int getTile(lua_State* L) {
 	return 1;
 }
 
+static int setSolid(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	bool ret = pager->SetSolid(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_toboolean(L, 4));
+	lua_pushboolean(L, ret);
+	return 1;
+}
+
+static int getSolid(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	bool ret = pager->GetSolid(lua_tointeger(L, 2), lua_tointeger(L, 3));
+	lua_pushboolean(L, ret);
+	return 1;
+}
+
 static int getRegion(lua_State* L) {
 	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
 	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
@@ -48,109 +61,86 @@ static int getRegion(lua_State* L) {
 	return 1;
 }
 
-static int setDirectory(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	std::string s = pager->SetDirectory(lua_tostring(L, 2));
-	lua_pushstring(L, s.c_str());
-	return 1;
-}
-
-static int getDirectory(lua_State* L) {
-	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	std::string s = pager->GetDirectory();
-	lua_pushstring(L, s.c_str());
-	return 1;
-}
-
 static int loadRegion(lua_State* L) {
-	//get the parameters
 	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	std::string s = pager->GetDirectory();
-
-	//push the parameters
-	lua_getglobal(L, "region");
-	lua_getfield(L, -1, "load");
+	Region* region = pager->LoadRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
 	lua_pushlightuserdata(L, region);
-	lua_pushstring(L, s.c_str());
-
-	//call the method
-	if (lua_pcall(L, 2, 1, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(L, -1) ));
-	}
 	return 1;
 }
 
 static int saveRegion(lua_State* L) {
-	//get the parameters
 	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	std::string s = pager->GetDirectory();
-
-	//push the parameters
-	lua_getglobal(L, "region");
-	lua_getfield(L, -1, "save");
+	Region* region = pager->SaveRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
 	lua_pushlightuserdata(L, region);
-	lua_pushstring(L, s.c_str());
-
-	//call the method
-	if (lua_pcall(L, 2, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(L, -1) ));
-	}
-	return 0;
+	return 1;
 }
 
 static int createRegion(lua_State* L) {
-	//get the parameters
 	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-
-	//push the parameters
-	lua_getglobal(L, "region");
-	lua_getfield(L, -1, "create");
+	Region* region = pager->CreateRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
 	lua_pushlightuserdata(L, region);
-	//TODO: parameters
-
-	//call the method
-	if (lua_pcall(L, 1, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(L, -1) ));
-	}
-	return 0;
+	return 1;
 }
 
 static int unloadRegion(lua_State* L) {
-	//get the parameters
 	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
-	std::string s = pager->GetDirectory();
-
-	//push the parameters
-	lua_getglobal(L, "region");
-	lua_getfield(L, -1, "unload");
-	lua_pushlightuserdata(L, region);
-	lua_pushstring(L, s.c_str());
-
-	//call the method
-	if (lua_pcall(L, 2, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(L, -1) ));
-	}
+	pager->UnloadRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
 	return 0;
 }
 
-static const luaL_Reg pagerlib[] = {
-	{"settile", setTile},
-	{"gettile", getTile},
-	{"getregion", getRegion},
-	{"setdirectory", setDirectory},
-	{"getdirectory", getDirectory},
-	{"loadregion", loadRegion},
-	{"saveregion", saveRegion},
-	{"createregion", createRegion},
-	{"unloadregion", unloadRegion},
+static int setOnLoad(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetLoadReference());
+	pager->SetLoadReference(luaL_ref(L, LUA_REGISTRYINDEX));
+	return 0;
+}
+
+static int setOnSave(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetSaveReference());
+	pager->SetSaveReference(luaL_ref(L, LUA_REGISTRYINDEX));
+	return 0;
+}
+
+static int setOnCreate(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetCreateReference());
+	pager->SetCreateReference(luaL_ref(L, LUA_REGISTRYINDEX));
+	return 0;
+}
+
+static int setOnUnload(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	luaL_unref(L, LUA_REGISTRYINDEX, pager->GetUnloadReference());
+	pager->SetUnloadReference(luaL_ref(L, LUA_REGISTRYINDEX));
+	return 0;
+}
+
+static const luaL_Reg regionPagerLib[] = {
+	//curry
+	{"SetTile", setTile},
+	{"GetTile", getTile},
+	{"SetSolid", setSolid},
+	{"GetSolid", getSolid},
+
+	//access and control
+	{"GetRegion", getRegion},
+	{"LoadRegion", loadRegion},
+	{"SaveRegion", saveRegion},
+	{"CreateRegion", createRegion},
+	{"UnloadRegion", unloadRegion},
+
+	//triggers
+	{"SetOnLoad",setOnLoad},
+	{"SetOnSave",setOnSave},
+	{"SetOnCreate",setOnCreate},
+	{"SetOnUnload",setOnUnload},
+
+	//sentinel
 	{nullptr, nullptr}
 };
 
-LUAMOD_API int luaopen_pagerapi(lua_State* L) {
-	luaL_newlib(L, pagerlib);
+LUAMOD_API int openRegionPagerAPI(lua_State* L) {
+	luaL_newlib(L, regionPagerLib);
 	return 1;
 }

common/map/region_pager_api.hpp

@@ -0,0 +1,34 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 REGIONPAGERAPI_HPP_
+#define REGIONPAGERAPI_HPP_
+
+#if defined(__MINGW32__)
+ #include "lua/lua.hpp"
+#else
+ #include "lua.hpp"
+#endif
+
+#define TORTUGA_REGION_PAGER_NAME "region_pager"
+LUAMOD_API int openRegionPagerAPI(lua_State* L);
+
+#endif

common/map/region_pager_base.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,8 +21,6 @@
 */
 #include "region_pager_base.hpp"
 
-#include "utility.hpp"
-
 #include <stdexcept>
 #include <algorithm>
 
@@ -36,7 +34,20 @@ Region::type_t RegionPagerBase::GetTile(int x, int y, int z) {
 	return ptr->GetTile(x - ptr->GetX(), y - ptr->GetY(), z);
 }
 
+bool RegionPagerBase::SetSolid(int x, int y, int b) {
+	Region* ptr = GetRegion(x, y);
+	return ptr->SetSolid(x - ptr->GetX(), y - ptr->GetY(), b);
+}
+
+bool RegionPagerBase::GetSolid(int x, int y) {
+	Region* ptr = GetRegion(x, y);
+	return ptr->GetSolid(x - ptr->GetX(), y - ptr->GetY());
+}
+
 Region* RegionPagerBase::GetRegion(int x, int y) {
+	x = snapToBase(REGION_WIDTH, x);
+	y = snapToBase(REGION_HEIGHT, y);
+
 	//get the region by various means
 	Region* ptr = nullptr;
 	ptr = FindRegion(x, y);
@@ -60,12 +71,12 @@ Region* RegionPagerBase::PushRegion(Region* const ptr) {
 }
 
 Region* RegionPagerBase::LoadRegion(int x, int y) {
-	//TODO: load the region if possible
+	//EMPTY, intended for override
 	return nullptr;
 }
 
 Region* RegionPagerBase::SaveRegion(int x, int y) {
-	//TODO: find & save the region
+	//EMPTY, intended for override
 	return nullptr;
 }
 
@@ -78,8 +89,9 @@ Region* RegionPagerBase::CreateRegion(int x, int y) {
 }
 
 void RegionPagerBase::UnloadRegion(int x, int y) {
-	//custom loop, not FindRegion()
-	regionList.remove_if([x, y](Region& region) -> bool { return region.GetX() == x && region.GetY() == y; });
+	regionList.remove_if([x, y](Region& region) -> bool {
+		return region.GetX() == x && region.GetY() == y;
+	});
 }
 
 void RegionPagerBase::UnloadAll() {

common/map/region_pager_base.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -35,6 +35,10 @@ public:
 	virtual Region::type_t SetTile(int x, int y, int z, Region::type_t v);
 	virtual Region::type_t GetTile(int x, int y, int z);
 
+	//solid manipulation
+	virtual bool SetSolid(int x, int y, int b);
+	virtual bool GetSolid(int x, int y);
+
 	//region manipulation
 	virtual Region* GetRegion(int x, int y);
 	virtual Region* FindRegion(int x, int y);

common/map/region_pager_lua.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,106 +21,173 @@
 */
 #include "region_pager_lua.hpp"
 
-#include "utility.hpp"
-
 #include <stdexcept>
 
+RegionPagerLua::~RegionPagerLua() {
+	//unload all regions
+	UnloadAll();
+	//clear any stored functions
+	luaL_unref(lua, LUA_REGISTRYINDEX, loadRef);
+	luaL_unref(lua, LUA_REGISTRYINDEX, saveRef);
+	luaL_unref(lua, LUA_REGISTRYINDEX, createRef);
+	luaL_unref(lua, LUA_REGISTRYINDEX, unloadRef);
+}
+
+//return the loaded region, or nullptr on failure
 Region* RegionPagerLua::LoadRegion(int x, int y) {
-	//load the region if possible
+	//get the pager's function from the registry
+	lua_rawgeti(lua, LUA_REGISTRYINDEX, loadRef);
 
-	//something to work on
-	regionList.emplace_front(x, y);
-
-	//API hook
-	lua_getglobal(luaState, "region");
-	lua_getfield(luaState, -1, "load");
-	lua_pushlightuserdata(luaState, &regionList.front());
-	lua_pushstring(luaState, directory.c_str());
-	if (lua_pcall(luaState, 2, 1, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
-	}
-	//success or failure
-	if (!lua_toboolean(luaState, -1)) {
-		lua_pop(luaState, 2);
-		regionList.pop_front();
+	//check if this function is available
+	if (lua_isnil(lua, -1)) {
+		lua_pop(lua, 1);
 		return nullptr;
 	}
-	lua_pop(luaState, 2);
-	return &regionList.front();
-}
 
-Region* RegionPagerLua::SaveRegion(int x, int y) {
-	//find & save the region
-	Region* ptr = FindRegion(x, y);
-	if (ptr) {
-		//API hook
-		lua_getglobal(luaState, "region");
-		lua_getfield(luaState, -1, "save");
-		lua_pushlightuserdata(luaState, ptr);
-		lua_pushstring(luaState, directory.c_str());
-		if (lua_pcall(luaState, 2, 0, 0) != LUA_OK) {
-			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
-		}
-		lua_pop(luaState, 1);
+	//something to work on
+	Region tmpRegion(x, y);
+	lua_pushlightuserdata(lua, &tmpRegion);
+
+	//call the funtion, 1 arg, 1 return
+	if (lua_pcall(lua, 1, 1, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+	}
+
+	//check the return value, success or failure
+	if (lua_toboolean(lua, -1)) {
+		lua_pop(lua, 1);
+		regionList.push_front(tmpRegion);
+		return &regionList.front();
+	}
+	else {
+		lua_pop(lua, 1);
+		return nullptr;
 	}
-	return ptr;
 }
 
+//return the saved region, or nullptr on failure
+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
+	Region* ptr = FindRegion(x, y);
+	if (!ptr) {
+		lua_pop(lua, 1);
+		return nullptr;
+	}
+	lua_pushlightuserdata(lua, ptr);
+
+	//call the function, 1 arg, 1 return
+	if (lua_pcall(lua, 1, 1, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+	}
+
+	//check the return value, success or failure
+	if (lua_toboolean(lua, -1)) {
+		lua_pop(lua, 1);
+		return ptr;
+	}
+	else {
+		lua_pop(lua, 1);
+		return nullptr;
+	}
+}
+
+//return the created region, or nullptr on failure
 Region* RegionPagerLua::CreateRegion(int x, int y) {
 	if (FindRegion(x, y)) {
 		throw(std::logic_error("Cannot overwrite an existing region"));
 	}
 
-	//something to work on
-	regionList.emplace_front(x, y);
+	//get the pager's function from the registry
+	lua_rawgeti(lua, LUA_REGISTRYINDEX, createRef);
 
-	//API hook
-	lua_getglobal(luaState, "region");
-	lua_getfield(luaState, -1, "create");
-	lua_pushlightuserdata(luaState, &regionList.front());
-	//TODO: parameters
-	if (lua_pcall(luaState, 1, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+	//check if this function is available
+	if (lua_isnil(lua, -1)) {
+		lua_pop(lua, 1);
+		return nullptr;
 	}
-	lua_pop(luaState, 1);
-	return &regionList.front();;
+
+	//something to work on
+	Region tmpRegion(x, y);
+	lua_pushlightuserdata(lua, &tmpRegion);
+
+	//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) ));
+	}
+
+	//return the new region
+	regionList.push_front(tmpRegion);
+	return &regionList.front();
 }
 
+//no return
 void RegionPagerLua::UnloadRegion(int x, int y) {
-	lua_getglobal(luaState, "region");
+	//get the pager's function from the registry
+	lua_rawgeti(lua, LUA_REGISTRYINDEX, unloadRef);
 
+	//check if this function is available
+	if (lua_isnil(lua, -1)) {
+		lua_pop(lua, 1);
+		return;
+	}
+
+	//run each region through this lambda
 	regionList.remove_if([&](Region& region) -> bool {
 		if (region.GetX() == x && region.GetY() == y) {
 
-			//API hook
-			lua_getfield(luaState, -1, "unload");
-			lua_pushlightuserdata(luaState, &region);
-			lua_pushstring(luaState, directory.c_str());
-			if (lua_pcall(luaState, 2, 0, 0) != LUA_OK) {
-				throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+			//push a copy of the function onto the stack with the region
+			lua_pushvalue(lua, -1);
+			lua_pushlightuserdata(lua, &region);
+
+			//call the function, 1 arg, 0 return
+			if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
+				throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
 			}
 
+			//signal to the container
 			return true;
 		}
+		//signal to the container
 		return false;
 	});
 
-	lua_pop(luaState, 1);
+	//pop the base copy of the function
+	lua_pop(lua, 1);
 }
 
 void RegionPagerLua::UnloadAll() {
-	lua_getglobal(luaState, "region");
+	//get the pager's function from the registry
+	lua_rawgeti(lua, LUA_REGISTRYINDEX, unloadRef);
+
+	//check if this function is available
+	if (lua_isnil(lua, -1)) {
+		lua_pop(lua, 1);
+		return;
+	}
 
 	for (auto& it : regionList) {
-		//API hook
-		lua_getfield(luaState, -1, "unload");
-		lua_pushlightuserdata(luaState, &it);
-		lua_pushstring(luaState, directory.c_str());
-		if (lua_pcall(luaState, 2, 0, 0) != LUA_OK) {
-			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+		//push a copy of the function onto the stack with the region
+		lua_pushvalue(lua, -1);
+		lua_pushlightuserdata(lua, &it);
+
+		//call the function, 1 arg, 0 return
+		if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
+			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
 		}
 	}
 
-	lua_pop(luaState, 1);
+	//pop the base copy of the function
+	lua_pop(lua, 1);
+
+	//remove from memory
 	regionList.clear();
 }

common/map/region_pager_lua.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -24,14 +24,18 @@
 
 #include "region_pager_base.hpp"
 
-#include "lua/lua.hpp"
+#if defined(__MINGW32__)
+ #include "lua/lua.hpp"
+#else
+ #include "lua.hpp"
+#endif
 
 #include <string>
 
 class RegionPagerLua : public RegionPagerBase {
 public:
 	RegionPagerLua() = default;
-	~RegionPagerLua() = default;
+	~RegionPagerLua();
 
 	//region manipulation
 	Region* LoadRegion(int x, int y) override;
@@ -41,14 +45,28 @@ public:
 
 	void UnloadAll() override;
 
-	std::string SetDirectory(std::string s) { return directory = s; }
-	std::string GetDirectory() { return directory; }
+	//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; }
 
-	lua_State* SetLuaState(lua_State* L) { return luaState = L; }
-	lua_State* GetLuaState() { return luaState; }
 protected:
-	std::string directory;
-	lua_State* luaState = nullptr;
+	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.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,24 +21,24 @@
 */
 #include "tile_sheet.hpp"
 
-void TileSheet::Load(std::string fname, int xc, int yc) {
-	XCount = xc;
-	YCount = yc;
+void TileSheet::Load(std::string fname, int tileWidth, int tileHeight) {
 	image.LoadSurface(fname);
-	image.SetClipW(image.GetClipW()/XCount);
-	image.SetClipH(image.GetClipH()/YCount);
+	image.SetClipW(tileWidth);
+	image.SetClipH(tileHeight);
+	xCount = image.GetSurface()->w / image.GetClipW();
+	yCount = image.GetSurface()->h / image.GetClipH();
 }
 
 void TileSheet::Unload() {
 	image.FreeSurface();
-	XCount = YCount = 0;
+	xCount = yCount = 0;
 }
 
-void TileSheet::DrawTo(SDL_Surface* const dest, int x, int y, Region::type_t tile) {
+void TileSheet::DrawTileTo(SDL_Surface* const dest, int x, int y, Region::type_t tile) {
 	//0 is invisible
 	if (tile == 0) return;
-	image.SetClipX((tile-1) % XCount * image.GetClipW());
-	image.SetClipY((tile-1) / XCount * image.GetClipH());
+	image.SetClipX((tile-1) % xCount * image.GetClipW());
+	image.SetClipY((tile-1) / xCount * image.GetClipH());
 	image.DrawTo(dest, x, y);
 }
 
@@ -50,8 +50,8 @@ void TileSheet::DrawRegionTo(SDL_Surface* const dest, Region* const region, int
 				tile = region->GetTile(i, j, k);
 				//0 is invisible
 				if (tile == 0) continue;
-				image.SetClipX((tile-1) % XCount * image.GetClipW());
-				image.SetClipY((tile-1) / XCount * image.GetClipH());
+				image.SetClipX((tile-1) % xCount * image.GetClipW());
+				image.SetClipY((tile-1) / xCount * image.GetClipH());
 				image.DrawTo(dest,
 					(region->GetX() + i) * image.GetClipW() - camX,
 					(region->GetY() + j) * image.GetClipH() - camY);

common/map/tile_sheet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -31,24 +31,24 @@
 class TileSheet {
 public:
 	TileSheet() = default;
-	TileSheet(std::string f, int x, int y) { Load(f, x, y); }
+	TileSheet(std::string f, int w, int h) { Load(f, w, h); }
 	~TileSheet() = default;
 
-	void Load(std::string fname, int XCount, int YCount);
+	void Load(std::string fname, int tileWidth, int tileHeight);
 	void Unload();
 
-	void DrawTo(SDL_Surface* const dest, int x, int y, Region::type_t tile);
+	void DrawTileTo(SDL_Surface* const dest, int x, int y, Region::type_t tile);
 	void DrawRegionTo(SDL_Surface* const dest, Region* const region, int camX, int camY);
 
 	//accessors
 	Image* GetImage() { return ℑ }
-	int GetXCount() { return XCount; }
-	int GetYCount() { return YCount; }
+	int GetXCount() { return xCount; }
+	int GetYCount() { return yCount; }
 	int GetTileW() { return image.GetClipW(); }
 	int GetTileH() { return image.GetClipH(); }
 private:
 	Image image;
-	int XCount = 0, YCount = 0;
+	int xCount = 0, yCount = 0;
 };
 
 #endif

common/map/tile_sheet_api.cpp

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

common/map/tile_sheet_api.hpp

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

common/network/makefile

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

common/network/packet/sanity_check.cpp

@@ -1,28 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "serial_packet.hpp"
-
-/* DOCS: Sanity check, read more
- * Since most/all of the files in this directory are header files, I've created
- * this source file as a "sanity check", to ensure that the above header files
- * are written correctly via make.
-*/

common/network/packet/serial_packet_type.hpp

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

common/network/packet_types/character_packet.cpp

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

common/network/packet_types/character_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -25,7 +25,6 @@
 #include "serial_packet_base.hpp"
 
 #include "vector2.hpp"
-#include "statistics.hpp"
 
 struct CharacterPacket : SerialPacketBase {
 	//identify the character
@@ -35,19 +34,17 @@ struct CharacterPacket : SerialPacketBase {
 
 	//the owner
 	int accountIndex;
+	//TODO: Authentication token?
 
 	//location
 	int roomIndex;
 	Vector2 origin;
 	Vector2 motion;
 
-	//gameplay
-	Statistics stats;
-
-	//TODO: equipment
-	//TODO: items
-	//TODO: buffs
-	//TODO: debuffs
+	//gameplay components: equipment, items, buffs, debuffs...
 };
 
+void serializeCharacter(void* buffer, CharacterPacket* packet);
+void deserializeCharacter(void* buffer, CharacterPacket* packet);
+
 #endif

common/network/packet_types/client_packet.cpp

@@ -0,0 +1,40 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 "client_packet.hpp"
+
+#include "serial_utility.hpp"
+
+void serializeClient(void* buffer, ClientPacket* packet) {
+	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	serialCopy(&buffer, &packet->clientIndex, sizeof(int));
+	serialCopy(&buffer, &packet->accountIndex, sizeof(int));
+	serialCopy(&buffer, packet->username, PACKET_STRING_SIZE);
+}
+
+void deserializeClient(void* buffer, ClientPacket* packet) {
+	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+
+	deserialCopy(&buffer, &packet->clientIndex, sizeof(int));
+	deserialCopy(&buffer, &packet->accountIndex, sizeof(int));
+	deserialCopy(&buffer, packet->username, PACKET_STRING_SIZE);
+}

common/network/packet_types/client_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -28,7 +28,9 @@ struct ClientPacket : SerialPacketBase {
 	int clientIndex;
 	int accountIndex;
 	char username[PACKET_STRING_SIZE];
-//	char password[PACKET_STRING_SIZE]; //hashed, not currently used
 };
 
+void serializeClient(void* buffer, ClientPacket* packet);
+void deserializeClient(void* buffer, ClientPacket* packet);
+
 #endif

common/network/packet_types/makefile

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

common/network/packet_types/region_packet.cpp

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

@@ -0,0 +1,48 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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_packet_base.cpp

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

common/network/packet_types/serial_packet_base.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -22,15 +22,10 @@
 #ifndef SERIALPACKETBASE_HPP_
 #define SERIALPACKETBASE_HPP_
 
-#ifndef SERIALPACKET_HPP_
- #error Cannot include this file without 'serial_packet.hpp'
-#endif
-
 #include "serial_packet_type.hpp"
 
 #include "SDL/SDL_net.h"
 
-constexpr int NETWORK_VERSION = 20140607;
 constexpr int PACKET_STRING_SIZE = 100;
 
 struct SerialPacketBase {
@@ -41,6 +36,4 @@ struct SerialPacketBase {
 	virtual ~SerialPacketBase() {};
 };
 
-typedef SerialPacketBase SerialPacket;
-
 #endif

common/network/packet_types/server_packet.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * 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,24 +19,24 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "serial.hpp"
+#include "server_packet.hpp"
 
-#include "serial_util.hpp"
+#include "serial_utility.hpp"
 
-void serializeServer(ServerPacket* packet, void* buffer) {
-	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+void serializeServer(void* buffer, ServerPacket* packet) {
+	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
 
 	//identify the server
-	SERIALIZE(buffer, &packet->name, PACKET_STRING_SIZE);
-	SERIALIZE(buffer, &packet->playerCount, sizeof(int));
-	SERIALIZE(buffer, &packet->version, sizeof(int));
+	serialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
+	serialCopy(&buffer, &packet->playerCount, sizeof(int));
+	serialCopy(&buffer, &packet->version, sizeof(int));
 }
 
-void deserializeServer(ServerPacket* packet, void* buffer) {
-	DESERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
+void deserializeServer(void* buffer, ServerPacket* packet) {
+	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
 
 	//identify the server
-	DESERIALIZE(buffer, &packet->name, PACKET_STRING_SIZE);
-	DESERIALIZE(buffer, &packet->playerCount, sizeof(int));
-	DESERIALIZE(buffer, &packet->version, sizeof(int));
+	deserialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
+	deserialCopy(&buffer, &packet->playerCount, sizeof(int));
+	deserialCopy(&buffer, &packet->version, sizeof(int));
 }

common/network/packet_types/server_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -31,4 +31,7 @@ struct ServerPacket : SerialPacketBase {
 	int version;
 };
 
+void serializeServer(void* buffer, ServerPacket* packet);
+void deserializeServer(void* buffer, ServerPacket* packet);
+
 #endif

common/network/packet_types/text_packet.cpp

@@ -0,0 +1,40 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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/packet_types/text_packet.hpp

@@ -0,0 +1,35 @@
+/* Copyright: (c) Kayne Ruse 2013-2015
+ * 
+ * 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 TEXTPACKET_HPP_
+#define TEXTPACKET_HPP_
+
+#include "serial_packet_base.hpp"
+
+struct TextPacket : SerialPacketBase {
+	char name[PACKET_STRING_SIZE];
+	char text[PACKET_STRING_SIZE];
+};
+
+void serializeText(void* buffer, TextPacket* packet);
+void deserializeText(void* buffer, TextPacket* packet);
+
+#endif

common/network/serial/serial.cpp

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

common/network/serial/serial.hpp

@@ -1,65 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#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 the PACKET_BUFFER_SIZE up to date
- * DOCS: REGION_CONTENT is currently the largest type of packet, read more
- *  map content: REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH * sizoeof(region::type_t)
- *  map format: sizeof(int) * 3
- *  metadata: sizeof(SerialPacket::Type)
-*/
-
-constexpr int PACKET_BUFFER_SIZE = REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH * sizeof(Region::type_t) + sizeof(int) * 3 + sizeof(SerialPacketType);
-
-#endif

common/network/serial/serial_character.cpp

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

common/network/serial/serial_client.cpp

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

common/network/serial/serial_combat.cpp

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

common/network/serial/serial_enemy.cpp

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

common/network/serial/serial_region.cpp

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

common/network/serial/serial_statistics.cpp

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

common/network/serial/serial_util.hpp

@@ -1,31 +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 SERIALIZEUTIL_HPP_
-#define SERIALIZEUTIL_HPP_
-
-#include <cstring>
-
-//NOTE: The strange assignments here used in order to move the void* parameter
-#define SERIALIZE(buffer, data, size) memcpy(buffer, data, size); buffer = reinterpret_cast<char*>(buffer) + size;
-#define DESERIALIZE(buffer, data, size) memcpy(data, buffer, size); buffer = reinterpret_cast<char*>(buffer) + size;
-
-#endif

common/network/serial_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -22,23 +22,43 @@
 #ifndef SERIALPACKET_HPP_
 #define SERIALPACKET_HPP_
 
+#include "serial_packet_base.hpp"
 #include "character_packet.hpp"
 #include "client_packet.hpp"
-#include "combat_packet.hpp"
-#include "enemy_packet.hpp"
 #include "region_packet.hpp"
 #include "server_packet.hpp"
+#include "text_packet.hpp"
 
-//NOTE: SerialPacket is defined in serial_packet_base.hpp
+//SerialPacketBase is defined in serial_packet_base.hpp
+typedef SerialPacketBase SerialPacket;
+
+//DOCS: NETWORK_VERSION is used to discern compatible servers and clients
+constexpr int NETWORK_VERSION = 20141227;
 
 union MaxPacket {
 	CharacterPacket a;
 	ClientPacket b;
-	CombatPacket c;
-	EnemyPacket d;
-	RegionPacket e;
-	ServerPacket f;
+	RegionPacket c;
+	ServerPacket d;
+	TextPacket e;
 };
+
 constexpr int MAX_PACKET_SIZE = sizeof(MaxPacket);
 
+/* DOCS: PACKET_BUFFER_SIZE is the memory required to store serialized data
+ * DOCS: SerialPacketType::REGION_CONTENT is currently the largest packet type
+ * Serialized RegionPacket structure:
+ *     SerialPacketType
+ *     room index (int)
+ *     X & Y position (int)
+ *     tile data (3 layers)
+ *     solid data (bitset)
+*/
+
+constexpr int PACKET_BUFFER_SIZE =
+	sizeof(SerialPacketType) +
+	REGION_METADATA_FOOTPRINT +
+	REGION_TILE_FOOTPRINT +
+	REGION_SOLID_FOOTPRINT;
+
 #endif

common/network/serial_packet_type.hpp

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

common/network/serial_utility.cpp

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

common/network/serial_utility.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013, 2014
+/* Copyright: (c) Kayne Ruse 2013-2015
  * 
  * 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,26 +19,19 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef ENEMYPACKET_HPP_
-#define ENEMYPACKET_HPP_
+#ifndef SERIALIZEUTILITY_HPP_
+#define SERIALIZEUTILITY_HPP_
 
 #include "serial_packet_base.hpp"
 
-struct EnemyPacket : SerialPacketBase {
-	//identify the enemy
-	int enemyIndex;
-	char handle[PACKET_STRING_SIZE];
-	char avatar[PACKET_STRING_SIZE];
+#include <cstring>
 
-	//gameplay
-	Statistics stats;
+//raw memory copy
+void serialCopy(void** buffer, void* data, int size);
+void deserialCopy(void** buffer, void* data, int size);
 
-	//TODO: equipment
-	//TODO: items
-	//TODO: buffs
-	//TODO: debuffs
+//primary functions
+void serializePacket(void* buffer, SerialPacketBase* packet);
+void deserializePacket(void* buffer, SerialPacketBase* packet);
 
-	//TODO: rewards
-};
-
-#endif
+#endif

common/network/udp_network_utility.cpp

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