Wrote a simple passive timer for debugging

After a few days of work, I'm committing what i've done so far. Mostly
I've cherry picked the best parts of the multiplayer branch's modules, and
adapted them for use here. I've written a few new components, and I've
learnt a few things along the way. I may continue with this branch for a
while, before moving the changes into the main branch. Alternatively, it
might turn out that this single player version is more fun. We'll see.

I've swapped the config system for a pure lua version instead. This is
actually fairly flexible. I've also changed the map system and it's API a
great deal. The tile sheet can be loaded from lua, and the save directory
isn't hard coded anymore. I think this would be a good testbed for a lot
of different systems, including the collision system, however the current
system (using vectors) is inadequate. I'll have to dig up the old BBox,
possilby.

This branch will piggy back on the main repo for a while.

.gitignore

@@ -1,21 +0,0 @@
-#Editor generated files
-*.sln
-*.vcproj
-*.suo
-*.ncb
-*.user
-
-#Directories
-Release/
-Debug/
-Out/
-
-#Project generated files
-*.db
-*.o
-*.a
-*.exe
-
-#Shell files
-*.bat
-*.sh

README.md

@@ -1,31 +0,0 @@
-The most recent stable windows build can be found [here](https://dl.dropboxusercontent.com/u/46669050/Tortuga.rar).
-
-Tortuga is an open source 2D multiplayer role playing game featuring permadeath (deletion of a character upon death). The emphasis of this game is on multiplayer cooperation, competition, exploration and customization. The game runs on customizable server software that can support up to 150 simultaneous players or more.
-
-This game is inspired by classic 2D RPGs, as well as more modern sandbox MMOs. This project is currently independently created and funded, with the goal of creating a game that will engage user's imagination and inspire a large modding community.
-
-## External Dependencies
-
-* [SDL 1.6](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
-
-## Documentation
-
-[Tortuga Game Design Document](https://github.com/Ratstail91/Tortuga/blob/docs/design%20doc.docx?raw=true)  
-[Tortuga Technical Document](https://github.com/Ratstail91/Tortuga/blob/docs/technical%20doc.docx?raw=true)
-
-## Copyright
-
-The current version of Tortuga is released under the [zlib license](http://en.wikipedia.org/wiki/Zlib_License).  
-
-Copyright (c) 2013, 2014 Kayne Ruse
-
-This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.

client/channels.hpp

@@ -1,8 +0,0 @@
-#ifndef CHANNELS_HPP_
-#define CHANNELS_HPP_
-
-enum Channels {
-	SERVER = 0
-};
-
-#endif

client/client_application.hpp

@@ -1,52 +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 CLIENTAPPLICATION_HPP_
-#define CLIENTAPPLICATION_HPP_
-
-#include "scene_list.hpp"
-#include "base_scene.hpp"
-
-#include "config_utility.hpp"
-#include "udp_network_utility.hpp"
-
-class ClientApplication {
-public:
-	ClientApplication() = default;
-	~ClientApplication() = default;
-
-	void Init(int argc, char** argv);
-	void Proc();
-	void Quit();
-
-private:
-	//Private access members
-	void LoadScene(SceneList sceneIndex);
-	void UnloadScene();
-
-	BaseScene* activeScene = nullptr;
-
-	ConfigUtility config;
-	UDPNetworkUtility network;
-	int clientIndex = -1; //replace with a struct?
-};
-
-#endif

client/makefile

@@ -1,44 +0,0 @@
-#config
-INCLUDES+=. scenes ../common ../common/graphics ../common/map ../common/network ../common/ui
-LIBS+=libclient.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
-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)/,client)
-
-#targets
-all: $(OBJ) $(OUT)
-	$(MAKE) -C scenes
-	$(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

client/player_character.cpp

@@ -1,117 +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 "player_character.hpp"
-
-#define WALKING_SPEED 140
-
-void PlayerCharacter::Update(double delta) {
-	if (diagonal) {
-		constexpr double d = 1.0/sqrt(2);
-		position += motion * delta * d;
-	}
-	else {
-		position += motion * delta;
-	}
-	sprite.Update(delta);
-}
-
-void PlayerCharacter::AdjustDirection(Direction direction) {
-	//shift the movement in this direction
-	switch(direction) {
-		case Direction::NORTH:
-			if (motion.y >= 0) {
-				motion.y -= WALKING_SPEED;
-			}
-		break;
-		case Direction::SOUTH:
-			if (motion.y <= 0) {
-				motion.y += WALKING_SPEED;
-			}
-		break;
-		case Direction::WEST:
-			if (motion.x >= 0) {
-				motion.x -= WALKING_SPEED;
-			}
-		break;
-		case Direction::EAST:
-			if (motion.x <= 0) {
-				motion.x += WALKING_SPEED;
-			}
-		break;
-	}
-	//face the correct direction
-	ResetDirection();
-}
-
-void PlayerCharacter::FaceDirection(Direction direction) {
-	//this function depends on the format of the sprite sheets
-	switch(direction) {
-		case Direction::NORTH:
-			sprite.SetYIndex(1);
-		break;
-		case Direction::SOUTH:
-			sprite.SetYIndex(0);
-		break;
-		case Direction::WEST:
-			sprite.SetYIndex(2);
-		break;
-		case Direction::EAST:
-			sprite.SetYIndex(3);
-		break;
-	}
-}
-
-void PlayerCharacter::ResetDirection() {
-	//base the direction on the character's movement
-	if (motion.y > 0) {
-		FaceDirection(Direction::SOUTH);
-	}
-	else if (motion.y < 0) {
-		FaceDirection(Direction::NORTH);
-	}
-	else if (motion.x > 0) {
-		FaceDirection(Direction::EAST);
-	}
-	else if (motion.x < 0) {
-		FaceDirection(Direction::WEST);
-	}
-	ResetSpeed();
-}
-
-void PlayerCharacter::ResetSpeed() {
-	//diagonal
-	if (motion.x != 0 && motion.y != 0) {
-		sprite.SetDelay(0.1);
-		diagonal = true;
-	}
-	//cardinal
-	else if (motion != 0) {
-		sprite.SetDelay(0.1);
-		diagonal = false;
-	}
-	//not moving
-	else {
-		sprite.SetDelay(0);
-		sprite.SetXIndex(0);
-		diagonal = false;
-	}
-}

client/scenes/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
-}

client/scenes/in_combat.cpp

@@ -1,82 +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 "in_combat.hpp"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-InCombat::InCombat() {
-	//
-}
-
-InCombat::~InCombat() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void InCombat::FrameStart() {
-	//
-}
-
-void InCombat::Update(double delta) {
-	//
-}
-
-void InCombat::FrameEnd() {
-	//
-}
-
-void InCombat::Render(SDL_Surface* const screen) {
-	//
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void InCombat::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	//
-}
-
-void InCombat::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void InCombat::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void InCombat::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			QuitEvent();
-			break;
-	}
-}
-
-void InCombat::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}

client/scenes/in_combat.hpp

@@ -1,48 +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 INCOMBAT_HPP_
-#define INCOMBAT_HPP_
-
-#include "base_scene.hpp"
-
-class InCombat : public BaseScene {
-public:
-	//Public access members
-	InCombat();
-	~InCombat();
-
-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&);
-};
-
-#endif

client/scenes/in_world.cpp

@@ -1,440 +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 "in_world.hpp"
-
-#include "channels.hpp"
-
-#include <algorithm>
-#include <cmath>
-#include <stdexcept>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-InWorld::InWorld(ConfigUtility* const argConfig, UDPNetworkUtility* const argNetwork, int* const argClientIndex):
-	config(*argConfig),
-	network(*argNetwork),
-	clientIndex(*argClientIndex)
-{
-	//setup the utility objects
-	buttonImage.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	buttonImage.SetClipH(buttonImage.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
-
-	//pass the utility objects
-	disconnectButton.SetImage(&buttonImage);
-	disconnectButton.SetFont(&font);
-	shutDownButton.SetImage(&buttonImage);
-	shutDownButton.SetFont(&font);
-
-	//set the button positions
-	disconnectButton.SetX(50);
-	disconnectButton.SetY(50 + buttonImage.GetClipH() * 0);
-	shutDownButton.SetX(50);
-	shutDownButton.SetY(50 + buttonImage.GetClipH() * 1);
-
-	//set the button texts
-	disconnectButton.SetText("Disconnect");
-	shutDownButton.SetText("Shut Down");
-
-	//load the tilesheet
-	//TODO: add the tilesheet to the map system?
-	tileSheet.Load(config["dir.tilesets"] + "terrain.bmp", 12, 15);
-
-	//create the server-side player object
-	//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
-	packet.meta.type = SerialPacket::Type::SYNCHRONIZE;
-	serialize(&packet, buffer);
-	network.Send(Channels::SERVER, buffer, PACKET_BUFFER_SIZE);
-
-	//debug
-//	RequestRegion(0, 0);
-}
-
-InWorld::~InWorld() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void InWorld::FrameStart() {
-	//
-}
-
-void InWorld::Update(double delta) {
-	SerialPacket packet;
-
-	//suck in all waiting packets
-	while(network.Receive()) {
-		deserialize(&packet, network.GetInData());
-		packet.meta.srcAddress = network.GetInPacket()->address;
-		HandlePacket(packet);
-	}
-
-	//update the characters
-	for (auto& it : playerCharacters) {
-		it.second.Update(delta);
-	}
-	//TODO: sort the players and entities by Y position
-
-	//update the camera
-	if(localCharacter) {
-		camera.x = localCharacter->GetPosition().x - camera.marginX;
-		camera.y = localCharacter->GetPosition().y - camera.marginY;
-	}
-
-	//check the map
-	UpdateMap();
-}
-
-void InWorld::FrameEnd() {
-	//
-}
-
-void InWorld::RenderFrame() {
-//	SDL_FillRect(GetScreen(), 0, 0);
-	Render(GetScreen());
-	SDL_Flip(GetScreen());
-}
-
-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);
-	}
-
-	//draw characters
-	for (auto& it : playerCharacters) {
-		it.second.DrawTo(screen, camera.x, camera.y);
-	}
-
-	//draw UI
-	disconnectButton.DrawTo(screen);
-	shutDownButton.DrawTo(screen);
-
-	font.DrawStringTo(to_string_custom(fps.GetFrameRate()), screen, 0, 0);
-
-	fps.Calculate();
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void InWorld::QuitEvent() {
-	//exit the game AND the server
-	RequestDisconnect();
-}
-
-void InWorld::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	disconnectButton.MouseMotion(motion);
-	shutDownButton.MouseMotion(motion);
-}
-
-void InWorld::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	disconnectButton.MouseButtonDown(button);
-	shutDownButton.MouseButtonDown(button);
-}
-
-void InWorld::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (disconnectButton.MouseButtonUp(button) == Button::State::HOVER) {
-		RequestDisconnect();
-	}
-	if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER) {
-		RequestShutDown();
-	}
-}
-
-void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE: {
-			QuitEvent();
-		}
-		break;
-
-		//player movement
-		case SDLK_LEFT:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::WEST);
-				SendState();
-			}
-		break;
-
-		case SDLK_RIGHT:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::EAST);
-				SendState();
-			}
-		break;
-
-		case SDLK_UP:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::NORTH);
-				SendState();
-			}
-		break;
-
-		case SDLK_DOWN:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::SOUTH);
-				SendState();
-			}
-		break;
-	}
-}
-
-void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		//player movement
-		case SDLK_LEFT:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::EAST);
-				SendState();
-			}
-		break;
-
-		case SDLK_RIGHT:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::WEST);
-				SendState();
-			}
-		break;
-
-		case SDLK_UP:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::SOUTH);
-				SendState();
-			}
-		break;
-
-		case SDLK_DOWN:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::NORTH);
-				SendState();
-			}
-		break;
-	}
-}
-
-//-------------------------
-//Network handlers
-//-------------------------
-
-void InWorld::HandlePacket(SerialPacket packet) {
-	switch(packet.meta.type) {
-		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;
-		//handle errors
-		default:
-			throw(std::runtime_error("Unknown SerialPacket::Type encountered"));
-		break;
-	}
-}
-
-void InWorld::HandleDisconnect(SerialPacket packet) {
-	network.Unbind(Channels::SERVER);
-	clientIndex = -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)) {
-		regionPager.UnloadRegion(packet.regionInfo.x, packet.regionInfo.y);
-	}
-	regionPager.PushRegion(packet.regionInfo.region);
-	packet.regionInfo.region = nullptr;
-}
-
-//-------------------------
-//Server control
-//-------------------------
-
-void InWorld::SendState() {
-	SerialPacket packet;
-	char buffer[PACKET_BUFFER_SIZE];
-
-	//pack the packet
-	packet.meta.type = SerialPacket::Type::PLAYER_UPDATE;
-	packet.playerInfo.clientIndex = clientIndex;
-	packet.playerInfo.playerIndex = playerIndex;
-	packet.playerInfo.position = localCharacter->GetPosition();
-	packet.playerInfo.motion = localCharacter->GetMotion();
-
-	serialize(&packet, buffer);
-	network.Send(Channels::SERVER, buffer, PACKET_BUFFER_SIZE);
-}
-
-void InWorld::RequestDisconnect() {
-	SerialPacket packet;
-	char buffer[PACKET_BUFFER_SIZE];
-
-	//send a disconnect request
-	packet.meta.type = SerialPacket::Type::DISCONNECT;
-	packet.clientInfo.index = clientIndex;
-	serialize(&packet, buffer);
-	network.Send(Channels::SERVER, buffer, PACKET_BUFFER_SIZE);
-}
-
-void InWorld::RequestShutDown() {
-	SerialPacket packet;
-	char buffer[PACKET_BUFFER_SIZE];
-
-	//send a shutdown request
-	packet.meta.type = SerialPacket::Type::SHUTDOWN;
-	packet.clientInfo.index = clientIndex;
-	serialize(&packet, buffer);
-	network.Send(Channels::SERVER, buffer, PACKET_BUFFER_SIZE);
-}
-
-void InWorld::RequestRegion(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.x = x;
-	packet.regionInfo.y = y;
-	serialize(&packet, buffer);
-	network.Send(Channels::SERVER, buffer, PACKET_BUFFER_SIZE);
-}
-
-//-------------------------
-//Utilities
-//-------------------------
-
-//TODO: convert this into a more generic function?; using parameters for the bounds
-void InWorld::UpdateMap() {
-	//these represent the zone of regions that the client needs loaded, including the mandatory buffers (+1/-1)
-	int xStart = snapToBase(REGION_WIDTH, camera.x/tileSheet.GetTileW()) - REGION_WIDTH;
-	int xEnd = snapToBase(REGION_WIDTH, (camera.x+camera.width)/tileSheet.GetTileW()) + REGION_WIDTH;
-
-	int yStart = snapToBase(REGION_HEIGHT, camera.y/tileSheet.GetTileH()) - REGION_HEIGHT;
-	int yEnd = snapToBase(REGION_HEIGHT, (camera.y+camera.height)/tileSheet.GetTileH()) + REGION_HEIGHT;
-
-	//prune distant regions
-	for (auto it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); /* EMPTY */) {
-		//check if the region is outside off this area
-		if ((*it)->GetX() < xStart || (*it)->GetX() > xEnd || (*it)->GetY() < yStart || (*it)->GetY() > yEnd) {
-
-			//clunky, but the alternative was time consuming
-			int tmpX = (*it)->GetX();
-			int tmpY = (*it)->GetY();
-			++it;
-
-			regionPager.UnloadRegion(tmpX, tmpY);
-			continue;
-		}
-		++it;
-	}
-
-	//request empty regions within this zone
-	for (int i = xStart; i <= xEnd; i += REGION_WIDTH) {
-		for (int j = yStart; j <= yEnd; j += REGION_HEIGHT) {
-			if (!regionPager.FindRegion(i, j)) {
-				RequestRegion(i, j);
-			}
-		}
-	}
-}

