A few tweaks

.gitignore

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

README.md

@@ -1,31 +0,0 @@
-You can find the [latest nightly build here](https://dl.dropboxusercontent.com/u/46669050/Tortuga.rar).
-
-Tortuga is an open source 2D multiplayer role playing game featuring permadeath (deletion of a character upon death). The emphasis of this game is on multiplayer cooperation, competition, and customization. The game runs on customizable server software that can support up to 150 simultaneous players or more.
-
-This game is inspired by classic 2D RPGs, as well as more modern sandbox MMOs. This project is currently independently created and funded, with the goal of creating a game that will engage user's imagination and inspire a large modding community.
-
-## External Dependencies
-
-* [SDL 1.6](http://www.libsdl.org/) - Simple DirectMedia Layer API
-* [SDL_net 1.2](http://www.libsdl.org/projects/SDL_net/) - SDL's networking extension
-* [lua 5.2](http://www.lua.org/) - The lua programming language
-* [SQLite3](http://www.sqlite.org/) - A lightweight SQL database engine
-
-## Documentation
-
-[Tortuga Game Design Document](https://docs.google.com/document/d/17SjOTdacKKWX0Z-UkaiFnVnjfEeMsc5LRmARtnjh5UI/edit?usp=sharing)  
-[Tortuga Technical Document](https://docs.google.com/document/d/1ASTfM_1e0yE1cFP-IZey_rHEC6k2kmVY56X4K407sw0/edit?usp=sharing)
-
-## Copyright
-
-The current version of Tortuga is released under the [zlib license](http://en.wikipedia.org/wiki/Zlib_License).  
-
-Copyright (c) 2013 Kayne Ruse
-
-This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.

client/channels.hpp

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

client/client_application.cpp

@@ -1,155 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial 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
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "client_application.hpp"
-
-#include <stdexcept>
-#include <chrono>
-
-//-------------------------
-//Static declarations
-//-------------------------
-
-ClientApplication ClientApplication::instance;
-
-//-------------------------
-//Scene headers
-//-------------------------
-
-//Add the custom scene headers here
-#include "splash_screen.hpp"
-#include "main_menu.hpp"
-#include "options_menu.hpp"
-#include "lobby_menu.hpp"
-#include "in_world.hpp"
-#include "in_combat.hpp"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-ClientApplication::ClientApplication() {
-	//
-}
-
-ClientApplication::~ClientApplication() {
-	//
-}
-
-void ClientApplication::Init() {
-	//load the prerequisites
-	config.Load("rsc\\config.cfg");
-
-	//initialize SDL
-	if (SDL_Init(SDL_INIT_VIDEO)) {
-		throw(std::runtime_error("Failed to initialize SDL"));
-	}
-	BaseScene::SetScreen(config.Int("screen.w"), config.Int("screen.h"), 0, (config.Bool("screen.f")) ? SDL_HWSURFACE|SDL_DOUBLEBUF : SDL_HWSURFACE);
-
-	//initialize SDL_net
-	if (SDLNet_Init()) {
-		throw(std::runtime_error("Failed to initialize SDL_net"));
-	}
-	network.Open(0, sizeof(NetworkPacket));
-}
-
-void ClientApplication::Proc() {
-	LoadScene(SceneList::FIRST);
-
-	//prepare the time system
-	typedef std::chrono::steady_clock Clock;
-
-	Clock::duration delta(16 * Clock::duration::period::den / std::milli::den);
-	Clock::time_point simTime = Clock::now();
-	Clock::time_point realTime;
-
-	//The main loop
-	while(activeScene->GetNextScene() != SceneList::QUIT) {
-		//switch scenes when necessary
-		if (activeScene->GetNextScene() != SceneList::CONTINUE) {
-			LoadScene(activeScene->GetNextScene());
-			continue;
-		}
-
-		//update the current time
-		realTime = Clock::now();
-
-		//simulate game time
-		while (simTime < realTime) {
-			//call each user defined function
-			activeScene->RunFrame(double(delta.count()) / Clock::duration::period::den);
-			simTime += delta;
-		}
-
-		//draw the game to the screen
-		activeScene->RenderFrame();
-
-		//give the computer a break
-		SDL_Delay(10);
-	}
-
-	UnloadScene();
-}
-
-void ClientApplication::Quit() {
-	network.Close();
-	SDLNet_Quit();
-	SDL_Quit();
-}
-
-//-------------------------
-//Private access members
-//-------------------------
-
-void ClientApplication::LoadScene(SceneList sceneIndex) {
-	UnloadScene();
-
-	switch(sceneIndex) {
-		//add scene creation calls here
-		case SceneList::FIRST:
-		case SceneList::SPLASHSCREEN:
-			activeScene = new SplashScreen(&config);
-		break;
-		case SceneList::MAINMENU:
-			activeScene = new MainMenu(&config);
-		break;
-		case SceneList::OPTIONSMENU:
-			activeScene = new OptionsMenu(&config);
-		break;
-		case SceneList::LOBBYMENU:
-			activeScene = new LobbyMenu(&config, &network, &clientIndex);
-		break;
-		case SceneList::INWORLD:
-			activeScene = new InWorld(&config, &network, &clientIndex);
-		break;
-		case SceneList::INCOMBAT:
-			activeScene = new InCombat();
-		break;
-
-		default:
-			throw(std::logic_error("Failed to recognize the scene index"));
-	}
-}
-
-void ClientApplication::UnloadScene() {
-	delete activeScene;
-	activeScene = nullptr;
-}

client/client_application.hpp

@@ -1,57 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef CLIENTAPPLICATION_HPP_
-#define CLIENTAPPLICATION_HPP_
-
-#include "scene_list.hpp"
-#include "base_scene.hpp"
-
-#include "config_utility.hpp"
-#include "network_packet.hpp"
-#include "udp_network_utility.hpp"
-
-class ClientApplication {
-private:
-	ClientApplication();
-	~ClientApplication();
-	static ClientApplication instance;
-
-public:
-	static ClientApplication* GetInstance() { return &instance; }
-
-	void Init();
-	void Proc();
-	void Quit();
-
-private:
-	//Private access members
-	void LoadScene(SceneList sceneIndex);
-	void UnloadScene();
-
-	BaseScene* activeScene = nullptr;
-
-	ConfigUtility config;
-	UDPNetworkUtility network;
-	int clientIndex = -1; //replace with a struct?
-};
-
-#endif

client/makefile

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

client/player_character.cpp

@@ -1,117 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "player_character.hpp"
-
-#define WALKING_SPEED 140
-
-void PlayerCharacter::Update(double delta) {
-	if (diagonal) {
-		constexpr double d = 1.0/sqrt(2);
-		position += motion * delta * d;
-	}
-	else {
-		position += motion * delta;
-	}
-	sprite.Update(delta);
-}
-
-void PlayerCharacter::AdjustDirection(Direction direction) {
-	//shift the movement in this direction
-	switch(direction) {
-		case Direction::NORTH:
-			if (motion.y >= 0) {
-				motion.y -= WALKING_SPEED;
-			}
-		break;
-		case Direction::SOUTH:
-			if (motion.y <= 0) {
-				motion.y += WALKING_SPEED;
-			}
-		break;
-		case Direction::WEST:
-			if (motion.x >= 0) {
-				motion.x -= WALKING_SPEED;
-			}
-		break;
-		case Direction::EAST:
-			if (motion.x <= 0) {
-				motion.x += WALKING_SPEED;
-			}
-		break;
-	}
-	//face the correct direction
-	ResetDirection();
-}
-
-void PlayerCharacter::FaceDirection(Direction direction) {
-	//this function depends on the format of the sprite sheets
-	switch(direction) {
-		case Direction::NORTH:
-			sprite.SetYIndex(1);
-		break;
-		case Direction::SOUTH:
-			sprite.SetYIndex(0);
-		break;
-		case Direction::WEST:
-			sprite.SetYIndex(2);
-		break;
-		case Direction::EAST:
-			sprite.SetYIndex(3);
-		break;
-	}
-}
-
-void PlayerCharacter::ResetDirection() {
-	//base the direction on the character's movement
-	if (motion.y > 0) {
-		FaceDirection(Direction::SOUTH);
-	}
-	else if (motion.y < 0) {
-		FaceDirection(Direction::NORTH);
-	}
-	else if (motion.x > 0) {
-		FaceDirection(Direction::EAST);
-	}
-	else if (motion.x < 0) {
-		FaceDirection(Direction::WEST);
-	}
-	ResetSpeed();
-}
-
-void PlayerCharacter::ResetSpeed() {
-	//diagonal
-	if (motion.x != 0 && motion.y != 0) {
-		sprite.SetDelay(0.1);
-		diagonal = true;
-	}
-	//cardinal
-	else if (motion != 0) {
-		sprite.SetDelay(0.1);
-		diagonal = false;
-	}
-	//not moving
-	else {
-		sprite.SetDelay(0);
-		sprite.SetXIndex(0);
-		diagonal = false;
-	}
-}

client/player_character.hpp

@@ -1,66 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef PLAYERCHARACTER_HPP_
-#define PLAYERCHARACTER_HPP_
-
-#include "vector2.hpp"
-#include "sprite_sheet.hpp"
-
-class PlayerCharacter {
-public:
-	enum class Direction {
-		NORTH, SOUTH, EAST, WEST
-	};
-
-	PlayerCharacter() = default;
-	~PlayerCharacter() = default;
-
-	void Update(double delta);
-
-	void DrawTo(SDL_Surface* const dest) { sprite.DrawTo(dest, position.x, position.y); }
-
-	//clunky code results in smooth movement and controls
-	void AdjustDirection(Direction);
-	void FaceDirection(Direction);
-	void ResetDirection();
-	void ResetSpeed();
-
-	//accessors and mutators
-	Vector2 SetPosition(Vector2 v) { return position = v; }
-	Vector2 ShiftPosition(Vector2 v) { return position += v; }
-	Vector2 GetPosition() { return position; }
-
-	Vector2 SetMotion(Vector2 v) { return motion = v; }
-	Vector2 ShiftMotion(Vector2 v) { return motion += v; }
-	Vector2 GetMotion() { return motion; }
-
-	SpriteSheet* GetSprite() { return &sprite; }
-private:
-	Vector2 position;
-	Vector2 motion;
-	SpriteSheet sprite;
-
-	//for moving diagonally
-	bool diagonal = false;
-};
-
-#endif

client/scene_list.hpp

@@ -1,40 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef SCENELIST_HPP_
-#define SCENELIST_HPP_
-
-enum class SceneList {
-	//these are reserved
-	QUIT,
-	CONTINUE,
-	FIRST,
-
-	//custom indexes
-	SPLASHSCREEN,
-	MAINMENU,
-	OPTIONSMENU,
-	LOBBYMENU,
-	INWORLD,
-	INCOMBAT,
-};
-
-#endif

client/scenes/base_scene.cpp

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

client/scenes/base_scene.hpp

@@ -1,74 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef BASESCENE_HPP_
-#define BASESCENE_HPP_
-
-#include "scene_list.hpp"
-
-#include "SDL/SDL.h"
-
-class BaseScene {
-public:
-	//Public access members
-	BaseScene();
-	virtual ~BaseScene();
-
-	//Program control
-	static SDL_Surface* SetScreen(int w, int h, int bpp = 0, Uint32 flags = SDL_HWSURFACE|SDL_DOUBLEBUF);
-	static SDL_Surface* GetScreen();
-
-	SceneList SetNextScene(SceneList sceneIndex);
-	SceneList GetNextScene() const;
-
-	//Frame loop
-	virtual void RunFrame(double delta);
-	virtual void RenderFrame();
-
-protected:
-	virtual void FrameStart() {}
-	virtual void HandleEvents();
-	virtual void Update(double delta) {}
-	virtual void FrameEnd() {}
-	virtual void Render(SDL_Surface* const screen) {}
-
-	//Event handlers
-	virtual void QuitEvent() { SetNextScene(SceneList::QUIT); }
-	virtual void MouseMotion(SDL_MouseMotionEvent const&) {}
-	virtual void MouseButtonDown(SDL_MouseButtonEvent const&) {}
-	virtual void MouseButtonUp(SDL_MouseButtonEvent const&) {}
-	virtual void KeyDown(SDL_KeyboardEvent const&) {}
-	virtual void KeyUp(SDL_KeyboardEvent const&) {}
-
-#ifdef USE_EVENT_JOYSTICK
-	//TODO: joystick/gamepad support
-#endif
-
-#ifdef USE_EVENT_UNKNOWN
-	virtual void UnknownEvent(SDL_Event const&) {}
-#endif
-
-private:
-	static SDL_Surface* screen;
-	SceneList nextScene = SceneList::CONTINUE;
-};
-
-#endif

client/scenes/in_combat.cpp

@@ -1,82 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "in_combat.hpp"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-InCombat::InCombat() {
-	//
-}
-
-InCombat::~InCombat() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void InCombat::FrameStart() {
-	//
-}
-
-void InCombat::Update(double delta) {
-	//
-}
-
-void InCombat::FrameEnd() {
-	//
-}
-
-void InCombat::Render(SDL_Surface* const screen) {
-	//
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void InCombat::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	//
-}
-
-void InCombat::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void InCombat::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void InCombat::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			QuitEvent();
-			break;
-	}
-}
-
-void InCombat::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}

client/scenes/in_world.cpp

@@ -1,315 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "in_world.hpp"
-
-#include "channels.hpp"
-
-#include <stdexcept>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-InWorld::InWorld(ConfigUtility* const argConfig, UDPNetworkUtility* const argNetwork, int* const argClientIndex):
-	config(*argConfig),
-	network(*argNetwork),
-	clientIndex(*argClientIndex)
-{
-	//setup the utility objects
-	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
-
-	//pass the utility objects
-	disconnectButton.SetImage(&image);
-	disconnectButton.SetFont(&font);
-	shutDownButton.SetImage(&image);
-	shutDownButton.SetFont(&font);
-
-	//set the button positions
-	disconnectButton.SetX(50);
-	disconnectButton.SetY(50 + image.GetClipH() * 0);
-	shutDownButton.SetX(50);
-	shutDownButton.SetY(50 + image.GetClipH() * 1);
-
-	//set the button texts
-	disconnectButton.SetText("Disconnect");
-	shutDownButton.SetText("Shut Down");
-
-	//create the server-side player object
-	NetworkPacket packet;
-	packet.meta.type = NetworkPacket::Type::PLAYER_NEW;
-	packet.playerInfo.clientIndex = clientIndex;
-	snprintf(packet.playerInfo.handle, PACKET_STRING_SIZE, "%s", config["player.handle"].c_str());
-	snprintf(packet.playerInfo.avatar, PACKET_STRING_SIZE, "%s", config["player.avatar"].c_str());
-	packet.playerInfo.position = {0,0};
-	packet.playerInfo.motion = {0,0};
-
-	//send it
-	network.Send(Channels::SERVER, &packet, sizeof(NetworkPacket));
-
-	//request a sync
-	packet.meta.type = NetworkPacket::Type::SYNCHRONIZE;
-	network.Send(Channels::SERVER, &packet, sizeof(NetworkPacket));
-}
-
-InWorld::~InWorld() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void InWorld::FrameStart() {
-	//
-}
-
-void InWorld::Update(double delta) {
-	//suck in all waiting packets
-	NetworkPacket packet;
-	while(network.Receive()) {
-		memcpy(&packet, network.GetInData(), sizeof(NetworkPacket));
-		packet.meta.srcAddress = network.GetInPacket()->address;
-		HandlePacket(packet);
-	}
-
-	for (auto& it : playerCharacters) {
-		it.second.Update(delta);
-	}
-}
-
-void InWorld::FrameEnd() {
-	//
-}
-
-void InWorld::Render(SDL_Surface* const screen) {
-	for (auto& it : playerCharacters) {
-		it.second.DrawTo(screen);
-	}
-	disconnectButton.DrawTo(screen);
-	shutDownButton.DrawTo(screen);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void InWorld::QuitEvent() {
-	//exit the game AND the server
-	RequestDisconnect();
-}
-
-void InWorld::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	disconnectButton.MouseMotion(motion);
-	shutDownButton.MouseMotion(motion);
-}
-
-void InWorld::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	disconnectButton.MouseButtonDown(button);
-	shutDownButton.MouseButtonDown(button);
-}
-
-void InWorld::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (disconnectButton.MouseButtonUp(button) == Button::State::HOVER) {
-		RequestDisconnect();
-	}
-	if (shutDownButton.MouseButtonUp(button) == Button::State::HOVER) {
-		RequestShutDown();
-	}
-}
-
-void InWorld::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE: {
-			QuitEvent();
-		}
-		break;
-
-		//player movement
-		case SDLK_LEFT:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::WEST);
-				SendState();
-			}
-		break;
-
-		case SDLK_RIGHT:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::EAST);
-				SendState();
-			}
-		break;
-
-		case SDLK_UP:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::NORTH);
-				SendState();
-			}
-		break;
-
-		case SDLK_DOWN:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::SOUTH);
-				SendState();
-			}
-		break;
-	}
-}
-
-void InWorld::KeyUp(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		//player movement
-		case SDLK_LEFT:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::EAST);
-				SendState();
-			}
-		break;
-
-		case SDLK_RIGHT:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::WEST);
-				SendState();
-			}
-		break;
-
-		case SDLK_UP:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::SOUTH);
-				SendState();
-			}
-		break;
-
-		case SDLK_DOWN:
-			if (localCharacter) {
-				localCharacter->AdjustDirection(PlayerCharacter::Direction::NORTH);
-				SendState();
-			}
-		break;
-	}
-}
-
-void InWorld::HandlePacket(NetworkPacket packet) {
-	switch(packet.meta.type) {
-		case NetworkPacket::Type::DISCONNECT:
-			HandleDisconnect(packet);
-		break;
-
-		case NetworkPacket::Type::PLAYER_NEW:
-			HandlePlayerNew(packet);
-		break;
-
-		case NetworkPacket::Type::PLAYER_DELETE:
-			HandlePlayerDelete(packet);
-		break;
-
-		case NetworkPacket::Type::PLAYER_UPDATE:
-			HandlePlayerUpdate(packet);
-		break;
-
-		//handle errors
-		default:
-			throw(std::runtime_error("Unknown NetworkPacket::Type encountered"));
-		break;
-	}
-}
-
-void InWorld::HandleDisconnect(NetworkPacket packet) {
-	network.Unbind(Channels::SERVER);
-	clientIndex = -1;
-	SetNextScene(SceneList::MAINMENU);
-}
-
-void InWorld::HandlePlayerNew(NetworkPacket packet) {
-	if (playerCharacters.find(packet.playerInfo.playerIndex) != playerCharacters.end()) {
-		throw(std::runtime_error("Cannot create duplicate players"));
-	}
-
-	playerCharacters[packet.playerInfo.playerIndex].GetSprite()->LoadSurface(config["dir.sprites"] + packet.playerInfo.avatar, 4, 4);
-	playerCharacters[packet.playerInfo.playerIndex].SetPosition(packet.playerInfo.position);
-	playerCharacters[packet.playerInfo.playerIndex].SetMotion(packet.playerInfo.motion);
-	playerCharacters[packet.playerInfo.playerIndex].ResetDirection();
-
-	//catch this client's player object
-	if (packet.playerInfo.clientIndex == clientIndex && !localCharacter) {
-		playerIndex = packet.playerInfo.playerIndex;
-		localCharacter = &playerCharacters[playerIndex];
-	}
-}
-
-void InWorld::HandlePlayerDelete(NetworkPacket packet) {
-	if (playerCharacters.find(packet.playerInfo.playerIndex) == playerCharacters.end()) {
-		throw(std::runtime_error("Cannot delete non-existant players"));
-	}
-
-	playerCharacters.erase(packet.playerInfo.playerIndex);
-
-	//catch this client's player object
-	if (packet.playerInfo.clientIndex == clientIndex) {
-		playerIndex = -1;
-		localCharacter = nullptr;
-	}
-}
-
-void InWorld::HandlePlayerUpdate(NetworkPacket packet) {
-	if (playerCharacters.find(packet.playerInfo.playerIndex) == playerCharacters.end()) {
-		HandlePlayerNew(packet);
-		return;
-	}
-
-	//update only if the message didn't originate from here
-	if (packet.playerInfo.clientIndex != clientIndex) {
-		playerCharacters[packet.playerInfo.playerIndex].SetPosition(packet.playerInfo.position);
-		playerCharacters[packet.playerInfo.playerIndex].SetMotion(packet.playerInfo.motion);
-	}
-	playerCharacters[packet.playerInfo.playerIndex].ResetDirection();
-}
-
-void InWorld::SendState() {
-	NetworkPacket packet;
-	packet.meta.type = NetworkPacket::Type::PLAYER_UPDATE;
-	packet.playerInfo.clientIndex = clientIndex;
-	packet.playerInfo.playerIndex = playerIndex;
-//	snprintf(packet.playerInfo.handle, PACKET_STRING_SIZE, "%s", config["player.handle"].c_str());
-//	snprintf(packet.playerInfo.avatar, PACKET_STRING_SIZE, "%s", config["player.avatar"].c_str());
-	packet.playerInfo.position = localCharacter->GetPosition();
-	packet.playerInfo.motion = localCharacter->GetMotion();
-
-	network.Send(Channels::SERVER, &packet, sizeof(NetworkPacket));
-}
-
-void InWorld::RequestDisconnect() {
-	//send a disconnect request
-	NetworkPacket packet;
-	packet.meta.type = NetworkPacket::Type::DISCONNECT;
-	packet.clientInfo.index = clientIndex;
-	network.Send(Channels::SERVER, &packet, sizeof(NetworkPacket));
-}
-
-void InWorld::RequestShutDown() {
-	//send a shutdown request
-	NetworkPacket packet;
-	packet.meta.type = NetworkPacket::Type::SHUTDOWN;
-	packet.clientInfo.index = clientIndex;
-	network.Send(Channels::SERVER, &packet, sizeof(NetworkPacket));
-}

