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

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

client/character.hpp

@@ -19,23 +19,38 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef BASECHARACTER_HPP_
-#define BASECHARACTER_HPP_
+#ifndef CHARACTER_HPP_
+#define CHARACTER_HPP_
 
 //components
 #include "character_defines.hpp"
-#include "entity.hpp"
+#include "vector2.hpp"
+#include "bounding_box.hpp"
+#include "statistics.hpp"
+
+//graphics
+#include "sprite_sheet.hpp"
 
 //std namespace
 #include <string>
+#include <cmath>
 
-class BaseCharacter : public Entity {
+class Character {
 public:
-	BaseCharacter() = default;
-	virtual ~BaseCharacter() = default;
+	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; }
@@ -45,11 +60,36 @@ public:
 	std::string SetAvatar(std::string s) { return avatar = s; }
 	std::string GetAvatar() const { return avatar; }
 
+	//position
+	Vector2 SetOrigin(Vector2 v) { return origin = v; }
+	Vector2 GetOrigin() const { return origin; }
+	Vector2 SetMotion(Vector2 v) { return motion = v; }
+	Vector2 GetMotion() const { return motion; }
+	BoundingBox SetBounds(BoundingBox b) { return bounds = b; }
+	BoundingBox GetBounds() { return bounds; }
+
 private:
+	//graphics
+	SpriteSheet sprite;
+
+	//base statistics
+	Statistics stats;
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs
+
 	//metadata
 	int owner;
 	std::string handle;
 	std::string avatar;
+
+	//position
+	Vector2 origin = {0.0,0.0};
+	Vector2 motion = {0.0,0.0};
+	BoundingBox bounds;
 };
 
+//tmp
+#include <map>
+typedef std::map<int, Character> CharacterMap;
+
 #endif

client/client_application.cpp

@@ -21,7 +21,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", 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
 
@@ -178,13 +175,16 @@ void ClientApplication::LoadScene(SceneList sceneIndex) {
 			activeScene = new OptionsMenu();
 		break;
 		case SceneList::LOBBYMENU:
-			activeScene = new LobbyMenu(&clientIndex, &accountIndex); //TODO: can I use the ConfigUtility for these parameters?
+			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

@@ -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/entities/entity.cpp

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

client/entities/entity.hpp

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

client/entities/makefile

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

@@ -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 server's routines
-		ClientApplication::CreateSingleton();
+		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+=. 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,7 +16,6 @@ OUT=$(addprefix $(OUTDIR)/,client)
 
 #targets
 all: $(OBJ) $(OUT)
-	$(MAKE) -C entities
 	$(MAKE) -C scenes
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 

client/scene_list.hpp

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

client/scenes/clean_up.cpp

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

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

@@ -34,9 +34,16 @@
 //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();
 
@@ -64,18 +71,10 @@ InWorld::InWorld(int* const argClientIndex,	int* const argAccountIndex):
 	//load the tilesheet
 	//TODO: add the tilesheet to the map system?
 	//TODO: Tile size and tile sheet should be loaded elsewhere
-	tileSheet.Load(config["dir.tilesets"] + "overworld.bmp", 32, 32);
-
-	//send this player's character info
-//	CharacterPacket newPacket;
-//	newPacket.type = SerialPacketType::CHARACTER_NEW;
-//	strncpy(newPacket.handle, config["client.handle"].c_str(), PACKET_STRING_SIZE);
-//	strncpy(newPacket.avatar, config["client.avatar"].c_str(), PACKET_STRING_SIZE);
-//	newPacket.accountIndex = accountIndex;
-//	network.SendTo(Channels::SERVER, &newPacket);
+	tileSheet.Load(config["dir.tilesets"] + "terrain.bmp", 32, 32);
 
 	//request a sync
-//	RequestSynchronize();
+	RequestSynchronize();
 
 	//debug
 	//
@@ -138,25 +137,9 @@ void InWorld::Update() {
 		}
 	}
 
-	//update the camera (following the player)
+	//update the camera
 	camera.x = localCharacter->GetOrigin().x - camera.marginX;
 	camera.y = localCharacter->GetOrigin().y - camera.marginY;
-
-	//check the connection
-	if (Clock::now() - lastBeat > std::chrono::seconds(3)) {
-		if (attemptedBeats > 2) {
-			RequestDisconnect();
-			SetNextScene(SceneList::DISCONNECTEDSCREEN);
-			ConfigUtility::GetSingleton()["client.disconnectMessage"] = "Error: Lost connection to the server";
-		}
-
-		ServerPacket newPacket;
-		newPacket.type = SerialPacketType::PING;
-		network.SendTo(Channels::SERVER, &newPacket);
-
-		attemptedBeats++;
-		lastBeat = Clock::now();
-	}
 }
 
 void InWorld::FrameEnd() {
@@ -179,7 +162,6 @@ void InWorld::Render(SDL_Surface* const screen) {
 	//draw characters
 	for (auto& it : characterMap) {
 		//BUG: #29 drawing order according to Y origin
-		//TODO: use a list of renderable objects
 		it.second.DrawTo(screen, camera.x, camera.y);
 	}
 
@@ -210,10 +192,10 @@ 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) {
+	if (disconnectButton.MouseButtonUp(button) == Button::State::HOVER) {
 		RequestDisconnect();
 	}
-	if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER && button.button == SDL_BUTTON_LEFT) {
+	if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER) {
 		RequestShutDown();
 	}
 }
