Tried, failed. I give up

It looks like this whole branch is fucking useless, considering that I'll
need to reimplement that massive switch statement again just to determine
which overwritten method to use. I might as well not have bothered.

README.md

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

README.txt

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

client/character.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,15 +19,23 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "base_character.hpp"
+#include "character.hpp"
 
-#include "config_utility.hpp"
+void Character::Update() {
+	if (motion.x && motion.y) {
+		origin += motion * CHARACTER_WALKING_MOD;
+	}
+	else if (motion != 0) {
+		origin += motion;
+	}
+	sprite.Update(0.016);
+}
 
-//-------------------------
-//graphics
-//-------------------------
+void Character::DrawTo(SDL_Surface* const dest, int camX, int camY) {
+	sprite.DrawTo(dest, origin.x - camX, origin.y - camY);
+}
 
-void BaseCharacter::CorrectSprite() {
+void Character::CorrectSprite() {
 	//NOTE: These must correspond to the sprite sheet in use
 	if (motion.y > 0) {
 		sprite.SetYIndex(0);
@@ -51,33 +59,3 @@ void BaseCharacter::CorrectSprite() {
 		sprite.SetXIndex(0);
 	}
 }
-
-//-------------------------
-//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/character.hpp

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

client/client_application.cpp

@@ -1,11 +1,11 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
+ * including commercial ClientApplications, 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,7 +21,6 @@
 */
 #include "client_application.hpp"
 
-#include "serial_packet.hpp"
 #include "config_utility.hpp"
 
 #include <stdexcept>
@@ -38,18 +37,19 @@
 #include "options_menu.hpp"
 #include "lobby_menu.hpp"
 #include "in_world.hpp"
-#include "disconnected_screen.hpp"
+//#include "in_combat.hpp"
+#include "clean_up.hpp"
 
 //-------------------------
 //Public access members
 //-------------------------
 
-void ClientApplication::Init(int argc, char* argv[]) {
+void ClientApplication::Init(int argc, char** argv) {
 	std::cout << "Beginning " << argv[0] << std::endl;
 
 	//load the prerequisites
 	ConfigUtility& config = ConfigUtility::GetSingleton();
-	config.Load("rsc/config.cfg", false, argc, argv);
+	config.Load("rsc\\config.cfg");
 
 	//-------------------------
 	//Initialize the APIs
@@ -88,7 +88,6 @@ void ClientApplication::Init(int argc, char* argv[]) {
 
 	std::cout << "Internal sizes:" << std::endl;
 
-	DEBUG_OUTPUT_VAR(NETWORK_VERSION);
 	DEBUG_OUTPUT_VAR(sizeof(Region::type_t));
 	DEBUG_OUTPUT_VAR(sizeof(Region));
 	DEBUG_OUTPUT_VAR(REGION_WIDTH);
@@ -96,10 +95,8 @@ void ClientApplication::Init(int argc, char* argv[]) {
 	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
 
@@ -181,10 +178,13 @@ void ClientApplication::LoadScene(SceneList sceneIndex) {
 			activeScene = new LobbyMenu(&clientIndex, &accountIndex);
 		break;
 		case SceneList::INWORLD:
-			activeScene = new InWorld(&clientIndex, &accountIndex);
+			activeScene = new InWorld(&clientIndex, &accountIndex, &characterIndex, &characterMap);
 		break;
-		case SceneList::DISCONNECTEDSCREEN:
-			activeScene = new DisconnectedScreen();
+//		case SceneList::INCOMBAT:
+//			activeScene = new InCombat(&clientIndex, &accountIndex, &characterIndex, &characterMap);
+//		break;
+		case SceneList::CLEANUP:
+			activeScene = new CleanUp(&clientIndex, &accountIndex, &characterIndex, &characterMap);
 		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-2015
+/* 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
@@ -26,6 +26,7 @@
 #include "base_scene.hpp"
 
 #include "udp_network_utility.hpp"
+#include "character.hpp"
 
 #include "singleton.hpp"
 
@@ -34,7 +35,7 @@
 class ClientApplication: public Singleton<ClientApplication> {
 public:
 	//public methods
-	void Init(int argc, char* argv[]);
+	void Init(int argc, char** argv);
 	void Proc();
 	void Quit();
 
@@ -53,6 +54,9 @@ private:
 	//shared parameters
 	int clientIndex = -1;
 	int accountIndex = -1;
+	int characterIndex = -1;
+
+	CharacterMap characterMap;
 };
 
 #endif

client/client_utilities/makefile

@@ -1,37 +0,0 @@
-#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.hpp

@@ -1,34 +0,0 @@
-/* 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 TERMINALERROR_HPP_
-#define TERMINALERROR_HPP_
-
-#include <stdexcept>
-#include <string>
-
-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.hpp

@@ -1,55 +0,0 @@
-/* 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 BASECHARACTER_HPP_
-#define BASECHARACTER_HPP_
-
-//components
-#include "character_defines.hpp"
-#include "entity.hpp"
-
-//std namespace
-#include <string>
-
-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;
-};
-
-#endif

client/entities/entity.cpp

@@ -1,63 +0,0 @@
-/* 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 "entity.hpp"
-
-void Entity::Update() {
-	origin += motion;
-	sprite.Update(0.016);
-}
-
-void Entity::DrawTo(SDL_Surface* const dest, int camX, int camY) {
-	sprite.DrawTo(dest, origin.x - camX, origin.y - camY);
-}
-
-SpriteSheet* Entity::GetSprite() {
-	return &sprite;
-}
-
-//-------------------------
-//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

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

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

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

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

client/main.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -30,25 +30,25 @@
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char** argv) {
 	try {
 		//create the singletons
-		ConfigUtility::CreateSingleton();
-		UDPNetworkUtility::CreateSingleton();
+		ConfigUtility::Create();
+		UDPNetworkUtility::Create();
 
-		//call the client's routines
-		ClientApplication::CreateSingleton();
+		//call the server's routines
+		ClientApplication::Create();
 		ClientApplication& app = ClientApplication::GetSingleton();
 
 		app.Init(argc, argv);
 		app.Proc();
 		app.Quit();
 
-		ClientApplication::DeleteSingleton();
+		ClientApplication::Delete();
 
 		//delete the singletons
-		ConfigUtility::DeleteSingleton();
-		UDPNetworkUtility::DeleteSingleton();
+		ConfigUtility::Delete();
+		UDPNetworkUtility::Delete();
 	}
 	catch(exception& e) {
 		cerr << "Fatal exception thrown: " << e.what() << endl;

client/makefile

@@ -1,15 +1,6 @@
-#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
+#config
+INCLUDES+=. scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
+LIBS+=client.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
@@ -25,8 +16,6 @@ OUT=$(addprefix $(OUTDIR)/,client)
 
 #targets
 all: $(OBJ) $(OUT)
-	$(MAKE) -C client_utilities
-	$(MAKE) -C entities
 	$(MAKE) -C scenes
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 

client/scene_list.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -34,7 +34,8 @@ enum class SceneList {
 	OPTIONSMENU,
 	LOBBYMENU,
 	INWORLD,
-	DISCONNECTEDSCREEN,
+	INCOMBAT,
+	CLEANUP,
 };
 
 #endif

client/scenes/base_scene.cpp

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

client/scenes/base_scene.hpp

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

client/scenes/clean_up.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,11 +19,10 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "disconnected_screen.hpp"
+#include "clean_up.hpp"
 
 #include "channels.hpp"
 #include "config_utility.hpp"
-#include "udp_network_utility.hpp"
 
 #include <stdexcept>
 
@@ -31,7 +30,17 @@
 //Public access members
 //-------------------------
 
-DisconnectedScreen::DisconnectedScreen() {
+CleanUp::CleanUp(
+	int* const argClientIndex,
+	int* const argAccountIndex,
+	int* const argCharacterIndex,
+	CharacterMap* argCharacterMap
+	):
+	clientIndex(*argClientIndex),
+	accountIndex(*argAccountIndex),
+	characterIndex(*argCharacterIndex),
+	characterMap(*argCharacterMap)
+{
 	ConfigUtility& config = ConfigUtility::GetSingleton();
 
 	//setup the utility objects
@@ -51,13 +60,19 @@ DisconnectedScreen::DisconnectedScreen() {
 	backButton.SetText("Back");
 
 	//full reset
-	UDPNetworkUtility::GetSingleton().Unbind(Channels::SERVER);
+	network.Unbind(Channels::SERVER);
+	clientIndex = -1;
+	accountIndex = -1;
+	characterIndex = -1;
+//	combatMap.clear();
+	characterMap.clear();
+//	enemyMap.clear();
 
 	//auto return
 	startTick = std::chrono::steady_clock::now();
 }
 
-DisconnectedScreen::~DisconnectedScreen() {
+CleanUp::~CleanUp() {
 	//
 }
 
@@ -65,45 +80,43 @@ DisconnectedScreen::~DisconnectedScreen() {
 //Frame loop
 //-------------------------
 
-void DisconnectedScreen::Update() {
+void CleanUp::Update() {
 	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(10)) {
 		SetNextScene(SceneList::MAINMENU);
 	}
 
-	//Eat incoming packets
-	while(UDPNetworkUtility::GetSingleton().Receive());
+	//BUGFIX: Eat incoming packets
+	while(network.Receive());
 }
 
-void DisconnectedScreen::Render(SDL_Surface* const screen) {
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-
+void CleanUp::Render(SDL_Surface* const screen) {
 	backButton.DrawTo(screen);
-	font.DrawStringTo(config["client.disconnectMessage"], screen, 50, 30);
+	font.DrawStringTo("You have been disconnected.", screen, 50, 30);
 }
 
 //-------------------------
 //Event handlers
 //-------------------------
 
-void DisconnectedScreen::QuitEvent() {
+void CleanUp::QuitEvent() {
 	SetNextScene(SceneList::QUIT);
 }
 
-void DisconnectedScreen::MouseMotion(SDL_MouseMotionEvent const& motion) {
+void CleanUp::MouseMotion(SDL_MouseMotionEvent const& motion) {
 	backButton.MouseMotion(motion);
 }
 
-void DisconnectedScreen::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+void CleanUp::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 	backButton.MouseButtonDown(button);
 }
 
-void DisconnectedScreen::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+void CleanUp::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
 		SetNextScene(SceneList::MAINMENU);
 	}
 }
 
-void DisconnectedScreen::KeyDown(SDL_KeyboardEvent const& key) {
+void CleanUp::KeyDown(SDL_KeyboardEvent const& key) {
 	switch(key.keysym.sym) {
 		case SDLK_ESCAPE:
 			SetNextScene(SceneList::MAINMENU);
@@ -111,6 +124,6 @@ void DisconnectedScreen::KeyDown(SDL_KeyboardEvent const& key) {
 	}
 }
 
-void DisconnectedScreen::KeyUp(SDL_KeyboardEvent const& key) {
+void CleanUp::KeyUp(SDL_KeyboardEvent const& key) {
 	//
 }

client/scenes/clean_up.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,8 +19,11 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef DISCONNECTEDSCREEN_HPP_
-#define DISCONNECTEDSCREEN_HPP_
+#ifndef CLEANUP_HPP_
+#define CLEANUP_HPP_
+
+//network
+#include "udp_network_utility.hpp"
 
 //graphics
 #include "image.hpp"
@@ -28,16 +31,22 @@
 #include "button.hpp"
 
 //client
+#include "character.hpp"
 #include "base_scene.hpp"
 
 //std namespace
 #include <chrono>
 
-class DisconnectedScreen : public BaseScene {
+class CleanUp : public BaseScene {
 public:
 	//Public access members
-	DisconnectedScreen();
-	~DisconnectedScreen();
+	CleanUp(
+		int* const argClientIndex,
+		int* const argAccountIndex,
+		int* const argCharacterIndex,
+		CharacterMap* argCharacterMap
+	);
+	~CleanUp();
 
 protected:
 	//Frame loop
@@ -52,6 +61,13 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
+	//shared parameters
+	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
+	int& clientIndex;
+	int& accountIndex;
+	int& characterIndex;
+	CharacterMap& characterMap;
+
 	//graphics
 	Image image;
 	RasterFont font;

client/scenes/in_world.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -23,34 +23,30 @@
 
 #include "channels.hpp"
 #include "utility.hpp"
+#include "config_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):
+InWorld::InWorld(
+	int* const argClientIndex,
+	int* const argAccountIndex,
+	int* const argCharacterIndex,
+	CharacterMap* argCharacterMap
+	):
 	clientIndex(*argClientIndex),
-	accountIndex(*argAccountIndex)
+	accountIndex(*argAccountIndex),
+	characterIndex(*argCharacterIndex),
+	characterMap(*argCharacterMap)
 {
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+
 	//setup the utility objects
 	buttonImage.LoadSurface(config["dir.interface"] + "button_menu.bmp");
 	buttonImage.SetClipH(buttonImage.GetClipH()/3);
@@ -73,36 +69,19 @@ InWorld::InWorld(int* const argClientIndex,	int* const argAccountIndex):
 	shutDownButton.SetText("Shut Down");
 
 	//load the tilesheet
-	//TODO: add the tilesheet to the map system
+	//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);
+	tileSheet.Load(config["dir.tilesets"] + "terrain.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;
+	//request a sync
+	RequestSynchronize();
 
 	//debug
 	//
 }
 
 InWorld::~InWorld() {
-	//unload the local data
-	characterMap.clear();
-	monsterMap.clear();
+	//
 }
 
 //-------------------------
@@ -114,90 +93,50 @@ void InWorld::FrameStart() {
 }
 
 void InWorld::Update() {
-	//create and zero the buffer
+	//suck in and process all waiting packets
 	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);
-		}
+	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
+	//update the characters
 	for (auto& it : characterMap) {
-//		it.second.Update();
-	}
-	for (auto& it : monsterMap) {
 		it.second.Update();
 	}
 
-	//update the map
+	//check the map
 	UpdateMap();
 
-	//skip the rest without a local character
+	//skip the rest
 	if (!localCharacter) {
 		return;
 	}
 
-	//prepare for collisions
+	//check for collisions with the map
 	BoundingBox wallBounds = {0, 0, tileSheet.GetTileW(), tileSheet.GetTileH()};
-	std::list<BoundingBox> boxList;
+	const int xCount = localCharacter->GetBounds().w / wallBounds.w + 1;
+	const int yCount = localCharacter->GetBounds().h / wallBounds.h + 1;
 
-	//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
+	for (int i = -1; i <= xCount; ++i) {
+		for (int j = -1; j <= yCount; ++j) {
+			//set the wall's position
+			wallBounds.x = wallBounds.w * i + snapToBase((double)wallBounds.w, localCharacter->GetOrigin().x);
+			wallBounds.y = wallBounds.h * j + snapToBase((double)wallBounds.h, localCharacter->GetOrigin().y);
 
-	//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);
+			if (!regionPager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
+				continue;
 			}
 
-			//increment
-			wallBounds.y += wallBounds.h;
+			if ((localCharacter->GetOrigin() + localCharacter->GetBounds()).CheckOverlap(wallBounds)) {
+				localCharacter->SetOrigin(localCharacter->GetOrigin() - (localCharacter->GetMotion()));
+				localCharacter->SetMotion({0,0});
+				localCharacter->CorrectSprite();
+				SendPlayerUpdate();
+			}
 		}
-
-		//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;
@@ -208,7 +147,7 @@ void InWorld::FrameEnd() {
 }
 
 void InWorld::RenderFrame() {
-	SDL_FillRect(GetScreen(), 0, 0);
+//	SDL_FillRect(GetScreen(), 0, 0);
 	Render(GetScreen());
 	SDL_Flip(GetScreen());
 	fps.Calculate();
@@ -220,13 +159,9 @@ void InWorld::Render(SDL_Surface* const screen) {
 		tileSheet.DrawRegionTo(screen, &(*it), camera.x, camera.y);
 	}
 
-	//draw the entities
+	//draw characters
 	for (auto& it : characterMap) {
-		//TODO: depth ordering
-		it.second.DrawTo(screen, camera.x, camera.y);
-	}
-	for (auto& it : monsterMap) {
-		//TODO: depth ordering
+		//BUG: #29 drawing order according to Y origin
 		it.second.DrawTo(screen, camera.x, camera.y);
 	}
 
@@ -241,8 +176,8 @@ void InWorld::Render(SDL_Surface* const screen) {
 //-------------------------
 
 void InWorld::QuitEvent() {
-	//two-step logout
-	SendDisconnectRequest();
+	//exit the game AND the server
+	RequestDisconnect();
 	SetNextScene(SceneList::QUIT);
 }
 
@@ -257,279 +192,269 @@ void InWorld::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 }
 
 void InWorld::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (disconnectButton.MouseButtonUp(button) == Button::State::HOVER && button.button == SDL_BUTTON_LEFT) {
-		SendLogoutRequest();
+	if (disconnectButton.MouseButtonUp(button) == Button::State::HOVER) {
+		RequestDisconnect();
 	}
-	if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER && button.button == SDL_BUTTON_LEFT) {
-		SendShutdownRequest();
+	if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER) {
+		RequestShutDown();
 	}
 }
 
 void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
+	if (!localCharacter) {
+		return;
+	}
+
 	//hotkeys
 	switch(key.keysym.sym) {
 		case SDLK_ESCAPE:
-			//TODO: the escape key should actually control menus and stuff
-			SendLogoutRequest();
-		return;
+			RequestDisconnect();
+		break;
 	}
 
-	//character movement
-	if (!localCharacter) {
-		return;
-	}
+	//player movement
 	Vector2 motion = localCharacter->GetMotion();
 	switch(key.keysym.sym) {
-		case SDLK_w:
-			motion.y -= CHARACTER_WALKING_SPEED;
-		break;
-		case SDLK_a:
+		case SDLK_LEFT:
 			motion.x -= CHARACTER_WALKING_SPEED;
 		break;
-		case SDLK_s:
-			motion.y += CHARACTER_WALKING_SPEED;
-		break;
-		case SDLK_d:
+		case SDLK_RIGHT:
 			motion.x += CHARACTER_WALKING_SPEED;
 		break;
+		case SDLK_UP:
+			motion.y -= CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_DOWN:
+			motion.y += CHARACTER_WALKING_SPEED;
+		break;
 		default:
-			//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();
+	SendPlayerUpdate();
 }
 
 void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
-	//character movement
 	if (!localCharacter) {
 		return;
 	}
+
+	//player movement
 	Vector2 motion = localCharacter->GetMotion();
 	switch(key.keysym.sym) {
-		case SDLK_w:
-			motion.y = std::min(0.0, motion.y += CHARACTER_WALKING_SPEED);
+		//NOTE: The use of min/max here are to prevent awkward movements
+		case SDLK_LEFT:
+			motion.x = std::min(motion.x + CHARACTER_WALKING_SPEED, 0.0);
 		break;
-		case SDLK_a:
-			motion.x = std::min(0.0, motion.x += CHARACTER_WALKING_SPEED);
+		case SDLK_RIGHT:
+			motion.x = std::max(motion.x - CHARACTER_WALKING_SPEED, 0.0);
 		break;
-		case SDLK_s:
-			motion.y = std::max(0.0, motion.y -= CHARACTER_WALKING_SPEED);
+		case SDLK_UP:
+			motion.y = std::min(motion.y + CHARACTER_WALKING_SPEED, 0.0);
 		break;
-		case SDLK_d:
-			motion.x = std::max(0.0, motion.x -= CHARACTER_WALKING_SPEED);
+		case SDLK_DOWN:
+			motion.y = std::max(motion.y - CHARACTER_WALKING_SPEED, 0.0);
 		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();
+	SendPlayerUpdate();
 }
 
 //-------------------------
-//Basic connections
+//Network handlers
 //-------------------------
 
 void InWorld::HandlePacket(SerialPacket* const argPacket) {
-	switch(argPacket->type) {
-		//heartbeat system
-		case SerialPacketType::PING:
-			HandlePing(static_cast<ServerPacket*>(argPacket));
+	switch(argPacket->GetType()) {
+		case SerialPacketType::DISCONNECT:
+			HandleDisconnect(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));
+		case SerialPacketType::CHARACTER_NEW:
+			HandleCharacterNew(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));
+		case SerialPacketType::CHARACTER_UPDATE:
+			HandleCharacterUpdate(static_cast<CharacterPacket*>(argPacket));
 		break;
-
-		//character movement
-		case SerialPacketType::CHARACTER_SET_ROOM:
-			HandleCharacterSetRoom(static_cast<CharacterPacket*>(argPacket));
+		case SerialPacketType::REGION_CONTENT:
+			HandleRegionContent(static_cast<RegionPacket*>(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()));
-		}
+		//handle errors
+		default:
+			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in InWorld: " + to_string_custom(static_cast<int>(argPacket->GetType())) ));
 		break;
 	}
 }
 
-void InWorld::HandlePing(ServerPacket* const argPacket) {
-	ServerPacket newPacket;
-	newPacket.type = SerialPacketType::PONG;
-	network.SendTo(argPacket->srcAddress, &newPacket);
+void InWorld::HandleDisconnect(SerialPacket* const argPacket) {
+	SetNextScene(SceneList::CLEANUP);
 }
 
-void InWorld::HandlePong(ServerPacket* const argPacket) {
-	if (*network.GetIPAddress(Channels::SERVER) != argPacket->srcAddress) {
-		throw(std::runtime_error("Heartbeat message received from an unknown source"));
+void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
+	if (characterMap.find(argPacket->GetCharacterIndex()) != characterMap.end()) {
+		throw(std::runtime_error("Cannot create duplicate characters"));
+	}
+
+	//create the character object
+	Character& newCharacter = characterMap[argPacket->GetCharacterIndex()];
+
+	//fill out the character's members
+	newCharacter.SetHandle(argPacket->GetHandle());
+	newCharacter.SetAvatar(argPacket->GetAvatar());
+
+	newCharacter.GetSprite()->LoadSurface(ConfigUtility::GetSingleton()["dir.sprites"] + newCharacter.GetAvatar(), 4, 4);
+
+	newCharacter.SetOrigin(argPacket->GetOrigin());
+	newCharacter.SetMotion(argPacket->GetMotion());
+	newCharacter.SetBounds({
+		CHARACTER_BOUNDS_X,
+		CHARACTER_BOUNDS_Y,
+		CHARACTER_BOUNDS_WIDTH,
+		CHARACTER_BOUNDS_HEIGHT
+	});
+
+	*newCharacter.GetStats() = *argPacket->GetStatistics();
+
+	//bookkeeping code
+	newCharacter.CorrectSprite();
+
+	//catch this client's player object
+	if (argPacket->GetAccountIndex() == accountIndex && !localCharacter) {
+		characterIndex = argPacket->GetCharacterIndex();
+		localCharacter = &newCharacter;
+
+		//setup the camera
+		//TODO: move this?
+		camera.width = GetScreen()->w;
+		camera.height = GetScreen()->h;
+
+		//center on the player's character
+		camera.marginX = (GetScreen()->w / 2 - localCharacter->GetSprite()->GetImage()->GetClipW() / 2);
+		camera.marginY = (GetScreen()->h / 2 - localCharacter->GetSprite()->GetImage()->GetClipH() / 2);
 	}
-	attemptedBeats = 0;
-	lastBeat = Clock::now();
 }
 
-//-------------------------
-//Connection control
-//-------------------------
+void InWorld::HandleCharacterDelete(CharacterPacket* const argPacket) {
+	//TODO: authenticate when own character is being deleted (linked to a TODO in the server)
 
-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);
+	//catch this client's player object
+	if (argPacket->GetCharacterIndex() == characterIndex) {
+		characterIndex = -1;
 		localCharacter = nullptr;
 	}
 
-	accountIndex = -1;
-	characterIndex = -1;
-
-	//reset the camera
-	camera.marginX = camera.marginY = 0;
-
-	//because, why not? I guess...
-	SendDisconnectRequest();
+	characterMap.erase(argPacket->GetCharacterIndex());
 }
 
-void InWorld::HandleDisconnectResponse(ClientPacket* const argPacket) {
-	HandleLogoutResponse(argPacket);//shortcut
-	SetNextScene(SceneList::DISCONNECTEDSCREEN);
-	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have successfully logged out";
-}
+void InWorld::HandleCharacterUpdate(CharacterPacket* const argPacket) {
+	if (characterMap.find(argPacket->GetCharacterIndex()) == characterMap.end()) {
+		std::cout << "Warning: HandleCharacterUpdate() is passing to HandleCharacterNew()" << std::endl;
+		HandleCharacterNew(argPacket);
+		return;
+	}
 
-void InWorld::HandleDisconnectForced(ClientPacket* const argPacket) {
-	HandleDisconnectResponse(argPacket);//shortcut
-	SetNextScene(SceneList::DISCONNECTEDSCREEN);
-	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have been forcibly disconnected by the server";
-}
+	Character& character = characterMap[argPacket->GetCharacterIndex()];
 
-//-------------------------
-//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);
+	//other characters moving
+	if (argPacket->GetCharacterIndex() != characterIndex) {
+		character.SetOrigin(argPacket->GetOrigin());
+		character.SetMotion(argPacket->GetMotion());
+		character.CorrectSprite();
+	}
 }
 
 void InWorld::HandleRegionContent(RegionPacket* const argPacket) {
 	//replace existing regions
-	regionPager.UnloadRegion(argPacket->x, argPacket->y);
-	regionPager.PushRegion(argPacket->region);
+	regionPager.UnloadRegion(argPacket->GetX(), argPacket->GetY());
+	regionPager.PushRegion(argPacket->GetRegion());
 
 	//clean up after the serial code
-	delete argPacket->region;
-	argPacket->region = nullptr;
+	delete argPacket->GetRegion();
+	argPacket->SetRegion(nullptr);
 }
 
-void InWorld::UpdateMap() {
-	if (roomIndex == -1) {
-		return;
-	}
+//-------------------------
+//Server control
+//-------------------------
 
+void InWorld::RequestSynchronize() {
+	ClientPacket newPacket;
+
+	//request a sync
+	newPacket.SetType(SerialPacketType::SYNCHRONIZE);
+	newPacket.SetClientIndex(clientIndex);
+	newPacket.SetAccountIndex(accountIndex);
+
+	//TODO: location, range for sync request
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::SendPlayerUpdate() {
+	CharacterPacket newPacket;
+
+	//pack the packet
+	newPacket.SetType(SerialPacketType::CHARACTER_UPDATE);
+
+	newPacket.SetCharacterIndex(characterIndex);
+	//NOTE: omitting the handle and avatar here
+	newPacket.SetAccountIndex(accountIndex);
+	newPacket.SetRoomIndex(0); //TODO: room index
+	newPacket.SetOrigin(localCharacter->GetOrigin());
+	newPacket.SetMotion(localCharacter->GetMotion());
+	*newPacket.GetStatistics() = *localCharacter->GetStats();
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::RequestDisconnect() {
+	ClientPacket newPacket;
+
+	//send a disconnect request
+	newPacket.SetType(SerialPacketType::DISCONNECT);
+	newPacket.SetClientIndex(clientIndex);
+	newPacket.SetAccountIndex(accountIndex);
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::RequestShutDown() {
+	ClientPacket newPacket;
+
+	//send a shutdown request
+	newPacket.SetType(SerialPacketType::SHUTDOWN);
+	newPacket.SetClientIndex(clientIndex);
+	newPacket.SetAccountIndex(accountIndex);
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::RequestRegion(int roomIndex, int x, int y) {
+	RegionPacket packet;
+
+	//pack the region's data
+	packet.SetType(SerialPacketType::REGION_REQUEST);
+	packet.SetRoomIndex(roomIndex);
+	packet.SetX(x);
+	packet.SetY(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;
@@ -538,194 +463,27 @@ void InWorld::UpdateMap() {
 	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;
-	});
+	for (std::list<Region>::iterator it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); /* EMPTY */) {
+		//check if the region is outside of this area
+		if (it->GetX() < xStart || it->GetX() > xEnd || it->GetY() < yStart || it->GetY() > yEnd) {
+
+			//clunky, but the alternative was time consuming
+			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)) {
-				SendRegionRequest(roomIndex, i, j);
+				RequestRegion(0, 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-2015
+/* 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
@@ -25,10 +25,8 @@
 //maps
 #include "region_pager_base.hpp"
 
-//utilities
+//networking
 #include "udp_network_utility.hpp"
-#include "serial_packet.hpp"
-#include "config_utility.hpp"
 
 //graphics
 #include "image.hpp"
@@ -39,20 +37,23 @@
 //common
 #include "frame_rate.hpp"
 
+#include "character.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(int* const argClientIndex, int* const argAccountIndex);
+	InWorld(
+		int* const argClientIndex,
+		int* const argAccountIndex,
+		int* const argCharacterIndex,
+		CharacterMap* argCharacterMap
+	);
 	~InWorld();
 
 protected:
@@ -71,41 +72,30 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//Basic connections
+	//Network handlers
 	void HandlePacket(SerialPacket* 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 HandleDisconnect(SerialPacket* const);
+	void HandleCharacterNew(CharacterPacket* const);
+	void HandleCharacterDelete(CharacterPacket* const);
+	void HandleCharacterUpdate(CharacterPacket* const);
 	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();
 
-	//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
+	//shared parameters
+	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
 	int& clientIndex;
 	int& accountIndex;
-	int characterIndex = -1;
-	int roomIndex = -1;
+	int& characterIndex;
+	CharacterMap& characterMap;
 
 	//graphics
 	Image buttonImage;
@@ -118,29 +108,16 @@ protected:
 	//UI
 	Button disconnectButton;
 	Button shutDownButton;
-	FrameRate fps;
-
-	//the camera structure
+	//TODO: Review the camera
 	struct {
 		int x = 0, y = 0;
 		int width = 0, height = 0;
 		int marginX = 0, marginY = 0;
 	} camera;
+	FrameRate fps;
 
-	//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();
+	//game
+	Character* localCharacter = nullptr;
 };
 
 #endif

client/scenes/lobby_menu.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -34,10 +34,6 @@ 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);
@@ -67,7 +63,7 @@ LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
 	//set the server list's position
 	listBox = {300, 50, 200, font.GetCharH()};
 
-	//Eat incoming packets
+	//BUGFIX: Eat incoming packets
 	while(network.Receive());
 
 	//Initial broadcast
@@ -116,7 +112,7 @@ void LobbyMenu::Render(SDL_Surface* const screen) {
 				(Uint16)listBox.w, (Uint16)listBox.h
 			};
 			r.y += i * listBox.h;
-			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 49, 150, 5));
+			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 255, 127, 39));
 		}
 
 		//draw the server name
@@ -189,29 +185,16 @@ void LobbyMenu::KeyUp(SDL_KeyboardEvent const& key) {
 //-------------------------
 
 void LobbyMenu::HandlePacket(SerialPacket* const argPacket) {
-		switch(argPacket->type) {
-			//responses
+		switch(argPacket->GetType()) {
 		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)) ));
+			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in LobbyMenu: " + to_string_custom(static_cast<int>(argPacket->GetType())) ));
 		break;
 	}
 }
@@ -219,10 +202,10 @@ void LobbyMenu::HandlePacket(SerialPacket* const argPacket) {
 void LobbyMenu::HandleBroadcastResponse(ServerPacket* const argPacket) {
 	//extract the data
 	ServerInformation server;
-	server.address = argPacket->srcAddress;
-	server.name = argPacket->name;
-	server.playerCount = argPacket->playerCount;
-	server.version = argPacket->version;
+	server.address = argPacket->GetAddress();
+	server.name = argPacket->GetName();
+	server.playerCount = argPacket->GetPlayerCount();
+	server.version = argPacket->GetVersion();
 
 	//Checking compatibility
 	server.compatible = server.version == NETWORK_VERSION;
@@ -232,28 +215,18 @@ void LobbyMenu::HandleBroadcastResponse(ServerPacket* const argPacket) {
 }
 
 void LobbyMenu::HandleJoinResponse(ClientPacket* const argPacket) {
-	//save the server's data
-	clientIndex = argPacket->clientIndex;
-	network.Bind(argPacket->srcAddress, Channels::SERVER);
-
-	//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;
+	clientIndex = argPacket->GetClientIndex();
+	accountIndex = argPacket->GetAccountIndex();
+	network.Bind(argPacket->GetAddressPtr(), Channels::SERVER);
 	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
+	//send this player's character info
+	CharacterPacket newPacket;
+	newPacket.SetType(SerialPacketType::CHARACTER_NEW);
+	newPacket.SetHandle(config["client.handle"].c_str());
+	newPacket.SetAvatar(config["client.avatar"].c_str());
+	newPacket.SetAccountIndex(accountIndex);
+	network.SendTo(Channels::SERVER, &newPacket);
 }
 
 //-------------------------
@@ -262,8 +235,8 @@ void LobbyMenu::HandleLoginRejection(TextPacket* const argPacket) {
 
 void LobbyMenu::SendBroadcastRequest() {
 	//broadcast to the network, or a specific server
-		ClientPacket packet;
-		packet.type = SerialPacketType::BROADCAST_REQUEST;
+		ServerPacket packet;
+		packet.SetType(SerialPacketType::BROADCAST_REQUEST);
 		network.SendTo(config["server.host"].c_str(), config.Int("server.port"), &packet);
 
 		//reset the server list
@@ -274,19 +247,10 @@ void LobbyMenu::SendBroadcastRequest() {
 void LobbyMenu::SendJoinRequest() {
 	//pack the packet
 		ClientPacket packet;
-		packet.type = SerialPacketType::JOIN_REQUEST;
+		packet.SetType(SerialPacketType::JOIN_REQUEST);
+		packet.SetUsername(config["client.username"].c_str());
 
 		//join the selected server
-		network.SendTo(selection->address, &packet);
+		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-2015
+/* 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
@@ -31,7 +31,6 @@
 //utilities
 #include "config_utility.hpp"
 #include "udp_network_utility.hpp"
-#include "serial_packet.hpp"
 
 //client
 #include "base_scene.hpp"
@@ -63,14 +62,10 @@ protected:
 	void HandlePacket(SerialPacket* const);
 	void HandleBroadcastResponse(ServerPacket* const);
 	void HandleJoinResponse(ClientPacket* const);
-	void HandleLoginResponse(ClientPacket* const);
-	void HandleJoinRejection(TextPacket* const);
-	void HandleLoginRejection(TextPacket* const);
 
 	//server control
 	void SendBroadcastRequest();
 	void SendJoinRequest();
-	void SendLoginRequest();
 
 	//shared parameters
 	ConfigUtility& config = ConfigUtility::GetSingleton();

client/scenes/main_menu.cpp

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

client/scenes/main_menu.hpp

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

client/scenes/makefile

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

client/scenes/options_menu.cpp

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

client/scenes/options_menu.hpp

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

client/scenes/splash_screen.cpp

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

client/scenes/splash_screen.hpp

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

common/debugging/timer.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -39,7 +39,7 @@ void Timer::Stop() {
 
 std::ostream& operator<<(std::ostream& os, Timer& t) {
 	os << t.GetName() << ": ";
-	os << std::chrono::duration_cast<std::chrono::microseconds>(t.GetTime()).count();
-	os << "us";
+	os << std::chrono::duration_cast<std::chrono::milliseconds>(t.GetTime()).count();
+	os << "ms";
 	return os;
 }

common/debugging/timer.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -34,8 +34,8 @@ public:
 	Timer(std::string s);
 	~Timer() = default;
 
-	void Start();
-	void Stop();
+	inline void Start();
+	inline void Stop();
 
 	//accessors and mutators
 	Clock::duration GetTime() { return timeSpan; }

common/gameplay/character_defines.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -27,7 +27,6 @@
 //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;
@@ -35,8 +34,4 @@ 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_defines.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,5 +19,16 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "terminal_error.hpp"
+#ifndef COMBATDEFINES_HPP_
+#define COMBATDEFINES_HPP_
 
+#define COMBAT_MAX_CHARACTERS 16
+#define COMBAT_MAX_ENEMIES 16
+
+enum class TerrainType {
+	NONE = 0,
+	GRASSLANDS,
+	//etc.
+};
+
+#endif

common/gameplay/statistics.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,18 +19,24 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef BASEMONSTER_HPP_
-#define BASEMONSTER_HPP_
+#ifndef STATISTICS_HPP_
+#define STATISTICS_HPP_
 
-#include "entity.hpp"
-
-class BaseMonster: public Entity {
-public:
-	BaseMonster() = default;
-	virtual ~BaseMonster() = default;
-
-protected:
-	//
+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-2015
+/* 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

common/graphics/image.hpp

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

common/graphics/sprite_sheet.cpp

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

common/graphics/sprite_sheet.hpp

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

common/map/map_system_api.cpp

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

common/map/region.hpp

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

common/map/region_api.cpp

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

common/map/region_api.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -22,13 +22,9 @@
 #ifndef REGIONAPI_HPP_
 #define REGIONAPI_HPP_
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua/lua.hpp"
 
-#define TORTUGA_REGION_NAME "region"
+#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 2013-2015
+/* 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

common/map/region_pager_api.hpp

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

common/map/region_pager_base.cpp

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

common/map/region_pager_base.hpp

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

common/map/region_pager_lua.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -23,17 +23,6 @@
 
 #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) {
 	//get the pager's function from the registry
 	lua_rawgeti(lua, LUA_REGISTRYINDEX, loadRef);
@@ -65,7 +54,6 @@ Region* RegionPagerLua::LoadRegion(int x, int y) {
 	}
 }
 
-//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);
@@ -100,7 +88,6 @@ Region* RegionPagerLua::SaveRegion(int x, int y) {
 	}
 }
 
-//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"));
@@ -129,7 +116,6 @@ Region* RegionPagerLua::CreateRegion(int x, int y) {
 	return &regionList.front();
 }
 
-//no return
 void RegionPagerLua::UnloadRegion(int x, int y) {
 	//get the pager's function from the registry
 	lua_rawgeti(lua, LUA_REGISTRYINDEX, unloadRef);

common/map/region_pager_lua.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -24,18 +24,14 @@
 
 #include "region_pager_base.hpp"
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua/lua.hpp"
 
 #include <string>
 
 class RegionPagerLua : public RegionPagerBase {
 public:
 	RegionPagerLua() = default;
-	~RegionPagerLua();
+	~RegionPagerLua() = default;
 
 	//region manipulation
 	Region* LoadRegion(int x, int y) override;

common/map/tile_sheet.cpp

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

common/map/tile_sheet.hpp

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

common/map/tile_sheet_api.cpp

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

common/map/tile_sheet_api.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -22,13 +22,9 @@
 #ifndef TILESHEETAPI_HPP_
 #define TILESHEETAPI_HPP_
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua/lua.hpp"
 
-#define TORTUGA_TILE_SHEET_NAME "tile_sheet"
+#define TORTUGA_TILE_SHEET_NAME "TileSheet"
 LUAMOD_API int openTileSheetAPI(lua_State* L);
 
 #endif

common/network/packet_types/character_packet.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -23,44 +23,50 @@
 
 #include "serial_utility.hpp"
 
-void serializeCharacter(void* buffer, CharacterPacket* packet) {
-	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+void CharacterPacket::Serialize(void* buffer) {
+	serializeCopy(&buffer, &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);
+	serializeCopy(&buffer, &characterIndex, sizeof(int));
+	serializeCopy(&buffer, handle, PACKET_STRING_SIZE);
+	serializeCopy(&buffer, avatar, PACKET_STRING_SIZE);
 
 	//the owner
-	serialCopy(&buffer, &packet->accountIndex, sizeof(int));
+	serializeCopy(&buffer, &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));
+	serializeCopy(&buffer, &roomIndex, sizeof(int));
+	serializeCopy(&buffer, &origin.x, sizeof(double));
+	serializeCopy(&buffer, &origin.y, sizeof(double));
+	serializeCopy(&buffer, &motion.x, sizeof(double));
+	serializeCopy(&buffer, &motion.y, sizeof(double));
 
-	//gameplay components: equipment, items, buffs, debuffs...
+	//stats structure
+	serializeCopyStatistics(&buffer, &stats);
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs
 }
 
-void deserializeCharacter(void* buffer, CharacterPacket* packet) {
-	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+void CharacterPacket::Deserialize(void* buffer) {
+	deserializeCopy(&buffer, &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);
+	deserializeCopy(&buffer, &characterIndex, sizeof(int));
+	deserializeCopy(&buffer, handle, PACKET_STRING_SIZE);
+	deserializeCopy(&buffer, avatar, PACKET_STRING_SIZE);
 
 	//the owner
-	deserialCopy(&buffer, &packet->accountIndex, sizeof(int));
+	deserializeCopy(&buffer, &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));
+	deserializeCopy(&buffer, &roomIndex, sizeof(int));
+	deserializeCopy(&buffer, &origin.x, sizeof(double));
+	deserializeCopy(&buffer, &origin.y, sizeof(double));
+	deserializeCopy(&buffer, &motion.x, sizeof(double));
+	deserializeCopy(&buffer, &motion.y, sizeof(double));
 
-	//gameplay components: equipment, items, buffs, debuffs...
+	//stats structure
+	deserializeCopyStatistics(&buffer, &stats);
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs
 }

common/network/packet_types/character_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -25,26 +25,63 @@
 #include "serial_packet_base.hpp"
 
 #include "vector2.hpp"
+#include "statistics.hpp"
 
-struct CharacterPacket : SerialPacketBase {
+#include <cstring>
+
+class CharacterPacket : public SerialPacketBase {
+public:
+	CharacterPacket() {}
+	~CharacterPacket() {}
+
+	//indentity
+	int SetCharacterIndex(int i) { return characterIndex = i; }
+	const char* SetHandle(const char* s)
+	{ return strncpy(handle, s, PACKET_STRING_SIZE); }
+	const char* SetAvatar(const char* s)
+	{ return strncpy(handle, s, PACKET_STRING_SIZE); }
+
+	int SetAccountIndex(int i) { return accountIndex = i; }
+
+	int GetCharacterIndex() { return characterIndex; }
+	const char* GetHandle() { return handle; }
+	const char* GetAvatar() { return avatar; }
+
+	int GetAccountIndex() { return accountIndex; }
+
+	//location
+	int SetRoomIndex(int i) { return roomIndex = i; }
+	Vector2 SetOrigin(Vector2 v) { return origin = v; }
+	Vector2 SetMotion(Vector2 v) { return motion = v; }
+
+	int GetRoomIndex() { return roomIndex; }
+	Vector2 GetOrigin() { return origin; }
+	Vector2 GetMotion() { return motion; }
+
+	//gameplay
+	Statistics* GetStatistics() { return &stats; }
+
+	virtual void Serialize(void* buffer) override;
+	virtual void Deserialize(void* buffer) override;
+
+private:
 	//identify the character
 	int characterIndex;
-	char handle[PACKET_STRING_SIZE];
-	char avatar[PACKET_STRING_SIZE];
+	char handle[PACKET_STRING_SIZE+1];
+	char avatar[PACKET_STRING_SIZE+1];
 
 	//the owner
 	int accountIndex;
-	//TODO: Authentication token?
 
 	//location
 	int roomIndex;
 	Vector2 origin;
 	Vector2 motion;
 
-	//gameplay components: equipment, items, buffs, debuffs...
+	//gameplay
+	Statistics stats;
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs
 };
 
-void serializeCharacter(void* buffer, CharacterPacket* packet);
-void deserializeCharacter(void* buffer, CharacterPacket* packet);
-
 #endif

common/network/packet_types/client_packet.cpp

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

common/network/packet_types/client_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -24,13 +24,31 @@
 
 #include "serial_packet_base.hpp"
 
-struct ClientPacket : SerialPacketBase {
+#include <cstring>
+
+class ClientPacket : public SerialPacketBase {
+public:
+	ClientPacket() {}
+	~ClientPacket() {}
+
+	//accessors & mutators
+	int SetClientIndex(int i) { return clientIndex = i; }
+	int SetAccountIndex(int i) { return accountIndex = i; }
+	const char* SetUsername(const char* s)
+	{ return strncpy(username, s, PACKET_STRING_SIZE); }
+
+	int GetClientIndex() { return clientIndex; }
+	int GetAccountIndex() { return accountIndex; }
+	const char* GetUsername() { return username; }
+
+	virtual void Serialize(void* buffer) override;
+	virtual void Deserialize(void* buffer) override;
+
+private:
 	int clientIndex;
 	int accountIndex;
-	char username[PACKET_STRING_SIZE];
+	char username[PACKET_STRING_SIZE+1];
+//	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/region_packet.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -23,15 +23,15 @@
 
 #include "serial_utility.hpp"
 
-void serializeRegion(void* buffer, RegionPacket* packet) {
-	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+void RegionPacket::Serialize(void* buffer) {
+	serializeCopy(&buffer, &type, sizeof(SerialPacketType));
 
 	//format
-	serialCopy(&buffer, &packet->roomIndex, sizeof(int));
-	serialCopy(&buffer, &packet->x, sizeof(int));
-	serialCopy(&buffer, &packet->y, sizeof(int));
+	serializeCopy(&buffer, &roomIndex, sizeof(int));
+	serializeCopy(&buffer, &x, sizeof(int));
+	serializeCopy(&buffer, &y, sizeof(int));
 
-	if (packet->type != SerialPacketType::REGION_CONTENT) {
+	if (type != SerialPacketType::REGION_CONTENT) {
 		return;
 	}
 
@@ -39,41 +39,41 @@ void serializeRegion(void* buffer, RegionPacket* packet) {
 	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);
+				*reinterpret_cast<Region::type_t*>(buffer) = region->GetTile(i, j, k);
 				buffer = reinterpret_cast<char*>(buffer) + sizeof(Region::type_t);
 			}
 		}
 	}
 
 	//solids
-	serialCopy(&buffer, packet->region->GetSolidBitset(), REGION_SOLID_FOOTPRINT);
+	serializeCopy(&buffer, region->GetSolidBitset(), REGION_SOLID_FOOTPRINT);
 }
 
-void deserializeRegion(void* buffer, RegionPacket* packet) {
-	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+void RegionPacket::Deserialize(void* buffer) {
+	deserializeCopy(&buffer, &type, sizeof(SerialPacketType));
 
 	//format
-	deserialCopy(&buffer, &packet->roomIndex, sizeof(int));
-	deserialCopy(&buffer, &packet->x, sizeof(int));
-	deserialCopy(&buffer, &packet->y, sizeof(int));
+	deserializeCopy(&buffer, &roomIndex, sizeof(int));
+	deserializeCopy(&buffer, &x, sizeof(int));
+	deserializeCopy(&buffer, &y, sizeof(int));
 
-	if (packet->type != SerialPacketType::REGION_CONTENT) {
+	if (type != SerialPacketType::REGION_CONTENT) {
 		return;
 	}
 
 	//an object to work on
-	packet->region = new Region(packet->x, packet->y);
+	region = new Region(x, 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));
+				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);
+	deserializeCopy(&buffer, region->GetSolidBitset(), REGION_SOLID_FOOTPRINT);
 }

common/network/packet_types/region_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -27,13 +27,35 @@
 #include "region.hpp"
 
 #include <cmath>
+#include <cstring>
 
 //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 {
+class RegionPacket : public SerialPacketBase {
+public:
+	RegionPacket() {}
+	~RegionPacket() {}
+
+	//location
+	int SetRoomIndex(int i) { return roomIndex = i; }
+	int SetX(int i) { return x = i; }
+	int SetY(int i) { return y = i; }
+
+	int GetRoomIndex() { return roomIndex; }
+	int GetX() { return x; }
+	int GetY() { return y; }
+
+	//the region itself
+	Region* SetRegion(Region* r) { return region = r; }
+	Region* GetRegion() { return region; }
+
+	virtual void Serialize(void* buffer) override;
+	virtual void Deserialize(void* buffer) override;
+
+private:
 	//location/identify the region
 	int roomIndex;
 	int x, y;
@@ -42,7 +64,4 @@ struct RegionPacket : SerialPacketBase {
 	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-2015
+/* 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
@@ -21,4 +21,4 @@
 */
 #include "serial_packet_base.hpp"
 
-//sanity check
+//NOTE: This is a sanity check

common/network/packet_types/serial_packet_base.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -26,14 +26,28 @@
 
 #include "SDL/SDL_net.h"
 
+//The packets use a char array for string storage
 constexpr int PACKET_STRING_SIZE = 100;
 
-struct SerialPacketBase {
-	//members
+class SerialPacketBase {
+public:
+	SerialPacketType SetType(SerialPacketType t) { return type = t; }
+	SerialPacketType GetType() { return type; }
+
+	IPaddress GetAddress() { return srcAddress; }
+	IPaddress* GetAddressPtr() { return &srcAddress; }
+
+	SerialPacketBase() {};
+	virtual ~SerialPacketBase() {};
+
+	virtual void Serialize(void* buffer) = 0;
+	virtual void Deserialize(void* buffer) = 0;
+
+protected:
+	friend class UDPNetworkUtility;
+
 	SerialPacketType type;
 	IPaddress srcAddress;
-
-	virtual ~SerialPacketBase() {};
 };
 
 #endif

common/network/packet_types/server_packet.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -23,20 +23,20 @@
 
 #include "serial_utility.hpp"
 
-void serializeServer(void* buffer, ServerPacket* packet) {
-	serialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+void ServerPacket::Serialize(void* buffer) {
+	serializeCopy(&buffer, &type, sizeof(SerialPacketType));
 
 	//identify the server
-	serialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
-	serialCopy(&buffer, &packet->playerCount, sizeof(int));
-	serialCopy(&buffer, &packet->version, sizeof(int));
+	serializeCopy(&buffer, name, PACKET_STRING_SIZE);
+	serializeCopy(&buffer, &playerCount, sizeof(int));
+	serializeCopy(&buffer, &version, sizeof(int));
 }
 
-void deserializeServer(void* buffer, ServerPacket* packet) {
-	deserialCopy(&buffer, &packet->type, sizeof(SerialPacketType));
+void ServerPacket::Deserialize(void* buffer) {
+	deserializeCopy(&buffer, &type, sizeof(SerialPacketType));
 
 	//identify the server
-	deserialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
-	deserialCopy(&buffer, &packet->playerCount, sizeof(int));
-	deserialCopy(&buffer, &packet->version, sizeof(int));
+	deserializeCopy(&buffer, name, PACKET_STRING_SIZE);
+	deserializeCopy(&buffer, &playerCount, sizeof(int));
+	deserializeCopy(&buffer, &version, sizeof(int));
 }

common/network/packet_types/server_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -24,14 +24,30 @@
 
 #include "serial_packet_base.hpp"
 
-struct ServerPacket : SerialPacketBase {
+#include <cstring>
+
+class ServerPacket : public SerialPacketBase {
+public:
+	ServerPacket() {}
+	~ServerPacket() {}
+
+	const char* SetName(const char* s)
+	{ return strncpy(name, s, PACKET_STRING_SIZE); }
+	int SetPlayerCount(int i) { return playerCount = i; }
+	int SetVersion(int i) { return version = i; }
+
+	const char* GetName() { return name; }
+	int GetPlayerCount() { return playerCount; }
+	int GetVersion() { return version; }
+
+	virtual void Serialize(void* buffer) override;
+	virtual void Deserialize(void* buffer) override;
+
+private:
 	//identify the server
-	char name[PACKET_STRING_SIZE];
+	char name[PACKET_STRING_SIZE+1];
 	int playerCount;
 	int version;
 };
 
-void serializeServer(void* buffer, ServerPacket* packet);
-void deserializeServer(void* buffer, ServerPacket* packet);
-
 #endif

common/network/packet_types/text_packet.cpp

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

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

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -22,28 +22,31 @@
 #ifndef SERIALPACKET_HPP_
 #define SERIALPACKET_HPP_
 
+/* DOCS: serial_packet.hpp is used to define a number of required constants.
+ * These are used extensively by the server and client
+*/
+
 #include "serial_packet_base.hpp"
 #include "character_packet.hpp"
 #include "client_packet.hpp"
 #include "region_packet.hpp"
 #include "server_packet.hpp"
-#include "text_packet.hpp"
 
 //SerialPacketBase is defined in serial_packet_base.hpp
 typedef SerialPacketBase SerialPacket;
 
 //DOCS: NETWORK_VERSION is used to discern compatible servers and clients
-constexpr int NETWORK_VERSION = 20141227;
+constexpr int NETWORK_VERSION = 20140831;
 
-union MaxPacket {
+//_MaxPacket Should not be used
+union _MaxPacket {
 	CharacterPacket a;
 	ClientPacket b;
 	RegionPacket c;
 	ServerPacket d;
-	TextPacket e;
 };
 
-constexpr int MAX_PACKET_SIZE = sizeof(MaxPacket);
+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

common/network/serial_packet_type.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -27,7 +27,6 @@
  * 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,
@@ -38,37 +37,31 @@ enum class SerialPacketType {
 	//-------------------------
 
 	//heartbeat
-	PING = 1,
-	PONG = 2,
+	PING,
+	PONG,
 
 	//Used for finding available servers
-	BROADCAST_REQUEST = 3,
-	BROADCAST_RESPONSE = 4,
+	BROADCAST_REQUEST,
+	BROADCAST_RESPONSE,
 
 	//-------------------------
 	//ClientPacket
-	//  client index, account index, username
+	//  client index, account index, character index
 	//-------------------------
 
 	//Connecting to a server as a client
-	JOIN_REQUEST = 5,
-	JOIN_RESPONSE = 6,
+	JOIN_REQUEST,
+	JOIN_RESPONSE,
+	JOIN_REJECTION,
+
+	//client requests all information from the server
+	SYNCHRONIZE,
 
 	//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,
+	DISCONNECT,
 
 	//shut down the server
-	SHUTDOWN_REQUEST = 14,
+	SHUTDOWN,
 
 	//-------------------------
 	//RegionPacket
@@ -76,56 +69,30 @@ enum class SerialPacketType {
 	//-------------------------
 
 	//map data
-	REGION_REQUEST = 15, //NOTE: technically a query
-	REGION_CONTENT = 16,
+	REGION_REQUEST,
+	REGION_CONTENT,
 
 	//-------------------------
 	//CharacterPacket
-	//  character index,
-	//  handle, avatar,
-	//  account index (owner),
-	//  room index, origin, motion,
+	//  handle, avatar, character index, account index,
+	//  room index, origin, motion
 	//  statistics
 	//-------------------------
 
-	//character management
-	CHARACTER_CREATE = 17,
-	CHARACTER_DELETE = 18,
-	CHARACTER_LOAD = 19,
-	CHARACTER_UNLOAD = 20,
+	//controlling characters
+	CHARACTER_NEW,
+	CHARACTER_DELETE,
+	CHARACTER_UPDATE,
 
-	//find out info from the server
-	QUERY_CHARACTER_EXISTS = 21,
-	QUERY_CHARACTER_STATS = 22,
-	QUERY_CHARACTER_LOCATION = 23,
+	//authentication, character index => character stats
+	CHARACTER_STATS_REQUEST,
+	CHARACTER_STATS_RESPONSE,
 
-	//set the info in the server
-	CHARACTER_SET_ROOM = 24,
-	CHARACTER_SET_ORIGIN = 25,
-	CHARACTER_SET_MOTION = 26,
+	//reject a character request
+	CHARACTER_REJECTION,
 
-	//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
+	LAST
 };
 
 #endif

common/network/serial_utility.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -21,123 +21,127 @@
 */
 #include "serial_utility.hpp"
 
-//packet types
-#include "character_packet.hpp"
+#include "serial_packet_type.hpp"
+
+#include "server_packet.hpp"
 #include "client_packet.hpp"
 #include "region_packet.hpp"
-#include "server_packet.hpp"
-#include "text_packet.hpp"
+#include "character_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) {
+void serializePacket(SerialPacketBase* packet, void* data) {
+	switch(packet->GetType()) {
 		case SerialPacketType::PING:
 		case SerialPacketType::PONG:
 		case SerialPacketType::BROADCAST_REQUEST:
 		case SerialPacketType::BROADCAST_RESPONSE:
-			serializeServer(buffer, static_cast<ServerPacket*>(packet));
+			static_cast<ServerPacket*>(packet)->Serialize(data);
 		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));
+		case SerialPacketType::JOIN_REJECTION:
+		case SerialPacketType::SYNCHRONIZE:
+		case SerialPacketType::DISCONNECT:
+		case SerialPacketType::SHUTDOWN:
+			static_cast<ClientPacket*>(packet)->Serialize(data);
 		break;
 		case SerialPacketType::REGION_REQUEST:
 		case SerialPacketType::REGION_CONTENT:
-			serializeRegion(buffer, static_cast<RegionPacket*>(packet));
+			static_cast<RegionPacket*>(packet)->Serialize(data);
 		break;
-		case SerialPacketType::CHARACTER_CREATE:
+		case SerialPacketType::CHARACTER_NEW:
 		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_UPDATE:
+		case SerialPacketType::CHARACTER_STATS_REQUEST:
+		case SerialPacketType::CHARACTER_STATS_RESPONSE:
 		case SerialPacketType::CHARACTER_REJECTION:
-		case SerialPacketType::SHUTDOWN_REJECTION:
-			serializeText(buffer, static_cast<TextPacket*>(packet));
+			static_cast<CharacterPacket*>(packet)->Serialize(data);
 		break;
 	}
 }
 
-void deserializePacket(void* buffer, SerialPacketBase* packet) {
-	//find the type, so that you can actually deserialize the packet!
+void deserializePacket(SerialPacketBase* packet, void* data) {
+	//get the type
 	SerialPacketType type;
-	memcpy(&type, buffer, sizeof(SerialPacketType));
+	memcpy(&type, data, sizeof(SerialPacketType));
 
 	switch(type) {
 		case SerialPacketType::PING:
 		case SerialPacketType::PONG:
 		case SerialPacketType::BROADCAST_REQUEST:
 		case SerialPacketType::BROADCAST_RESPONSE:
-			deserializeServer(buffer, static_cast<ServerPacket*>(packet));
+			static_cast<ServerPacket*>(packet)->Deserialize(data);
 		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));
+		case SerialPacketType::JOIN_REJECTION:
+		case SerialPacketType::SYNCHRONIZE:
+		case SerialPacketType::DISCONNECT:
+		case SerialPacketType::SHUTDOWN:
+			static_cast<ClientPacket*>(packet)->Deserialize(data);
 		break;
 		case SerialPacketType::REGION_REQUEST:
 		case SerialPacketType::REGION_CONTENT:
-			deserializeRegion(buffer, static_cast<RegionPacket*>(packet));
+			static_cast<RegionPacket*>(packet)->Deserialize(data);
 		break;
-		case SerialPacketType::CHARACTER_CREATE:
+		case SerialPacketType::CHARACTER_NEW:
 		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_UPDATE:
+		case SerialPacketType::CHARACTER_STATS_REQUEST:
+		case SerialPacketType::CHARACTER_STATS_RESPONSE:
 		case SerialPacketType::CHARACTER_REJECTION:
-		case SerialPacketType::SHUTDOWN_REJECTION:
-			deserializeText(buffer, static_cast<TextPacket*>(packet));
+			static_cast<CharacterPacket*>(packet)->Deserialize(data);
 		break;
 	}
-}
+}
+
+void serializeCopy(void** bufferHead, void* data, int size) {
+	memcpy(*bufferHead, data, size);
+	(*bufferHead) = static_cast<void*>(static_cast<char*>(*bufferHead) + size);
+}
+
+void deserializeCopy(void** bufferHead, void* data, int size) {
+	memcpy(data, *bufferHead, size);
+	(*bufferHead) = static_cast<void*>(static_cast<char*>(*bufferHead) + size);
+}
+
+void serializeCopyStatistics(void** bufferHead, Statistics* stats) {
+	//integers
+	serializeCopy(bufferHead, &stats->level, sizeof(int));
+	serializeCopy(bufferHead, &stats->exp, sizeof(int));
+	serializeCopy(bufferHead, &stats->maxHP, sizeof(int));
+	serializeCopy(bufferHead, &stats->health, sizeof(int));
+	serializeCopy(bufferHead, &stats->maxMP, sizeof(int));
+	serializeCopy(bufferHead, &stats->mana, sizeof(int));
+	serializeCopy(bufferHead, &stats->attack, sizeof(int));
+	serializeCopy(bufferHead, &stats->defence, sizeof(int));
+	serializeCopy(bufferHead, &stats->intelligence, sizeof(int));
+	serializeCopy(bufferHead, &stats->resistance, sizeof(int));
+	serializeCopy(bufferHead, &stats->speed, sizeof(int));
+
+	//floats
+	serializeCopy(bufferHead, &stats->accuracy, sizeof(float));
+	serializeCopy(bufferHead, &stats->evasion, sizeof(float));
+	serializeCopy(bufferHead, &stats->luck, sizeof(float));
+}
+
+void deserializeCopyStatistics(void** bufferHead, Statistics* stats) {
+	//integers
+	deserializeCopy(bufferHead, &stats->level, sizeof(int));
+	deserializeCopy(bufferHead, &stats->exp, sizeof(int));
+	deserializeCopy(bufferHead, &stats->maxHP, sizeof(int));
+	deserializeCopy(bufferHead, &stats->health, sizeof(int));
+	deserializeCopy(bufferHead, &stats->maxMP, sizeof(int));
+	deserializeCopy(bufferHead, &stats->mana, sizeof(int));
+	deserializeCopy(bufferHead, &stats->attack, sizeof(int));
+	deserializeCopy(bufferHead, &stats->defence, sizeof(int));
+	deserializeCopy(bufferHead, &stats->intelligence, sizeof(int));
+	deserializeCopy(bufferHead, &stats->resistance, sizeof(int));
+	deserializeCopy(bufferHead, &stats->speed, sizeof(int));
+
+	//floats
+	deserializeCopy(bufferHead, &stats->accuracy, sizeof(float));
+	deserializeCopy(bufferHead, &stats->evasion, sizeof(float));
+	deserializeCopy(bufferHead, &stats->luck, sizeof(float));
+}

common/network/serial_utility.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -24,14 +24,19 @@
 
 #include "serial_packet_base.hpp"
 
-#include <cstring>
+#include "statistics.hpp"
 
-//raw memory copy
-void serialCopy(void** buffer, void* data, int size);
-void deserialCopy(void** buffer, void* data, int size);
+//NOTE: The naming conventions here are fucking terrible
 
-//primary functions
-void serializePacket(void* buffer, SerialPacketBase* packet);
-void deserializePacket(void* buffer, SerialPacketBase* packet);
+//BUGFIX: There's really no way to escape this :(
+void serializePacket(SerialPacketBase* packet, void* data);
+void deserializePacket(SerialPacketBase* packet, void* data);
+
+//raw memcpy
+void serializeCopy(void** bufferHead, void* data, int size);
+void deserializeCopy(void** bufferHead, void* data, int size);
+
+void serializeCopyStatistics(void** bufferHead, Statistics* stats);
+void deserializeCopyStatistics(void** bufferHead, Statistics* stats);
 
 #endif

common/network/udp_network_utility.cpp

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

common/network/udp_network_utility.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -23,7 +23,7 @@
 #define UDPNETWORKUTILITY_HPP_
 
 //common
-#include "serial_packet_base.hpp"
+#include "serial_packet.hpp"
 #include "singleton.hpp"
 
 //APIs
@@ -36,7 +36,7 @@ public:
 
 	//bind to a channel
 	int Bind(const char* ip, int port, int channel = -1);
-	int Bind(IPaddress add, int channel = -1);
+	int Bind(IPaddress* add, int channel = -1);
 	void Unbind(int channel);
 
 	IPaddress* GetIPAddress(int channel) {
@@ -45,17 +45,17 @@ public:
 
 	//send a buffer
 	int SendTo(const char* ip, int port, void* data, int len);
-	int SendTo(IPaddress add, void* data, int len);
+	int SendTo(IPaddress* add, void* data, int len);
 	int SendTo(int channel, void* data, int len);
 	int SendToAllChannels(void* data, int len);
 	int Receive();
 
-	//send a SerialPacketBase
-	int SendTo(const char* ip, int port, SerialPacketBase* serialPacket);
-	int SendTo(IPaddress add, SerialPacketBase* serialPacket);
-	int SendTo(int channel, SerialPacketBase* serialPacket);
-	int SendToAllChannels(SerialPacketBase* serialPacket);
-	int Receive(SerialPacketBase* serialPacket);
+	//send a SerialPacket
+	int SendTo(const char* ip, int port, SerialPacket* serialPacket);
+	int SendTo(IPaddress* add, SerialPacket* serialPacket);
+	int SendTo(int channel, SerialPacket* serialPacket);
+	int SendToAllChannels(SerialPacket* serialPacket);
+	int Receive(SerialPacket* serialPacket);
 
 	//accessors
 	UDPpacket* GetPacket() const {

common/ui/button.cpp

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

common/ui/button.hpp

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

common/ui/menu_bar.cpp

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

common/ui/menu_bar.hpp

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

common/ui/raster_font.cpp

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

common/ui/raster_font.hpp

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

common/utilities/bounding_box.hpp

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

common/utilities/config_utility.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -22,77 +22,26 @@
 #include "config_utility.hpp"
 
 #include <cstdlib>
-#include <cstring>
 #include <fstream>
-#include <sstream>
 #include <stdexcept>
 
-void ConfigUtility::Load(std::string fname, bool skipMissingFile, int argc, char* argv[]) {
+void ConfigUtility::Load(std::string fname) {
 	//clear the stored configuration
 	configMap.clear();
-
-	//use the default file
-	if (argc < 2) {
-		configMap = Read(fname, skipMissingFile);
-		return;
-	}
-
-	//some variables to use
-	table_t redirectedFile;
-	table_t cmdLineParams;
-	char key[256], val[256];
-	bool redirectUsed = false;
-
-	//reading from the command line
-	for (int i = 1; i < argc; ++i) {
-		//read from a specified config file
-		if (!strncmp(argv[i], "-config=", 8)) {
-			//older specified files take precedence
-			table_t tmp = Read(argv[i] + 8, skipMissingFile);
-			redirectedFile.insert(tmp.begin(), tmp.end());
-			redirectUsed = true;
-			continue;
-		}
-
-		//set some specific values
-		if (!strncmp(argv[i], "-", 1)) {
-			//wipe the variables
-			memset(key, 0, 256);
-			memset(key, 0, 256);
-
-			//read the key-value pair
-			if (sscanf(argv[i], "-%[^=]=%[^\0]", key, val) != 2) {
-				std::ostringstream os;
-				os << "Failed to read a command line config argument (expected -%s=%s):" << std::endl;
-				os << "\targv[" << i << "]: " << argv[i] << std::endl;
-				os << "\tkey: " << key << std::endl;
-				os << "\tval: " << val << std::endl;
-				throw(std::runtime_error( os.str() ));
-			}
-			cmdLineParams[key] = val;
-		}
-	}
-
-	//finally, construct the final config table
-	if (!redirectUsed) {
-		redirectedFile = Read(fname, skipMissingFile);
-	}
-	configMap.insert(cmdLineParams.begin(), cmdLineParams.end());
-	configMap.insert(redirectedFile.begin(), redirectedFile.end());
+	//pass to the recursive method
+	configMap = Read(fname);
 }
 
-ConfigUtility::table_t ConfigUtility::Read(std::string fname, bool skipMissingFile) {
+ConfigUtility::table_t ConfigUtility::Read(std::string fname) {
 	//read in and return this file's data
 	table_t retTable;
 	std::ifstream is(fname);
 
 	if (!is.is_open()) {
-		if (skipMissingFile) {
-			return {}; //empty table
-		}
-		std::ostringstream os;
-		os << "Failed to open a config file: " << fname;
-		throw(std::runtime_error( os.str() ));
+		std::string msg;
+		msg += "Failed to open a config file: ";
+		msg += fname;
+		throw(std::runtime_error(msg));
 	}
 
 	std::string key, val;
@@ -120,23 +69,15 @@ ConfigUtility::table_t ConfigUtility::Read(std::string fname, bool skipMissingFi
 		getline(is, key,'=');
 		getline(is, val);
 
-		//eat the whitespace at the start & end
-		while(key.size() && isspace( *key.begin() )) {
-			key.erase(0, 1);
-		}
-		while(val.size() && isspace( *val.begin() )) {
-			val.erase(0, 1);
-		}
+		//trim the strings at the start & end
+		while(key.size() && isspace(*key.begin())) key.erase(0, 1);
+		while(val.size() && isspace(*val.begin())) val.erase(0, 1);
 
-		while(key.size() && isspace( *(key.end()-1) )) {
-			key.erase(key.end() - 1);
-		}
-		while(val.size() && isspace( *(val.end()-1) )) {
-			val.erase(val.end() - 1);
-		}
+		while(key.size() && isspace(*(key.end()-1))) key.erase(key.end() - 1);
+		while(val.size() && isspace(*(val.end()-1))) val.erase(val.end() - 1);
 
-		//disallow empty/wiped pairs
-		if (key.size() == 0 || val.size() == 0) {
+		//disallow empty/wiped values
+		if (key.size() == 0) {
 			continue;
 		}
 
@@ -147,8 +88,9 @@ ConfigUtility::table_t ConfigUtility::Read(std::string fname, bool skipMissingFi
 	is.close();
 
 	//load in any subordinate config files
+	//TODO: Possibility of nesting config levels?
 	if (retTable.find("config.next") != retTable.end()) {
-		table_t subTable = Read(retTable["config.next"], skipMissingFile);
+		table_t subTable = Read(retTable["config.next"]);
 		retTable.insert(subTable.begin(), subTable.end());
 	}
 

common/utilities/config_utility.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -27,9 +27,9 @@
 #include <map>
 #include <string>
 
-class ConfigUtility: public Singleton<ConfigUtility> {
+class ConfigUtility : public Singleton<ConfigUtility> {
 public:
-	void Load(std::string fname, bool skipMissingFile = false, int argc = 0, char* argv[] = nullptr);
+	void Load(std::string fname);
 
 	//convert to a type
 	std::string& String(std::string);
@@ -47,7 +47,10 @@ private:
 
 	friend Singleton<ConfigUtility>;
 
-	table_t Read(std::string fname, bool skipMissingFile);
+	ConfigUtility() = default;
+	~ConfigUtility() = default;
+
+	table_t Read(std::string fname);
 
 	table_t configMap;
 };

common/utilities/frame_rate.hpp

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

common/utilities/singleton.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -33,13 +33,13 @@ public:
 		}
 		return *ptr;
 	}
-	static void CreateSingleton() {
+	static void Create() {
 		if (ptr) {
 			throw(std::logic_error("This singleton has already been created"));
 		}
 		ptr = new T();
 	}
-	static void DeleteSingleton() {
+	static void Delete() {
 		if (!ptr) {
 			throw(std::logic_error("A non-existant singleton cannot be deleted"));
 		}

common/utilities/sql_utility.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,7 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "sql_tools.hpp"
+#include "sql_utility.hpp"
 
 #include "utility.hpp"
 

common/utilities/sql_utility.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -22,11 +22,7 @@
 #ifndef SERVERUTILITY_HPP_
 #define SERVERUTILITY_HPP_
 
-#if defined(__MINGW32__)
- #include "sqlite3/sqlite3.h"
-#else
- #include "sqlite3.h"
-#endif
+#include "sqlite3/sqlite3.h"
 
 #include <string>
 

common/utilities/utility.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -29,8 +29,10 @@ std::string truncatePath(std::string pathname) {
 			pathname.rbegin(),
 			pathname.rend(),
 			[](char ch) -> bool {
-				//windows & unix tested
+				//windows only
 				return ch == '/' || ch == '\\';
+//				//unix only
+//				return ch == '/';
 			}).base(),
 		pathname.end());
 }

common/utilities/utility.hpp

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

common/utilities/vector2.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* 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
@@ -92,10 +92,6 @@ public:
 		return ret;
 	}
 
-	//unary operators
-	Vector2 operator-() { return {-x, -y}; }
-
-	//comparison operators
 	bool operator==(Vector2 v) { return (x == v.x && y == v.y); }
 	bool operator!=(Vector2 v) { return (x != v.x || y != v.y); }
 

makefile

@@ -19,7 +19,7 @@ release: clean all package
 #For use on my machine ONLY
 package:
 	rar a -r -ep Tortuga.rar $(OUTDIR)/*.exe  $(OUTDIR)/*.dll
-	rar a -r Tortuga.rar rsc/* copyright.txt README.txt
+	rar a -r Tortuga.rar rsc/* copyright.txt
 
 $(OUTDIR):
 	mkdir $(OUTDIR)

rsc/scripts/map_maker.lua

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

rsc/scripts/map_saver.lua

@@ -1,9 +0,0 @@
-local mapSaver = {}
-function mapSaver.Load(region)
-	--empty
-end
-function mapSaver.Save(region)
-	--empty
-end
---TODO: create a flexible saving & loading system
-return mapSaver

rsc/scripts/setup_server.lua

@@ -1,32 +1,52 @@
 print("Lua script check")
 
-mapMaker = require "map_maker"
-mapSaver = require "map_saver"
-roomSystem = require "room_system"
+--uber lazy declarations
+function math.sqr(x) return x*x end
+function math.dist(x, y, i, j) return math.sqrt(math.sqr(x - i) + math.sqr(y - j)) end
 
-local function dumpTable(t)
-	print(t)
-	for k, v in pairs(t) do
-		print("",k, v)
+--tile macros, mapped to the tilesheet
+local base = 14
+local shift = 36
+tiles = {
+	plains	= base + shift * 0,
+	grass	= base + shift * 1,
+	dirt	= base + shift * 2,
+	sand	= base + shift * 3,
+	water	= base + shift * 4
+}
+
+--custom generation systems here
+function islandGenerator(region)
+	io.write("Generating (", Region.GetX(region), ", ", Region.GetY(region), ")\n")
+	for i = 1, Region.GetWidth(region) do
+		for j = 1, Region.GetHeight(region) do
+			local dist = math.dist(0, 0, i + Region.GetX(region) -1, j + Region.GetY(region) -1)
+			if dist < 10 then
+				Region.SetTile(region, i, j, 1, tiles.plains)
+			elseif dist < 12 then
+				Region.SetTile(region, i, j, 1, tiles.sand)
+			else
+				Region.SetTile(region, i, j, 1, tiles.water)
+				Region.SetSolid(region, i, j, true)
+			end
+		end
 	end
 end
 
---create the overworld, set it's generator, loader & saver
+--Get some regions
+--BUG: The server fails without at least one room
+--TODO: Create rooms with names?
+newRoom = RoomManager.CreateRoom()
+pager = Room.GetPager(newRoom)
+RegionPager.SetOnCreate(pager, islandGenerator)
+
 --[[
-local t = {
-	"overworld.bmp", --tileset name
-	mapSaver.load, --load function
-	mapSaver.save, --save function
-	mapMaker.debugIsland, --create function
-	mapSaver.save --unload function
-}]]
-
-dumpTable(roomSystem)
-dumpTable(roomSystem.RoomManager)
-dumpTable(roomSystem.Room)
-
---NOTE: room 0 is the first that the client asks for, therefore it must exist
-local overworld, uid = roomSystem.RoomManager.CreateRoom("overworld")
-roomSystem.Room.Initialize(overworld, "overworld.bmp", mapSaver.Load, mapSaver.Save, mapMaker.debugIsland, mapSaver.Save)
+regionTable = {
+	RegionPager.GetRegion(pager, Region.GetWidth() * 0, Region.GetHeight() * 0),
+	RegionPager.GetRegion(pager, Region.GetWidth() *-1, Region.GetHeight() * 0),
+	RegionPager.GetRegion(pager, Region.GetWidth() * 0, Region.GetHeight() *-1),
+	RegionPager.GetRegion(pager, Region.GetWidth() *-1, Region.GetHeight() *-1)
+}
+]]
 
 print("Finished the lua script")

rsc/scripts/setup_server.sql

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