client/scenes/in_world.hpp

@@ -1,83 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef INWORLD_HPP_
-#define INWORLD_HPP_
-
-#include "base_scene.hpp"
-
-#include "config_utility.hpp"
-#include "udp_network_utility.hpp"
-#include "network_packet.hpp"
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-#include "player_character.hpp"
-
-#include <map>
-
-class InWorld : public BaseScene {
-public:
-	//Public access members
-	InWorld(ConfigUtility* const, UDPNetworkUtility* const, int* const);
-	~InWorld();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update(double delta);
-	void FrameEnd();
-	void Render(SDL_Surface* const);
-
-	//Event handlers
-	void QuitEvent();
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
-	void KeyDown(SDL_KeyboardEvent const&);
-	void KeyUp(SDL_KeyboardEvent const&);
-
-	void HandlePacket(NetworkPacket);
-	void HandleDisconnect(NetworkPacket);
-	void HandlePlayerNew(NetworkPacket);
-	void HandlePlayerDelete(NetworkPacket);
-	void HandlePlayerUpdate(NetworkPacket);
-
-	void SendState();
-	void RequestDisconnect();
-	void RequestShutDown();
-
-	//global
-	ConfigUtility& config;
-	UDPNetworkUtility& network;
-	int& clientIndex;
-
-	//members
-	Image image;
-	RasterFont font;
-	Button disconnectButton;
-	Button shutDownButton;
-	std::map<int, PlayerCharacter> playerCharacters;
-	PlayerCharacter* localCharacter = nullptr;
-	int playerIndex = -1;
-};
-
-#endif

client/scenes/lobby_menu.cpp

@@ -1,196 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "lobby_menu.hpp"
-
-#include "channels.hpp"
-
-#include <stdexcept>
-
-//-------------------------
-//Public access members
-//-------------------------
-
-LobbyMenu::LobbyMenu(ConfigUtility* const argConfig, UDPNetworkUtility* const argNetwork, int* const argClientIndex):
-	config(*argConfig),
-	network(*argNetwork),
-	clientIndex(*argClientIndex)
-{
-	//setup the utility objects
-	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
-
-	//pass the utility objects
-	search.SetImage(&image);
-	search.SetFont(&font);
-	join.SetImage(&image);
-	join.SetFont(&font);
-	back.SetImage(&image);
-	back.SetFont(&font);
-
-	//set the button positions
-	search.SetX(50);
-	search.SetY(50 + image.GetClipH() * 0);
-	join.SetX(50);
-	join.SetY(50 + image.GetClipH() * 1);
-	back.SetX(50);
-	back.SetY(50 + image.GetClipH() * 2);
-
-	//set the button texts
-	search.SetText("Search");
-	join.SetText("Join");
-	back.SetText("Back");
-
-	//set the server list's position
-	listBox = {300, 50, 200, font.GetCharH()};
-}
-
-LobbyMenu::~LobbyMenu() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void LobbyMenu::FrameStart() {
-	//
-}
-
-void LobbyMenu::Update(double delta) {
-	//suck in all waiting packets
-	NetworkPacket packet;
-	while(network.Receive()) {
-		memcpy(&packet, network.GetInData(), sizeof(NetworkPacket));
-		packet.meta.srcAddress = network.GetInPacket()->address;
-		HandlePacket(packet);
-	}
-}
-
-void LobbyMenu::FrameEnd() {
-	//
-}
-
-void LobbyMenu::Render(SDL_Surface* const screen) {
-	search.DrawTo(screen);
-	join.DrawTo(screen);
-	back.DrawTo(screen);
-	for (int i = 0; i < serverInfo.size(); i++) {
-		//draw the selected server's highlight
-		if (selection == &serverInfo[i]) {
-			SDL_Rect r = listBox;
-			r.y += i * listBox.h;
-			SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, 255, 127, 39));
-		}
-
-		//draw the server name
-		font.DrawStringTo(serverInfo[i].name, screen, listBox.x, listBox.y + i*listBox.h);
-	}
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void LobbyMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	search.MouseMotion(motion);
-	join.MouseMotion(motion);
-	back.MouseMotion(motion);
-}
-
-void LobbyMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	search.MouseButtonDown(button);
-	join.MouseButtonDown(button);
-	back.MouseButtonDown(button);
-}
-
-void LobbyMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (search.MouseButtonUp(button) == Button::State::HOVER) {
-		//broadcast to the network, or a specific server
-		NetworkPacket packet;
-		packet.meta.type = NetworkPacket::Type::BROADCAST_REQUEST;
-		network.Send(config["server.host"].c_str(), config.Int("server.port"), reinterpret_cast<void*>(&packet), sizeof(NetworkPacket));
-
-		//reset the server list
-		serverInfo.clear();
-		selection = nullptr;
-	}
-
-	else if (join.MouseButtonUp(button) == Button::State::HOVER && selection != nullptr) {
-		//join the selected server
-		NetworkPacket packet;
-		packet.meta.type = NetworkPacket::Type::JOIN_REQUEST;
-		network.Send(&selection->address, &packet, sizeof(NetworkPacket));
-		selection = nullptr;
-	}
-
-	else if (back.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::MAINMENU);
-	}
-
-	else if (
-		//has the user selected a server on the list?
-		button.x > listBox.x &&
-		button.x < listBox.x + listBox.w &&
-		button.y > listBox.y &&
-		button.y < listBox.y + listBox.h * serverInfo.size()
-		) {
-		selection = &serverInfo[(button.y - listBox.y)/listBox.h];
-	}
-	else {
-		selection = nullptr;
-	}
-}
-
-void LobbyMenu::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			SetNextScene(SceneList::MAINMENU);
-		break;
-	}
-}
-
-void LobbyMenu::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}
-
-void LobbyMenu::HandlePacket(NetworkPacket packet) {
-		switch(packet.meta.type) {
-		case NetworkPacket::Type::BROADCAST_RESPONSE: {
-			ServerInformation server;
-			server.name = packet.serverInfo.name;
-			server.address = packet.meta.srcAddress;
-			serverInfo.push_back(server);
-		}
-		break;
-		case NetworkPacket::Type::JOIN_RESPONSE:
-			clientIndex = packet.clientInfo.index;
-			network.Bind(&packet.meta.srcAddress, Channels::SERVER);
-			SetNextScene(SceneList::INWORLD);
-		break;
-
-		//handle errors
-		default:
-			throw(std::runtime_error("Unknown NetworkPacket::Type encountered"));
-		break;
-	}
-}

client/scenes/lobby_menu.hpp

@@ -1,85 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef LOBBYMENU_HPP_
-#define LOBBYMENU_HPP_
-
-#include "base_scene.hpp"
-
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-
-#include "config_utility.hpp"
-#include "udp_network_utility.hpp"
-#include "network_packet.hpp"
-
-#include <vector>
-
-class LobbyMenu : public BaseScene {
-public:
-	//Public access members
-	LobbyMenu(ConfigUtility* const, UDPNetworkUtility* const, int* const);
-	~LobbyMenu();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update(double delta);
-	void FrameEnd();
-	void Render(SDL_Surface* const);
-
-	//Event handlers
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
-	void KeyDown(SDL_KeyboardEvent const&);
-	void KeyUp(SDL_KeyboardEvent const&);
-
-	void HandlePacket(NetworkPacket);
-
-	//global
-	ConfigUtility& config;
-	UDPNetworkUtility& network;
-	int& clientIndex;
-
-	//members
-	Image image;
-	RasterFont font;
-	Button search;
-	Button join;
-	Button back;
-
-	//server list
-	struct ServerInformation {
-		std::string name;
-		IPaddress address;
-	};
-
-	std::vector<ServerInformation> serverInfo;
-
-	//a terrible hack, forgive me
-	//I'd love a proper gui system for this
-	SDL_Rect listBox;
-	ServerInformation* selection = nullptr;
-};
-
-#endif

client/scenes/main_menu.cpp

@@ -1,122 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "main_menu.hpp"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-MainMenu::MainMenu(ConfigUtility* const argConfig):
-	config(*argConfig)
-{
-	//setup the utility objects
-	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
-
-	//pass the utility objects
-	startButton.SetImage(&image);
-	startButton.SetFont(&font);
-	optionsButton.SetImage(&image);
-	optionsButton.SetFont(&font);
-	quitButton.SetImage(&image);
-	quitButton.SetFont(&font);
-
-	//set the button positions
-	startButton.SetX(50);
-	startButton.SetY(50 + image.GetClipH() * 0);
-	optionsButton.SetX(50);
-	optionsButton.SetY(50 + image.GetClipH() * 1);
-	quitButton.SetX(50);
-	quitButton.SetY(50 + image.GetClipH() * 2);
-
-	//set the button texts
-	startButton.SetText("Start");
-	optionsButton.SetText("Options");
-	quitButton.SetText("Quit");
-}
-
-MainMenu::~MainMenu() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void MainMenu::FrameStart() {
-	//
-}
-
-void MainMenu::Update(double delta) {
-	//
-}
-
-void MainMenu::FrameEnd() {
-	//
-}
-
-void MainMenu::Render(SDL_Surface* const screen) {
-	startButton.DrawTo(screen);
-	optionsButton.DrawTo(screen);
-	quitButton.DrawTo(screen);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void MainMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	startButton.MouseMotion(motion);
-	optionsButton.MouseMotion(motion);
-	quitButton.MouseMotion(motion);
-}
-
-void MainMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	startButton.MouseButtonDown(button);
-	optionsButton.MouseButtonDown(button);
-	quitButton.MouseButtonDown(button);
-}
-
-void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (startButton.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::LOBBYMENU);
-	}
-	if (optionsButton.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::OPTIONSMENU);
-	}
-	if (quitButton.MouseButtonUp(button) == Button::State::HOVER) {
-		QuitEvent();
-	}
-}
-
-void MainMenu::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			QuitEvent();
-		break;
-	}
-}
-
-void MainMenu::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}

client/scenes/main_menu.hpp