@@ -287,94 +269,49 @@ void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
 //-------------------------
 
 void InWorld::HandlePacket(SerialPacket* const argPacket) {
-	switch(argPacket->type) {
-		//heartbeat system
-		case SerialPacketType::PING: {
-			ServerPacket newPacket;
-			newPacket.type = SerialPacketType::PONG;
-			network.SendTo(argPacket->srcAddress, &newPacket);
-		}
+	switch(argPacket->GetType()) {
+		case SerialPacketType::DISCONNECT:
+			HandleDisconnect(argPacket);
 		break;
-		case SerialPacketType::PONG:
-//			HandlePong(static_cast<ServerPacket*>(argPacket));
+		case SerialPacketType::CHARACTER_NEW:
+			HandleCharacterNew(static_cast<CharacterPacket*>(argPacket));
 		break;
-
-		//game server connections
-		case SerialPacketType::LOGOUT_RESPONSE:
-//			HandleLogoutResponse(static_cast<ClientPacket*>(argPacket));
+		case SerialPacketType::CHARACTER_DELETE:
+			HandleCharacterDelete(static_cast<CharacterPacket*>(argPacket));
 		break;
-		case SerialPacketType::DISCONNECT_REQUEST:
-//			HandleDisconnectRequest(static_cast<ClientPacket*>(argPacket));
+		case SerialPacketType::CHARACTER_UPDATE:
+			HandleCharacterUpdate(static_cast<CharacterPacket*>(argPacket));
 		break;
-		case SerialPacketType::DISCONNECT_FORCED:
-//			HandleDisconnectForced(static_cast<ClientPacket*>(argPacket));
-		break;
-
-		//data management
 		case SerialPacketType::REGION_CONTENT:
-//			HandleRegionContent(static_cast<RegionPacket*>(argPacket));
+			HandleRegionContent(static_cast<RegionPacket*>(argPacket));
 		break;
-//		case SerialPacketType::QUERY_CHARACTER_EXISTS:
-//		case SerialPacketType::QUERY_CHARACTER_STATS:
-//		case SerialPacketType::QUERY_CHARACTER_LOCATION:
-
-		//character management
-//		case SerialPacketType::CHARACTER_NEW:
-//			HandleCharacterNew(static_cast<CharacterPacket*>(argPacket));
-//		break;
-//		case SerialPacketType::CHARACTER_DELETE:
-//			HandleCharacterDelete(static_cast<CharacterPacket*>(argPacket));
-//		break;
-//		case SerialPacketType::CHARACTER_UPDATE:
-//			HandleCharacterUpdate(static_cast<CharacterPacket*>(argPacket));
-//		break;
-//		case SerialPacketType::CHARACTER_REJECTION:
-//			HandleCharacterRejection(static_cast<TextPacket*>(argPacket));
-//		break;
-
-		//enemy management
-		//TODO: enemy management
-
-		//TODO: text
-
 		//handle errors
 		default:
-			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in InWorld: " + to_string_custom(static_cast<int>(argPacket->type)) ));
+			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in InWorld: " + to_string_custom(static_cast<int>(argPacket->GetType())) ));
 		break;
 	}
 }
 
-void InWorld::HandlePong(ServerPacket* const argPacket) {
-	if (network.GetIPAddress(Channels::SERVER)->host != argPacket->srcAddress.host) {
-		throw(std::runtime_error("Heartbeat message received from an unknown source"));
-	}
-
-	attemptedBeats = 0;
-	lastBeat = Clock::now();
-}
-
-void InWorld::HandleDisconnect(ClientPacket* const argPacket) {
-	//TODO: More needed in the disconnection
-	SetNextScene(SceneList::DISCONNECTEDSCREEN);
-	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have been disconnected";
+void InWorld::HandleDisconnect(SerialPacket* const argPacket) {
+	SetNextScene(SceneList::CLEANUP);
 }
 
 void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
-	if (characterMap.find(argPacket->characterIndex) != characterMap.end()) {
+	if (characterMap.find(argPacket->GetCharacterIndex()) != characterMap.end()) {
 		throw(std::runtime_error("Cannot create duplicate characters"));
 	}
 
 	//create the character object
-	BaseCharacter& newCharacter = characterMap[argPacket->characterIndex];
+	Character& newCharacter = characterMap[argPacket->GetCharacterIndex()];
 
 	//fill out the character's members
-	newCharacter.SetHandle(argPacket->handle);
-	newCharacter.SetAvatar(argPacket->avatar);
+	newCharacter.SetHandle(argPacket->GetHandle());
+	newCharacter.SetAvatar(argPacket->GetAvatar());
 
 	newCharacter.GetSprite()->LoadSurface(ConfigUtility::GetSingleton()["dir.sprites"] + newCharacter.GetAvatar(), 4, 4);
 
-	newCharacter.SetOrigin(argPacket->origin);
-	newCharacter.SetMotion(argPacket->motion);
+	newCharacter.SetOrigin(argPacket->GetOrigin());
+	newCharacter.SetMotion(argPacket->GetMotion());
 	newCharacter.SetBounds({
 		CHARACTER_BOUNDS_X,
 		CHARACTER_BOUNDS_Y,
@@ -382,17 +319,18 @@ void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
 		CHARACTER_BOUNDS_HEIGHT
 	});
 
-//	(*newCharacter.GetBaseStats()) = argPacket->stats;
+	*newCharacter.GetStats() = *argPacket->GetStatistics();
 
 	//bookkeeping code
 	newCharacter.CorrectSprite();
 
 	//catch this client's player object
-	if (argPacket->accountIndex == accountIndex && !localCharacter) {
-		characterIndex = argPacket->characterIndex;
+	if (argPacket->GetAccountIndex() == accountIndex && !localCharacter) {
+		characterIndex = argPacket->GetCharacterIndex();
 		localCharacter = &newCharacter;
 
 		//setup the camera
+		//TODO: move this?
 		camera.width = GetScreen()->w;
 		camera.height = GetScreen()->h;
 
@@ -406,46 +344,39 @@ void InWorld::HandleCharacterDelete(CharacterPacket* const argPacket) {
 	//TODO: authenticate when own character is being deleted (linked to a TODO in the server)
 
 	//catch this client's player object
-	if (argPacket->characterIndex == characterIndex) {
+	if (argPacket->GetCharacterIndex() == characterIndex) {
 		characterIndex = -1;
 		localCharacter = nullptr;
 	}
 
-	characterMap.erase(argPacket->characterIndex);
+	characterMap.erase(argPacket->GetCharacterIndex());
 }
 
 void InWorld::HandleCharacterUpdate(CharacterPacket* const argPacket) {
-	if (characterMap.find(argPacket->characterIndex) == characterMap.end()) {
+	if (characterMap.find(argPacket->GetCharacterIndex()) == characterMap.end()) {
+		std::cout << "Warning: HandleCharacterUpdate() is passing to HandleCharacterNew()" << std::endl;
 		HandleCharacterNew(argPacket);
 		return;
 	}
 
-	BaseCharacter& character = characterMap[argPacket->characterIndex];
+	Character& character = characterMap[argPacket->GetCharacterIndex()];
 
 	//other characters moving
-	if (argPacket->characterIndex != characterIndex) {
-		character.SetOrigin(argPacket->origin);
-		character.SetMotion(argPacket->motion);
+	if (argPacket->GetCharacterIndex() != characterIndex) {
+		character.SetOrigin(argPacket->GetOrigin());
+		character.SetMotion(argPacket->GetMotion());
 		character.CorrectSprite();
 	}
 }
 
-void InWorld::HandleCharacterRejection(TextPacket* const argPacket) {
-	RequestDisconnect();
-	SetNextScene(SceneList::DISCONNECTEDSCREEN);
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-	config["client.disconnectMessage"] = "Error: ";
-	config["client.disconnectMessage"] += argPacket->text;
-}
-
 void InWorld::HandleRegionContent(RegionPacket* const argPacket) {
 	//replace existing regions
-	regionPager.UnloadRegion(argPacket->x, argPacket->y);
-	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);
 }
 
 //-------------------------
@@ -453,31 +384,31 @@ void InWorld::HandleRegionContent(RegionPacket* const argPacket) {
 //-------------------------
 
 void InWorld::RequestSynchronize() {
-//	ClientPacket newPacket;
+	ClientPacket newPacket;
 
 	//request a sync
-//	newPacket.type = SerialPacketType::SYNCHRONIZE;
-//	newPacket.clientIndex = clientIndex;
-//	newPacket.accountIndex = accountIndex;
+	newPacket.SetType(SerialPacketType::SYNCHRONIZE);
+	newPacket.SetClientIndex(clientIndex);
+	newPacket.SetAccountIndex(accountIndex);
 
 	//TODO: location, range for sync request
 
-//	network.SendTo(Channels::SERVER, &newPacket);
+	network.SendTo(Channels::SERVER, &newPacket);
 }
 
 void InWorld::SendPlayerUpdate() {
 	CharacterPacket newPacket;
 
 	//pack the packet
-//	newPacket.type = SerialPacketType::CHARACTER_UPDATE;
+	newPacket.SetType(SerialPacketType::CHARACTER_UPDATE);
 
-	newPacket.characterIndex = characterIndex;
+	newPacket.SetCharacterIndex(characterIndex);
 	//NOTE: omitting the handle and avatar here
-	newPacket.accountIndex = accountIndex;
-	newPacket.roomIndex = 0; //TODO: room index
-	newPacket.origin = localCharacter->GetOrigin();
-	newPacket.motion = localCharacter->GetMotion();
-//	newPacket.stats = *localCharacter->GetBaseStats();
+	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
 
@@ -488,9 +419,9 @@ void InWorld::RequestDisconnect() {
 	ClientPacket newPacket;
 
 	//send a disconnect request
-	newPacket.type = SerialPacketType::DISCONNECT_REQUEST;
-	newPacket.clientIndex = clientIndex;
-	newPacket.accountIndex = accountIndex;
+	newPacket.SetType(SerialPacketType::DISCONNECT);
+	newPacket.SetClientIndex(clientIndex);
+	newPacket.SetAccountIndex(accountIndex);
 
 	network.SendTo(Channels::SERVER, &newPacket);
 }
@@ -499,9 +430,9 @@ void InWorld::RequestShutDown() {
 	ClientPacket newPacket;
 
 	//send a shutdown request
-	newPacket.type = SerialPacketType::SHUTDOWN_REQUEST;
-	newPacket.clientIndex = clientIndex;
-	newPacket.accountIndex = accountIndex;
+	newPacket.SetType(SerialPacketType::SHUTDOWN);
+	newPacket.SetClientIndex(clientIndex);
+	newPacket.SetAccountIndex(accountIndex);
 
 	network.SendTo(Channels::SERVER, &newPacket);
 }
@@ -510,10 +441,10 @@ void InWorld::RequestRegion(int roomIndex, int x, int y) {
 	RegionPacket packet;
 
 	//pack the region's data
-	packet.type = SerialPacketType::REGION_REQUEST;
-	packet.roomIndex = roomIndex;
-	packet.x = x;
-	packet.y = y;
+	packet.SetType(SerialPacketType::REGION_REQUEST);
+	packet.SetRoomIndex(roomIndex);
+	packet.SetX(x);
+	packet.SetY(y);
 
 	network.SendTo(Channels::SERVER, &packet);
 }

client/scenes/in_world.hpp

@@ -27,7 +27,6 @@
 
 //networking
 #include "udp_network_utility.hpp"
-#include "serial_packet.hpp"
 
 //graphics
 #include "image.hpp"
@@ -38,8 +37,7 @@
 //common
 #include "frame_rate.hpp"
 
-#include "base_character.hpp"
-#include "base_monster.hpp"
+#include "character.hpp"
 
 //client
 #include "base_scene.hpp"
@@ -47,12 +45,15 @@
 //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:
@@ -73,12 +74,10 @@ protected:
 
 	//Network handlers
 	void HandlePacket(SerialPacket* const);
-	void HandlePong(ServerPacket* const);
-	void HandleDisconnect(ClientPacket* const);
+	void HandleDisconnect(SerialPacket* const);
 	void HandleCharacterNew(CharacterPacket* const);
 	void HandleCharacterDelete(CharacterPacket* const);
 	void HandleCharacterUpdate(CharacterPacket* const);
-	void HandleCharacterRejection(TextPacket* const);
 	void HandleRegionContent(RegionPacket* const);
 
 	//Server control
@@ -91,13 +90,12 @@ protected:
 	//utilities
 	void UpdateMap();
 
-	//singleton shortcut
+	//shared parameters
 	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
-
-	//indexes
 	int& clientIndex;
 	int& accountIndex;
-	int characterIndex = -1;
+	int& characterIndex;
+	CharacterMap& characterMap;
 
 	//graphics
 	Image buttonImage;
@@ -110,25 +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;
 
-	//game components
-	BaseCharacter* localCharacter = nullptr;
-	std::map<int, BaseCharacter> characterMap;
-	std::map<int, BaseMonster> monsterMap;
-
-	//heartbeat
-	//TODO: This needs it's own utility, for both InWorld and InCombat
-	typedef std::chrono::steady_clock Clock;
-	Clock::time_point lastBeat = Clock::now();
-	int attemptedBeats = 0;
+	//game
+	Character* localCharacter = nullptr;
 };
 
 #endif

client/scenes/lobby_menu.cpp

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

@@ -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/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. .. ../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))
 

common/gameplay/character_defines.hpp

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

common/gameplay/combat_defines.hpp

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

common/gameplay/statistics.hpp

@@ -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;
-
-private:
-	//
+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/map/map_system_api.cpp

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

common/map/map_system_api.hpp

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

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

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

@@ -24,18 +24,6 @@
 #include <stdexcept>
 #include <algorithm>
 
-RegionPagerBase::RegionPagerBase() {
-	//
-}
-
-RegionPagerBase::RegionPagerBase(RegionPagerBase&& rhs) {
-	regionList = std::move(rhs.regionList);
-}
-
-RegionPagerBase::~RegionPagerBase() {
-	UnloadAll();
-}
-
 Region::type_t RegionPagerBase::SetTile(int x, int y, int z, Region::type_t v) {
 	Region* ptr = GetRegion(x, y);
 	return ptr->SetTile(x - ptr->GetX(), y - ptr->GetY(), z, v);

common/map/region_pager_base.hpp

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

common/map/region_pager_lua.cpp

@@ -23,29 +23,6 @@
 
 #include <stdexcept>
 
-RegionPagerLua::RegionPagerLua() {
-	//
-}
-
-RegionPagerLua::RegionPagerLua(RegionPagerLua&& rhs) {
-	lua = rhs.lua;
-	loadRef = rhs.loadRef;
-	saveRef = rhs.saveRef;
-	createRef = rhs.createRef;
-	unloadRef = rhs.unloadRef;
-}
-
-RegionPagerLua::~RegionPagerLua() {
-	//unload all regions
-	UnloadAll();
-	//clear any stored functions
-	luaL_unref(lua, LUA_REGISTRYINDEX, loadRef);
-	luaL_unref(lua, LUA_REGISTRYINDEX, saveRef);
-	luaL_unref(lua, LUA_REGISTRYINDEX, createRef);
-	luaL_unref(lua, LUA_REGISTRYINDEX, unloadRef);
-}
-
-//return the loaded region, or nullptr on failure
 Region* RegionPagerLua::LoadRegion(int x, int y) {
 	//get the pager's function from the registry
 	lua_rawgeti(lua, LUA_REGISTRYINDEX, loadRef);
@@ -77,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);
@@ -112,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"));
@@ -141,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);
@@ -176,7 +150,6 @@ void RegionPagerLua::UnloadRegion(int x, int y) {
 	lua_pop(lua, 1);
 }
 
-//no return
 void RegionPagerLua::UnloadAll() {
 	//get the pager's function from the registry
 	lua_rawgeti(lua, LUA_REGISTRYINDEX, unloadRef);

common/map/region_pager_lua.hpp

@@ -24,19 +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();
-	RegionPagerLua(RegionPagerLua&&);
-	~RegionPagerLua();
+	RegionPagerLua() = default;
+	~RegionPagerLua() = default;
 
 	//region manipulation
 	Region* LoadRegion(int x, int y) override;

common/map/tile_sheet_api.hpp

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

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

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

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

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

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

@@ -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 2014
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -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

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

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

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

common/network/packet_types/text_packet.hpp

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

@@ -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 = -1;
+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

@@ -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,
@@ -47,28 +46,22 @@ enum class SerialPacketType {
 
 	//-------------------------
 	//ClientPacket
-	//  client index, account index, username
+	//  client index, account index, character index
 	//-------------------------
 
 	//Connecting to a server as a client
 	JOIN_REQUEST,
 	JOIN_RESPONSE,
+	JOIN_REJECTION,
+
+	//client requests all information from the server
+	SYNCHRONIZE,
 
 	//disconnect from the server
-	DISCONNECT_REQUEST,
-	DISCONNECT_RESPONSE,
-	DISCONNECT_FORCED,
-
-	//load the account
-	LOGIN_REQUEST,
-	LOGIN_RESPONSE,
-
-	//unload the account
-	LOGOUT_REQUEST,
-	LOGOUT_RESPONSE,
+	DISCONNECT,
 
 	//shut down the server
-	SHUTDOWN_REQUEST,
+	SHUTDOWN,
 
 	//-------------------------
 	//RegionPacket
@@ -76,54 +69,29 @@ enum class SerialPacketType {
 	//-------------------------
 
 	//map data
-	REGION_REQUEST, //NOTE: technically a query
+	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,
+	//controlling characters
+	CHARACTER_NEW,
 	CHARACTER_DELETE,
-	CHARACTER_LOAD,
-	CHARACTER_UNLOAD,
+	CHARACTER_UPDATE,
 
-	//find out info from the server
-	QUERY_CHARACTER_EXISTS,
-	QUERY_CHARACTER_STATS,
-	QUERY_CHARACTER_LOCATION,
+	//authentication, character index => character stats
+	CHARACTER_STATS_REQUEST,
+	CHARACTER_STATS_RESPONSE,
 
-	//set the info in the server
-	CHARACTER_SET_ROOM,
-	CHARACTER_SET_ORIGIN,
-	CHARACTER_SET_MOTION,
-
-	//TODO: enemy management
-
-	//-------------------------
-	//TextPacket
-	//  name, text
-	//-------------------------
-
-	//general speech
-	TEXT_BROADCAST,
-
-	//rejection/error messages
-	JOIN_REJECTION,
-	LOGIN_REJECTION,
+	//reject a character request
 	CHARACTER_REJECTION,
-	SHUTDOWN_REJECTION,
 
-	//-------------------------
 	//not used
-	//-------------------------
-
 	LAST
 };
 

common/network/serial_utility.cpp

@@ -21,121 +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::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(packet->type) {
+	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::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

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

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

@@ -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/utilities/config_utility.cpp

@@ -22,61 +22,14 @@
 #include "config_utility.hpp"
 
 #include <cstdlib>
-#include <cstring>
 #include <fstream>
-#include <sstream>
 #include <stdexcept>
 
-void ConfigUtility::Load(std::string fname, 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);
-		return;
-	}
-
-	//some variables to use
-	table_t redirectedFile;
-	table_t cmdLineParams;
-	char key[256], val[256];
-	bool redirectUsed = false;
-
-	//reading from the command line
-	for (int i = 1; i < argc; ++i) {
-		//read from a specified config file
-		if (!strncmp(argv[i], "-config=", 8)) {
-			redirectedFile = Read(argv[i] + 8);
-			redirectUsed = true;
-			continue;
-		}
-
-		//set some specific values
-		if (!strncmp(argv[i], "-", 1)) {
-			//wipe the variables
-			memset(key, 0, 256);
-			memset(key, 0, 256);
-
-			//read the key-value pair
-			if (sscanf(argv[i], "-%[^=]=%[^\0]", key, val) != 2) {
-				std::ostringstream os;
-				os << "Failed to read a command line config argument (expected -%s=%s):" << std::endl;
-				os << "\targv[" << i << "]: " << argv[i] << std::endl;
-				os << "\tkey: " << key << std::endl;
-				os << "\tval: " << val << std::endl;
-				throw(std::runtime_error( os.str() ));
-			}
-			cmdLineParams[key] = val;
-		}
-	}
-
-	//finally, construct the final config table
-	if (!redirectUsed) {
-		redirectedFile = Read(fname);
-	}
-	configMap.insert(cmdLineParams.begin(), cmdLineParams.end());
-	configMap.insert(redirectedFile.begin(), redirectedFile.end());
+	//pass to the recursive method
+	configMap = Read(fname);
 }
 
 ConfigUtility::table_t ConfigUtility::Read(std::string fname) {
@@ -85,9 +38,10 @@ ConfigUtility::table_t ConfigUtility::Read(std::string fname) {
 	std::ifstream is(fname);
 
 	if (!is.is_open()) {
-		std::ostringstream os;
-		os << "Failed to open a config file: " << fname;
-		throw(std::runtime_error( os.str() ));
+		std::string msg;
+		msg += "Failed to open a config file: ";
+		msg += fname;
+		throw(std::runtime_error(msg));
 	}
 
 	std::string key, val;
@@ -115,23 +69,15 @@ ConfigUtility::table_t ConfigUtility::Read(std::string fname) {
 		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;
 		}
 
@@ -142,6 +88,7 @@ ConfigUtility::table_t ConfigUtility::Read(std::string fname) {
 	is.close();
 
 	//load in any subordinate config files
+	//TODO: Possibility of nesting config levels?
 	if (retTable.find("config.next") != retTable.end()) {
 		table_t subTable = Read(retTable["config.next"]);
 		retTable.insert(subTable.begin(), subTable.end());

common/utilities/config_utility.hpp

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

common/utilities/singleton.hpp

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

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

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

@@ -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());
 }

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,3 +0,0 @@
-local mapSaver = {}
---TODO: create a flexible saving & loading system
-return mapSaver

rsc/scripts/setup_server.lua

@@ -1,30 +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)
-
-local overworld = roomSystem.RoomManager.CreateRoom("overworld")
+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.
+);

server/accounts/account_data.cpp

@@ -1,54 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "account_data.hpp"
-
-int AccountData::SetClientIndex(int i) {
-	return clientIndex = i;
-}
-
-int AccountData::GetClientIndex() {
-	return clientIndex;
-}
-
-std::string AccountData::SetUsername(std::string s) {
-	return username = s;
-}
-
-std::string AccountData::GetUsername() {
-	return username;
-}
-
-bool AccountData::GetBlackListed() {
-	return blackListed;
-}
-
-bool AccountData::GetWhiteListed() {
-	return whiteListed;
-}
-
-bool AccountData::GetModerator() {
-	return mod;
-}
-
-bool AccountData::GetAdministrator() {
-	return admin;
-}

server/accounts/account_data.hpp

@@ -30,17 +30,17 @@ public:
 	~AccountData() = default;
 
 	//accessors and mutators
-	int SetClientIndex(int i);
-	int GetClientIndex();
+	int SetClientIndex(int i) { return clientIndex = i; }
+	int GetClientIndex() { return clientIndex; }
 
-	std::string SetUsername(std::string s);
-	std::string GetUsername();
+	std::string SetUsername(std::string s) { return username = s; }
+	std::string GetUsername() { return username; }
 
 	//database stuff
-	bool GetBlackListed();
-	bool GetWhiteListed();
-	bool GetModerator();
-	bool GetAdministrator();
+	bool GetBlackListed() { return blackListed; }
+	bool GetWhiteListed() { return whiteListed; }
+	bool GetModerator() { return mod; }
+	bool GetAdministrator() { return admin; }
 
 private:
 	friend class AccountManager;
@@ -49,7 +49,6 @@ private:
 	std::string username;
 	//TODO: password
 
-	//bit fields?
 	bool blackListed = false;
 	bool whiteListed = true;
 	bool mod = false;

server/accounts/account_manager.cpp

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

server/accounts/account_manager.hpp

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

server/accounts/makefile

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

server/characters/character_data.hpp

@@ -24,28 +24,45 @@
 
 //components
 #include "character_defines.hpp"
-#include "entity.hpp"
+#include "vector2.hpp"
+#include "statistics.hpp"
 
 //std namespace
 #include <string>
 #include <cmath>
 
-class CharacterData: public Entity {
+class CharacterData {
 public:
 	CharacterData() = default;
 	~CharacterData() = default;
 
+	//location and movement
+	int SetRoomIndex(int i) { return roomIndex = i; }
+	Vector2 SetOrigin(Vector2 v) { return origin = v; }
+	Vector2 SetMotion(Vector2 v) { return motion = v; }
+
+	int GetRoomIndex() { return roomIndex; }
+	Vector2 GetOrigin() { return origin; }
+	Vector2 GetMotion() { return motion; }
+
 	//accessors and mutators
-	//...
+	Statistics* GetBaseStats() { return &baseStats; }
 
 	//database stuff
-	int GetOwner();
-	std::string GetHandle();
-	std::string GetAvatar();
+	int GetOwner() { return owner; }
+	std::string GetHandle() { return handle; }
+	std::string GetAvatar() { return avatar; }
 
 private:
 	friend class CharacterManager;
 
+	//world position
+	int roomIndex = 0;
+	Vector2 origin = {0.0,0.0};
+	Vector2 motion = {0.0,0.0};
+
+	Statistics baseStats;
+
 	int owner;
 	std::string handle;
 	std::string avatar;

server/characters/character_manager.cpp

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

server/characters/character_manager.hpp

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

server/characters/makefile

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

server/client_data.hpp

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

server/clients/client_data.cpp

@@ -1,52 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "client_data.hpp"
-
-ClientData::ClientData(IPaddress add) {
-	address = add;
-}
-
-IPaddress ClientData::SetAddress(IPaddress add) {
-	return address = add;
-}
-
-IPaddress ClientData::GetAddress() {
-	return address;
-}
-
-ClientData::Clock::time_point ClientData::GetLastBeat() {
-	return lastBeat;
-}
-
-int ClientData::GetAttempts() {
-	return attemptedBeats;
-}
-
-int ClientData::IncrementAttempts() {
-	lastBeat = Clock::now();
-	return attemptedBeats++;
-}
-
-int ClientData::ResetAttempts() {
-	lastBeat = Clock::now();
-	return attemptedBeats = 0;
-}

server/clients/client_data.hpp

@@ -1,53 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef CLIENTDATA_HPP_
-#define CLIENTDATA_HPP_
-
-#include "SDL/SDL_net.h"
-
-#include <chrono>
-
-class ClientData {
-public:
-	typedef std::chrono::steady_clock Clock;
-
-	ClientData() = default;
-	ClientData(IPaddress add);
-	~ClientData() = default;
-
-	IPaddress SetAddress(IPaddress add);
-	IPaddress GetAddress();
-
-	Clock::time_point GetLastBeat();
-
-	int GetAttempts();
-	int IncrementAttempts();
-	int ResetAttempts();
-
-private:
-	IPaddress address = {0,0};
-
-	Clock::time_point lastBeat = Clock::now();
-	int attemptedBeats = 0;
-};
-
-#endif

server/clients/client_manager.cpp

@@ -1,109 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "client_manager.hpp"
-
-#include "udp_network_utility.hpp"
-
-#include <chrono>
-
-int ClientManager::CheckConnections() {
-	for (auto& it : elementMap) {
-		//3 seconds between beats
-		if (ClientData::Clock::now() - it.second.GetLastBeat() > std::chrono::seconds(3)) {
-			ServerPacket newPacket;
-			newPacket.type = SerialPacketType::PING;
-			UDPNetworkUtility::GetSingleton().SendTo(it.second.GetAddress(), &newPacket);
-			it.second.IncrementAttempts();
-		}
-	}
-
-	for (auto& it : elementMap) {
-		if (it.second.GetAttempts() > 2) {
-			int ret = it.first;
-			elementMap.erase(it.first);
-			return ret;
-		}
-	}
-
-	return -1;
-}
-
-void ClientManager::HandlePong(ServerPacket* const argPacket) {
-	//find and update the specified client
-	for (auto& it : elementMap) {
-		if (it.second.GetAddress().host == argPacket->srcAddress.host &&
-			it.second.GetAddress().port == argPacket->srcAddress.port
-			) {
-			it.second.ResetAttempts();
-			return;
-		}
-	}
-}
-
-int ClientManager::Create(IPaddress add) {
-	ClientData& client = elementMap[counter];
-	client.SetAddress(add);
-	return counter++;
-}
-
-void ClientManager::Unload(int uid) {
-	elementMap.erase(uid);
-}
-
-void ClientManager::UnloadAll() {
-	elementMap.clear();
-}
-
-void ClientManager::UnloadIf(std::function<bool(std::pair<const int, ClientData>&)> fn) {
-	std::map<int, ClientData>::iterator it = elementMap.begin();
-	while (it != elementMap.end()) {
-		if (fn(*it)) {
-			it = elementMap.erase(it);
-			//TODO: ? disconnect, unload characters, notify other clients
-		}
-		else {
-			++it;
-		}
-	}
-}
-
-ClientData* ClientManager::Get(int uid) {
-	std::map<int, ClientData>::iterator it = elementMap.find(uid);
-
-	if (it == elementMap.end()) {
-		return nullptr;
-	}
-
-	return &it->second;
-}
-
-int ClientManager::GetLoadedCount() {
-	return elementMap.size();
-}
-
-int ClientManager::GetTotalCount() {
-	return elementMap.size();
-}
-
-std::map<int, ClientData>* ClientManager::GetContainer() {
-	return &elementMap;
-}

server/clients/client_manager.hpp

@@ -1,70 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef CLIENTMANAGER_HPP_
-#define CLIENTMANAGER_HPP_
-
-#include "client_data.hpp"
-#include "manager_interface.hpp"
-#include "server_packet.hpp"
-#include "singleton.hpp"
-
-#include "SDL/SDL_net.h"
-
-#include <functional>
-
-class ClientManager:
-	public Singleton<ClientManager>,
-	public ManagerInterface<ClientData, IPaddress>
-{
-public:
-	//methods
-	int CheckConnections();
-	void HandlePong(ServerPacket* const argPacket);
-
-	//common public methods
-	int Create(IPaddress) override;
-	void Unload(int uid) override;
-
-	void UnloadAll() override;
-	void UnloadIf(std::function<bool(std::pair<const int, ClientData>&)> fn) override;
-
-	//accessors & mutators
-	ClientData* Get(int uid) override;
-	int GetLoadedCount() override;
-	int GetTotalCount() override;
-	std::map<int, ClientData>* GetContainer() override;
-
-private:
-	friend Singleton<ClientManager>;
-
-	ClientManager() = default;
-	~ClientManager() = default;
-
-	//EMPTY
-	int Load(IPaddress) override { return -1; }
-	int Save(int uid) override { return -1; }
-	void Delete(int uid) override { return; }
-
-	int counter = 0;
-};
-
-#endif

server/clients/makefile

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

server/doors/door_data.cpp

@@ -1,38 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "door_data.hpp"
-
-std::string DoorData::SetRoomName(std::string s) {
-	return roomName = s;
-}
-
-Vector2 DoorData::SetDestPosition(Vector2 v) {
-	return destPosition = v;
-}
-
-std::string DoorData::GetRoomName() {
-	return roomName;
-}
-
-Vector2 DoorData::GetDestPosition() {
-	return destPosition;
-}

server/doors/door_data.hpp

@@ -1,49 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef DOORDATA_HPP_
-#define DOORDATA_HPP_
-
-#include "entity.hpp"
-#include "vector2.hpp"
-
-#include <string>
-
-class DoorData: public Entity {
-public:
-	DoorData() = default;
-	~DoorData() = default;
-
-	//accessors & mutators
-	std::string SetRoomName(std::string);
-	Vector2 SetDestPosition(Vector2);
-
-	std::string GetRoomName();
-	Vector2 GetDestPosition();
-
-private:
-	friend class DoorManager;
-
-	std::string roomName;
-	Vector2 destPosition;
-};
-
-#endif

server/doors/door_manager.cpp

@@ -1,66 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "door_manager.hpp"
-
-int DoorManager::Create(std::string, Vector2) {
-	//TODO
-}
-
-int DoorManager::Load(std::string, Vector2) {
-	//TODO
-}
-
-int DoorManager::Save(int uid) {
-	//TODO
-}
-
-void DoorManager::Unload(int uid) {
-	//TODO
-}
-
-void DoorManager::Delete(int uid) {
-	//TODO
-}
-
-void DoorManager::UnloadAll() {
-	//TODO
-}
-
-void DoorManager::UnloadIf(std::function<bool(std::pair<const int, DoorData>&)> fn) {
-	//TODO
-}
-
-DoorData* DoorManager::Get(int uid) {
-	//TODO
-}
-
-int DoorManager::GetLoadedCount() {
-	//TODO
-}
-
-int DoorManager::GetTotalCount() {
-	//TODO
-}
-
-std::map<int, DoorData>* DoorManager::GetContainer() {
-	//TODO
-}

server/doors/door_manager.hpp

@@ -1,61 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef DOORMANAGER_HPP_
-#define DOORMANAGER_HPP_
-
-#include "door_data.hpp"
-#include "manager_interface.hpp"
-#include "singleton.hpp"
-#include "vector2.hpp"
-
-#include <functional>
-#include <string>
-
-class DoorManager:
-	public Singleton<DoorManager>,
-	public ManagerInterface<DoorData, std::string, Vector2>
-{
-public:
-	//common public methods
-	int Create(std::string, Vector2) override;
-	int Load(std::string, Vector2) override;
-	int Save(int uid) override;
-	void Unload(int uid) override;
-	void Delete(int uid) override;
-
-	void UnloadAll() override;
-	void UnloadIf(std::function<bool(std::pair<const int, DoorData>&)> fn) override;
-
-	//accessors & mutators
-	DoorData* Get(int uid) override;
-	int GetLoadedCount() override;
-	int GetTotalCount() override;
-	std::map<int, DoorData>* GetContainer() override;
-
-private:
-	friend Singleton<DoorManager>;
-
-	DoorManager() = default;
-	~DoorManager() = default;
-};
-
-#endif

server/doors/makefile

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

server/entities/entity.cpp

@@ -1,53 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "entity.hpp"
-
-int Entity::SetEntityIndex(int i) {
-	return entityIndex = i;
-}
-
-int Entity::SetRoomIndex(int i) {
-	return roomIndex = i;
-}
-
-Vector2 Entity::SetOrigin(Vector2 v) {
-	return origin = v;
-}
-
-Vector2 Entity::SetMotion(Vector2 v) {
-	return motion = v;
-}
-int Entity::GetEntityIndex() {
-	return entityIndex;
-}
-
-int Entity::GetRoomIndex() {
-	return roomIndex;
-}
-
-Vector2 Entity::GetOrigin() {
-	return origin;
-}
-
-Vector2 Entity::GetMotion() {
-	return motion;
-}

server/entities/entity.hpp

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

server/entities/makefile

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

server/linit.cpp

@@ -34,14 +34,13 @@
 #define linit_c
 #define LUA_LIB
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua/lua.hpp"
 
-#include "map_system_api.hpp"
-#include "room_system_api.hpp"
+#include "region_api.hpp"
+#include "region_pager_api.hpp"
+#include "tile_sheet_api.hpp"
+#include "room_api.hpp"
+#include "room_manager_api.hpp"
 
 //these libs are loaded by lua.c and are readily available to any Lua program
 static const luaL_Reg loadedlibs[] = {
@@ -56,14 +55,20 @@ static const luaL_Reg loadedlibs[] = {
 	{LUA_BITLIBNAME, luaopen_bit32},
 	{LUA_MATHLIBNAME, luaopen_math},
 	{LUA_DBLIBNAME, luaopen_debug},
+
+	//Tortuga's API
+	{TORTUGA_REGION_NAME, openRegionAPI},
+	{TORTUGA_REGION_PAGER_NAME, openRegionPagerAPI},
+	{TORTUGA_TILE_SHEET_NAME, openTileSheetAPI},
+	{TORTUGA_ROOM_NAME, openRoomAPI},
+	{TORTUGA_ROOM_MANAGER_NAME, openRoomManagerAPI},
+
 	{NULL, NULL}
 };
 
 
 //these libs are preloaded and must be required before used
 static const luaL_Reg preloadedlibs[] = {
-	{TORTUGA_MAP_SYSTEM_API, openMapSystemAPI},
-	{TORTUGA_ROOM_SYSTEM_API, openRoomSystemAPI},
 	{NULL, NULL}
 };
 
@@ -81,4 +86,4 @@ LUALIB_API void luaL_openlibs (lua_State *L) {
 		lua_setfield(L, -2, lib->name);
 	}
 	lua_pop(L, 1); //remove _PRELOAD table
-}
+}

server/main.cpp

@@ -22,13 +22,7 @@
 #include "server_application.hpp"
 
 //singletons
-#include "account_manager.hpp"
-#include "character_manager.hpp"
-#include "client_manager.hpp"
 #include "config_utility.hpp"
-#include "door_manager.hpp"
-#include "monster_manager.hpp"
-#include "room_manager.hpp"
 #include "udp_network_utility.hpp"
 
 #include <stdexcept>
@@ -36,37 +30,31 @@
 
 using namespace std;
 
-int main(int argc, char* argv[]) {
+int main(int argc, char** argv) {
 	try {
 		//create the singletons
-		AccountManager::CreateSingleton();
-		CharacterManager::CreateSingleton();
-		ClientManager::CreateSingleton();
-		ConfigUtility::CreateSingleton();
-		DoorManager::CreateSingleton();
-		MonsterManager::CreateSingleton();
-		RoomManager::CreateSingleton();
-		UDPNetworkUtility::CreateSingleton();
+		AccountManager::Create();
+		CharacterManager::Create();
+		ConfigUtility::Create();
+		RoomManager::Create();
+		UDPNetworkUtility::Create();
 
 		//call the server's routines
-		ServerApplication::CreateSingleton();
+		ServerApplication::Create();
 		ServerApplication& app = ServerApplication::GetSingleton();
 
 		app.Init(argc, argv);
 		app.Proc();
 		app.Quit();
 
-		ServerApplication::DeleteSingleton();
+		ServerApplication::Delete();
 
 		//delete the singletons
-		AccountManager::DeleteSingleton();
-		CharacterManager::DeleteSingleton();
-		ClientManager::DeleteSingleton();
-		ConfigUtility::DeleteSingleton();
-		DoorManager::DeleteSingleton();
-		MonsterManager::DeleteSingleton();
-		RoomManager::DeleteSingleton();
-		UDPNetworkUtility::DeleteSingleton();
+		AccountManager::Delete();
+		CharacterManager::Delete();
+		ConfigUtility::Delete();
+		RoomManager::Delete();
+		UDPNetworkUtility::Delete();
 	}
 	catch(exception& e) {
 		cerr << "Fatal exception thrown: " << e.what() << endl;

server/makefile

@@ -1,15 +1,6 @@
-#include directories
-INCLUDES+=. accounts characters clients doors entities monsters rooms server_utilities ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities
-
-#libraries
-#the order of the $(LIBS) is important, at least for MinGW
-LIBS+=server.a ../libcommon.a -lSDL_net
-ifeq ($(OS),Windows_NT)
-	LIBS+=-lwsock32 -liphlpapi -lmingw32
-endif
-LIBS+=-lSDLmain -lSDL -llua -lsqlite3
-
-#flags
+#config
+INCLUDES+=. accounts characters rooms ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities
+LIBS+=server.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
@@ -27,12 +18,7 @@ OUT=$(addprefix $(OUTDIR)/,server)
 all: $(OBJ) $(OUT)
 	$(MAKE) -C accounts
 	$(MAKE) -C characters
-	$(MAKE) -C clients
-	$(MAKE) -C doors
-	$(MAKE) -C entities
-	$(MAKE) -C monsters
 	$(MAKE) -C rooms
-	$(MAKE) -C server_utilities
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)

server/monsters/makefile

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

server/monsters/monster_data.cpp

@@ -1,38 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "monster_data.hpp"
-
-std::string MonsterData::SetAvatar(std::string s) {
-	return avatar = s;
-}
-
-int MonsterData::SetScriptReference(int i) {
-	return scriptRef = i;
-}
-
-std::string MonsterData::GetAvatar() {
-	return avatar;
-}
-
-int MonsterData::GetScriptReference() {
-	return scriptRef;
-}

server/monsters/monster_data.hpp

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

server/monsters/monster_manager.cpp

@@ -1,82 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "monster_manager.hpp"
-
-int MonsterManager::Create(std::string) {
-	//TODO
-}
-
-int MonsterManager::Load(std::string) {
-	//TODO
-}
-
-int MonsterManager::Save(int uid) {
-	//TODO
-}
-
-void MonsterManager::Unload(int uid) {
-	//TODO
-}
-
-void MonsterManager::Delete(int uid) {
-	//TODO
-}
-
-void MonsterManager::UnloadAll() {
-	//TODO
-}
-
-void MonsterManager::UnloadIf(std::function<bool(std::pair<const int, MonsterData>&)> fn) {
-	//TODO
-}
-
-MonsterData* MonsterManager::Get(int uid) {
-	//TODO
-}
-
-int MonsterManager::GetLoadedCount() {
-	//TODO
-}
-
-int MonsterManager::GetTotalCount() {
-	//TODO
-}
-
-std::map<int, MonsterData>* MonsterManager::GetContainer() {
-	//TODO
-}
-
-sqlite3* MonsterManager::SetDatabase(sqlite3* db) {
-	//TODO
-}
-
-sqlite3* MonsterManager::GetDatabase() {
-	//TODO
-}
-
-lua_State* MonsterManager::SetLuaState(lua_State* L) {
-	//TODO
-}
-
-lua_State* MonsterManager::GetLuaState() {
-	//TODO
-}

server/monsters/monster_manager.hpp

@@ -1,77 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef MONSTERMANAGER_HPP_
-#define MONSTERMANAGER_HPP_
-
-#include "manager_interface.hpp"
-#include "monster_data.hpp"
-#include "singleton.hpp"
-
-#ifdef __unix__
- #include "lua.hpp"
- #include "sqlite3.h"
-#else
- #include "lua/lua.hpp"
- #include "sqlite3/sqlite3.h"
-#endif
-
-#include <functional>
-#include <string>
-
-class MonsterManager:
-	public Singleton<MonsterManager>,
-	public ManagerInterface<MonsterData, std::string>
-{
-public:
-	//common public methods
-	int Create(std::string) override;
-	int Load(std::string) override;
-	int Save(int uid) override;
-	void Unload(int uid) override;
-	void Delete(int uid) override;
-
-	void UnloadAll() override;
-	void UnloadIf(std::function<bool(std::pair<const int, MonsterData>&)> fn) override;
-
-	//accessors & mutators
-	MonsterData* Get(int uid) override;
-	int GetLoadedCount() override;
-	int GetTotalCount() override;
-	std::map<int, MonsterData>* GetContainer() override;
-
-	//hooks
-	sqlite3* SetDatabase(sqlite3* db);
-	sqlite3* GetDatabase();
-	lua_State* SetLuaState(lua_State* L);
-	lua_State* GetLuaState();
-
-private:
-	friend Singleton<MonsterManager>;
-
-	MonsterManager() = default;
-	~MonsterManager() = default;
-
-	sqlite3* database = nullptr;
-	lua_State* lua = nullptr;
-};
-
-#endif

server/rooms/makefile

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

server/rooms/room_api.cpp

@@ -23,58 +23,27 @@
 
 #include "room_data.hpp"
 
-static int setRoomName(lua_State* L) {
-	RoomData* room = reinterpret_cast<RoomData*>(lua_touserdata(L, 1));
-	room->SetRoomName(lua_tostring(L, 2));
-	return 0;
-}
-
-static int getRoomName(lua_State* L) {
-	RoomData* room = reinterpret_cast<RoomData*>(lua_touserdata(L, 1));
-	lua_pushstring(L, room->GetRoomName().c_str());
-	return 1;
-}
-
-static int setTilesetName(lua_State* L) {
-	RoomData* room = reinterpret_cast<RoomData*>(lua_touserdata(L, 1));
-	room->SetTilesetName(lua_tostring(L, 2));
-	return 0;
-}
-
-static int getTilesetName(lua_State* L) {
-	RoomData* room = reinterpret_cast<RoomData*>(lua_touserdata(L, 1));
-	lua_pushstring(L, room->GetTilesetName().c_str());
-	return 1;
-}
-
 static int getPager(lua_State* L) {
 	RoomData* room = reinterpret_cast<RoomData*>(lua_touserdata(L, 1));
 	lua_pushlightuserdata(L, reinterpret_cast<void*>(room->GetPager()) );
 	return 1;
 }
 
-static int initialize(lua_State* L) {
-	//set the members of the given room
-	RoomData* room = static_cast<RoomData*>(lua_touserdata(L, 1));
-	room->SetRoomName(lua_tostring(L, 2));
+static int create(lua_State* L) {
+	//EMPTY
+	//NOTE: This can be used to set defaults for the pager
+	return 0;
+}
 
-	//set the refs of these parameters (backwards, since it pops from the top of the stack)
-	room->GetPager()->SetUnloadReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	room->GetPager()->SetCreateReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	room->GetPager()->SetSaveReference(luaL_ref(L, LUA_REGISTRYINDEX));
-	room->GetPager()->SetLoadReference(luaL_ref(L, LUA_REGISTRYINDEX));
-
-	//more parameters can be added here later
+static int unload(lua_State* L) {
+	//EMPTY
 	return 0;
 }
 
 static const luaL_Reg roomLib[] = {
 	{"GetPager",getPager},
-	{"SetRoomName", setRoomName},
-	{"GetRoomName", getRoomName},
-	{"SetTileset", setTilesetName},
-	{"GetTileset", getTilesetName},
-	{"Initialize", initialize},
+	{"Create", create},
+	{"Unload", unload},
 	{nullptr, nullptr}
 };
 

server/rooms/room_api.hpp

@@ -22,13 +22,9 @@
 #ifndef ROOMAPI_HPP_
 #define ROOMAPI_HPP_
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
+#include "lua/lua.hpp"
 
-#define TORTUGA_ROOM_API "room"
+#define TORTUGA_ROOM_NAME "Room"
 LUAMOD_API int openRoomAPI(lua_State* L);
 
 #endif

server/rooms/room_data.cpp

@@ -1,61 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "room_data.hpp"
-
-RoomData::RoomData() {
-	//
-}
-
-RoomData::RoomData(RoomData& rhs) {
-	roomName = std::move(rhs.roomName);
-	tilesetName = std::move(rhs.tilesetName);
-	pager = std::move(rhs.pager);
-	//entityList = std::move(rhs.entityList);
-}
-
-RoomData::~RoomData() {
-	//
-}
-
-std::string RoomData::SetRoomName(std::string s) {
-	return roomName = s;
-}
-
-std::string RoomData::GetRoomName() {
-	return roomName;
-}
-
-std::string RoomData::SetTilesetName(std::string s) {
-	return tilesetName = s;
-}
-
-std::string RoomData::GetTilesetName() {
-	return tilesetName;
-}
-
-RegionPagerLua* RoomData::GetPager() {
-	return &pager;
-}
-
-std::list<Entity*>* RoomData::GetEntityList() {
-//	return &entityList;
-}

server/rooms/room_data.hpp

@@ -22,43 +22,22 @@
 #ifndef ROOMDATA_HPP_
 #define ROOMDATA_HPP_
 
-#include "entity.hpp"
+//map system
 #include "region_pager_lua.hpp"
 
-#if defined(__MINGW32__)
- #include "lua/lua.hpp"
-#else
- #include "lua.hpp"
-#endif
-
-#include <list>
-#include <string>
-
 class RoomData {
 public:
-	RoomData();
-	RoomData(RoomData&);
-	~RoomData();
+	RoomData() = default;
+	~RoomData() = default;
 
 	//accessors and mutators
-	std::string SetRoomName(std::string s);
-	std::string GetRoomName();
-
-	std::string SetTilesetName(std::string s);
-	std::string GetTilesetName();
-
-	RegionPagerLua* GetPager();
-	std::list<Entity*>* GetEntityList();
+	RegionPagerLua* GetPager() { return &pager; }
 
 private:
 	friend class RoomManager;
 
 	//members
-	std::string roomName;
-	std::string tilesetName;
-
 	RegionPagerLua pager;
-//	std::list<Entity*> entityList;
 };
 
 #endif

server/rooms/room_manager.cpp

@@ -23,73 +23,84 @@
 
 #include "room_api.hpp"
 
-#include <iostream>
 #include <stdexcept>
 
 //-------------------------
 //public access methods
 //-------------------------
 
-int RoomManager::Create(std::string roomName) {
-	std::cout << "Create-1" << std::endl;
+int RoomManager::CreateRoom() {
 	//create the room
-	elementMap.emplace(counter); ////explicitly constructs the element
-	RoomData* newRoom = &(elementMap.find(counter)->second);
-	std::cout << "Create-2" << std::endl;
-	newRoom->SetRoomName(roomName);
-	std::cout << "Create-3" << std::endl;
-	newRoom->pager.SetLuaState(lua);
-	std::cout << "Create-4" << std::endl;
+	RoomData* newRoom = new RoomData();
+	newRoom->pager.SetLuaState(luaState);
+
+	//register the room
+	roomMap[counter] = newRoom;
+
+	//API hook
+	lua_getglobal(luaState, TORTUGA_ROOM_NAME);
+	lua_getfield(luaState, -1, "Create");
+	lua_pushlightuserdata(luaState, newRoom);
+	if (lua_pcall(luaState, 1, 0, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+	}
+	lua_pop(luaState, 1);
 
 	//finish the routine
 	return counter++;
 }
 
-void RoomManager::Unload(int uid) {
+void RoomManager::UnloadRoom(int uid) {
 	//find the room
-	std::map<int, RoomData>::iterator it = elementMap.find(uid);
-	if (it == elementMap.end()) {
+	RoomData* room = FindRoom(uid);
+	if (!room) {
 		return;
 	}
 
+	//API hook
+	lua_getglobal(luaState, TORTUGA_ROOM_NAME);
+	lua_getfield(luaState, -1, "Unload");
+	lua_pushlightuserdata(luaState, room);
+	if (lua_pcall(luaState, 1, 0, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+	}
+	lua_pop(luaState, 1);
+
 	//free the memory
-	elementMap.erase(uid);
+	delete room;
+	roomMap.erase(uid);
+}
+
+RoomData* RoomManager::GetRoom(int uid) {
+	return FindRoom(uid);
+	//TODO: expand this to auto-create the room
+}
+
+RoomData* RoomManager::FindRoom(int uid) {
+	std::map<int, RoomData*>::iterator it = roomMap.find(uid);
+	if (it == roomMap.end()) {
+		return nullptr;
+	}
+	return it->second;
+}
+
+int RoomManager::PushRoom(RoomData* room) {
+	roomMap[counter++] = room;
+	return counter;
 }
 
 void RoomManager::UnloadAll() {
-	elementMap.clear();
-}
+	lua_getglobal(luaState, TORTUGA_ROOM_NAME);
 
-void RoomManager::UnloadIf(std::function<bool(std::pair<const int,RoomData>&)> fn) {
-	std::map<int, RoomData>::iterator it = elementMap.begin();
-	while (it != elementMap.end()) {
-		if (fn(*it)) {
-			it = elementMap.erase(it);
-		}
-		else {
-			++it;
+	for (auto& it : roomMap) {
+		//API hook
+		lua_getfield(luaState, -1, "Unload");
+		lua_pushlightuserdata(luaState, it.second);
+		if (lua_pcall(luaState, 1, 0, 0) != LUA_OK) {
+			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
 		}
 	}
-}
 
-RoomData* RoomManager::Get(int uid) {
-	std::map<int, RoomData>::iterator it = elementMap.find(uid);
-
-	if (it == elementMap.end()) {
-		return nullptr;
-	}
-
-	return &it->second;
-}
-
-int RoomManager::GetLoadedCount() {
-	return elementMap.size();
-}
-
-int RoomManager::GetTotalCount() {
-	return elementMap.size();
-}
-
-std::map<int, RoomData>* RoomManager::GetContainer() {
-	return &elementMap;
-}
+	lua_pop(luaState, 1);
+	roomMap.clear();
+}