client/scenes/in_world.hpp

@@ -1,121 +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 INWORLD_HPP_
-#define INWORLD_HPP_
-
-//maps
-#include "map_allocator.hpp"
-#include "map_file_format.hpp"
-#include "region_pager.hpp"
-
-//networking
-#include "udp_network_utility.hpp"
-#include "serial_packet.hpp"
-#include "serial.hpp"
-
-//graphics
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-#include "tile_sheet.hpp"
-
-//common
-#include "config_utility.hpp"
-#include "frame_rate.hpp"
-
-//client
-#include "base_scene.hpp"
-#include "player_character.hpp"
-
-//STL
-#include <map>
-
-class InWorld : public BaseScene {
-public:
-	//Public access members
-	InWorld(ConfigUtility* const, UDPNetworkUtility* const, int* const);
-	~InWorld();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update(double delta);
-	void FrameEnd();
-	void RenderFrame();
-	void Render(SDL_Surface* const);
-
-	//Event handlers
-	void QuitEvent();
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
-	void KeyDown(SDL_KeyboardEvent const&);
-	void KeyUp(SDL_KeyboardEvent const&);
-
-	//Network handlers
-	void HandlePacket(SerialPacket);
-	void HandleDisconnect(SerialPacket);
-	void HandlePlayerNew(SerialPacket);
-	void HandlePlayerDelete(SerialPacket);
-	void HandlePlayerUpdate(SerialPacket);
-	void HandleRegionContent(SerialPacket);
-
-	//Server control
-	void SendState();
-	void RequestDisconnect();
-	void RequestShutDown();
-	void RequestRegion(int x, int y);
-
-	//utilities
-	void UpdateMap();
-
-	//globals
-	ConfigUtility& config;
-	FrameRate fps;
-	UDPNetworkUtility& network;
-	int& clientIndex;
-
-	//graphics
-	Image buttonImage;
-	RasterFont font;
-	TileSheet tileSheet;
-
-	//map
-	RegionPager<BlankAllocator, DummyFormat> regionPager;
-
-	//UI
-	Button disconnectButton;
-	Button shutDownButton;
-	//TODO: Fix the camera
-	struct {
-		int x = 0, y = 0;
-		int width = 0, height = 0;
-		int marginX = 0, marginY = 0;
-	} camera;
-
-	//game
-	std::map<int, PlayerCharacter> playerCharacters;
-	PlayerCharacter* localCharacter = nullptr;
-	int playerIndex = -1;
-};
-
-#endif

client/scenes/lobby_menu.cpp

@@ -1,229 +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 "lobby_menu.hpp"
-
-#include "channels.hpp"
-#include "utility.hpp"
-
-#include <stdexcept>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-LobbyMenu::LobbyMenu(ConfigUtility* const argConfig, UDPNetworkUtility* const argNetwork, int* const argClientIndex):
-	config(*argConfig),
-	network(*argNetwork),
-	clientIndex(*argClientIndex)
-{
-	//setup the utility objects
-	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
-
-	//pass the utility objects
-	search.SetImage(&image);
-	search.SetFont(&font);
-	join.SetImage(&image);
-	join.SetFont(&font);
-	back.SetImage(&image);
-	back.SetFont(&font);
-
-	//set the button positions
-	search.SetX(50);
-	search.SetY(50 + image.GetClipH() * 0);
-	join.SetX(50);
-	join.SetY(50 + image.GetClipH() * 1);
-	back.SetX(50);
-	back.SetY(50 + image.GetClipH() * 2);
-
-	//set the button texts
-	search.SetText("Search");
-	join.SetText("Join");
-	back.SetText("Back");
-
-	//set the server list's position
-	listBox = {300, 50, 200, font.GetCharH()};
-}
-
-LobbyMenu::~LobbyMenu() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void LobbyMenu::FrameStart() {
-	//
-}
-
-void LobbyMenu::Update(double delta) {
-	//suck in all waiting packets
-	SerialPacket packet;
-	while(network.Receive()) {
-		deserialize(&packet, network.GetInData());
-		packet.meta.srcAddress = network.GetInPacket()->address;
-		HandlePacket(packet);
-	}
-}
-
-void LobbyMenu::FrameEnd() {
-	//
-}
-
-void LobbyMenu::Render(SDL_Surface* const screen) {
-	//TODO: I need a proper UI system for the entire client and the editor
-	//UI
-	search.DrawTo(screen);
-	join.DrawTo(screen);
-	back.DrawTo(screen);
-
-	//TODO: draw headers for the server list
-	for (int i = 0; i < serverInfo.size(); i++) {
-		//draw the selected server's highlight
-		if (selection == &serverInfo[i]) {
-			SDL_Rect r = listBox;
-			r.y += i * listBox.h;
-			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 255, 127, 39));
-		}
-
-		//draw the server name
-		font.DrawStringTo(serverInfo[i].name, screen, listBox.x, listBox.y + i*listBox.h);
-
-		//draw the player count
-		font.DrawStringTo(to_string_custom(serverInfo[i].playerCount), screen, listBox.x + listBox.w, listBox.y + i*listBox.h);
-
-		//compatible?
-		if (!serverInfo[i].compatible) {
-			font.DrawStringTo("?", screen, listBox.x - font.GetCharW(), listBox.y + i*listBox.h);
-		}
-
-		//TODO: ping?
-	}
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void LobbyMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	search.MouseMotion(motion);
-	join.MouseMotion(motion);
-	back.MouseMotion(motion);
-}
-
-void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	search.MouseButtonDown(button);
-	join.MouseButtonDown(button);
-	back.MouseButtonDown(button);
-}
-
-void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (search.MouseButtonUp(button) == Button::State::HOVER) {
-		//the vars
-		SerialPacket packet;
-		char buffer[PACKET_BUFFER_SIZE];
-
-		//broadcast to the network, or a specific server
-		packet.meta.type = SerialPacket::Type::BROADCAST_REQUEST;
-		serialize(&packet, buffer);
-		network.Send(config["server.host"].c_str(), config.Int("server.port"), buffer, PACKET_BUFFER_SIZE);
-
-		//reset the server list
-		serverInfo.clear();
-		selection = nullptr;
-	}
-
-	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
-		packet.meta.type = SerialPacket::Type::JOIN_REQUEST;
-		serialize(&packet, buffer);
-		network.Send(&selection->address, buffer, PACKET_BUFFER_SIZE);
-		selection = nullptr;
-	}
-
-	else if (back.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::MAINMENU);
-	}
-
-	else if (
-		//has the user selected a server on the list?
-		button.x > listBox.x &&
-		button.x < listBox.x + listBox.w &&
-		button.y > listBox.y &&
-		button.y < listBox.y + listBox.h * serverInfo.size()
-		) {
-		selection = &serverInfo[(button.y - listBox.y)/listBox.h];
-	}
-	else {
-		selection = nullptr;
-	}
-}
-
-void LobbyMenu::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			SetNextScene(SceneList::MAINMENU);
-		break;
-	}
-}
-
-void LobbyMenu::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}
-
-void LobbyMenu::HandlePacket(SerialPacket packet) {
-		switch(packet.meta.type) {
-		case SerialPacket::Type::BROADCAST_RESPONSE: {
-			//extract the data
-			ServerInformation server;
-			server.address = packet.meta.srcAddress;
-			server.name = packet.serverInfo.name;
-			server.playerCount = packet.serverInfo.playerCount;
-
-			//NOTE: Check compatibility here
-			server.compatible = packet.serverInfo.regionWidth == REGION_WIDTH &&
-				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;
-			network.Bind(&packet.meta.srcAddress, Channels::SERVER);
-			SetNextScene(SceneList::INWORLD);
-		break;
-
-		//handle errors
-		default:
-			throw(std::runtime_error("Unknown SerialPacket::Type encountered"));
-		break;
-	}
-}

client/scenes/lobby_menu.hpp

@@ -1,96 +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 LOBBYMENU_HPP_
-#define LOBBYMENU_HPP_
-
-//graphics & utilities
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-#include "config_utility.hpp"
-
-//map
-#include "region.hpp"
-
-//network
-#include "udp_network_utility.hpp"
-#include "serial_packet.hpp"
-#include "serial.hpp"
-
-//client
-#include "base_scene.hpp"
-
-//STL
-#include <vector>
-
-class LobbyMenu : public BaseScene {
-public:
-	//Public access members
-	LobbyMenu(ConfigUtility* const, UDPNetworkUtility* const, int* const);
-	~LobbyMenu();
-
-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&);
-
-	void HandlePacket(SerialPacket);
-
-	//global
-	ConfigUtility& config;
-	UDPNetworkUtility& network;
-	int& clientIndex;
-
-	//members
-	Image image;
-	RasterFont font;
-	Button search;
-	Button join;
-	Button back;
-
-	//server list
-	struct ServerInformation {
-		IPaddress address;
-		//TODO: version info
-		std::string name;
-		int playerCount;
-		bool compatible;
-	};
-
-	std::vector<ServerInformation> serverInfo;
-
-	//a terrible hack, forgive me
-	//I'd love a proper gui system for this
-	SDL_Rect listBox;
-	ServerInformation* selection = nullptr;
-};
-
-#endif

client/scenes/makefile

@@ -1,43 +0,0 @@
-#config
-INCLUDES+=. .. ../../common ../../common/graphics ../../common/map ../../common/network ../../common/ui
-LIBS+=
-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=$(addprefix $(OUTDIR)/,libclient.a)
-
-#targets
-all: $(OBJ) $(OUT)
-	ar -crs $(OUT) $(OBJ)
-
-$(OBJ): | $(OBJDIR)
-
-$(OUT): | $(OUTDIR)
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-$(OUTDIR):
-	mkdir $(OUTDIR)
-
-$(OBJDIR)/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all

common/config_utility.cpp

@@ -1,105 +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 "config_utility.hpp"
-
-#include <cstdlib>
-#include <fstream>
-#include <stdexcept>
-
-using namespace std;
-
-void ConfigUtility::Load(string fname) {
-	ifstream is(fname);
-
-	if (!is.is_open()) {
-		throw(runtime_error("Failed to open config file"));
-	}
-
-	string key, val;
-
-	for (;;) { //forever
-		//eat whitespace
-		while(isspace(is.peek()))
-			is.ignore();
-
-		//end of file
-		if (is.eof())
-			break;
-
-		//skip comment lines
-		if (is.peek() == '#') {
-			while(is.peek() != '\n' && !is.eof()) {
-				is.ignore();
-			}
-			continue;
-		}
-
-		//read in the pair
-		getline(is, key,'=');
-		getline(is, val);
-
-		//trim the strings at the start & end
-		while(key.size() && isspace(*key.begin())) key.erase(0, 1);
-		while(val.size() && isspace(*val.begin())) val.erase(0, 1);
-
-		while(key.size() && isspace(*(key.end()-1))) key.erase(key.end() - 1);
-		while(val.size() && isspace(*(val.end()-1))) val.erase(val.end() - 1);
-
-		//allow empty/wiped values
-		if (key.size() == 0) {
-			continue;
-		}
-
-		//save the pair
-		table[key] = val;
-	}
-
-	is.close();
-}
-
-std::string& ConfigUtility::String(std::string s) {
-	return table[s];
-}
-
-int ConfigUtility::Integer(std::string s) {
-	std::map<std::string, std::string>::iterator it = table.find(s);
-	if (it == table.end()) {
-		return 0;
-	}
-	return atoi(it->second.c_str());
-}
-
-double ConfigUtility::Double(std::string s) {
-	std::map<std::string, std::string>::iterator it = table.find(s);
-	if (it == table.end()) {
-		return 0.0;
-	}
-	return atof(it->second.c_str());
-}
-
-bool ConfigUtility::Boolean(std::string s) {
-	std::map<std::string, std::string>::iterator it = table.find(s);
-	if (it == table.end()) {
-		return false;
-	}
-	return it->second == "true";
-}

common/config_utility.hpp

@@ -1,60 +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 CONFIGUTILITY_HPP_
-#define CONFIGUTILITY_HPP_
-
-#include <map>
-#include <string>
-
-class ConfigUtility {
-public:
-	ConfigUtility() = default;
-	ConfigUtility(std::string s) { Load(s); }
-
-	void Load(std::string fname);
-
-	//convert to a type
-	std::string& String(std::string);
-	int Integer(std::string);
-	double Double(std::string);
-	bool Boolean(std::string);
-
-	//shorthand
-	std::string& operator[](std::string s) {
-		return String(s);
-	}
-	int Int(std::string s) {
-		return Integer(s);
-	}
-	bool Bool(std::string s) {
-		return Boolean(s);
-	}
-
-	//OO breaker
-	std::map<std::string, std::string>* GetMap() {
-		return &table;
-	}
-private:
-	std::map<std::string, std::string> table;
-};
-
-#endif

common/map/map_allocator.cpp

@@ -1,60 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "map_allocator.hpp"
-
-#include <stdexcept>
-
-void BlankAllocator::Create(Region** const ptr, int x, int y) {
-	(*ptr) = new Region(x, y);
-}
-
-void BlankAllocator::Unload(Region* const ptr) {
-	delete ptr;
-}
-
-void LuaAllocator::Create(Region** const ptr, int x, int y) {
-	//something to work on
-	(*ptr) = new Region(x, y);
-
-	//API hook
-	lua_getglobal(state, "Region");
-	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) ));
-	}
-	lua_pop(state, 1);
-}
-
-void LuaAllocator::Unload(Region* const ptr) {
-	//API hook
-	lua_getglobal(state, "Region");
-	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) ));
-	}
-	lua_pop(state, 1);
-
-	//clean up the memory
-	delete ptr;
-}

common/map/map_file_format.cpp

@@ -1,66 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "map_file_format.hpp"
-
-#include <stdexcept>
-
-void DummyFormat::Load(Region** const ptr, int x, int y) {
-	//EMPTY
-}
-
-void DummyFormat::Save(Region* const ptr) {
-	//EMPTY
-}
-
-void LuaFormat::Load(Region** const ptr, int x, int y) {
-	//something to load into
-
-	if (!(*ptr)) {
-		(*ptr) = new Region(x, y);
-	}
-
-	//API hook
-	lua_getglobal(state, "Region");
-	lua_getfield(state, -1, "Load");
-	lua_pushlightuserdata(state, *ptr);
-	lua_pushstring(state, saveDir.c_str());
-	if (lua_pcall(state, 2, 1, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));
-	}
-	if (lua_toboolean(state, -1) == false) {
-		delete (*ptr);
-		(*ptr) = nullptr;
-	}
-	lua_pop(state, 2);
-}
-
-void LuaFormat::Save(Region* const ptr) {
-	//API hook
-	lua_getglobal(state, "Region");
-	lua_getfield(state, -1, "Save");
-	lua_pushlightuserdata(state, ptr);
-	lua_pushstring(state, saveDir.c_str());
-	if (lua_pcall(state, 2, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));
-	}
-	lua_pop(state, 1);
-}

common/map/region_pager.hpp