@@ -1,63 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef MAINMENU_HPP_
-#define MAINMENU_HPP_
-
-#include "base_scene.hpp"
-
-#include "config_utility.hpp"
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-
-class MainMenu : public BaseScene {
-public:
-	//Public access members
-	MainMenu(ConfigUtility* const);
-	~MainMenu();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update(double delta);
-	void FrameEnd();
-	void Render(SDL_Surface* const);
-
-	//Event handlers
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
-	void KeyDown(SDL_KeyboardEvent const&);
-	void KeyUp(SDL_KeyboardEvent const&);
-
-	//globals
-	ConfigUtility& config;
-
-	//members
-	Image image;
-	RasterFont font;
-	Button startButton;
-	Button optionsButton;
-	Button quitButton;
-};
-
-#endif

client/scenes/makefile

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

client/scenes/options_menu.cpp

@@ -1,102 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "options_menu.hpp"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-OptionsMenu::OptionsMenu(ConfigUtility* const argConfig):
-	config(*argConfig)
-{
-	//setup the utility objects
-	image.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	image.SetClipH(image.GetClipH()/3);
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
-
-	//pass the utility objects
-	backButton.SetImage(&image);
-	backButton.SetFont(&font);
-
-	//set the button positions
-	backButton.SetX(50);
-	backButton.SetY(50 + image.GetClipH() * 0);
-
-	//set the button texts
-	backButton.SetText("Back");
-}
-
-OptionsMenu::~OptionsMenu() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void OptionsMenu::FrameStart() {
-	//
-}
-
-void OptionsMenu::Update(double delta) {
-	//
-}
-
-void OptionsMenu::FrameEnd() {
-	//
-}
-
-void OptionsMenu::Render(SDL_Surface* const screen) {
-	backButton.DrawTo(screen);
-
-	font.DrawStringTo("Oh, were you looking for the options screen?", screen, 50, 30);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void OptionsMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	backButton.MouseMotion(motion);
-}
-
-void OptionsMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	backButton.MouseButtonDown(button);
-}
-
-void OptionsMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (backButton.MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::MAINMENU);
-	}
-}
-
-void OptionsMenu::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			SetNextScene(SceneList::MAINMENU);
-		break;
-	}
-}
-
-void OptionsMenu::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}

client/scenes/options_menu.hpp

@@ -1,61 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef OPTIONSMENU_HPP_
-#define OPTIONSMENU_HPP_
-
-#include "base_scene.hpp"
-
-#include "config_utility.hpp"
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-
-class OptionsMenu : public BaseScene {
-public:
-	//Public access members
-	OptionsMenu(ConfigUtility* const);
-	~OptionsMenu();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update(double delta);
-	void FrameEnd();
-	void Render(SDL_Surface* const);
-
-	//Event handlers
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
-	void KeyDown(SDL_KeyboardEvent const&);
-	void KeyUp(SDL_KeyboardEvent const&);
-
-	//globals
-	ConfigUtility& config;
-
-	//members
-	Image image;
-	RasterFont font;
-	Button backButton;
-};
-
-#endif

client/scenes/splash_screen.cpp

@@ -1,51 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "splash_screen.hpp"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-SplashScreen::SplashScreen(ConfigUtility* const argConfig):
-	config(*argConfig)
-{
-	logo.LoadSurface(config["dir.logos"] + "krstudios.bmp");
-	startTick = std::chrono::steady_clock::now();
-}
-
-SplashScreen::~SplashScreen() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void SplashScreen::Update(double delta) {
-	if (std::chrono::steady_clock::now() - startTick > std::chrono::duration<int>(1)) {
-		SetNextScene(SceneList::MAINMENU);
-	}
-}
-
-void SplashScreen::Render(SDL_Surface* const screen) {
-	logo.DrawTo(screen, (screen->w - logo.GetClipW()) / 2, (screen->h - logo.GetClipH()) / 2);
-}

common/config_utility.cpp

@@ -1,105 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "config_utility.hpp"
-
-#include <cstdlib>
-#include <fstream>
-#include <stdexcept>
-
-using namespace std;
-
-void ConfigUtility::Load(string fname) {
-	ifstream is(fname);
-
-	if (!is.is_open()) {
-		throw(runtime_error("Failed to open config file"));
-	}
-
-	string key, val;
-
-	for (;;) { //forever
-		//eat whitespace
-		while(isspace(is.peek()))
-			is.ignore();
-
-		//end of file
-		if (is.eof())
-			break;
-
-		//skip comment lines
-		if (is.peek() == '#') {
-			while(is.peek() != '\n' && !is.eof()) {
-				is.ignore();
-			}
-			continue;
-		}
-
-		//read in the pair
-		getline(is, key,'=');
-		getline(is, val);
-
-		//trim the strings at the start & end
-		while(key.size() && isspace(*key.begin())) key.erase(0, 1);
-		while(val.size() && isspace(*val.begin())) val.erase(0, 1);
-
-		while(key.size() && isspace(*(key.end()-1))) key.erase(key.end() - 1);
-		while(val.size() && isspace(*(val.end()-1))) val.erase(val.end() - 1);
-
-		//allow empty/wiped values
-		if (key.size() == 0) {
-			continue;
-		}
-
-		//save the pair
-		table[key] = val;
-	}
-
-	is.close();
-}
-
-std::string& ConfigUtility::String(std::string s) {
-	return table[s];
-}
-
-int ConfigUtility::Integer(std::string s) {
-	std::map<std::string, std::string>::iterator it = table.find(s);
-	if (it == table.end()) {
-		return 0;
-	}
-	return atoi(it->second.c_str());
-}
-
-double ConfigUtility::Double(std::string s) {
-	std::map<std::string, std::string>::iterator it = table.find(s);
-	if (it == table.end()) {
-		return 0.0;
-	}
-	return atof(it->second.c_str());
-}
-
-bool ConfigUtility::Boolean(std::string s) {
-	std::map<std::string, std::string>::iterator it = table.find(s);
-	if (it == table.end()) {
-		return false;
-	}
-	return it->second == "true";
-}

common/config_utility.hpp

@@ -1,60 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef CONFIGUTILITY_HPP_
-#define CONFIGUTILITY_HPP_
-
-#include <map>
-#include <string>
-
-class ConfigUtility {
-public:
-	ConfigUtility() = default;
-	ConfigUtility(std::string s) { Load(s); }
-
-	void Load(std::string fname);
-
-	//convert to a type
-	std::string& String(std::string);
-	int Integer(std::string);
-	double Double(std::string);
-	bool Boolean(std::string);
-
-	//shorthand
-	std::string& operator[](std::string s) {
-		return String(s);
-	}
-	int Int(std::string s) {
-		return Integer(s);
-	}
-	bool Bool(std::string s) {
-		return Boolean(s);
-	}
-
-	//OO breaker
-	std::map<std::string, std::string>* GetMap() {
-		return &table;
-	}
-private:
-	std::map<std::string, std::string> table;
-};
-
-#endif

common/graphics/sprite_sheet.cpp

@@ -1,102 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "sprite_sheet.hpp"
-
-#include <stdexcept>
-#include <sstream>
-
-void SpriteSheet::Update(double delta) {
-	if (delay && (tick += delta) >= delay) {
-		if (++xIndex >= xCount) {
-			xIndex = 0;
-		}
-		tick = 0;
-	}
-	image.SetClipX(xIndex * image.GetClipW());
-	image.SetClipY(yIndex * image.GetClipH());
-}
-
-SDL_Surface* SpriteSheet::LoadSurface(std::string fname, Uint16 xCellCount, Uint16 yCellCount) {
-	image.LoadSurface(fname);
-
-	xCount = xCellCount;
-	yCount = yCellCount;
-
-	image.SetClipW(image.GetSurface()->w / xCount);
-	image.SetClipH(image.GetSurface()->h / yCount);
-
-	xIndex = yIndex = 0;
-	delay = tick = 0.0;
-}
-
-SDL_Surface* SpriteSheet::SetSurface(SDL_Surface* surface, Uint16 xCellCount, Uint16 yCellCount) {
-	image.SetSurface(surface);
-
-	xCount = xCellCount;
-	yCount = yCellCount;
-
-	image.SetClipW(image.GetSurface()->w / xCount);
-	image.SetClipH(image.GetSurface()->h / yCount);
-
-	xIndex = yIndex = 0;
-	delay = tick = 0.0;
-}
-
-void SpriteSheet::FreeSurface() {
-	image.FreeSurface();
-	xCount = yCount = 0;
-	xIndex = yIndex = 0;
-	delay = tick = 0.0;
-}
-
-Uint16 SpriteSheet::SetXCount(Uint16 i) {
-	xIndex = 0;
-	return xCount = i;
-}
-
-Uint16 SpriteSheet::SetYCount(Uint16 i) {
-	yIndex = 0;
-	return yCount = i;
-}
-
-Uint16 SpriteSheet::SetXIndex(Uint16 i) {
-	if (i > xCount) {
-		std::ostringstream os;
-		os << "Cannot set x index to " << i;
-		throw(std::invalid_argument(os.str()));
-	}
-	return xIndex = i;
-}
-
-Uint16 SpriteSheet::SetYIndex(Uint16 i) {
-	if (i > yCount) {
-		std::ostringstream os;
-		os << "Cannot set y index to " << i;
-		throw(std::invalid_argument(os.str()));
-	}
-	return yIndex = i;
-}
-
-double SpriteSheet::SetDelay(double d) {
-	tick = 0;
-	return delay = d;
-}

common/graphics/sprite_sheet.hpp

@@ -1,66 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef SPRITESHEET_HPP_
-#define SPRITESHEET_HPP_
-
-#include "image.hpp"
-
-class SpriteSheet {
-public:
-	SpriteSheet() = default;
-	SpriteSheet(std::string fname, Uint16 xCellCount, Uint16 yCellCount) { LoadSurface(fname, xCellCount, yCellCount); }
-	SpriteSheet(SDL_Surface* surface, Uint16 xCellCount, Uint16 yCellCount) { SetSurface(surface, xCellCount, yCellCount); }
-	~SpriteSheet() { FreeSurface(); };
-
-	void Update(double delta);
-
-	SDL_Surface* LoadSurface(std::string fname, Uint16 xCellCount, Uint16 yCellCount);
-	SDL_Surface* SetSurface(SDL_Surface* surface, Uint16 xCellCount, Uint16 yCellCount);
-	SDL_Surface* GetSurface() { return image.GetSurface(); }
-	void FreeSurface();
-
-	void DrawTo(SDL_Surface* const dest, Sint16 x, Sint16 y) { image.DrawTo(dest, x, y); }
-
-	//accessors and mutators
-	Image* GetImage() { return ℑ } //OO breaker
-
-	Uint16 SetXCount(Uint16);
-	Uint16 SetYCount(Uint16);
-	Uint16 SetXIndex(Uint16);
-	Uint16 SetYIndex(Uint16);
-
-	Uint16 GetXCount() const { return xCount; }
-	Uint16 GetYCount() const { return yCount; }
-	Uint16 GetXIndex() const { return xIndex; }
-	Uint16 GetYIndex() const { return yIndex; }
-
-	double SetDelay(double d);
-	double GetDelay() const { return delay; }
-
-private:
-	Image image;
-	Uint16 xCount = 0, yCount = 0; //number of cells
-	Uint16 xIndex = 0, yIndex = 0; //current cell being drawn
-	double delay = 0.0, tick = 0.0;
-};
-
-#endif

common/makefile

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

common/map/makefile

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

common/map/region.cpp

@@ -1,123 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "region.hpp"
-
-#include "utility.hpp"
-
-#include <stdexcept>
-#include <sstream>
-
-Region::Region(int _x, int _y, int _w, int _h):
-	x(_x),
-	y(_y),
-	width(_w),
-	height(_h)
-{
-	//make sure that the region's position lines up
-	if (x != snapToBase(width, x) || y != snapToBase(height, y)) {
-		std::ostringstream os;
-		os << "Region is unaligned; x: " << x << ", y: " << y << ", width: " << width << ", height: " << height;
-		throw(std::runtime_error(os.str()));
-	}
-}
-
-int Region::NewTileR(Tile const& tile) {
-	//return 1 for overwrite, 0 for insert
-	if (!InBoundsR(tile.x, tile.y)) {
-		std::ostringstream os;
-		os << "New tile location out of bounds: " <<
-			"(" << x << "," << y << ")->" <<
-			"(" << tile.x << "," << tile.y << ")"
-		;
-		throw(std::runtime_error(os.str()));
-	}
-
-	int ret = tiles.erase(tile);
-	tiles.insert(tile);
-	return ret;
-}
-
-Tile Region::GetTileR(int tx, int ty, int minDepth) {
-	std::set<Tile>::iterator ptr = tiles.begin();
-
-	//skip the tiles that are too deep
-	while(ptr != tiles.end()) {
-		if (ptr->depth >= minDepth) {
-			break;
-		}
-		ptr++;
-	}
-
-	//find the first tile here
-	while(ptr != tiles.end()) {
-		//bounds
-		if ((ptr->x <= tx) && (ptr->y <= ty) && (ptr->x + ptr->width > tx) && (ptr->y + ptr->height > ty)) {
-			break;
-		}
-		ptr++;
-	}
-
-	//found it
-	if (ptr != tiles.end()) {
-		return *ptr;
-	}
-
-	//a tileIndex of -1 is an error code, the rest is for show
-	return {0,0,0,-1,-1,-1};
-}
-
-int Region::DeleteTileR(Tile const& tile) {
-	if (!InBoundsR(tile.x, tile.y)) {
-		throw(std::runtime_error("Deleted tile location out of bounds"));
-
-		std::ostringstream os;
-		os << "Deleted tile location out of bounds: " <<
-			"(" << x << "," << y << ")->" <<
-			"(" << tile.x << "," << tile.y << ")"
-		;
-		throw(std::runtime_error(os.str()));
-	}
-	//sentinel/error code
-	if (tile.tileIndex == -1) {
-		return 0;
-	}
-	return tiles.erase(tile);
-}
-
-bool operator<(Region const& lhs, Region const& rhs) {
-	//sort by y -> x
-	if (lhs.y == rhs.y) {
-		return lhs.x < rhs.x;
-	}
-	return lhs.y < rhs.y;
-}
-
-inline bool operator>(Region const& lhs, Region const& rhs) {
-	//wrap the other operator
-	return rhs < lhs;
-}
-
-inline bool operator==(Region const& lhs, Region const& rhs) {
-	//comparisons work on the location ONLY
-	//this function is redundant as far as the std::set object is concerned
-	return (lhs.x == rhs.x) && (lhs.y == rhs.y);
-}

common/map/region.hpp

@@ -1,112 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef REGION_HPP_
-#define REGION_HPP_
-
-#include "tile.hpp"
-
-#include <set>
-
-/* A single section of the map.
- * This class stores the tiles relative to it's own position, but
- * there are functions for referencing the tiles' absolute position.
- * These functions simply wrap the normal functions.
-*/
-class Region {
-public:
-	Region() = delete;
-	Region(int x, int y, int width, int height);
-	~Region() = default;
-
-	//create and insert a new tile, overwriting an existing tile at that location
-	int NewTileR(Tile const& tile);
-	int NewTileA(Tile const& tile) {
-		//these can change, if the Tile class is changed
-		return NewTileR({
-			tile.x - x,
-			tile.y - y,
-			tile.depth,
-			tile.width,
-			tile.height,
-			tile.tileIndex
-		});
-	}
-
-	//find the first tile at this location, with the specified minimum depth
-	Tile GetTileR(int tx, int ty, int minDepth);
-	Tile GetTileA(int tx, int ty, int minDepth) {
-		return GetTileR(tx - x, ty - y, minDepth);
-	}
-
-	//wrap the other delete functions
-	int DeleteTileR(int tx, int ty, int minDepth) {
-		return DeleteTileR(GetTileR(tx, ty, minDepth));
-	}
-	int DeleteTileA(int tx, int ty, int minDepth) {
-		//explicitly skip one function call by adjusting from A to R
-		return DeleteTileR(GetTileR(tx - x, ty - y, minDepth));
-	}
-
-	//delete the specified tile
-	int DeleteTileR(Tile const& tile);
-	int DeleteTileA(Tile const& tile) {
-		//these can change, if the Tile class is changed
-		return DeleteTileR({
-			tile.x - x,
-			tile.y - y,
-			tile.depth,
-			tile.width,
-			tile.height,
-			tile.tileIndex
-		});
-	}
-
-	//find if the specified location exists within the region's bounds
-	bool InBoundsR(int i, int j) {
-		return (i >= 0) && (j >= 0) && (i < width) && (j < height);
-	}
-	bool InBoundsA(int i, int j) {
-		return InBoundsR(i - x, j - y);
-	}
-
-	//Raw accessors & mutators
-	int GetX() const { return x; }
-	int GetY() const { return y; }
-	int GetWidth() const { return width; }
-	int GetHeight() const { return height; }
-
-	std::set<Tile>* GetTiles() { return &tiles; }
-
-	//sorting the regions by the locations
-	friend bool operator<(Region const& lhs, Region const& rhs);
-	friend bool operator>(Region const& lhs, Region const& rhs);
-	friend bool operator==(Region const& lhs, Region const& rhs);
-
-private:
-	int const x;
-	int const y;
-	int const width;
-	int const height;
-	std::set<Tile> tiles;
-};
-
-#endif

