Merge branch 'develop'

This has been a long-running problem for days, but I've finally
implemented a correctly working hierarchy between the ClientData,
AccountData and CharacterData objects:

CharacterData -> AccountData -> ClientData

There doesn't seem to be any issues with it right now, touch wood.

README.md

@@ -6,7 +6,7 @@ This game is inspired by classic 2D RPGs, as well as more modern sandbox MMOs. T
 
 ## External Dependencies
 
-* [SDL 1.6](http://www.libsdl.org/) - Simple DirectMedia Layer API
+* [SDL 1.2](http://www.libsdl.org/) - Simple DirectMedia Layer API
 * [SDL_net 1.2](http://www.libsdl.org/projects/SDL_net/) - SDL's networking extension
 * [lua 5.2](http://www.lua.org/) - The lua programming language
 * [SQLite3](http://www.sqlite.org/) - A lightweight SQL database engine

client/client_application.cpp

@@ -119,10 +119,10 @@ void ClientApplication::LoadScene(SceneList sceneIndex) {
 			activeScene = new OptionsMenu(&config);
 		break;
 		case SceneList::LOBBYMENU:
-			activeScene = new LobbyMenu(&config, &network, &clientIndex);
+			activeScene = new LobbyMenu(&config, &network, &clientIndex, &accountIndex, &characterIndex);
 		break;
 		case SceneList::INWORLD:
-			activeScene = new InWorld(&config, &network, &clientIndex);
+			activeScene = new InWorld(&config, &network, &clientIndex, &accountIndex, &characterIndex);
 		break;
 		case SceneList::INCOMBAT:
 			activeScene = new InCombat();

client/client_application.hpp

@@ -44,9 +44,12 @@ private:
 
 	BaseScene* activeScene = nullptr;
 
+	//shared parameters
 	ConfigUtility config;
 	UDPNetworkUtility network;
-	int clientIndex = -1; //replace with a struct?
+	int clientIndex = -1;
+	int accountIndex = -1;
+	int characterIndex = -1;
 };
 
 #endif

client/scenes/in_world.cpp

@@ -31,10 +31,12 @@
 //Public access members
 //-------------------------
 
-InWorld::InWorld(ConfigUtility* const argConfig, UDPNetworkUtility* const argNetwork, int* const argClientIndex):
+InWorld::InWorld(ConfigUtility* const argConfig, UDPNetworkUtility* const argNetwork, int* const argClientIndex, int* const argAccountIndex, int* const argCharacterIndex):
 	config(*argConfig),
 	network(*argNetwork),
-	clientIndex(*argClientIndex)
+	clientIndex(*argClientIndex),
+	accountIndex(*argAccountIndex),
+	characterIndex(*argCharacterIndex)
 {
 	//setup the utility objects
 	buttonImage.LoadSurface(config["dir.interface"] + "button_menu.bmp");
@@ -61,23 +63,14 @@ InWorld::InWorld(ConfigUtility* const argConfig, UDPNetworkUtility* const argNet
 	//TODO: add the tilesheet to the map system?
 	tileSheet.Load(config["dir.tilesets"] + "terrain.bmp", 12, 15);
 
-	//create the server-side player object
+	//TODO: move this into it's own function
-	//TODO: the login system needs an overhaul
-	SerialPacket packet;
-	packet.meta.type = SerialPacket::Type::PLAYER_NEW;
-	packet.playerInfo.clientIndex = clientIndex;
-	snprintf(packet.playerInfo.handle, PACKET_STRING_SIZE, "%s", config["player.handle"].c_str());
-	snprintf(packet.playerInfo.avatar, PACKET_STRING_SIZE, "%s", config["player.avatar"].c_str());
-	packet.playerInfo.position = {0,0};
-	packet.playerInfo.motion = {0,0};
-
-	//send it
-	char buffer[PACKET_BUFFER_SIZE];
-	serialize(&packet, buffer);
-	network.Send(Channels::SERVER, buffer, PACKET_BUFFER_SIZE);
-
 	//request a sync
+	SerialPacket packet;
+	char buffer[PACKET_STRING_SIZE];
 	packet.meta.type = SerialPacket::Type::SYNCHRONIZE;
+	packet.clientInfo.clientIndex = clientIndex;
+	packet.clientInfo.accountIndex = accountIndex;
+	packet.clientInfo.characterIndex = characterIndex;
 	serialize(&packet, buffer);
 	network.Send(Channels::SERVER, buffer, PACKET_BUFFER_SIZE);
 
@@ -131,11 +124,11 @@ void InWorld::RenderFrame() {
 //	SDL_FillRect(GetScreen(), 0, 0);
 	Render(GetScreen());
 	SDL_Flip(GetScreen());
+	fps.Calculate();
 }
 
 void InWorld::Render(SDL_Surface* const screen) {
 	//draw the map
-	//TODO: figure out something to fix the region container access
 	for (auto it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); it++) {
 		tileSheet.DrawRegionTo(screen, *it, camera.x, camera.y);
 	}
@@ -148,10 +141,7 @@ void InWorld::Render(SDL_Surface* const screen) {
 	//draw UI
 	disconnectButton.DrawTo(screen);
 	shutDownButton.DrawTo(screen);
-
 	font.DrawStringTo(to_string_custom(fps.GetFrameRate()), screen, 0, 0);
-
-	fps.Calculate();
 }
 
 //-------------------------
@@ -193,28 +183,28 @@ void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
 		case SDLK_LEFT:
 			if (localCharacter) {
 				localCharacter->AdjustDirection(PlayerCharacter::Direction::WEST);
-				SendState();
+				SendPlayerUpdate();
 			}
 		break;
 
 		case SDLK_RIGHT:
 			if (localCharacter) {
 				localCharacter->AdjustDirection(PlayerCharacter::Direction::EAST);
-				SendState();
+				SendPlayerUpdate();
 			}
 		break;
 
 		case SDLK_UP:
 			if (localCharacter) {
 				localCharacter->AdjustDirection(PlayerCharacter::Direction::NORTH);
-				SendState();
+				SendPlayerUpdate();
 			}
 		break;
 
 		case SDLK_DOWN:
 			if (localCharacter) {
 				localCharacter->AdjustDirection(PlayerCharacter::Direction::SOUTH);
-				SendState();
+				SendPlayerUpdate();
 			}
 		break;
 	}
@@ -226,28 +216,28 @@ void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
 		case SDLK_LEFT:
 			if (localCharacter) {
 				localCharacter->AdjustDirection(PlayerCharacter::Direction::EAST);
-				SendState();
+				SendPlayerUpdate();
 			}
 		break;
 
 		case SDLK_RIGHT:
 			if (localCharacter) {
 				localCharacter->AdjustDirection(PlayerCharacter::Direction::WEST);
-				SendState();
+				SendPlayerUpdate();
 			}
 		break;
 
 		case SDLK_UP:
 			if (localCharacter) {
 				localCharacter->AdjustDirection(PlayerCharacter::Direction::SOUTH);
-				SendState();
+				SendPlayerUpdate();
 			}
 		break;
 
 		case SDLK_DOWN:
 			if (localCharacter) {
 				localCharacter->AdjustDirection(PlayerCharacter::Direction::NORTH);
-				SendState();
+				SendPlayerUpdate();
 			}
 		break;
 	}
@@ -262,21 +252,21 @@ void InWorld::HandlePacket(SerialPacket packet) {
 		case SerialPacket::Type::DISCONNECT:
 			HandleDisconnect(packet);
 		break;
-		case SerialPacket::Type::PLAYER_NEW:
-			HandlePlayerNew(packet);
-		break;
-		case SerialPacket::Type::PLAYER_DELETE:
-			HandlePlayerDelete(packet);
-		break;
-		case SerialPacket::Type::PLAYER_UPDATE:
-			HandlePlayerUpdate(packet);
-		break;
 		case SerialPacket::Type::REGION_CONTENT:
 			HandleRegionContent(packet);
 		break;
+		case SerialPacket::Type::CHARACTER_UPDATE:
+			HandleCharacterUpdate(packet);
+		break;
+		case SerialPacket::Type::CHARACTER_NEW:
+			HandleCharacterNew(packet);
+		break;
+		case SerialPacket::Type::CHARACTER_DELETE:
+			HandleCharacterDelete(packet);
+		break;
 		//handle errors
 		default:
-			throw(std::runtime_error("Unknown SerialPacket::Type encountered"));
+			throw(std::runtime_error(std::string() + "Unknown SerialPacket::Type encountered in InWorld: " + to_string_custom(int(packet.meta.type))));
 		break;
 	}
 }
@@ -284,60 +274,11 @@ void InWorld::HandlePacket(SerialPacket packet) {
 void InWorld::HandleDisconnect(SerialPacket packet) {
 	network.Unbind(Channels::SERVER);
 	clientIndex = -1;
+	accountIndex = -1;
+	characterIndex = -1;
 	SetNextScene(SceneList::MAINMENU);
 }
 
-void InWorld::HandlePlayerNew(SerialPacket packet) {
-	if (playerCharacters.find(packet.playerInfo.playerIndex) != playerCharacters.end()) {
-		throw(std::runtime_error("Cannot create duplicate players"));
-	}
-
-	playerCharacters[packet.playerInfo.playerIndex].GetSprite()->LoadSurface(config["dir.sprites"] + packet.playerInfo.avatar, 4, 4);
-	playerCharacters[packet.playerInfo.playerIndex].SetPosition(packet.playerInfo.position);
-	playerCharacters[packet.playerInfo.playerIndex].SetMotion(packet.playerInfo.motion);
-	playerCharacters[packet.playerInfo.playerIndex].ResetDirection();
-
-	//catch this client's player object
-	if (packet.playerInfo.clientIndex == clientIndex && !localCharacter) {
-		playerIndex = packet.playerInfo.playerIndex;
-		localCharacter = &playerCharacters[playerIndex];
-		//setup the camera
-		camera.width = GetScreen()->w;
-		camera.height = GetScreen()->h;
-		//center on the player's character
-		camera.marginX = (GetScreen()->w / 2 - localCharacter->GetSprite()->GetImage()->GetClipW() / 2);
-		camera.marginY = (GetScreen()->h / 2 - localCharacter->GetSprite()->GetImage()->GetClipH() / 2);
-	}
-}
-
-void InWorld::HandlePlayerDelete(SerialPacket packet) {
-	if (playerCharacters.find(packet.playerInfo.playerIndex) == playerCharacters.end()) {
-		throw(std::runtime_error("Cannot delete non-existant players"));
-	}
-
-	playerCharacters.erase(packet.playerInfo.playerIndex);
-
-	//catch this client's player object
-	if (packet.playerInfo.clientIndex == clientIndex) {
-		playerIndex = -1;
-		localCharacter = nullptr;
-	}
-}
-
-void InWorld::HandlePlayerUpdate(SerialPacket packet) {
-	if (playerCharacters.find(packet.playerInfo.playerIndex) == playerCharacters.end()) {
-		HandlePlayerNew(packet);
-		return;
-	}
-
-	//update only if the message didn't originate from here
-	if (packet.playerInfo.clientIndex != clientIndex) {
-		playerCharacters[packet.playerInfo.playerIndex].SetPosition(packet.playerInfo.position);
-		playerCharacters[packet.playerInfo.playerIndex].SetMotion(packet.playerInfo.motion);
-	}
-	playerCharacters[packet.playerInfo.playerIndex].ResetDirection();
-}
-
 void InWorld::HandleRegionContent(SerialPacket packet) {
 	//replace existing regions
 	if (regionPager.FindRegion(packet.regionInfo.x, packet.regionInfo.y)) {
@@ -347,20 +288,74 @@ void InWorld::HandleRegionContent(SerialPacket packet) {
 	packet.regionInfo.region = nullptr;
 }
 
+void InWorld::HandleCharacterUpdate(SerialPacket packet) {
+	if (playerCharacters.find(packet.characterInfo.characterIndex) == playerCharacters.end()) {
+		HandleCharacterNew(packet);
+		return;
+	}
+
+	//update only if the message didn't originate from here
+	if (packet.characterInfo.clientIndex != clientIndex) {
+		playerCharacters[packet.characterInfo.characterIndex].SetPosition(packet.characterInfo.position);
+		playerCharacters[packet.characterInfo.characterIndex].SetMotion(packet.characterInfo.motion);
+	}
+	playerCharacters[packet.characterInfo.characterIndex].ResetDirection();
+}
+
+void InWorld::HandleCharacterNew(SerialPacket packet) {
+	if (playerCharacters.find(packet.characterInfo.characterIndex) != playerCharacters.end()) {
+		throw(std::runtime_error("Cannot create duplicate characters"));
+	}
+
+	//TODO: set the player's handle
+	playerCharacters[packet.characterInfo.characterIndex].GetSprite()->LoadSurface(config["dir.sprites"] + packet.characterInfo.avatar, 4, 4);
+	playerCharacters[packet.characterInfo.characterIndex].SetPosition(packet.characterInfo.position);
+	playerCharacters[packet.characterInfo.characterIndex].SetMotion(packet.characterInfo.motion);
+	playerCharacters[packet.characterInfo.characterIndex].ResetDirection();
+
+	//catch this client's player object
+	if (packet.characterInfo.characterIndex == characterIndex && !localCharacter) {
+		localCharacter = &playerCharacters[characterIndex];
+
+		//setup the camera
+		camera.width = GetScreen()->w;
+		camera.height = GetScreen()->h;
+		//center on the player's character
+		camera.marginX = (GetScreen()->w / 2 - localCharacter->GetSprite()->GetImage()->GetClipW() / 2);
+		camera.marginY = (GetScreen()->h / 2 - localCharacter->GetSprite()->GetImage()->GetClipH() / 2);
+	}
+}
+
+void InWorld::HandleCharacterDelete(SerialPacket packet) {
+	//TODO: authenticate
+	if (playerCharacters.find(packet.characterInfo.characterIndex) == playerCharacters.end()) {
+		throw(std::runtime_error("Cannot delete non-existant characters"));
+	}
+
+	playerCharacters.erase(packet.characterInfo.characterIndex);
+
+	//catch this client's player object
+	if (packet.characterInfo.characterIndex == characterIndex) {
+		characterIndex = -1;
+		localCharacter = nullptr;
+	}
+}
+
 //-------------------------
 //Server control
 //-------------------------
 
-void InWorld::SendState() {
+void InWorld::SendPlayerUpdate() {
 	SerialPacket packet;
 	char buffer[PACKET_BUFFER_SIZE];
 
 	//pack the packet
-	packet.meta.type = SerialPacket::Type::PLAYER_UPDATE;
+	packet.meta.type = SerialPacket::Type::CHARACTER_UPDATE;
-	packet.playerInfo.clientIndex = clientIndex;
+	packet.characterInfo.clientIndex = clientIndex;
-	packet.playerInfo.playerIndex = playerIndex;
+	packet.characterInfo.accountIndex = accountIndex;
-	packet.playerInfo.position = localCharacter->GetPosition();
+	packet.characterInfo.characterIndex = characterIndex;
-	packet.playerInfo.motion = localCharacter->GetMotion();
+	packet.characterInfo.position = localCharacter->GetPosition();
+	packet.characterInfo.motion = localCharacter->GetMotion();
 
 	serialize(&packet, buffer);
 	network.Send(Channels::SERVER, buffer, PACKET_BUFFER_SIZE);
@@ -372,7 +367,9 @@ void InWorld::RequestDisconnect() {
 
 	//send a disconnect request
 	packet.meta.type = SerialPacket::Type::DISCONNECT;
-	packet.clientInfo.index = clientIndex;
+	packet.clientInfo.clientIndex = clientIndex;
+	packet.clientInfo.accountIndex = accountIndex;
+	packet.clientInfo.characterIndex = characterIndex;
 	serialize(&packet, buffer);
 	network.Send(Channels::SERVER, buffer, PACKET_BUFFER_SIZE);
 }
@@ -383,17 +380,20 @@ void InWorld::RequestShutDown() {
 
 	//send a shutdown request
 	packet.meta.type = SerialPacket::Type::SHUTDOWN;
-	packet.clientInfo.index = clientIndex;
+	packet.clientInfo.clientIndex = clientIndex;
+	packet.clientInfo.accountIndex = accountIndex;
+	packet.clientInfo.characterIndex = characterIndex;
 	serialize(&packet, buffer);
 	network.Send(Channels::SERVER, buffer, PACKET_BUFFER_SIZE);
 }
 
-void InWorld::RequestRegion(int x, int y) {
+void InWorld::RequestRegion(int mapIndex, int x, int y) {
 	SerialPacket packet;
 	char buffer[PACKET_BUFFER_SIZE];
 
 	//pack the region's data
 	packet.meta.type = SerialPacket::Type::REGION_REQUEST;
+	packet.regionInfo.mapIndex = mapIndex;
 	packet.regionInfo.x = x;
 	packet.regionInfo.y = y;
 	serialize(&packet, buffer);
@@ -433,7 +433,7 @@ void InWorld::UpdateMap() {
 	for (int i = xStart; i <= xEnd; i += REGION_WIDTH) {
 		for (int j = yStart; j <= yEnd; j += REGION_HEIGHT) {
 			if (!regionPager.FindRegion(i, j)) {
-				RequestRegion(i, j);
+				RequestRegion(0, i, j);
 			}
 		}
 	}

client/scenes/in_world.hpp

@@ -52,7 +52,7 @@
 class InWorld : public BaseScene {
 public:
 	//Public access members
-	InWorld(ConfigUtility* const, UDPNetworkUtility* const, int* const);
+	InWorld(ConfigUtility* const, UDPNetworkUtility* const, int* const, int* const, int* const);
 	~InWorld();
 
 protected:
@@ -74,25 +74,26 @@ protected:
 	//Network handlers
 	void HandlePacket(SerialPacket);
 	void HandleDisconnect(SerialPacket);
-	void HandlePlayerNew(SerialPacket);
+	void HandleCharacterNew(SerialPacket);
-	void HandlePlayerDelete(SerialPacket);
+	void HandleCharacterDelete(SerialPacket);
-	void HandlePlayerUpdate(SerialPacket);
+	void HandleCharacterUpdate(SerialPacket);
 	void HandleRegionContent(SerialPacket);
 
 	//Server control
-	void SendState();
+	void SendPlayerUpdate();
 	void RequestDisconnect();
 	void RequestShutDown();
-	void RequestRegion(int x, int y);
+	void RequestRegion(int mapIndex, int x, int y);
 
 	//utilities
 	void UpdateMap();
 
-	//globals
+	//shared parameters
 	ConfigUtility& config;
-	FrameRate fps;
 	UDPNetworkUtility& network;
 	int& clientIndex;
+	int& accountIndex;
+	int& characterIndex;
 
 	//graphics
 	Image buttonImage;
@@ -111,11 +112,11 @@ protected:
 		int width = 0, height = 0;
 		int marginX = 0, marginY = 0;
 	} camera;
+	FrameRate fps;
 
 	//game
 	std::map<int, PlayerCharacter> playerCharacters;
 	PlayerCharacter* localCharacter = nullptr;
-	int playerIndex = -1;
 };
 
 #endif

client/scenes/lobby_menu.cpp

@@ -30,10 +30,12 @@
 //Public access members
 //-------------------------
 
-LobbyMenu::LobbyMenu(ConfigUtility* const argConfig, UDPNetworkUtility* const argNetwork, int* const argClientIndex):
+LobbyMenu::LobbyMenu(ConfigUtility* const argConfig, UDPNetworkUtility* const argNetwork, int* const argClientIndex, int* const argAccountIndex, int* const argCharacterIndex):
 	config(*argConfig),
 	network(*argNetwork),
-	clientIndex(*argClientIndex)
+	clientIndex(*argClientIndex),
+	accountIndex(*argAccountIndex),
+	characterIndex(*argCharacterIndex)
 {
 	//setup the utility objects
 	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
@@ -118,7 +120,7 @@ void LobbyMenu::Render(SDL_Surface* const screen) {
 			font.DrawStringTo("?", screen, listBox.x - font.GetCharW(), listBox.y + i*listBox.h);
 		}
 
-		//TODO: ping?
+		//ping?
 	}
 }
 
@@ -155,13 +157,17 @@ void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 	}
 
 	else if (join.MouseButtonUp(button) == Button::State::HOVER && selection != nullptr && selection->compatible) {
-		//TODO: The player login information should be collected by the lobby screen
 		//the vars
 		SerialPacket packet;
 		char buffer[PACKET_BUFFER_SIZE];
 
-		//join the selected server
+		//pack the packet
 		packet.meta.type = SerialPacket::Type::JOIN_REQUEST;
+		strncpy(packet.clientInfo.username, config["client.username"].c_str(), PACKET_STRING_SIZE);
+		strncpy(packet.clientInfo.handle, config["client.handle"].c_str(), PACKET_STRING_SIZE);
+		strncpy(packet.clientInfo.avatar, config["client.avatar"].c_str(), PACKET_STRING_SIZE);
+
+		//join the selected server
 		serialize(&packet, buffer);
 		network.Send(&selection->address, buffer, PACKET_BUFFER_SIZE);
 		selection = nullptr;
@@ -203,27 +209,28 @@ void LobbyMenu::HandlePacket(SerialPacket packet) {
 			//extract the data
 			ServerInformation server;
 			server.address = packet.meta.srcAddress;
+			server.networkVersion = packet.serverInfo.networkVersion;
 			server.name = packet.serverInfo.name;
 			server.playerCount = packet.serverInfo.playerCount;
 
 			//NOTE: Check compatibility here
-			server.compatible = packet.serverInfo.regionWidth == REGION_WIDTH &&
+			server.compatible = server.networkVersion == NETWORK_VERSION;
-				packet.serverInfo.regionHeight == REGION_HEIGHT &&
-				packet.serverInfo.regionDepth == REGION_DEPTH;
 
 			//push
 			serverInfo.push_back(server);
 		}
 		break;
 		case SerialPacket::Type::JOIN_RESPONSE:
-			clientIndex = packet.clientInfo.index;
+			clientIndex = packet.clientInfo.clientIndex;
+			accountIndex = packet.clientInfo.accountIndex;
+			characterIndex = packet.clientInfo.characterIndex;
 			network.Bind(&packet.meta.srcAddress, Channels::SERVER);
 			SetNextScene(SceneList::INWORLD);
 		break;
 
 		//handle errors
 		default:
-			throw(std::runtime_error("Unknown SerialPacket::Type encountered"));
+			throw(std::runtime_error(std::string() + "Unknown SerialPacket::Type encountered in LobbyMenu: " + to_string_custom(int(packet.meta.type))));
 		break;
 	}
 }

client/scenes/lobby_menu.hpp

@@ -28,9 +28,6 @@
 #include "button.hpp"
 #include "config_utility.hpp"
 
-//map
-#include "region.hpp"
-
 //network
 #include "udp_network_utility.hpp"
 #include "serial_packet.hpp"
@@ -45,7 +42,7 @@
 class LobbyMenu : public BaseScene {
 public:
 	//Public access members
-	LobbyMenu(ConfigUtility* const, UDPNetworkUtility* const, int* const);
+	LobbyMenu(ConfigUtility* const, UDPNetworkUtility* const, int* const, int* const, int* const);
 	~LobbyMenu();
 
 protected:
@@ -64,10 +61,12 @@ protected:
 
 	void HandlePacket(SerialPacket);
 
-	//global
+	//shared parameters
 	ConfigUtility& config;
 	UDPNetworkUtility& network;
 	int& clientIndex;
+	int& accountIndex;
+	int& characterIndex;
 
 	//members
 	Image image;
@@ -79,7 +78,7 @@ protected:
 	//server list
 	struct ServerInformation {
 		IPaddress address;
-		//TODO: version info
+		int networkVersion;
 		std::string name;
 		int playerCount;
 		bool compatible;

client/scenes/main_menu.hpp

@@ -49,7 +49,7 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//globals
+	//shared parameters
 	ConfigUtility& config;
 
 	//members

client/scenes/options_menu.hpp

@@ -49,7 +49,7 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//globals
+	//shared parameters
 	ConfigUtility& config;
 
 	//members

client/scenes/splash_screen.hpp

@@ -40,7 +40,7 @@ protected:
 	void Update(double delta);
 	void Render(SDL_Surface* const);
 
-	//globals
+	//shared parameters
 	ConfigUtility& config;
 
 	//members

common/map/map_allocator.cpp

@@ -36,8 +36,8 @@ void LuaAllocator::Create(Region** const ptr, int x, int y) {
 	(*ptr) = new Region(x, y);
 
 	//API hook
-	lua_getglobal(state, "Region");
+	lua_getglobal(state, "map");
-	lua_getfield(state, -1, "Create");
+	lua_getfield(state, -1, "create");
 	lua_pushlightuserdata(state, *ptr);
 	if (lua_pcall(state, 1, 0, 0) != LUA_OK) {
 		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));
@@ -47,8 +47,8 @@ void LuaAllocator::Create(Region** const ptr, int x, int y) {
 
 void LuaAllocator::Unload(Region* const ptr) {
 	//API hook
-	lua_getglobal(state, "Region");
+	lua_getglobal(state, "map");
-	lua_getfield(state, -1, "Unload");
+	lua_getfield(state, -1, "unload");
 	lua_pushlightuserdata(state, ptr);
 	if (lua_pcall(state, 1, 0, 0) != LUA_OK) {
 		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));

common/map/map_file_format.cpp

@@ -39,8 +39,8 @@ void LuaFormat::Load(Region** const ptr, int x, int y) {
 	}
 
 	//API hook
-	lua_getglobal(state, "Region");
+	lua_getglobal(state, "map");
-	lua_getfield(state, -1, "Load");
+	lua_getfield(state, -1, "load");
 	lua_pushlightuserdata(state, *ptr);
 	lua_pushstring(state, saveDir.c_str());
 	if (lua_pcall(state, 2, 1, 0) != LUA_OK) {
@@ -55,8 +55,8 @@ void LuaFormat::Load(Region** const ptr, int x, int y) {
 
 void LuaFormat::Save(Region* const ptr) {
 	//API hook
-	lua_getglobal(state, "Region");
+	lua_getglobal(state, "map");
-	lua_getfield(state, -1, "Save");
+	lua_getfield(state, -1, "save");
 	lua_pushlightuserdata(state, ptr);
 	lua_pushstring(state, saveDir.c_str());
 	if (lua_pcall(state, 2, 0, 0) != LUA_OK) {

common/network/serial.cpp

@@ -25,85 +25,60 @@
 
 #include <cstring>
 
+//-------------------------
+//Convenience Macros
+//-------------------------
+
+#define SERIALIZE(buffer, data, size) memcpy(buffer, data, size); buffer += size;
+#define DESERIALIZE(buffer, data, size) memcpy(data, buffer, size); buffer += size;
+
 //-------------------------
 //internal serialization functions
 //-------------------------
 
 void serializeType(SerialPacket* packet, char* buffer) {
-	memcpy(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
+	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
 }
 
 void serializeServer(SerialPacket* packet, char* buffer) {
-	memcpy(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
+	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-	buffer += sizeof(SerialPacket::Type);
 
 	//server info
-	//Note: version info serialization goes here
+	SERIALIZE(buffer, &packet->serverInfo.networkVersion, sizeof(int));
-	memcpy(buffer, packet->serverInfo.name, PACKET_STRING_SIZE);
+	SERIALIZE(buffer, packet->serverInfo.name, PACKET_STRING_SIZE);
-	buffer += PACKET_STRING_SIZE;
+	SERIALIZE(buffer, &packet->serverInfo.playerCount, sizeof(int));
-	memcpy(buffer, &packet->serverInfo.playerCount, sizeof(int));
-	buffer += sizeof(int);
-
-	//map format
-	memcpy(buffer, &packet->serverInfo.regionWidth, sizeof(int));
-	buffer += sizeof(int);
-	memcpy(buffer, &packet->serverInfo.regionHeight, sizeof(int));
-	buffer += sizeof(int);
-	memcpy(buffer, &packet->serverInfo.regionDepth, sizeof(int));
 }
 
 void serializeClient(SerialPacket* packet, char* buffer) {
-	memcpy(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
+	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-	buffer += sizeof(SerialPacket::Type);
-	memcpy(buffer, &packet->clientInfo.index, sizeof(int));
-}
-
-void serializePlayer(SerialPacket* packet, char* buffer) {
-	memcpy(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-	buffer += sizeof(SerialPacket::Type);
 
 	//indexes
-	memcpy(buffer, &packet->playerInfo.clientIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->clientInfo.clientIndex, sizeof(int));
-	buffer += sizeof(int);
+	SERIALIZE(buffer, &packet->clientInfo.accountIndex, sizeof(int));
-	memcpy(buffer, &packet->playerInfo.playerIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->clientInfo.characterIndex, sizeof(int));
-	buffer += sizeof(int);
 
-	//text
+	//texts
-	memcpy(buffer, packet->playerInfo.handle, PACKET_STRING_SIZE);
+	SERIALIZE(buffer, packet->clientInfo.username, PACKET_STRING_SIZE);
-	buffer += PACKET_STRING_SIZE;
+	SERIALIZE(buffer, packet->clientInfo.handle, PACKET_STRING_SIZE);
-	memcpy(buffer, packet->playerInfo.avatar, PACKET_STRING_SIZE);
+	SERIALIZE(buffer, packet->clientInfo.avatar, PACKET_STRING_SIZE);
-	buffer += PACKET_STRING_SIZE;
-
-	//vectors
-	memcpy(buffer, &packet->playerInfo.position.x, sizeof(double));
-	buffer += sizeof(double);
-	memcpy(buffer, &packet->playerInfo.position.y, sizeof(double));
-	buffer += sizeof(double);
-	memcpy(buffer, &packet->playerInfo.motion.x, sizeof(double));
-	buffer += sizeof(double);
-	memcpy(buffer, &packet->playerInfo.motion.y, sizeof(double));
 }
 
 void serializeRegionFormat(SerialPacket* packet, char* buffer) {
-	memcpy(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
+	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-	buffer += sizeof(SerialPacket::Type);
 
-	//x & y
+	//format
-	memcpy(buffer, &packet->regionInfo.x, sizeof(int));
+	SERIALIZE(buffer, &packet->regionInfo.mapIndex, sizeof(int));
-	buffer += sizeof(int);
+	SERIALIZE(buffer, &packet->regionInfo.x, sizeof(int));
-	memcpy(buffer, &packet->regionInfo.y, sizeof(int));
+	SERIALIZE(buffer, &packet->regionInfo.y, sizeof(int));
 }
 
 void serializeRegionContent(SerialPacket* packet, char* buffer) {
-	//format
+	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-	memcpy(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-	buffer += sizeof(SerialPacket::Type);
 
-	//x & y
+	//format
-	*reinterpret_cast<int*>(buffer) = packet->regionInfo.region->GetX();
+	SERIALIZE(buffer, &packet->regionInfo.mapIndex, sizeof(int));
-	buffer += sizeof(int);
+	SERIALIZE(buffer, &packet->regionInfo.x, sizeof(int));
-	*reinterpret_cast<int*>(buffer) = packet->regionInfo.region->GetY();
+	SERIALIZE(buffer, &packet->regionInfo.y, sizeof(int));
-	buffer += sizeof(int);
 
 	//content
 	for (register int i = 0; i < REGION_WIDTH; i++) {
@@ -116,92 +91,81 @@ void serializeRegionContent(SerialPacket* packet, char* buffer) {
 	}
 }
 
+void serializeCharacter(SerialPacket* packet, char* buffer) {
+	SERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
+
+	//indexes
+	SERIALIZE(buffer, &packet->characterInfo.clientIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->characterInfo.accountIndex, sizeof(int));
+	SERIALIZE(buffer, &packet->characterInfo.characterIndex, sizeof(int));
+
+	//texts
+	SERIALIZE(buffer, packet->clientInfo.handle, PACKET_STRING_SIZE);
+	SERIALIZE(buffer, packet->clientInfo.avatar, PACKET_STRING_SIZE);
+
+	//vectors
+	SERIALIZE(buffer, &packet->characterInfo.position.x, sizeof(double));
+	SERIALIZE(buffer, &packet->characterInfo.position.y, sizeof(double));
+	SERIALIZE(buffer, &packet->characterInfo.motion.x, sizeof(double));
+	SERIALIZE(buffer, &packet->characterInfo.motion.y, sizeof(double));
+}
+
 //-------------------------
 //internal deserialization functions
 //-------------------------
 
 void deserializeType(SerialPacket* packet, char* buffer) {
-	memcpy(&packet->meta.type, buffer, sizeof(SerialPacket::Type));
+	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
 }
 
 void deserializeServer(SerialPacket* packet, char* buffer) {
-	memcpy(&packet->meta.type, buffer, sizeof(SerialPacket::Type));
+	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-	buffer += sizeof(SerialPacket::Type);
 
 	//server info
-	//Note: version info deserialization goes here
+	DESERIALIZE(buffer, &packet->serverInfo.networkVersion, sizeof(int));
-	memcpy(packet->serverInfo.name, buffer, PACKET_STRING_SIZE);
+	DESERIALIZE(buffer, packet->serverInfo.name, PACKET_STRING_SIZE);
-	buffer += PACKET_STRING_SIZE;
+	DESERIALIZE(buffer, &packet->serverInfo.playerCount, sizeof(int));
-	memcpy(&packet->serverInfo.playerCount, buffer, sizeof(int));
-	buffer += sizeof(int);
-
-	//map format
-	memcpy(&packet->serverInfo.regionWidth, buffer, sizeof(int));
-	buffer += sizeof(int);
-	memcpy(&packet->serverInfo.regionHeight, buffer, sizeof(int));
-	buffer += sizeof(int);
-	memcpy(&packet->serverInfo.regionDepth, buffer, sizeof(int));
 }
 
 void deserializeClient(SerialPacket* packet, char* buffer) {
-	memcpy(&packet->meta.type, buffer, sizeof(SerialPacket::Type));
+	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-	buffer += sizeof(SerialPacket::Type);
-	memcpy(&packet->clientInfo.index, buffer, sizeof(int));
-}
-
-void deserializePlayer(SerialPacket* packet, char* buffer) {
-	memcpy(&packet->meta.type, buffer, sizeof(SerialPacket::Type));
-	buffer += sizeof(SerialPacket::Type);
 
 	//indexes
-	memcpy(&packet->playerInfo.clientIndex, buffer, sizeof(int));
+	DESERIALIZE(buffer, &packet->clientInfo.clientIndex, sizeof(int));
-	buffer += sizeof(int);
+	DESERIALIZE(buffer, &packet->clientInfo.accountIndex, sizeof(int));
-	memcpy(&packet->playerInfo.playerIndex, buffer, sizeof(int));
+	DESERIALIZE(buffer, &packet->clientInfo.characterIndex, sizeof(int));
-	buffer += sizeof(int);
 
-	//text
+	//texts
-	memcpy(packet->playerInfo.handle, buffer, PACKET_STRING_SIZE);
+	DESERIALIZE(buffer, packet->clientInfo.username, PACKET_STRING_SIZE);
-	buffer += PACKET_STRING_SIZE;
+	DESERIALIZE(buffer, packet->clientInfo.handle, PACKET_STRING_SIZE);
-	memcpy(packet->playerInfo.avatar, buffer, PACKET_STRING_SIZE);
+	DESERIALIZE(buffer, packet->clientInfo.avatar, PACKET_STRING_SIZE);
-	buffer += PACKET_STRING_SIZE;
-
-	//vectors
-	memcpy(&packet->playerInfo.position.x, buffer, sizeof(double));
-	buffer += sizeof(double);
-	memcpy(&packet->playerInfo.position.y, buffer, sizeof(double));
-	buffer += sizeof(double);
-	memcpy(&packet->playerInfo.motion.x, buffer, sizeof(double));
-	buffer += sizeof(double);
-	memcpy(&packet->playerInfo.motion.y, buffer, sizeof(double));
 }
 
 void deserializeRegionFormat(SerialPacket* packet, char* buffer) {
-	memcpy(&packet->meta.type, buffer, sizeof(SerialPacket::Type));
+	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-	buffer += sizeof(SerialPacket::Type);
 
-	//x & y
+	//format
-	memcpy(&packet->regionInfo.x, buffer, sizeof(int));
+	DESERIALIZE(buffer, &packet->regionInfo.mapIndex, sizeof(int));
-	buffer += sizeof(int);
+	DESERIALIZE(buffer, &packet->regionInfo.x, sizeof(int));
-	memcpy(&packet->regionInfo.y, buffer, sizeof(int));
+	DESERIALIZE(buffer, &packet->regionInfo.y, sizeof(int));
 }
 
 void deserializeRegionContent(SerialPacket* packet, char* buffer) {
-	memcpy(&packet->meta.type, buffer, sizeof(SerialPacket::Type));
+	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-	buffer += sizeof(SerialPacket::Type);
 
-	//x & y
+	//format
-	memcpy(&packet->regionInfo.x, buffer, sizeof(int));
+	DESERIALIZE(buffer, &packet->regionInfo.mapIndex, sizeof(int));
-	buffer += sizeof(int);
+	DESERIALIZE(buffer, &packet->regionInfo.x, sizeof(int));
-	memcpy(&packet->regionInfo.y, buffer, sizeof(int));
+	DESERIALIZE(buffer, &packet->regionInfo.y, sizeof(int));
-	buffer += sizeof(int);
 
-	//content
+	//an object to work on
 	BlankAllocator().Create(
 		&packet->regionInfo.region,
 		packet->regionInfo.x,
 		packet->regionInfo.y
 	);
 
+	//content
 	for (register int i = 0; i < REGION_WIDTH; i++) {
 		for (register int j = 0; j < REGION_HEIGHT; j++) {
 			for (register int k = 0; k < REGION_DEPTH; k++) {
@@ -212,6 +176,25 @@ void deserializeRegionContent(SerialPacket* packet, char* buffer) {
 	}
 }
 
+void deserializeCharacter(SerialPacket* packet, char* buffer) {
+	DESERIALIZE(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
+
+	//indexes
+	DESERIALIZE(buffer, &packet->characterInfo.clientIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->characterInfo.accountIndex, sizeof(int));
+	DESERIALIZE(buffer, &packet->characterInfo.characterIndex, sizeof(int));
+
+	//texts
+	DESERIALIZE(buffer, packet->clientInfo.handle, PACKET_STRING_SIZE);
+	DESERIALIZE(buffer, packet->clientInfo.avatar, PACKET_STRING_SIZE);
+
+	//vectors
+	DESERIALIZE(buffer, &packet->characterInfo.position.x, sizeof(double));
+	DESERIALIZE(buffer, &packet->characterInfo.position.y, sizeof(double));
+	DESERIALIZE(buffer, &packet->characterInfo.motion.x, sizeof(double));
+	DESERIALIZE(buffer, &packet->characterInfo.motion.y, sizeof(double));
+}
+
 //-------------------------
 //the interface functions
 //-------------------------
@@ -223,8 +206,6 @@ void serialize(SerialPacket* packet, void* buffer) {
 		case SerialPacket::Type::PING:
 		case SerialPacket::Type::PONG:
 		case SerialPacket::Type::BROADCAST_REQUEST:
-		case SerialPacket::Type::JOIN_REQUEST:
-		case SerialPacket::Type::SYNCHRONIZE:
 			serializeType(packet, reinterpret_cast<char*>(buffer));
 		break;
 
@@ -234,19 +215,14 @@ void serialize(SerialPacket* packet, void* buffer) {
 		break;
 
 		//Client info
+		case SerialPacket::Type::JOIN_REQUEST:
 		case SerialPacket::Type::JOIN_RESPONSE:
+		case SerialPacket::Type::SYNCHRONIZE:
 		case SerialPacket::Type::DISCONNECT:
 		case SerialPacket::Type::SHUTDOWN:
 			serializeClient(packet, reinterpret_cast<char*>(buffer));
 		break;
 
-		//Player info
-		case SerialPacket::Type::PLAYER_NEW:
-		case SerialPacket::Type::PLAYER_DELETE:
-		case SerialPacket::Type::PLAYER_UPDATE:
-			serializePlayer(packet, reinterpret_cast<char*>(buffer));
-		break;
-
 		//region info
 		case SerialPacket::Type::REGION_REQUEST:
 			serializeRegionFormat(packet, reinterpret_cast<char*>(buffer));
@@ -255,6 +231,13 @@ void serialize(SerialPacket* packet, void* buffer) {
 		case SerialPacket::Type::REGION_CONTENT:
 			serializeRegionContent(packet, reinterpret_cast<char*>(buffer));
 		break;
+
+		//Character info
+		case SerialPacket::Type::CHARACTER_NEW:
+		case SerialPacket::Type::CHARACTER_DELETE:
+		case SerialPacket::Type::CHARACTER_UPDATE:
+			serializeCharacter(packet, reinterpret_cast<char*>(buffer));
+		break;
 	}
 }
 
@@ -267,8 +250,6 @@ void deserialize(SerialPacket* packet, void* buffer) {
 		case SerialPacket::Type::PING:
 		case SerialPacket::Type::PONG:
 		case SerialPacket::Type::BROADCAST_REQUEST:
-		case SerialPacket::Type::JOIN_REQUEST:
-		case SerialPacket::Type::SYNCHRONIZE:
 			//NOTHING
 		break;
 
@@ -278,19 +259,14 @@ void deserialize(SerialPacket* packet, void* buffer) {
 		break;
 
 		//Client info
+		case SerialPacket::Type::JOIN_REQUEST:
 		case SerialPacket::Type::JOIN_RESPONSE:
+		case SerialPacket::Type::SYNCHRONIZE:
 		case SerialPacket::Type::DISCONNECT:
 		case SerialPacket::Type::SHUTDOWN:
 			deserializeClient(packet, reinterpret_cast<char*>(buffer));
 		break;
 
-		//Player info
-		case SerialPacket::Type::PLAYER_NEW:
-		case SerialPacket::Type::PLAYER_DELETE:
-		case SerialPacket::Type::PLAYER_UPDATE:
-			deserializePlayer(packet, reinterpret_cast<char*>(buffer));
-		break;
-
 		//region info
 		case SerialPacket::Type::REGION_REQUEST:
 			deserializeRegionFormat(packet, reinterpret_cast<char*>(buffer));
@@ -299,5 +275,12 @@ void deserialize(SerialPacket* packet, void* buffer) {
 		case SerialPacket::Type::REGION_CONTENT:
 			deserializeRegionContent(packet, reinterpret_cast<char*>(buffer));
 		break;
+
+		//Character info
+		case SerialPacket::Type::CHARACTER_NEW:
+		case SerialPacket::Type::CHARACTER_DELETE:
+		case SerialPacket::Type::CHARACTER_UPDATE:
+			deserializeCharacter(packet, reinterpret_cast<char*>(buffer));
+		break;
 	}
 }

common/network/serial.hpp

@@ -27,10 +27,10 @@
 /* NOTE: Keep the PACKET_BUFFER_SIZE up to date
  * NOTE: REGION_CONTENT is currently the largest type of packet
  *  map content: REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH * sizoeof(region::type_t)
- *  map format: sizeof(int) * 2
+ *  map format: sizeof(int) * 3
  *  metadata: sizeof(metadata)
 */
-#define PACKET_BUFFER_SIZE REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH * sizeof(Region::type_t) + sizeof(int) * 2 + sizeof(SerialPacket::Metadata)
+#define PACKET_BUFFER_SIZE REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH * sizeof(Region::type_t) + sizeof(int) * 3 + sizeof(SerialPacket::Metadata)
 
 void serialize(SerialPacket* const, void*);
 void deserialize(SerialPacket* const, void*);

common/network/serial_packet.hpp

@@ -27,6 +27,7 @@
 
 #include "SDL/SDL_net.h"
 
+#define NETWORK_VERSION 20140512
 #define PACKET_STRING_SIZE 100
 
 #pragma pack(push, 0)
@@ -41,6 +42,8 @@ union SerialPacket {
 		PING = 1,
 		PONG = 2,
 
+		//TODO: rejection message
+
 		//Searching for a server to join
 		BROADCAST_REQUEST = 3,
 		BROADCAST_RESPONSE = 4,
@@ -49,23 +52,25 @@ union SerialPacket {
 		JOIN_REQUEST = 5,
 		JOIN_RESPONSE = 6,
 
-		//disconnect from the server
-		DISCONNECT = 7,
-
 		//mass update
-		SYNCHRONIZE = 8,
+		SYNCHRONIZE = 7,
+
+		//disconnect from the server
+		DISCONNECT = 8,
 
 		//shut down the server
 		SHUTDOWN = 9,
 
-		//Player movement, etc.
-		PLAYER_NEW = 10,
-		PLAYER_DELETE = 11,
-		PLAYER_UPDATE = 12,
-
 		//map data
-		REGION_REQUEST = 13,
+		REGION_REQUEST = 10,
-		REGION_CONTENT = 14,
+		REGION_CONTENT = 11,
+
+		//Character movement, etc.
+		CHARACTER_NEW = 12,
+		CHARACTER_DELETE = 13,
+		CHARACTER_UPDATE = 14,
+
+		//TODO: combat packets
 	};
 
 	//metadata on the packet itself
@@ -77,42 +82,43 @@ union SerialPacket {
 	//information about the server
 	struct ServerInformation {
 		Metadata meta;
-		//TODO: version info
+		int networkVersion;
 		char name[PACKET_STRING_SIZE];
 		int playerCount;
-
-		//map format
-		int regionWidth;
-		int regionHeight;
-		int regionDepth;
 	}serverInfo;
 
 	//information about the client
-	//TODO: login credentials
 	struct ClientInformation {
-		Metadata meta;
-		int index;
-	}clientInfo;
-
-	//information about a player
-	struct PlayerInformation {
 		Metadata meta;
 		int clientIndex;
-		int playerIndex;
+		int accountIndex;
-		//TODO: should move handle/avatar into clientInfo; these might actually do better during the login system
+		int characterIndex;
+		char username[PACKET_STRING_SIZE];
 		char handle[PACKET_STRING_SIZE];
 		char avatar[PACKET_STRING_SIZE];
-		Vector2 position;
+	}clientInfo;
-		Vector2 motion;
-	}playerInfo;
 
 	//map data
 	struct RegionInformation {
 		Metadata meta;
+		int mapIndex;
 		int x, y;
 		Region* region;
 	}regionInfo;
 
+	//information about a character
+	struct CharacterInformation {
+		Metadata meta;
+		int clientIndex;
+		int accountIndex;
+		int characterIndex;
+		char handle[PACKET_STRING_SIZE];
+		char avatar[PACKET_STRING_SIZE];
+		int mapIndex;
+		Vector2 position;
+		Vector2 motion;
+	}characterInfo;
+
 	//defaults
 	SerialPacket() {
 		meta.type = Type::NONE;

common/script/linit.cpp

@@ -20,7 +20,7 @@
 #define LUA_LIB
 
 #include "lua/lua.hpp"
-#include "region_api.hpp"
+#include "map_api.hpp"
 
 
 /*
@@ -41,7 +41,7 @@ static const luaL_Reg loadedlibs[] = {
   {LUA_DBLIBNAME, luaopen_debug},
 
   /* custom libs */
-  {LUA_REGIONLIBNAME, luaopen_regionapi},
+  {LUA_MAPLIBNAME, luaopen_mapapi},
 
   {NULL, NULL}
 };

common/script/map_api.cpp

@@ -0,0 +1,126 @@
+/* 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_api.hpp"
+
+//map headers
+#include "map_allocator.hpp"
+#include "map_file_format.hpp"
+#include "region_pager.hpp"
+
+//NOTE: When operating on a region, setTile() & getTile() *are not* zero indexed, but when operating on the entire map they *are* zero indexed.
+
+static int setTile(lua_State* L) {
+	if (lua_gettop(L) == 5) {
+		//operating on a region
+		Region* ptr = (Region*)lua_touserdata(L, 1);
+		ptr->SetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1, lua_tointeger(L, 5));
+	}
+	else {
+		//operating on the whole map
+		lua_pushstring(L, "pager");
+		lua_gettable(L, LUA_REGISTRYINDEX);
+
+		//assume the pager is using lua
+		RegionPager<LuaAllocator, LuaFormat>* pager = reinterpret_cast<RegionPager<LuaAllocator, LuaFormat>*>(lua_touserdata(L, -1));
+
+		//balance the stack
+		lua_pop(L, 1);
+
+		pager->SetTile(lua_tointeger(L, 1), lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4));
+	}
+	return 0;
+}
+
+static int getTile(lua_State* L) {
+	if (lua_gettop(L) == 4) {
+		//operating on a region
+		Region* ptr = (Region*)lua_touserdata(L, 1);
+		int ret = ptr->GetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1);
+		lua_pushnumber(L, ret);
+	}
+	else {
+		//operating on the whole map
+		lua_pushstring(L, "pager");
+		lua_gettable(L, LUA_REGISTRYINDEX);
+
+		//assume the pager is using lua
+		RegionPager<LuaAllocator, LuaFormat>* pager = reinterpret_cast<RegionPager<LuaAllocator, LuaFormat>*>(lua_touserdata(L, -1));
+
+		//balance the stack
+		lua_pop(L, 1);
+
+		int ret = pager->GetTile(lua_tointeger(L, 1), lua_tointeger(L, 2), lua_tointeger(L, 3));
+		lua_pushnumber(L, ret);
+	}
+	return 1;
+}
+
+static int getX(lua_State* L) {
+	Region* ptr = (Region*)lua_touserdata(L, 1);
+	lua_pushinteger(L, ptr->GetX());
+	return 1;
+}
+
+static int getY(lua_State* L) {
+	Region* ptr = (Region*)lua_touserdata(L, 1);
+	lua_pushinteger(L, ptr->GetY());
+	return 1;
+}
+
+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;
+}
+
+static int dummy(lua_State* L) {
+	return 0;
+}
+
+static const luaL_Reg regionlib[] = {
+	{"create", dummy},
+	{"unload", dummy},
+	{"load", dummy},
+	{"save", dummy},
+	{"settile",setTile},
+	{"gettile",getTile},
+	{"getx",getX},
+	{"gety",getY},
+	{"getregionwidth",getRegionWidth},
+	{"getregionheight",getRegionHeight},
+	{"getregiondepth",getRegionDepth},
+	{nullptr, nullptr}
+};
+
+LUAMOD_API int luaopen_mapapi(lua_State* L) {
+	luaL_newlib(L, regionlib);
+	return 1;
+}

common/script/map_api.hpp

@@ -19,12 +19,12 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGIONAPI_HPP_
+#ifndef MAPAPI_HPP_
-#define REGIONAPI_HPP_
+#define MAPAPI_HPP_
 
 #include "lua/lua.hpp"
 
-#define LUA_REGIONLIBNAME "Region"
+#define LUA_MAPLIBNAME "map"
-LUAMOD_API int luaopen_regionapi(lua_State* L);
+LUAMOD_API int luaopen_mapapi(lua_State* L);
 
 #endif

common/script/region_api.cpp

@@ -1,88 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "region_api.hpp"
-
-#include "region.hpp"
-
-static int setTile(lua_State* L) {
-	Region* ptr = (Region*)lua_touserdata(L, 1);
-	ptr->SetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1, lua_tointeger(L, 5));
-	return 0;
-}
-
-static int getTile(lua_State* L) {
-	Region* ptr = (Region*)lua_touserdata(L, 1);
-	int ret = ptr->GetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1);
-	lua_pushnumber(L, ret);
-	return 1;
-}
-
-static int getWidth(lua_State* L) {
-	lua_pushinteger(L, REGION_WIDTH);
-	return 1;
-}
-
-static int getHeight(lua_State* L) {
-	lua_pushinteger(L, REGION_HEIGHT);
-	return 1;
-}
-
-static int getDepth(lua_State* L) {
-	lua_pushinteger(L, REGION_DEPTH);
-	return 1;
-}
-
-static int getX(lua_State* L) {
-	Region* ptr = (Region*)lua_touserdata(L, 1);
-	lua_pushinteger(L, ptr->GetX());
-	return 1;
-}
-
-static int getY(lua_State* L) {
-	Region* ptr = (Region*)lua_touserdata(L, 1);
-	lua_pushinteger(L, ptr->GetY());
-	return 1;
-}
-
-static int dummy(lua_State* L) {
-	return 0;
-}
-
-static const luaL_Reg regionlib[] = {
-	{"SetTile",setTile},
-	{"GetTile",getTile},
-	{"GetWidth",getWidth},
-	{"GetHeight",getHeight},
-	{"GetDepth",getDepth},
-	{"GetX",getX},
-	{"GetY",getY},
-	{"Create", dummy},
-	{"Unload", dummy},
-	{"Load", dummy},
-	{"Save", dummy},
-	{nullptr, nullptr}
-};
-
-LUAMOD_API int luaopen_regionapi(lua_State* L) {
-	luaL_newlib(L, regionlib);
-	return 1;
-}

common/sql_utility.cpp

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

editor/base_scene.cpp

@@ -1,139 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "base_scene.hpp"
-
-#include <stdexcept>
-
-//-------------------------
-//Static declarations
-//-------------------------
-
-SDL_Surface* BaseScene::screen = nullptr;
-
-//-------------------------
-//Public access members
-//-------------------------
-
-BaseScene::BaseScene() {
-	//
-}
-
-BaseScene::~BaseScene() {
-	//
-}
-
-//-------------------------
-//Program control
-//-------------------------
-
-SDL_Surface* BaseScene::SetScreen(int w, int h, int bpp, Uint32 flags) {
-	if (!bpp) {
-		bpp = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
-	}
-
-	screen = SDL_SetVideoMode(w, h, bpp, flags);
-
-	if (!screen) {
-		throw(std::runtime_error("Failed to create the screen surface"));
-	}
-
-	return screen;
-}
-
-SDL_Surface* BaseScene::GetScreen() {
-	return screen;
-}
-
-SceneList BaseScene::SetNextScene(SceneList sceneIndex) {
-	return nextScene = sceneIndex;
-}
-
-SceneList BaseScene::GetNextScene() const {
-	return nextScene;
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void BaseScene::RunFrame(double delta) {
-	FrameStart();
-	HandleEvents();
-	Update(delta);
-	FrameEnd();
-}
-
-void BaseScene::RenderFrame() {
-	SDL_FillRect(screen, 0, 0);
-	Render(screen);
-	SDL_Flip(screen);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void BaseScene::HandleEvents() {
-	SDL_Event event;
-
-	while(SDL_PollEvent(&event)) {
-		switch(event.type) {
-			case SDL_QUIT:
-				QuitEvent();
-			break;
-
-			case SDL_VIDEORESIZE:
-				SetScreen(event.resize.w, event.resize.h, 0, screen->flags);
-			break;
-
-			case SDL_MOUSEMOTION:
-				MouseMotion(event.motion);
-			break;
-
-			case SDL_MOUSEBUTTONDOWN:
-				MouseButtonDown(event.button);
-			break;
-
-			case SDL_MOUSEBUTTONUP:
-				MouseButtonUp(event.button);
-			break;
-
-			case SDL_KEYDOWN:
-				KeyDown(event.key);
-			break;
-
-			case SDL_KEYUP:
-				KeyUp(event.key);
-			break;
-
-#ifdef USE_EVENT_JOYSTICK
-			//TODO: joystick/gamepad support
-#endif
-
-#ifdef USE_EVENT_UNKNOWN
-			default:
-				UnknownEvent(event);
-			break;
-#endif
-		}//switch
-	}//while
-}

editor/base_scene.hpp

@@ -1,74 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * 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 BASESCENE_HPP_
-#define BASESCENE_HPP_
-
-#include "scene_list.hpp"
-
-#include "SDL/SDL.h"
-
-class BaseScene {
-public:
-	//Public access members
-	BaseScene();
-	virtual ~BaseScene();
-
-	//Program control
-	static SDL_Surface* SetScreen(int w, int h, int bpp = 0, Uint32 flags = SDL_HWSURFACE|SDL_DOUBLEBUF);
-	static SDL_Surface* GetScreen();
-
-	SceneList SetNextScene(SceneList sceneIndex);
-	SceneList GetNextScene() const;
-
-	//Frame loop
-	virtual void RunFrame(double delta);
-	virtual void RenderFrame();
-
-protected:
-	virtual void FrameStart() {}
-	virtual void HandleEvents();
-	virtual void Update(double delta) {}
-	virtual void FrameEnd() {}
-	virtual void Render(SDL_Surface* const screen) {}
-
-	//Event handlers
-	virtual void QuitEvent() { SetNextScene(SceneList::QUIT); }
-	virtual void MouseMotion(SDL_MouseMotionEvent const&) {}
-	virtual void MouseButtonDown(SDL_MouseButtonEvent const&) {}
-	virtual void MouseButtonUp(SDL_MouseButtonEvent const&) {}
-	virtual void KeyDown(SDL_KeyboardEvent const&) {}
-	virtual void KeyUp(SDL_KeyboardEvent const&) {}
-
-#ifdef USE_EVENT_JOYSTICK
-	//TODO: joystick/gamepad support
-#endif
-
-#ifdef USE_EVENT_UNKNOWN
-	virtual void UnknownEvent(SDL_Event const&) {}
-#endif
-
-private:
-	static SDL_Surface* screen;
-	SceneList nextScene = SceneList::CONTINUE;
-};
-
-#endif

editor/editor_application.cpp

@@ -1,116 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * 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 EditorApplications, 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 "editor_application.hpp"
-
-#include <stdexcept>
-#include <chrono>
-
-//-------------------------
-//Scene headers
-//-------------------------
-
-//Add the custom scene headers here
-#include "editor_scene.hpp"
-#include "testificate_scene.hpp"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-void EditorApplication::Init(int argc, char** argv) {
-	config.Load("rsc\\config.cfg");
-	if (SDL_Init(SDL_INIT_VIDEO))
-		throw(std::runtime_error("Failed to initialize SDL"));
-
-	BaseScene::SetScreen(config.Int("screen.w"), config.Int("screen.h"));
-}
-
-void EditorApplication::Proc() {
-	LoadScene(SceneList::FIRST);
-
-	//prepare the time system
-	typedef std::chrono::steady_clock Clock;
-
-	Clock::duration delta(16 * Clock::duration::period::den / std::milli::den);
-	Clock::time_point simTime = Clock::now();
-	Clock::time_point realTime;
-
-	//The main loop
-	while(activeScene->GetNextScene() != SceneList::QUIT) {
-		//switch scenes when necessary
-		if (activeScene->GetNextScene() != SceneList::CONTINUE) {
-			LoadScene(activeScene->GetNextScene());
-			continue;
-		}
-
-		//update the current time
-		realTime = Clock::now();
-
-		//simulate game time
-		while (simTime < realTime) {
-			//call each user defined function
-			activeScene->RunFrame(double(delta.count()) / Clock::duration::period::den);
-			simTime += delta;
-		}
-
-		//draw the game to the screen
-		activeScene->RenderFrame();
-
-		//give the computer a break
-		SDL_Delay(10);
-	}
-
-	UnloadScene();
-}
-
-void EditorApplication::Quit() {
-	SDL_Quit();
-}
-
-//-------------------------
-//Private access members
-//-------------------------
-
-void EditorApplication::LoadScene(SceneList sceneIndex) {
-	UnloadScene();
-
-	switch(sceneIndex) {
-		//add scene creation calls here
-		case SceneList::FIRST:
-		case SceneList::EDITORSCENE:
-			activeScene = new EditorScene(&config);
-		break;
-
-		case SceneList::TESTIFICATESCENE:
-			activeScene = new TestificateScene(&config);
-		break;
-
-
-		default:
-			throw(std::logic_error("Failed to recognize the scene index"));
-	}
-}
-
-void EditorApplication::UnloadScene() {
-	delete activeScene;
-	activeScene = nullptr;
-}

editor/editor_application.hpp

@@ -1,49 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * 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 EDITORAPPLICATION_HPP_
-#define EDITORAPPLICATION_HPP_
-
-#include "scene_list.hpp"
-#include "base_scene.hpp"
-#include "config_utility.hpp"
-
-class EditorApplication {
-public:
-	EditorApplication() = default;
-	~EditorApplication() = default;
-
-	void Init(int argc, char** argv);
-	void Proc();
-	void Quit();
-
-private:
-	//Private access members
-	void LoadScene(SceneList sceneIndex);
-	void UnloadScene();
-
-	//globals
-	ConfigUtility config;
-
-	BaseScene* activeScene = nullptr;
-};
-
-#endif

editor/editor_scene.cpp

@@ -1,230 +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 "editor_scene.hpp"
-
-#include "utility.hpp"
-
-#include <cstdio>
-#include <iostream>
-#include <stdexcept>
-
-using namespace std;
-
-//-------------------------
-//Public access members
-//-------------------------
-
-EditorScene::EditorScene(ConfigUtility* const arg1):
-	config(*arg1)
-{
-	//create the debugging "window"
-	debugInfo.CreateSurface(256, 256);
-
-	//setup the utility objects
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
-
-	buttonImage.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	buttonImage.SetClipH(buttonImage.GetClipH()/3);
-
-	//setup the menu bar
-	menuBar.SetFont(&font);
-	menuBar.SetImage(&buttonImage);
-
-	menuBar.SetEntries({
-		{"File", "New", "Open", "Save", "Close"},
-		{"Edit", "Set Tile", "Set Brush", "Script"},
-		{"Debug", "Debug On", "Debug Off", "Toggle", "Testificate"}
-	});
-
-	//debug
-	tsheet.Load(config["dir.tilesets"] + "terrain.bmp", 12, 15);
-	for (int i = 0; i < REGION_WIDTH; i++) {
-		for (int j = 0; j < REGION_HEIGHT; j++) {
-			pager.SetTile(i, j, 0, 14);
-		}
-	}
-	pager.SetTile(5, 10, 1, 48);
-}
-
-EditorScene::~EditorScene() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void EditorScene::FrameStart() {
-	//
-}
-
-void EditorScene::Update(double delta) {
-	//
-}
-
-void EditorScene::FrameEnd() {
-	//
-}
-
-void EditorScene::Render(SDL_Surface* const screen) {
-	tsheet.DrawRegionTo(screen, pager.GetRegion(0, 0), camera.x, camera.y);
-/*	//debug
-	for (int i = 0; i < pager.GetRegionWidth()*2; i++) {
-		for (int j = 0; j < pager.GetRegionHeight()*2; j++) {
-			for (int k = 0; k < pager.GetRegionDepth(); k++) {
-				//TODO: skip the out-of-bounds regions
-				tsheet.DrawTo(
-					screen,
-					i*tsheet.GetTileW()-camera.x,
-					j*tsheet.GetTileH()-camera.y,
-					pager.GetTile(i,j,k)
-				);
-			}
-		}
-	}
-*/
-	//draw a big bar across the top (hackish)
-	buttonImage.SetClipY(0);
-	for (int i = 0; i < screen->w; i += buttonImage.GetClipW()) {
-		buttonImage.DrawTo(screen, i, 0);
-	}
-
-	//draw the menu bar
-	menuBar.DrawTo(screen);
-
-	//draw some debugging info
-	if (debugOpen) {
-		SDL_FillRect(debugInfo.GetSurface(), 0, 0);
-		DrawToDebugInfo(string("camera.x: ") + to_string_custom(camera.x), 0);
-		DrawToDebugInfo(string("camera.y: ") + to_string_custom(camera.y), 1);
-		debugInfo.DrawTo(screen, screen->w - debugInfo.GetClipW(), buttonImage.GetClipH());
-	}
-}
-
-void EditorScene::DrawToDebugInfo(std::string str, int line) {
-	//draw the debug info on the right, with a grey background
-	SDL_Rect clip = {
-		Sint16(debugInfo.GetClipW() - str.size() * font.GetCharW()),
-		Sint16(font.GetCharH() * line),
-		Uint16(str.size() * font.GetCharW()),
-		Uint16(font.GetCharH())
-	};
-	SDL_FillRect(debugInfo.GetSurface(), &clip, SDL_MapRGB(debugInfo.GetSurface()->format, 64, 64, 64));
-	font.DrawStringTo(str, debugInfo.GetSurface(), clip.x, clip.y);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void EditorScene::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	menuBar.MouseMotion(motion);
-
-	if (motion.state & SDL_BUTTON_RMASK) {
-		camera.x -= motion.xrel;
-		camera.y -= motion.yrel;
-	}
-}
-
-void EditorScene::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	menuBar.MouseButtonDown(button);
-}
-
-void EditorScene::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	int entry, drop;
-	menuBar.MouseButtonUp(button, &entry, &drop);
-	HandleMenuOption(entry, drop);
-}
-
-void EditorScene::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			QuitEvent();
-		break;
-		case SDLK_SPACE:
-			camera.x = 0;
-			camera.y = 0;
-		break;
-		case SDLK_TAB:
-			debugOpen = !debugOpen;
-		break;
-	}
-}
-
-void EditorScene::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}
-
-//-------------------------
-//Members
-//-------------------------
-
-void EditorScene::HandleMenuOption(int entry, int drop) {
-	//manage input from the menu bar
-	switch(entry) {
-		case 0: //File
-			switch(drop) {
-				case 0:
-					//TODO: NEW
-				break;
-				case 1:
-					//TODO: OPEN
-				break;
-				case 2:
-					//TODO: SAVE
-				break;
-				case 3:
-					//TODO: CLOSE
-				break;
-			}
-		break;
-		case 1: //Edit
-			switch(drop) {
-				case 0:
-					//TODO: SET TILE
-				break;
-				case 1:
-					//TODO: SET BRUSH
-				break;
-				case 2:
-					//TODO: SCRIPT
-				break;
-			}
-		break;
-		case 2: //Debug
-			switch(drop) {
-				case 0:
-					debugOpen = true;
-				break;
-				case 1:
-					debugOpen = false;
-				break;
-				case 2:
-					debugOpen = !debugOpen;
-				break;
-				case 3:
-					SetNextScene(SceneList::TESTIFICATESCENE);
-				break;
-			}
-		break;
-	}
-}

editor/editor_scene.hpp

@@ -1,80 +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 EDITORSCENE_HPP_
-#define EDITORSCENE_HPP_
-
-#include "base_scene.hpp"
-
-#include "config_utility.hpp"
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "menu_bar.hpp"
-
-#include "region_pager.hpp"
-#include "map_allocator.hpp"
-#include "map_file_format.hpp"
-#include "tile_sheet.hpp"
-
-class EditorScene : public BaseScene {
-public:
-	//Public access members
-	EditorScene(ConfigUtility* const);
-	~EditorScene();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update(double delta);
-	void FrameEnd();
-	void Render(SDL_Surface* const);
-
-	//Event handlers
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
-	void KeyDown(SDL_KeyboardEvent const&);
-	void KeyUp(SDL_KeyboardEvent const&);
-
-	//members
-	void HandleMenuOption(int entry, int drop);
-
-	//globals
-	ConfigUtility& config;
-
-	//debugging tools
-	void DrawToDebugInfo(std::string, int line);
-	Image debugInfo;
-	bool debugOpen = true;
-
-	RasterFont font;
-	Image buttonImage;
-	MenuBar menuBar;
-
-	struct {
-		int x = 0, y = 0;
-	} camera;
-
-	RegionPager<BlankAllocator, DummyFormat> pager;
-	TileSheet tsheet;
-};
-
-#endif

editor/main.cpp

@@ -1,43 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * 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 "editor_application.hpp"
-
-#include <stdexcept>
-#include <iostream>
-
-using namespace std;
-
-int main(int argc, char** argv) {
-	cout << "Beginning editor" << endl;
-	try {
-		EditorApplication app;
-		app.Init(argc, argv);
-		app.Proc();
-		app.Quit();
-	}
-	catch(exception& e) {
-		cerr << "Fatal exception thrown: " << e.what() << endl;
-		return 1;
-	}
-	cout << "Clean exit" << endl;
-	return 0;
-}

editor/makefile

@@ -1,43 +0,0 @@
-#config
-INCLUDES+=../common ../common/graphics ../common/map ../common/ui
-LIBS+=../libcommon.a -lmingw32 -lSDLmain -lSDL -llua
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
-
-#source
-CXXSRC=$(wildcard *.cpp)
-CSRC=$(wildcard *.c)
-
-#objects
-OBJDIR=obj
-OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.o))
-
-#output
-OUTDIR=../out
-OUT=$(addprefix $(OUTDIR)/,editor)
-
-#targets
-all: $(OBJ) $(OUT)
-	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
-
-$(OBJ): | $(OBJDIR)
-
-$(OUT): | $(OUTDIR)
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-$(OUTDIR):
-	mkdir $(OUTDIR)
-
-$(OBJDIR)/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all

editor/scene_list.hpp

@@ -1,36 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * 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 SCENELIST_HPP_
-#define SCENELIST_HPP_
-
-enum class SceneList {
-	//these are reserved
-	QUIT,
-	CONTINUE,
-	FIRST,
-
-	//custom indexes
-	TESTIFICATESCENE,
-	EDITORSCENE,
-};
-
-#endif

editor/testificate_scene.cpp

@@ -1,91 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * 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 "testificate_scene.hpp"
-
-#include <iostream>
-
-using std::cout;
-using std::endl;
-
-//-------------------------
-//Public access members
-//-------------------------
-
-TestificateScene::TestificateScene(ConfigUtility* const arg1):
-	config(*arg1)
-{
-	//
-}
-
-TestificateScene::~TestificateScene() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void TestificateScene::FrameStart() {
-	//
-}
-
-void TestificateScene::Update(double delta) {
-	//
-}
-
-void TestificateScene::FrameEnd() {
-	//
-}
-
-void TestificateScene::Render(SDL_Surface* const screen) {
-	//
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void TestificateScene::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	//
-}
-
-
-void TestificateScene::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void TestificateScene::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void TestificateScene::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-//			QuitEvent();
-		SetNextScene(SceneList::EDITORSCENE);
-		break;
-	}
-}
-
-void TestificateScene::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}

editor/testificate_scene.hpp

@@ -1,53 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * 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 TESTIFICATESCENE_HPP_
-#define TESTIFICATESCENE_HPP_
-
-#include "base_scene.hpp"
-
-#include "config_utility.hpp"
-
-class TestificateScene : public BaseScene {
-public:
-	//Public access members
-	TestificateScene(ConfigUtility* const);
-	~TestificateScene();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update(double delta);
-	void FrameEnd();
-	void Render(SDL_Surface* const);
-
-	//Event handlers
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
-	void KeyDown(SDL_KeyboardEvent const&);
-	void KeyUp(SDL_KeyboardEvent const&);
-
-	//globals
-	ConfigUtility& config;
-};
-
-#endif

makefile

@@ -15,7 +15,6 @@ all: $(OUTDIR)
 	$(MAKE) -C common
 	$(MAKE) -C server
 	$(MAKE) -C client
-	$(MAKE) -C editor
 
 $(OUTDIR):
 	mkdir $(OUTDIR)

rsc/config.cfg

@@ -23,7 +23,8 @@ map.pager.height = 20
 map.pager.depth = 3
 
 #player options
-player.handle = username
+client.username = Kayne Ruse
-player.avatar = elliot2.bmp
+client.handle = Ratstail91
+client.avatar = elliot2.bmp
 
 #debugging

rsc/scripts/setup_server.lua

@@ -1,29 +1,27 @@
 print("Lua script check OK (./rsc)")
 
-function Region.Create(r)
+function map.create(region)
---	print("Region:Create(r", Region.GetX(r), Region.GetY(r), ")")
+	for i = 1, map.getregionwidth() do
-	for i = 1, Region.GetWidth(r) do
+		for j = 1, map.getregionheight() do
-		for j = 1, Region.GetHeight(r) do
+			if math.abs(map.getx(region) + i -1) == math.abs(map.gety(region) + j -1) then
-			if math.abs(i) == math.abs(j) then
+				map.settile(region, i, j, 1, 50)
-				Region.SetTile(r, i, j, 1, 50)
 			else
-				Region.SetTile(r, i, j, 1, 14)
+				map.settile(region, i, j, 1, 14)
 			end
 		end
 	end
---	print("done")
 end
 
-function Region.Unload(r)
+function map.unload(region)
---	print("Region:Unload(r", Region.GetX(r), Region.GetY(r), ")")
+	--
 end
 
 --return true if file loaded, otherwise return false
-function Region.Load(r, saveDir)
+function map.load(region, dir)
---	print("Region:Load(r,", saveDir, Region.GetX(r), Region.GetY(r), ")")
+	--
 	return false
 end
 
-function Region.Save(r, saveDir)
+function map.save(region, dir)
---	print("Region:Save(r,", saveDir, Region.GetX(r), Region.GetY(r), ")")
+	--
 end

rsc/scripts/setup_server.sql

@@ -1,5 +1,3 @@
---TODO: The SQL startup script needs revising
-
 -------------------------
 --Server
 -------------------------
@@ -7,9 +5,11 @@
 CREATE TABLE IF NOT EXISTS UserAccounts (
 	uid INTEGER PRIMARY KEY AUTOINCREMENT,
 	username varchar(100) UNIQUE,
-	password varchar(100), --NOTE: DO NOT DO THIS!!
+	--TODO: server-client security
+--	password varchar(100),
 	blacklisted BIT DEFAULT 0,
 	whitelisted BIT DEFAULT 1
+--	TODO: moderator
 );
 
 -------------------------
@@ -50,6 +50,7 @@ CREATE TABLE IF NOT EXISTS PlayerCharacters (
 	uid INTEGER PRIMARY KEY AUTOINCREMENT,
 
 	--metadata
+	owner INTEGER REFERENCES UserAccounts(uid),
 	handle varchar(100) UNIQUE,
 	avatar varchar(100),
 	birth timestamp NOT NULL DEFAULT (datetime()),

server/account_data.hpp

@@ -19,6 +19,18 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "client_entry.hpp"
+#ifndef ACCOUNTDATA_HPP_
+#define ACCOUNTDATA_HPP_
 
-unsigned int ClientEntry::uidCounter;
+#include <string>
+
+struct AccountData {
+	std::string username;
+	//TODO: password
+	bool blackListed = false;
+	bool whiteListed = true;
+
+	int clientIndex;
+};
+
+#endif

server/account_management.cpp

@@ -0,0 +1,192 @@
+/* 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 "server_application.hpp"
+
+#include "sqlite3/sqlite3.h"
+
+#include <stdexcept>
+
+//-------------------------
+//Define the queries
+//-------------------------
+
+static const char* CREATE_USER_ACCOUNT = "INSERT INTO UserAccounts (username) VALUES (?);";
+static const char* LOAD_USER_ACCOUNT = "SELECT * FROM UserAccounts WHERE username = ?;";
+static const char* SAVE_USER_ACCOUNT = "INSERT OR REPLACE INTO UserAccounts VALUES (?, ?, ?, ?);";
+static const char* DELETE_USER_ACCOUNT = "DELETE FROM UserAccounts WHERE uid = ?;";
+
+//-------------------------
+//Define the methods
+//-------------------------
+
+int ServerApplication::CreateUserAccount(std::string username, int clientIndex) {
+	//create this user account, failing if it exists, leave this account in memory
+	sqlite3_stmt* statement = nullptr;
+
+	//prep
+	if (sqlite3_prepare_v2(database, CREATE_USER_ACCOUNT, -1, &statement, nullptr) != SQLITE_OK) {
+		throw( std::runtime_error(std::string() + "Failed to prepare an SQL statement: " + sqlite3_errmsg(database)) );
+	}
+
+	//parameter
+	if (sqlite3_bind_text(statement, 1, username.c_str(), username.size() + 1, SQLITE_STATIC) != SQLITE_OK) {
+		throw( std::runtime_error(std::string() + "Failed to replace a prepared statement's parameter: " + sqlite3_errmsg(database)) );
+	}
+
+	//execute
+	if (sqlite3_step(statement) != SQLITE_DONE) {
+		//if this fails, than this account exists
+		sqlite3_finalize(statement);
+		return -1;
+	}
+
+	sqlite3_finalize(statement);
+
+	//load this account into memory
+	return LoadUserAccount(username, clientIndex);
+}
+
+int ServerApplication::LoadUserAccount(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;
+
+	//prep
+	if (sqlite3_prepare_v2(database, LOAD_USER_ACCOUNT, -1, &statement, nullptr) != SQLITE_OK) {
+		throw( std::runtime_error(std::string() + "Failed to prepare an SQL statement: " + sqlite3_errmsg(database)) );
+	}
+
+	//parameter
+	if (sqlite3_bind_text(statement, 1, username.c_str(), username.size() + 1, SQLITE_STATIC) != SQLITE_OK) {
+		throw( std::runtime_error(std::string() + "Failed to replace a prepared statement's parameter: " + sqlite3_errmsg(database)) );
+	}
+
+	//execute
+	int ret = sqlite3_step(statement);
+
+	//process the result
+	if (ret == SQLITE_ROW) {
+		//get the index
+		int uid = sqlite3_column_int(statement, 0);
+
+		//check to see if this account is already loaded
+		if (accountMap.find(uid) != accountMap.end()) {
+			sqlite3_finalize(statement);
+			return -1;
+		}
+
+		//extract the data into memory
+		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);
+		newAccount.clientIndex = clientIndex;
+
+		//finish the routine
+		sqlite3_finalize(statement);
+		return uid;
+	}
+
+	sqlite3_finalize(statement);
+
+	if (ret == SQLITE_DONE) {
+		//create the non-existant account instead
+		return CreateUserAccount(username, clientIndex);
+	}
+
+	throw(std::runtime_error(std::string() + "Unknown SQL error in LoadUserAccount: " + sqlite3_errmsg(database) ));
+}
+
+int ServerApplication::SaveUserAccount(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 (accountMap.find(uid) == accountMap.end()) {
+		return -1;
+	}
+
+	AccountData& account = accountMap[uid];
+	sqlite3_stmt* statement = nullptr;
+
+	//prep
+	if (sqlite3_prepare_v2(database, SAVE_USER_ACCOUNT, -1, &statement, nullptr) != SQLITE_OK) {
+		throw( std::runtime_error(std::string() + "Failed to prepare an SQL statement: " + sqlite3_errmsg(database)) );
+	}
+
+	//parameters
+	bool ret = false;
+	ret |= sqlite3_bind_int(statement, 1, uid) != SQLITE_OK;
+	ret |= sqlite3_bind_text(statement, 2, account.username.c_str(), account.username.size() + 1, SQLITE_STATIC) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 3, account.blackListed) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 4, account.whiteListed) != SQLITE_OK;
+
+	//check for binding errors
+	if (ret) {
+		throw( std::runtime_error(std::string() + "Failed to replace a prepared statement's parameter: " + sqlite3_errmsg(database)) );
+	}
+
+	//execute
+	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 an account: " + sqlite3_errmsg(database)) );
+	}
+
+	sqlite3_finalize(statement);
+
+	//successful execution
+	return 0;
+}
+
+void ServerApplication::UnloadUserAccount(int uid) {
+	//save this user account, and then unload it
+	//NOTE: the associated characters are unloaded externally
+	SaveUserAccount(uid);
+	accountMap.erase(uid);
+}
+
+void ServerApplication::DeleteUserAccount(int uid) {
+	//delete a user account from the database, and remove it from memory
+	//NOTE: the associated characters are unloaded externally
+	sqlite3_stmt* statement = nullptr;
+
+	//prep
+	if (sqlite3_prepare_v2(database, DELETE_USER_ACCOUNT, -1, &statement, nullptr) != SQLITE_OK) {
+		throw( std::runtime_error(std::string() + "Failed to prepare an SQL statement: " + sqlite3_errmsg(database)) );
+	}
+
+	//parameter
+	if (sqlite3_bind_int(statement, 1, uid) != SQLITE_OK) {
+		throw( std::runtime_error(std::string() + "Failed to replace a prepared statement's parameter: " + sqlite3_errmsg(database)) );
+	}
+
+	//execute
+	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 an account: " + sqlite3_errmsg(database)) );
+	}
+
+	//finish the routine
+	sqlite3_finalize(statement);
+	accountMap.erase(uid);
+}

server/character_data.hpp

@@ -19,8 +19,8 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef PLAYERENTRY_HPP_
+#ifndef CHARACTERDATA_HPP_
-#define PLAYERENTRY_HPP_
+#define CHARACTERDATA_HPP_
 
 //POD members
 #include "bbox.hpp"
@@ -28,35 +28,32 @@
 
 #include <string>
 
-struct PlayerEntry {
+struct CharacterData {
 	//metadata
-	int clientIndex;
+	int owner;
 	std::string handle;
 	std::string avatar;
 
 	//world position
-	int mapIndex;
+	int mapIndex = 0;
-	Vector2 position;
+	Vector2 position = {0.0,0.0};
-	Vector2 motion;
+	Vector2 motion = {0.0,0.0};
-	BBox bbox;
+	BBox bbox = {0,0,0,0};
 
 	//statistics
-	int level;
+	int level = 0;
-	int exp;
+	int exp = 0;
-	int maxHP;
+	int maxHP = 0;
-	int health;
+	int health = 0;
-	int maxMP;
+	int maxMP = 0;
-	int mana;
+	int mana = 0;
-	int attack;
+	int attack = 0;
-	int defence;
+	int defence = 0;
-	int intelligence;
+	int intelligence = 0;
-	int resistance;
+	int resistance = 0;
-	float accuracy;
+	float accuracy = 0.0;
-	float evasion;
+	float evasion = 0.0;
-	float luck;
+	float luck = 0.0;
-
-	//uid
-	static unsigned int uidCounter;
 };
 
 #endif

server/character_management.cpp

@@ -0,0 +1,229 @@
+/* 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 "server_application.hpp"
+
+#include "sqlite3/sqlite3.h"
+
+#include <stdexcept>
+
+//-------------------------
+//Define the queries
+//-------------------------
+
+static const char* CREATE_CHARACTER = "INSERT INTO PlayerCharacters (owner, handle, avatar) VALUES (?, ?, ?);";
+static const char* LOAD_CHARACTER = "SELECT * FROM PlayerCharacters WHERE handle = ?;";
+static const char* SAVE_CHARACTER = "INSERT OR REPLACE INTO PlayerCharacters (uid, owner, mapIndex, positionX, positionY) VALUES (?, ?, ?, ?, ?);";
+static const char* DELETE_CHARACTER = "DELETE FROM PlayerCharacters WHERE uid = ?;";
+
+//-------------------------
+//Define the methods
+//-------------------------
+
+int ServerApplication::CreateCharacter(int owner, std::string handle, std::string avatar) {
+	//Create the character, failing if it exists
+	sqlite3_stmt* statement = nullptr;
+
+	//prep
+	if (sqlite3_prepare_v2(database, CREATE_CHARACTER, -1, &statement, nullptr) != SQLITE_OK) {
+		throw( std::runtime_error(std::string() + "Failed to prepare an SQL statement: " + sqlite3_errmsg(database)) );
+	}
+
+	//parameters
+	bool ret = false;
+	ret |= sqlite3_bind_int(statement, 1, owner);
+	ret |= sqlite3_bind_text(statement, 2, handle.c_str(), handle.size() + 1, SQLITE_STATIC);
+	ret |= sqlite3_bind_text(statement, 3, avatar.c_str(), avatar.size() + 1, SQLITE_STATIC);
+
+	//check for binding errors
+	if (ret) {
+		throw( std::runtime_error(std::string() + "Failed to replace a prepared statement's parameter: " + sqlite3_errmsg(database)) );
+	}
+
+	//execute
+	if (sqlite3_step(statement) != SQLITE_DONE) {
+		//if this fails, than this character exists
+		sqlite3_finalize(statement);
+		return -1;
+	}
+
+	sqlite3_finalize(statement);
+
+	//load this character into memory
+	return LoadCharacter(owner, handle, avatar);
+}
+
+int ServerApplication::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;
+
+	//prep
+	if (sqlite3_prepare_v2(database, LOAD_CHARACTER, -1, &statement, nullptr) != SQLITE_OK) {
+		throw( std::runtime_error(std::string() + "Failed to prepare an SQL statement: " + sqlite3_errmsg(database)) );
+	}
+
+	//parameter
+	if (sqlite3_bind_text(statement, 1, handle.c_str(), handle.size() + 1, SQLITE_STATIC) != SQLITE_OK) {
+		throw( std::runtime_error(std::string() + "Failed to replace a prepared statement's parameter: " + sqlite3_errmsg(database)) );
+	}
+
+	//execute
+	int ret = sqlite3_step(statement);
+
+	//process the result
+	if (ret == SQLITE_ROW) {
+		//get the index
+		int uid = sqlite3_column_int(statement, 0);
+
+		//check to see if this character is already loaded
+		if (characterMap.find(uid) != characterMap.end()) {
+			sqlite3_finalize(statement);
+			return -1;
+		}
+
+		//check the owner
+		if (owner != sqlite3_column_int(statement, 1)) {
+			sqlite3_finalize(statement);
+			return -2;
+		}
+
+		//extract the data into memory
+		CharacterData& newChar = characterMap[uid];
+
+		//metadata
+		newChar.owner = owner;
+		newChar.handle = reinterpret_cast<const char*>(sqlite3_column_text(statement, 2));
+		newChar.avatar = reinterpret_cast<const char*>(sqlite3_column_text(statement, 3));
+		//Don't cache the birth
+
+		//world position
+		newChar.mapIndex = sqlite3_column_int(statement, 5);
+		newChar.position.x = (double)sqlite3_column_int(statement, 6);
+		newChar.position.y = (double)sqlite3_column_int(statement, 7);
+
+		//statistics
+		newChar.level = sqlite3_column_int(statement, 8);
+		newChar.exp = sqlite3_column_int(statement, 9);
+		newChar.maxHP = sqlite3_column_int(statement, 10);
+		newChar.health = sqlite3_column_int(statement, 11);
+		newChar.maxMP = sqlite3_column_int(statement, 12);
+		newChar.mana = sqlite3_column_int(statement, 13);
+		newChar.attack = sqlite3_column_int(statement, 14);
+		newChar.defence = sqlite3_column_int(statement, 15);
+		newChar.intelligence = sqlite3_column_int(statement, 16);
+		newChar.resistance = sqlite3_column_int(statement, 17);
+		newChar.accuracy = sqlite3_column_double(statement, 18);
+		newChar.evasion = sqlite3_column_double(statement, 19);
+		newChar.luck = sqlite3_column_double(statement, 20);
+
+		//TODO: equipment
+
+		//finish the routine
+		sqlite3_finalize(statement);
+		return uid;
+	}
+
+	sqlite3_finalize(statement);
+
+	if (ret == SQLITE_DONE) {
+		//create the non-existant character instead
+		return CreateCharacter(owner, handle, avatar);
+	}
+
+	throw(std::runtime_error(std::string() + "Unknown SQL error in LoadCharacter: " + sqlite3_errmsg(database) ));
+}
+
+int ServerApplication::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 (characterMap.find(uid) == characterMap.end()) {
+		return -1;
+	}
+
+	CharacterData& character = characterMap[uid];
+	sqlite3_stmt* statement = nullptr;
+
+	//prep
+	if (sqlite3_prepare_v2(database, SAVE_CHARACTER, -1, &statement, nullptr) != SQLITE_OK) {
+		throw( std::runtime_error(std::string() + "Failed to prepare an SQL statement: " + sqlite3_errmsg(database)) );
+	}
+
+	//parameters
+	bool ret = false;
+	ret |= sqlite3_bind_int(statement, 1, uid) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 2, character.owner) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 3, character.mapIndex) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 4, (int)character.position.x) != SQLITE_OK;
+	ret |= sqlite3_bind_int(statement, 5, (int)character.position.y) != SQLITE_OK;
+	//TODO: stats, etc.
+
+	//check for binding errors
+	if (ret) {
+		throw( std::runtime_error(std::string() + "Failed to replace a prepared statement's parameter: " + sqlite3_errmsg(database)) );
+	}
+
+	//execute
+	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 an account: " + sqlite3_errmsg(database)) );
+	}
+
+	sqlite3_finalize(statement);
+
+	//successful execution
+	return 0;
+}
+
+void ServerApplication::UnloadCharacter(int uid) {
+	//save this character, then unload it
+	SaveCharacter(uid);
+	characterMap.erase(uid);
+}
+
+void ServerApplication::DeleteCharacter(int uid) {
+	//delete this character from the database, then remove it from memory
+	sqlite3_stmt* statement = nullptr;
+
+	//prep
+	if (sqlite3_prepare_v2(database, DELETE_CHARACTER, -1, &statement, nullptr) != SQLITE_OK) {
+		throw( std::runtime_error(std::string() + "Failed to prepare an SQL statement: " + sqlite3_errmsg(database)) );
+	}
+
+	//parameter
+	if (sqlite3_bind_int(statement, 1, uid) != SQLITE_OK) {
+		throw( std::runtime_error(std::string() + "Failed to replace a prepared statement's parameter: " + sqlite3_errmsg(database)) );
+	}
+
+	//execute
+	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 an account: " + sqlite3_errmsg(database)) );
+	}
+
+	//finish the routine
+	sqlite3_finalize(statement);
+	characterMap.erase(uid);
+}

server/client_data.hpp

@@ -19,14 +19,14 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CLIENTENTRY_HPP_
+#ifndef CLIENTDATA_HPP_
-#define CLIENTENTRY_HPP_
+#define CLIENTDATA_HPP_
 
 #include "SDL/SDL_net.h"
 
-struct ClientEntry {
+struct ClientData {
-	IPaddress address;
+	IPaddress address = {0,0};
-	static unsigned int uidCounter;
+	static int uidCounter;
 };
 
 #endif

server/player_entry.cpp

@@ -1,24 +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 "player_entry.hpp"
-
-unsigned int PlayerEntry::uidCounter;

server/server_application.cpp

@@ -1,373 +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 "server_application.hpp"
-
-#include "utility.hpp"
-
-#include <stdexcept>
-#include <iostream>
-#include <string>
-
-//-------------------------
-//Define the public members
-//-------------------------
-
-void ServerApplication::Init(int argc, char** argv) {
-	//NOTE: I might need to rearrange the init process so that lua & SQL can interact with the map system as needed.
-	std::cout << "Beginning startup" << std::endl;
-
-	//initial setup
-	ClientEntry::uidCounter = 0;
-	PlayerEntry::uidCounter = 0;
-	config.Load("rsc\\config.cfg");
-
-	//Init SDL
-	if (SDL_Init(0)) {
-		throw(std::runtime_error("Failed to initialize SDL"));
-	}
-	std::cout << "Initialized SDL" << std::endl;
-
-	//Init SDL_net
-	if (SDLNet_Init()) {
-		throw(std::runtime_error("Failed to initialize SDL_net"));
-	}
-	network.Open(config.Int("server.port"), PACKET_BUFFER_SIZE);
-	std::cout << "Initialized SDL_net" << std::endl;
-
-	//Init SQL
-	int ret = sqlite3_open_v2(config["server.dbname"].c_str(), &database, SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE, nullptr);
-	if (ret != SQLITE_OK || !database) {
-		throw(std::runtime_error(std::string() + "Failed to initialize SQL: " + sqlite3_errmsg(database) ));
-	}
-	std::cout << "Initialized SQL" << std::endl;
-
-	//setup the database
-	if (runSQLScript(database, config["dir.scripts"] + "setup_server.sql")) {
-		throw(std::runtime_error("Failed to initialize SQL's setup script"));
-	}
-	std::cout << "Initialized SQL's setup script" << std::endl;
-
-	//lua
-	luaState = luaL_newstate();
-	if (!luaState) {
-		throw(std::runtime_error("Failed to initialize lua"));
-	}
-	luaL_openlibs(luaState);
-	std::cout << "Initialized lua" << std::endl;
-
-	//run the startup script
-	if (luaL_dofile(luaState, (config["dir.scripts"] + "setup_server.lua").c_str())) {
-		throw(std::runtime_error(std::string() + "Failed to initialize lua's setup script: " + lua_tostring(luaState, -1) ));
-	}
-	std::cout << "Initialized lua's setup script" << std::endl;
-
-	//setup the map object
-	regionPager.GetAllocator()->SetLuaState(luaState);
-	regionPager.GetFormat()->SetLuaState(luaState);
-	//TODO: config parameter
-	regionPager.GetFormat()->SetSaveDir("save/mapname/");
-
-	std::cout << "Initialized the map system" << std::endl;
-	std::cout << "\tsizeof(SerialPacket): " << sizeof(SerialPacket) << std::endl;
-	std::cout << "\tPACKET_BUFFER_SIZE: " << PACKET_BUFFER_SIZE << std::endl;
-
-	//finalize the startup
-	std::cout << "Startup completed successfully" << std::endl;
-
-	//debugging
-	//
-}
-
-void ServerApplication::Proc() {
-	SerialPacket packet;
-	while(running) {
-		//suck in the waiting packets & process them
-		while(network.Receive()) {
-			//get the packet
-			deserialize(&packet, network.GetInData());
-			//cache the source address
-			packet.meta.srcAddress = network.GetInPacket()->address;
-			//we need to go deeper
-			HandlePacket(packet);
-		}
-		//give the computer a break
-		//TODO: remove this delay?
-		SDL_Delay(10);
-	}
-}
-
-void ServerApplication::Quit() {
-	std::cout << "Shutting down" << std::endl;
-	//empty the members
-	regionPager.UnloadAll();
-
-	//APIs
-	lua_close(luaState);
-	sqlite3_close_v2(database);
-	network.Close();
-	SDLNet_Quit();
-	SDL_Quit();
-	std::cout << "Shutdown finished" << std::endl;
-}
-
-//-------------------------
-//Define the uber switch
-//-------------------------
-
-void ServerApplication::HandlePacket(SerialPacket packet) {
-	switch(packet.meta.type) {
-		case SerialPacket::Type::BROADCAST_REQUEST:
-			HandleBroadcastRequest(packet);
-		break;
-		case SerialPacket::Type::JOIN_REQUEST:
-			HandleJoinRequest(packet);
-		break;
-		case SerialPacket::Type::DISCONNECT:
-			HandleDisconnect(packet);
-		break;
-		case SerialPacket::Type::SYNCHRONIZE:
-			HandleSynchronize(packet);
-		break;
-		case SerialPacket::Type::SHUTDOWN:
-			HandleShutdown(packet);
-		break;
-		case SerialPacket::Type::PLAYER_NEW:
-			HandlePlayerNew(packet);
-		break;
-		case SerialPacket::Type::PLAYER_DELETE:
-			HandlePlayerDelete(packet);
-		break;
-		case SerialPacket::Type::PLAYER_UPDATE:
-			HandlePlayerUpdate(packet);
-		break;
-		case SerialPacket::Type::REGION_REQUEST:
-			HandleRegionRequest(packet);
-		break;
-		//handle errors
-		default:
-			throw(std::runtime_error("Unknown SerialPacket::Type encountered"));
-		break;
-	}
-}
-
-//-------------------------
-//Handle various network input
-//-------------------------
-
-void ServerApplication::HandleBroadcastRequest(SerialPacket packet) {
-	//send back the server's metadata
-	packet.meta.type = SerialPacket::Type::BROADCAST_RESPONSE;
-
-	//pack the data
-	//TODO: version info
-	snprintf(packet.serverInfo.name, PACKET_STRING_SIZE, "%s", config["server.name"].c_str());
-	packet.serverInfo.playerCount = playerMap.size();
-	packet.serverInfo.regionWidth = REGION_WIDTH;
-	packet.serverInfo.regionHeight = REGION_HEIGHT;
-	packet.serverInfo.regionDepth = REGION_DEPTH;
-
-	//send the data
-	char buffer[PACKET_BUFFER_SIZE];
-	serialize(&packet, buffer);
-	network.Send(&packet.meta.srcAddress, buffer, PACKET_BUFFER_SIZE);
-}
-
-void ServerApplication::HandleJoinRequest(SerialPacket packet) {
-	//register the new client
-	ClientEntry newClient;
-	newClient.address = packet.meta.srcAddress;
-	clientMap[ClientEntry::uidCounter] = newClient;
-
-	//send the client their index
-	char buffer[PACKET_BUFFER_SIZE];
-	packet.meta.type = SerialPacket::Type::JOIN_RESPONSE;
-	packet.clientInfo.index = ClientEntry::uidCounter;
-	serialize(&packet, buffer);
-
-	//bounce this packet
-	network.Send(&newClient.address, buffer, PACKET_BUFFER_SIZE);
-
-	//finished this routine
-	ClientEntry::uidCounter++;
-	std::cout << "Connect, total: " << clientMap.size() << std::endl;
-}
-
-void ServerApplication::HandleDisconnect(SerialPacket packet) {
-	//TODO: authenticate who is disconnecting/kicking
-
-	//disconnect the specified client
-	char buffer[PACKET_BUFFER_SIZE];
-	serialize(&packet, buffer);
-	network.Send(&clientMap[packet.clientInfo.index].address, buffer, PACKET_BUFFER_SIZE);
-	clientMap.erase(packet.clientInfo.index);
-
-	//prep the delete packet
-	SerialPacket delPacket;
-	delPacket.meta.type = SerialPacket::Type::PLAYER_DELETE;
-
-	//TODO: can this use DeletePlayer() instead?
-	//delete server and client side players
-	erase_if(playerMap, [&](std::pair<unsigned int, PlayerEntry> it) -> bool {
-		//find the internal players to delete
-		if (it.second.clientIndex == packet.clientInfo.index) {
-			//send the delete player command to all clients
-			delPacket.playerInfo.playerIndex = it.first;
-			PumpPacket(delPacket);
-
-			//delete this player object
-			return true;
-		}
-
-		//don't delete this player object
-		return false;
-	});
-
-	//finished this routine
-	std::cout << "Disconnect, total: " << clientMap.size() << std::endl;
-}
-
-void ServerApplication::HandleSynchronize(SerialPacket packet) {
-	//TODO: compensate for large distances
-
-	//send all the server's data to this client
-	SerialPacket newPacket;
-	char buffer[PACKET_BUFFER_SIZE];
-
-	//TODO: syncronize the map?
-
-	//players
-	newPacket.meta.type = SerialPacket::Type::PLAYER_UPDATE;
-	for (auto& it : playerMap) {
-		//TODO: update this for the expanded PlayerEntry structure
-		newPacket.playerInfo.playerIndex = it.first;
-		snprintf(newPacket.playerInfo.handle, PACKET_STRING_SIZE, "%s", it.second.handle.c_str());
-		snprintf(newPacket.playerInfo.avatar, PACKET_STRING_SIZE, "%s", it.second.avatar.c_str());
-		newPacket.playerInfo.position = it.second.position;
-		newPacket.playerInfo.motion = it.second.motion;
-		serialize(&newPacket, buffer);
-		network.Send(&clientMap[packet.clientInfo.index].address, buffer, PACKET_BUFFER_SIZE);
-	}
-}
-
-void ServerApplication::HandleShutdown(SerialPacket packet) {
-	//end the server
-	running = false;
-
-	//disconnect all clients
-	packet.meta.type = SerialPacket::Type::DISCONNECT;
-	PumpPacket(packet);
-
-	//finished this routine
-	std::cout << "Shutdown signal accepted" << std::endl;
-}
-
-void ServerApplication::HandlePlayerNew(SerialPacket packet) {
-	//register the new PlayerEntry
-	//NOTE: assigning each field one-by-one so adding or moving a field doesn't break this code
-	PlayerEntry newPlayer;
-
-	//metadata
-	newPlayer.clientIndex = packet.playerInfo.clientIndex;
-	newPlayer.handle = packet.playerInfo.handle;
-	newPlayer.avatar = packet.playerInfo.avatar;
-
-	//position
-	newPlayer.mapIndex = 0;
-	newPlayer.position = {0,0};
-	newPlayer.motion = {0,0};
-	newPlayer.bbox = {0, 0, 0, 0};
-
-	//stats
-	//TODO
-
-	//push this player
-	playerMap[PlayerEntry::uidCounter] = newPlayer;
-
-	//send the client their info
-	packet.playerInfo.playerIndex = PlayerEntry::uidCounter;
-	packet.playerInfo.position = newPlayer.position;
-	packet.playerInfo.motion = newPlayer.motion;
-
-	//actually send to everyone
-	PumpPacket(packet);
-
-	//finish this routine
-	PlayerEntry::uidCounter++;
-}
-
-//TODO: differentiate between delete and unload
-void ServerApplication::HandlePlayerDelete(SerialPacket packet) {
-	//TODO: authenticate who is deleting this player
-	if (playerMap.find(packet.playerInfo.playerIndex) == playerMap.end()) {
-		throw(std::runtime_error("Cannot delete a non-existant player"));
-	}
-
-	//TODO: remove the deleted player from the database?
-
-	//prep the delete packet
-	SerialPacket delPacket;
-	delPacket.meta.type = SerialPacket::Type::PLAYER_DELETE;
-
-	//delete the specified playerEntry
-	erase_if(playerMap, [&](std::pair<unsigned int, PlayerEntry> it) -> bool {
-		//find the specified PlayerEntry
-		if (it.first == packet.playerInfo.playerIndex) {
-			//send to all
-			delPacket.playerInfo.playerIndex = it.first;
-			PumpPacket(delPacket);
-
-			//delete this player
-			return true;
-		}
-		//skip this player
-		return false;
-	});
-}
-
-void ServerApplication::HandlePlayerUpdate(SerialPacket packet) {
-	if (playerMap.find(packet.playerInfo.playerIndex) == playerMap.end()) {
-		throw(std::runtime_error("Cannot update a non-existant player"));
-	}
-
-	//TODO: the server needs it's own movement system too
-	playerMap[packet.playerInfo.playerIndex].position = packet.playerInfo.position;
-	playerMap[packet.playerInfo.playerIndex].motion = packet.playerInfo.motion;
-
-	PumpPacket(packet);
-}
-
-void ServerApplication::HandleRegionRequest(SerialPacket packet) {
-	char buffer[PACKET_BUFFER_SIZE];
-	packet.meta.type = SerialPacket::Type::REGION_CONTENT;
-	packet.regionInfo.region = regionPager.GetRegion(packet.regionInfo.x, packet.regionInfo.y);
-	serialize(&packet, buffer);
-	network.Send(&packet.meta.srcAddress, buffer, PACKET_BUFFER_SIZE);
-}
-
-void ServerApplication::PumpPacket(SerialPacket packet) {
-	//I don't really like this, but it'll do for now
-	char buffer[PACKET_BUFFER_SIZE];
-	serialize(&packet, buffer);
-	for (auto& it : clientMap) {
-		network.Send(&it.second.address, buffer, PACKET_BUFFER_SIZE);
-	}
-}

server/server_application.hpp

@@ -23,9 +23,9 @@
 #define SERVERAPPLICATION_HPP_
 
 //server specific stuff
-#include "server_utility.hpp"
+#include "client_data.hpp"
-#include "client_entry.hpp"
+#include "account_data.hpp"
-#include "player_entry.hpp"
+#include "character_data.hpp"
 
 //maps
 #include "map_allocator.hpp"
@@ -48,6 +48,7 @@
 
 //STL
 #include <map>
+#include <string>
 
 //The main application class
 class ServerApplication {
@@ -63,19 +64,34 @@ public:
 private:
 	void HandlePacket(SerialPacket);
 
-	//high cohesion utility functions
+	//handle incoming traffic
 	void HandleBroadcastRequest(SerialPacket);
 	void HandleJoinRequest(SerialPacket);
-	void HandleDisconnect(SerialPacket);
 	void HandleSynchronize(SerialPacket);
+	void HandleDisconnect(SerialPacket);
 	void HandleShutdown(SerialPacket);
-	void HandlePlayerNew(SerialPacket);
+	void HandleCharacterUpdate(SerialPacket);
-	void HandlePlayerDelete(SerialPacket);
-	void HandlePlayerUpdate(SerialPacket);
 	void HandleRegionRequest(SerialPacket);
 
-	//TODO: a function that only sends to players in a certain proximity
+	//TODO: a function that only sends to characters in a certain proximity
 	void PumpPacket(SerialPacket);
+	void PumpCharacterUnload(int uid);
+
+	//Account management
+	int CreateUserAccount(std::string username, int clientIndex);
+	int LoadUserAccount(std::string username, int clientIndex);
+	int SaveUserAccount(int uid);
+	void UnloadUserAccount(int uid);
+	void DeleteUserAccount(int uid);
+
+	//TODO: character management
+	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);
+
+	//TODO: combat systems
 
 	//APIs
 	UDPNetworkUtility network;
@@ -83,11 +99,13 @@ private:
 	lua_State* luaState = nullptr;
 
 	//server tables
-	std::map<unsigned int, ClientEntry> clientMap;
+	std::map<int, ClientData> clientMap;
-	std::map<unsigned int, PlayerEntry> playerMap;
+	std::map<int, AccountData> accountMap;
+	std::map<int, CharacterData> characterMap;
 
 	//maps
 	//TODO: I need to handle multiple map objects
+	//TODO: Unload regions that are distant from any characters
 	RegionPager<LuaAllocator, LuaFormat> regionPager;
 
 	//misc

server/server_connections.cpp

@@ -0,0 +1,196 @@
+/* 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 "server_application.hpp"
+
+#include <stdexcept>
+#include <iostream>
+
+//-------------------------
+//Handle various network input
+//-------------------------
+
+void ServerApplication::HandleBroadcastRequest(SerialPacket packet) {
+	//pack the server's data
+	packet.meta.type = SerialPacket::Type::BROADCAST_RESPONSE;
+	packet.serverInfo.networkVersion = NETWORK_VERSION;
+	snprintf(packet.serverInfo.name, PACKET_STRING_SIZE, "%s", config["server.name"].c_str());
+	packet.serverInfo.playerCount = characterMap.size();
+
+	//bounce this packet
+	char buffer[PACKET_BUFFER_SIZE];
+	serialize(&packet, buffer);
+	network.Send(&packet.meta.srcAddress, buffer, PACKET_BUFFER_SIZE);
+}
+
+void ServerApplication::HandleJoinRequest(SerialPacket packet) {
+	//create the new client
+	ClientData newClient;
+	newClient.address = packet.meta.srcAddress;
+
+	//load the user account
+	int accountIndex = LoadUserAccount(packet.clientInfo.username, ClientData::uidCounter);
+	if (accountIndex < 0) {
+		//TODO: send rejection packet
+		std::cerr << "Error: Account already loaded: " << accountIndex << std::endl;
+		return;
+	}
+
+	//load the new character
+	int characterIndex = LoadCharacter(accountIndex, packet.clientInfo.handle, packet.clientInfo.avatar);
+	if (characterIndex < 0) {
+		//TODO: send rejection packet
+		std::cerr << "Error: Character already loaded: " << characterIndex << std::endl;
+		UnloadUserAccount(accountIndex);
+		return;
+	}
+
+	//send the client their info
+	packet.meta.type = SerialPacket::Type::JOIN_RESPONSE;
+	packet.clientInfo.clientIndex = ClientData::uidCounter;
+	packet.clientInfo.accountIndex = accountIndex;
+	packet.clientInfo.characterIndex = characterIndex;
+
+	//bounce this packet
+	char buffer[PACKET_BUFFER_SIZE];
+	serialize(&packet, buffer);
+	network.Send(&newClient.address, buffer, PACKET_BUFFER_SIZE);
+
+	//send the new character to all clients
+	packet.meta.type = SerialPacket::Type::CHARACTER_NEW;
+	packet.characterInfo.characterIndex = characterIndex;
+	strncpy(packet.characterInfo.handle, characterMap[characterIndex].handle.c_str(), PACKET_STRING_SIZE);
+	strncpy(packet.characterInfo.avatar, characterMap[characterIndex].avatar.c_str(), PACKET_STRING_SIZE);
+	packet.characterInfo.position = characterMap[characterIndex].position;
+	packet.characterInfo.motion = characterMap[characterIndex].motion;
+	PumpPacket(packet);
+
+	//TODO: don't send anything to a certain client until they send the OK (the sync packet? or ignore client side?)
+	//finished this routine
+	clientMap[ClientData::uidCounter++] = newClient;
+	std::cout << "Connect, total: " << clientMap.size() << std::endl;
+}
+
+void ServerApplication::HandleSynchronize(SerialPacket packet) {
+	//TODO: compensate for large distances
+
+	//send all the server's data to this client
+	SerialPacket newPacket;
+	char buffer[PACKET_BUFFER_SIZE];
+
+	//characters
+	newPacket.meta.type = SerialPacket::Type::CHARACTER_UPDATE;
+	for (auto& it : characterMap) {
+		//TODO: update this for the expanded CharacterData structure
+		newPacket.characterInfo.characterIndex = it.first;
+		snprintf(newPacket.characterInfo.handle, PACKET_STRING_SIZE, "%s", it.second.handle.c_str());
+		snprintf(newPacket.characterInfo.avatar, PACKET_STRING_SIZE, "%s", it.second.avatar.c_str());
+		newPacket.characterInfo.mapIndex = it.second.mapIndex;
+		newPacket.characterInfo.position = it.second.position;
+		newPacket.characterInfo.motion = it.second.motion;
+		serialize(&newPacket, buffer);
+		network.Send(&clientMap[packet.clientInfo.clientIndex].address, buffer, PACKET_BUFFER_SIZE);
+	}
+}
+
+void ServerApplication::HandleDisconnect(SerialPacket packet) {
+	//TODO: authenticate who is disconnecting/kicking
+
+	//forward to the specified client
+	char buffer[PACKET_BUFFER_SIZE];
+	serialize(&packet, buffer);
+	network.Send(&clientMap[accountMap[packet.clientInfo.accountIndex].clientIndex].address, buffer, PACKET_BUFFER_SIZE);
+
+	//unload client and server-side characters
+	for (std::map<int, CharacterData>::iterator it = characterMap.begin(); it != characterMap.end(); /* EMPTY */ ) {
+		if (it->second.owner == packet.clientInfo.accountIndex) {
+			PumpCharacterUnload(it->first);
+			SaveCharacter(it->first);
+			it = characterMap.erase(it); //efficient
+			continue;
+		}
+		else {
+			++it;
+		}
+	}
+
+	//erase the in-memory stuff
+	clientMap.erase(accountMap[packet.clientInfo.accountIndex].clientIndex);
+	UnloadUserAccount(packet.clientInfo.accountIndex);
+
+	//finished this routine
+	std::cout << "Disconnect, total: " << clientMap.size() << std::endl;
+}
+
+void ServerApplication::HandleShutdown(SerialPacket packet) {
+	//TODO: authenticate who is shutting the server down
+
+	//end the server
+	running = false;
+
+	//disconnect all clients
+	packet.meta.type = SerialPacket::Type::DISCONNECT;
+	PumpPacket(packet);
+
+	//finished this routine
+	std::cout << "Shutdown signal accepted" << std::endl;
+}
+
+void ServerApplication::HandleCharacterUpdate(SerialPacket packet) {
+	//TODO: this should be moved elsewhere
+	if (characterMap.find(packet.characterInfo.characterIndex) == characterMap.end()) {
+		throw(std::runtime_error("Cannot update a non-existant character"));
+	}
+
+	//TODO: the server needs it's own movement system too
+	characterMap[packet.characterInfo.characterIndex].position = packet.characterInfo.position;
+	characterMap[packet.characterInfo.characterIndex].motion = packet.characterInfo.motion;
+
+	PumpPacket(packet);
+}
+
+void ServerApplication::HandleRegionRequest(SerialPacket packet) {
+	//TODO: this should be moved elsewhere
+	packet.meta.type = SerialPacket::Type::REGION_CONTENT;
+	packet.regionInfo.region = regionPager.GetRegion(packet.regionInfo.x, packet.regionInfo.y);
+
+	//send the content
+	char buffer[PACKET_BUFFER_SIZE];
+	serialize(&packet, buffer);
+	network.Send(&packet.meta.srcAddress, buffer, PACKET_BUFFER_SIZE);
+}
+
+void ServerApplication::PumpPacket(SerialPacket packet) {
+	//NOTE: I don't really like this, but it'll do for now
+	char buffer[PACKET_BUFFER_SIZE];
+	serialize(&packet, buffer);
+	for (auto& it : clientMap) {
+		network.Send(&it.second.address, buffer, PACKET_BUFFER_SIZE);
+	}
+}
+
+void ServerApplication::PumpCharacterUnload(int uid) {
+	//delete the client-side character(s)
+	SerialPacket delPacket;
+	delPacket.meta.type = SerialPacket::Type::CHARACTER_DELETE;
+	delPacket.characterInfo.characterIndex = uid;
+	PumpPacket(delPacket);
+}

server/server_internals.cpp

@@ -0,0 +1,201 @@
+/* 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 "server_application.hpp"
+
+#include "sql_utility.hpp"
+
+#include <stdexcept>
+#include <iostream>
+#include <string>
+
+//-------------------------
+//Define the various UIDs
+//-------------------------
+
+int ClientData::uidCounter = 0;
+
+//-------------------------
+//Define the public members
+//-------------------------
+
+void ServerApplication::Init(int argc, char** argv) {
+	//NOTE: I might need to rearrange the init process so that lua & SQL can interact with the map system as needed.
+	std::cout << "Beginning startup" << std::endl;
+
+	//initial setup
+	config.Load("rsc\\config.cfg");
+
+	//-------------------------
+	//Initialize the APIs
+	//-------------------------
+
+	//Init SDL
+	if (SDL_Init(0)) {
+		throw(std::runtime_error("Failed to initialize SDL"));
+	}
+	std::cout << "Initialized SDL" << std::endl;
+
+	//Init SDL_net
+	if (SDLNet_Init()) {
+		throw(std::runtime_error("Failed to initialize SDL_net"));
+	}
+	network.Open(config.Int("server.port"), PACKET_BUFFER_SIZE);
+	std::cout << "Initialized SDL_net" << std::endl;
+
+	//Init SQL
+	int ret = sqlite3_open_v2(config["server.dbname"].c_str(), &database, SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE, nullptr);
+	if (ret != SQLITE_OK || !database) {
+		throw(std::runtime_error(std::string() + "Failed to initialize SQL: " + sqlite3_errmsg(database) ));
+	}
+	std::cout << "Initialized SQL" << std::endl;
+
+	//Init lua
+	luaState = luaL_newstate();
+	if (!luaState) {
+		throw(std::runtime_error("Failed to initialize lua"));
+	}
+	luaL_openlibs(luaState);
+	std::cout << "Initialized lua" << std::endl;
+
+	//-------------------------
+	//Setup the objects
+	//-------------------------
+
+	//setup the map object
+	regionPager.GetAllocator()->SetLuaState(luaState);
+	regionPager.GetFormat()->SetLuaState(luaState);
+	//TODO: config parameter
+	regionPager.GetFormat()->SetSaveDir("save/mapname/");
+	std::cout << "Prepared the map system" << std::endl;
+
+	//push the pager onto the lua registry
+	lua_pushstring(luaState, "pager");
+	lua_pushlightuserdata(luaState, reinterpret_cast<void*>(&regionPager));
+	lua_settable(luaState, LUA_REGISTRYINDEX);
+	std::cout << "Registered the map system in lua" << std::endl;
+
+	//-------------------------
+	//Run the startup scripts
+	//-------------------------
+
+	//setup the database
+	if (runSQLScript(database, config["dir.scripts"] + "setup_server.sql")) {
+		throw(std::runtime_error("Failed to initialize SQL's setup script"));
+	}
+	std::cout << "Completed SQL's setup script" << std::endl;
+
+	//run lua's startup script
+	if (luaL_dofile(luaState, (config["dir.scripts"] + "setup_server.lua").c_str())) {
+		throw(std::runtime_error(std::string() + "Failed to initialize lua's setup script: " + lua_tostring(luaState, -1) ));
+	}
+	std::cout << "Completed lua's setup script" << std::endl;
+
+	//debug output
+	std::cout << "Internal sizes:" << std::endl;
+	std::cout << "\tsizeof(SerialPacket): " << sizeof(SerialPacket) << std::endl;
+	std::cout << "\tPACKET_BUFFER_SIZE: " << PACKET_BUFFER_SIZE << std::endl;
+
+	//finalize the startup
+	std::cout << "Startup completed successfully" << std::endl;
+
+	//debugging
+	//
+}
+
+void ServerApplication::Proc() {
+	SerialPacket packet;
+	while(running) {
+		//suck in the waiting packets & process them
+		while(network.Receive()) {
+			//get the packet
+			deserialize(&packet, network.GetInData());
+			//cache the source address
+			packet.meta.srcAddress = network.GetInPacket()->address;
+			//we need to go deeper
+			HandlePacket(packet);
+		}
+		//update the internals
+		//TODO: update the internals i.e. player positions
+		//give the computer a break
+		SDL_Delay(10);
+	}
+}
+
+void ServerApplication::Quit() {
+	std::cout << "Shutting down" << std::endl;
+
+	//save the server state
+	for (auto& it : accountMap) {
+		SaveUserAccount(it.first);
+	}
+	for (auto& it : characterMap) {
+		SaveCharacter(it.first);
+	}
+
+	//empty the members
+	accountMap.clear();
+	characterMap.clear();
+	regionPager.UnloadAll();
+
+	//APIs
+	lua_close(luaState);
+	sqlite3_close_v2(database);
+	network.Close();
+	SDLNet_Quit();
+	SDL_Quit();
+
+	std::cout << "Shutdown finished" << std::endl;
+}
+
+//-------------------------
+//Define the uber switch
+//-------------------------
+
+void ServerApplication::HandlePacket(SerialPacket packet) {
+	switch(packet.meta.type) {
+		case SerialPacket::Type::BROADCAST_REQUEST:
+			HandleBroadcastRequest(packet);
+		break;
+		case SerialPacket::Type::JOIN_REQUEST:
+			HandleJoinRequest(packet);
+		break;
+		case SerialPacket::Type::SYNCHRONIZE:
+			HandleSynchronize(packet);
+		break;
+		case SerialPacket::Type::DISCONNECT:
+			HandleDisconnect(packet);
+		break;
+		case SerialPacket::Type::SHUTDOWN:
+			HandleShutdown(packet);
+		break;
+		case SerialPacket::Type::CHARACTER_UPDATE:
+			HandleCharacterUpdate(packet);
+		break;
+		case SerialPacket::Type::REGION_REQUEST:
+			HandleRegionRequest(packet);
+		break;
+		//handle errors
+		default:
+			throw(std::runtime_error("Unknown SerialPacket::Type encountered"));
+		break;
+	}
+}

todo.txt

@@ -0,0 +1,39 @@
+* I need to keep the documentation up to date. Namely, the GDD is getting out of date.
+* How many lookups is the map system using?
+* Add the serial packet to the network utility
+
+--Naming conventions--
+
+I need to define the differences between several different terms i.e. naming conventions.
+I may also need to rewrite some variable names.
+
+* User: This is the individual who is playing the game
+* Player: A synonym for a user
+* Character: This is the actual player character in the game
+* Username: This is the name of the player; ususally kept private
+* Handle: This is the name of a character
+* Avatar: This is the name of the sprite used by a character
+
+--ServerApplication's methods--
+
+These interact with the database file, making the server a persistent system.
+
+* CreateUserAccount
+* LoadUserAccount
+* SaveUserAccount
+* UnloadUserAccount
+* DeleteUserAccount
+
+* CreateCharacter
+* LoadCharacter
+* SaveCharacter
+* UnloadCharacter
+* DeleteCharacter
+
+--Battle System--
+
+CombatPortal:
+	x, y
+	list<Character>
+	list<Monster>
+	//...