@@ -1,133 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef REGIONPAGER_HPP_
-#define REGIONPAGER_HPP_
-
-#include "region.hpp"
-#include "utility.hpp"
-
-#include <list>
-
-class RegionPagerBase {
-public:
-	RegionPagerBase() {};
-	virtual ~RegionPagerBase() {};
-
-	//tile manipulation
-	Region::type_t SetTile(int x, int y, int z, Region::type_t v);
-	Region::type_t GetTile(int x, int y, int z);
-
-	//region manipulation
-	Region* GetRegion(int x, int y);
-	Region* FindRegion(int x, int y);
-	Region* PushRegion(Region*);
-
-	//interface
-	virtual Region* LoadRegion(int x, int y) = 0;
-	virtual Region* SaveRegion(int x, int y) = 0;
-	virtual Region* CreateRegion(int x, int y) = 0;
-	virtual void UnloadRegion(int x, int y) = 0;
-	//TODO: delete existing regions
-
-	//accessors & mutators
-	std::list<Region*>* GetContainer() { return &regionList; }
-protected:
-	std::list<Region*> regionList;
-};
-
-template<typename Allocator, typename FileFormat>
-class RegionPager : public RegionPagerBase {
-public:
-	RegionPager() {};
-	~RegionPager() {
-		UnloadAll();
-	}
-
-	Region* LoadRegion(int x, int y) {
-		//snap the coords
-		x = snapToBase(REGION_WIDTH, x);
-		y = snapToBase(REGION_HEIGHT, y);
-
-		//load the region if possible
-		Region* ptr = nullptr;
-		format.Load(&ptr, x, y);
-		if (ptr) {
-			return PushRegion(ptr);
-		}
-		return nullptr;
-	}
-
-	Region* SaveRegion(int x, int y) {
-		//snap the coords
-		x = snapToBase(REGION_WIDTH, x);
-		y = snapToBase(REGION_HEIGHT, y);
-
-		//find & save the region
-		Region* ptr = FindRegion(x, y);
-		if (ptr) {
-			format.Save(ptr);
-		}
-		return ptr;
-	}
-
-	Region* CreateRegion(int x, int y) {
-		//snap the coords
-		x = snapToBase(REGION_WIDTH, x);
-		y = snapToBase(REGION_HEIGHT, y);
-
-		//create and push the object
-		Region* ptr = nullptr;
-		allocator.Create(&ptr, x, y);
-		return PushRegion(ptr);
-	}
-
-	void UnloadRegion(int x, int y) {
-		//snap the coords
-		x = snapToBase(REGION_WIDTH, x);
-		y = snapToBase(REGION_HEIGHT, y);
-
-		//custom loop
-		for (std::list<Region*>::iterator it = regionList.begin(); it != regionList.end(); /* EMPTY */) {
-			if ((*it)->GetX() == x && (*it)->GetY() == y) {
-				allocator.Unload(*it);
-				it = regionList.erase(it);
-				continue;
-			}
-			++it;
-		}
-	}
-	void UnloadAll() {
-		for (auto& it : regionList) {
-			allocator.Unload(it);
-		}
-		regionList.clear();
-	}
-
-	//accessors
-	Allocator* GetAllocator() { return &allocator; }
-	FileFormat* GetFormat() { return &format; }
-protected:
-	Allocator allocator;
-	FileFormat format;
-};
-
-#endif

common/network/serial.cpp

@@ -1,303 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "serial.hpp"
-
-#include "map_allocator.hpp"
-
-#include <cstring>
-
-//-------------------------
-//internal serialization functions
-//-------------------------
-
-void serializeType(SerialPacket* packet, char* buffer) {
-	memcpy(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-}
-
-void serializeServer(SerialPacket* packet, char* buffer) {
-	memcpy(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-	buffer += sizeof(SerialPacket::Type);
-
-	//server info
-	//Note: version info serialization goes here
-	memcpy(buffer, packet->serverInfo.name, PACKET_STRING_SIZE);
-	buffer += PACKET_STRING_SIZE;
-	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));
-	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));
-	buffer += sizeof(int);
-	memcpy(buffer, &packet->playerInfo.playerIndex, sizeof(int));
-	buffer += sizeof(int);
-
-	//text
-	memcpy(buffer, packet->playerInfo.handle, PACKET_STRING_SIZE);
-	buffer += PACKET_STRING_SIZE;
-	memcpy(buffer, packet->playerInfo.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));
-	buffer += sizeof(SerialPacket::Type);
-
-	//x & y
-	memcpy(buffer, &packet->regionInfo.x, sizeof(int));
-	buffer += sizeof(int);
-	memcpy(buffer, &packet->regionInfo.y, sizeof(int));
-}
-
-void serializeRegionContent(SerialPacket* packet, char* buffer) {
-	//format
-	memcpy(buffer, &packet->meta.type, sizeof(SerialPacket::Type));
-	buffer += sizeof(SerialPacket::Type);
-
-	//x & y
-	*reinterpret_cast<int*>(buffer) = packet->regionInfo.region->GetX();
-	buffer += sizeof(int);
-	*reinterpret_cast<int*>(buffer) = packet->regionInfo.region->GetY();
-	buffer += sizeof(int);
-
-	//content
-	for (register int i = 0; i < REGION_WIDTH; i++) {
-		for (register int j = 0; j < REGION_HEIGHT; j++) {
-			for (register int k = 0; k < REGION_DEPTH; k++) {
-				*reinterpret_cast<Region::type_t*>(buffer) = packet->regionInfo.region->GetTile(i, j, k);
-				buffer += sizeof(Region::type_t);
-			}
-		}
-	}
-}
-
-//-------------------------
-//internal deserialization functions
-//-------------------------
-
-void deserializeType(SerialPacket* packet, char* buffer) {
-	memcpy(&packet->meta.type, buffer, sizeof(SerialPacket::Type));
-}
-
-void deserializeServer(SerialPacket* packet, char* buffer) {
-	memcpy(&packet->meta.type, buffer, sizeof(SerialPacket::Type));
-	buffer += sizeof(SerialPacket::Type);
-
-	//server info
-	//Note: version info deserialization goes here
-	memcpy(packet->serverInfo.name, buffer, PACKET_STRING_SIZE);
-	buffer += PACKET_STRING_SIZE;
-	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));
-	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));
-	buffer += sizeof(int);
-	memcpy(&packet->playerInfo.playerIndex, buffer, sizeof(int));
-	buffer += sizeof(int);
-
-	//text
-	memcpy(packet->playerInfo.handle, buffer, PACKET_STRING_SIZE);
-	buffer += PACKET_STRING_SIZE;
-	memcpy(packet->playerInfo.avatar, buffer, 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));
-	buffer += sizeof(SerialPacket::Type);
-
-	//x & y
-	memcpy(&packet->regionInfo.x, buffer, sizeof(int));
-	buffer += sizeof(int);
-	memcpy(&packet->regionInfo.y, buffer, sizeof(int));
-}
-
-void deserializeRegionContent(SerialPacket* packet, char* buffer) {
-	memcpy(&packet->meta.type, buffer, sizeof(SerialPacket::Type));
-	buffer += sizeof(SerialPacket::Type);
-
-	//x & y
-	memcpy(&packet->regionInfo.x, buffer, sizeof(int));
-	buffer += sizeof(int);
-	memcpy(&packet->regionInfo.y, buffer, sizeof(int));
-	buffer += sizeof(int);
-
-	//content
-	BlankAllocator().Create(
-		&packet->regionInfo.region,
-		packet->regionInfo.x,
-		packet->regionInfo.y
-	);
-
-	for (register int i = 0; i < REGION_WIDTH; i++) {
-		for (register int j = 0; j < REGION_HEIGHT; j++) {
-			for (register int k = 0; k < REGION_DEPTH; k++) {
-				packet->regionInfo.region->SetTile(i, j, k, *reinterpret_cast<Region::type_t*>(buffer));
-				buffer += sizeof(Region::type_t);
-			}
-		}
-	}
-}
-
-//-------------------------
-//the interface functions
-//-------------------------
-
-void serialize(SerialPacket* packet, void* buffer) {
-	switch(packet->meta.type) {
-		//No extra data
-		case SerialPacket::Type::NONE:
-		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;
-
-		//Server info
-		case SerialPacket::Type::BROADCAST_RESPONSE:
-			serializeServer(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//Client info
-		case SerialPacket::Type::JOIN_RESPONSE:
-		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));
-		break;
-
-		case SerialPacket::Type::REGION_CONTENT:
-			serializeRegionContent(packet, reinterpret_cast<char*>(buffer));
-		break;
-	}
-}
-
-void deserialize(SerialPacket* packet, void* buffer) {
-	//find the type, so that you can actually deserialize the packet!
-	deserializeType(packet, reinterpret_cast<char*>(buffer));
-	switch(packet->meta.type) {
-		//No extra data
-		case SerialPacket::Type::NONE:
-		case SerialPacket::Type::PING:
-		case SerialPacket::Type::PONG:
-		case SerialPacket::Type::BROADCAST_REQUEST:
-		case SerialPacket::Type::JOIN_REQUEST:
-		case SerialPacket::Type::SYNCHRONIZE:
-			//NOTHING
-		break;
-
-		//Server info
-		case SerialPacket::Type::BROADCAST_RESPONSE:
-			deserializeServer(packet, reinterpret_cast<char*>(buffer));
-		break;
-
-		//Client info
-		case SerialPacket::Type::JOIN_RESPONSE:
-		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));
-		break;
-
-		case SerialPacket::Type::REGION_CONTENT:
-			deserializeRegionContent(packet, reinterpret_cast<char*>(buffer));
-		break;
-	}
-}

common/network/serial.hpp

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

common/network/serial_packet.hpp

@@ -1,125 +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 SERIALPACKET_HPP_
-#define SERIALPACKET_HPP_
-
-#include "vector2.hpp"
-#include "region.hpp"
-
-#include "SDL/SDL_net.h"
-
-#define PACKET_STRING_SIZE 100
-
-#pragma pack(push, 0)
-
-union SerialPacket {
-	//types of packets
-	enum class Type {
-		//default: there is something wrong
-		NONE = 0,
-
-		//not used
-		PING = 1,
-		PONG = 2,
-
-		//Searching for a server to join
-		BROADCAST_REQUEST = 3,
-		BROADCAST_RESPONSE = 4,
-
-		//try to join the server
-		JOIN_REQUEST = 5,
-		JOIN_RESPONSE = 6,
-
-		//disconnect from the server
-		DISCONNECT = 7,
-
-		//mass update
-		SYNCHRONIZE = 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_CONTENT = 14,
-	};
-
-	//metadata on the packet itself
-	struct Metadata {
-		Type type;
-		IPaddress srcAddress;
-	}meta;
-
-	//information about the server
-	struct ServerInformation {
-		Metadata meta;
-		//TODO: version info
-		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;
-		//TODO: should move handle/avatar into clientInfo; these might actually do better during the login system
-		char handle[PACKET_STRING_SIZE];
-		char avatar[PACKET_STRING_SIZE];
-		Vector2 position;
-		Vector2 motion;
-	}playerInfo;
-
-	//map data
-	struct RegionInformation {
-		Metadata meta;
-		int x, y;
-		Region* region;
-	}regionInfo;
-
-	//defaults
-	SerialPacket() {
-		meta.type = Type::NONE;
-		meta.srcAddress = {0,0};
-	}
-};
-
-#pragma pack(pop)
-
-#endif

common/network/udp_network_utility.cpp

@@ -1,148 +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 "udp_network_utility.hpp"
-
-#include <stdexcept>
-
-void UDPNetworkUtility::Open(int port, int packSize) {
-	if (!(socket = SDLNet_UDP_Open(port))) {
-		Close();
-		throw(std::runtime_error("Failed to open a UDP socket"));
-	}
-
-	if (!(packOut = SDLNet_AllocPacket(packSize))) {
-		Close();
-		throw(std::runtime_error("Failed to allocate the out packet"));
-	}
-
-	if (!(packIn = SDLNet_AllocPacket(packSize))) {
-		Close();
-		throw(std::runtime_error("Failed to allocate the in packet"));
-	}
-}
-
-void UDPNetworkUtility::Close() {
-	SDLNet_UDP_Close(socket);
-	SDLNet_FreePacket(packOut);
-	SDLNet_FreePacket(packIn);
-	socket = nullptr;
-	packOut = nullptr;
-	packIn = nullptr;
-}
-
-int UDPNetworkUtility::Bind(const char* ip, int port, int channel) {
-	IPaddress add;
-	if (SDLNet_ResolveHost(&add, ip, port) == -1) {
-		throw(std::runtime_error("Failed to resolve a host"));
-	}
-
-	return Bind(&add, channel);
-}
-
-int UDPNetworkUtility::Bind(IPaddress* add, int channel) {
-	int ret = SDLNet_UDP_Bind(socket, channel, add);
-
-	if (ret == -1) {
-		throw(std::runtime_error("Failed to bind to a channel"));
-	}
-
-	return ret;
-}
-
-void UDPNetworkUtility::Unbind(int channel) {
-	SDLNet_UDP_Unbind(socket, channel);
-}
-
-int UDPNetworkUtility::Send(const char* ip, int port, void* data, int len) {
-	IPaddress add;
-	if (SDLNet_ResolveHost(&add, ip, port) == -1) {
-		throw(std::runtime_error("Failed to resolve a host"));
-	}
-
-	Send(&add, data, len);
-}
-
-int UDPNetworkUtility::Send(IPaddress* add, void* data, int len) {
-	if (len > packOut->maxlen) {
-		throw(std::runtime_error("Failed to copy the data into the packet"));
-	}
-	memset(packOut->data, 0, packOut->maxlen);
-	memcpy(packOut->data, data, len);
-	packOut->len = len;
-	packOut->address = *add;
-
-	int ret = SDLNet_UDP_Send(socket, -1, packOut);
-
-	if (ret <= 0) {
-		throw(std::runtime_error("Failed to send a packet"));
-	}
-
-	return ret;
-}
-
-int UDPNetworkUtility::Send(int channel, void* data, int len) {
-	if (len > packOut->maxlen) {
-		throw(std::runtime_error("Failed to copy the data into the packet"));
-	}
-	memset(packOut->data, 0, packOut->maxlen);
-	memcpy(packOut->data, data, len);
-	packOut->len = len;
-
-	int ret = SDLNet_UDP_Send(socket, channel, packOut);
-
-	if (ret <= 0) {
-		throw(std::runtime_error("Failed to send a packet"));
-	}
-
-	return ret;
-}
-
-int UDPNetworkUtility::SendAll(void* data, int len) {
-	if (len > packOut->maxlen) {
-		throw(std::runtime_error("Failed to copy the data into the packet"));
-	}
-	memset(packOut->data, 0, packOut->maxlen);
-	memcpy(packOut->data, data, len);
-	packOut->len = len;
-
-	int sent = 0;
-
-	//send to all bound channels
-	for (int i = 0; i < SDLNET_MAX_UDPCHANNELS; i++) {
-		if (SDLNet_UDP_GetPeerAddress(socket, i)) {
-			sent += SDLNet_UDP_Send(socket, i, packOut);
-		}
-	}
-
-	return sent;
-}
-
-int UDPNetworkUtility::Receive() {
-	memset(packIn->data, 0, packIn->maxlen);
-	int ret = SDLNet_UDP_Recv(socket, packIn);
-
-	if (ret < 0) {
-		throw(std::runtime_error("Unknown network error occured"));
-	}
-
-	return ret;
-}

common/network/udp_network_utility.hpp

@@ -1,71 +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 UDPNETWORKUTILITY_HPP_
-#define UDPNETWORKUTILITY_HPP_
-
-#include "SDL/SDL_net.h"
-
-class UDPNetworkUtility {
-public:
-	UDPNetworkUtility() = default;
-	~UDPNetworkUtility() = default;
-
-	void Open(int port, int packSize);
-	void Close();
-
-	//bind to a channel
-	int Bind(const char* ip, int port, int channel = -1);
-	int Bind(IPaddress* add, int channel = -1);
-	void Unbind(int channel);
-
-	IPaddress* GetIPAddress(int channel) {
-		return SDLNet_UDP_GetPeerAddress(socket, channel);
-	}
-
-	int Send(const char* ip, int port, void* data, int len);
-	int Send(IPaddress* add, void* data, int len);
-	int Send(int channel, void* data, int len);
-	int SendAll(void* data, int len);
-	int Receive();
-
-	void* GetOutData() const {
-		return reinterpret_cast<void*>(packOut->data);
-	};
-	void* GetInData() const {
-		return reinterpret_cast<void*>(packIn->data);
-	};
-	UDPpacket* GetOutPacket() const {
-		return packOut;
-	}
-	UDPpacket* GetInPacket() const {
-		return packIn;
-	}
-	UDPsocket GetSocket() const {
-		return socket;
-	}
-private:
-	UDPsocket socket = nullptr;
-	UDPpacket* packOut = nullptr;
-	UDPpacket* packIn = nullptr;
-};
-
-#endif