common/map/region_pager.cpp

@@ -1,121 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "region_pager.hpp"
-
-#include "utility.hpp"
-
-#include <stdexcept>
-#include <string>
-
-RegionPager::RegionPager() {
-	//
-}
-
-RegionPager::~RegionPager() {
-	if (onDelete) {
-		for (auto& i : regionList) {
-			onDelete(&i);
-		}
-	}
-}
-
-Region* RegionPager::NewRegion(int x, int y) {
-	for (auto& i : regionList) {
-		if (i.GetX() == x && i.GetY() == y) {
-			throw(std::runtime_error("Duplicate Regions detected"));
-		}
-	}
-
-	regionList.push_front({x, y, regionWidth, regionHeight});
-	if (onNew) {
-		onNew(&regionList.front());
-	}
-	return &regionList.front();
-}
-
-Region* RegionPager::GetRegion(int x, int y) {
-	for (auto& i : regionList) {
-		if (i.GetX() == x && i.GetY() == y) {
-			return &i;
-		}
-	}
-	//create, insert and return
-	regionList.push_front({x, y, regionWidth, regionHeight});
-	if (onNew) {
-		onNew(&regionList.front());
-	}
-	return &regionList.front();
-}
-
-void RegionPager::DeleteRegion(int x, int y) {
-	for (std::list<Region>::iterator i = regionList.begin(); i != regionList.end(); i++) {
-		if (i->GetX() == x && i->GetY() == y) {
-			if (onDelete) {
-				onDelete(&(*i));
-			}
-			regionList.erase(i);
-			break;
-		}
-	}
-}
-
-void RegionPager::DrawTo(SDL_Surface* const dest, TileSheetManager* const sheetMgr, int camX, int camY) {
-	for (auto& regionIter : regionList) {
-
-#ifdef DEBUG
-		//draw the region's location
-		SDL_Rect box = {
-			Sint16(regionIter.GetX() - camX),
-			Sint16(regionIter.GetY() - camY),
-			Uint16(regionIter.GetWidth()),
-			Uint16(regionIter.GetHeight())
-		};
-		SDL_FillRect(dest, &box, SDL_MapRGB(dest->format, 10, 10, 20));
-#endif
-
-		//draw each tile
-		for (auto& tileIter : *regionIter.GetTiles()) {
-			sheetMgr->DrawTo(
-				dest,
-				tileIter.x + regionIter.GetX() - camX,
-				tileIter.y + regionIter.GetY() - camY,
-				tileIter.tileIndex
-			);
-		}
-	}
-}
-
-void RegionPager::Prune(int left, int top, int right, int bottom) {
-	std::list<Region>::iterator it = regionList.begin();
-
-	while(it != regionList.end()) {
-		if (it->GetX() >= right || it->GetY() >= bottom || it->GetX() + it->GetWidth() < left || it->GetY() + it->GetHeight() < top) {
-			if (onDelete) {
-				onDelete(&(*it));
-			}
-			regionList.erase(it);
-			it = regionList.begin();
-			continue;
-		}
-		it++;
-	}
-}

common/map/region_pager.hpp

@@ -1,69 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef REGIONPAGER_HPP_
-#define REGIONPAGER_HPP_
-
-#include "region.hpp"
-#include "tile_sheet_manager.hpp"
-
-#include <list>
-
-class RegionPager {
-public:
-	//for simplicity and consistency
-	typedef void (*regionCallback_t)(Region* const);
-
-	RegionPager();
-	~RegionPager();
-
-	//these parameters MUST be multiples of the width & height
-	Region* NewRegion(int x, int y);
-	Region* GetRegion(int x, int y);
-	void DeleteRegion(int x, int y);
-
-	//call this to draw to the screen
-	void DrawTo(SDL_Surface* const, TileSheetManager* const, int camX, int camY);
-
-	//callback hooks
-	void SetOnNew(regionCallback_t f) { onNew = f; }
-	void SetOnDelete(regionCallback_t f) { onDelete = f; }
-
-	//params: Absolute values
-	void Prune(int left, int top, int right, int bottom);
-
-	//accessors and mutators
-	int SetWidth(int i) { return regionWidth = i; }
-	int SetHeight(int i) { return regionHeight = i; }
-
-	int GetWidth() const { return regionWidth; }
-	int GetHeight() const { return regionHeight; }
-
-	std::list<Region>* GetRegions() { return &regionList; }
-private:
-	std::list<Region> regionList;
-	int regionWidth = 0, regionHeight = 0;
-
-	regionCallback_t onNew = nullptr;
-	regionCallback_t onDelete = nullptr;
-};
-
-#endif

common/map/tile.cpp

@@ -1,44 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "tile.hpp"
-
-bool operator<(Tile const& lhs, Tile const& rhs) {
-	//sort by depth -> y -> x
-	if (lhs.depth == rhs.depth) {
-		if (lhs.y == rhs.y) {
-			return lhs.x < rhs.x;
-		}
-		return lhs.y < rhs.y;
-	}
-	return lhs.depth < rhs.depth;
-}
-
-inline bool operator>(Tile const& lhs, Tile const& rhs) {
-	//wrap the other operator
-	return rhs < lhs;
-}
-
-inline bool operator==(Tile const& lhs, Tile const& rhs) {
-	//comparisons work on the location ONLY
-	//this function is redundant as far as the std::set object is concerned
-	return (lhs.x == rhs.x) && (lhs.y == rhs.y) && (lhs.depth == rhs.depth);
-}

common/map/tile.hpp

@@ -1,50 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef TILE_HPP_
-#define TILE_HPP_
-
-//explicitly a POD
-struct Tile {
-	//position relative to the Region
-	int x, y, depth;
-
-	//graphics
-	int width, height;
-	int tileIndex;
-
-	Tile() = default;
-	Tile(int _x, int _y, int _depth, int _width, int _height, int _tileIndex) {
-		//The order of the arguments should be explicit
-		x = _x;
-		y = _y;
-		depth = _depth;
-		width = _width;
-		height = _height;
-		tileIndex = _tileIndex;
-	}
-};
-
-bool operator<(Tile const& lhs, Tile const& rhs);
-bool operator>(Tile const& lhs, Tile const& rhs);
-bool operator==(Tile const& lhs, Tile const& rhs);
-
-#endif

common/map/tile_sheet.cpp

@@ -1,59 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "tile_sheet.hpp"
-
-#include <stdexcept>
-
-void TileSheet::Load(std::string fname, Uint16 w, Uint16 h) {
-	//setup the image
-	image.LoadSurface(fname);
-	image.SetClipW(w);
-	image.SetClipH(h);
-
-	//get the tile counts
-	xCount = image.GetSurface()->w / w;
-	yCount = image.GetSurface()->h / h;
-	totalCount = xCount * yCount;
-
-	//set begin & end (usually temporary)
-	begin = 0;
-	end = totalCount;
-}
-
-void TileSheet::Unload() {
-	image.FreeSurface();
-	totalCount = xCount = yCount = 0;
-	begin = end = -1;
-}
-
-void TileSheet::DrawTo(SDL_Surface* const dest, int x, int y, int tileIndex) {
-	if (!InRange(tileIndex)) {
-		throw(std::invalid_argument("Tile index out of range"));
-	}
-	Sint16 clipX = (tileIndex-begin) % xCount * image.GetClipW();
-	Sint16 clipY = (tileIndex-begin) / xCount * image.GetClipH();
-
-	image.SetClipX(clipX);
-	image.SetClipY(clipY);
-
-	image.DrawTo(dest, x, y);
-}

common/map/tile_sheet.hpp

@@ -1,70 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef TILESHEET_HPP_
-#define TILESHEET_HPP_
-
-#include "image.hpp"
-
-#include <string>
-
-/* The TileSheet class is used for drawing tiles of the map to the screen.
- * This class also tracks the range of the tile images.
-*/
-class TileSheet {
-public:
-	TileSheet() = default;
-	~TileSheet() = default;
-
-	//these load/set functions need to be followed by bookkeeping code
-	//w & h are the width & height of individual tiles
-	//TODO: rename these
-	void Load(std::string fname, Uint16 w, Uint16 h);
-	void Unload();
-
-	void DrawTo(SDL_Surface* const dest, int x, int y, int tileIndex);
-
-	bool InRange(int i) { return i >= begin && i < end; }
-
-	//accessors and mutators
-	Image* GetImage() { return &image; }
-
-	int GetTileW() const { return image.GetClipW(); }
-	int GetTileH() const { return image.GetClipH(); }
-
-	int GetTotalCount() const { return totalCount; }
-	int GetXCount() const { return xCount; }
-	int GetYCount() const { return yCount; }
-
-	int SetBegin(int i) { return begin = i; }
-	int SetEnd(int i) { return end = i; }
-
-	int GetBegin() const { return begin; }
-	int GetEnd() const { return end; }
-private:
-	Image image;
-
-	//these are generated and used by internal processes
-	int totalCount = 0, xCount = 0, yCount = 0;
-	int begin = -1, end = -1;
-};
-
-#endif

common/map/tile_sheet_manager.cpp

@@ -1,73 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "tile_sheet_manager.hpp"
-
-#include "utility.hpp"
-
-#include <stdexcept>
-
-TileSheet* TileSheetManager::LoadSheet(std::string fname, Uint16 w, Uint16 h) {
-	//get the key
-	std::string key = truncatePath(fname);
-
-	//don't override what's already here
-	if (sheetMap.find(key) != sheetMap.end()) {
-		throw(std::runtime_error("Cannot load duplicate tile sheets"));
-	}
-
-	//load & setup the sheet object
-	sheetMap[key].Load(fname, w, h);
-	sheetMap[key].SetBegin(rangeEnd);
-	rangeEnd += sheetMap[key].GetTotalCount();
-	sheetMap[key].SetEnd(rangeEnd);
-
-	//you can modify the object, say, during the save & load routines...
-	return &sheetMap[key];
-}
-
-TileSheet* TileSheetManager::GetSheet(std::string name) {
-	return &sheetMap.at(name);
-}
-
-TileSheet* TileSheetManager::GetSheetByIndex(int tileIndex) {
-	for (auto& it : sheetMap) {
-		if (it.second.InRange(tileIndex)) {
-			return &it.second;
-		}
-	}
-	return nullptr;
-}
-
-void TileSheetManager::UnloadSheet(std::string name) {
-	sheetMap.erase(name);
-}
-
-void TileSheetManager::DrawTo(SDL_Surface* const dest, int x, int y, int tileIndex) {
-	for (auto& it : sheetMap) {
-		if (it.second.InRange(tileIndex)) {
-			it.second.DrawTo(dest, x, y, tileIndex);
-			return;
-		}
-	}
-	//No matching tile index
-	throw(std::invalid_argument("Tile index is out of range of all tile sheets"));
-}

common/map/tile_sheet_manager.hpp

@@ -1,51 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef TILESHEETMANAGER_HPP_
-#define TILESHEETMANAGER_HPP_
-
-#include "tile_sheet.hpp"
-
-#include <map>
-#include <string>
-
-class TileSheetManager {
-public:
-	TileSheetManager() = default;
-	~TileSheetManager() = default;
-
-	TileSheet* LoadSheet(std::string fname, Uint16 w, Uint16 h);
-	TileSheet* GetSheet(std::string name);
-	TileSheet* GetSheetByIndex(int tileIndex);
-	void UnloadSheet(std::string name);
-
-	void DrawTo(SDL_Surface* const, int x, int y, int tileIndex);
-
-	int SetRangeEnd(int i) { return rangeEnd += i; }
-	int GetRangeEnd() const { return rangeEnd; }
-
-	std::map<std::string, TileSheet>* GetSheetMap() { return &sheetMap; }
-private:
-	std::map<std::string, TileSheet> sheetMap;
-	int rangeEnd = 0;
-};
-
-#endif

common/network/network_packet.hpp

@@ -1,106 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef NETWORKPACKET_HPP_
-#define NETWORKPACKET_HPP_
-
-#include "SDL/SDL_net.h"
-
-#include "vector2.hpp"
-
-#define PACKET_STRING_SIZE 100
-
-#pragma pack(push, 0)
-
-union NetworkPacket {
-	//types of packets
-	enum class Type {
-		//default: there is something wrong
-		NONE = 0,
-
-		//not used
-		PING = 1,
-		PONG = 2,
-
-		//Searching for a server to join
-		BROADCAST_REQUEST = 3,
-		BROADCAST_RESPONSE = 4,
-
-		//try to join the server
-		JOIN_REQUEST = 5,
-		JOIN_RESPONSE = 6,
-
-		//disconnect from the server
-		DISCONNECT = 7,
-
-		//mass update
-		SYNCHRONIZE = 8,
-
-		//shut down the server
-		SHUTDOWN = 9,
-
-		//Player movement, etc.
-		PLAYER_NEW = 10,
-		PLAYER_DELETE = 11,
-		PLAYER_UPDATE = 12,
-	};
-
-	//metadata on the packet itself
-	struct Metadata {
-		Type type;
-		IPaddress srcAddress;
-	}meta;
-
-	//information about the server
-	struct ServerInformation {
-		Metadata meta;
-		//TODO: version info
-		char name[PACKET_STRING_SIZE];
-		//TODO: player count
-	}serverInfo;
-
-	//information about the client
-	struct ClientInformation {
-		Metadata meta;
-		int index;
-	}clientInfo;
-
-	//information about a player
-	struct PlayerInformation {
-		Metadata meta;
-		int clientIndex;
-		int playerIndex;
-		char handle[PACKET_STRING_SIZE];
-		char avatar[PACKET_STRING_SIZE];
-		Vector2 position;
-		Vector2 motion;
-	}playerInfo;
-
-	//defaults
-	NetworkPacket() {
-		meta.type = Type::NONE;
-		meta.srcAddress = {0,0};
-	}
-};
-
-#pragma pack(pop)
-
-#endif

common/network/udp_network_utility.cpp

