Problems with lambdas and references

OK, so I think I was working on the parameters for CreateRoom() in lua,
but then shit just got ot of control. IDK, I'm probably going about this
all wrong anyway. I just want to finish this stage, and reach the high
water mark again.

README.md

@@ -20,17 +20,13 @@ The most recent stable build for Windows can be found [here](https://dl.dropboxu
 * [lua 5.2](http://www.lua.org/) - The lua programming language
 * [SQLite3](http://www.sqlite.org/) - A lightweight SQL database engine
 
-## Tools
-
-* [WinRAR](http://www.rarlab.com/) - The best compression tool available IMO; only needed for distribution
-
 ## Copyright
 
 (Future versions (to be determined) may be released under a modified version of the [Uplink Developer's License](http://www.introversion.co.uk/uplink/developer/license.html).)
 
 The current version of Tortuga is released under the [zlib license](http://en.wikipedia.org/wiki/Zlib_License).  
 
-Copyright (c) 2013-2015 Kayne Ruse
+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.
 

README.txt

@@ -14,10 +14,9 @@ Both a game server and game client are included in this package.
 Instructions For Setup
 -------------------------
 
-1. To create a server, simply run server.exe
+1. To create a server, simply run server.exe.
-	(a public server is provided by default)
+2. To join that server, run client.exe with config settings not already in use.
-2. To join a server, your player information must be input into rsc/config.cfg
+    (Note: This process will be streamlined later).
-	(NOTE: This process will be streamlined later)
 3. To change the config settings, open rsc/config.cfg
 4. These settings must be unique for each player:
 
@@ -29,7 +28,7 @@ Instructions For Setup
 * client.avatar = elliot2.bmp #male
 * client.avatar = coa2.bmp    #female
 
-6. When you've correctly set these values, run client.exe, and select 'Start'
+6. When you've correctly set these values (good luck), select 'Start' from the
-	from the main menu; this displays the list of available servers.
+    main menu; this displays the list of available servers.
-7. Select the name of a server (default is 'Public') and select 'Join'.
+7. Select the name of your server (default is 'local') and select 'Join'.
 8. Welcome to Tortuga, enjoy your stay.

client/channels.hpp

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

client/client_application.cpp

@@ -1,11 +1,11 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
  * arising from the use of this software.
  * 
  * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
+ * including commercial ClientApplications, and to alter it and redistribute it
  * freely, subject to the following restrictions:
  * 
  * 1. The origin of this software must not be misrepresented; you must not
@@ -49,7 +49,7 @@ void ClientApplication::Init(int argc, char* argv[]) {
 
 	//load the prerequisites
 	ConfigUtility& config = ConfigUtility::GetSingleton();
-	config.Load("rsc/config.cfg", false, argc, argv);
+	config.Load("rsc/config.cfg", argc, argv);
 
 	//-------------------------
 	//Initialize the APIs
@@ -137,17 +137,11 @@ void ClientApplication::Proc() {
 		realTime = Clock::now();
 
 		//simulate game time
-		if (simTime < realTime) {
+		while (simTime < realTime) {
-			while (simTime < realTime) {
+			//call each user defined function
-				//call each user defined function
+			activeScene->RunFrame();
-				activeScene->RunFrame();
+			//~60 FPS
-				//~60 FPS
+			simTime += std::chrono::duration<int, std::milli>(16);
-				simTime += std::chrono::duration<int, std::milli>(16);
-			}
-		}
-		else {
-			//give the machine a break
-			SDL_Delay(10);
 		}
 
 		//draw the game to the screen
@@ -184,7 +178,7 @@ void ClientApplication::LoadScene(SceneList sceneIndex) {
 			activeScene = new OptionsMenu();
 		break;
 		case SceneList::LOBBYMENU:
-			activeScene = new LobbyMenu(&clientIndex, &accountIndex);
+			activeScene = new LobbyMenu(&clientIndex, &accountIndex); //TODO: can I use the ConfigUtility for these parameters?
 		break;
 		case SceneList::INWORLD:
 			activeScene = new InWorld(&clientIndex, &accountIndex);

client/client_application.hpp

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

client/client_utilities/makefile

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

client/client_utilities/terminal_error.cpp

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

client/client_utilities/terminal_error.hpp

@@ -1,34 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef TERMINALERROR_HPP_
-#define TERMINALERROR_HPP_
-
-#include <stdexcept>
-#include <string>
-
-class terminal_error: public std::runtime_error {
-public:
-	explicit terminal_error(const std::string& str): runtime_error(str) {}
-	explicit terminal_error(const char* cstr): runtime_error(cstr) {}
-};
-
-#endif

client/entities/base_character.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,12 +21,6 @@
 */
 #include "base_character.hpp"
 
-#include "config_utility.hpp"
-
-//-------------------------
-//graphics
-//-------------------------
-
 void BaseCharacter::CorrectSprite() {
 	//NOTE: These must correspond to the sprite sheet in use
 	if (motion.y > 0) {
@@ -51,33 +45,3 @@ void BaseCharacter::CorrectSprite() {
 		sprite.SetXIndex(0);
 	}
 }
-
-//-------------------------
-//metadata
-//-------------------------
-
-int BaseCharacter::SetOwner(int i) {
-	return owner = i;
-}
-
-int BaseCharacter::GetOwner() {
-	return owner;
-}
-
-std::string BaseCharacter::SetHandle(std::string s) {
-	return handle = s;
-}
-
-std::string BaseCharacter::GetHandle() const {
-	return handle;
-}
-
-std::string BaseCharacter::SetAvatar(std::string s) {
-	avatar = s;
-	sprite.LoadSurface(ConfigUtility::GetSingleton()["dir.sprites"] + avatar, CHARACTER_CELLS_X, CHARACTER_CELLS_Y);
-	return avatar;
-}
-
-std::string BaseCharacter::GetAvatar() const {
-	return avatar;
-}

client/entities/base_character.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -29,7 +29,7 @@
 //std namespace
 #include <string>
 
-class BaseCharacter: public Entity {
+class BaseCharacter : public Entity {
 public:
 	BaseCharacter() = default;
 	virtual ~BaseCharacter() = default;
@@ -38,14 +38,14 @@ public:
 	void CorrectSprite();
 
 	//metadata
-	int SetOwner(int i);
+	int SetOwner(int i) { return owner = i; }
-	int GetOwner();
+	int GetOwner() { return owner; }
-	std::string SetHandle(std::string s);
+	std::string SetHandle(std::string s) { return handle = s; }
-	std::string GetHandle() const;
+	std::string GetHandle() const { return handle; }
-	std::string SetAvatar(std::string s);
+	std::string SetAvatar(std::string s) { return avatar = s; }
-	std::string GetAvatar() const;
+	std::string GetAvatar() const { return avatar; }
 
-protected:
+private:
 	//metadata
 	int owner;
 	std::string handle;

client/entities/base_monster.cpp

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

client/entities/base_monster.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -24,12 +24,12 @@
 
 #include "entity.hpp"
 
-class BaseMonster: public Entity {
+class BaseMonster : public Entity {
 public:
 	BaseMonster() = default;
 	virtual ~BaseMonster() = default;
 
-protected:
+private:
 	//
 };
 

client/entities/entity.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -30,13 +30,13 @@ void Entity::DrawTo(SDL_Surface* const dest, int camX, int camY) {
 	sprite.DrawTo(dest, origin.x - camX, origin.y - camY);
 }
 
-SpriteSheet* Entity::GetSprite() {
+int Entity::SetEntityIndex(int i) {
-	return &sprite;
+	return entityIndex = i;
 }
 
-//-------------------------
+int Entity::SetRoomIndex(int i) {
-//accessors & mutators
+	return roomIndex = i;
-//-------------------------
+}
 
 Vector2 Entity::SetOrigin(Vector2 v) {
 	return origin = v;
@@ -45,9 +45,12 @@ Vector2 Entity::SetOrigin(Vector2 v) {
 Vector2 Entity::SetMotion(Vector2 v) {
 	return motion = v;
 }
+int Entity::GetEntityIndex() {
+	return entityIndex;
+}
 
-BoundingBox Entity::SetBounds(BoundingBox b) {
+int Entity::GetRoomIndex() {
-	return bounds = b;
+	return roomIndex;
 }
 
 Vector2 Entity::GetOrigin() {
@@ -56,8 +59,4 @@ Vector2 Entity::GetOrigin() {
 
 Vector2 Entity::GetMotion() {
 	return motion;
-}
-
-BoundingBox Entity::GetBounds() {
-	return bounds;
 }

client/entities/entity.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -32,22 +32,28 @@ public:
 	virtual void Update();
 	virtual void DrawTo(SDL_Surface* const, int camX, int camY);
 
-	SpriteSheet* GetSprite();
+	SpriteSheet* GetSprite() { return &sprite; }
 
 	//accessors & mutators
+	int SetEntityIndex(int i);
+	int SetRoomIndex(int i);
 	Vector2 SetOrigin(Vector2 v);
 	Vector2 SetMotion(Vector2 v);
-	BoundingBox SetBounds(BoundingBox b);
+	BoundingBox SetBounds(BoundingBox b) { return bounds = b; }
 
+	int GetEntityIndex();
+	int GetRoomIndex();
 	Vector2 GetOrigin();
 	Vector2 GetMotion();
-	BoundingBox GetBounds();
+	BoundingBox GetBounds() { return bounds; }
 
 protected:
 	Entity() = default;
-	virtual ~Entity() = default;
+	~Entity() = default;
 
 	SpriteSheet sprite;
+	int entityIndex = -1;
+	int roomIndex = -1;
 	Vector2 origin;
 	Vector2 motion;
 	BoundingBox bounds;

client/entities/local_character.cpp

@@ -1,76 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "local_character.hpp"
-
-#include <iostream>
-
-bool LocalCharacter::ProcessCollisionGrid(std::list<BoundingBox> boxList, Uint8* keyState) {
-	//skip this if there's no movement
-	if (motion == 0) {
-		return false;
-	}
-
-	//determine the simple movement based on input
-	Vector2 newMotion = {0, 0};
-	if (keyState[SDLK_w]) {
-		newMotion.y -= CHARACTER_WALKING_SPEED;
-	}
-	if (keyState[SDLK_a]) {
-		newMotion.x -= CHARACTER_WALKING_SPEED;
-	}
-	if (keyState[SDLK_s]) {
-		newMotion.y += CHARACTER_WALKING_SPEED;
-	}
-	if (keyState[SDLK_d]) {
-		newMotion.x += CHARACTER_WALKING_SPEED;
-	}
-
-	bool ret = false;
-
-	for(auto& box : boxList) {
-		if (box.CheckCollision(origin + bounds)) {
-			//push the character to the closest non-contact position
-			Vector2 shift = box.CalcShift(origin + bounds);
-			origin += shift;
-
-			//set any motion in that direction to zero
-			if (shift.x != 0) {
-				newMotion.x = 0;
-			}
-			if (shift.y != 0) {
-				newMotion.y = 0;
-			}
-			ret = true;
-		}
-	}
-
-	//handle diagonals
-	if (newMotion.x != 0 && newMotion.y != 0) {
-		newMotion *= CHARACTER_WALKING_MOD;
-	}
-
-	//set the new motion
-	motion = newMotion;
-
-	//signal for updates
-	return ret;
-}

client/gameplay_scenes/in_world_entities.cpp

@@ -1,252 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "in_world.hpp"
-
-#include "channels.hpp"
-
-#include <iostream>
-#include <sstream>
-#include <stdexcept>
-
-//-------------------------
-//character management
-//-------------------------
-
-//DOCS: preexisting characters will result in query responses
-//DOCS: new characters will result in create messages
-//DOCS: this client's character will exist in both (skipped)
-
-void InWorld::HandleCharacterCreate(CharacterPacket* const argPacket) {
-	//prevent double message
-	if (characterMap.find(argPacket->characterIndex) != characterMap.end()) {
-		std::ostringstream msg;
-		msg << "Double character creation event; ";
-		msg << "Index: " << argPacket->characterIndex << "; ";
-		msg << "Handle: " << argPacket->handle;
-		throw(std::runtime_error(msg.str()));
-	}
-
-	//implicity create and retrieve the entity
-	BaseCharacter* character = &characterMap[argPacket->characterIndex];
-
-	//fill the character's info
-	character->SetOrigin(argPacket->origin);
-	character->SetMotion(argPacket->motion);
-	character->SetBounds({CHARACTER_BOUNDS_X, CHARACTER_BOUNDS_Y, CHARACTER_BOUNDS_WIDTH, CHARACTER_BOUNDS_HEIGHT});
-	character->SetHandle(argPacket->handle);
-	character->SetAvatar(argPacket->avatar);
-	character->SetOwner(argPacket->accountIndex);
-	character->CorrectSprite();
-
-	//check for this player's character
-	if (character->GetOwner() == accountIndex) {
-		localCharacter = static_cast<LocalCharacter*>(character);
-
-		//focus the camera on this character
-		camera.marginX = (camera.width / 2 - localCharacter->GetSprite()->GetImage()->GetClipW() / 2);
-		camera.marginY = (camera.height/ 2 - localCharacter->GetSprite()->GetImage()->GetClipH() / 2);
-
-		//focus on this character's info
-		characterIndex = argPacket->characterIndex;
-		roomIndex = argPacket->roomIndex;
-	}
-
-	//debug
-	std::cout << "Create, total: " << characterMap.size() << std::endl;
-}
-
-void InWorld::HandleCharacterDelete(CharacterPacket* const argPacket) {
-	//ignore if this character doesn't exist
-	std::map<int, BaseCharacter>::iterator characterIt = characterMap.find(argPacket->characterIndex);
-	if (characterIt == characterMap.end()) {
-		return;
-	}
-
-	//check for this player's character
-	if ((*characterIt).second.GetOwner() == accountIndex) {
-		localCharacter = nullptr;
-
-		//clear the camera
-		camera.marginX = 0;
-		camera.marginY = 0;
-
-		//clear the room
-		roomIndex = -1;
-	}
-
-	//remove this character
-	characterMap.erase(characterIt);
-
-	//debug
-	std::cout << "Delete, total: " << characterMap.size() << std::endl;
-}
-
-void InWorld::HandleCharacterQueryExists(CharacterPacket* const argPacket) {
-	//prevent a double message about this player's character
-	if (argPacket->accountIndex == accountIndex) {
-		return;
-	}
-
-	//ignore characters in a different room (sub-optimal)
-	if (argPacket->roomIndex != roomIndex) {
-		return;
-	}
-
-	//implicitly construct the character if it doesn't exist
-	BaseCharacter* character = &characterMap[argPacket->characterIndex];
-
-	//set/update the character's info
-	character->SetOrigin(argPacket->origin);
-	character->SetMotion(argPacket->motion);
-	character->SetBounds({CHARACTER_BOUNDS_X, CHARACTER_BOUNDS_Y, CHARACTER_BOUNDS_WIDTH, CHARACTER_BOUNDS_HEIGHT});
-	character->SetHandle(argPacket->handle);
-	character->SetAvatar(argPacket->avatar);
-	character->SetOwner(argPacket->accountIndex);
-	character->CorrectSprite();
-
-	//debug
-	std::cout << "Query, total: " << characterMap.size() << std::endl;
-}
-
-void InWorld::HandleCharacterMovement(CharacterPacket* const argPacket) {
-	//TODO: Authentication
-	if (argPacket->characterIndex == characterIndex) {
-		return;
-	}
-
-	//check that this character exists
-	std::map<int, BaseCharacter>::iterator characterIt = characterMap.find(argPacket->characterIndex);
-	if (characterIt != characterMap.end()) {
-		//set the origin and motion
-		characterIt->second.SetOrigin(argPacket->origin);
-		characterIt->second.SetMotion(argPacket->motion);
-		characterIt->second.CorrectSprite();
-	}
-}
-
-void InWorld::HandleCharacterAttack(CharacterPacket* const argPacket) {
-	//TODO: attack animation
-}
-
-//-------------------------
-//monster management
-//-------------------------
-
-void InWorld::HandleMonsterCreate(MonsterPacket* const argPacket) {
-	//TODO
-}
-
-void InWorld::HandleMonsterDelete(MonsterPacket* const argPacket) {
-	//TODO
-}
-
-void InWorld::HandleMonsterQueryExists(MonsterPacket* const argPacket) {
-	//TODO
-}
-
-void InWorld::HandleMonsterMovement(MonsterPacket* const argPacket) {
-	//TODO
-}
-
-void InWorld::HandleMonsterAttack(MonsterPacket* const argPacket) {
-	//TODO
-}
-
-//-------------------------
-//player movement
-//-------------------------
-
-void InWorld::ProcessLocalCharacterMovement() {
-	//character movement
-	if (!localCharacter) {
-		return;
-	}
-
-	Vector2 newMotion = {0, 0};
-	if (keyState[SDLK_w]) {
-		newMotion.y -= CHARACTER_WALKING_SPEED;
-	}
-	if (keyState[SDLK_a]) {
-		newMotion.x -= CHARACTER_WALKING_SPEED;
-	}
-	if (keyState[SDLK_s]) {
-		newMotion.y += CHARACTER_WALKING_SPEED;
-	}
-	if (keyState[SDLK_d]) {
-		newMotion.x += CHARACTER_WALKING_SPEED;
-	}
-
-	//handle diagonals
-	if (newMotion.x != 0 && newMotion.y != 0) {
-		newMotion *= CHARACTER_WALKING_MOD;
-	}
-
-	//set the info
-	if (localCharacter->GetMotion() != newMotion) {
-		localCharacter->SetMotion(newMotion);
-		localCharacter->CorrectSprite();
-		SendLocalCharacterMovement();
-	}
-}
-
-void InWorld::SendLocalCharacterMovement() {
-	CharacterPacket newPacket;
-	newPacket.type = SerialPacketType::CHARACTER_MOVEMENT;
-
-	newPacket.accountIndex = accountIndex;
-	newPacket.characterIndex = characterIndex;
-	newPacket.roomIndex = roomIndex;
-	newPacket.origin = localCharacter->GetOrigin();
-	newPacket.motion = localCharacter->GetMotion();
-
-	network.SendTo(Channels::SERVER, &newPacket);
-}
-
-std::list<BoundingBox> InWorld::GenerateCollisionGrid(Entity* ptr, int tileWidth, int tileHeight) {
-	//prepare for collisions
-	BoundingBox wallBounds = {0, 0, tileWidth, tileHeight};
-	std::list<BoundingBox> boxList;
-
-	//NOTE: for loops were too dense to work with, so I've just used while loops
-
-	//outer loop
-	wallBounds.x = snapToBase((double)wallBounds.w, ptr->GetOrigin().x);
-	while(wallBounds.x < (ptr->GetOrigin() + ptr->GetBounds()).x + ptr->GetBounds().w) {
-		//inner loop
-		wallBounds.y = snapToBase((double)wallBounds.h, ptr->GetOrigin().y);
-		while(wallBounds.y < (ptr->GetOrigin() + ptr->GetBounds()).y + ptr->GetBounds().h) {
-			//check to see if this tile is solid
-			if (regionPager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
-				//push onto the box set
-				boxList.push_front(wallBounds);
-			}
-
-			//increment
-			wallBounds.y += wallBounds.h;
-		}
-
-		//increment
-		wallBounds.x += wallBounds.w;
-	}
-
-	return std::move(boxList);
-}

client/gameplay_scenes/in_world_networking.cpp

@@ -1,264 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "in_world.hpp"
-
-#include "channels.hpp"
-#include "ip_operators.hpp"
-#include "terminal_error.hpp"
-
-#include <chrono>
-#include <sstream>
-#include <stdexcept>
-
-//-------------------------
-//Basic connections
-//-------------------------
-
-void InWorld::HandlePacket(SerialPacket* const argPacket) {
-	switch(argPacket->type) {
-		//heartbeat system
-		case SerialPacketType::PING:
-			HandlePing(static_cast<ServerPacket*>(argPacket));
-		break;
-		case SerialPacketType::PONG:
-			HandlePong(static_cast<ServerPacket*>(argPacket));
-		break;
-
-		//game server connections
-		case SerialPacketType::LOGOUT_RESPONSE:
-			HandleLogoutResponse(static_cast<ClientPacket*>(argPacket));
-		break;
-		case SerialPacketType::DISCONNECT_RESPONSE:
-			HandleDisconnectResponse(static_cast<ClientPacket*>(argPacket));
-		break;
-		case SerialPacketType::DISCONNECT_FORCED:
-			HandleDisconnectForced(static_cast<ClientPacket*>(argPacket));
-		break;
-
-		//map management
-		case SerialPacketType::REGION_CONTENT:
-			HandleRegionContent(static_cast<RegionPacket*>(argPacket));
-		break;
-
-		//character management
-		case SerialPacketType::CHARACTER_CREATE:
-			HandleCharacterCreate(static_cast<CharacterPacket*>(argPacket));
-		break;
-		case SerialPacketType::CHARACTER_DELETE:
-			HandleCharacterDelete(static_cast<CharacterPacket*>(argPacket));
-		break;
-		case SerialPacketType::QUERY_CHARACTER_EXISTS:
-			HandleCharacterQueryExists(static_cast<CharacterPacket*>(argPacket));
-		break;
-		case SerialPacketType::CHARACTER_MOVEMENT:
-			HandleCharacterMovement(static_cast<CharacterPacket*>(argPacket));
-		break;
-		case SerialPacketType::CHARACTER_ATTACK:
-			HandleCharacterAttack(static_cast<CharacterPacket*>(argPacket));
-		break;
-
-		//monster management
-		case SerialPacketType::MONSTER_CREATE:
-			HandleMonsterCreate(static_cast<MonsterPacket*>(argPacket));
-		break;
-		case SerialPacketType::MONSTER_DELETE:
-			HandleMonsterDelete(static_cast<MonsterPacket*>(argPacket));
-		break;
-		case SerialPacketType::QUERY_MONSTER_EXISTS:
-			HandleMonsterQueryExists(static_cast<MonsterPacket*>(argPacket));
-		break;
-		case SerialPacketType::MONSTER_MOVEMENT:
-			HandleMonsterMovement(static_cast<MonsterPacket*>(argPacket));
-		break;
-		case SerialPacketType::MONSTER_ATTACK:
-			HandleMonsterAttack(static_cast<MonsterPacket*>(argPacket));
-		break;
-
-		//rejection messages
-		case SerialPacketType::REGION_REJECTION:
-		case SerialPacketType::CHARACTER_REJECTION:
-			throw(terminal_error(static_cast<TextPacket*>(argPacket)->text));
-		break;
-		case SerialPacketType::SHUTDOWN_REJECTION:
-			throw(std::runtime_error(static_cast<TextPacket*>(argPacket)->text));
-		break;
-
-		//errors
-		default: {
-			std::ostringstream msg;
-			msg << "Unknown SerialPacketType encountered in InWorld: " << static_cast<int>(argPacket->type);
-			throw(std::runtime_error(msg.str()));
-		}
-		break;
-	}
-}
-
-void InWorld::HandlePing(ServerPacket* const argPacket) {
-	ServerPacket newPacket;
-	newPacket.type = SerialPacketType::PONG;
-	network.SendTo(argPacket->srcAddress, &newPacket);
-}
-
-void InWorld::HandlePong(ServerPacket* const argPacket) {
-	if (*network.GetIPAddress(Channels::SERVER) != argPacket->srcAddress) {
-		throw(std::runtime_error("Heartbeat message received from an unknown source"));
-	}
-	attemptedBeats = 0;
-	lastBeat = Clock::now();
-}
-
-//-------------------------
-//Connection control
-//-------------------------
-
-void InWorld::SendLogoutRequest() {
-	ClientPacket newPacket;
-
-	//send a logout request
-	newPacket.type = SerialPacketType::LOGOUT_REQUEST;
-	newPacket.accountIndex = accountIndex;
-
-	network.SendTo(Channels::SERVER, &newPacket);
-}
-
-void InWorld::SendDisconnectRequest() {
-	ClientPacket newPacket;
-
-	//send a disconnect request
-	newPacket.type = SerialPacketType::DISCONNECT_REQUEST;
-	newPacket.clientIndex = clientIndex;
-
-	network.SendTo(Channels::SERVER, &newPacket);
-}
-
-void InWorld::SendShutdownRequest() {
-	ClientPacket newPacket;
-
-	//send a shutdown request
-	newPacket.type = SerialPacketType::SHUTDOWN_REQUEST;
-	newPacket.accountIndex = accountIndex;
-
-	network.SendTo(Channels::SERVER, &newPacket);
-}
-
-void InWorld::HandleLogoutResponse(ClientPacket* const argPacket) {
-	if (localCharacter) {
-		characterMap.erase(characterIndex);
-		localCharacter = nullptr;
-	}
-
-	accountIndex = -1;
-	characterIndex = -1;
-
-	//reset the camera
-	camera.marginX = camera.marginY = 0;
-
-	//because, why not? I guess...
-	SendDisconnectRequest();
-}
-
-void InWorld::HandleDisconnectResponse(ClientPacket* const argPacket) {
-	HandleLogoutResponse(argPacket);//shortcut
-	SetNextScene(SceneList::DISCONNECTEDSCREEN);
-	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have successfully logged out";
-}
-
-void InWorld::HandleDisconnectForced(ClientPacket* const argPacket) {
-	HandleDisconnectResponse(argPacket);//shortcut
-	SetNextScene(SceneList::DISCONNECTEDSCREEN);
-	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have been forcibly disconnected by the server";
-}
-
-void InWorld::CheckHeartBeat() {
-	//check the connection (heartbeat)
-	if (Clock::now() - lastBeat > std::chrono::seconds(3)) {
-		if (attemptedBeats > 2) {
-			//escape to the disconnect screen
-			SendDisconnectRequest();
-			SetNextScene(SceneList::DISCONNECTEDSCREEN);
-			ConfigUtility::GetSingleton()["client.disconnectMessage"] = "Error: Lost connection to the server";
-		}
-		else {
-			ServerPacket newPacket;
-			newPacket.type = SerialPacketType::PING;
-			network.SendTo(Channels::SERVER, &newPacket);
-
-			attemptedBeats++;
-			lastBeat = Clock::now();
-		}
-	}
-}
-
-//-------------------------
-//map management
-//-------------------------
-
-void InWorld::SendRegionRequest(int roomIndex, int x, int y) {
-	RegionPacket packet;
-
-	//pack the region's data
-	packet.type = SerialPacketType::REGION_REQUEST;
-	packet.roomIndex = roomIndex;
-	packet.x = x;
-	packet.y = y;
-
-	network.SendTo(Channels::SERVER, &packet);
-}
-
-void InWorld::HandleRegionContent(RegionPacket* const argPacket) {
-	//replace existing regions
-	regionPager.UnloadIf([&](Region const& region) -> bool {
-		return region.GetX() == argPacket->x && region.GetY() == argPacket->y;
-	});
-	regionPager.PushRegion(argPacket->region);
-
-	//clean up after the serial code
-	delete argPacket->region;
-	argPacket->region = nullptr;
-}
-
-void InWorld::UpdateMap() {
-	if (roomIndex == -1) {
-		return;
-	}
-
-	//these represent the zone of regions that the client needs loaded, including the mandatory buffers (+1/-1)
-	int xStart = snapToBase(REGION_WIDTH, camera.x/tileSheet.GetTileW()) - REGION_WIDTH;
-	int xEnd = snapToBase(REGION_WIDTH, (camera.x+camera.width)/tileSheet.GetTileW()) + REGION_WIDTH;
-
-	int yStart = snapToBase(REGION_HEIGHT, camera.y/tileSheet.GetTileH()) - REGION_HEIGHT;
-	int yEnd = snapToBase(REGION_HEIGHT, (camera.y+camera.height)/tileSheet.GetTileH()) + REGION_HEIGHT;
-
-	//prune distant regions
-	regionPager.GetContainer()->remove_if([&](Region const& region) -> bool {
-		return region.GetX() < xStart || region.GetX() > xEnd || region.GetY() < yStart || region.GetY() > yEnd;
-	});
-
-	//request empty regions within this zone
-	for (int i = xStart; i <= xEnd; i += REGION_WIDTH) {
-		for (int j = yStart; j <= yEnd; j += REGION_HEIGHT) {
-			if (!regionPager.FindRegion(i, j)) {
-				SendRegionRequest(roomIndex, i, j);
-			}
-		}
-	}
-}

client/gameplay_scenes/in_world_scene.cpp

@@ -1,253 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "in_world.hpp"
-
-#include "channels.hpp"
-
-#include "terminal_error.hpp"
-#include <stdexcept>
-#include <algorithm>
-#include <cmath>
-#include <iostream>
-#include <sstream>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-InWorld::InWorld(int* const argClientIndex,	int* const argAccountIndex):
-	clientIndex(*argClientIndex),
-	accountIndex(*argAccountIndex),
-	keyState(SDL_GetKeyState(nullptr))
-{
-	//setup the utility objects
-	buttonImage.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	buttonImage.SetClipH(buttonImage.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
-
-	//pass the utility objects
-	disconnectButton.SetImage(&buttonImage);
-	disconnectButton.SetFont(&font);
-	shutDownButton.SetImage(&buttonImage);
-	shutDownButton.SetFont(&font);
-
-	//set the button positions
-	disconnectButton.SetX(50);
-	disconnectButton.SetY(50 + buttonImage.GetClipH() * 0);
-	shutDownButton.SetX(50);
-	shutDownButton.SetY(50 + buttonImage.GetClipH() * 1);
-
-	//set the button texts
-	disconnectButton.SetText("Disconnect");
-	shutDownButton.SetText("Shut Down");
-
-	//load the tilesheet
-	//TODO: add the tilesheet to the map system
-	//TODO: Tile size and tile sheet should be loaded elsewhere
-	tileSheet.Load(config["dir.tilesets"] + "overworld.bmp", 32, 32);
-
-	//Send the character data
-	//TODO: login scene, prompt, etc.
-	CharacterPacket newPacket;
-	newPacket.type = SerialPacketType::CHARACTER_LOAD;
-	strncpy(newPacket.handle, config["client.handle"].c_str(), PACKET_STRING_SIZE);
-	strncpy(newPacket.avatar, config["client.avatar"].c_str(), PACKET_STRING_SIZE);
-	newPacket.accountIndex = accountIndex;
-	network.SendTo(Channels::SERVER, &newPacket);
-
-	//query the world state
-	memset(&newPacket, 0, MAX_PACKET_SIZE);
-	newPacket.type = SerialPacketType::QUERY_CHARACTER_EXISTS;
-	network.SendTo(Channels::SERVER, &newPacket);
-
-	//set the camera's values
-	camera.width = GetScreen()->w;
-	camera.height = GetScreen()->h;
-
-	//debug
-	//
-}
-
-InWorld::~InWorld() {
-	//unload the local data
-	characterMap.clear();
-	monsterMap.clear();
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void InWorld::FrameStart() {
-	//
-}
-
-void InWorld::Update() {
-	//create and zero the buffer
-	SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]);
-	memset(packetBuffer, 0, MAX_PACKET_SIZE);
-
-	try {
-		//suck in and process all waiting packets
-		while(network.Receive(packetBuffer)) {
-			HandlePacket(packetBuffer);
-		}
-	}
-	catch(terminal_error& e) {
-		throw(e);
-	}
-	catch(std::exception& e) {
-		std::cerr << "HandlePacket Error: " << e.what() << std::endl;
-	}
-
-	//free the buffer
-	delete reinterpret_cast<char*>(packetBuffer);
-
-	//heartbeat system
-	CheckHeartBeat();
-
-	//update all entities
-	for (auto& it : characterMap) {
-		it.second.Update();
-	}
-	for (auto& it : monsterMap) {
-		it.second.Update();
-	}
-
-	//update the map
-	UpdateMap();
-
-	//skip the rest without a local character
-	if (!localCharacter) {
-		return;
-	}
-
-	//get the collidable boxes
-	std::list<BoundingBox> boxList = GenerateCollisionGrid(localCharacter, tileSheet.GetTileW(), tileSheet.GetTileH());
-
-	//process the collisions
-	if (localCharacter->ProcessCollisionGrid(boxList, keyState)) {
-		localCharacter->CorrectSprite();
-		SendLocalCharacterMovement();
-	}
-
-	//update the camera
-	camera.x = localCharacter->GetOrigin().x - camera.marginX;
-	camera.y = localCharacter->GetOrigin().y - camera.marginY;
-}
-
-void InWorld::FrameEnd() {
-	//
-}
-
-void InWorld::RenderFrame() {
-	SDL_FillRect(GetScreen(), 0, 0);
-	Render(GetScreen());
-	SDL_Flip(GetScreen());
-	fps.Calculate();
-}
-
-void InWorld::Render(SDL_Surface* const screen) {
-	//draw the map
-	for (std::list<Region>::iterator it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); it++) {
-		tileSheet.DrawRegionTo(screen, &(*it), camera.x, camera.y);
-	}
-
-	//draw the entities
-	for (auto& it : characterMap) {
-		//TODO: depth ordering
-		it.second.DrawTo(screen, camera.x, camera.y);
-	}
-	for (auto& it : monsterMap) {
-		//TODO: depth ordering
-		it.second.DrawTo(screen, camera.x, camera.y);
-	}
-
-	//draw UI
-	disconnectButton.DrawTo(screen);
-	shutDownButton.DrawTo(screen);
-	std::ostringstream msg;
-	msg << fps.GetFrameRate();
-	font.DrawStringTo(msg.str(), screen, 0, 0);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void InWorld::QuitEvent() {
-	//two-step logout
-	SendDisconnectRequest();
-	SetNextScene(SceneList::QUIT);
-}
-
-void InWorld::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	disconnectButton.MouseMotion(motion);
-	shutDownButton.MouseMotion(motion);
-}
-
-void InWorld::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	disconnectButton.MouseButtonDown(button);
-	shutDownButton.MouseButtonDown(button);
-}
-
-void InWorld::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (disconnectButton.MouseButtonUp(button) == Button::State::HOVER && button.button == SDL_BUTTON_LEFT) {
-		SendLogoutRequest();
-	}
-	if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER && button.button == SDL_BUTTON_LEFT) {
-		SendShutdownRequest();
-	}
-}
-
-void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
-	//hotkeys & player input
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			//TODO: the escape key should actually control menus and stuff
-			SendLogoutRequest();
-		return;
-		case SDLK_w:
-		case SDLK_a:
-		case SDLK_s:
-		case SDLK_d:
-			ProcessLocalCharacterMovement();
-		break;
-		default:
-			//DOCS: prevents wrong keys screwing with character movement
-			return;
-	}
-}
-
-void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_w:
-		case SDLK_a:
-		case SDLK_s:
-		case SDLK_d:
-			ProcessLocalCharacterMovement();
-		break;
-		default:
-			//DOCS: prevents wrong keys screwing with character movement
-			return;
-	}
-}

client/gameplay_scenes/makefile

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

client/main.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -36,7 +36,7 @@ int main(int argc, char* argv[]) {
 		ConfigUtility::CreateSingleton();
 		UDPNetworkUtility::CreateSingleton();
 
-		//call the client's routines
+		//call the server's routines
 		ClientApplication::CreateSingleton();
 		ClientApplication& app = ClientApplication::GetSingleton();
 

client/makefile

@@ -1,5 +1,5 @@
 #include directories
-INCLUDES+=. client_utilities entities gameplay_scenes menu_scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
+INCLUDES+=. entities scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities
 
 #libraries
 #the order of the $(LIBS) is important, at least for MinGW
@@ -25,10 +25,8 @@ OUT=$(addprefix $(OUTDIR)/,client)
 
 #targets
 all: $(OBJ) $(OUT)
-	$(MAKE) -C client_utilities
 	$(MAKE) -C entities
-	$(MAKE) -C gameplay_scenes
+	$(MAKE) -C scenes
-	$(MAKE) -C menu_scenes
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)

client/scene_list.hpp

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

client/scenes/base_scene.cpp

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

client/scenes/base_scene.hpp

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

client/scenes/disconnected_screen.cpp

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

client/scenes/disconnected_screen.hpp

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

client/scenes/in_world.cpp

@@ -0,0 +1,558 @@
+/* Copyright: (c) Kayne Ruse 2013, 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "in_world.hpp"
+
+#include "channels.hpp"
+#include "utility.hpp"
+#include "config_utility.hpp"
+
+#include <stdexcept>
+#include <algorithm>
+#include <cmath>
+#include <iostream>
+
+//-------------------------
+//Public access members
+//-------------------------
+
+InWorld::InWorld(int* const argClientIndex,	int* const argAccountIndex):
+	clientIndex(*argClientIndex),
+	accountIndex(*argAccountIndex)
+{
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+
+	//setup the utility objects
+	buttonImage.LoadSurface(config["dir.interface"] + "button_menu.bmp");
+	buttonImage.SetClipH(buttonImage.GetClipH()/3);
+	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
+
+	//pass the utility objects
+	disconnectButton.SetImage(&buttonImage);
+	disconnectButton.SetFont(&font);
+	shutDownButton.SetImage(&buttonImage);
+	shutDownButton.SetFont(&font);
+
+	//set the button positions
+	disconnectButton.SetX(50);
+	disconnectButton.SetY(50 + buttonImage.GetClipH() * 0);
+	shutDownButton.SetX(50);
+	shutDownButton.SetY(50 + buttonImage.GetClipH() * 1);
+
+	//set the button texts
+	disconnectButton.SetText("Disconnect");
+	shutDownButton.SetText("Shut Down");
+
+	//load the tilesheet
+	//TODO: add the tilesheet to the map system?
+	//TODO: Tile size and tile sheet should be loaded elsewhere
+	tileSheet.Load(config["dir.tilesets"] + "overworld.bmp", 32, 32);
+
+	//send this player's character info
+//	CharacterPacket newPacket;
+//	newPacket.type = SerialPacketType::CHARACTER_NEW;
+//	strncpy(newPacket.handle, config["client.handle"].c_str(), PACKET_STRING_SIZE);
+//	strncpy(newPacket.avatar, config["client.avatar"].c_str(), PACKET_STRING_SIZE);
+//	newPacket.accountIndex = accountIndex;
+//	network.SendTo(Channels::SERVER, &newPacket);
+
+	//request a sync
+//	RequestSynchronize();
+
+	//debug
+	//
+}
+
+InWorld::~InWorld() {
+	//
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void InWorld::FrameStart() {
+	//
+}
+
+void InWorld::Update() {
+	//suck in and process all waiting packets
+	SerialPacket* packetBuffer = reinterpret_cast<SerialPacket*>(new char[MAX_PACKET_SIZE]);
+	while(network.Receive(packetBuffer)) {
+		HandlePacket(packetBuffer);
+	}
+	delete reinterpret_cast<char*>(packetBuffer);
+
+	//update the characters
+	for (auto& it : characterMap) {
+		it.second.Update();
+	}
+
+	//check the map
+	UpdateMap();
+
+	//skip the rest
+	if (!localCharacter) {
+		return;
+	}
+
+	//check for collisions with the map
+	BoundingBox wallBounds = {0, 0, tileSheet.GetTileW(), tileSheet.GetTileH()};
+	const int xCount = localCharacter->GetBounds().w / wallBounds.w + 1;
+	const int yCount = localCharacter->GetBounds().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, localCharacter->GetOrigin().x);
+			wallBounds.y = wallBounds.h * j + snapToBase((double)wallBounds.h, localCharacter->GetOrigin().y);
+
+			if (!regionPager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
+				continue;
+			}
+
+			if ((localCharacter->GetOrigin() + localCharacter->GetBounds()).CheckOverlap(wallBounds)) {
+				localCharacter->SetOrigin(localCharacter->GetOrigin() - (localCharacter->GetMotion()));
+				localCharacter->SetMotion({0,0});
+				localCharacter->CorrectSprite();
+				SendPlayerUpdate();
+			}
+		}
+	}
+
+	//update the camera (following the player)
+	camera.x = localCharacter->GetOrigin().x - camera.marginX;
+	camera.y = localCharacter->GetOrigin().y - camera.marginY;
+
+	//check the connection
+	if (Clock::now() - lastBeat > std::chrono::seconds(3)) {
+		if (attemptedBeats > 2) {
+			RequestDisconnect();
+			SetNextScene(SceneList::DISCONNECTEDSCREEN);
+			ConfigUtility::GetSingleton()["client.disconnectMessage"] = "Error: Lost connection to the server";
+		}
+
+		ServerPacket newPacket;
+		newPacket.type = SerialPacketType::PING;
+		network.SendTo(Channels::SERVER, &newPacket);
+
+		attemptedBeats++;
+		lastBeat = Clock::now();
+	}
+}
+
+void InWorld::FrameEnd() {
+	//
+}
+
+void InWorld::RenderFrame() {
+//	SDL_FillRect(GetScreen(), 0, 0);
+	Render(GetScreen());
+	SDL_Flip(GetScreen());
+	fps.Calculate();
+}
+
+void InWorld::Render(SDL_Surface* const screen) {
+	//draw the map
+	for (std::list<Region>::iterator it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); it++) {
+		tileSheet.DrawRegionTo(screen, &(*it), camera.x, camera.y);
+	}
+
+	//draw characters
+	for (auto& it : characterMap) {
+		//BUG: #29 drawing order according to Y origin
+		//TODO: use a list of renderable objects
+		it.second.DrawTo(screen, camera.x, camera.y);
+	}
+
+	//draw UI
+	disconnectButton.DrawTo(screen);
+	shutDownButton.DrawTo(screen);
+	font.DrawStringTo(to_string_custom(fps.GetFrameRate()), screen, 0, 0);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void InWorld::QuitEvent() {
+	//exit the game AND the server
+	RequestDisconnect();
+	SetNextScene(SceneList::QUIT);
+}
+
+void InWorld::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	disconnectButton.MouseMotion(motion);
+	shutDownButton.MouseMotion(motion);
+}
+
+void InWorld::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	disconnectButton.MouseButtonDown(button);
+	shutDownButton.MouseButtonDown(button);
+}
+
+void InWorld::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	if (disconnectButton.MouseButtonUp(button) == Button::State::HOVER && button.button == SDL_BUTTON_LEFT) {
+		RequestDisconnect();
+	}
+	if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER && button.button == SDL_BUTTON_LEFT) {
+		RequestShutDown();
+	}
+}
+
+void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
+	if (!localCharacter) {
+		return;
+	}
+
+	//hotkeys
+	switch(key.keysym.sym) {
+		case SDLK_ESCAPE:
+			RequestDisconnect();
+		break;
+	}
+
+	//player movement
+	Vector2 motion = localCharacter->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;
+		default:
+			return;
+	}
+	localCharacter->SetMotion(motion);
+	localCharacter->CorrectSprite();
+	SendPlayerUpdate();
+}
+
+void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
+	if (!localCharacter) {
+		return;
+	}
+
+	//player movement
+	Vector2 motion = localCharacter->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;
+		default:
+			return;
+	}
+	localCharacter->SetMotion(motion);
+	localCharacter->CorrectSprite();
+	SendPlayerUpdate();
+}
+
+//-------------------------
+//Network handlers
+//-------------------------
+
+void InWorld::HandlePacket(SerialPacket* const argPacket) {
+	switch(argPacket->type) {
+		//heartbeat system
+		case SerialPacketType::PING: {
+			ServerPacket newPacket;
+			newPacket.type = SerialPacketType::PONG;
+			network.SendTo(argPacket->srcAddress, &newPacket);
+		}
+		break;
+		case SerialPacketType::PONG:
+//			HandlePong(static_cast<ServerPacket*>(argPacket));
+		break;
+
+		//game server connections
+		case SerialPacketType::LOGOUT_RESPONSE:
+//			HandleLogoutResponse(static_cast<ClientPacket*>(argPacket));
+		break;
+		case SerialPacketType::DISCONNECT_REQUEST:
+//			HandleDisconnectRequest(static_cast<ClientPacket*>(argPacket));
+		break;
+		case SerialPacketType::DISCONNECT_FORCED:
+//			HandleDisconnectForced(static_cast<ClientPacket*>(argPacket));
+		break;
+
+		//data management
+		case SerialPacketType::REGION_CONTENT:
+//			HandleRegionContent(static_cast<RegionPacket*>(argPacket));
+		break;
+//		case SerialPacketType::QUERY_CHARACTER_EXISTS:
+//		case SerialPacketType::QUERY_CHARACTER_STATS:
+//		case SerialPacketType::QUERY_CHARACTER_LOCATION:
+
+		//character management
+//		case SerialPacketType::CHARACTER_NEW:
+//			HandleCharacterNew(static_cast<CharacterPacket*>(argPacket));
+//		break;
+//		case SerialPacketType::CHARACTER_DELETE:
+//			HandleCharacterDelete(static_cast<CharacterPacket*>(argPacket));
+//		break;
+//		case SerialPacketType::CHARACTER_UPDATE:
+//			HandleCharacterUpdate(static_cast<CharacterPacket*>(argPacket));
+//		break;
+//		case SerialPacketType::CHARACTER_REJECTION:
+//			HandleCharacterRejection(static_cast<TextPacket*>(argPacket));
+//		break;
+
+		//enemy management
+		//TODO: enemy management
+
+		//TODO: text
+
+		//handle errors
+		default:
+			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in InWorld: " + to_string_custom(static_cast<int>(argPacket->type)) ));
+		break;
+	}
+}
+
+void InWorld::HandlePong(ServerPacket* const argPacket) {
+	if (network.GetIPAddress(Channels::SERVER)->host != argPacket->srcAddress.host) {
+		throw(std::runtime_error("Heartbeat message received from an unknown source"));
+	}
+
+	attemptedBeats = 0;
+	lastBeat = Clock::now();
+}
+
+void InWorld::HandleDisconnect(ClientPacket* const argPacket) {
+	//TODO: More needed in the disconnection
+	SetNextScene(SceneList::DISCONNECTEDSCREEN);
+	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have been disconnected";
+}
+
+void InWorld::HandleCharacterNew(CharacterPacket* const argPacket) {
+	if (characterMap.find(argPacket->characterIndex) != characterMap.end()) {
+		throw(std::runtime_error("Cannot create duplicate characters"));
+	}
+
+	//create the character object
+	BaseCharacter& newCharacter = characterMap[argPacket->characterIndex];
+
+	//fill out the character's members
+	newCharacter.SetHandle(argPacket->handle);
+	newCharacter.SetAvatar(argPacket->avatar);
+
+	newCharacter.GetSprite()->LoadSurface(ConfigUtility::GetSingleton()["dir.sprites"] + newCharacter.GetAvatar(), 4, 4);
+
+	newCharacter.SetOrigin(argPacket->origin);
+	newCharacter.SetMotion(argPacket->motion);
+	newCharacter.SetBounds({
+		CHARACTER_BOUNDS_X,
+		CHARACTER_BOUNDS_Y,
+		CHARACTER_BOUNDS_WIDTH,
+		CHARACTER_BOUNDS_HEIGHT
+	});
+
+//	(*newCharacter.GetBaseStats()) = argPacket->stats;
+
+	//bookkeeping code
+	newCharacter.CorrectSprite();
+
+	//catch this client's player object
+	if (argPacket->accountIndex == accountIndex && !localCharacter) {
+		characterIndex = argPacket->characterIndex;
+		localCharacter = &newCharacter;
+
+		//setup the camera
+		camera.width = GetScreen()->w;
+		camera.height = GetScreen()->h;
+
+		//center on the player's character
+		camera.marginX = (GetScreen()->w / 2 - localCharacter->GetSprite()->GetImage()->GetClipW() / 2);
+		camera.marginY = (GetScreen()->h / 2 - localCharacter->GetSprite()->GetImage()->GetClipH() / 2);
+	}
+}
+
+void InWorld::HandleCharacterDelete(CharacterPacket* const argPacket) {
+	//TODO: authenticate when own character is being deleted (linked to a TODO in the server)
+
+	//catch this client's player object
+	if (argPacket->characterIndex == characterIndex) {
+		characterIndex = -1;
+		localCharacter = nullptr;
+	}
+
+	characterMap.erase(argPacket->characterIndex);
+}
+
+void InWorld::HandleCharacterUpdate(CharacterPacket* const argPacket) {
+	if (characterMap.find(argPacket->characterIndex) == characterMap.end()) {
+		HandleCharacterNew(argPacket);
+		return;
+	}
+
+	BaseCharacter& character = characterMap[argPacket->characterIndex];
+
+	//other characters moving
+	if (argPacket->characterIndex != characterIndex) {
+		character.SetOrigin(argPacket->origin);
+		character.SetMotion(argPacket->motion);
+		character.CorrectSprite();
+	}
+}
+
+void InWorld::HandleCharacterRejection(TextPacket* const argPacket) {
+	RequestDisconnect();
+	SetNextScene(SceneList::DISCONNECTEDSCREEN);
+	ConfigUtility& config = ConfigUtility::GetSingleton();
+	config["client.disconnectMessage"] = "Error: ";
+	config["client.disconnectMessage"] += argPacket->text;
+}
+
+void InWorld::HandleRegionContent(RegionPacket* const argPacket) {
+	//replace existing regions
+	regionPager.UnloadRegion(argPacket->x, argPacket->y);
+	regionPager.PushRegion(argPacket->region);
+
+	//clean up after the serial code
+	delete argPacket->region;
+	argPacket->region = nullptr;
+}
+
+//-------------------------
+//Server control
+//-------------------------
+
+void InWorld::RequestSynchronize() {
+//	ClientPacket newPacket;
+
+	//request a sync
+//	newPacket.type = SerialPacketType::SYNCHRONIZE;
+//	newPacket.clientIndex = clientIndex;
+//	newPacket.accountIndex = accountIndex;
+
+	//TODO: location, range for sync request
+
+//	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::SendPlayerUpdate() {
+	CharacterPacket newPacket;
+
+	//pack the packet
+//	newPacket.type = SerialPacketType::CHARACTER_UPDATE;
+
+	newPacket.characterIndex = characterIndex;
+	//NOTE: omitting the handle and avatar here
+	newPacket.accountIndex = accountIndex;
+	newPacket.roomIndex = 0; //TODO: room index
+	newPacket.origin = localCharacter->GetOrigin();
+	newPacket.motion = localCharacter->GetMotion();
+//	newPacket.stats = *localCharacter->GetBaseStats();
+
+	//TODO: gameplay components: equipment, items, buffs, debuffs
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::RequestDisconnect() {
+	ClientPacket newPacket;
+
+	//send a disconnect request
+	newPacket.type = SerialPacketType::DISCONNECT_REQUEST;
+	newPacket.clientIndex = clientIndex;
+	newPacket.accountIndex = accountIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::RequestShutDown() {
+	ClientPacket newPacket;
+
+	//send a shutdown request
+	newPacket.type = SerialPacketType::SHUTDOWN_REQUEST;
+	newPacket.clientIndex = clientIndex;
+	newPacket.accountIndex = accountIndex;
+
+	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+void InWorld::RequestRegion(int roomIndex, int x, int y) {
+	RegionPacket packet;
+
+	//pack the region's data
+	packet.type = SerialPacketType::REGION_REQUEST;
+	packet.roomIndex = roomIndex;
+	packet.x = x;
+	packet.y = y;
+
+	network.SendTo(Channels::SERVER, &packet);
+}
+
+//-------------------------
+//Utilities
+//-------------------------
+
+//TODO: convert this into a more generic function?; using parameters for the bounds
+void InWorld::UpdateMap() {
+	//these represent the zone of regions that the client needs loaded, including the mandatory buffers (+1/-1)
+	int xStart = snapToBase(REGION_WIDTH, camera.x/tileSheet.GetTileW()) - REGION_WIDTH;
+	int xEnd = snapToBase(REGION_WIDTH, (camera.x+camera.width)/tileSheet.GetTileW()) + REGION_WIDTH;
+
+	int yStart = snapToBase(REGION_HEIGHT, camera.y/tileSheet.GetTileH()) - REGION_HEIGHT;
+	int yEnd = snapToBase(REGION_HEIGHT, (camera.y+camera.height)/tileSheet.GetTileH()) + REGION_HEIGHT;
+
+	//prune distant regions
+	for (std::list<Region>::iterator it = regionPager.GetContainer()->begin(); it != regionPager.GetContainer()->end(); /* EMPTY */) {
+		//check if the region is outside of this area
+		if (it->GetX() < xStart || it->GetX() > xEnd || it->GetY() < yStart || it->GetY() > yEnd) {
+
+			//clunky, but the alternative was time consuming
+			int tmpX = it->GetX();
+			int tmpY = it->GetY();
+			++it;
+
+			regionPager.UnloadRegion(tmpX, tmpY);
+			continue;
+		}
+		++it;
+	}
+
+	//request empty regions within this zone
+	for (int i = xStart; i <= xEnd; i += REGION_WIDTH) {
+		for (int j = yStart; j <= yEnd; j += REGION_HEIGHT) {
+			if (!regionPager.FindRegion(i, j)) {
+				RequestRegion(0, i, j);
+			}
+		}
+	}
+}

client/scenes/in_world.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -25,10 +25,9 @@
 //maps
 #include "region_pager_base.hpp"
 
-//utilities
+//networking
 #include "udp_network_utility.hpp"
 #include "serial_packet.hpp"
-#include "config_utility.hpp"
 
 //graphics
 #include "image.hpp"
@@ -39,10 +38,11 @@
 //common
 #include "frame_rate.hpp"
 
+#include "base_character.hpp"
+#include "base_monster.hpp"
+
 //client
 #include "base_scene.hpp"
-#include "base_monster.hpp"
-#include "local_character.hpp"
 
 //STL
 #include <map>
@@ -71,51 +71,33 @@ protected:
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
 
-	//Basic connections
+	//Network handlers
 	void HandlePacket(SerialPacket* const);
-	void HandlePing(ServerPacket* const);
 	void HandlePong(ServerPacket* const);
-
+	void HandleDisconnect(ClientPacket* const);
-	//Connection control
+	void HandleCharacterNew(CharacterPacket* const);
-	void SendLogoutRequest();
+	void HandleCharacterDelete(CharacterPacket* const);
-	void SendDisconnectRequest();
+	void HandleCharacterUpdate(CharacterPacket* const);
-	void SendShutdownRequest();
+	void HandleCharacterRejection(TextPacket* const);
-
-	void HandleLogoutResponse(ClientPacket* const);
-	void HandleDisconnectResponse(ClientPacket* const);
-	void HandleDisconnectForced(ClientPacket* const);
-
-	void CheckHeartBeat();
-
-	//map management
-	void SendRegionRequest(int roomIndex, int x, int y);
 	void HandleRegionContent(RegionPacket* const);
+
+	//Server control
+	void RequestSynchronize();
+	void SendPlayerUpdate();
+	void RequestDisconnect();
+	void RequestShutDown();
+	void RequestRegion(int roomIndex, int x, int y);
+
+	//utilities
 	void UpdateMap();
 
-	//character management
+	//singleton shortcut
-	void HandleCharacterCreate(CharacterPacket* const);
+	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
-	void HandleCharacterDelete(CharacterPacket* const);
-	void HandleCharacterQueryExists(CharacterPacket* const);
-	void HandleCharacterMovement(CharacterPacket* const);
-	void HandleCharacterAttack(CharacterPacket* const);
-
-	//monster management
-	void HandleMonsterCreate(MonsterPacket* const);
-	void HandleMonsterDelete(MonsterPacket* const);
-	void HandleMonsterQueryExists(MonsterPacket* const);
-	void HandleMonsterMovement(MonsterPacket* const);
-	void HandleMonsterAttack(MonsterPacket* const);
-
-	//player movement
-	void ProcessLocalCharacterMovement();
-	void SendLocalCharacterMovement();
-	std::list<BoundingBox> GenerateCollisionGrid(Entity*, int tileWidth, int tileHeight);
 
 	//indexes
 	int& clientIndex;
 	int& accountIndex;
 	int characterIndex = -1;
-	int roomIndex = -1;
 
 	//graphics
 	Image buttonImage;
@@ -137,21 +119,16 @@ protected:
 		int marginX = 0, marginY = 0;
 	} camera;
 
-	//entities
+	//game components
+	BaseCharacter* localCharacter = nullptr;
 	std::map<int, BaseCharacter> characterMap;
 	std::map<int, BaseMonster> monsterMap;
-	LocalCharacter* localCharacter = nullptr;
 
 	//heartbeat
-	//TODO: Heartbeat needs it's own utility
+	//TODO: This needs it's own utility, for both InWorld and InCombat
 	typedef std::chrono::steady_clock Clock;
 	Clock::time_point lastBeat = Clock::now();
 	int attemptedBeats = 0;
-
-	//ugly references; I hate this
-	ConfigUtility& config = ConfigUtility::GetSingleton();
-	UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
-	Uint8* keyState = nullptr;
 };
 
 #endif

client/scenes/lobby_menu.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -22,9 +22,9 @@
 #include "lobby_menu.hpp"
 
 #include "channels.hpp"
+#include "utility.hpp"
 
 #include <stdexcept>
-#include <sstream>
 
 //-------------------------
 //Public access members
@@ -123,9 +123,7 @@ void LobbyMenu::Render(SDL_Surface* const screen) {
 		font.DrawStringTo(serverInfo[i].name, screen, listBox.x, listBox.y + i*listBox.h);
 
 		//draw the player count
-		std::ostringstream msg;
+		font.DrawStringTo(to_string_custom(serverInfo[i].playerCount), screen, listBox.x + listBox.w, listBox.y + i*listBox.h);
-		msg << serverInfo[i].playerCount;
-		font.DrawStringTo(msg.str(), screen, listBox.x + listBox.w, listBox.y + i*listBox.h);
 
 		//compatible?
 		if (!serverInfo[i].compatible) {
@@ -166,7 +164,7 @@ void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
 	//has the user selected a server on the list?
 	BoundingBox tmpBox = listBox;
 	tmpBox.h *= serverInfo.size();
-	if (tmpBox.CheckCollision({button.x, button.y, 0, 0})) {
+	if (tmpBox.CheckOverlap({button.x, button.y})) {
 		selection = &serverInfo[(button.y - listBox.y)/listBox.h];
 	}
 	else {
@@ -212,11 +210,8 @@ void LobbyMenu::HandlePacket(SerialPacket* const argPacket) {
 		break;
 
 		//handle errors
-		default: {
+		default:
-			std::ostringstream msg;
+			throw(std::runtime_error(std::string() + "Unknown SerialPacketType encountered in LobbyMenu: " + to_string_custom(static_cast<int>(argPacket->type)) ));
-			msg << "Unknown SerialPacketType encountered in LobbyMenu: " << static_cast<int>(argPacket->type);
-			throw(std::runtime_error( msg.str() ));
-		}
 		break;
 	}
 }

client/scenes/lobby_menu.hpp

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

client/scenes/main_menu.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -84,12 +84,6 @@ void MainMenu::Render(SDL_Surface* const screen) {
 	startButton.DrawTo(screen);
 	optionsButton.DrawTo(screen);
 	quitButton.DrawTo(screen);
-
-	//text
-	font.DrawStringTo("Thanks for playing!", screen, 50, screen->h - 50 - image.GetClipH() * 2);
-	font.DrawStringTo("You can get the latest version at: ", screen, 50, screen->h - 50 - image.GetClipH() * 1);
-	font.DrawStringTo("https://github.com/Ratstail91/Tortuga", screen, 50, screen->h - 50 - image.GetClipH() * 0);
-	//TODO: replace this with a website address
 }
 
 //-------------------------

client/scenes/main_menu.hpp

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

client/scenes/makefile

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

client/scenes/options_menu.cpp

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

client/scenes/options_menu.hpp

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

client/scenes/splash_screen.cpp

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

client/scenes/splash_screen.hpp

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

common/debugging/timer.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -39,7 +39,7 @@ void Timer::Stop() {
 
 std::ostream& operator<<(std::ostream& os, Timer& t) {
 	os << t.GetName() << ": ";
-	os << std::chrono::duration_cast<std::chrono::microseconds>(t.GetTime()).count();
+	os << std::chrono::duration_cast<std::chrono::milliseconds>(t.GetTime()).count();
-	os << "us";
+	os << "ms";
 	return os;
 }

common/debugging/timer.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -34,8 +34,8 @@ public:
 	Timer(std::string s);
 	~Timer() = default;
 
-	void Start();
+	inline void Start();
-	void Stop();
+	inline void Stop();
 
 	//accessors and mutators
 	Clock::duration GetTime() { return timeSpan; }

common/gameplay/character_defines.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -35,8 +35,4 @@ constexpr int CHARACTER_BOUNDS_Y = 16;
 constexpr int CHARACTER_BOUNDS_WIDTH = 32;
 constexpr int CHARACTER_BOUNDS_HEIGHT = 32;
 
-//the character's sprite format
-constexpr int CHARACTER_CELLS_X = 4;
-constexpr int CHARACTER_CELLS_Y = 4;
-
 #endif

common/graphics/image.cpp

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

common/graphics/image.hpp

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

common/graphics/makefile

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

common/graphics/sprite_sheet.cpp

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

common/graphics/sprite_sheet.hpp

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

common/map/makefile

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

common/map/map_system_api.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -24,18 +24,40 @@
 //all map API headers
 #include "region_api.hpp"
 #include "region_pager_api.hpp"
+#include "tile_sheet_api.hpp"
+
+//macros
+#include "region.hpp"
 
 //useful "globals"
-//...
+static int getRegionWidth(lua_State* L) {
+	lua_pushinteger(L, REGION_WIDTH);
+	return 1;
+}
+
+static int getRegionHeight(lua_State* L) {
+	lua_pushinteger(L, REGION_HEIGHT);
+	return 1;
+}
+
+static int getRegionDepth(lua_State* L) {
+	lua_pushinteger(L, REGION_DEPTH);
+	return 1;
+}
 
 //This mimics linit.c to create a nested collection of all map modules.
 static const luaL_Reg funcs[] = {
+	//synonyms
+	{"GetRegionWidth", getRegionWidth},
+	{"GetRegionHeight", getRegionHeight},
+	{"GetRegionDepth", getRegionDepth},
 	{nullptr, nullptr}
 };
 
 static const luaL_Reg libs[] = {
 	{"Region", openRegionAPI},
 	{"RegionPager", openRegionPagerAPI},
+//	{"TileSheet", openTileSheetAPI},
 	{nullptr, nullptr}
 };
 
@@ -48,7 +70,7 @@ int openMapSystemAPI(lua_State* L) {
 
 	//push the substable
 	for (const luaL_Reg* lib = libs; lib->func; lib++) {
-		lib->func(L);
+		lua_pushcfunction(L, lib->func);
 		lua_setfield(L, -2, lib->name);
 	}
 	return 1;

common/map/map_system_api.hpp

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

common/map/region.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -21,9 +21,9 @@
 */
 #include "region.hpp"
 
+#include <stdexcept>
 #include <cmath>
 #include <cstring>
-#include <stdexcept>
 
 int snapToBase(int base, int x) {
 	return floor((double)x / base) * base;
@@ -42,41 +42,17 @@ Region::Region(Region const& rhs): x(rhs.x), y(rhs.y) {
 }
 
 Region::type_t Region::SetTile(int x, int y, int z, type_t v) {
-	if (x < 0 || y < 0 || z < 0 || x >= REGION_WIDTH || y >= REGION_HEIGHT || z >= REGION_DEPTH) {
-		throw(std::out_of_range("Region::SetTile() argument out of range"));
-	}
 	return tiles[x][y][z] = v;
 }
 
 Region::type_t Region::GetTile(int x, int y, int z) {
-	if (x < 0 || y < 0 || z < 0 || x >= REGION_WIDTH || y >= REGION_HEIGHT || z >= REGION_DEPTH) {
-		throw(std::out_of_range("Region::GetTile() argument out of range"));
-	}
 	return tiles[x][y][z];
 }
 
 bool Region::SetSolid(int x, int y, bool b) {
-	if (x < 0 || y < 0 || x >= REGION_WIDTH || y >= REGION_HEIGHT) {
-		throw(std::out_of_range("Region::SetSolid() argument out of range"));
-	}
 	return solid[x * REGION_WIDTH + y] = b;
 }
 
 bool Region::GetSolid(int x, int y) {
-	if (x < 0 || y < 0 || x >= REGION_WIDTH || y >= REGION_HEIGHT) {
-		throw(std::out_of_range("Region::GetSolid() argument out of range"));
-	}
 	return solid[x * REGION_WIDTH + y];
-}
-
-int Region::GetX() const {
-	return x;
-}
-
-int Region::GetY() const {
-	return y;
-}
-
-std::bitset<REGION_WIDTH*REGION_HEIGHT>* Region::GetSolidBitset() {
-	return &solid;
 }

common/map/region.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -48,10 +48,10 @@ public:
 	bool GetSolid(int x, int y);
 
 	//accessors
-	int GetX() const;
+	int GetX() const { return x; }
-	int GetY() const;
+	int GetY() const { return y; }
 
-	std::bitset<REGION_WIDTH*REGION_HEIGHT>* GetSolidBitset();
+	std::bitset<REGION_WIDTH*REGION_HEIGHT>* GetSolidBitset() { return &solid; }
 private:
 	const int x;
 	const int y;

common/map/region_api.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -85,8 +85,6 @@ static const luaL_Reg regionLib[] = {
 	{"GetSolid",getSolid},
 	{"GetX",getX},
 	{"GetY",getY},
-
-	//the global macros
 	{"GetWidth",getWidth},
 	{"GetHeight",getHeight},
 	{"GetDepth",getDepth},

common/map/region_api.hpp

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

common/map/region_pager_api.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -84,22 +84,7 @@ static int createRegion(lua_State* L) {
 
 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));
-	//two argument types: coords & the region itself
-	switch(lua_type(L, 2)) {
-		case LUA_TNUMBER:
-			pager->UnloadIf([&](Region const& region) -> bool {
-				int x = lua_tointeger(L, 2);
-				int y = lua_tointeger(L, 3);
-				return region.GetX() == x && region.GetY() == y;
-			});
-		break;
-		case LUA_TLIGHTUSERDATA:
-			pager->UnloadIf([&](Region const& region) -> bool {
-				return (&region) == lua_touserdata(L, 2);
-			});
-		break;
-	}
 	return 0;
 }
 
@@ -131,13 +116,6 @@ static int setOnUnload(lua_State* L) {
 	return 0;
 }
 
-//debugging
-static int containerSize(lua_State* L) {
-	RegionPagerLua* pager = static_cast<RegionPagerLua*>(lua_touserdata(L, 1));
-	lua_pushinteger(L, pager->GetContainer()->size());
-	return 1;
-}
-
 static const luaL_Reg regionPagerLib[] = {
 	//curry
 	{"SetTile", setTile},
@@ -158,9 +136,6 @@ static const luaL_Reg regionPagerLib[] = {
 	{"SetOnCreate",setOnCreate},
 	{"SetOnUnload",setOnUnload},
 
-	//debugging
-	{"ContainerSize", containerSize},
-
 	//sentinel
 	{nullptr, nullptr}
 };

common/map/region_pager_api.hpp

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

common/map/region_pager_base.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -24,9 +24,17 @@
 #include <stdexcept>
 #include <algorithm>
 
+RegionPagerBase::RegionPagerBase() {
+	//
+}
+
+RegionPagerBase::RegionPagerBase(RegionPagerBase&& rhs) {
+	regionList = std::move(rhs.regionList);
+}
+
 RegionPagerBase::~RegionPagerBase() {
 	UnloadAll();
-};
+}
 
 Region::type_t RegionPagerBase::SetTile(int x, int y, int z, Region::type_t v) {
 	Region* ptr = GetRegion(x, y);
@@ -92,14 +100,12 @@ Region* RegionPagerBase::CreateRegion(int x, int y) {
 	return &regionList.front();
 }
 
-void RegionPagerBase::UnloadIf(std::function<bool(Region const&)> fn) {
+void RegionPagerBase::UnloadRegion(int x, int y) {
-	regionList.remove_if(fn);
+	regionList.remove_if([x, y](Region& region) -> bool {
+		return region.GetX() == x && region.GetY() == y;
+	});
 }
 
 void RegionPagerBase::UnloadAll() {
 	regionList.clear();
-}
-
-std::list<Region>* RegionPagerBase::GetContainer() {
-	return &regionList;
 }

common/map/region_pager_base.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -24,12 +24,12 @@
 
 #include "region.hpp"
 
-#include <functional>
 #include <list>
 
 class RegionPagerBase {
 public:
-	RegionPagerBase() = default;
+	RegionPagerBase();
+	RegionPagerBase(RegionPagerBase&&);
 	virtual ~RegionPagerBase();
 
 	//tile manipulation
@@ -48,12 +48,12 @@ public:
 	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 UnloadIf(std::function<bool(Region const&)> fn);
 	virtual void UnloadAll();
 
 	//accessors & mutators
-	std::list<Region>* GetContainer();
+	std::list<Region>* GetContainer() { return &regionList; }
 protected:
 	std::list<Region> regionList;
 };

common/map/region_pager_lua.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -23,8 +23,17 @@
 
 #include <stdexcept>
 
-//DOCS: Load, Save and Create fail unless the lua function has been set
+RegionPagerLua::RegionPagerLua() {
-//DOCS: UnloadIf and UnloadAll will still continue without the function set
+	//
+}
+
+RegionPagerLua::RegionPagerLua(RegionPagerLua&& rhs) {
+	lua = rhs.lua;
+	loadRef = rhs.loadRef;
+	saveRef = rhs.saveRef;
+	createRef = rhs.createRef;
+	unloadRef = rhs.unloadRef;
+}
 
 RegionPagerLua::~RegionPagerLua() {
 	//unload all regions
@@ -133,25 +142,23 @@ Region* RegionPagerLua::CreateRegion(int x, int y) {
 }
 
 //no return
-void RegionPagerLua::UnloadIf(std::function<bool(Region const&)> fn) {
+void RegionPagerLua::UnloadRegion(int x, int y) {
 	//get the pager's function from the registry
 	lua_rawgeti(lua, LUA_REGISTRYINDEX, unloadRef);
 
 	//check if this function is available
 	if (lua_isnil(lua, -1)) {
 		lua_pop(lua, 1);
-		//remove the regions anyway
-		regionList.remove_if(fn);
 		return;
 	}
 
 	//run each region through this lambda
 	regionList.remove_if([&](Region& region) -> bool {
-		if (fn(region)) {
+		if (region.GetX() == x && region.GetY() == y) {
 
 			//push a copy of the function onto the stack with the region
 			lua_pushvalue(lua, -1);
-			lua_pushlightuserdata(lua, static_cast<void*>(&region));
+			lua_pushlightuserdata(lua, &region);
 
 			//call the function, 1 arg, 0 return
 			if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
@@ -169,6 +176,7 @@ void RegionPagerLua::UnloadIf(std::function<bool(Region const&)> fn) {
 	lua_pop(lua, 1);
 }
 
+//no return
 void RegionPagerLua::UnloadAll() {
 	//get the pager's function from the registry
 	lua_rawgeti(lua, LUA_REGISTRYINDEX, unloadRef);
@@ -176,8 +184,6 @@ void RegionPagerLua::UnloadAll() {
 	//check if this function is available
 	if (lua_isnil(lua, -1)) {
 		lua_pop(lua, 1);
-		//remove the regions anyway
-		regionList.clear();
 		return;
 	}
 

common/map/region_pager_lua.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -24,22 +24,26 @@
 
 #include "region_pager_base.hpp"
 
-#include "lua.hpp"
+#if defined(__MINGW32__)
+ #include "lua/lua.hpp"
+#else
+ #include "lua.hpp"
+#endif
 
-#include <functional>
 #include <string>
 
 class RegionPagerLua : public RegionPagerBase {
 public:
-	RegionPagerLua() = default;
+	RegionPagerLua();
+	RegionPagerLua(RegionPagerLua&&);
 	~RegionPagerLua();
 
 	//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 UnloadIf(std::function<bool(Region const&)> fn) override;
 	void UnloadAll() override;
 
 	//accessors & mutators

common/map/tile_sheet.cpp

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

common/map/tile_sheet.hpp

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

common/map/tile_sheet_api.cpp

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

common/map/tile_sheet_api.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,13 +19,16 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef IPOPERATORS_HPP_
+#ifndef TILESHEETAPI_HPP_
-#define IPOPERATORS_HPP_
+#define TILESHEETAPI_HPP_
 
-#include "SDL/SDL_net.h"
+#if defined(__MINGW32__)
+ #include "lua/lua.hpp"
+#else
+ #include "lua.hpp"
+#endif
 
-//these should've come standard
+#define TORTUGA_TILE_SHEET_NAME "tile_sheet"
-bool operator==(IPaddress lhs, IPaddress rhs);
+LUAMOD_API int openTileSheetAPI(lua_State* L);
-bool operator!=(IPaddress lhs, IPaddress rhs);
 
-#endif
+#endif

common/network/packet_types/character_packet.cpp

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

common/network/packet_types/character_packet.hpp

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

common/network/packet_types/client_packet.cpp

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

common/network/packet_types/client_packet.hpp

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

common/network/packet_types/monster_packet.cpp

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

common/network/packet_types/region_packet.cpp

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

common/network/packet_types/region_packet.hpp

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

common/network/packet_types/serial_packet_base.cpp

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

common/network/packet_types/serial_packet_base.hpp

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

common/network/packet_types/server_packet.cpp

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

common/network/packet_types/server_packet.hpp

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

common/network/packet_types/text_packet.cpp

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

common/network/packet_types/text_packet.hpp

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

common/network/serial_packet.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -25,7 +25,6 @@
 #include "serial_packet_base.hpp"
 #include "character_packet.hpp"
 #include "client_packet.hpp"
-#include "monster_packet.hpp"
 #include "region_packet.hpp"
 #include "server_packet.hpp"
 #include "text_packet.hpp"
@@ -39,10 +38,9 @@ constexpr int NETWORK_VERSION = -1;
 union MaxPacket {
 	CharacterPacket a;
 	ClientPacket b;
-	MonsterPacket c;
+	RegionPacket c;
-	RegionPacket d;
+	ServerPacket d;
-	ServerPacket e;
+	TextPacket e;
-	TextPacket f;
 };
 
 constexpr int MAX_PACKET_SIZE = sizeof(MaxPacket);

common/network/serial_packet_type.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -30,7 +30,7 @@
 //TODO: This needs to be smoothed out
 enum class SerialPacketType {
 	//default: there is something wrong
-	NONE,
+	NONE = 0,
 
 	//-------------------------
 	//ServerPacket
@@ -100,29 +100,11 @@ enum class SerialPacketType {
 	QUERY_CHARACTER_LOCATION,
 
 	//set the info in the server
-	CHARACTER_MOVEMENT,
+	CHARACTER_SET_ROOM,
-	CHARACTER_ATTACK,
+	CHARACTER_SET_ORIGIN,
+	CHARACTER_SET_MOTION,
 
-	//admin control
+	//TODO: enemy management
-//	ADMIN_SET_CHARACTER_ORIGIN,
-
-	//-------------------------
-	//MonsterPacket
-	//  monster index,
-	//  handle, avatar, hitbox
-	//  room index, origin, motion
-	//  TODO: attack data
-	//-------------------------
-
-	MONSTER_CREATE,
-	MONSTER_DELETE,
-
-	QUERY_MONSTER_EXISTS, //a list of monsters in a room
-	QUERY_MONSTER_STATS, //statistics of a specific monster type or instance
-	QUERY_MONSTER_LOCATION, //umm...
-
-	MONSTER_MOVEMENT, //monster movement
-	MONSTER_ATTACK,
 
 	//-------------------------
 	//TextPacket
@@ -135,9 +117,7 @@ enum class SerialPacketType {
 	//rejection/error messages
 	JOIN_REJECTION,
 	LOGIN_REJECTION,
-	REGION_REJECTION,
 	CHARACTER_REJECTION,
-	MONSTER_REJECTION,
 	SHUTDOWN_REJECTION,
 
 	//-------------------------

common/network/serial_utility.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -24,7 +24,6 @@
 //packet types
 #include "character_packet.hpp"
 #include "client_packet.hpp"
-#include "monster_packet.hpp"
 #include "region_packet.hpp"
 #include "server_packet.hpp"
 #include "text_packet.hpp"
@@ -76,25 +75,15 @@ void serializePacket(void* buffer, SerialPacketBase* packet) {
 		case SerialPacketType::QUERY_CHARACTER_EXISTS:
 		case SerialPacketType::QUERY_CHARACTER_STATS:
 		case SerialPacketType::QUERY_CHARACTER_LOCATION:
-		case SerialPacketType::CHARACTER_MOVEMENT:
+		case SerialPacketType::CHARACTER_SET_ROOM:
-		case SerialPacketType::CHARACTER_ATTACK:
+		case SerialPacketType::CHARACTER_SET_ORIGIN:
+		case SerialPacketType::CHARACTER_SET_MOTION:
 			serializeCharacter(buffer, static_cast<CharacterPacket*>(packet));
 		break;
-		case SerialPacketType::MONSTER_CREATE:
-		case SerialPacketType::MONSTER_DELETE:
-		case SerialPacketType::QUERY_MONSTER_EXISTS:
-		case SerialPacketType::QUERY_MONSTER_STATS:
-		case SerialPacketType::QUERY_MONSTER_LOCATION:
-		case SerialPacketType::MONSTER_MOVEMENT:
-		case SerialPacketType::MONSTER_ATTACK:
-			serializeMonster(buffer, static_cast<MonsterPacket*>(packet));
-		break;
 		case SerialPacketType::TEXT_BROADCAST:
 		case SerialPacketType::JOIN_REJECTION:
 		case SerialPacketType::LOGIN_REJECTION:
-		case SerialPacketType::REGION_REJECTION:
 		case SerialPacketType::CHARACTER_REJECTION:
-		case SerialPacketType::MONSTER_REJECTION:
 		case SerialPacketType::SHUTDOWN_REJECTION:
 			serializeText(buffer, static_cast<TextPacket*>(packet));
 		break;
@@ -106,7 +95,7 @@ void deserializePacket(void* buffer, SerialPacketBase* packet) {
 	SerialPacketType type;
 	memcpy(&type, buffer, sizeof(SerialPacketType));
 
-	switch(type) {
+	switch(packet->type) {
 		case SerialPacketType::PING:
 		case SerialPacketType::PONG:
 		case SerialPacketType::BROADCAST_REQUEST:
@@ -136,25 +125,15 @@ void deserializePacket(void* buffer, SerialPacketBase* packet) {
 		case SerialPacketType::QUERY_CHARACTER_EXISTS:
 		case SerialPacketType::QUERY_CHARACTER_STATS:
 		case SerialPacketType::QUERY_CHARACTER_LOCATION:
-		case SerialPacketType::CHARACTER_MOVEMENT:
+		case SerialPacketType::CHARACTER_SET_ROOM:
-		case SerialPacketType::CHARACTER_ATTACK:
+		case SerialPacketType::CHARACTER_SET_ORIGIN:
+		case SerialPacketType::CHARACTER_SET_MOTION:
 			deserializeCharacter(buffer, static_cast<CharacterPacket*>(packet));
 		break;
-		case SerialPacketType::MONSTER_CREATE:
-		case SerialPacketType::MONSTER_DELETE:
-		case SerialPacketType::QUERY_MONSTER_EXISTS:
-		case SerialPacketType::QUERY_MONSTER_STATS:
-		case SerialPacketType::QUERY_MONSTER_LOCATION:
-		case SerialPacketType::MONSTER_MOVEMENT:
-		case SerialPacketType::MONSTER_ATTACK:
-			deserializeMonster(buffer, static_cast<MonsterPacket*>(packet));
-		break;
 		case SerialPacketType::TEXT_BROADCAST:
 		case SerialPacketType::JOIN_REJECTION:
 		case SerialPacketType::LOGIN_REJECTION:
-		case SerialPacketType::REGION_REJECTION:
 		case SerialPacketType::CHARACTER_REJECTION:
-		case SerialPacketType::MONSTER_REJECTION:
 		case SerialPacketType::SHUTDOWN_REJECTION:
 			deserializeText(buffer, static_cast<TextPacket*>(packet));
 		break;

common/network/serial_utility.hpp

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

common/network/udp_network_utility.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -26,7 +26,7 @@
 
 #include <stdexcept>
 
-//DOCS: memset() is used before sending a packet to remove old data; you don't want to send sensitive data over the network
+//NOTE: memset() is used before sending a packet to remove old data; you don't want to send sensitive data over the network
 //NOTE: don't confuse SerialPacketBase with UDPpacket
 
 void UDPNetworkUtility::Open(int port) {

common/network/udp_network_utility.hpp

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

common/ui/button.cpp

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

common/ui/button.hpp

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

common/ui/menu_bar.cpp

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

common/ui/menu_bar.hpp

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

common/ui/raster_font.cpp

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

common/ui/raster_font.hpp

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

common/utilities/bounding_box.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -22,8 +22,6 @@
 #ifndef BOUNDINGBOX_HPP_
 #define BOUNDINGBOX_HPP_
 
-#include "vector2.hpp"
-
 #include <type_traits>
 #include <algorithm>
 
@@ -34,15 +32,16 @@ public:
 	int w, h;
 
 	BoundingBox() = default;
+	BoundingBox(int i, int j): x(i), y(j), w(0), h(0) {};
 	BoundingBox(int i, int j, int k, int l): x(i), y(j), w(k), h(l) {};
 	~BoundingBox() = default;
 	BoundingBox& operator=(BoundingBox const&) = default;
 
 	int Size() {
-		return (w-x) * (h-y);
+		return std::max(w*h,0);
 	}
 
-	bool CheckCollision(BoundingBox rhs) {
+	bool CheckOverlap(BoundingBox rhs) {
 		return !(
 			x >= rhs.x + rhs.w ||
 			y >= rhs.y + rhs.h ||
@@ -50,25 +49,24 @@ public:
 			rhs.y >= y + h);
 	}
 
-	Vector2 CalcShift(BoundingBox rhs) {
+	BoundingBox CalcOverlap(BoundingBox rhs) {
-		if (!CheckCollision(rhs)) {
+		if (!CheckOverlap(rhs)) {
-			return {0, 0};
+			return {0, 0, 0, 0};
 		}
-
+		BoundingBox ret;
-		//DOCS: Given two BoundingBox objects, how does the other have to move so that they are no longer colliding?
+		ret.x = std::max(x, rhs.x);
-		Vector2 horizontal = {0, 0};
+		ret.y = std::max(y, rhs.y);
-		Vector2 vertical = {0, 0};
+		ret.w = std::min(x+w, rhs.x+rhs.w) - ret.x;
-
+		ret.h = std::min(y+h, rhs.y+rhs.h) - ret.y;
-		horizontal.x = std::abs(x + w - rhs.x) < std::abs(rhs.x + rhs.w - x) ? x + w - rhs.x -1 : -(rhs.x + rhs.w - x -1);
+		return ret;
-		vertical.y = std::abs(y + h - rhs.x) < std::abs(rhs.y + rhs.h - y) ? y + h - rhs.y -1 : -(rhs.y + rhs.h - y -1);
-
-		return std::abs(vertical.y) < std::abs(horizontal.x) ? vertical : horizontal;
 	}
 };
 
 //This is explicitly a POD
 static_assert(std::is_pod<BoundingBox>::value, "BoundingBox is not a POD");
 
+#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};

common/utilities/config_utility.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -27,13 +27,13 @@
 #include <sstream>
 #include <stdexcept>
 
-void ConfigUtility::Load(std::string fname, bool skipMissingFile, int argc, char* argv[]) {
+void ConfigUtility::Load(std::string fname, int argc, char* argv[]) {
 	//clear the stored configuration
 	configMap.clear();
 
 	//use the default file
 	if (argc < 2) {
-		configMap = Read(fname, skipMissingFile);
+		configMap = Read(fname);
 		return;
 	}
 
@@ -47,9 +47,7 @@ void ConfigUtility::Load(std::string fname, bool skipMissingFile, int argc, char
 	for (int i = 1; i < argc; ++i) {
 		//read from a specified config file
 		if (!strncmp(argv[i], "-config=", 8)) {
-			//older specified files take precedence
+			redirectedFile = Read(argv[i] + 8);
-			table_t tmp = Read(argv[i] + 8, skipMissingFile);
-			redirectedFile.insert(tmp.begin(), tmp.end());
 			redirectUsed = true;
 			continue;
 		}
@@ -75,21 +73,18 @@ void ConfigUtility::Load(std::string fname, bool skipMissingFile, int argc, char
 
 	//finally, construct the final config table
 	if (!redirectUsed) {
-		redirectedFile = Read(fname, skipMissingFile);
+		redirectedFile = Read(fname);
 	}
 	configMap.insert(cmdLineParams.begin(), cmdLineParams.end());
 	configMap.insert(redirectedFile.begin(), redirectedFile.end());
 }
 
-ConfigUtility::table_t ConfigUtility::Read(std::string fname, bool skipMissingFile) {
+ConfigUtility::table_t ConfigUtility::Read(std::string fname) {
 	//read in and return this file's data
 	table_t retTable;
 	std::ifstream is(fname);
 
 	if (!is.is_open()) {
-		if (skipMissingFile) {
-			return {}; //empty table
-		}
 		std::ostringstream os;
 		os << "Failed to open a config file: " << fname;
 		throw(std::runtime_error( os.str() ));
@@ -148,7 +143,7 @@ ConfigUtility::table_t ConfigUtility::Read(std::string fname, bool skipMissingFi
 
 	//load in any subordinate config files
 	if (retTable.find("config.next") != retTable.end()) {
-		table_t subTable = Read(retTable["config.next"], skipMissingFile);
+		table_t subTable = Read(retTable["config.next"]);
 		retTable.insert(subTable.begin(), subTable.end());
 	}
 

common/utilities/config_utility.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -27,9 +27,9 @@
 #include <map>
 #include <string>
 
-class ConfigUtility: public Singleton<ConfigUtility> {
+class ConfigUtility : public Singleton<ConfigUtility> {
 public:
-	void Load(std::string fname, bool skipMissingFile = false, int argc = 0, char* argv[] = nullptr);
+	void Load(std::string fname, int argc = 0, char* argv[] = nullptr);
 
 	//convert to a type
 	std::string& String(std::string);
@@ -47,7 +47,10 @@ private:
 
 	friend Singleton<ConfigUtility>;
 
-	table_t Read(std::string fname, bool skipMissingFile);
+	ConfigUtility() = default;
+	~ConfigUtility() = default;
+
+	table_t Read(std::string fname);
 
 	table_t configMap;
 };

common/utilities/frame_rate.hpp

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

common/utilities/singleton.hpp

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

common/utilities/utility.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,28 +19,30 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "waypoint_data.hpp"
+#include "utility.hpp"
 
-int WaypointData::SetTriggerReference(int i) {
+#include <algorithm>
-	return triggerRef = i;
+
+std::string truncatePath(std::string pathname) {
+	return std::string(
+		std::find_if(
+			pathname.rbegin(),
+			pathname.rend(),
+			[](char ch) -> bool {
+				//windows & unix tested
+				return ch == '/' || ch == '\\';
+			}).base(),
+		pathname.end());
 }
 
-int WaypointData::GetTriggerReference() {
+std::string to_string_custom(int i) {
-	return triggerRef;
+	char buffer[20];
+	snprintf(buffer, 20, "%d", i);
+	return std::string(buffer);
 }
 
-BoundingBox WaypointData::SetBoundingBox(BoundingBox b) {
+int to_integer_custom(std::string s) {
-	return bounds = b;
+	int ret = 0;
-}
+	sscanf(s.c_str(), "%d", &ret);
-
+	return ret;
-BoundingBox WaypointData::GetBoundingBox() {
+}
-	return bounds;
-}
-
-Vector2 WaypointData::SetOrigin(Vector2 v) {
-	return origin = v;
-}
-
-Vector2 WaypointData::GetOrigin() {
-	return origin;
-}

common/utilities/utility.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,12 +19,16 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CHARACTERMANAGERAPI_HPP_
+#ifndef UTILITY_HPP_
-#define CHARACTERMANAGERAPI_HPP_
+#define UTILITY_HPP_
 
-#include "lua.hpp"
+#include <string>
 
-#define TORTUGA_CHARACTER_MANAGER_API "character_manager"
+std::string truncatePath(std::string pathname);
-LUAMOD_API int openCharacterManagerAPI(lua_State* L);
 
-#endif
+//fixing known bugs in g++
+std::string to_string_custom(int i);
+
+int to_integer_custom(std::string);
+
+#endif

common/utilities/vector2.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013-2015
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -92,10 +92,6 @@ public:
 		return ret;
 	}
 
-	//unary operators
-	Vector2 operator-() { return {-x, -y}; }
-
-	//comparison operators
 	bool operator==(Vector2 v) { return (x == v.x && y == v.y); }
 	bool operator!=(Vector2 v) { return (x != v.x || y != v.y); }
 

copyright.txt

@@ -2,7 +2,7 @@ Future versions (to be determined) may be released under a modified version of t
 
 The current version of Tortuga is released under the zlib license.
 
-Copyright (c) 2013-2015 Kayne Ruse
+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.
 

makefile

@@ -1,8 +1,7 @@
-#Windows 7:
+#for use on Windows:
-#RM=del /y
 
-#Windows 8.1:
+#MKDIR=mkdir
-#RM=del /S
+#RM=del /y
 
 OUTDIR=out
 

rsc/config.cfg

@@ -12,8 +12,8 @@ server.dbname = database.db
 #client.screen.h = 600
 client.screen.f = false
 
-client.username = username
+client.username = Kayne Ruse
-client.handle = handle
+client.handle = Ratstail91
 client.avatar = elliot2.bmp
 
 #directories

rsc/scripts/map_maker.lua

@@ -1,95 +1,39 @@
-local Region = require("map_system").Region
+local mapSystem = require "map_system"
 
 local mapMaker = {}
 
 --utility functions
-function mapMaker.Sqr(x) return x*x end
+function mapMaker.sqr(x) return x*x end
-function mapMaker.Dist(x, y, i, j) return math.sqrt(mapMaker.Sqr(x - i) + mapMaker.Sqr(y - j)) end
+function mapMaker.dist(x, y, i, j) return math.sqrt(mapMaker.sqr(x - i) + mapMaker.sqr(y - j)) end
 
 --tile macros, mapped to the tilesheet "overworld.bmp"
-mapMaker.water	= 18 + 3 * 0
-mapMaker.sand	= 18 + 3 * 1
-mapMaker.plains	= 18 + 3 * 2
-mapMaker.grass	= 18 + 3 * 3
-mapMaker.dirt	= 18 + 3 * 4
-
---"edge" macros
 mapMaker.edges = {}
 mapMaker.edges.north = -16
 mapMaker.edges.south = 16
 mapMaker.edges.east = 1
 mapMaker.edges.west = -1
 
---use these macros (mapped to "overworld.bmp" for now) to smooth the region's edges
+mapMaker.water	= 18 + 3 * 0
-function mapMaker.SmoothEdgesSimple(r)
+mapMaker.sand	= 18 + 3 * 1
-	--make and pad an array to use
+mapMaker.plains	= 18 + 3 * 2
-	local shiftArray = {}
+mapMaker.grass	= 18 + 3 * 3
-	for i = 1, Region.GetWidth(r) do
+mapMaker.dirt	= 18 + 3 * 4
-		shiftArray[i] = {}
-		for j = 1, Region.GetHeight(r) do
-			shiftArray[i][j] = 0
-		end
-	end
-
-	--build the array
-	for i = 1, Region.GetWidth(r) do
-		for j = 1, Region.GetHeight(r) do
-			--if (not region edge) and (west tile < this tile), etc.
-			if i > 1 and Region.GetTile(r, i - 1, j, 1) < Region.GetTile(r, i, j, 1) then
-				shiftArray[i][j] = shiftArray[i][j] + mapMaker.edges.west
-			end
-			if j > 1 and Region.GetTile(r, i, j - 1, 1) < Region.GetTile(r, i, j, 1) then
-				shiftArray[i][j] = shiftArray[i][j] + mapMaker.edges.north
-			end
-			if i < Region.GetWidth(r) and Region.GetTile(r, i + 1, j, 1) < Region.GetTile(r, i, j, 1) then
-				shiftArray[i][j] = shiftArray[i][j] + mapMaker.edges.east
-			end
-			if j < Region.GetHeight(r) and Region.GetTile(r, i, j + 1, 1) < Region.GetTile(r, i, j, 1) then
-				shiftArray[i][j] = shiftArray[i][j] + mapMaker.edges.south
-			end
-		end
-	end
-
-	--finally apply this
-	for i = 1, Region.GetWidth(r) do
-		for j = 1, Region.GetHeight(r) do
-			if shiftArray[i][j] ~= 0 then
-				Region.SetTile(r, i, j, 2, Region.GetTile(r, i, j, 1) + shiftArray[i][j])
-				Region.SetTile(r, i, j, 1, Region.GetTile(r, i, j, 1) - 3)
-			end
-		end
-	end
-end
 
 --custom generation systems here
-function mapMaker.DebugIsland(r)
+function mapMaker.debugIsland(region)
-	--basic distance check for each tile, placing an island around the world origin
+	for i = 1, mapSystem.Region.GetWidth(region) do
-	for i = 1, Region.GetWidth(r) do
+		for j = 1, mapSystem.Region.GetHeight(region) do
-		for j = 1, Region.GetHeight(r) do
+			local dist = mapMaker.dist(0, 0, i + mapSystem.Region.GetX(region) -1, j + mapSystem.Region.GetY(region) -1)
-			local dist = mapMaker.Dist(0, 0, i + Region.GetX(r) -1, j + Region.GetY(r) -1)
 			if dist < 10 then
-				Region.SetTile(r, i, j, 1, mapMaker.plains)
+				mapSystem.Region.SetTile(region, i, j, 1, mapMaker.plains)
 			elseif dist < 12 then
-				Region.SetTile(r, i, j, 1, mapMaker.sand)
+				mapSystem.Region.SetTile(region, i, j, 1, mapMaker.sand)
 			else
-				Region.SetTile(r, i, j, 1, mapMaker.water)
+				mapSystem.Region.SetTile(region, i, j, 1, mapMaker.water)
-				Region.SetSolid(r, i, j, true)
+				mapSystem.Region.SetSolid(region, i, j, true)
 			end
 		end
 	end
-
-	--examples of the smoothing function NOT working correctly
-	--[[
-	for j = 1, Region.GetHeight(r) do
-		Region.SetTile(r, 3, j, 1, mapMaker.dirt)
-		Region.SetTile(r, 4, j, 1, mapMaker.dirt)
-
-		Region.SetTile(r, 10, j, 1, mapMaker.dirt)
-	end
-	--]]
-
-	--A generic edge system
-	mapMaker.SmoothEdgesSimple(r)
 end
 
 return mapMaker

rsc/scripts/map_saver.lua

@@ -1,15 +1,3 @@
-local Region = require("map_system").Region
-
 local mapSaver = {}
-
-function mapSaver.Load(r)
-	--empty
-	io.write("map_saver:Load(", Region.GetX(r), ", ", Region.GetY(r), ")\n")
-end
-function mapSaver.Save(r)
-	--empty
-	io.write("map_saver:Save(", Region.GetX(r), ", ", Region.GetY(r), ")\n")
-end
-
 --TODO: create a flexible saving & loading system
 return mapSaver