common/script/linit.cpp

@@ -1,72 +0,0 @@
-/*
-** $Id: linit.c,v 1.32 2011/04/08 19:17:36 roberto Exp $
-** Initialization of libraries for lua.c and other clients
-** See Copyright Notice in lua.h
-*/
-
-/* Modified for use in Tortuga, renamed to linit.cpp
-*/
-
-
-/*
-** If you embed Lua in your program and need to open the standard
-** libraries, call luaL_openlibs in your program. If you need a
-** different set of libraries, copy this file to your project and edit
-** it to suit your needs.
-*/
-
-
-#define linit_c
-#define LUA_LIB
-
-#include "lua/lua.hpp"
-#include "region_api.hpp"
-
-
-/*
-** these libs are loaded by lua.c and are readily available to any Lua
-** program
-*/
-static const luaL_Reg loadedlibs[] = {
-  /* Standard libs */
-  {"_G", luaopen_base},
-  {LUA_LOADLIBNAME, luaopen_package},
-  {LUA_COLIBNAME, luaopen_coroutine},
-  {LUA_TABLIBNAME, luaopen_table},
-  {LUA_IOLIBNAME, luaopen_io},
-  {LUA_OSLIBNAME, luaopen_os},
-  {LUA_STRLIBNAME, luaopen_string},
-  {LUA_BITLIBNAME, luaopen_bit32},
-  {LUA_MATHLIBNAME, luaopen_math},
-  {LUA_DBLIBNAME, luaopen_debug},
-
-  /* custom libs */
-  {LUA_REGIONLIBNAME, luaopen_regionapi},
-
-  {NULL, NULL}
-};
-
-
-/*
-** these libs are preloaded and must be required before used
-*/
-static const luaL_Reg preloadedlibs[] = {
-  {NULL, NULL}
-};
-
-
-LUALIB_API void luaL_openlibs (lua_State *L) {
-  const luaL_Reg *lib;
-  /* call open functions from 'loadedlibs' and set results to global table */
-  for (lib = loadedlibs; lib->func; lib++) {
-    luaL_requiref(L, lib->name, lib->func, 1);
-    lua_pop(L, 1);  /* remove lib */
-  }
-  /* add open functions from 'preloadedlibs' into 'package.preload' table */
-  luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD");
-  for (lib = preloadedlibs; lib->func; lib++) {
-    lua_pushcfunction(L, lib->func);
-    lua_setfield(L, -2, lib->name);
-  }
-  lua_pop(L, 1);  /* remove _PRELOAD table */
-}

common/ui/makefile

@@ -1,43 +0,0 @@
-#config
-INCLUDES+=. .. ../graphics
-LIBS+=
-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=$(addprefix $(OUTDIR)/,libcommon.a)
-
-#targets
-all: $(OBJ) $(OUT)
-	ar -crs $(OUT) $(OBJ)
-
-$(OBJ): | $(OBJDIR)
-
-$(OUT): | $(OUTDIR)
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-$(OUTDIR):
-	mkdir $(OUTDIR)
-
-$(OBJDIR)/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all

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_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/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

@@ -1,21 +1,17 @@
-#TODO: The build process needs revising
 #for use on Windows:
 
 #MKDIR=mkdir
 #RM=del /y
 
-CXXFLAGS+=-static-libgcc -static-libstdc++
-CFLAGS+=-static-libgcc
+#CXXFLAGS+=-static-libgcc -static-libstdc++ -g -fno-inline-functions -Wall
+#CXXFLAGS+=-static-libgcc -static-libstdc++
 
-export
+#export
 
 OUTDIR=out
 
 all: $(OUTDIR)
-	$(MAKE) -C common
-	$(MAKE) -C server
-	$(MAKE) -C client
-	$(MAKE) -C editor
+	$(MAKE) -C src
 
 $(OUTDIR):
 	mkdir $(OUTDIR)

out/rsc/setup.lua

@@ -0,0 +1,3 @@
+--reroute the program while in development
+config = {debug = true}
+dofile("../rsc/setup.lua")

rsc/config.cfg

@@ -1,29 +0,0 @@
-#configuration of the programs
-server.host = 255.255.255.255
-server.port = 21795
-server.name = local
-
-server.dbname = database.db
-
-screen.w = 800
-screen.h = 600
-screen.f = false
-
-#directories
-dir.fonts = rsc/graphics/fonts/
-dir.logos = rsc/graphics/logos/
-dir.sprites = rsc/graphics/sprites/
-dir.tilesets = rsc/graphics/tilesets/
-dir.interface = rsc/graphics/interface/
-dir.scripts = rsc/scripts/
-
-#map system
-map.pager.width = 20
-map.pager.height = 20
-map.pager.depth = 3
-
-#player options
-player.handle = username
-player.avatar = elliot2.bmp
-
-#debugging

rsc/scripts/file_format.lua

@@ -0,0 +1,9 @@
+--overwriting the existing hard coded methods
+function Region.Load(region)
+	--the return value signals if this succeeded or failed
+	return false
+end
+
+function Region.Save(region)
+	--
+end

rsc/scripts/generator.lua

@@ -0,0 +1,16 @@
+--uber lazy declarations
+function math.sqr(x) return x*x end
+function math.dist(x, y, i, j) return math.sqrt(math.sqr(x-i) + math.sqr(y-j)) end
+
+--define these
+function Region.Create(region)
+	for i = 1, Region.GetWidth() do
+		for j = 1, Region.GetHeight() do
+			Region.SetTile(region, i, j, 1, 1) --to show the basics are working
+		end
+	end
+end
+
+function Region.Unload(region)
+	--
+end

rsc/scripts/in_world.lua

@@ -0,0 +1,33 @@
+local sheet = TileSheet.GetTileSheet()
+local pager = RegionPager.GetRegionPager()
+
+--the selected tilesheet
+TileSheet.Load(sheet, config.dir.tilesets .. "terrain.bmp", 32, 32)
+
+--tile macros, mapped to this tilesheet
+local base = 14
+local shift = 36
+tiles = {
+	plains	= base + shift * 0,
+	grass	= base + shift * 1,
+	dirt	= base + shift * 2,
+	sand	= base + shift * 3,
+	water	= base + shift * 4
+}
+
+--could set custom generation systems here, that differ from the global generators, etc.
+function Region.Create(region)
+	for i = 1, Region.GetWidth() do
+		for j = 1, Region.GetHeight() do
+			local dist = math.dist(0, 0, i + Region.GetX(region) -1, j + Region.GetY(region) -1)
+			if dist < 10 then
+				Region.SetTile(region, i, j, 1, tiles.plains)
+			elseif dist < 12 then
+				Region.SetTile(region, i, j, 1, tiles.sand)
+			else
+				Region.SetTile(region, i, j, 1, tiles.water)
+				Region.SetSolid(region, i, j, true)
+			end
+		end
+	end
+end

rsc/scripts/setup_server.lua

@@ -1,29 +0,0 @@
-print("Lua script check OK (./rsc)")
-
-function Region.Create(r)
---	print("Region:Create(r", Region.GetX(r), Region.GetY(r), ")")
-	for i = 1, Region.GetWidth(r) do
-		for j = 1, Region.GetHeight(r) do
-			if math.abs(i) == math.abs(j) then
-				Region.SetTile(r, i, j, 1, 50)
-			else
-				Region.SetTile(r, i, j, 1, 14)
-			end
-		end
-	end
---	print("done")
-end
-
-function Region.Unload(r)
---	print("Region:Unload(r", Region.GetX(r), Region.GetY(r), ")")
-end
-
---return true if file loaded, otherwise return false
-function Region.Load(r, saveDir)
---	print("Region:Load(r,", saveDir, Region.GetX(r), Region.GetY(r), ")")
-	return false
-end
-
-function Region.Save(r, saveDir)
---	print("Region:Save(r,", saveDir, Region.GetX(r), Region.GetY(r), ")")
-end

rsc/scripts/setup_server.sql

@@ -1,82 +0,0 @@
---TODO: The SQL startup script needs revising
-
--------------------------
---Server
--------------------------
-
-CREATE TABLE IF NOT EXISTS UserAccounts (
-	uid INTEGER PRIMARY KEY AUTOINCREMENT,
-	username varchar(100) UNIQUE,
-	password varchar(100), --NOTE: DO NOT DO THIS!!
-	blacklisted BIT DEFAULT 0,
-	whitelisted BIT DEFAULT 1
-);
-
--------------------------
---Items
--------------------------
-
-CREATE TABLE IF NOT EXISTS MundaneItems (
-	--metadata
-	uid INTEGER PRIMARY KEY AUTOINCREMENT,
-	itemID INTEGER,
-	stackSize INTEGER DEFAULT 0,
-	owner INTEGER REFERENCES PlayerCharacters(uid)
-);
-
-CREATE TABLE IF NOT EXISTS Consumables (
-	--metadata
-	uid INTEGER PRIMARY KEY AUTOINCREMENT,
-	itemID INTEGER,
-	stackSize INTEGER DEFAULT 0,
-	owner INTEGER REFERENCES PlayerCharacters(uid)
-	--holds all consumable items info (food, potions, etc.)
-);
-
-CREATE TABLE IF NOT EXISTS Equipment (
-	--metadata
-	uid INTEGER PRIMARY KEY AUTOINCREMENT,
-	itemID INTEGER,
-	owner INTEGER REFERENCES PlayerCharacters(uid)
-	--hold all equipment info
-	--stat mods, special effects, etc.
-);
-
--------------------------
---Players
--------------------------
-
-CREATE TABLE IF NOT EXISTS PlayerCharacters (
-	uid INTEGER PRIMARY KEY AUTOINCREMENT,
-
-	--metadata
-	handle varchar(100) UNIQUE,
-	avatar varchar(100),
-	birth timestamp NOT NULL DEFAULT (datetime()),
-
-	--position
-	mapIndex		INTEGER DEFAULT 0,
-	positionX		INTEGER DEFAULT 0,
-	positionY		INTEGER DEFAULT 0,
-
-	--statistics
-	level			INTEGER DEFAULT 0,
-	exp				INTEGER DEFAULT 0,
-	maxHP			INTEGER DEFAULT 0,
-	health			INTEGER DEFAULT 0,
-	maxMP			INTEGER DEFAULT 0,
-	mana			INTEGER DEFAULT 0,
-	attack			INTEGER DEFAULT 0,
-	defence			INTEGER DEFAULT 0,
-	intelligence	INTEGER DEFAULT 0,
-	resistance		INTEGER DEFAULT 0,
-	accuracy		REAL DEFAULT 0.0,
-	evasion			REAL DEFAULT 0.0,
-	luck			REAL DEFAULT 0.0,
-
-	--equipment
-	weapon INTEGER REFERENCES Equipment(uid),
-	helmet INTEGER REFERENCES Equipment(uid),
-	armour INTEGER REFERENCES Equipment(uid)
-	--etc.
-);

rsc/setup.lua

@@ -0,0 +1,42 @@
+--[[
+	--reroute the program while in development
+	config = {debug = true}
+	dofile("../rsc/setup.lua")
+--]]
+
+--catch the debug signal if the program was rerouted
+local debug = false
+if config ~= nil then
+	debug = config.debug
+end
+
+--the program's configuration
+config = {
+	debug = debug,
+	screen = {
+		width = 800,
+		height = 600,
+		fullscreen = false
+	},
+	dir = {
+		fonts = "rsc/graphics/fonts/",
+		logos = "rsc/graphics/logos/",
+		sprites = "rsc/graphics/sprites/",
+		tilesets = "rsc/graphics/tilesets/",
+		interface = "rsc/graphics/interface/",
+		scripts = "rsc/scripts/",
+		maps = "rsc/maps/"
+	},
+	mapname = "mapname"
+}
+
+--development environment
+if config.debug then
+	for k, v in pairs(config.dir) do
+		config.dir[k] = string.format("../%s", v)
+	end
+end
+
+--"load" the scripted systems
+dofile(config.dir.scripts .. "file_format.lua")
+dofile(config.dir.scripts .. "generator.lua")

server/main.cpp

@@ -1,45 +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 "server_application.hpp"
-
-#include "SDL/SDL.h"
-
-#include <stdexcept>
-#include <iostream>
-
-using namespace std;
-
-int main(int argc, char** argv) {
-	cout << "Beginning server" << endl;
-	try {
-		ServerApplication app;
-		app.Init(argc, argv);
-		app.Proc();
-		app.Quit();
-	}
-	catch(exception& e) {
-		cerr << "Fatal error: " << e.what() << endl;
-		return 1;
-	}
-	cout << "Clean exit" << endl;
-	return 0;
-}

server/makefile

@@ -1,43 +0,0 @@
-#config
-INCLUDES+=. ../common ../common/map ../common/script ../common/network
-LIBS+=../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
-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)/,server)
-
-#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

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

@@ -1,98 +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 SERVERAPPLICATION_HPP_
-#define SERVERAPPLICATION_HPP_
-
-//server specific stuff
-#include "server_utility.hpp"
-#include "client_entry.hpp"
-#include "player_entry.hpp"
-
-//maps
-#include "map_allocator.hpp"
-#include "map_file_format.hpp"
-#include "region_pager.hpp"
-
-//networking
-#include "serial_packet.hpp"
-#include "udp_network_utility.hpp"
-#include "serial.hpp"
-
-//common
-#include "config_utility.hpp"
-#include "vector2.hpp"
-
-//APIs
-#include "lua/lua.hpp"
-#include "sqlite3/sqlite3.h"
-#include "SDL/SDL.h"
-
-//STL
-#include <map>
-
-//The main application class
-class ServerApplication {
-public:
-	//standard functions
-	ServerApplication() = default;
-	~ServerApplication() = default;
-
-	void Init(int argc, char** argv);
-	void Proc();
-	void Quit();
-
-private:
-	void HandlePacket(SerialPacket);
-
-	//high cohesion utility functions
-	void HandleBroadcastRequest(SerialPacket);
-	void HandleJoinRequest(SerialPacket);
-	void HandleDisconnect(SerialPacket);
-	void HandleSynchronize(SerialPacket);
-	void HandleShutdown(SerialPacket);
-	void HandlePlayerNew(SerialPacket);
-	void HandlePlayerDelete(SerialPacket);
-	void HandlePlayerUpdate(SerialPacket);
-	void HandleRegionRequest(SerialPacket);
-
-	//TODO: a function that only sends to players in a certain proximity
-	void PumpPacket(SerialPacket);
-
-	//APIs
-	UDPNetworkUtility network;
-	sqlite3* database = nullptr;
-	lua_State* luaState = nullptr;
-
-	//server tables
-	std::map<unsigned int, ClientEntry> clientMap;
-	std::map<unsigned int, PlayerEntry> playerMap;
-
-	//maps
-	//TODO: I need to handle multiple map objects
-	RegionPager<LuaAllocator, LuaFormat> regionPager;
-
-	//misc
-	bool running = true;
-	ConfigUtility config;
-};
-
-#endif

src/application.cpp

@@ -1,11 +1,11 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* 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 ClientApplications, and to alter it and redistribute it
+ * including commercial Applications, and to alter it and redistribute it
  * freely, subject to the following restrictions:
  * 
  * 1. The origin of this software must not be misrepresented; you must not
@@ -19,12 +19,13 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "client_application.hpp"
+#include "application.hpp"
 
-#include "serial.hpp"
+#include "timer.hpp"
 
 #include <stdexcept>
 #include <chrono>
+#include <iostream>
 
 //-------------------------
 //Scene headers