@@ -1,148 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "udp_network_utility.hpp"
-
-#include <stdexcept>
-
-void UDPNetworkUtility::Open(int port, int packSize) {
-	if (!(socket = SDLNet_UDP_Open(port))) {
-		Close();
-		throw(std::runtime_error("Failed to open a UDP socket"));
-	}
-
-	if (!(packOut = SDLNet_AllocPacket(packSize))) {
-		Close();
-		throw(std::runtime_error("Failed to allocate the out packet"));
-	}
-
-	if (!(packIn = SDLNet_AllocPacket(packSize))) {
-		Close();
-		throw(std::runtime_error("Failed to allocate the in packet"));
-	}
-}
-
-void UDPNetworkUtility::Close() {
-	SDLNet_UDP_Close(socket);
-	SDLNet_FreePacket(packOut);
-	SDLNet_FreePacket(packIn);
-	socket = nullptr;
-	packOut = nullptr;
-	packIn = nullptr;
-}
-
-int UDPNetworkUtility::Bind(const char* ip, int port, int channel) {
-	IPaddress add;
-	if (SDLNet_ResolveHost(&add, ip, port) == -1) {
-		throw(std::runtime_error("Failed to resolve a host"));
-	}
-
-	return Bind(&add, channel);
-}
-
-int UDPNetworkUtility::Bind(IPaddress* add, int channel) {
-	int ret = SDLNet_UDP_Bind(socket, channel, add);
-
-	if (ret == -1) {
-		throw(std::runtime_error("Failed to bind to a channel"));
-	}
-
-	return ret;
-}
-
-void UDPNetworkUtility::Unbind(int channel) {
-	SDLNet_UDP_Unbind(socket, channel);
-}
-
-int UDPNetworkUtility::Send(const char* ip, int port, void* data, int len) {
-	IPaddress add;
-	if (SDLNet_ResolveHost(&add, ip, port) == -1) {
-		throw(std::runtime_error("Failed to resolve a host"));
-	}
-
-	Send(&add, data, len);
-}
-
-int UDPNetworkUtility::Send(IPaddress* add, void* data, int len) {
-	if (len > packOut->maxlen) {
-		throw(std::runtime_error("Failed to copy the data into the packet"));
-	}
-	memset(packOut->data, 0, packOut->maxlen);
-	memcpy(packOut->data, data, len);
-	packOut->len = len;
-	packOut->address = *add;
-
-	int ret = SDLNet_UDP_Send(socket, -1, packOut);
-
-	if (ret <= 0) {
-		throw(std::runtime_error("Failed to send a packet"));
-	}
-
-	return ret;
-}
-
-int UDPNetworkUtility::Send(int channel, void* data, int len) {
-	if (len > packOut->maxlen) {
-		throw(std::runtime_error("Failed to copy the data into the packet"));
-	}
-	memset(packOut->data, 0, packOut->maxlen);
-	memcpy(packOut->data, data, len);
-	packOut->len = len;
-
-	int ret = SDLNet_UDP_Send(socket, channel, packOut);
-
-	if (ret <= 0) {
-		throw(std::runtime_error("Failed to send a packet"));
-	}
-
-	return ret;
-}
-
-int UDPNetworkUtility::SendAll(void* data, int len) {
-	if (len > packOut->maxlen) {
-		throw(std::runtime_error("Failed to copy the data into the packet"));
-	}
-	memset(packOut->data, 0, packOut->maxlen);
-	memcpy(packOut->data, data, len);
-	packOut->len = len;
-
-	int sent = 0;
-
-	//send to all bound channels
-	for (int i = 0; i < SDLNET_MAX_UDPCHANNELS; i++) {
-		if (SDLNet_UDP_GetPeerAddress(socket, i)) {
-			sent += SDLNet_UDP_Send(socket, i, packOut);
-		}
-	}
-
-	return sent;
-}
-
-int UDPNetworkUtility::Receive() {
-	memset(packIn->data, 0, packIn->maxlen);
-	int ret = SDLNet_UDP_Recv(socket, packIn);
-
-	if (ret < 0) {
-		throw(std::runtime_error("Unknown network error occured"));
-	}
-
-	return ret;
-}

common/network/udp_network_utility.hpp

@@ -1,71 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef UDPNETWORKUTILITY_HPP_
-#define UDPNETWORKUTILITY_HPP_
-
-#include "SDL/SDL_net.h"
-
-class UDPNetworkUtility {
-public:
-	UDPNetworkUtility() = default;
-	~UDPNetworkUtility() = default;
-
-	void Open(int port, int packSize);
-	void Close();
-
-	//bind to a channel
-	int Bind(const char* ip, int port, int channel = -1);
-	int Bind(IPaddress* add, int channel = -1);
-	void Unbind(int channel);
-
-	IPaddress* GetIPAddress(int channel) {
-		return SDLNet_UDP_GetPeerAddress(socket, channel);
-	}
-
-	int Send(const char* ip, int port, void* data, int len);
-	int Send(IPaddress* add, void* data, int len);
-	int Send(int channel, void* data, int len);
-	int SendAll(void* data, int len);
-	int Receive();
-
-	void* GetOutData() const {
-		return reinterpret_cast<void*>(packOut->data);
-	};
-	void* GetInData() const {
-		return reinterpret_cast<void*>(packIn->data);
-	};
-	UDPpacket* GetOutPacket() const {
-		return packOut;
-	}
-	UDPpacket* GetInPacket() const {
-		return packIn;
-	}
-	UDPsocket GetSocket() const {
-		return socket;
-	}
-private:
-	UDPsocket socket = nullptr;
-	UDPpacket* packOut = nullptr;
-	UDPpacket* packIn = nullptr;
-};
-
-#endif

common/ui/button.cpp

@@ -1,81 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "button.hpp"
-
-#include <stdexcept>
-
-Button::State Button::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	return CalcState(motion.x, motion.y, motion.state & SDL_BUTTON_LMASK);
-}
-
-Button::State Button::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	if (button.button == SDL_BUTTON_LEFT) {
-		return CalcState(button.x, button.y, true);
-	}
-	return state;
-}
-
-Button::State Button::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (button.button == SDL_BUTTON_LEFT) {
-		return CalcState(button.x, button.y, false);
-	}
-	return state;
-}
-
-void Button::DrawTo(SDL_Surface* const dest) {
-	if (!image || !font) {
-		throw(std::runtime_error("Surface not set for Button"));
-	}
-	image->SetClipY(state * image->GetClipH());
-	image->DrawTo(dest, x, y);
-	font->DrawStringTo(text, dest, textX + x, textY + y);
-}
-
-std::string Button::SetText(std::string t) {
-	if (!image || !font) {
-		throw(std::runtime_error("Surface not set for Button"));
-	}
-	//one line, cache the position
-	text = t;
-	textX = (image->GetClipW() / 2) - (font->GetCharW() * text.size() / 2);
-	textY = (image->GetClipH() / 2) - (font->GetCharH() / 2);
-	return text;
-}
-
-Button::State Button::CalcState(Sint16 i, Sint16 j, bool leftPressed) {
-	if (!image || !font) {
-		throw(std::runtime_error("Surface not set for Button"));
-	}
-	//if out of bounds
-	if (i < x || i >= (x + image->GetClipW()) ||
-		j < y || j >= (y + image->GetClipH())
-		) {
-		return state = State::NORMAL;
-	}
-
-	if (leftPressed) {
-		return state = State::PRESSED;
-	}
-	else {
-		return state = State::HOVER;
-	}
-}

common/ui/button.hpp

@@ -1,94 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef BUTTON_HPP_
-#define BUTTON_HPP_
-
-#include "image.hpp"
-#include "raster_font.hpp"
-
-#include <string>
-
-/* 3-phases, no toggle, centred text
- * This class uses the size of the provided image as its bounds. Also,
- * The provided image should be formatted correctly.
- *
- * The button's image should be divided into 3 sections virtucally,
- * which act as the different button images. The clip width & height of the
- * Image should be set manually, and the height should be 1/3 of the total
- * graphical data.
-*/
-class Button {
-public:
-	enum State {
-		NORMAL = 0, HOVER = 1, PRESSED = 2
-	};
-
-	Button() = default;
-	~Button() = default;
-
-	//handle input
-	State MouseMotion(SDL_MouseMotionEvent const&);
-	State MouseButtonDown(SDL_MouseButtonEvent const&);
-	State MouseButtonUp(SDL_MouseButtonEvent const&);
-
-	//yet another draw function
-	void DrawTo(SDL_Surface* const);
-
-	//accessors and mutators
-	Image* SetImage(Image* const ptr) { return image = ptr; }
-	Image* GetImage() { return image; }
-	RasterFont* SetFont(RasterFont* const ptr) { return font = ptr; }
-	RasterFont* GetFont() { return font; }
-
-	Sint16 SetX(Sint16 i) { return x = i; }
-	Sint16 SetY(Sint16 i) { return y = i; }
-	Sint16 GetX() const { return x; }
-	Sint16 GetY() const { return y; }
-
-	Sint16 SetTextX(Sint16 i) { return textX = i; }
-	Sint16 SetTextY(Sint16 i) { return textY = i; }
-	Sint16 GetTextX() const { return textX; }
-	Sint16 GetTextY() const { return textY; }
-
-	State SetState(State s) { return state = s; }
-	State GetState() const { return state; }
-
-	std::string SetText(std::string);
-	std::string GetText() const { return text; }
-
-private:
-	State CalcState(Sint16 x, Sint16 y, bool leftPressed);
-
-	//point to the provided external objects
-	Image* image = nullptr;
-	RasterFont* font = nullptr;
-
-	//positions
-	Sint16 x = 0, y = 0;
-	Sint16 textX = 0, textY = 0;
-
-	//
-	State state = State::NORMAL;
-	std::string text;
-};
-
-#endif

common/ui/makefile

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

common/ui/menu_bar.cpp

@@ -1,139 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "menu_bar.hpp"
-
-#include <stdexcept>
-#include <sstream>
-
-void MenuBar::DrawTo(SDL_Surface* const dest) {
-	for (auto& i : entries) {
-		i.DrawTo(dest);
-	}
-}
-
-void MenuBar::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	for (auto& i : entries) {
-		i.MouseMotion(motion);
-	}
-}
-
-void MenuBar::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	for (auto& i : entries) {
-		i.MouseButtonDown(button);
-	}
-}
-
-void MenuBar::MouseButtonUp(SDL_MouseButtonEvent const& button, int* entry, int* butt) {
-	*entry = *butt = -1;
-	int ret = -1;
-	for (auto& i : entries) {
-		ret = i.MouseButtonUp(button);
-
-		if (ret != -1) {
-			*entry = (&i - entries.data());
-			*butt = ret;
-		}
-	}
-}
-
-void MenuBar::SetEntries(std::vector<std::vector<std::string>> info) {
-	if (!image || !font) {
-		throw(std::runtime_error("Surfaces not loaded into the menu bar"));
-	}
-
-	entries.clear();
-	for (int i = 0; i < info.size(); i++) {
-		//create the entry & the main button
-		entries.push_back(MenuBarEntry());
-		entries[i].mainButton.SetImage(image);
-		entries[i].mainButton.SetFont(font);
-		entries[i].mainButton.SetText(info[i][0]);
-		entries[i].mainButton.SetX(i * image->GetClipW());
-		entries[i].mainButton.SetY(0);
-		for (int j = 0; j < info[i].size()-1; j++) {
-			//create each drop button in this entry
-			entries[i].dropButtons.push_back(Button());
-			entries[i].dropButtons[j].SetImage(image);
-			entries[i].dropButtons[j].SetFont(font);
-			entries[i].dropButtons[j].SetText(info[i][j+1]);
-			entries[i].dropButtons[j].SetX(i * image->GetClipW());
-			entries[i].dropButtons[j].SetY((j+1) * image->GetClipH());
-		}
-	}
-}
-
-void MenuBar::MenuBarEntry::DrawTo(SDL_Surface* const dest) {
-	//only draw the dropButtons in the user has this menu open
-	mainButton.DrawTo(dest);
-
-	if (!open) {
-		return;
-	}
-
-	for (auto& i : dropButtons) {
-		i.DrawTo(dest);
-	}
-}
-
-void MenuBar::MenuBarEntry::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	//open the menu
-	bool o = mainButton.MouseMotion(motion) == Button::State::PRESSED;
-
-	if (!(open |= o)) {
-		return;
-	}
-
-	for (auto& i : dropButtons) {
-		//dragging down the menu
-		o |= i.MouseMotion(motion) == Button::State::PRESSED;
-	}
-
-	open = o;
-}
-
-void MenuBar::MenuBarEntry::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	//open the menu
-	if (!(open = mainButton.MouseButtonDown(button) == Button::State::PRESSED)) {
-		return;
-	}
-
-	//update the others anyway
-	for (auto& i : dropButtons) {
-		i.MouseButtonDown(button);
-	}
-}
-
-int MenuBar::MenuBarEntry::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	int ret = -1;
-	mainButton.MouseButtonUp(button);
-
-	for (auto& i : dropButtons) {
-		//the user just released this button
-		if (i.GetState() != i.MouseButtonUp(button) && i.GetState() == Button::State::HOVER && open) {
-			//get this button's index
-			ret = (&i - dropButtons.data());
-		}
-	}
-
-	open = false;
-	return ret;
-}

common/ui/menu_bar.hpp

@@ -1,91 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef MENUBAR_HPP_
-#define MENUBAR_HPP_
-
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "button.hpp"
-
-#include <string>
-#include <vector>
-
-/* I've redesigned this so that the contents of the menu bar can't change during run time.
- * This is more restrictive but I'm focusing on getting this working first.
- * The Image and Font pointers must be set before the text data is entered.
- * 
- * This class needs a rewrite.
-*/
-
-class MenuBar {
-public:
-	MenuBar() = default;
-	~MenuBar() = default;
-
-	//yet another draw function
-	void DrawTo(SDL_Surface* const dest);
-
-	//user inputs
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&, int* entry, int* button);
-
-	//manage the entries & buttons
-	void SetEntries(std::vector<std::vector<std::string>> info);
-	void ClearEntries() { entries.clear(); }
-
-	//Accessors and mutators
-	Image* SetImage(Image* const ptr) { return image = ptr; }
-	Image* GetImage() { return image; }
-	RasterFont* SetFont(RasterFont* const ptr) { return font = ptr; }
-	RasterFont* GetFont() { return font; }
-
-private:
-	class MenuBarEntry;
-
-	std::vector<MenuBarEntry> entries;
-
-	Image* image = nullptr;
-	RasterFont* font = nullptr;
-};
-
-class MenuBar::MenuBarEntry {
-public:
-	MenuBarEntry() = default;
-	~MenuBarEntry() = default;
-
-	void DrawTo(SDL_Surface* const dest);
-
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	int MouseButtonUp(SDL_MouseButtonEvent const&);
-
-private:
-	Button mainButton;
-
-	std::vector<Button> dropButtons;
-	bool open = false;
-
-	friend class MenuBar;
-};
-
-#endif

common/ui/raster_font.cpp

@@ -1,60 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "raster_font.hpp"
-
-#include <stdexcept>
-
-/* It might be more efficient to render to a different surface (like an Image)
- * rather than calling this function with all of it's '%' and '/'.
-*/
-
-void RasterFont::DrawStringTo(std::string s, SDL_Surface* const dest, Sint16 x, Sint16 y) {
-	if (!image.GetSurface()) {
-		throw(std::runtime_error("RasterFont not loaded"));
-	}
-	const Uint16 w = image.GetClipW();
-	const Uint16 h = image.GetClipH();
-	for (int i = 0; i < s.size(); i++) {
-		image.SetClipX(s[i] % 16 * w);
-		image.SetClipY(s[i] / 16 * h);
-		image.DrawTo(dest, x + i * w, y);
-	}
-}
-
-/* Note: This class can only take a raster font with 16*16 characters, and the
- * indevidual characters must have the same dimensions. Overall this class is too
- * restrictive; I suggest using a 3rd party library.
-*/
-
-SDL_Surface* RasterFont::LoadSurface(std::string fname) {
-	image.LoadSurface(fname);
-	image.SetClipW(image.GetSurface()->w/16);
-	image.SetClipH(image.GetSurface()->h/16);
-	return image.GetSurface();
-}
-
-SDL_Surface* RasterFont::SetSurface(SDL_Surface* p) {
-	image.SetSurface(p);
-	image.SetClipW(image.GetSurface()->w/16);
-	image.SetClipH(image.GetSurface()->h/16);
-	return image.GetSurface();
-}

common/ui/raster_font.hpp

@@ -1,54 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef RASTERFONT_HPP_
-#define RASTERFONT_HPP_
-
-#include "image.hpp"
-
-class RasterFont {
-public:
-	RasterFont() = default;
-	RasterFont(RasterFont const& rhs) { *this = rhs; }
-	RasterFont(RasterFont&& rhs) { *this = std::move(rhs); }
-	RasterFont(std::string fname) { LoadSurface(fname); }
-	RasterFont(SDL_Surface* p) { SetSurface(p); }
-	~RasterFont() = default;
-
-	RasterFont& operator=(RasterFont const& rhs) { image = rhs.image; }
-	RasterFont& operator=(RasterFont&& rhs) { image = std::move(rhs.image); }
-
-	void DrawStringTo(std::string, SDL_Surface* const, Sint16 x, Sint16 y);
-
-	//Accessors and Mutators
-	SDL_Surface* LoadSurface(std::string);
-	SDL_Surface* SetSurface(SDL_Surface*);
-	SDL_Surface* GetSurface() const { return image.GetSurface(); }
-	void FreeSurface() { image.FreeSurface(); }
-
-	Uint16 GetCharW() const { return image.GetClipW(); }
-	Uint16 GetCharH() const { return image.GetClipH(); }
-
-private:
-	Image image;
-};
-
-#endif

common/utility.cpp

@@ -1,59 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "utility.hpp"
-
-#include <algorithm>
-
-int snapToBase(int base, int x) {
-	//snap to a grid
-	if (x < 0) {
-		x++;
-		return x - x % base - base;
-	}
-	return x - x % base;
-}
-
-std::string truncatePath(std::string pathname) {
-	return std::string(
-		std::find_if(
-			pathname.rbegin(),
-			pathname.rend(),
-			[](char ch) -> bool {
-				//windows only
-				return ch == '/' || ch == '\\';
-//				//unix only
-//				return ch == '/';
-			}).base(),
-		pathname.end());
-}
-
-std::string to_string_custom(int i) {
-	char buffer[20];
-	snprintf(buffer, 20, "%d", i);
-	return std::string(buffer);
-}
-
-int to_integer_custom(std::string s) {
-	int ret = 0;
-	sscanf(s.c_str(), "%d", &ret);
-	return ret;
-}

common/utility.hpp

@@ -1,48 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef UTILITY_HPP_
-#define UTILITY_HPP_
-
-#include <string>
-
-int snapToBase(int base, int x);
-std::string truncatePath(std::string pathname);
-
-//fixing known bugs in g++
-std::string to_string_custom(int i);
-
-int to_integer_custom(std::string);
-
-//wow
-template<typename ContainerT, typename PredicateT>
-void erase_if(ContainerT& items, const PredicateT& predicate) {
-	for(auto it = items.begin(); it != items.end(); /* empty */) {
-		if(predicate(*it)) {
-			it = items.erase(it);
-		}
-		else {
-			++it;
-		}
-	}
-};
-
-#endif

editor/editor_scene.cpp

@@ -1,282 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "editor_scene.hpp"
-
-#include "utility.hpp"
-
-#include <cstdio>
-#include <iostream>
-#include <stdexcept>
-
-using namespace std;
-
-//-------------------------
-//Public access members
-//-------------------------
-
-EditorScene::EditorScene(ConfigUtility* const arg1):
-	config(*arg1)
-{
-	//create the debugging "window"
-	debugInfo.CreateSurface(256, 256);
-
-	//setup the utility objects
-	font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp");
-
-	buttonImage.LoadSurface(config["dir.interface"] + "button_menu.bmp");
-	buttonImage.SetClipH(buttonImage.GetClipH()/3);
-
-	//setup the menu bar
-	menuBar.SetFont(&font);
-	menuBar.SetImage(&buttonImage);
-
-	menuBar.SetEntries({
-		{"File", "-New", "-Open", "-Save", "-Save As...", "-Close", "Exit"},
-		{"Edit", "-Set Tile", "-Load Sheet", "-Delete Sheet", "-Metadata", "-Run Script"},
-		{"Debugging", "Debug On", "Debug Off", "Toggle Debug", "Testificate"}
-	});
-
-	//setup the pager
-	pager.SetOnNew([](Region* const ptr){
-		printf("New Region: %d, %d\n", ptr->GetX(), ptr->GetY());
-	});
-
-	pager.SetOnDelete([](Region* const ptr){
-		printf("Delete Region: %d, %d\n", ptr->GetX(), ptr->GetY());
-	});
-
-	//Set a resonable size for the regions
-	pager.SetWidth(32*4);
-	pager.SetHeight(32*4);
-
-	sheetMgr.LoadSheet(config["dir.tilesets"] + "terrain.bmp", 32, 32);
-}
-
-EditorScene::~EditorScene() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void EditorScene::FrameStart() {
-	//
-}
-
-void EditorScene::Update(double delta) {
-	pager.Prune(camera.x, camera.y, camera.x + GetScreen()->w, camera.y + GetScreen()->h);
-}
-
-void EditorScene::FrameEnd() {
-	//
-}
-
-void EditorScene::Render(SDL_Surface* const screen) {
-	//draw the map
-	pager.DrawTo(screen, &sheetMgr, camera.x, camera.y);
-
-	//draw a big bar across the top
-	buttonImage.SetClipY(0);
-	for (int i = 0; i < screen->w; i += buttonImage.GetClipW()) {
-		buttonImage.DrawTo(screen, i, 0);
-	}
-
-	//draw the menu bar
-	menuBar.DrawTo(screen);
-
-	//draw some debugging info
-	if (debugOpen) {
-		SDL_FillRect(debugInfo.GetSurface(), 0, 0);
-		DrawToDebugInfo(string("camera.x: ") + to_string_custom(camera.x), 0);
-		DrawToDebugInfo(string("camera.y: ") + to_string_custom(camera.y), 1);
-		debugInfo.DrawTo(screen, screen->w - debugInfo.GetClipW(), buttonImage.GetClipH());
-	}
-}
-
-void EditorScene::DrawToDebugInfo(std::string str, int line) {
-	//draw the debug info on the right
-	font.DrawStringTo(
-		str,
-		debugInfo.GetSurface(),
-		debugInfo.GetClipW() - str.size() * font.GetCharW(),
-		font.GetCharH() * line
-	);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void EditorScene::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	menuBar.MouseMotion(motion);
-
-	if (motion.state & SDL_BUTTON_LMASK && motion.y >= buttonImage.GetClipH()) {
-		Region* regionPtr = pager.GetRegion(
-			snapToBase(pager.GetWidth(), motion.x + camera.x),
-			snapToBase(pager.GetHeight(), motion.y + camera.y)
-		);
-
-		TileSheet* sheetPtr = sheetMgr.GetSheetByIndex(tileCounter);
-
-		regionPtr->NewTileA({
-			snapToBase(sheetPtr->GetTileW(), motion.x + camera.x), //x
-			snapToBase(sheetPtr->GetTileH(), motion.y + camera.y), //y
-			0, //depth
-			sheetPtr->GetTileW(), //width
-			sheetPtr->GetTileH(), //height
-			tileCounter++ //value
-		});
-	}
-
-	if (motion.state & SDL_BUTTON_RMASK) {
-		camera.x -= motion.xrel;
-		camera.y -= motion.yrel;
-	}
-}
-
-void EditorScene::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	menuBar.MouseButtonDown(button);
-
-	if (button.button == SDL_BUTTON_LEFT && button.y >= buttonImage.GetClipH()) {
-		Region* regionPtr = pager.GetRegion(
-			snapToBase(pager.GetWidth(), button.x + camera.x),
-			snapToBase(pager.GetHeight(), button.y + camera.y)
-		);
-
-		TileSheet* sheetPtr = sheetMgr.GetSheetByIndex(tileCounter);
-
-		regionPtr->NewTileA({
-			snapToBase(sheetPtr->GetTileW(), button.x + camera.x), //x
-			snapToBase(sheetPtr->GetTileH(), button.y + camera.y), //y
-			0, //depth
-			sheetPtr->GetTileW(), //width
-			sheetPtr->GetTileH(), //height
-			tileCounter++ //value
-		});
-	}
-}
-
-void EditorScene::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	int entry, drop;
-	menuBar.MouseButtonUp(button, &entry, &drop);
-
-	//manage input from the menu bar
-	switch(entry) {
-		case 0: //File
-			switch(drop) {
-				case 0:
-					//TODO: NEW
-				break;
-
-				case 1:
-					//TODO: OPEN
-				break;
-
-				case 2:
-					//TODO: SAVE
-				break;
-
-				case 3:
-					//TODO: SAVE AS
-				break;
-
-				case 4:
-					//TODO: CLOSE
-				break;
-
-				case 5: {
-					//Quit
-					SDL_Event e;
-					e.type = SDL_QUIT;
-					SDL_PushEvent(&e);
-				}
-				break;
-			}
-		break;
-
-		case 1: //Edit
-			switch(drop) {
-				case 0:
-					//TODO: SET TILE
-				break;
-
-				case 1:
-					//TODO: LOAD SHEET
-				break;
-
-				case 2:
-					//TODO: DELETE SHEET
-				break;
-
-				case 3:
-					//TODO: METADATA
-				break;
-
-				case 4:
-					//TODO: RUN SCRIPT
-				break;
-			}
-		break;
-
-		case 2: //Debug
-			switch(drop) {
-				case 0:
-					debugOpen = true;
-				break;
-
-				case 1:
-					debugOpen = false;
-				break;
-
-				case 2:
-					debugOpen = !debugOpen;
-				break;
-
-				case 3:
-					SetNextScene(SceneList::TESTIFICATESCENE);
-				break;
-			}
-		break;
-	}
-}
-
-void EditorScene::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			QuitEvent();
-		break;
-
-		case SDLK_SPACE:
-			camera.x = 0;
-			camera.y = 0;
-		break;
-
-		case SDLK_TAB:
-			debugOpen = !debugOpen;
-		break;
-	}
-}
-
-void EditorScene::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}

editor/editor_scene.hpp

@@ -1,80 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef EDITORSCENE_HPP_
-#define EDITORSCENE_HPP_
-
-#include "base_scene.hpp"
-
-#include "region_pager.hpp"
-#include "tile_sheet_manager.hpp"
-
-#include "config_utility.hpp"
-#include "image.hpp"
-#include "raster_font.hpp"
-#include "menu_bar.hpp"
-
-//#include "map_loader.hpp"
-
-class EditorScene : public BaseScene {
-public:
-	//Public access members
-	EditorScene(ConfigUtility* const);
-	~EditorScene();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update(double delta);
-	void FrameEnd();
-	void Render(SDL_Surface* const);
-
-	//Event handlers
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
-	void KeyDown(SDL_KeyboardEvent const&);
-	void KeyUp(SDL_KeyboardEvent const&);
-
-	//globals
-	ConfigUtility& config;
-
-	//debugging tools
-	void DrawToDebugInfo(std::string, int line);
-	Image debugInfo;
-	bool debugOpen = true;
-
-	RegionPager pager;
-	TileSheetManager sheetMgr;
-
-	RasterFont font;
-	Image buttonImage;
-
-	MenuBar menuBar;
-
-	struct {
-		int x = 0, y = 0;
-	} camera;
-
-	int tileCounter = 0;
-};
-
-#endif

editor/main.cpp

@@ -1,42 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "editor_application.hpp"
-
-#include <stdexcept>
-#include <iostream>
-
-using namespace std;
-
-int main(int, char**) {
-	cout << "Beginning editor" << endl;
-	try {
-		EditorApplication::GetInstance()->Init();
-		EditorApplication::GetInstance()->Proc();
-		EditorApplication::GetInstance()->Quit();
-	}
-	catch(exception& e) {
-		cerr << "Fatal exception thrown: " << e.what() << endl;
-		return 1;
-	}
-	cout << "Clean exit" << endl;
-	return 0;
-}

editor/testificate_scene.cpp

@@ -1,107 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "testificate_scene.hpp"
-
-#include <iostream>
-
-using std::cout;
-using std::endl;
-
-//-------------------------
-//Public access members
-//-------------------------
-
-TestificateScene::TestificateScene(ConfigUtility* const arg1):
-	config(*arg1)
-{
-	sheetMgr.LoadSheet(config["dir.tilesets"] + "grass.bmp", 32, 32);
-	sheetMgr.LoadSheet(config["dir.tilesets"] + "longgrass.bmp", 32, 32);
-	sheetMgr.LoadSheet(config["dir.tilesets"] + "sand.bmp", 32, 32);
-	sheetMgr.LoadSheet(config["dir.tilesets"] + "dirt.bmp", 32, 32);
-	sheetMgr.LoadSheet(config["dir.tilesets"] + "water.bmp", 32, 32);
-
-	cout << "Range End: " << sheetMgr.GetRangeEnd() << endl;
-
-	pager.SetWidth(128);
-	pager.SetHeight(128);
-
-	pager.GetRegion(0, 0)->NewTileR({0, 0, 0, 32, 32, 0});
-}
-
-TestificateScene::~TestificateScene() {
-	//
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void TestificateScene::FrameStart() {
-	//
-}
-
-void TestificateScene::Update(double delta) {
-	//
-}
-
-void TestificateScene::FrameEnd() {
-	//
-}
-
-void TestificateScene::Render(SDL_Surface* const screen) {
-	//dump all tile graphics to the screen
-	for (int i = 0; i < sheetMgr.GetRangeEnd(); i++) {
-		sheetMgr.DrawTo(screen, i * 32 % screen->w, i * 32 / screen->w * 32, i);
-	}
-
-//	pager.DrawTo(screen, &sheetMgr, 0, 0);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void TestificateScene::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	//
-}
-
-
-void TestificateScene::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void TestificateScene::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void TestificateScene::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-//			QuitEvent();
-		SetNextScene(SceneList::EDITORSCENE);
-		break;
-	}
-}
-
-void TestificateScene::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}

editor/testificate_scene.hpp

@@ -1,59 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef TESTIFICATESCENE_HPP_
-#define TESTIFICATESCENE_HPP_
-
-#include "base_scene.hpp"
-
-#include "config_utility.hpp"
-#include "tile_Sheet_manager.hpp"
-#include "region_pager.hpp"
-
-class TestificateScene : public BaseScene {
-public:
-	//Public access members
-	TestificateScene(ConfigUtility* const);
-	~TestificateScene();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update(double delta);
-	void FrameEnd();
-	void Render(SDL_Surface* const);
-
-	//Event handlers
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
-	void KeyDown(SDL_KeyboardEvent const&);
-	void KeyUp(SDL_KeyboardEvent const&);
-
-	//globals
-	ConfigUtility& config;
-
-	//members
-	TileSheetManager sheetMgr;
-	RegionPager pager;
-};
-
-#endif

makefile

@@ -4,17 +4,15 @@
 #RM=del /y
 
 CXXFLAGS+=-static-libgcc -static-libstdc++
-CFLAGS+=-static-libgcc
 
 export
 
 OUTDIR=out
 
 all: $(OUTDIR)
-	$(MAKE) -C common
-	$(MAKE) -C server
-	$(MAKE) -C client
-	$(MAKE) -C editor
+	$(MAKE) -C utils
+	$(MAKE) -C mapgen
+	$(MAKE) -C src
 
 $(OUTDIR):
 	mkdir $(OUTDIR)

mapgen/makefile

@@ -1,20 +1,17 @@
 #config
-INCLUDES+=. ..
+INCLUDES+=. ../utils
 LIBS+=
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
 CXXSRC=$(wildcard *.cpp)
-CSRC=$(wildcard *.c)
 
 #objects
 OBJDIR=obj
 OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.o))
 
 #output
-OUTDIR=../..
+OUTDIR=..
 OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 
 #targets
@@ -34,9 +31,6 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
 clean:
 	$(RM) *.o *.a *.exe
 

mapgen/map_generator.cpp