@@ -34,32 +35,71 @@
 #include "splash_screen.hpp"
 #include "main_menu.hpp"
 #include "options_menu.hpp"
-#include "lobby_menu.hpp"
 #include "in_world.hpp"
-#include "in_combat.hpp"
 
 //-------------------------
 //Public access members
 //-------------------------
 
-void ClientApplication::Init(int argc, char** argv) {
-	//load the prerequisites
-	config.Load("rsc\\config.cfg");
+void Application::Init(int argc, char** argv) {
+	std::cout << "Beginning " << argv[0] << std::endl;
+
+	//-------------------------
+	//Initialize the APIs
+	//-------------------------
 
 	//initialize SDL
 	if (SDL_Init(SDL_INIT_VIDEO)) {
 		throw(std::runtime_error("Failed to initialize SDL"));
 	}
-	BaseScene::SetScreen(config.Int("screen.w"), config.Int("screen.h"), 0, (config.Bool("screen.f")) ? SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_FULLSCREEN : SDL_HWSURFACE|SDL_DOUBLEBUF);
+	std::cout << "Initialized SDL" << std::endl;
 
-	//initialize SDL_net
-	if (SDLNet_Init()) {
-		throw(std::runtime_error("Failed to initialize SDL_net"));
+	//initialize lua
+	lua = luaL_newstate();
+	if (!lua) {
+		throw(std::runtime_error("Failed to initialize lua"));
 	}
-	network.Open(0, PACKET_BUFFER_SIZE);
+	luaL_openlibs(lua);
+	std::cout << "Initialized lua" << std::endl;
+
+	if (luaL_dofile(lua, "rsc\\setup.lua")) {
+		throw(std::runtime_error("Failed to initialize lua's startup script"));
+	}
+	std::cout << "Initialized lua's setup script" << std::endl;
+
+	//-------------------------
+	//Setup the screen
+	//-------------------------
+
+	lua_getglobal(lua, "config");
+	lua_getfield(lua, 1, "screen");
+	lua_getfield(lua, 2, "width");
+	lua_getfield(lua, 2, "height");
+	lua_getfield(lua, 2, "fullscreen");
+
+	int w = lua_tointeger(lua, 3);
+	int h = lua_tointeger(lua, 4);
+	int f = lua_toboolean(lua, 5);
+
+	lua_pop(lua, 5);
+
+	BaseScene::SetScreen(w ? w : 800, h ? h : 600, 0, f ? SDL_HWSURFACE|SDL_DOUBLEBUF|SDL_FULLSCREEN : SDL_HWSURFACE|SDL_DOUBLEBUF);
+	std::cout << "Initialized the screen" << std::endl;
+
+	//-------------------------
+	//finalize the startup
+	//-------------------------
+
+	std::cout << "Startup completed successfully" << std::endl;
+
+	//-------------------------
+	//debugging
+	//-------------------------
+
+	//...
 }
 
-void ClientApplication::Proc() {
+void Application::Proc() {
 	LoadScene(SceneList::FIRST);
 
 	//prepare the time system
@@ -80,6 +120,8 @@ void ClientApplication::Proc() {
 		//update the current time
 		realTime = Clock::now();
 
+		Timer runTimer("run");
+
 		//simulate game time
 		while (simTime < realTime) {
 			//call each user defined function
@@ -87,52 +129,57 @@ void ClientApplication::Proc() {
 			simTime += delta;
 		}
 
+		runTimer.Stop();
+
+		Timer renderTimer("render");
+
 		//draw the game to the screen
 		activeScene->RenderFrame();
+
+		renderTimer.Stop();
+
+		//debugging output
+//		std::cout << runTimer << std::endl;
+//		std::cout << renderTimer << std::endl;
 	}
 
 	UnloadScene();
 }
 
-void ClientApplication::Quit() {
-	network.Close();
-	SDLNet_Quit();
+void Application::Quit() {
+	std::cout << "Shutting down" << std::endl;
+	lua_close(lua);
 	SDL_Quit();
+	std::cout << "Clean exit" << std::endl;
 }
 
 //-------------------------
 //Private access members
 //-------------------------
 
-void ClientApplication::LoadScene(SceneList sceneIndex) {
+void Application::LoadScene(SceneList sceneIndex) {
 	UnloadScene();
 	switch(sceneIndex) {
 		//add scene creation calls here
 		case SceneList::FIRST:
 		case SceneList::SPLASHSCREEN:
-			activeScene = new SplashScreen(&config);
+			activeScene = new SplashScreen(lua);
 		break;
 		case SceneList::MAINMENU:
-			activeScene = new MainMenu(&config);
+			activeScene = new MainMenu(lua);
 		break;
 		case SceneList::OPTIONSMENU:
-			activeScene = new OptionsMenu(&config);
-		break;
-		case SceneList::LOBBYMENU:
-			activeScene = new LobbyMenu(&config, &network, &clientIndex);
+			activeScene = new OptionsMenu(lua);
 		break;
 		case SceneList::INWORLD:
-			activeScene = new InWorld(&config, &network, &clientIndex);
-		break;
-		case SceneList::INCOMBAT:
-			activeScene = new InCombat();
+			activeScene = new InWorld(lua);
 		break;
 		default:
 			throw(std::logic_error("Failed to recognize the scene index"));
 	}
 }
 
-void ClientApplication::UnloadScene() {
+void Application::UnloadScene() {
 	delete activeScene;
 	activeScene = nullptr;
 }

src/application.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,17 +19,18 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef EDITORAPPLICATION_HPP_
-#define EDITORAPPLICATION_HPP_
+#ifndef APPLICATION_HPP_
+#define APPLICATION_HPP_
 
 #include "scene_list.hpp"
 #include "base_scene.hpp"
-#include "config_utility.hpp"
 
-class EditorApplication {
+#include "lua/lua.hpp"
+
+class Application {
 public:
-	EditorApplication() = default;
-	~EditorApplication() = default;
+	Application() = default;
+	~Application() = default;
 
 	void Init(int argc, char** argv);
 	void Proc();
@@ -40,10 +41,9 @@ private:
 	void LoadScene(SceneList sceneIndex);
 	void UnloadScene();
 
-	//globals
-	ConfigUtility config;
-
 	BaseScene* activeScene = nullptr;
+
+	lua_State* lua = nullptr;
 };
 
-#endif
+#endif

src/base_scene.cpp

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

src/base_scene.hpp

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

src/character.cpp

@@ -19,32 +19,43 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "server_utility.hpp"
+#include "character.hpp"
 
-#include "utility.hpp"
-
-#include <stdexcept>
-#include <fstream>
-#include <cstdlib>
-
-int runSQLScript(sqlite3* db, std::string fname, int (*callback)(void*,int,char**,char**), void* argPtr) {
-	//load the file into a string
-	std::ifstream is(fname);
-	if (!is.is_open()) {
-		return -1;
+void Character::Update(double delta) {
+	if (motion.x && motion.y) {
+		origin += motion * delta * CHARACTER_WALKING_MOD;
 	}
-	std::string script;
-	getline(is, script, '\0');
-	is.close();
-
-	//run the SQL loaded from the file
-	char* errmsg = nullptr;
-	int ret = sqlite3_exec(db, script.c_str(), callback, argPtr, &errmsg);
-	if (ret != SQLITE_OK) {
-		//handle any errors received from the SQL
-		std::runtime_error e(std::string() + "SQL Script Error " + to_string_custom(ret) + ": " + errmsg);
-		free(errmsg);
-		throw(e);
+	else if (motion != 0) {
+		origin += motion * delta;
 	}
-	return ret;
-}
+	sprite.Update(delta);
+}
+
+void Character::DrawTo(SDL_Surface* const dest, int camX, int camY) {
+	sprite.DrawTo(dest, origin.x - camX, origin.y - camY);
+}
+
+void Character::CorrectSprite() {
+	//NOTE: These must correspond to the sprite sheet in use
+	if (motion.y > 0) {
+		sprite.SetYIndex(0);
+	}
+	else if (motion.y < 0) {
+		sprite.SetYIndex(1);
+	}
+	else if (motion.x > 0) {
+		sprite.SetYIndex(3);
+	}
+	else if (motion.x < 0) {
+		sprite.SetYIndex(2);
+	}
+
+	//animation
+	if (motion != 0) {
+		sprite.SetDelay(0.1);
+	}
+	else {
+		sprite.SetDelay(0);
+		sprite.SetXIndex(0);
+	}
+}

src/character.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,49 +19,51 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef PLAYERCHARACTER_HPP_
-#define PLAYERCHARACTER_HPP_
+#ifndef CHARACTER_HPP_
+#define CHARACTER_HPP_
 
+//components
 #include "vector2.hpp"
+#include "bounding_box.hpp"
+
+//graphics
 #include "sprite_sheet.hpp"
 
-//TODO: correct the PlayerCharacter class and it's movement system
-class PlayerCharacter {
-public:
-	enum class Direction {
-		NORTH, SOUTH, EAST, WEST
-	};
+//std namespace
+#include <cmath>
 
-	PlayerCharacter() = default;
-	~PlayerCharacter() = default;
+//the speeds that the characters move
+constexpr double CHARACTER_WALKING_SPEED = 140.0;
+constexpr double CHARACTER_WALKING_MOD = 1.0/sqrt(2.0);
+
+class Character {
+public:
+	Character() = default;
+	~Character() = default;
 
 	void Update(double delta);
 
-	void DrawTo(SDL_Surface* const dest, int camX, int camY) { sprite.DrawTo(dest, position.x - camX, position.y - camY); }
-
-	//clunky code results in smooth movement and controls
-	void AdjustDirection(Direction);
-	void FaceDirection(Direction);
-	void ResetDirection();
-	void ResetSpeed();
+	//graphics
+	void DrawTo(SDL_Surface* const, int camX, int camY);
+	void CorrectSprite();
+	SpriteSheet* GetSprite() { return &sprite; }
 
 	//accessors and mutators
-	Vector2 SetPosition(Vector2 v) { return position = v; }
-	Vector2 ShiftPosition(Vector2 v) { return position += v; }
-	Vector2 GetPosition() { return position; }
-
+	Vector2 SetOrigin(Vector2 v) { return origin = v; }
+	Vector2 GetOrigin() const { return origin; }
 	Vector2 SetMotion(Vector2 v) { return motion = v; }
-	Vector2 ShiftMotion(Vector2 v) { return motion += v; }
-	Vector2 GetMotion() { return motion; }
+	Vector2 GetMotion() const { return motion; }
+	BoundingBox SetBoundingBox(BoundingBox b) { return bounds = b; }
+	BoundingBox GetBoundingBox() const { return bounds; }
 
-	SpriteSheet* GetSprite() { return &sprite; }
 private:
-	Vector2 position;
-	Vector2 motion;
+	//graphics
 	SpriteSheet sprite;
 
-	//for moving diagonally
-	bool diagonal = false;
+	//position
+	Vector2 origin = {0.0,0.0};
+	Vector2 motion = {0.0,0.0};
+	BoundingBox bounds;
 };
 
 #endif

src/debugging/makefile

@@ -1,20 +1,17 @@
 #config
-INCLUDES+=. .. ../map
+INCLUDES+=.
 LIBS+=
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+CXXFLAGS+=-std=c++11 $(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=../..
+OUTDIR=..
 OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 
 #targets
@@ -34,9 +31,6 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
 clean:
 	$(RM) *.o *.a *.exe
 

src/debugging/timer.cpp

@@ -19,14 +19,11 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CLIENTENTRY_HPP_
-#define CLIENTENTRY_HPP_
+#include "timer.hpp"
 
-#include "SDL/SDL_net.h"
-
-struct ClientEntry {
-	IPaddress address;
-	static unsigned int uidCounter;
-};
-
-#endif
+std::ostream& operator<<(std::ostream& os, Timer& t) {
+	os << t.GetName() << ": ";
+	os << std::chrono::duration_cast<std::chrono::nanoseconds>(t.GetTime()).count();
+	os << "ns";
+	return os;
+}

src/debugging/timer.hpp

@@ -19,44 +19,36 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef PLAYERENTRY_HPP_
-#define PLAYERENTRY_HPP_
-
-//POD members
-#include "bbox.hpp"
-#include "vector2.hpp"
+#ifndef TIMER_HPP_
+#define TIMER_HPP_
 
+#include <chrono>
 #include <string>
+#include <ostream>
 
-struct PlayerEntry {
-	//metadata
-	int clientIndex;
-	std::string handle;
-	std::string avatar;
+class Timer {
+public:
+	typedef std::chrono::high_resolution_clock Clock;
 
-	//world position
-	int mapIndex;
-	Vector2 position;
-	Vector2 motion;
-	BBox bbox;
+	Timer() = default;
+	Timer(std::string s) : name(s), start(Clock::now()) {};
+	~Timer() = default;
 
-	//statistics
-	int level;
-	int exp;
-	int maxHP;
-	int health;
-	int maxMP;
-	int mana;
-	int attack;
-	int defence;
-	int intelligence;
-	int resistance;
-	float accuracy;
-	float evasion;
-	float luck;
+	inline void Start() { start = Clock::now(); }
+	inline void Stop() { time = Clock::now() - start; }
 
-	//uid
-	static unsigned int uidCounter;
+	//accessors and mutators
+	Clock::duration GetTime() { return time; }
+
+	std::string SetName(std::string s) { return name = s; }
+	std::string GetName() { return name; }
+
+private:
+	std::string name;
+	Clock::time_point start;
+	Clock::duration time;
 };
 
+std::ostream& operator<<(std::ostream& os, Timer& t);
+
 #endif

src/graphics/image.cpp

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

src/graphics/image.hpp

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

src/graphics/makefile

@@ -1,20 +1,17 @@
 #config
-INCLUDES+=. .. ../map
+INCLUDES+=.
 LIBS+=
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+CXXFLAGS+=-std=c++11 $(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=../..
+OUTDIR=..
 OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 
 #targets
@@ -34,9 +31,6 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
 clean:
 	$(RM) *.o *.a *.exe
 

src/graphics/sprite_sheet.cpp

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

src/graphics/sprite_sheet.hpp

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

src/in_world.cpp

@@ -0,0 +1,257 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "in_world.hpp"
+
+#include "timer.hpp"
+
+#include "utility.hpp"
+
+#include "region_pager_api.hpp"
+#include "tile_sheet_api.hpp"
+
+#include <iostream>
+
+//-------------------------
+//Public access members
+//-------------------------
+
+InWorld::InWorld(lua_State* L): lua(L) {
+	//register the pager
+	lua_pushstring(lua, TORTUGA_REGION_PAGER_PSEUDO_INDEX);
+	lua_pushlightuserdata(lua, &pager);
+	lua_settable(L, LUA_REGISTRYINDEX);
+
+	//register the tilesheet
+	lua_pushstring(lua, TORTUGA_TILE_SHEET_PSEUDO_INDEX);
+	lua_pushlightuserdata(lua, &tileSheet);
+	lua_settable(L, LUA_REGISTRYINDEX);
+
+	//setup the component objecrs
+	pager.SetLuaState(lua);
+
+	//get the config info
+	lua_getglobal(lua, "config");
+	lua_getfield(lua, -1, "dir");
+	lua_getfield(lua, -1, "fonts");
+	std::string fonts = lua_tostring(lua, -1);
+	lua_getfield(lua, -2, "interface");
+	std::string interface = lua_tostring(lua, -1);
+	lua_getfield(lua, -3, "sprites");
+	std::string sprites = lua_tostring(lua, -1);
+	lua_getfield(lua, -4, "scripts");
+	std::string scripts = lua_tostring(lua, -1);
+	lua_pop(lua, 6);
+
+	//run the additional scripts
+	if (luaL_dofile(lua, (scripts + "in_world.lua").c_str())) {
+		throw(std::runtime_error(std::string() + "Failed to run in_world.lua: " + lua_tostring(lua, -1) ));
+	}
+
+	//setup the utility objects
+	buttonImage.LoadSurface(interface + "button_menu.bmp");
+	buttonImage.SetClipH(buttonImage.GetClipH()/3);
+	font.LoadSurface(fonts + "pk_white_8.bmp");
+
+	//pass the utility objects
+	backButton.SetImage(&buttonImage);
+	backButton.SetFont(&font);
+
+	//set the button positions
+	backButton.SetX(50);
+	backButton.SetY(50 + buttonImage.GetClipH() * 0);
+
+	//set the button texts
+	backButton.SetText("Back");
+
+	//entities
+	character.GetSprite()->LoadSurface(sprites + "elliot2.bmp", 4, 4);
+	character.SetBoundingBox({0, 0,
+		character.GetSprite()->GetImage()->GetClipW(),
+		character.GetSprite()->GetImage()->GetClipH()
+	});
+
+	//setup the camera
+	camera.margin.x = GetScreen()->w / 2 - character.GetSprite()->GetImage()->GetClipW() / 2;
+	camera.margin.y = GetScreen()->h / 2 - character.GetSprite()->GetImage()->GetClipH() / 2;
+
+	//debug
+	//
+}
+
+InWorld::~InWorld() {
+	//unregister the map components
+	lua_pushstring(lua, TORTUGA_REGION_PAGER_PSEUDO_INDEX);
+	lua_pushstring(lua, TORTUGA_TILE_SHEET_PSEUDO_INDEX);
+	lua_pushnil(lua);
+	lua_settable(lua, LUA_REGISTRYINDEX);
+	lua_pushnil(lua);
+	lua_settable(lua, LUA_REGISTRYINDEX);
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void InWorld::FrameStart() {
+	//
+}
+
+void InWorld::Update(double delta) {
+	//update the entities
+	character.Update(delta);
+
+	//check for collisions with the map
+	BoundingBox wallBounds = {0, 0, tileSheet.GetTileW(), tileSheet.GetTileH()};
+	const int xCount = character.GetBoundingBox().w / wallBounds.w + 1;
+	const int yCount = character.GetBoundingBox().h / wallBounds.h + 1;
+
+	for (int i = -1; i <= xCount; ++i) {
+		for (int j = -1; j <= yCount; ++j) {
+			//set the wall's position
+			wallBounds.x = wallBounds.w * i + snapToBase((double)wallBounds.w, character.GetOrigin().x);
+			wallBounds.y = wallBounds.h * j + snapToBase((double)wallBounds.h, character.GetOrigin().y);
+
+			if (!pager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
+				continue;
+			}
+
+			if ((character.GetOrigin() + character.GetBoundingBox()).CheckOverlap(wallBounds)) {
+				character.SetOrigin(character.GetOrigin() - (character.GetMotion() * delta));
+				character.SetMotion({0,0});
+				character.CorrectSprite();
+			}
+		}
+	}
+
+	//update the camera
+	camera.origin.x = character.GetOrigin().x - camera.margin.x;
+	camera.origin.y = character.GetOrigin().y - camera.margin.y;
+
+	//TODO: prune distant regions
+
+	//summon nearby unloaded regions
+	const int left = snapToBase(REGION_WIDTH, camera.origin.x / tileSheet.GetTileW());
+	const int top = snapToBase(REGION_HEIGHT, camera.origin.y / tileSheet.GetTileH());
+	const int right = snapToBase(REGION_WIDTH, (camera.origin.x + GetScreen()->w) / tileSheet.GetTileW());
+	const int bottom = snapToBase(REGION_HEIGHT, (camera.origin.y + GetScreen()->h) / tileSheet.GetTileH());
+
+	for (int i = left - REGION_WIDTH; i <= right + REGION_WIDTH; i += REGION_WIDTH) {
+		for (int j = top - REGION_HEIGHT; j <= bottom + REGION_HEIGHT; j += REGION_HEIGHT) {
+			pager.GetRegion(i, j);
+		}
+	}
+}
+
+void InWorld::FrameEnd() {
+	//
+}
+
+void InWorld::RenderFrame() {
+//	SDL_FillRect(GetScreen(), 0, 0);
+	Render(GetScreen());
+	SDL_Flip(GetScreen());
+	fps.Calculate();
+}
+
+void InWorld::Render(SDL_Surface* const screen) {
+	//draw all regions
+	for (std::list<Region>::iterator it = pager.GetContainer()->begin(); it != pager.GetContainer()->end(); it++) {
+		tileSheet.DrawRegionTo(screen, &(*it), camera.origin.x, camera.origin.y);
+	}
+
+	//draw the characters
+	character.DrawTo(screen, camera.origin.x, camera.origin.y);
+
+	//draw the UI
+	backButton.DrawTo(screen);
+	font.DrawStringTo(to_string_custom(fps.GetFrameRate()), screen, 0, 0);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void InWorld::QuitEvent() {
+	//exit the game
+	SetNextScene(SceneList::QUIT);
+}
+
+void InWorld::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	backButton.MouseMotion(motion);
+}
+
+void InWorld::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	backButton.MouseButtonDown(button);
+}
+
+void InWorld::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
+		SetNextScene(SceneList::MAINMENU);
+	}
+}
+
+void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
+	//player movement
+	Vector2 motion = character.GetMotion();
+	switch(key.keysym.sym) {
+		case SDLK_LEFT:
+			motion.x -= CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_RIGHT:
+			motion.x += CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_UP:
+			motion.y -= CHARACTER_WALKING_SPEED;
+		break;
+		case SDLK_DOWN:
+			motion.y += CHARACTER_WALKING_SPEED;
+		break;
+	}
+	if (character.GetMotion() != motion) {
+		character.SetMotion(motion);
+		character.CorrectSprite();
+	}
+}
+
+void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
+	//player movement
+	Vector2 motion = character.GetMotion();
+	switch(key.keysym.sym) {
+		//NOTE: The use of min/max here are to prevent awkward movements
+		case SDLK_LEFT:
+			motion.x = std::min(motion.x + CHARACTER_WALKING_SPEED, 0.0);
+		break;
+		case SDLK_RIGHT:
+			motion.x = std::max(motion.x - CHARACTER_WALKING_SPEED, 0.0);
+		break;
+		case SDLK_UP:
+			motion.y = std::min(motion.y + CHARACTER_WALKING_SPEED, 0.0);
+		break;
+		case SDLK_DOWN:
+			motion.y = std::max(motion.y - CHARACTER_WALKING_SPEED, 0.0);
+		break;
+	}
+	if (character.GetMotion() != motion) {
+		character.SetMotion(motion);
+		character.CorrectSprite();
+	}
+}

src/in_world.hpp

@@ -19,62 +19,75 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef EDITORSCENE_HPP_
-#define EDITORSCENE_HPP_
+#ifndef INWORLD_HPP_
+#define INWORLD_HPP_
 
-#include "base_scene.hpp"
-
-#include "config_utility.hpp"
+//graphics & ui
 #include "image.hpp"
 #include "raster_font.hpp"
-#include "menu_bar.hpp"
+#include "button.hpp"
 
-#include "region_pager.hpp"
-#include "map_allocator.hpp"
-#include "map_file_format.hpp"
+//map stuff
 #include "tile_sheet.hpp"
+#include "region_pager_lua.hpp"
 
-class EditorScene : public BaseScene {
+//entities
+#include "character.hpp"
+
+//utilities
+#include "frame_rate.hpp"
+
+//framework
+#include "base_scene.hpp"
+
+//APIs
+#include "lua/lua.hpp"
+
+class InWorld : public BaseScene {
 public:
 	//Public access members
-	EditorScene(ConfigUtility* const);
-	~EditorScene();
+	InWorld(lua_State* L);
+	~InWorld();
 
 protected:
 	//Frame loop
 	void FrameStart();
 	void Update(double delta);
 	void FrameEnd();
+	void RenderFrame();
 	void Render(SDL_Surface* const);
 
 	//Event handlers
+	void QuitEvent();
 	void MouseMotion(SDL_MouseMotionEvent const&);
 	void MouseButtonDown(SDL_MouseButtonEvent const&);
 	void MouseButtonUp(SDL_MouseButtonEvent const&);
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//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;
+		struct {
+			int x, y;
+		}origin, margin;
+	}camera;
 
-	RegionPager<BlankAllocator, DummyFormat> pager;
-	TileSheet tsheet;
+	//shared parameters
+	lua_State* lua = nullptr;
+
+	//graphics
+	Image buttonImage;
+	RasterFont font;
+
+	//map stuff
+	TileSheet tileSheet;
+	RegionPagerLua pager;
+
+	//entities
+	Character character;
+
+	//UI
+	Button backButton;
+	FrameRate fps;
 };
 
 #endif

src/linit.cpp

@@ -0,0 +1,85 @@
+/* $Id: linit.c,v 1.32, modified
+ * Initialization of libraries for lua.c and other clients
+ * See Copyright Notice in lua.h
+ * 
+ * If you embed Lua in your program and need to open the standard
+ * libraries, call luaL_openlibs in your program. If you need a
+ * different set of libraries, copy this file to your project and edit
+ * it to suit your needs.
+ * 
+ * Modified for use in Tortuga, renamed to linit.cpp
+ * Modifications are released under the zlib license:
+ * 
+ * Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#define linit_c
+#define LUA_LIB
+
+#include "lua/lua.hpp"
+
+#include "region_api.hpp"
+#include "region_pager_api.hpp"
+#include "tile_sheet_api.hpp"
+
+//these libs are loaded by lua.c and are readily available to any Lua program
+static const luaL_Reg loadedlibs[] = {
+	//Standard libs
+	{"_G", luaopen_base},
+	{LUA_LOADLIBNAME, luaopen_package},
+	{LUA_COLIBNAME, luaopen_coroutine},
+	{LUA_TABLIBNAME, luaopen_table},
+	{LUA_IOLIBNAME, luaopen_io},
+	{LUA_OSLIBNAME, luaopen_os},
+	{LUA_STRLIBNAME, luaopen_string},
+	{LUA_BITLIBNAME, luaopen_bit32},
+	{LUA_MATHLIBNAME, luaopen_math},
+	{LUA_DBLIBNAME, luaopen_debug},
+
+	//Tortuga's API
+	{TORTUGA_REGION_NAME, openRegionAPI},
+	{TORTUGA_REGION_PAGER_NAME, openRegionPagerAPI},
+	{TORTUGA_TILE_SHEET_NAME, openTileSheetAPI},
+
+	{NULL, NULL}
+};
+
+
+//these libs are preloaded and must be required before used
+static const luaL_Reg preloadedlibs[] = {
+	{NULL, NULL}
+};
+
+LUALIB_API void luaL_openlibs (lua_State *L) {
+	const luaL_Reg *lib;
+	//call open functions from 'loadedlibs' and set results to global table
+	for (lib = loadedlibs; lib->func; lib++) {
+		luaL_requiref(L, lib->name, lib->func, 1);
+		lua_pop(L, 1); //remove lib
+	}
+	//add open functions from 'preloadedlibs' into 'package.preload' table
+	luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD");
+	for (lib = preloadedlibs; lib->func; lib++) {
+		lua_pushcfunction(L, lib->func);
+		lua_setfield(L, -2, lib->name);
+	}
+	lua_pop(L, 1); //remove _PRELOAD table
+}

src/main.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,7 +19,7 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "client_application.hpp"
+#include "application.hpp"
 
 #include <stdexcept>
 #include <iostream>
@@ -27,9 +27,8 @@
 using namespace std;
 
 int main(int argc, char** argv) {
-	cout << "Beginning client" << endl;
 	try {
-		ClientApplication app;
+		Application app;
 		app.Init(argc, argv);
 		app.Proc();
 		app.Quit();
@@ -38,6 +37,5 @@ int main(int argc, char** argv) {
 		cerr << "Fatal exception thrown: " << e.what() << endl;
 		return 1;
 	}
-	cout << "Clean exit" << endl;
 	return 0;
 }

src/main_menu.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -25,13 +25,20 @@
 //Public access members
 //-------------------------
 
-MainMenu::MainMenu(ConfigUtility* const argConfig):
-	config(*argConfig)
-{
+MainMenu::MainMenu(lua_State* L): lua(L) {
+	//get the config info
+	lua_getglobal(lua, "config");
+	lua_getfield(lua, -1, "dir");
+	lua_getfield(lua, -1, "interface");
+	std::string interface = lua_tostring(lua, -1);
+	lua_getfield(lua, -2, "fonts");
+	std::string fonts = lua_tostring(lua, -1);
+	lua_pop(lua, 4);
+
 	//setup the utility objects
-	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
+	image.LoadSurface(interface + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+	font.LoadSurface(fonts + "pk_white_8.bmp");
 
 	//pass the utility objects
 	startButton.SetImage(&image);
@@ -53,6 +60,9 @@ MainMenu::MainMenu(ConfigUtility* const argConfig):
 	startButton.SetText("Start");
 	optionsButton.SetText("Options");
 	quitButton.SetText("Quit");
+
+	//debug
+	//
 }
 
 MainMenu::~MainMenu() {
@@ -99,7 +109,7 @@ void MainMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
 
 void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 	if (startButton.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::LOBBYMENU);
+		SetNextScene(SceneList::INWORLD);
 	}
 	if (optionsButton.MouseButtonUp(button) == Button::State::HOVER) {
 		SetNextScene(SceneList::OPTIONSMENU);
@@ -110,11 +120,7 @@ void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 }
 
 void MainMenu::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			QuitEvent();
-		break;
-	}
+	//
 }
 
 void MainMenu::KeyUp(SDL_KeyboardEvent const& key) {

src/main_menu.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -24,15 +24,16 @@
 
 #include "base_scene.hpp"
 
-#include "config_utility.hpp"
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
 
+#include "lua/lua.hpp"
+
 class MainMenu : public BaseScene {
 public:
 	//Public access members
-	MainMenu(ConfigUtility* const);
+	MainMenu(lua_State* L);
 	~MainMenu();
 
 protected:
@@ -49,8 +50,8 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//globals
-	ConfigUtility& config;
+	//shared parameters
+	lua_State* lua = nullptr;
 
 	//members
 	Image image;

src/makefile

@@ -1,30 +1,27 @@
 #config
-INCLUDES+=.
-LIBS+=
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+INCLUDES+=. debugging graphics map ui utilities
+LIBS+=libcommon.a -lmingw32 -lSDLmain -lSDL -llua
+CXXFLAGS+=-std=c++11 $(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=$(addprefix $(OUTDIR)/,libcommon.a)
+OUTDIR=../out
+OUT=$(addprefix $(OUTDIR)/,jam)
 
 #targets
 all: $(OBJ) $(OUT)
-	ar -crs $(OUT) $(OBJ)
+	$(MAKE) -C debugging
 	$(MAKE) -C graphics
 	$(MAKE) -C map
-	$(MAKE) -C script
-	$(MAKE) -C network
 	$(MAKE) -C ui
+	$(MAKE) -C utilities
+	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)
 
@@ -39,9 +36,6 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
 clean:
 	$(RM) *.o *.a *.exe
 

src/map/makefile

@@ -1,20 +1,17 @@
 #config
-INCLUDES+=. .. ../map
+INCLUDES+=. ../graphics ../utilities
 LIBS+=
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+CXXFLAGS+=-std=c++11 $(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=../..
+OUTDIR=..
 OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 
 #targets
@@ -34,9 +31,6 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
 clean:
 	$(RM) *.o *.a *.exe
 

src/map/region.cpp

@@ -19,42 +19,37 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef MAPFILEFORMAT_HPP_
-#define MAPFILEFORMAT_HPP_
-
 #include "region.hpp"
 
-#include "lua/lua.hpp"
+#include "utility.hpp"
 
-#include <string>
+#include <stdexcept>
+#include <cstring>
 
-class DummyFormat {
-public:
-	void Load(Region** const, int x, int y);
-	void Save(Region* const);
+Region::Region(int argX, int argY): x(argX), y(argY) {
+	if (x != snapToBase(REGION_WIDTH, x) || y != snapToBase(REGION_HEIGHT, y)) {
+		throw(std::invalid_argument("Region location is off grid"));
+	}
+	memset(tiles, 0, REGION_WIDTH*REGION_HEIGHT*REGION_DEPTH*sizeof(type_t));
+}
 
-	std::string SetSaveDir(std::string s) { return saveDir = s; }
-	std::string GetSaveDir() { return saveDir; }
-private:
-	std::string saveDir;
-};
+Region::Region(Region const& rhs): x(rhs.x), y(rhs.y) {
+	memcpy(tiles, rhs.tiles, REGION_WIDTH*REGION_HEIGHT*REGION_DEPTH*sizeof(type_t));
+	solid = rhs.solid;
+}
 
-//TODO: verbose save file format
-//TODO: compact save file format
+Region::type_t Region::SetTile(int x, int y, int z, type_t v) {
+	return tiles[x][y][z] = v;
+}
 
-class LuaFormat {
-public:
-	void Load(Region** const, int x, int y);
-	void Save(Region* const);
+Region::type_t Region::GetTile(int x, int y, int z) {
+	return tiles[x][y][z];
+}
 
-	std::string SetSaveDir(std::string s) { return saveDir = s; }
-	std::string GetSaveDir() { return saveDir; }
+bool Region::SetSolid(int x, int y, bool b) {
+	return solid[x * REGION_WIDTH + y] = b;
+}
 
-	lua_State* SetLuaState(lua_State* L) { return state = L; }
-	lua_State* GetLuaState() { return state; }
-private:
-	std::string saveDir;
-	lua_State* state = nullptr;
-};
-
-#endif
+bool Region::GetSolid(int x, int y) {
+	return solid[x * REGION_WIDTH + y];
+}

src/map/region.hpp

@@ -22,29 +22,46 @@
 #ifndef REGION_HPP_
 #define REGION_HPP_
 
-#define REGION_WIDTH 20
-#define REGION_HEIGHT 20
-#define REGION_DEPTH 3
+#include <bitset>
+#include <cmath>
+
+//the region's storage format
+constexpr int REGION_WIDTH = 20;
+constexpr int REGION_HEIGHT = 20;
+constexpr int REGION_DEPTH = 3;
+
+//the size of the solid map
+constexpr int REGION_SOLID_FOOTPRINT = ceil(REGION_WIDTH * REGION_HEIGHT / 8.0);
 
 class Region {
 public:
-	typedef unsigned short type_t;
+	typedef unsigned char type_t;
 
 	Region() = delete;
 	Region(int x, int y);
+	Region(Region const&);
 	~Region() = default;
 
 	type_t SetTile(int x, int y, int z, type_t v);
 	type_t GetTile(int x, int y, int z);
 
+	bool SetSolid(int x, int y, bool b);
+	bool GetSolid(int x, int y);
+
 	//accessors
 	int GetX() const { return x; }
 	int GetY() const { return y; }
+
+	std::bitset<REGION_WIDTH*REGION_HEIGHT>* GetSolidBitset() { return &solid; }
 private:
 	const int x;
 	const int y;
 
 	type_t tiles[REGION_WIDTH][REGION_HEIGHT][REGION_DEPTH];
+	std::bitset<REGION_WIDTH*REGION_HEIGHT> solid;
 };
 
+//the memory footprint of the tile and solid data; not including any metadata
+constexpr int REGION_FOOTPRINT = REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH * sizeof(Region::type_t) + REGION_SOLID_FOOTPRINT;
+
 #endif

src/map/region_api.cpp

@@ -24,15 +24,42 @@
 #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;
+	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
+	int ret = region->SetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1, lua_tointeger(L, 5));
+	lua_pushinteger(L, ret);
+	return 1;
 }
 
 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);
+	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
+	int ret = region->GetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1);
+	lua_pushinteger(L, ret);
+	return 1;
+}
+
+static int setSolid(lua_State* L) {
+	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
+	bool ret = region->SetSolid(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_toboolean(L, 4));
+	lua_pushboolean(L, ret);
+	return 1;
+}
+
+static int getSolid(lua_State* L) {
+	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
+	bool ret = region->GetSolid(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1);
+	lua_pushboolean(L, ret);
+	return 1;
+}
+
+static int getX(lua_State* L) {
+	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
+	lua_pushinteger(L, region->GetX());
+	return 1;
+}
+
+static int getY(lua_State* L) {
+	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
+	lua_pushinteger(L, region->GetY());
 	return 1;
 }
 
@@ -51,38 +78,45 @@ static int getDepth(lua_State* L) {
 	return 1;
 }
 
-static int getX(lua_State* L) {
-	Region* ptr = (Region*)lua_touserdata(L, 1);
-	lua_pushinteger(L, ptr->GetX());
+static int load(lua_State* L) {
+	//EMPTY
+	lua_pushboolean(L, false);
 	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) {
+static int save(lua_State* L) {
+	//EMPTY
 	return 0;
 }
 
-static const luaL_Reg regionlib[] = {
+static int create(lua_State* L) {
+	//EMPTY
+	return 0;
+}
+
+static int unload(lua_State* L) {
+	//EMPTY
+	return 0;
+}
+
+static const luaL_Reg regionLib[] = {
 	{"SetTile",setTile},
 	{"GetTile",getTile},
+	{"SetSolid",setSolid},
+	{"GetSolid",getSolid},
+	{"GetX",getX},
+	{"GetY",getY},
 	{"GetWidth",getWidth},
 	{"GetHeight",getHeight},
 	{"GetDepth",getDepth},
-	{"GetX",getX},
-	{"GetY",getY},
-	{"Create", dummy},
-	{"Unload", dummy},
-	{"Load", dummy},
-	{"Save", dummy},
+	{"Load",load},
+	{"Save",save},
+	{"Create",create},
+	{"Unload",unload},
 	{nullptr, nullptr}
 };
 
-LUAMOD_API int luaopen_regionapi(lua_State* L) {
-	luaL_newlib(L, regionlib);
+LUAMOD_API int openRegionAPI(lua_State* L) {
+	luaL_newlib(L, regionLib);
 	return 1;
 }

src/map/region_api.hpp

@@ -24,7 +24,7 @@
 
 #include "lua/lua.hpp"
 
-#define LUA_REGIONLIBNAME "Region"
-LUAMOD_API int luaopen_regionapi(lua_State* L);
+#define TORTUGA_REGION_NAME "Region"
+LUAMOD_API int openRegionAPI(lua_State* L);
 
 #endif

src/map/region_pager_api.cpp

@@ -0,0 +1,115 @@
+/* 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_pager_api.hpp"
+
+#include "region_pager_lua.hpp"
+#include "region.hpp"
+
+#include <string>
+
+static int getRegionPager(lua_State* L) {
+	lua_pushstring(L, TORTUGA_REGION_PAGER_PSEUDO_INDEX);
+	lua_gettable(L, LUA_REGISTRYINDEX);
+}
+
+//DOCS: These glue functions simply wrap RegionPagerLua's methods
+
+static int setTile(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	int ret = pager->SetTile(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4), lua_tointeger(L, 5));
+	lua_pushinteger(L, ret);
+	return 1;
+}
+
+static int getTile(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	int ret = pager->GetTile(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4));
+	lua_pushinteger(L, ret);
+	return 1;
+}
+
+static int setSolid(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	bool ret = pager->SetSolid(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_toboolean(L, 4));
+	lua_pushboolean(L, ret);
+	return 1;
+}
+
+static int getSolid(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	bool ret = pager->GetSolid(lua_tointeger(L, 2), lua_tointeger(L, 3));
+	lua_pushboolean(L, ret);
+	return 1;
+}
+
+static int getRegion(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
+	lua_pushlightuserdata(L, region);
+	return 1;
+}
+
+static int loadRegion(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	Region* region = pager->LoadRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
+	lua_pushlightuserdata(L, region);
+	return 1;
+}
+
+static int saveRegion(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	Region* region = pager->SaveRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
+	lua_pushlightuserdata(L, region);
+	return 1;
+}
+
+static int createRegion(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	Region* region = pager->CreateRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
+	lua_pushlightuserdata(L, region);
+	return 1;
+}
+
+static int unloadRegion(lua_State* L) {
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
+	pager->UnloadRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
+	return 0;
+}
+
+static const luaL_Reg regionPagerLib[] = {
+	{"GetRegionPager", getRegionPager},
+	{"SetTile", setTile},
+	{"GetTile", getTile},
+	{"SetSolid", setSolid},
+	{"GetSolid", getSolid},
+	{"GetRegion", getRegion},
+	{"LoadRegion", loadRegion},
+	{"SaveRegion", saveRegion},
+	{"CreateRegion", createRegion},
+	{"UnloadRegion", unloadRegion},
+	{nullptr, nullptr}
+};
+
+LUAMOD_API int openRegionPagerAPI(lua_State* L) {
+	luaL_newlib(L, regionPagerLib);
+	return 1;
+}

src/map/region_pager_api.hpp

@@ -19,6 +19,13 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "client_entry.hpp"
+#ifndef REGIONPAGERAPI_HPP_
+#define REGIONPAGERAPI_HPP_
 
-unsigned int ClientEntry::uidCounter;
+#include "lua/lua.hpp"
+
+#define TORTUGA_REGION_PAGER_PSEUDO_INDEX "RegionPagerPseudoIndex"
+#define TORTUGA_REGION_PAGER_NAME "RegionPager"
+LUAMOD_API int openRegionPagerAPI(lua_State* L);
+
+#endif

src/map/region_pager_base.cpp

@@ -19,10 +19,13 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "region_pager.hpp"
+#include "region_pager_base.hpp"
 
 #include "utility.hpp"
 
+#include <stdexcept>
+#include <algorithm>
+
 Region::type_t RegionPagerBase::SetTile(int x, int y, int z, Region::type_t v) {
 	Region* ptr = GetRegion(x, y);
 	return ptr->SetTile(x - ptr->GetX(), y - ptr->GetY(), z, v);
@@ -33,8 +36,17 @@ Region::type_t RegionPagerBase::GetTile(int x, int y, int z) {
 	return ptr->GetTile(x - ptr->GetX(), y - ptr->GetY(), z);
 }
 
+bool RegionPagerBase::SetSolid(int x, int y, int b) {
+	Region* ptr = GetRegion(x, y);
+	return ptr->SetSolid(x - ptr->GetX(), y - ptr->GetY(), b);
+}
+
+bool RegionPagerBase::GetSolid(int x, int y) {
+	Region* ptr = GetRegion(x, y);
+	return ptr->GetSolid(x - ptr->GetX(), y - ptr->GetY());
+}
+
 Region* RegionPagerBase::GetRegion(int x, int y) {
-	//snap the coords
 	x = snapToBase(REGION_WIDTH, x);
 	y = snapToBase(REGION_HEIGHT, y);
 
@@ -48,20 +60,41 @@ Region* RegionPagerBase::GetRegion(int x, int y) {
 }
 
 Region* RegionPagerBase::FindRegion(int x, int y) {
-	//snap the coords
-	x = snapToBase(REGION_WIDTH, x);
-	y = snapToBase(REGION_HEIGHT, y);
-
 	//find the region
-	for (std::list<Region*>::iterator it = regionList.begin(); it != regionList.end(); it++) {
-		if ((*it)->GetX() == x && (*it)->GetY() == y) {
-			return *it;
-		}
-	}
+	std::list<Region>::iterator it = find_if(regionList.begin(), regionList.end(), [x, y](Region& region) -> bool {
+		return region.GetX() == x && region.GetY() == y;
+	});
+	return it != regionList.end() ? &(*it) : nullptr;
+}
+
+Region* RegionPagerBase::PushRegion(Region* const ptr) {
+	regionList.push_front(*ptr);
+	return &regionList.front();
+}
+
+Region* RegionPagerBase::LoadRegion(int x, int y) {
+	//TODO: load the region if possible
 	return nullptr;
 }
 
-Region* RegionPagerBase::PushRegion(Region* ptr) {
-	regionList.push_front(ptr);
-	return regionList.front();
+Region* RegionPagerBase::SaveRegion(int x, int y) {
+	//TODO: find & save the region
+	return nullptr;
+}
+
+Region* RegionPagerBase::CreateRegion(int x, int y) {
+	if (FindRegion(x, y)) {
+		throw(std::logic_error("Cannot overwrite an existing region"));
+	}
+	regionList.emplace_front(x, y);
+	return &regionList.front();
+}
+
+void RegionPagerBase::UnloadRegion(int x, int y) {
+	//custom loop, not FindRegion()
+	regionList.remove_if([x, y](Region& region) -> bool { return region.GetX() == x && region.GetY() == y; });
+}
+
+void RegionPagerBase::UnloadAll() {
+	regionList.clear();
 }

src/map/region_pager_base.hpp

@@ -0,0 +1,60 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef REGIONPAGERBASE_HPP_
+#define REGIONPAGERBASE_HPP_
+
+#include "region.hpp"
+
+#include <list>
+
+class RegionPagerBase {
+public:
+	RegionPagerBase() = default;
+	virtual ~RegionPagerBase() { UnloadAll(); };
+
+	//tile manipulation
+	virtual Region::type_t SetTile(int x, int y, int z, Region::type_t v);
+	virtual Region::type_t GetTile(int x, int y, int z);
+
+	//solid manipulation
+	virtual bool SetSolid(int x, int y, int b);
+	virtual bool GetSolid(int x, int y);
+
+	//region manipulation
+	virtual Region* GetRegion(int x, int y);
+	virtual Region* FindRegion(int x, int y);
+	virtual Region* PushRegion(Region* const);
+
+	virtual Region* LoadRegion(int x, int y);
+	virtual Region* SaveRegion(int x, int y);
+	virtual Region* CreateRegion(int x, int y);
+	virtual void UnloadRegion(int x, int y);
+
+	virtual void UnloadAll();
+
+	//accessors & mutators
+	std::list<Region>* GetContainer() { return &regionList; }
+protected:
+	std::list<Region> regionList;
+};
+
+#endif

src/map/region_pager_lua.cpp

@@ -0,0 +1,123 @@
+/* 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_pager_lua.hpp"
+
+#include "utility.hpp"
+
+#include <stdexcept>
+
+Region* RegionPagerLua::LoadRegion(int x, int y) {
+	//load the region if possible
+
+	//something to work on
+	Region tmpRegion(x, y);
+
+	//API hook
+	lua_getglobal(lua, "Region");
+	lua_getfield(lua, -1, "Load");
+	lua_pushlightuserdata(lua, &tmpRegion);
+	if (lua_pcall(lua, 1, 1, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+	}
+	//success or failure
+	if (!lua_toboolean(lua, -1)) {
+		lua_pop(lua, 2);
+		return nullptr;
+	}
+	lua_pop(lua, 2);
+	regionList.push_front(tmpRegion);
+	return &regionList.front();
+}
+
+Region* RegionPagerLua::SaveRegion(int x, int y) {
+	//find & save the region
+	Region* ptr = FindRegion(x, y);
+	if (ptr) {
+		//API hook
+		lua_getglobal(lua, "Region");
+		lua_getfield(lua, -1, "Save");
+		lua_pushlightuserdata(lua, ptr);
+		if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
+			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+		}
+		lua_pop(lua, 1);
+	}
+	return ptr;
+}
+
+Region* RegionPagerLua::CreateRegion(int x, int y) {
+	if (FindRegion(x, y)) {
+		throw(std::logic_error("Cannot overwrite an existing region"));
+	}
+
+	//something to work on
+	Region tmpRegion(x, y);
+
+	//API hook
+	lua_getglobal(lua, "Region");
+	lua_getfield(lua, -1, "Create");
+	lua_pushlightuserdata(lua, &tmpRegion);
+	//TODO: parameters
+	if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+	}
+	lua_pop(lua, 1);
+	regionList.push_front(tmpRegion);
+	return &regionList.front();
+}
+
+void RegionPagerLua::UnloadRegion(int x, int y) {
+	lua_getglobal(lua, "Region");
+
+	regionList.remove_if([&](Region& region) -> bool {
+		if (region.GetX() == x && region.GetY() == y) {
+
+			//API hook
+			lua_getfield(lua, -1, "Unload");
+			lua_pushlightuserdata(lua, &region);
+			if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
+				throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+			}
+
+			return true;
+		}
+		return false;
+	});
+
+	lua_pop(lua, 1);
+}
+
+void RegionPagerLua::UnloadAll() {
+	lua_getglobal(lua, "Region");
+
+	for (auto& it : regionList) {
+		//API hook
+		lua_getfield(lua, -1, "Unload");
+		lua_pushlightuserdata(lua, &it);
+		if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
+			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(lua, -1) ));
+		}
+	}
+
+	lua_pop(lua, 1);
+	regionList.clear();
+}

src/map/region_pager_lua.hpp

@@ -19,30 +19,33 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef MAPALLOCATOR_HPP_
-#define MAPALLOCATOR_HPP_
+#ifndef REGIONPAGERLUA_HPP_
+#define REGIONPAGERLUA_HPP_
 
-#include "region.hpp"
+#include "region_pager_base.hpp"
 
 #include "lua/lua.hpp"
 
-class BlankAllocator {
-public:
-	void Create(Region** const, int x, int y);
-	void Unload(Region* const);
-private:
-	//
-};
+#include <string>
 
-class LuaAllocator {
+class RegionPagerLua : public RegionPagerBase {
 public:
-	void Create(Region** const, int x, int y);
-	void Unload(Region* const);
+	RegionPagerLua() = default;
+	~RegionPagerLua() = default;
 
-	lua_State* SetLuaState(lua_State* L) { return state = L; }
-	lua_State* GetLuaState() { return state; }
-private:
-	lua_State* state = nullptr;
+	//region manipulation
+	Region* LoadRegion(int x, int y) override;
+	Region* SaveRegion(int x, int y) override;
+	Region* CreateRegion(int x, int y) override;
+	void UnloadRegion(int x, int y) override;
+
+	void UnloadAll() override;
+
+	//accessors & mutators
+	lua_State* SetLuaState(lua_State* L) { return lua = L; }
+	lua_State* GetLuaState() { return lua; }
+protected:
+	lua_State* lua = nullptr;
 };
 
 #endif

src/map/tile_sheet.cpp

@@ -21,24 +21,24 @@
 */
 #include "tile_sheet.hpp"
 
-void TileSheet::Load(std::string fname, int xc, int yc) {
-	XCount = xc;
-	YCount = yc;
+void TileSheet::Load(std::string fname, int tileWidth, int tileHeight) {
 	image.LoadSurface(fname);
-	image.SetClipW(image.GetClipW()/XCount);
-	image.SetClipH(image.GetClipH()/YCount);
+	image.SetClipW(tileWidth);
+	image.SetClipH(tileHeight);
+	xCount = image.GetSurface()->w / image.GetClipW();
+	yCount = image.GetSurface()->h / image.GetClipH();
 }
 
 void TileSheet::Unload() {
 	image.FreeSurface();
-	XCount = YCount = 0;
+	xCount = yCount = 0;
 }
 
-void TileSheet::DrawTo(SDL_Surface* const dest, int x, int y, Region::type_t tile) {
+void TileSheet::DrawTileTo(SDL_Surface* const dest, int x, int y, Region::type_t tile) {
 	//0 is invisible
 	if (tile == 0) return;
-	image.SetClipX((tile-1) % XCount * image.GetClipW());
-	image.SetClipY((tile-1) / XCount * image.GetClipH());
+	image.SetClipX((tile-1) % xCount * image.GetClipW());
+	image.SetClipY((tile-1) / xCount * image.GetClipH());
 	image.DrawTo(dest, x, y);
 }
 
@@ -50,8 +50,8 @@ void TileSheet::DrawRegionTo(SDL_Surface* const dest, Region* const region, int
 				tile = region->GetTile(i, j, k);
 				//0 is invisible
 				if (tile == 0) continue;
-				image.SetClipX((tile-1) % XCount * image.GetClipW());
-				image.SetClipY((tile-1) / XCount * image.GetClipH());
+				image.SetClipX((tile-1) % xCount * image.GetClipW());
+				image.SetClipY((tile-1) / xCount * image.GetClipH());
 				image.DrawTo(dest,
 					(region->GetX() + i) * image.GetClipW() - camX,
 					(region->GetY() + j) * image.GetClipH() - camY);

src/map/tile_sheet.hpp

@@ -31,24 +31,24 @@
 class TileSheet {
 public:
 	TileSheet() = default;
-	TileSheet(std::string f, int x, int y) { Load(f, x, y); }
+	TileSheet(std::string f, int w, int h) { Load(f, w, h); }
 	~TileSheet() = default;
 
-	void Load(std::string fname, int XCount, int YCount);
+	void Load(std::string fname, int tileWidth, int tileHeight);
 	void Unload();
 
-	void DrawTo(SDL_Surface* const dest, int x, int y, Region::type_t tile);
+	void DrawTileTo(SDL_Surface* const dest, int x, int y, Region::type_t tile);
 	void DrawRegionTo(SDL_Surface* const dest, Region* const region, int camX, int camY);
 
 	//accessors
 	Image* GetImage() { return ℑ }
-	int GetXCount() { return XCount; }
-	int GetYCount() { return YCount; }
+	int GetXCount() { return xCount; }
+	int GetYCount() { return yCount; }
 	int GetTileW() { return image.GetClipW(); }
 	int GetTileH() { return image.GetClipH(); }
 private:
 	Image image;
-	int XCount = 0, YCount = 0;
+	int xCount = 0, yCount = 0;
 };
 
 #endif

src/map/tile_sheet_api.cpp

@@ -0,0 +1,82 @@
+/* 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 "tile_sheet_api.hpp"
+
+#include "tile_sheet.hpp"
+
+static int getTileSheet(lua_State* L) {
+	lua_pushstring(L, TORTUGA_TILE_SHEET_PSEUDO_INDEX);
+	lua_gettable(L, LUA_REGISTRYINDEX);
+	return 1;
+}
+
+static int load(lua_State* L) {
+	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
+	sheet->Load(lua_tostring(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4));
+	return 0;
+}
+
+static int unload(lua_State* L) {
+	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
+	sheet->Unload();
+	return 0;
+}
+
+static int getXCount(lua_State* L) {
+	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
+	lua_pushinteger(L, sheet->GetXCount());
+	return 1;
+}
+
+static int getYCount(lua_State* L) {
+	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
+	lua_pushinteger(L, sheet->GetYCount());
+	return 1;
+}
+
+static int getTileW(lua_State* L) {
+	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
+	lua_pushinteger(L, sheet->GetTileW());
+	return 1;
+}
+
+static int getTileH(lua_State* L) {
+	TileSheet* sheet = reinterpret_cast<TileSheet*>(lua_touserdata(L, 1));
+	lua_pushinteger(L, sheet->GetTileH());
+	return 1;
+}
+
+static const luaL_Reg tileSheetLib[] = {
+	{"GetTileSheet",getTileSheet},
+	{"Load",load},
+	{"Unload",unload},
+	{"GetXCount",getXCount},
+	{"GetYCount",getYCount},
+	{"GetTileW",getTileW},
+	{"GetTileH",getTileH},
+	{nullptr, nullptr}
+};
+
+LUAMOD_API int openTileSheetAPI(lua_State* L) {
+	luaL_newlib(L, tileSheetLib);
+	return 1;
+}

src/map/tile_sheet_api.hpp

@@ -19,13 +19,13 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SERVERUTILITY_HPP_
-#define SERVERUTILITY_HPP_
+#ifndef TILESHEETAPI_HPP_
+#define TILESHEETAPI_HPP_
 
-#include "sqlite3/sqlite3.h"
+#include "lua/lua.hpp"
 
-#include <string>
-
-int runSQLScript(sqlite3* db, std::string fname, int (*callback)(void*,int,char**,char**) = nullptr, void* argPtr = nullptr);
+#define TORTUGA_TILE_SHEET_PSEUDO_INDEX "TileSheetPseudoIndex"
+#define TORTUGA_TILE_SHEET_NAME "TileSheet"
+LUAMOD_API int openTileSheetAPI(lua_State* L);
 
 #endif

src/options_menu.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -25,13 +25,20 @@
 //Public access members
 //-------------------------
 
-OptionsMenu::OptionsMenu(ConfigUtility* const argConfig):
-	config(*argConfig)
-{
+OptionsMenu::OptionsMenu(lua_State* L): lua(L) {
+	//get the config info
+	lua_getglobal(lua, "config");
+	lua_getfield(lua, -1, "dir");
+	lua_getfield(lua, -1, "interface");
+	std::string interface = lua_tostring(lua, -1);
+	lua_getfield(lua, -2, "fonts");
+	std::string fonts = lua_tostring(lua, -1);
+	lua_pop(lua, 4);
+
 	//setup the utility objects
-	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
+	image.LoadSurface(interface + "button_menu.bmp");
 	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+	font.LoadSurface(fonts + "pk_white_8.bmp");
 
 	//pass the utility objects
 	backButton.SetImage(&image);
@@ -90,11 +97,7 @@ void OptionsMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 }
 
 void OptionsMenu::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			SetNextScene(SceneList::MAINMENU);
-		break;
-	}
+	//
 }
 
 void OptionsMenu::KeyUp(SDL_KeyboardEvent const& key) {

src/options_menu.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -24,15 +24,17 @@
 
 #include "base_scene.hpp"
 
-#include "config_utility.hpp"
 #include "image.hpp"
 #include "raster_font.hpp"
 #include "button.hpp"
 
+#include "lua/lua.hpp"
+
+//TODO: The options screen needs to be USED
 class OptionsMenu : public BaseScene {
 public:
 	//Public access members
-	OptionsMenu(ConfigUtility* const);
+	OptionsMenu(lua_State* L);
 	~OptionsMenu();
 
 protected:
@@ -49,8 +51,8 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//globals
-	ConfigUtility& config;
+	//shared parameters
+	lua_State* lua = nullptr;
 
 	//members
 	Image image;

src/scene_list.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* 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
@@ -32,9 +32,7 @@ enum class SceneList {
 	SPLASHSCREEN,
 	MAINMENU,
 	OPTIONSMENU,
-	LOBBYMENU,
 	INWORLD,
-	INCOMBAT,
 };
 
 #endif

src/splash_screen.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,14 +21,21 @@
 */
 #include "splash_screen.hpp"
 
+#include <string>
+
 //-------------------------
 //Public access members
 //-------------------------
 
-SplashScreen::SplashScreen(ConfigUtility* const argConfig):
-	config(*argConfig)
-{
-	logo.LoadSurface(config["dir.logos"] + "krstudios.bmp");
+SplashScreen::SplashScreen(lua_State* L): lua(L) {
+	//get the config info
+	lua_getglobal(lua, "config");
+	lua_getfield(lua, -1, "dir");
+	lua_getfield(lua, -1, "logos");
+	std::string logos = lua_tostring(lua, -1);
+	lua_pop(lua, 3);
+
+	logo.LoadSurface(logos + "krstudios.bmp");
 	startTick = std::chrono::steady_clock::now();
 }
 

src/splash_screen.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -24,15 +24,16 @@
 
 #include "base_scene.hpp"
 
-#include "config_utility.hpp"
 #include "image.hpp"
 
+#include "lua/lua.hpp"
+
 #include <chrono>
 
 class SplashScreen : public BaseScene {
 public:
 	//Public access members
-	SplashScreen(ConfigUtility* const);
+	SplashScreen(lua_State* L);
 	~SplashScreen();
 
 protected:
@@ -40,8 +41,8 @@ protected:
 	void Update(double delta);
 	void Render(SDL_Surface* const);
 
-	//globals
-	ConfigUtility& config;
+	//shared parameters
+	lua_State* lua = nullptr;
 
 	//members
 	std::chrono::steady_clock::time_point startTick;

src/ui/button.cpp

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

src/ui/button.hpp

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

src/ui/makefile

@@ -1,20 +1,17 @@
 #config
-INCLUDES+=. .. ../graphics
+INCLUDES+=. ../graphics
 LIBS+=
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+CXXFLAGS+=-std=c++11 $(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=../..
+OUTDIR=..
 OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 
 #targets
@@ -34,9 +31,6 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
 clean:
 	$(RM) *.o *.a *.exe
 

src/ui/menu_bar.cpp

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

src/ui/menu_bar.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* 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
@@ -36,6 +36,7 @@
  * This class needs a rewrite.
 */
 
+//TODO: This thing is fucking terrible, fix it and the button class
 class MenuBar {
 public:
 	MenuBar() = default;

src/ui/raster_font.cpp

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

src/ui/raster_font.hpp

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

src/utilities/bounding_box.hpp

@@ -19,57 +19,59 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef BBOX_HPP_
-#define BBOX_HPP_
+#ifndef BOUNDINGBOX_HPP_
+#define BOUNDINGBOX_HPP_
 
 #include <type_traits>
-#include <stdexcept>
 #include <algorithm>
 
-//TODO: This is supposed to interact with the vector
-class BBox {
+class BoundingBox {
 public:
-	double x, y;
-	double w, h;
+	//This is explicitly a POD
+	int x, y;
+	int w, h;
 
-	BBox() = default;
-	BBox(double i, double j, double k, double l): x(i), y(j), w(k), h(l) {};
-	~BBox() = default;
-	BBox& operator=(BBox const&) = default;
+	BoundingBox() = default;
+	BoundingBox(int i, int j, int k, int l): x(i), y(j), w(k), h(l) {};
+	~BoundingBox() = default;
+	BoundingBox& operator=(BoundingBox const&) = default;
 
-	double Size() {
-		return std::max(w*h,0.0);
+	int Size() {
+		return std::max(w*h,0);
 	}
 
-	bool IsCollision(BBox rhs) {
-		return not (
+	bool CheckOverlap(BoundingBox rhs) {
+		return !(
 			x >= rhs.x + rhs.w ||
 			y >= rhs.y + rhs.h ||
 			rhs.x >= x + w ||
-			rhs.y >= y + h
-		);
+			rhs.y >= y + h);
 	}
 
-	BBox Intersection(BBox rhs) {
-		if (!IsCollision(rhs)) {
+	BoundingBox CalcOverlap(BoundingBox rhs) {
+		if (!CheckOverlap(rhs)) {
 			return {0, 0, 0, 0};
 		}
-		BBox ret;
+		BoundingBox ret;
 		ret.x = std::max(x, rhs.x);
 		ret.y = std::max(y, rhs.y);
 		ret.w = std::min(x+w, rhs.x+rhs.w) - ret.x;
 		ret.h = std::min(y+h, rhs.y+rhs.h) - ret.y;
 		return ret;
 	}
-
-	double operator[](size_t i) {
-		if (i >= 4)
-			throw(std::domain_error("Out of range"));
-		return *(&x+i);
-	}
 };
 
 //This is explicitly a POD
-static_assert(std::is_pod<BBox>::value, "BBox is not a POD");
+static_assert(std::is_pod<Vector2>::value, "BoundingBox is not a POD");
 
-#endif
+#include "vector2.hpp"
+
+//operators
+inline BoundingBox operator+(BoundingBox b, Vector2 v) {
+	return {b.x + (int)v.x, b.y + (int)v.y, b.w, b.h};
+}
+inline BoundingBox operator+(Vector2 v, BoundingBox b) {
+	return b + v;
+}
+
+#endif

src/utilities/makefile

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