@@ -0,0 +1,120 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "map_generator.hpp"
+
+#include "vector2.hpp"
+
+#include <cmath>
+
+//-------------------------
+//Utility functions
+//-------------------------
+
+//snap to a grid (floating point version)
+static double snap(double x, double base) {
+	return floor(x / base) * base;
+}
+
+//A.K.A.: the dot product
+static double scalarProduct(Vector2 lhs, Vector2 rhs) {
+	return lhs.x * rhs.x + lhs.y * rhs.y;
+}
+
+//curved interpolation
+static double curve(double x) {
+	//param: 0 to 1 inclusive
+	return 3.0 * pow(x, 2.0) - 2.0 * pow(x, 3.0);
+}
+
+//fix the overflow
+static double curl(double x) {
+	if (x > 1.0) {
+		return -curl(x-1) +1;
+	}
+	if (x < 0.0) {
+		return curl(-x);
+	}
+	return x;
+}
+
+static double cut(double x) {
+	if (x > 1.0) {
+		return 1.0;
+	}
+	if (x < 0.0) {
+		return 0.0;
+	}
+	return x;
+}
+
+//-------------------------
+//Public methods
+//-------------------------
+
+Vector2 MapGenerator::RawNoise(Vector2 const& gridPoint) {
+	double angle = rng(gridPoint.x * 0xffff + gridPoint.y);
+	Vector2 v = {cos(angle), sin(angle)};
+	v.Normalize();
+	return v;
+}
+
+double MapGenerator::Influence(Vector2 const& gridPoint, Vector2 const& queryPoint, double width, double height) {
+	//note: inverting the distance here, so the smaller the distance the more influence it has
+	Vector2 distance = queryPoint - gridPoint;
+	Vector2 inverted = {width - distance.x, height - distance.y};
+	double ret = scalarProduct(RawNoise(gridPoint), inverted);
+	return ret > 0 ? ret : -ret;
+}
+
+double MapGenerator::ScaledNoise(double x, double y, double width, double height) {
+	Vector2 queryPoint = {x, y};
+
+	//the "grid points"
+	Vector2 tl = {snap(x, width), snap(y, height)};
+	Vector2 tr = {tl.x + width, tl.y};
+	Vector2 bl = {tl.x, tl.y + height};
+	Vector2 br = {tl.x + width, tl.y + height};
+
+	//influence equasion
+	double s = Influence(tl, queryPoint, width, height);
+	double t = Influence(tr, queryPoint, width, height);
+	double u = Influence(bl, queryPoint, width, height);
+	double v = Influence(br, queryPoint, width, height);
+
+	//Finally, calc the value
+	double a = s + curve((t - s) / width);
+	double b = u + curve((v - u) / width);
+	return curve((b - a) / height);
+}
+
+double MapGenerator::ScaledOctave(double x, double y, double width, double height, double octave) {
+	double ret = 0;
+	if (octave > 1) {
+		ret += ScaledOctave(x, y, width/2, height/2, octave-1);
+	}
+	return ret / octave + ScaledNoise(x, y, width, height);
+}
+
+double MapGenerator::GetPixel(double x, double y, double width, double height, double octave) {
+	//use this as a decorator function
+	return curl(ScaledOctave(x, y, width, height, octave));
+}

mapgen/map_generator.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,33 +19,26 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SPLASHSCREEN_HPP_
-#define SPLASHSCREEN_HPP_
+#ifndef MAPGENERATOR_HPP_
+#define MAPGENERATOR_HPP_
 
-#include "base_scene.hpp"
+#include "simple_rng.hpp"
 
-#include "config_utility.hpp"
-#include "image.hpp"
+#include "vector2.hpp"
 
-#include <chrono>
-
-class SplashScreen : public BaseScene {
+class MapGenerator {
 public:
-	//Public access members
-	SplashScreen(ConfigUtility* const);
-	~SplashScreen();
+	MapGenerator() = default;
+	~MapGenerator() = default;
 
-protected:
-	//Frame loop
-	void Update(double delta);
-	void Render(SDL_Surface* const);
+	Vector2 RawNoise(Vector2 const&);
+	double Influence(Vector2 const& gridPoint, Vector2 const& queryPoint, double width, double height);
+	double ScaledNoise(double x, double y, double width, double height);
+	double ScaledOctave(double x, double y, double width, double height, double octave);
+	double GetPixel(double x, double y, double width, double height, double octave);
 
-	//globals
-	ConfigUtility& config;
-
-	//members
-	std::chrono::steady_clock::time_point startTick;
-	Image logo;
+private:
+	SimpleRNG rng;
 };
 
-#endif
+#endif

rsc/config.cfg

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

rsc/scripts/setup_server.sql

@@ -1,73 +0,0 @@
--------------------------
---Server
--------------------------
-
-CREATE TABLE IF NOT EXISTS UserAccounts (
-	userAccountID INTEGER PRIMARY KEY AUTOINCREMENT,
-	username varchar(30) UNIQUE,
-	password varchar(30),
-	blacklisted BIT DEFAULT 0,
-	whitelisted BIT DEFAULT 1
-);
-
--------------------------
---Items
--------------------------
-
-CREATE TABLE IF NOT EXISTS GlobalItemList (
-	globalItemListID INTEGER PRIMARY KEY AUTOINCREMENT,
-	itemName varchar(30) UNIQUE,
-	itemImage varchar(30),
-	type varchar(15), --{'mundane', 'consumable', 'equipment'}
-	maxStackSize INTEGER, --{1-max; 0 for non-stackable}
-	maxUniqueCopies INTEGER --{1-max; 0 for unlimited}
-);
-
-CREATE TABLE IF NOT EXISTS MundaneItems (
-	mundaneItemID INTEGER PRIMARY KEY AUTOINCREMENT,
-	globalItemListID INTEGER REFERENCES GlobalItemList(globalItemListID)
-	--holds whatever
-);
-
-CREATE TABLE IF NOT EXISTS Consumables (
-	consumableID INTEGER PRIMARY KEY AUTOINCREMENT,
-	globalItemListID INTEGER REFERENCES GlobalItemList(globalItemListID)
-	--holds all consumable items info (food, potions, etc.)
-);
-
-CREATE TABLE IF NOT EXISTS Equipment (
-	equipmentID INTEGER PRIMARY KEY AUTOINCREMENT,
-	globalItemListID INTEGER REFERENCES GlobalItemList(globalItemListID)
-	--hold all equipment info
-);
-
--------------------------
---Players
--------------------------
-
-CREATE TABLE IF NOT EXISTS PlayerCharacters (
-	playerCharacterID INTEGER PRIMARY KEY AUTOINCREMENT,
-	name varchar(30) UNIQUE,
-
-	--stats
-	currentLevel		INTEGER DEFAULT 0,
-	currentExperience	INTEGER DEFAULT 0,
-	maxHealth			INTEGER DEFAULT 0,
-	maxMana				INTEGER DEFAULT 0,
-	currentHealth		INTEGER DEFAULT 0,
-	currentMana			INTEGER DEFAULT 0,
-	attack				INTEGER DEFAULT 0,
-	defence				INTEGER DEFAULT 0,
-	--etc.
-
-	--equipment
-	weapon INTEGER REFERENCES Equipment(equipmentID),
-	helmet INTEGER REFERENCES Equipment(equipmentID),
-	armour INTEGER REFERENCES Equipment(equipmentID)
-	--etc.
-);
-
-CREATE TABLE IF NOT EXISTS PlayerInventoryItems (
-	characterID INTEGER REFERENCES PlayerCharacters(characterID),
-	globalItemListID INTEGER REFERENCES GlobalItemList(globalItemListID)
-);

server/makefile

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

server/server_application.cpp

@@ -1,300 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "server_application.hpp"
-
-#include "utility.hpp"
-
-#include <stdexcept>
-#include <iostream>
-#include <string>
-#include <fstream>
-
-using namespace std;
-
-//-------------------------
-//Define the ServerApplication
-//-------------------------
-
-ServerApplication::ServerApplication() {
-	//
-}
-
-ServerApplication::~ServerApplication() {
-	//
-}
-
-void ServerApplication::Init(int argc, char** argv) {
-	//TODO: proper command line option parsing
-
-	//load config
-	config.Load("rsc\\config.cfg");
-
-	//Init SDL
-	if (SDL_Init(0)) {
-		throw(runtime_error("Failed to initialize SDL"));
-	}
-	cout << "initialized SDL" << endl;
-
-	//Init SDL_net
-	if (SDLNet_Init()) {
-		throw(runtime_error("Failed to init SDL_net"));
-	}
-	network.Open(config.Int("server.port"), sizeof(NetworkPacket));
-	cout << "initialized SDL_net" << endl;
-
-	//Init SQL
-	string dbname = (config["server.dbname"].size()) ? config["server.dbname"] : std::string(argv[0]) + ".db"; //fancy and unnecessary
-	int ret = sqlite3_open_v2(dbname.c_str(), &database, SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE|SQLITE_OPEN_FULLMUTEX, nullptr);
-	if (ret != SQLITE_OK || !database) {
-		throw(runtime_error("Failed to open the server database"));
-	}
-	cout << "initialized SQL" << endl;
-	cout << "Database filename: " << dbname << endl;
-
-	//TODO: move this into a function?
-	//Run setup scripts
-	ifstream is("rsc\\scripts\\setup_server.sql");
-	if (!is.is_open()) {
-		throw(runtime_error("Failed to run database setup script"));
-	}
-	string script;
-	getline(is, script, '\0');
-	is.close();
-	sqlite3_exec(database, script.c_str(), nullptr, nullptr, nullptr);
-}
-
-void ServerApplication::Loop() {
-	NetworkPacket packet;
-
-	while(running) {
-		//suck in the waiting packets & process them
-		try {
-			while(network.Receive()) {
-				memcpy(&packet, network.GetInData(), sizeof(NetworkPacket));
-				packet.meta.srcAddress = network.GetInPacket()->address;
-				HandlePacket(packet);
-			}
-		}
-		catch(exception& e) {
-			cerr << "Network Error: " << e.what() << endl;
-		}
-
-		//give the computer a break
-		SDL_Delay(10);
-	}
-}
-
-void ServerApplication::Quit() {
-	//members
-	network.Close();
-
-	//APIs
-	sqlite3_close_v2(database);
-	SDLNet_Quit();
-	SDL_Quit();
-}
-
-void ServerApplication::HandlePacket(NetworkPacket packet) {
-	switch(packet.meta.type) {
-		case NetworkPacket::Type::BROADCAST_REQUEST:
-			HandleBroadcastRequest(packet);
-		break;
-
-		case NetworkPacket::Type::JOIN_REQUEST:
-			HandleJoinRequest(packet);
-		break;
-
-		case NetworkPacket::Type::DISCONNECT:
-			HandleDisconnect(packet);
-		break;
-
-		case NetworkPacket::Type::SYNCHRONIZE:
-			HandleSynchronize(packet);
-		break;
-
-		case NetworkPacket::Type::SHUTDOWN:
-			HandleShutdown(packet);
-		break;
-
-		case NetworkPacket::Type::PLAYER_NEW:
-			HandlePlayerNew(packet);
-		break;
-
-		case NetworkPacket::Type::PLAYER_DELETE:
-			HandlePlayerDelete(packet);
-		break;
-
-		case NetworkPacket::Type::PLAYER_UPDATE:
-			HandlePlayerUpdate(packet);
-		break;
-
-		//handle errors
-		default:
-			throw(runtime_error("Unknown NetworkPacket::Type encountered"));
-		break;
-	}
-}
-
-void ServerApplication::HandleBroadcastRequest(NetworkPacket packet) {
-	//send back the server's name
-	packet.meta.type = NetworkPacket::Type::BROADCAST_RESPONSE;
-	snprintf(packet.serverInfo.name, PACKET_STRING_SIZE, "%s", config["server.name"].c_str());
-	network.Send(&packet.meta.srcAddress, &packet, sizeof(NetworkPacket));
-}
-
-void ServerApplication::HandleJoinRequest(NetworkPacket packet) {
-	//TODO: prevent duplicate logins from the same address?
-
-	//create the new client, filling it with the correct info
-	Client newClient;
-	newClient.address = packet.meta.srcAddress;
-
-	//push the new client
-	clientMap[clientCounter] = newClient;
-
-	//send the client their info
-	packet.meta.type = NetworkPacket::Type::JOIN_RESPONSE;
-	packet.clientInfo.index = clientCounter;
-	network.Send(&newClient.address, &packet, sizeof(NetworkPacket));
-
-	//finished this routine
-	clientCounter++;
-	cout << "connect, total: " << clientMap.size() << endl;
-}
-
-void ServerApplication::HandleDisconnect(NetworkPacket packet) {
-	//disconnect the specified client
-	network.Send(&clientMap[packet.clientInfo.index].address, &packet, sizeof(NetworkPacket));
-	clientMap.erase(packet.clientInfo.index);
-
-	//delete players
-	erase_if(playerMap, [&](pair<int, Player> it) -> bool {
-		if (it.second.clientIndex == packet.clientInfo.index) {
-			NetworkPacket delPacket;
-
-			//data to delete one specific player
-			delPacket.meta.type = NetworkPacket::Type::PLAYER_DELETE;
-			delPacket.playerInfo.playerIndex = it.first;
-
-			//send to all
-			PumpPacket(delPacket);
-
-			return true;
-		}
-		return false;
-	});
-
-	cout << "disconnect, total: " << clientMap.size() << endl;
-}
-
-void ServerApplication::HandleSynchronize(NetworkPacket packet) {
-	//send all the server's data to this client
-	NetworkPacket newPacket;
-
-	//players
-	newPacket.meta.type = NetworkPacket::Type::PLAYER_UPDATE;
-	for (auto& it : playerMap) {
-		newPacket.playerInfo.playerIndex = it.first;
-		snprintf(newPacket.playerInfo.handle, PACKET_STRING_SIZE, "%s", it.second.handle.c_str());
-		snprintf(newPacket.playerInfo.avatar, PACKET_STRING_SIZE, "%s", it.second.avatar.c_str());
-		newPacket.playerInfo.position = it.second.position;
-		newPacket.playerInfo.motion = it.second.motion;
-		network.Send(&clientMap[packet.clientInfo.index].address, &newPacket, sizeof(NetworkPacket));
-	}
-}
-
-void ServerApplication::HandleShutdown(NetworkPacket packet) {
-	//end the server
-	running = false;
-
-	//disconnect all clients
-	packet.meta.type = NetworkPacket::Type::DISCONNECT;
-	PumpPacket(packet);
-
-	cout << "shutting down" << endl;
-}
-
-void ServerApplication::HandlePlayerNew(NetworkPacket packet) {
-	//create the new player object
-	Player newPlayer;
-	newPlayer.clientIndex = packet.playerInfo.clientIndex;
-	newPlayer.handle = packet.playerInfo.handle;
-	newPlayer.avatar = packet.playerInfo.avatar;
-	newPlayer.position = {0,0};
-	newPlayer.motion = {0,0};
-
-	//push this player
-	playerMap[playerCounter] = newPlayer;
-
-	//send the client their info
-	packet.playerInfo.playerIndex = playerCounter;
-	packet.playerInfo.position = playerMap[playerCounter].position;
-	packet.playerInfo.motion = playerMap[playerCounter].motion;
-
-	//actually send to everyone
-	PumpPacket(packet);
-
-	//finish this routine
-	playerCounter++;
-}
-
-void ServerApplication::HandlePlayerDelete(NetworkPacket packet) {
-	if (playerMap.find(packet.playerInfo.playerIndex) == playerMap.end()) {
-		throw(std::runtime_error("Cannot delete a non-existant player"));
-	}
-
-	//delete players
-	erase_if(playerMap, [&](pair<int, Player> it) -> bool {
-		if (it.first == packet.playerInfo.playerIndex) {
-			NetworkPacket delPacket;
-
-			//data to delete one specific player
-			delPacket.meta.type = NetworkPacket::Type::PLAYER_DELETE;
-			delPacket.playerInfo.playerIndex = it.first;
-
-			//send to all
-			PumpPacket(delPacket);
-
-			return true;
-		}
-		return false;
-	});
-}
-
-void ServerApplication::HandlePlayerUpdate(NetworkPacket packet) {
-	if (playerMap.find(packet.playerInfo.playerIndex) == playerMap.end()) {
-		throw(std::runtime_error("Cannot update a non-existant player"));
-	}
-
-	//server is the slave to the clients, but only for now
-	playerMap[packet.playerInfo.playerIndex].position = packet.playerInfo.position;
-	playerMap[packet.playerInfo.playerIndex].motion = packet.playerInfo.motion;
-
-	PumpPacket(packet);
-}
-
-void ServerApplication::PumpPacket(NetworkPacket packet) {
-	//send this packet to all clients
-	for (auto& it : clientMap) {
-		network.Send(&it.second.address, &packet, sizeof(NetworkPacket));
-	}
-}

server/server_application.hpp

@@ -1,88 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#ifndef SERVERAPPLICATION_HPP_
-#define SERVERAPPLICATION_HPP_
-
-//networking
-#include "network_packet.hpp"
-#include "udp_network_utility.hpp"
-
-//APIs
-#include "sqlite3/sqlite3.h"
-#include "SDL/SDL.h"
-
-//misc
-#include "config_utility.hpp"
-#include "vector2.hpp"
-
-#include "client.hpp"
-#include "player.hpp"
-
-//STL
-#include <map>
-#include <string>
-
-//The main application class
-class ServerApplication {
-public:
-	//standard functions
-	ServerApplication();
-	~ServerApplication();
-
-	void Init(int argc, char** argv);
-	void Loop();
-	void Quit();
-
-private:
-	void HandlePacket(NetworkPacket);
-
-	//high cohesion utility functions
-	void HandleBroadcastRequest(NetworkPacket);
-	void HandleJoinRequest(NetworkPacket);
-	void HandleDisconnect(NetworkPacket);
-	void HandleSynchronize(NetworkPacket);
-	void HandleShutdown(NetworkPacket);
-	void HandlePlayerNew(NetworkPacket);
-	void HandlePlayerDelete(NetworkPacket);
-	void HandlePlayerUpdate(NetworkPacket);
-
-	void PumpPacket(NetworkPacket);
-
-	//networking
-	UDPNetworkUtility network;
-
-	//database
-	sqlite3* database = nullptr;
-
-	//misc
-	bool running = true;
-	ConfigUtility config;
-
-	//global lists
-	ClientMap clientMap;
-	PlayerMap playerMap;
-
-	int clientCounter = 0;
-	int playerCounter = 0;
-};
-
-#endif

src/application.cpp

@@ -1,11 +1,11 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
  * arising from the use of this software.
  * 
  * Permission is granted to anyone to use this software for any purpose,
- * including commercial EditorApplications, and to alter it and redistribute it
+ * including commercial Applications, and to alter it and redistribute it
  * freely, subject to the following restrictions:
  * 
  * 1. The origin of this software must not be misrepresented; you must not
@@ -19,52 +19,38 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "editor_application.hpp"
+#include "application.hpp"
 
 #include <stdexcept>
 #include <chrono>
-
-//-------------------------
-//Static declarations
-//-------------------------
-
-EditorApplication EditorApplication::instance;
+#include <sstream>
 
 //-------------------------
 //Scene headers
 //-------------------------
 
 //Add the custom scene headers here
-#include "editor_scene.hpp"
-#include "testificate_scene.hpp"
+#include "shell_scene.hpp"
 
 //-------------------------
 //Public access members
 //-------------------------
 
-EditorApplication::EditorApplication() {
-	//
-}
-
-EditorApplication::~EditorApplication() {
-	//
-}
-
-void EditorApplication::Init() {
-	config.Load("rsc\\config.cfg");
-	if (SDL_Init(SDL_INIT_VIDEO))
+void Application::Init(int argc, char** argv) {
+	//initialize SDL
+	if (SDL_Init(SDL_INIT_VIDEO)) {
 		throw(std::runtime_error("Failed to initialize SDL"));
-
-	BaseScene::SetScreen(config.Int("screen.w"), config.Int("screen.h"));
+	}
+	BaseScene::SetScreen(800, 600, 0, SDL_HWSURFACE|SDL_DOUBLEBUF);
 }
 
-void EditorApplication::Proc() {
+void Application::Proc() {
 	LoadScene(SceneList::FIRST);
 
 	//prepare the time system
 	typedef std::chrono::steady_clock Clock;
 
-	Clock::duration delta(16 * Clock::duration::period::den / std::milli::den);
+	std::chrono::duration<int, std::milli> delta(16);
 	Clock::time_point simTime = Clock::now();
 	Clock::time_point realTime;
 
@@ -82,21 +68,18 @@ void EditorApplication::Proc() {
 		//simulate game time
 		while (simTime < realTime) {
 			//call each user defined function
-			activeScene->RunFrame(double(delta.count()) / Clock::duration::period::den);
+			activeScene->RunFrame(double(delta.count()) / std::chrono::duration<int, std::milli>::period::den);
 			simTime += delta;
 		}
 
 		//draw the game to the screen
 		activeScene->RenderFrame();
-
-		//give the computer a break
-		SDL_Delay(10);
 	}
 
 	UnloadScene();
 }
 
-void EditorApplication::Quit() {
+void Application::Quit() {
 	SDL_Quit();
 }
 
@@ -104,27 +87,24 @@ void EditorApplication::Quit() {
 //Private access members
 //-------------------------
 
-void EditorApplication::LoadScene(SceneList sceneIndex) {
+void Application::LoadScene(SceneList sceneIndex) {
 	UnloadScene();
-
 	switch(sceneIndex) {
 		//add scene creation calls here
 		case SceneList::FIRST:
-		case SceneList::EDITORSCENE:
-			activeScene = new EditorScene(&config);
+		case SceneList::SHELL:
+			activeScene = new ShellScene();
 		break;
-
-		case SceneList::TESTIFICATESCENE:
-			activeScene = new TestificateScene(&config);
-		break;
-
-
-		default:
-			throw(std::logic_error("Failed to recognize the scene index"));
+		default: {
+			std::ostringstream msg;
+			msg << "Failed to recognize the scene index: ";
+			msg << sceneIndex;
+			throw(std::logic_error(msg.str()));
+		}
 	}
 }
 
-void EditorApplication::UnloadScene() {
+void Application::UnloadScene() {
 	delete activeScene;
 	activeScene = nullptr;
 }

src/application.hpp

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

src/base_scene.cpp

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

src/base_scene.hpp

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

src/main.cpp

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

src/makefile

@@ -1,21 +1,18 @@
 #config
-INCLUDES+=../common ../common/graphics ../common/map ../common/ui
+INCLUDES+=. ../utils ../mapgen
 LIBS+=../libcommon.a -lmingw32 -lSDLmain -lSDL
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
 CXXSRC=$(wildcard *.cpp)
-CSRC=$(wildcard *.c)
 
 #objects
 OBJDIR=obj
 OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.o))
 
 #output
 OUTDIR=../out
-OUT=$(addprefix $(OUTDIR)/,editor)
+OUT=$(addprefix $(OUTDIR)/,shell)
 
 #targets
 all: $(OBJ) $(OUT)
@@ -34,9 +31,6 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
 clean:
 	$(RM) *.o *.a *.exe
 

src/scene_list.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -22,15 +22,14 @@
 #ifndef SCENELIST_HPP_
 #define SCENELIST_HPP_
 
-enum class SceneList {
+enum SceneList {
 	//these are reserved
 	QUIT,
 	CONTINUE,
 	FIRST,
 
 	//custom indexes
-	TESTIFICATESCENE,
-	EDITORSCENE,
+	SHELL,
 };
 
 #endif

src/shell_scene.cpp

@@ -0,0 +1,150 @@
+/* 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 "shell_scene.hpp"
+
+#include <iostream>
+
+//-------------------------
+//Public access members
+//-------------------------
+
+static double max = 0;
+static double min = 0;
+
+void setPixel(SDL_Surface* const dest, int x, int y, int colour) {
+	*(static_cast<int*>(dest->pixels) + dest->w * y + x) = colour;
+}
+
+int convertToColour(SDL_PixelFormat* format, double x) {
+	//track the max value
+	max = x > max ? x : max;
+	min = x < min ? x : min;
+
+	if (x > 1) {
+		return SDL_MapRGB(format, 255, 0, 0);
+	}
+
+	if (x < 0) {
+		return SDL_MapRGB(format, 0, 255, 0);
+	}
+
+	if (x == 0) {
+		return SDL_MapRGB(format, 0, 0, 255);
+	}
+
+	return SDL_MapRGB(format, 255*x, 255*x, 255*x);
+}
+
+int convertToTerrain(SDL_PixelFormat* format, double x) {
+	//water
+	if (x < 0.4) {
+		return SDL_MapRGB(format, 0, 0, 255);
+	}
+	//sand
+	if (x < 0.5) {
+		return SDL_MapRGB(format, 255, 255, 0);
+	}
+	//grass
+	if (x < 0.6) {
+		return SDL_MapRGB(format, 0, 255, 0);
+	}
+	//forest
+	if (x < 0.8) {
+		return SDL_MapRGB(format, 0, 128, 0);
+	}
+	//snow
+	if (x < 0.8) {
+		return SDL_MapRGB(format, 255, 255, 255);
+	}
+	//dark snow
+	return SDL_MapRGB(format, 128, 128, 128);
+}
+
+ShellScene::ShellScene() {
+	//test the generator
+	int width = 256;
+	int height = 256;
+	image.CreateSurface(GetScreen()->w, GetScreen()->h);
+
+	double value;
+	int colour;
+
+	std::cout << "Beggining generation" << std::endl;
+	for (int i = 0; i < image.GetSurface()->w; i++) {
+		for (int j = 0; j < image.GetSurface()->h; j++) {
+			value = generator.GetPixel(i, j, width, height, 8);
+			colour = convertToColour(image.GetSurface()->format, value);
+			setPixel(image.GetSurface(), i, j, colour);
+		}
+	}
+	std::cout << "Finished generation" << std::endl;
+	std::cout << "Max: " << max << std::endl;
+	std::cout << "Min: " << min << std::endl;
+}
+
+ShellScene::~ShellScene() {
+	//
+}
+
+//-------------------------
+//Frame loop
+//-------------------------
+
+void ShellScene::FrameStart() {
+	//
+}
+
+void ShellScene::Update(double delta) {
+	//
+}
+
+void ShellScene::FrameEnd() {
+	//
+}
+
+void ShellScene::Render(SDL_Surface* const screen) {
+	image.DrawTo(screen, 0, 0);
+}
+
+//-------------------------
+//Event handlers
+//-------------------------
+
+void ShellScene::MouseMotion(SDL_MouseMotionEvent const& motion) {
+	//
+}
+
+void ShellScene::MouseButtonDown(SDL_MouseButtonEvent const& button) {
+	//
+}
+
+void ShellScene::MouseButtonUp(SDL_MouseButtonEvent const& button) {
+	//
+}
+
+void ShellScene::KeyDown(SDL_KeyboardEvent const& key) {
+	//
+}
+
+void ShellScene::KeyUp(SDL_KeyboardEvent const& key) {
+	//
+}

src/shell_scene.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,16 +19,20 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef INCOMBAT_HPP_
-#define INCOMBAT_HPP_
+#ifndef SHELLSCENE_HPP_
+#define SHELLSCENE_HPP_
 
 #include "base_scene.hpp"
 
-class InCombat : public BaseScene {
+#include "map_generator.hpp"
+
+#include "image.hpp"
+
+class ShellScene : public BaseScene {
 public:
 	//Public access members
-	InCombat();
-	~InCombat();
+	ShellScene();
+	~ShellScene();
 
 protected:
 	//Frame loop
@@ -43,6 +47,10 @@ protected:
 	void MouseButtonUp(SDL_MouseButtonEvent const&);
 	void KeyDown(SDL_KeyboardEvent const&);
 	void KeyUp(SDL_KeyboardEvent const&);
+
+	//members
+	MapGenerator generator;
+	Image image;
 };
 
 #endif

utils/image.cpp

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

utils/image.hpp

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

utils/makefile

@@ -1,20 +1,17 @@
 #config
-INCLUDES+=. ..
+INCLUDES+=.
 LIBS+=
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
 CXXSRC=$(wildcard *.cpp)
-CSRC=$(wildcard *.c)
 
 #objects
 OBJDIR=obj
 OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.o))
 
 #output
-OUTDIR=../..
+OUTDIR=..
 OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 
 #targets
@@ -34,9 +31,6 @@ $(OUTDIR):
 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
 clean:
 	$(RM) *.o *.a *.exe
 

utils/maths.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,24 +19,27 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "client_application.hpp"
+#include "maths.hpp"
 
-#include <stdexcept>
-#include <iostream>
-
-using namespace std;
-
-int main(int, char**) {
-	cout << "Beginning client" << endl;
-	try {
-		ClientApplication::GetInstance()->Init();
-		ClientApplication::GetInstance()->Proc();
-		ClientApplication::GetInstance()->Quit();
-	}
-	catch(exception& e) {
-		cerr << "Fatal exception thrown: " << e.what() << endl;
-		return 1;
-	}
-	cout << "Clean exit" << endl;
-	return 0;
+double curve(double x) {
+	return 3.0 * pow(x, 2.0) - 2.0 * pow(x, 3.0);
 }
+
+double snap(double x, double base) {
+	//snap to a grid (floating point version)
+	return floor(x / base) * base;
+}
+
+int snap(int x, int base) {
+	//snap to a grid (integer devision version)
+	if (x < 0) {
+		++x;
+		return x / base * base - base;
+	}
+	return x / base * base;
+}
+
+double scalarProduct(Vector2 lhs, Vector2 rhs) {
+	//the dot product
+	return lhs.x * rhs.x + lhs.y * rhs.y;
+}

utils/maths.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,25 +19,19 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef PLAYER_HPP_
-#define PLAYER_HPP_
+#ifndef MATHS_HPP_
+#define MATHS_HPP_
 
 #include "vector2.hpp"
 
-#include <string>
-#include <map>
+//param: 0 to 1 inclusive
+double curve(double);
 
-/* Hold the player info.
-*/
+//snap x to a grid of base
+double snap(double x, double base);
+int snap(int x, int base);
 
-struct Player {
-	int clientIndex;
-	std::string handle;
-	std::string avatar;
-	Vector2 position;
-	Vector2 motion;
-};
+//vector dot product
+double scalarProduct(Vector2, Vector2);
 
-typedef std::map<int, Player> PlayerMap;
-
-#endif
+#endif

utils/simple_rng.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -19,20 +19,24 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef CLIENT_HPP_
-#define CLIENT_HPP_
+#ifndef SIMPLERNG_HPP_
+#define SIMPLERNG_HPP_
 
-#include "SDL/SDL_net.h"
+//a simple, stateless, random number generator
+class SimpleRNG {
+public:
+	SimpleRNG() { SetSeed(8891.0); }
+	SimpleRNG(double x) { SetSeed(x); }
 
-#include <map>
+	double SetSeed(double s) { return seed = s; }
+	double GetSeed() { return seed; }
 
-/* Hold the client info.
-*/
+	double operator()(double x) {
+		return (x + seed) * 11235.0 + 81321.0;
+	};
 
-struct Client {
-	IPaddress address;
+private:
+	double seed;
 };
 
-typedef std::map<int, Client> ClientMap;
-
-#endif
+#endif

utils/vector2.hpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -22,6 +22,7 @@
 #ifndef VECTOR2_HPP_
 #define VECTOR2_HPP_
 
+#include <type_traits>
 #include <stdexcept>
 #include <cmath>
 
@@ -29,7 +30,6 @@ class Vector2 {
 public:
 	double x, y;
 
-	//This is explicitly a POD
 	Vector2() = default;
 	Vector2(double i, double j): x(i), y(j) {};
 	~Vector2() = default;
@@ -41,11 +41,10 @@ public:
 	double SquaredLength() const {
 		return x*x+y*y;
 	}
-
-	double operator[](size_t i) {
-		if (i >= 2)
-			throw(std::domain_error("Out of range"));
-		return *(&x+i);
+	void Normalize() {
+		double l = Length();
+		x /= l;
+		y /= l;
 	}
 
 	//Arithmetic operators
@@ -103,13 +102,7 @@ public:
 	template<typename T> bool operator!=(T t) { return (x != t || y != t); }
 };
 
-//non-member templates (flip the order)
-template<typename T> Vector2 operator+(T t, Vector2 v) { return v + t; }
-template<typename T> Vector2 operator-(T t, Vector2 v) { return v - t; }
-template<typename T> Vector2 operator*(T t, Vector2 v) { return v * t; }
-template<typename T> Vector2 operator/(T t, Vector2 v) { return v / t; }
-
-template<typename T> bool operator==(T t, Vector2 v) { return v == t; }
-template<typename T> bool operator!=(T t, Vector2 v) { return v != t; }
+//This is explicitly a POD
+static_assert(std::is_pod<Vector2>::value, "Vector2 is not a POD");
 
 #endif