A few tweaks

.gitignore

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

README.md

@@ -1,30 +0,0 @@
-Tortuga is a 3/4 top down multiplayer RPG set in a large archipelago occupied by warring pirate clans. The emphasis of this game is on multiplayer competition, exploration in an open world, and solo adventuring. The game runs on a Minecraft like server system with a goal of about 50-100 players on a single server. The player characters are tied to the server where they are created, and are susceptible to permadeath: deletion of a character upon death. The servers are designed to allow a large amount of modification by the hosts.
-
-## Libraries
-
-* [SDL](http://www.libsdl.org/) - Simple DirectMedia Layer API
-* [SDL_net](http://www.libsdl.org/projects/SDL_net/) - SDL's networking extension; modified source included under libs/SDL_net
-* [Codebase](https://github.com/Ratstail91/Codebase) - files included locally; modifications will be included upstream further into this project.
-
-## Instructions
-
-* This project uses C++11, which is available via GNU (or MinGW) 4.7, or Visual Studio 2012. Personally, I'm using MinGW 4.7.2.
-* You need to build the library in the common/ directroy before any others.
-* I'm trying to keep this as IDE agnostic as possible, so if you use an IDE, please add it's files to .gitignore.
-* You can read more details on the GitHub wiki [here](https://github.com/Ratstail91/Tortuga/wiki).
-
-## Copyright
-
-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/combat.cpp

@@ -1,69 +0,0 @@
-#include "combat.hpp"
-
-#include <iostream>
-
-using namespace std;
-
-//-------------------------
-//Public access members
-//-------------------------
-
-Combat::Combat() {
-#ifdef DEBUG
-	cout << "entering Combat" << endl;
-#endif
-}
-
-Combat::~Combat() {
-#ifdef DEBUG
-	cout << "leaving Combat" << endl;
-#endif
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void Combat::FrameStart() {
-	//
-}
-
-void Combat::Update(double delta) {
-	//
-}
-
-void Combat::FrameEnd() {
-	//
-}
-
-void Combat::Render(SDL_Surface* const screen) {
-	//
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void Combat::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	//
-}
-
-void Combat::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void Combat::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void Combat::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			QuitEvent();
-		break;
-	}
-}
-
-void Combat::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}

client/combat.hpp

@@ -1,27 +0,0 @@
-#ifndef COMBAT_HPP_
-#define COMBAT_HPP_
-
-#include "base_scene.hpp"
-
-class Combat : public BaseScene {
-public:
-	/* Public access members */
-	Combat();
-	~Combat();
-
-protected:
-	/* Frame loop */
-	void FrameStart();
-	void Update(double delta);
-	void FrameEnd();
-	void Render(SDL_Surface* const);
-
-	/* Event handlers */
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
-	void KeyDown(SDL_KeyboardEvent const&);
-	void KeyUp(SDL_KeyboardEvent const&);
-};
-
-#endif

client/defines.hpp

@@ -1,9 +0,0 @@
-#ifndef DEFINES_HPP_
-#define DEFINES_HPP_
-
-enum class Direction {
-	NORTH = 1, SOUTH = 2,
-	EAST = 3, WEST = 4
-};
-
-#endif

client/in_game.cpp

@@ -1,120 +0,0 @@
-#include "in_game.hpp"
-
-#include <iostream>
-
-using namespace std;
-
-//-------------------------
-//Public access members
-//-------------------------
-
-InGame::InGame(ConfigUtility* cUtil, SurfaceManager* sMgr, UDPNetworkUtility* nUtil, int* ID) {
-#ifdef DEBUG
-	cout << "entering InGame" << endl;
-#endif
-	configUtil = cUtil;
-	surfaceMgr = sMgr;
-	netUtil = nUtil;
-	playerID = ID;
-	cout << "playerID: " << *playerID << endl;
-}
-
-InGame::~InGame() {
-	//placeholder disconnect
-	PacketData p;
-	p.type = PacketList::DISCONNECT;
-	p.disconnect.playerID = *playerID;
-	*playerID = -1;
-	netUtil->Send(0, &p, sizeof(PacketData));
-	netUtil->Unbind(0);
-#ifdef DEBUG
-	cout << "leaving InGame" << endl;
-#endif
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void InGame::FrameStart() {
-	//
-}
-
-void InGame::Update(double delta) {
-	Receive();
-}
-
-void InGame::Receive() {
-	PacketData packet;
-	while(netUtil->Receive()) {
-		memcpy(&packet, netUtil->GetInData(), sizeof(PacketData));
-		switch(packet.type) {
-//			case PacketList::NONE:
-//				//
-//			break;
-//			case PacketList::PING:
-//				//
-//			break;
-//			case PacketList::PONG:
-//				//
-//			break;
-//			case PacketList::JOINREQUEST:
-//				//
-//			break;
-//			case PacketList::JOINCONFIRM:
-//				//
-//			break;
-//			case PacketList::DISCONNECT:
-//				//
-//			break;
-//			case PacketList::SYNCHRONIZE:
-//				//
-//			break;
-			case PacketList::NEWPLAYER:
-				cout << "NEWPLAYER triggered" << endl;
-			break;
-			case PacketList::DELETEPLAYER:
-				cout << "DELETEPLAYER triggered" << endl;
-			break;
-//			case PacketList::MOVEMENT:
-//				//
-//			break;
-		}
-	}
-}
-
-void InGame::FrameEnd() {
-	//
-}
-
-void InGame::Render(SDL_Surface* const screen) {
-	//
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void InGame::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	//
-}
-
-void InGame::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void InGame::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void InGame::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			QuitEvent();
-		break;
-	}
-}
-
-void InGame::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}

client/in_game.hpp

@@ -1,39 +0,0 @@
-#ifndef INGAME_HPP_
-#define INGAME_HPP_
-
-#include "base_scene.hpp"
-
-#include "config_utility.hpp"
-#include "surface_manager.hpp"
-#include "udp_network_utility.hpp"
-#include "packet_list.hpp"
-
-class InGame : public BaseScene {
-public:
-	//Public access members
-	InGame(ConfigUtility*, SurfaceManager*, UDPNetworkUtility*, int* playerID);
-	~InGame();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update(double delta);
-	void Receive();
-	void FrameEnd();
-	void Render(SDL_Surface* const);
-
-	//Event handlers
-	void MouseMotion(SDL_MouseMotionEvent const&);
-	void MouseButtonDown(SDL_MouseButtonEvent const&);
-	void MouseButtonUp(SDL_MouseButtonEvent const&);
-	void KeyDown(SDL_KeyboardEvent const&);
-	void KeyUp(SDL_KeyboardEvent const&);
-
-	//members
-	ConfigUtility* configUtil = nullptr;
-	SurfaceManager* surfaceMgr = nullptr;
-	UDPNetworkUtility* netUtil = nullptr;
-	int* playerID = nullptr;
-};
-
-#endif

client/lobby.cpp

@@ -1,210 +0,0 @@
-#include "lobby.hpp"
-
-#include <exception>
-#include <iostream>
-
-using namespace std;
-
-//-------------------------
-//Public access members
-//-------------------------
-
-Lobby::Lobby(ConfigUtility* cUtil, SurfaceManager* sMgr, UDPNetworkUtility* nUtil, int* ID) {
-#ifdef DEBUG
-	cout << "entering Lobby" << endl;
-#endif
-	//globals
-	configUtil = cUtil;
-	surfaceMgr = sMgr;
-	netUtil = nUtil;
-	playerID = ID;
-
-	//members
-	font.SetSurface(surfaceMgr->Get("font"));
-
-	//the buttons
-	buttonMap["ping"] = new Button(50, 50 , surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Refresh");
-	buttonMap["join"] = new Button(50, 100, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Join");
-	buttonMap["back"] = new Button(50, 150, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Back");
-
-	//drawing information for the server list
-	listBox.x = 250;
-	listBox.y = 50;
-	listBox.w = GetScreen()->w - listBox.x;
-	listBox.h = font.GetCharH();
-
-	//ping the network
-	PingNetwork();
-}
-
-Lobby::~Lobby() {
-	for (auto it : buttonMap) {
-		delete it.second;
-	}
-#ifdef DEBUG
-	cout << "leaving Lobby" << endl;
-#endif
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void Lobby::FrameStart() {
-	//
-}
-
-void Lobby::Update(double delta) {
-	Receive();
-}
-
-void Lobby::Receive() {
-	PacketData packet;
-	while(netUtil->Receive()) {
-		memcpy(&packet, netUtil->GetInData(), sizeof(PacketData));
-		switch(packet.type) {
-//			case PacketList::NONE:
-//				//
-//			break;
-//			case PacketList::PING:
-//				//
-//			break;
-			case PacketList::PONG:
-				PushServer(&packet);
-			break;
-//			case PacketList::JOINREQUEST:
-//				//
-//			break;
-			case PacketList::JOINCONFIRM: {
-				PacketData p;
-				memcpy(&p, netUtil->GetInData(), sizeof(PacketData));
-				*playerID = p.joinConfirm.playerID;
-				netUtil->Bind(&netUtil->GetInPacket()->address, 0);
-				SetNextScene(SceneList::INGAME);
-			}
-			break;
-//			case PacketList::DISCONNECT:
-//				//
-//			break;
-//			case PacketList::SYNCHRONIZE:
-//				//
-//			break;
-#ifdef DEBUG
-			//this might not be the end of the world; it only happens when the game ping is too low
-			case PacketList::NEWPLAYER:
-				cout << "WARNING: new player triggered unexpectedly" << endl;
-			break;
-#endif
-//			case PacketList::DELETEPLAYER:
-//				//
-//			break;
-//			case PacketList::MOVEMENT:
-//				//
-//			break;
-		}
-	}
-}
-
-void Lobby::FrameEnd() {
-	//
-}
-
-void Lobby::Render(SDL_Surface* const screen) {
-	for (auto it : buttonMap) {
-		it.second->DrawTo(screen);
-	}
-
-	//draw the server list, highlighting the selected server
-	SDL_Rect clip;
-	for (int i = 0; i < serverVector.size(); i++) {
-		clip = listBox;
-		clip.y += i * font.GetCharH();
-
-		//if a server has  been selected, and this is the selected server
-		if (selectedServer && selectedServer == &serverVector[i]) {
-			//draw the orange box
-			SDL_FillRect(screen, &clip, SDL_MapRGB(screen->format, 255, 127, 39));
-		}
-		font.DrawStringTo(serverVector[i].name, screen, clip.x, clip.y);
-	}
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void Lobby::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	for (auto it : buttonMap) {
-		it.second->MouseMotion(motion);
-	}
-}
-
-void Lobby::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	for (auto it : buttonMap) {
-		it.second->MouseButtonDown(button);
-	}
-}
-
-void Lobby::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (buttonMap["ping"]->MouseButtonUp(button) == Button::State::HOVER) {
-		PingNetwork();
-	}
-	else if (buttonMap["join"]->MouseButtonUp(button) == Button::State::HOVER) {
-		JoinRequest(selectedServer);
-	}
-	else if (buttonMap["back"]->MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::MAINMENU);
-	}
-	//select a server (clicked within the bounds of the server box)
-	else if (button.x > listBox.x && button.y > listBox.y && button.y < serverVector.size() * font.GetCharH() + listBox.y) {
-		selectedServer = &serverVector[(button.y-listBox.y)/font.GetCharH()];
-	}
-	else {
-		selectedServer = nullptr;
-	}
-}
-
-void Lobby::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			SetNextScene(SceneList::MAINMENU);
-		break;
-	}
-}
-
-void Lobby::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}
-
-//-------------------------
-//Utilities
-//-------------------------
-
-void Lobby::PingNetwork() {
-	//ping the network
-	PacketData p;
-	p.type = PacketList::PING;
-	netUtil->Send("255.255.255.255", configUtil->Integer("server.port"), reinterpret_cast<void*>(&p), sizeof(PacketData));
-	//reset the server list
-	//TODO: enable this
-//	serverVector.clear();
-}
-
-void Lobby::PushServer(PacketData* packet) {
-	ServerData s;
-	s.name = packet->pong.metadata;
-	s.address = netUtil->GetInPacket()->address;
-	serverVector.push_back(s);
-}
-
-void Lobby::JoinRequest(ServerData* server) {
-	if (!server) {
-		//CAN receive null
-		return;
-	}
-	PacketData p;
-	p.type = PacketList::JOINREQUEST;
-	snprintf(p.joinRequest.handle, PACKET_STRING_SIZE, "%s", configUtil->CString("handle"));
-	snprintf(p.joinRequest.avatar, PACKET_STRING_SIZE, "%s", configUtil->CString("avatar"));
-	netUtil->Send(&server->address, reinterpret_cast<void*>(&p), sizeof(PacketData));
-}

client/lobby.hpp

@@ -1,65 +0,0 @@
-#ifndef LOBBY_HPP_
-#define LOBBY_HPP_
-
-#include "base_scene.hpp"
-
-#include "config_utility.hpp"
-#include "surface_manager.hpp"
-#include "udp_network_utility.hpp"
-#include "packet_list.hpp"
-
-#include "raster_font.hpp"
-#include "button.hpp"
-
-#include <vector>
-#include <map>
-#include <string>
-
-class Lobby : public BaseScene {
-public:
-	//Public access members
-	Lobby(ConfigUtility*, SurfaceManager*, UDPNetworkUtility*, int* playerID);
-	~Lobby();
-
-protected:
-	//Frame loop
-	void FrameStart();
-	void Update(double delta);
-	void Receive();
-	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&);
-
-	//utilities
-	struct ServerData {
-		std::string name;
-		IPaddress address;
-	};
-
-	void PingNetwork();
-	void PushServer(PacketData*);
-	void JoinRequest(ServerData*);
-
-	//globals
-	ConfigUtility* configUtil = nullptr;
-	SurfaceManager* surfaceMgr = nullptr;
-	UDPNetworkUtility* netUtil = nullptr;
-	int* playerID;
-
-	//members
-	RasterFont font;
-	std::map<std::string, Button*> buttonMap;
-
-	//the list of servers on the screen
-	std::vector<ServerData> serverVector;
-	ServerData* selectedServer = nullptr;
-	SDL_Rect listBox;
-};
-
-#endif

client/main.cpp

@@ -1,26 +0,0 @@
-#include "scene_manager.hpp"
-
-#include <stdexcept>
-#include <iostream>
-
-using namespace std;
-
-int main(int, char**) {
-#ifdef DEBUG
-	cout << "Beginning program" << endl;
-#endif
-	try {
-		SceneManager app;
-		app.Init();
-		app.Proc();
-		app.Quit();
-	}
-	catch(exception& e) {
-		cerr << "Fatal error: " << e.what() << endl;
-		return 1;
-	}
-#ifdef DEBUG
-	cout << "Clean exit" << endl;
-#endif
-	return 0;
-}

client/main_menu.cpp

@@ -1,98 +0,0 @@
-#include "main_menu.hpp"
-
-#include <iostream>
-
-using namespace std;
-
-//-------------------------
-//Public access members
-//-------------------------
-
-MainMenu::MainMenu(ConfigUtility* cUtil, SurfaceManager* sMgr) {
-#ifdef DEBUG
-	cout << "entering MainMenu" << endl;
-#endif
-	configUtil = cUtil;
-	surfaceMgr = sMgr;
-
-	buttonMap["start"] = new Button(50, 50, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Start");
-	buttonMap["options"] = new Button(50, 100, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Options");
-	buttonMap["quit"] = new Button(50, 150, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "Quit");
-
-	buttonMap["testsystems"] = new Button(50, 250, surfaceMgr->Get("button"), surfaceMgr->Get("font"), "TestSystems");
-}
-
-MainMenu::~MainMenu() {
-	for (auto it : buttonMap) {
-		delete it.second;
-	}
-	buttonMap.clear();
-#ifdef DEBUG
-	cout << "leaving MainMenu" << endl;
-#endif
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void MainMenu::FrameStart() {
-	//
-}
-
-void MainMenu::Update(double delta) {
-	//
-}
-
-void MainMenu::FrameEnd() {
-	//
-}
-
-void MainMenu::Render(SDL_Surface* const screen) {
-	for (auto it : buttonMap) {
-		it.second->DrawTo(screen);
-	}
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void MainMenu::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	for (auto it : buttonMap) {
-		it.second->MouseMotion(motion);
-	}
-}
-
-void MainMenu::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	for (auto it : buttonMap) {
-		it.second->MouseButtonDown(button);
-	}
-}
-
-void MainMenu::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	if (buttonMap["start"]->MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::LOBBY);
-	}
-	if (buttonMap["options"]->MouseButtonUp(button) == Button::State::HOVER) {
-		//TODO
-	}
-	if (buttonMap["quit"]->MouseButtonUp(button) == Button::State::HOVER) {
-		QuitEvent();
-	}
-	if (buttonMap["testsystems"]->MouseButtonUp(button) == Button::State::HOVER) {
-		SetNextScene(SceneList::TESTSYSTEMS);
-	}
-}
-
-void MainMenu::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			QuitEvent();
-		break;
-	}
-}
-
-void MainMenu::KeyUp(SDL_KeyboardEvent const& key) {
-	//
-}

client/main_menu.hpp

@@ -1,42 +0,0 @@
-#ifndef MAINMENU_HPP_
-#define MAINMENU_HPP_
-
-#include "base_scene.hpp"
-
-#include "config_utility.hpp"
-#include "surface_manager.hpp"
-
-#include "button.hpp"
-
-#include <string>
-#include <map>
-
-class MainMenu : public BaseScene {
-public:
-	//Public access members
-	MainMenu(ConfigUtility*, SurfaceManager*);
-	~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* configUtil;
-	SurfaceManager* surfaceMgr;
-
-	//members
-	std::map<std::string, Button*> buttonMap;
-};
-
-#endif

client/makefile

@@ -1,37 +0,0 @@
-#config
-INCLUDES=../common
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-LIB=../common/out/common.a -lmingw32 -lSDL_net -lSDLmain -lSDL -lwsock32 -liphlpapi
-
-#source
-SRC=$(filter-out unit.cpp, $(wildcard *.cpp))
-
-#objects
-OBJDIR=obj
-OBJ=$(addprefix $(OBJDIR)/,$(SRC:.cpp=.o))
-
-#output
-OUTDIR=out
-OUT=$(addprefix $(OUTDIR)/,client)
-
-#targets
-all: $(OBJ) $(OUT)
-	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIB)
-
-$(OBJ): | $(OBJDIR)
-
-$(OUT): | $(OUTDIR)
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-$(OUTDIR):
-	mkdir $(OUTDIR)
-
-$(OBJDIR)/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all

client/player.cpp

@@ -1,93 +0,0 @@
-#include "player.hpp"
-
-#define ANIMATION_SPEED 0.1
-#define WALKING_SPEED 140
-
-Player::Player(SDL_Surface* s, int w, int h)
-	: sprite(s, w, h)
-{
-}
-
-void Player::Update(double delta) {
-	if (motion.y > 0) {
-		FaceDirection(Direction::SOUTH);
-	}
-	else if (motion.y < 0) {
-		FaceDirection(Direction::NORTH);
-	}
-	else if (motion.x < 0) {
-		FaceDirection(Direction::WEST);
-	}
-	else if (motion.x > 0) {
-		FaceDirection(Direction::EAST);
-	}
-
-	if (motion.x != 0 && motion.y != 0) {
-		sprite.SetInterval(ANIMATION_SPEED);
-		constexpr double d = 1/sqrt(2);
-		position += motion * d * delta;
-	}
-	else if (motion != 0) {
-		sprite.SetInterval(ANIMATION_SPEED);
-		position += motion * delta;
-	}
-	else {
-		sprite.SetCurrentFrame(0);
-		sprite.SetInterval(0);
-	}
-	sprite.Update(delta);
-}
-
-void Player::WalkInDirection(Direction d) {
-	switch(d) {
-		case Direction::NORTH:
-			if (motion.y >= 0) {
-				motion.y -= WALKING_SPEED;
-			}
-			else {
-				motion.y = -WALKING_SPEED;
-			}
-		break;
-		case Direction::SOUTH:
-			if (motion.y <= 0) {
-				motion.y += WALKING_SPEED;
-			}
-			else {
-				motion.y = WALKING_SPEED;
-			}
-		break;
-		case Direction::WEST:
-			if (motion.x >= 0) {
-				motion.x -= WALKING_SPEED;
-			}
-			else {
-				motion.x = -WALKING_SPEED;
-			}
-		break;
-		case Direction::EAST:
-			if (motion.x <= 0) {
-				motion.x += WALKING_SPEED;
-			}
-			else {
-				motion.x = WALKING_SPEED;
-			}
-		break;
-	}
-}
-
-void Player::FaceDirection(Direction dir) {
-	switch(dir) {
-		case Direction::SOUTH:
-			sprite.SetCurrentStrip(0);
-		break;
-		case Direction::NORTH:
-			sprite.SetCurrentStrip(1);
-		break;
-		case Direction::WEST:
-			sprite.SetCurrentStrip(2);
-		break;
-		case Direction::EAST:
-			sprite.SetCurrentStrip(3);
-		break;
-	}
-}

client/player.hpp

@@ -1,36 +0,0 @@
-#ifndef PLAYER_HPP_
-#define PLAYER_HPP_
-
-#include "defines.hpp"
-#include "vector2.hpp"
-#include "sprite_sheet.hpp"
-
-#include "SDL/SDL.h"
-
-class Player {
-public:
-	Player(SDL_Surface*, int w, int h);
-
-	void Update(double delta);
-
-	void WalkInDirection(Direction);
-
-	Vector2 SetPosition(Vector2 v) { return position = v; }
-	Vector2 ShiftPosition(Vector2 v) { return position += v; }
-	Vector2 GetPosition() const { return position; };
-
-	Vector2 SetMotion(Vector2 v) { return motion = v; }
-	Vector2 ShiftMotion(Vector2 v) { return motion += v; }
-	Vector2 GetMotion() const { return motion; }
-
-	void DrawTo(SDL_Surface* const s) { sprite.DrawTo(s, position.x, position.y); }
-	void FaceDirection(Direction);
-
-	SpriteSheet* GetSpriteSheet() { return &sprite; };
-private:
-	Vector2 position;
-	Vector2 motion;
-	SpriteSheet sprite;
-};
-
-#endif

client/player_manager.cpp

@@ -1,53 +0,0 @@
-#include "player_manager.hpp"
-
-#include <stdexcept>
-
-PlayerManager::PlayerManager() {
-	//
-}
-
-PlayerManager::~PlayerManager() {
-	DeleteAll();
-}
-
-Player* PlayerManager::New(int index, SDL_Surface* avatarSheet) {
-	if (playerMap.find(index) != playerMap.end()) {
-		throw(std::runtime_error("This player's index is already taken"));
-	}
-
-	return playerMap[index] = new Player(avatarSheet, avatarSheet->w/4, avatarSheet->h/4);
-}
-
-Player* PlayerManager::Get(int index) {
-	std::map<int, Player*>::iterator it = playerMap.find(index);
-	if(it == playerMap.end()) {
-		throw(std::runtime_error("Failed to find a player with that index"));
-	}
-
-	return it->second;
-}
-
-void PlayerManager::Delete(int index) {
-	std::map<int, Player*>::iterator it = playerMap.find(index);
-	delete it->second;
-	playerMap.erase(it);
-}
-
-void PlayerManager::UpdateAll(double delta) {
-	for (auto it : playerMap) {
-		it.second->Update(delta);
-	}
-}
-
-void PlayerManager::DrawAllTo(SDL_Surface* dest) {
-	for (auto it : playerMap) {
-		it.second->DrawTo(dest);
-	}
-}
-
-void PlayerManager::DeleteAll() {
-	for (auto it : playerMap) {
-		delete it.second;
-	}
-	playerMap.clear();
-}

client/player_manager.hpp

@@ -1,26 +0,0 @@
-#ifndef PLAYERMANAGER_HPP_
-#define PLAYERMANAGER_HPP_
-
-#include "player.hpp"
-
-#include <map>
-
-class PlayerManager {
-public:
-	PlayerManager();
-	~PlayerManager();
-
-	Player* New(int index, SDL_Surface* avatarSheet);
-	Player* Get(int index);
-	void Delete(int index);
-
-	void UpdateAll(double delta);
-	void DrawAllTo(SDL_Surface* dest);
-	void DeleteAll();
-
-	Player* operator[](int i) { return Get(i); }
-private:
-	std::map<int, Player*> playerMap;
-};
-
-#endif

client/scene_list.hpp

@@ -1,21 +0,0 @@
-#ifndef SCENELIST_HPP_
-#define SCENELIST_HPP_
-
-enum class SceneList {
-	//these are reserved
-	QUIT, //doubles as "up one scene" in nested scenes
-	CONTINUE,
-	FIRST,
-
-	//custom indexes
-	TESTSYSTEMS,
-	SPLASH,
-	MAINMENU,
-	INGAME,
-
-	//subscenes
-	LOBBY,
-	COMBAT,
-};
-
-#endif

client/scene_manager.cpp

@@ -1,128 +0,0 @@
-#include "scene_manager.hpp"
-
-#include <stdexcept>
-#include <chrono>
-
-//-------------------------
-//Scene headers
-//-------------------------
-
-//Add the custom scene headers here
-#include "test_systems.hpp"
-
-#include "splash.hpp"
-#include "main_menu.hpp"
-#include "lobby.hpp"
-#include "in_game.hpp"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-SceneManager::SceneManager() {
-	//
-}
-
-SceneManager::~SceneManager() {
-	UnloadScene();
-}
-
-void SceneManager::Init() {
-	if (SDL_Init(SDL_INIT_VIDEO)) {
-		throw(std::runtime_error("Failed to initialize SDL"));
-	}
-	if (SDLNet_Init()) {
-		throw(std::runtime_error("Failed to initialize SDL_net"));
-	}
-
-	configUtil.Load("rsc/config.cfg");
-	netUtil.Open(0, sizeof(PacketData));
-
-	//set the screen from the config file
-	int flags = SDL_HWSURFACE|SDL_DOUBLEBUF;
-	if (configUtil.Boolean("screen.f")) {
-		flags |= SDL_FULLSCREEN;
-	}
-	BaseScene::SetScreen(configUtil.Integer("screen.w"),configUtil.Integer("screen.h"),0,flags);
-}
-
-void SceneManager::Proc() {
-	LoadScene(SceneList::FIRST);
-
-	//prepare the time system
-	typedef std::chrono::high_resolution_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 SceneManager::Quit() {
-	UnloadScene();
-	SDLNet_Quit();
-	SDL_Quit();
-}
-
-//-------------------------
-//Private access members
-//-------------------------
-
-void SceneManager::LoadScene(SceneList sceneIndex) {
-	UnloadScene();
-
-	switch(sceneIndex) {
-		//add scene creation calls here
-		case SceneList::TESTSYSTEMS:
-			activeScene = new TestSystems(&configUtil, &surfaceMgr, &netUtil);
-		break;
-
-		case SceneList::FIRST:
-		case SceneList::SPLASH:
-			activeScene = new Splash(&configUtil, &surfaceMgr);
-		break;
-		case SceneList::MAINMENU:
-			activeScene = new MainMenu(&configUtil, &surfaceMgr);
-		break;
-		case SceneList::LOBBY:
-			activeScene = new Lobby(&configUtil, &surfaceMgr, &netUtil, &playerID);
-		break;
-		case SceneList::INGAME:
-			activeScene = new InGame(&configUtil, &surfaceMgr, &netUtil, &playerID);
-		break;
-
-		default:
-			throw(std::logic_error("Failed to recognize the scene index"));
-	}
-}
-
-void SceneManager::UnloadScene() {
-	delete activeScene;
-	activeScene = nullptr;
-}

client/scene_manager.hpp

@@ -1,38 +0,0 @@
-#ifndef SCENEMANAGER_HPP_
-#define SCENEMANAGER_HPP_
-
-#include "scene_list.hpp"
-#include "base_scene.hpp"
-
-#include "config_utility.hpp"
-#include "surface_manager.hpp"
-#include "udp_network_utility.hpp"
-#include "packet_list.hpp"
-
-#include "SDL/SDL.h"
-
-class SceneManager {
-public:
-	//Public access members
-	SceneManager();
-	~SceneManager();
-
-	void Init();
-	void Proc();
-	void Quit();
-
-private:
-	//Private access members
-	void LoadScene(SceneList sceneIndex);
-	void UnloadScene();
-
-	BaseScene* activeScene = nullptr;
-
-	//globals
-	ConfigUtility configUtil;
-	SurfaceManager surfaceMgr;
-	UDPNetworkUtility netUtil;
-	int playerID = -1;
-};
-
-#endif

client/splash.cpp

@@ -1,62 +0,0 @@
-#include "splash.hpp"
-
-#include <iostream>
-
-using namespace std;
-
-//-------------------------
-//Public access members
-//-------------------------
-
-Splash::Splash(ConfigUtility* cUtil, SurfaceManager* sMgr) {
-#ifdef DEBUG
-	cout << "entering Splash" << endl;
-#endif
-	configUtil = cUtil;
-	surfaceMgr = sMgr;
-
-	logo = new Image(surfaceMgr->Load("splash-logo", configUtil->String("logos") + "/krstudios.bmp"));
-}
-
-Splash::~Splash() {
-	delete logo;
-	surfaceMgr->Free("splash-logo");
-#ifdef DEBUG
-	cout << "leaving Splash" << endl;
-#endif
-}
-
-void Splash::RunFrame(double delta) {
-	//skip any event handling here
-	SDL_Event event;
-	while(SDL_PollEvent(&event));
-
-	//draw the logo in the middle of the screen
-	int x = (GetScreen()->w - logo->GetClipW()) / 2;
-	int y = (GetScreen()->h - logo->GetClipH()) / 2;
-
-	logo->DrawTo(GetScreen(),x,y);
-	SDL_Flip(GetScreen());
-
-	//load the resources ONCE
-	if (!loaded) {
-		loaded = true;
-		LoadResources();
-	}
-
-	//wait X seconds
-	if (Clock::now() - start > std::chrono::duration<int>(1)) {
-		SetNextScene(SceneList::MAINMENU);
-	}
-}
-
-void Splash::LoadResources() {
-	//load the global resources here
-	surfaceMgr->Load("font", configUtil->String("fonts") + "/pokemon_dark_font.bmp");
-	surfaceMgr->Load("button", configUtil->String("interface") + "/button.bmp");
-	surfaceMgr->Load("elliot", configUtil->String("sprites") + "/elliot2.bmp");
-	surfaceMgr->Load("coa", configUtil->String("sprites") + "/coa2.bmp");
-	surfaceMgr->Load("flower", configUtil->String("sprites") + "/aniflower.bmp");
-	surfaceMgr->Load("terrain", configUtil->String("tilesets") + "/terrain.bmp");
-	//TODO
-}

client/splash.hpp

@@ -1,34 +0,0 @@
-#ifndef SPLASH_HPP_
-#define SPLASH_HPP_
-
-#include "base_scene.hpp"
-
-#include "config_utility.hpp"
-#include "surface_manager.hpp"
-#include "image.hpp"
-
-#include <chrono>
-
-class Splash : public BaseScene {
-public:
-	Splash(ConfigUtility*, SurfaceManager*);
-	~Splash();
-
-protected:
-	typedef std::chrono::high_resolution_clock Clock;
-	void RunFrame(double delta);
-	void RenderFrame() {};
-
-	void LoadResources();
-
-	//globals
-	ConfigUtility* configUtil;
-	SurfaceManager* surfaceMgr;
-
-	//members
-	bool loaded = false;
-	Clock::time_point start = Clock::now();
-	Image* logo = nullptr;
-};
-
-#endif

client/test_systems.cpp

@@ -1,170 +0,0 @@
-#include "test_systems.hpp"
-
-#include <iostream>
-
-using namespace std;
-
-#include "splash.hpp"
-
-//-------------------------
-//Public access members
-//-------------------------
-
-TestSystems::TestSystems(ConfigUtility* cUtil, SurfaceManager* sMgr, UDPNetworkUtility* nUtil) {
-#ifdef DEBUG
-	cout << "entering TestSystems" << endl;
-#endif
-	configUtil = cUtil;
-	surfaceMgr = sMgr;
-	netUtil = nUtil;
-
-	playerCounter = currentPlayer = 0;
-
-	playerMgr.New(playerCounter++, surfaceMgr->Get("elliot"));
-	playerMgr.New(playerCounter++, surfaceMgr->Get("elliot"));
-	playerMgr.New(playerCounter++, surfaceMgr->Get("coa"));
-	playerMgr.New(playerCounter++, surfaceMgr->Get("coa"));
-
-	font.SetSurface(surfaceMgr->Get("font"));
-}
-
-TestSystems::~TestSystems() {
-	playerMgr.DeleteAll();
-#ifdef DEBUG
-	cout << "leaving TestSystems" << endl;
-#endif
-}
-
-//-------------------------
-//Frame loop
-//-------------------------
-
-void TestSystems::FrameStart() {
-	//
-}
-
-void TestSystems::Update(double delta) {
-	playerMgr.UpdateAll(delta);
-}
-
-void TestSystems::FrameEnd() {
-	//
-}
-
-string IToS(int i) {
-	char buffer[20];
-	memset(buffer, 0, 20);
-	sprintf(buffer, "%d", i);
-	return string(buffer);
-}
-
-void TestSystems::Render(SDL_Surface* const screen) {
-	FrameRate::Calculate();
-	playerMgr.DrawAllTo(screen);
-	font.DrawStringTo("FPS: " + IToS(FrameRate::GetFrameRate()), screen, 16, 16);
-}
-
-//-------------------------
-//Event handlers
-//-------------------------
-
-void TestSystems::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	//
-}
-
-void TestSystems::MouseButtonDown(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void TestSystems::MouseButtonUp(SDL_MouseButtonEvent const& button) {
-	//
-}
-
-void TestSystems::KeyDown(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_ESCAPE:
-			SetNextScene(SceneList::MAINMENU);
-		break;
-
-		case SDLK_w:
-			playerMgr[currentPlayer]->WalkInDirection(Direction::NORTH);
-			SendMessage("move up");
-		break;
-		case SDLK_s:
-			playerMgr[currentPlayer]->WalkInDirection(Direction::SOUTH);
-			SendMessage("move down");
-		break;
-		case SDLK_a:
-			playerMgr[currentPlayer]->WalkInDirection(Direction::WEST);
-			SendMessage("move left");
-		break;
-		case SDLK_d:
-			playerMgr[currentPlayer]->WalkInDirection(Direction::EAST);
-			SendMessage("move right");
-		break;
-
-		case SDLK_1:
-			SwitchToPlayer(0);
-		break;
-		case SDLK_2:
-			SwitchToPlayer(1);
-		break;
-		case SDLK_3:
-			SwitchToPlayer(2);
-		break;
-		case SDLK_4:
-			SwitchToPlayer(3);
-		break;
-	}
-}
-
-void TestSystems::KeyUp(SDL_KeyboardEvent const& key) {
-	switch(key.keysym.sym) {
-		case SDLK_w:
-			playerMgr[currentPlayer]->WalkInDirection(Direction::SOUTH);
-		break;
-		case SDLK_s:
-			playerMgr[currentPlayer]->WalkInDirection(Direction::NORTH);
-		break;
-		case SDLK_a:
-			playerMgr[currentPlayer]->WalkInDirection(Direction::EAST);
-		break;
-		case SDLK_d:
-			playerMgr[currentPlayer]->WalkInDirection(Direction::WEST);
-		break;
-	}
-}
-
-//-------------------------
-//Utilities
-//-------------------------
-
-void TestSystems::NewPlayer(int index, std::string avatarName, int x, int y) {
-	Player* p = playerMgr.New(index, surfaceMgr->Get(avatarName));
-	p->SetPosition(Vector2(x, y));
-}
-
-void TestSystems::SwitchToPlayer(int index) {
-	//dirty hacks for smooth movement
-	playerMgr[currentPlayer]->SetMotion(Vector2(0,0));
-	currentPlayer = index;
-
-	Uint8* key = SDL_GetKeyState(nullptr);
-
-	if (key[SDLK_w]) {
-		playerMgr[currentPlayer]->WalkInDirection(Direction::NORTH);
-	}
-	if (key[SDLK_s]) {
-		playerMgr[currentPlayer]->WalkInDirection(Direction::SOUTH);
-	}
-	if (key[SDLK_a]) {
-		playerMgr[currentPlayer]->WalkInDirection(Direction::WEST);
-	}
-	if (key[SDLK_d]) {
-		playerMgr[currentPlayer]->WalkInDirection(Direction::EAST);
-	}
-}
-
-void TestSystems::SendMessage(std::string s) {
-	cout << s << endl;
-}

client/test_systems.hpp

@@ -1,54 +0,0 @@
-#ifndef TESTSYSTEMS_HPP_
-#define TESTSYSTEMS_HPP_
-
-#include "base_scene.hpp"
-
-#include "config_utility.hpp"
-#include "surface_manager.hpp"
-#include "udp_network_utility.hpp"
-#include "packet_list.hpp"
-
-#include "player_manager.hpp"
-#include "frame_rate.hpp"
-#include "raster_font.hpp"
-
-#include <string>
-
-class TestSystems : public BaseScene {
-public:
-	//Public access members
-	TestSystems(ConfigUtility*, SurfaceManager*, UDPNetworkUtility*);
-	~TestSystems();
-
-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&);
-
-	//utilities
-	void NewPlayer(int index, std::string avatarName, int x, int y);
-	void SwitchToPlayer(int index);
-	void SendMessage(std::string);
-
-	//members
-	ConfigUtility* configUtil = nullptr;
-	SurfaceManager* surfaceMgr = nullptr;
-	UDPNetworkUtility* netUtil = nullptr;
-
-	PlayerManager playerMgr;
-	RasterFont font;
-
-	int playerCounter;
-	int currentPlayer;
-};
-
-#endif

client/unit.cpp

@@ -1,7 +0,0 @@
-#include <iostream>
-
-using namespace std;
-
-int SDL_main(int argc, char* argv[]) {
-	return 0;
-}

common/button.cpp

@@ -1,103 +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::Button():
-	Button(0,0, nullptr, nullptr)
-{
-}
-
-Button::Button(Sint16 i, Sint16 j, SDL_Surface* imageSurface, SDL_Surface* fontSurface, std::string s) {
-	x = i;
-	y = j;
-	state = State::NORMAL;
-
-	SetSurfaces(imageSurface, fontSurface);
-
-	SetText(s);
-}
-
-Button::State Button::MouseMotion(SDL_MouseMotionEvent const& motion) {
-	if (motion.state & SDL_BUTTON_LMASK) {
-		return CalcState(motion.x, motion.y, true);
-	}
-	else {
-		return CalcState(motion.x, motion.y, false);
-	}
-	return state;
-}
-
-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) {
-	image.DrawTo(dest, x, y);
-	font.DrawStringTo(text, dest, textX + x, textY + y);
-}
-
-void Button::SetSurfaces(SDL_Surface* imageSurface, SDL_Surface* fontSurface) {
-	//graphical stuff
-	image.SetSurface(imageSurface);
-	image.SetClipH(image.GetClipH() / 3); //3 phases
-	font.SetSurface(fontSurface);
-
-	//reset textX & textY
-	SetText(text);
-}
-
-std::string Button::SetText(std::string s) {
-	//one line
-	text = s;
-	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 (i < x || i > (x + image.GetClipW()) ||
-		j < y || j > (y + image.GetClipH())
-		) {
-		image.SetClipY(0);
-		return state = State::NORMAL;
-	}
-	if (leftPressed) {
-		image.SetClipY(image.GetClipH()*2);
-		return state = State::PRESSED;
-	}
-	else {
-		image.SetClipY(image.GetClipH());
-		return state = State::HOVER;
-	}
-}

common/button.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 BUTTON_HPP_
-#define BUTTON_HPP_
-
-#include "image.hpp"
-#include "raster_font.hpp"
-
-#include <string>
-
-//3-phases, no toggle, centred text
-class Button {
-public:
-	enum class State {
-		NORMAL, HOVER, PRESSED
-	};
-
-	Button();
-	Button(Sint16 x, Sint16 y, SDL_Surface* imageSurface, SDL_Surface* fontSurface, std::string text = "");
-
-	//return the current state
-	State MouseMotion(SDL_MouseMotionEvent const&);
-	State MouseButtonDown(SDL_MouseButtonEvent const&);
-	State MouseButtonUp(SDL_MouseButtonEvent const&);
-	State GetState() const {
-		return state;
-	}
-
-	//yet another draw function
-	void DrawTo(SDL_Surface* const);
-
-	//simple accessors and mutators
-	Sint16 SetX(Sint16 i) { return x = i; }
-	Sint16 SetY(Sint16 i) { return y = i; }
-	Sint16 GetX() const { return x; }
-	Sint16 GetY() const { return y; }
-
-	void SetSurfaces(SDL_Surface* image, SDL_Surface* font);
-
-	std::string SetText(std::string s);
-	std::string GetText() const { return text; }
-
-	//raw access, be careful
-	Image* GetImage() { return &image; }
-	RasterFont* GetFont() { return &font; }
-
-	//debug
-	Sint16 GetTextX() const { return textX; }
-	Sint16 GetTextY() const { return textY; }
-private:
-	State CalcState(Sint16 x, Sint16 y, bool leftPressed);
-
-	Sint16 x, y;
-	Sint16 textX, textY; //prevent recalc every loop
-	Image image;
-	RasterFont font;
-	State state;
-	std::string text;
-};
-
-#endif

common/config_utility.cpp

@@ -1,76 +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 <stdexcept>
-#include <fstream>
-
-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();
-}

common/config_utility.hpp

@@ -1,68 +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>
-#include <cstdlib>
-
-class ConfigUtility {
-public:
-	ConfigUtility() {}
-	ConfigUtility(std::string s) { Load(s); }
-
-	void Load(std::string fname);
-
-	std::string String(std::string s) {
-		return table[s];
-	}
-	const char* CString(std::string s) {
-		return table[s].c_str();
-	}
-	int Integer(std::string s) {
-		return atoi(table[s].c_str());
-	}
-	double Double(std::string s) {
-		return atof(table[s].c_str());
-	}
-	bool Boolean(std::string s) {
-		return table[s] == "true";
-	}
-
-	std::string& operator[](std::string s) {
-		return table[s];
-	}
-	int Int(std::string s) {
-		return Integer(s);
-	}
-	int Bool(std::string s) {
-		return Boolean(s);
-	}
-	std::map<std::string, std::string>* GetMap() {
-		return &table;
-	}
-private:
-	std::map<std::string, std::string> table;
-};
-
-#endif

common/packet_list.hpp

@@ -1,109 +0,0 @@
-#ifndef PACKETLIST_HPP_
-#define PACKETLIST_HPP_ 
-
-#include "vector2.hpp"
-
-#include <string>
-
-#define PACKET_STRING_SIZE 100
-
-enum class PacketList {
-	NONE = 0,
-
-	//connections
-	PING = 1,
-	PONG = 2,
-	JOINREQUEST = 3,
-	JOINCONFIRM = 4,
-	DISCONNECT = 5,
-
-	//information control
-	SYNCHRONIZE = 6,
-	NEWPLAYER = 7,
-	DELETEPLAYER = 8,
-	MOVEMENT = 9,
-};
-
-//-------------------------
-//connections
-//-------------------------
-
-struct Ping {
-	PacketList type = PacketList::PING;
-	char metadata[PACKET_STRING_SIZE];
-};
-
-struct Pong {
-	PacketList type = PacketList::PONG;
-	char metadata[PACKET_STRING_SIZE];
-};
-
-struct JoinRequest {
-	PacketList type = PacketList::JOINREQUEST;
-	char handle[PACKET_STRING_SIZE];
-	char avatar[PACKET_STRING_SIZE];
-};
-
-struct JoinConfirm {
-	PacketList type = PacketList::JOINCONFIRM;
-	int playerID;
-};
-
-struct Disconnect {
-	PacketList type = PacketList::DISCONNECT;
-	int playerID;
-};
-
-//-------------------------
-//information control
-//-------------------------
-
-struct Synchronize {
-	PacketList type = PacketList::SYNCHRONIZE;
-	int playerID;
-};
-
-struct NewPlayer {
-	PacketList type = PacketList::NEWPLAYER;
-	int playerID;
-	char handle[PACKET_STRING_SIZE];
-	char avatar[PACKET_STRING_SIZE];
-	Vector2 position;
-	Vector2 motion;
-};
-
-struct DeletePlayer {
-	PacketList type = PacketList::DELETEPLAYER;
-	int playerID;
-};
-
-struct Movement {
-	PacketList type = PacketList::MOVEMENT;
-	int playerID;
-	Vector2 position;
-	Vector2 motion;
-};
-
-//-------------------------
-//the packet itself
-//-------------------------
-
-union PacketData {
-	PacketData() {};
-	PacketList type = PacketList::NONE;
-
-	//connections
-	Ping ping;
-	Pong pong;
-	JoinRequest joinRequest;
-	JoinConfirm joinConfirm;
-	Disconnect disconnect;
-
-	//information control
-	Synchronize synchronize;
-	NewPlayer newPlayer;
-	DeletePlayer deletePlayer;
-	Movement movement;
-};
-
-#endif

common/raster_font.cpp

@@ -1,49 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2013
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "raster_font.hpp"
-
-#include <stdexcept>
-
-RasterFont::RasterFont(SDL_Surface* p) {
-	SetSurface(p);
-}
-
-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] % w * w);
-		image.SetClipY(s[i] / h * h);
-		image.DrawTo(dest, x + i * w, y);
-	}
-}
-
-SDL_Surface* RasterFont::SetSurface(SDL_Surface* p) {
-	if (image.SetSurface(p)) {
-		image.SetClipW(image.GetSurface()->w/16);
-		image.SetClipH(image.GetSurface()->h/16);
-	}
-	return image.GetSurface();
-}

common/sprite_sheet.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 "sprite_sheet.hpp"
-
-SpriteSheet::SpriteSheet(SDL_Surface* s, Uint16 w, Uint16 h) {
-	SetSurface(s, w, h);
-}
-
-void SpriteSheet::Update(double delta) {
-	if (interval && (ticks += delta) >= interval) {
-		if (++currentFrame >= maxFrames) {
-			currentFrame = 0;
-		}
-		ticks = 0;
-	}
-	image.SetClipX(currentFrame * image.GetClipW());
-	image.SetClipY(currentStrip * image.GetClipH());
-}
-
-SDL_Surface* SpriteSheet::SetSurface(SDL_Surface* const s, Uint16 w, Uint16 h) {
-	image.SetSurface(s, {0, 0, w, h});
-	currentFrame = 0; maxFrames = image.GetSurface()->w / image.GetClipW();
-	currentStrip = 0; maxStrips = image.GetSurface()->h / image.GetClipH();
-	interval = ticks = 0;
-}

common/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"
-
-#include "SDL/SDL.h"
-
-class SpriteSheet {
-public:
-	SpriteSheet() = default;
-	SpriteSheet(SDL_Surface*, Uint16 w, Uint16 h);
-	~SpriteSheet() = default;
-
-	void Update(double delta);
-
-	SDL_Surface* SetSurface(SDL_Surface* const, Uint16 w, Uint16 h);
-	SDL_Surface* GetSurface() const {
-		return image.GetSurface();
-	}
-
-	void DrawTo(SDL_Surface* const dest, Sint16 x, Sint16 y) {
-		image.DrawTo(dest, x, y);
-	}
-
-	//Accessors and Mutators
-	double SetInterval(double i) { return interval = i; }
-	double GetInterval() const { return interval; }
-
-	int SetCurrentFrame(int i) { return currentFrame = i; }
-	int SetCurrentStrip(int i) { return currentStrip = i; }
-
-	Uint16 GetFrameWidth() const { return image.GetClipW(); }
-	Uint16 GetFrameHeight() const { return image.GetClipH(); }
-	int GetCurrentFrame() const { return currentFrame; };
-	int GetCurrentStrip() const { return currentStrip; };
-	int GetMaxFrames() const { return maxFrames; }
-	int GetMaxStrips() const { return maxStrips; }
-private:
-	Image image;
-	int currentFrame = 0, maxFrames = 0;
-	int currentStrip = 0, maxStrips = 0;
-	 double interval = 0, ticks = 0;
-};
-
-#endif

common/surface_manager.cpp

@@ -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.
-*/
-#include "surface_manager.hpp"
-
-#include <stdexcept>
-
-SurfaceManager::~SurfaceManager() noexcept {
-	FreeAll();
-}
-
-SDL_Surface* SurfaceManager::Load(std::string key, std::string fname) {
-	MapType::iterator it = surfaceMap.find(key);
-	if (it != surfaceMap.end()) {
-		throw(std::runtime_error(std::string("Surface already loaded: ") + key + std::string(", ") + fname));
-	}
-	return LoadSurface(key, fname);
-}
-
-SDL_Surface* SurfaceManager::Reload(std::string key, std::string fname) {
-	MapType::iterator it = surfaceMap.find(key);
-	if (it != surfaceMap.end()) {
-		SDL_FreeSurface(it->second);
-		surfaceMap.erase(it);
-	}
-	return LoadSurface(key, fname);
-}
-
-SDL_Surface* SurfaceManager::Get(std::string key) {
-	MapType::iterator it = surfaceMap.find(key);
-	if (it == surfaceMap.end()) {
-		throw(std::runtime_error(std::string("Could not find key: ") + key));
-	}
-	return it->second;
-}
-
-SDL_Surface* SurfaceManager::Set(std::string key, SDL_Surface* ptr) {
-	MapType::iterator it = surfaceMap.find(key);
-	if (it != surfaceMap.end()) {
-		throw(std::runtime_error(std::string("Key already exists: ") + key));
-	}
-	return surfaceMap[key] = ptr;
-}
-
-void SurfaceManager::Free(std::string key) {
-	MapType::iterator it = surfaceMap.find(key);
-	if (it != surfaceMap.end()) {
-		SDL_FreeSurface(it->second);
-		surfaceMap.erase(it);
-	}
-}
-
-void SurfaceManager::FreeAll() {
-	for (auto it : surfaceMap) {
-		SDL_FreeSurface(it.second);
-	}
-	surfaceMap.clear();
-}
-
-SDL_Surface* SurfaceManager::LoadSurface(std::string key, std::string fname) {
-	SDL_Surface* ptr = SDL_LoadBMP(fname.c_str());
-	if (!ptr) {
-		throw(std::runtime_error(std::string("Failed to load file: ") + fname));
-	}
-	SDL_SetColorKey(ptr, SDL_SRCCOLORKEY, SDL_MapRGB(ptr->format, 255, 0, 255)); //default
-	return surfaceMap[key] = ptr;
-}

common/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/udp_network_utility.hpp

@@ -1,79 +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_net/SDL_net.h"
-
-class UDPNetworkUtility {
-public:
-	UDPNetworkUtility() = default;
-	~UDPNetworkUtility() = default;
-
-	void Open(int port, int packSize);
-	void Close();
-
-	//bind to an available channel
-	int Bind(const char* ip, int port) {
-		Bind(ip, port, -1);
-	}
-	int Bind(IPaddress* add) {
-		Bind(add, -1);
-	}
-
-	//bind to certain channel
-	int Bind(const char* ip, int port, int channel);
-	int Bind(IPaddress* add, int channel);
-	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

libs/SDL_net/SDL_net.h

@@ -1,452 +0,0 @@
-/*
-  SDL_net:  An example cross-platform network library for use with SDL
-  Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
-
-  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.
-*/
-
-/* $Id$ */
-
-#ifndef _SDL_NET_H
-#define _SDL_NET_H
-
-#include "SDL/SDL.h"
-#include "SDL/SDL_endian.h"
-#include "SDL/SDL_version.h"
-#include "SDL/begin_code.h"
-
-
-
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL
-*/
-#define SDL_NET_MAJOR_VERSION	1
-#define SDL_NET_MINOR_VERSION	2
-#define SDL_NET_PATCHLEVEL	8
-
-/* This macro can be used to fill a version structure with the compile-time
- * version of the SDL_net library.
- */
-#define SDL_NET_VERSION(X)						\
-{									\
-	(X)->major = SDL_NET_MAJOR_VERSION;				\
-	(X)->minor = SDL_NET_MINOR_VERSION;				\
-	(X)->patch = SDL_NET_PATCHLEVEL;				\
-}
-
-/* This function gets the version of the dynamically linked SDL_net library.
-   it should NOT be used to fill a version structure, instead you should
-   use the SDL_NET_VERSION() macro.
- */
-extern DECLSPEC const SDL_version * SDLCALL SDLNet_Linked_Version(void);
-
-/* Initialize/Cleanup the network API
-   SDL must be initialized before calls to functions in this library,
-   because this library uses utility functions from the SDL library.
-*/
-extern DECLSPEC int  SDLCALL SDLNet_Init(void);
-extern DECLSPEC void SDLCALL SDLNet_Quit(void);
-
-/***********************************************************************/
-/* IPv4 hostname resolution API                                        */
-/***********************************************************************/
-
-typedef struct {
-	Uint32 host;			/* 32-bit IPv4 host address */
-	Uint16 port;			/* 16-bit protocol port */
-} IPaddress;
-
-/* Resolve a host name and port to an IP address in network form.
-   If the function succeeds, it will return 0.
-   If the host couldn't be resolved, the host portion of the returned
-   address will be INADDR_NONE, and the function will return -1.
-   If 'host' is NULL, the resolved host will be set to INADDR_ANY.
- */
-#ifndef INADDR_ANY
-#define INADDR_ANY		0x00000000
-#endif
-#ifndef INADDR_NONE
-#define INADDR_NONE		0xFFFFFFFF
-#endif
-#ifndef INADDR_LOOPBACK
-#define INADDR_LOOPBACK		0x7f000001
-#endif
-#ifndef INADDR_BROADCAST
-#define INADDR_BROADCAST	0xFFFFFFFF
-#endif
-extern DECLSPEC int SDLCALL SDLNet_ResolveHost(IPaddress *address, const char *host, Uint16 port);
-
-/* Resolve an ip address to a host name in canonical form.
-   If the ip couldn't be resolved, this function returns NULL,
-   otherwise a pointer to a static buffer containing the hostname
-   is returned.  Note that this function is not thread-safe.
-*/
-extern DECLSPEC const char * SDLCALL SDLNet_ResolveIP(const IPaddress *ip);
-
-/* Get the addresses of network interfaces on this system.
-   This returns the number of addresses saved in 'addresses'
- */
-extern DECLSPEC int SDLCALL SDLNet_GetLocalAddresses(IPaddress *addresses, int maxcount);
-
-/***********************************************************************/
-/* TCP network API                                                     */
-/***********************************************************************/
-
-typedef struct _TCPsocket *TCPsocket;
-
-/* Open a TCP network socket
-   If ip.host is INADDR_NONE or INADDR_ANY, this creates a local server
-   socket on the given port, otherwise a TCP connection to the remote
-   host and port is attempted. The address passed in should already be
-   swapped to network byte order (addresses returned from 
-   SDLNet_ResolveHost() are already in the correct form).
-   The newly created socket is returned, or NULL if there was an error.
-*/
-extern DECLSPEC TCPsocket SDLCALL SDLNet_TCP_Open(IPaddress *ip);
-
-/* Accept an incoming connection on the given server socket.
-   The newly created socket is returned, or NULL if there was an error.
-*/
-extern DECLSPEC TCPsocket SDLCALL SDLNet_TCP_Accept(TCPsocket server);
-
-/* Get the IP address of the remote system associated with the socket.
-   If the socket is a server socket, this function returns NULL.
-*/
-extern DECLSPEC IPaddress * SDLCALL SDLNet_TCP_GetPeerAddress(TCPsocket sock);
-
-/* Send 'len' bytes of 'data' over the non-server socket 'sock'
-   This function returns the actual amount of data sent.  If the return value
-   is less than the amount of data sent, then either the remote connection was
-   closed, or an unknown socket error occurred.
-*/
-extern DECLSPEC int SDLCALL SDLNet_TCP_Send(TCPsocket sock, const void *data,
-		int len);
-
-/* Receive up to 'maxlen' bytes of data over the non-server socket 'sock',
-   and store them in the buffer pointed to by 'data'.
-   This function returns the actual amount of data received.  If the return
-   value is less than or equal to zero, then either the remote connection was
-   closed, or an unknown socket error occurred.
-*/
-extern DECLSPEC int SDLCALL SDLNet_TCP_Recv(TCPsocket sock, void *data, int maxlen);
-
-/* Close a TCP network socket */
-extern DECLSPEC void SDLCALL SDLNet_TCP_Close(TCPsocket sock);
-
-
-/***********************************************************************/
-/* UDP network API                                                     */
-/***********************************************************************/
-
-/* The maximum channels on a a UDP socket */
-#define SDLNET_MAX_UDPCHANNELS	150
-/* The maximum addresses bound to a single UDP socket channel */
-#define SDLNET_MAX_UDPADDRESSES	1
-
-typedef struct _UDPsocket *UDPsocket;
-typedef struct {
-	int channel;		/* The src/dst channel of the packet */
-	Uint8 *data;		/* The packet data */
-	int len;		/* The length of the packet data */
-	int maxlen;		/* The size of the data buffer */
-	int status;		/* packet status after sending */
-	IPaddress address;		/* The source/dest address of an incoming/outgoing packet */
-} UDPpacket;
-
-/* Allocate/resize/free a single UDP packet 'size' bytes long.
-   The new packet is returned, or NULL if the function ran out of memory.
- */
-extern DECLSPEC UDPpacket * SDLCALL SDLNet_AllocPacket(int size);
-extern DECLSPEC int SDLCALL SDLNet_ResizePacket(UDPpacket *packet, int newsize);
-extern DECLSPEC void SDLCALL SDLNet_FreePacket(UDPpacket *packet);
-
-/* Allocate/Free a UDP packet vector (array of packets) of 'howmany' packets,
-   each 'size' bytes long.
-   A pointer to the first packet in the array is returned, or NULL if the
-   function ran out of memory.
- */
-extern DECLSPEC UDPpacket ** SDLCALL SDLNet_AllocPacketV(int howmany, int size);
-extern DECLSPEC void SDLCALL SDLNet_FreePacketV(UDPpacket **packetV);
-
-
-/* Open a UDP network socket
-   If 'port' is non-zero, the UDP socket is bound to a local port.
-   The 'port' should be given in native byte order, but is used
-   internally in network (big endian) byte order, in addresses, etc.
-   This allows other systems to send to this socket via a known port.
-*/
-extern DECLSPEC UDPsocket SDLCALL SDLNet_UDP_Open(Uint16 port);
-
-/* Set the percentage of simulated packet loss for packets sent on the socket.
-*/
-extern DECLSPEC void SDLCALL SDLNet_UDP_SetPacketLoss(UDPsocket sock, int percent);
-
-/* Bind the address 'address' to the requested channel on the UDP socket.
-   If the channel is -1, then the first unbound channel will be bound with
-   the given address as it's primary address.
-   If the channel is already bound, this new address will be added to the
-   list of valid source addresses for packets arriving on the channel.
-   If the channel is not already bound, then the address becomes the primary
-   address, to which all outbound packets on the channel are sent.
-   This function returns the channel which was bound, or -1 on error.
-*/
-extern DECLSPEC int SDLCALL SDLNet_UDP_Bind(UDPsocket sock, int channel, const IPaddress *address);
-
-/* Unbind all addresses from the given channel */
-extern DECLSPEC void SDLCALL SDLNet_UDP_Unbind(UDPsocket sock, int channel);
-
-/* Get the primary IP address of the remote system associated with the 
-   socket and channel.  If the channel is -1, then the primary IP port
-   of the UDP socket is returned -- this is only meaningful for sockets
-   opened with a specific port.
-   If the channel is not bound and not -1, this function returns NULL.
- */
-extern DECLSPEC IPaddress * SDLCALL SDLNet_UDP_GetPeerAddress(UDPsocket sock, int channel);
-
-/* Send a vector of packets to the the channels specified within the packet.
-   If the channel specified in the packet is -1, the packet will be sent to
-   the address in the 'src' member of the packet.
-   Each packet will be updated with the status of the packet after it has 
-   been sent, -1 if the packet send failed.
-   This function returns the number of packets sent.
-*/
-extern DECLSPEC int SDLCALL SDLNet_UDP_SendV(UDPsocket sock, UDPpacket **packets, int npackets);
-
-/* Send a single packet to the specified channel.
-   If the channel specified in the packet is -1, the packet will be sent to
-   the address in the 'src' member of the packet.
-   The packet will be updated with the status of the packet after it has
-   been sent.
-   This function returns 1 if the packet was sent, or 0 on error.
-
-   NOTE:
-   The maximum size of the packet is limited by the MTU (Maximum Transfer Unit)
-   of the transport medium.  It can be as low as 250 bytes for some PPP links,
-   and as high as 1500 bytes for ethernet.
-*/
-extern DECLSPEC int SDLCALL SDLNet_UDP_Send(UDPsocket sock, int channel, UDPpacket *packet);
-
-/* Receive a vector of pending packets from the UDP socket.
-   The returned packets contain the source address and the channel they arrived
-   on.  If they did not arrive on a bound channel, the the channel will be set
-   to -1.
-   The channels are checked in highest to lowest order, so if an address is
-   bound to multiple channels, the highest channel with the source address
-   bound will be returned.
-   This function returns the number of packets read from the network, or -1
-   on error.  This function does not block, so can return 0 packets pending.
-*/
-extern DECLSPEC int SDLCALL SDLNet_UDP_RecvV(UDPsocket sock, UDPpacket **packets);
-
-/* Receive a single packet from the UDP socket.
-   The returned packet contains the source address and the channel it arrived
-   on.  If it did not arrive on a bound channel, the the channel will be set
-   to -1.
-   The channels are checked in highest to lowest order, so if an address is
-   bound to multiple channels, the highest channel with the source address
-   bound will be returned.
-   This function returns the number of packets read from the network, or -1
-   on error.  This function does not block, so can return 0 packets pending.
-*/
-extern DECLSPEC int SDLCALL SDLNet_UDP_Recv(UDPsocket sock, UDPpacket *packet);
-
-/* Close a UDP network socket */
-extern DECLSPEC void SDLCALL SDLNet_UDP_Close(UDPsocket sock);
-
-
-/***********************************************************************/
-/* Hooks for checking sockets for available data                       */
-/***********************************************************************/
-
-typedef struct _SDLNet_SocketSet *SDLNet_SocketSet;
-
-/* Any network socket can be safely cast to this socket type */
-typedef struct _SDLNet_GenericSocket {
-	int ready;
-} *SDLNet_GenericSocket;
-
-/* Allocate a socket set for use with SDLNet_CheckSockets()
-   This returns a socket set for up to 'maxsockets' sockets, or NULL if
-   the function ran out of memory.
- */
-extern DECLSPEC SDLNet_SocketSet SDLCALL SDLNet_AllocSocketSet(int maxsockets);
-
-/* Add a socket to a set of sockets to be checked for available data */
-#define SDLNet_TCP_AddSocket(set, sock) \
-			SDLNet_AddSocket(set, SDL_reinterpret_cast(SDLNet_GenericSocket, sock))
-#define SDLNet_UDP_AddSocket(set, sock) \
-			SDLNet_AddSocket(set, SDL_reinterpret_cast(SDLNet_GenericSocket, sock))
-extern DECLSPEC int SDLCALL SDLNet_AddSocket(SDLNet_SocketSet set, SDLNet_GenericSocket sock);
-
-/* Remove a socket from a set of sockets to be checked for available data */
-#define SDLNet_TCP_DelSocket(set, sock) \
-			SDLNet_DelSocket(set, SDL_reinterpret_cast(SDLNet_GenericSocket, sock))
-#define SDLNet_UDP_DelSocket(set, sock) \
-			SDLNet_DelSocket(set, SDL_reinterpret_cast(SDLNet_GenericSocket, sock))
-extern DECLSPEC int SDLCALL SDLNet_DelSocket(SDLNet_SocketSet set, SDLNet_GenericSocket sock);
-
-/* This function checks to see if data is available for reading on the
-   given set of sockets.  If 'timeout' is 0, it performs a quick poll,
-   otherwise the function returns when either data is available for
-   reading, or the timeout in milliseconds has elapsed, which ever occurs
-   first.  This function returns the number of sockets ready for reading, 
-   or -1 if there was an error with the select() system call.
-*/
-extern DECLSPEC int SDLCALL SDLNet_CheckSockets(SDLNet_SocketSet set, Uint32 timeout);
-
-/* After calling SDLNet_CheckSockets(), you can use this function on a
-   socket that was in the socket set, to find out if data is available
-   for reading.
-*/
-#define SDLNet_SocketReady(sock) \
-		((sock != NULL) && SDL_reinterpret_cast(SDLNet_GenericSocket, sock)->ready)
-
-/* Free a set of sockets allocated by SDL_NetAllocSocketSet() */
-extern DECLSPEC void SDLCALL SDLNet_FreeSocketSet(SDLNet_SocketSet set);
-
-
-/***********************************************************************/
-/* Platform-independent data conversion functions                      */
-/***********************************************************************/
-
-/* Write a 16/32 bit value to network packet buffer */
-extern DECLSPEC void SDLCALL SDLNet_Write16(Uint16 value, void *area);
-extern DECLSPEC void SDLCALL SDLNet_Write32(Uint32 value, void *area);
-
-/* Read a 16/32 bit value from network packet buffer */
-extern DECLSPEC Uint16 SDLCALL SDLNet_Read16(void *area);
-extern DECLSPEC Uint32 SDLCALL SDLNet_Read32(void *area);
-
-/***********************************************************************/
-/* Error reporting functions                                           */
-/***********************************************************************/
-
-/* We'll use SDL's functions for error reporting */
-#define SDLNet_SetError	SDL_SetError
-#define SDLNet_GetError	SDL_GetError
-
-/* I'm eventually going to try to disentangle SDL_net from SDL, thus making
-   SDL_net an independent X-platform networking toolkit.  Not today though....
-
-extern no_parse_DECLSPEC void SDLCALL SDLNet_SetError(const char *fmt, ...);
-extern no_parse_DECLSPEC char * SDLCALL SDLNet_GetError(void);
-*/
-
-
-/* Inline macro functions to read/write network data */
-
-/* Warning, some systems have data access alignment restrictions */
-#if defined(sparc) || defined(mips)
-#define SDL_DATA_ALIGNED	1
-#endif
-#ifndef SDL_DATA_ALIGNED
-#define SDL_DATA_ALIGNED	0
-#endif
-
-/* Write a 16 bit value to network packet buffer */
-#if !SDL_DATA_ALIGNED
-#define SDLNet_Write16(value, areap)	\
-	(*SDL_reinterpret_cast(Uint16 *, areap) = SDL_SwapBE16(value))
-#else
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-#define SDLNet_Write16(value, areap)	\
-do 					\
-{					\
-	Uint8 *area = SDL_reinterpret_cast(Uint8 *, areap);	\
-	area[0] = (value >>  8) & 0xFF;	\
-	area[1] =  value        & 0xFF;	\
-} while ( 0 )
-#else
-#define SDLNet_Write16(value, areap)	\
-do 					\
-{					\
-	Uint8 *area = SDL_reinterpret_cast(Uint8 *, areap);	\
-	area[1] = (value >>  8) & 0xFF;	\
-	area[0] =  value        & 0xFF;	\
-} while ( 0 )
-#endif
-#endif /* !SDL_DATA_ALIGNED */
-
-/* Write a 32 bit value to network packet buffer */
-#if !SDL_DATA_ALIGNED
-#define SDLNet_Write32(value, areap) 	\
-	*SDL_reinterpret_cast(Uint32 *, areap) = SDL_SwapBE32(value);
-#else
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-#define SDLNet_Write32(value, areap) 	\
-do					\
-{					\
-	Uint8 *area = SDL_reinterpret_cast(Uint8 *, areap);	\
-	area[0] = (value >> 24) & 0xFF;	\
-	area[1] = (value >> 16) & 0xFF;	\
-	area[2] = (value >>  8) & 0xFF;	\
-	area[3] =  value       & 0xFF;	\
-} while ( 0 )
-#else
-#define SDLNet_Write32(value, areap) 	\
-do					\
-{					\
-	Uint8 *area = SDL_reinterpret_cast(Uint8 *, areap);	\
-	area[3] = (value >> 24) & 0xFF;	\
-	area[2] = (value >> 16) & 0xFF;	\
-	area[1] = (value >>  8) & 0xFF;	\
-	area[0] =  value       & 0xFF;	\
-} while ( 0 )
-#endif
-#endif /* !SDL_DATA_ALIGNED */
-
-/* Read a 16 bit value from network packet buffer */
-#if !SDL_DATA_ALIGNED
-#define SDLNet_Read16(areap) 		\
-	(SDL_SwapBE16(*SDL_reinterpret_cast(Uint16 *, areap)))
-#else
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-#define SDLNet_Read16(areap) 		\
-	(((SDL_reinterpret_cast(Uint8 *, areap))[0] <<  8) | (SDL_reinterpret_cast(Uint8 *, areap))[1] <<  0)
-#else
-#define SDLNet_Read16(areap) 		\
-	(((SDL_reinterpret_cast(Uint8 *, areap))[1] <<  8) | (SDL_reinterpret_cast(Uint8 *, areap))[0] <<  0)
-#endif
-#endif /* !SDL_DATA_ALIGNED */
-
-/* Read a 32 bit value from network packet buffer */
-#if !SDL_DATA_ALIGNED
-#define SDLNet_Read32(areap) 		\
-	(SDL_SwapBE32(*SDL_reinterpret_cast(Uint32 *, areap)))
-#else
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-#define SDLNet_Read32(areap) 		\
-	(((SDL_reinterpret_cast(Uint8 *, areap))[0] << 24) | ((SDL_reinterpret_cast(Uint8 *, areap))[1] << 16) | \
-	 ((SDL_reinterpret_cast(Uint8 *, areap))[2] <<  8) |  (SDL_reinterpret_cast(Uint8 *, areap))[3] <<  0)
-#else
-#define SDLNet_Read32(areap) 		\
-	(((SDL_reinterpret_cast(Uint8 *, areap))[3] << 24) | ((SDL_reinterpret_cast(Uint8 *, areap))[2] << 16) | \
-	 ((SDL_reinterpret_cast(Uint8 *, areap))[1] <<  8) |  (SDL_reinterpret_cast(Uint8 *, areap))[0] <<  0)
-#endif
-#endif /* !SDL_DATA_ALIGNED */
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "SDL/close_code.h"
-
-#endif /* _SDL_NET_H */

libs/SDL_net/SDLnet.c

@@ -1,269 +0,0 @@
-/*
-  SDL_net:  An example cross-platform network library for use with SDL
-  Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
-
-  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.
-*/
-
-/* $Id$ */
-
-#include <string.h>
-
-#include "SDL/SDL_endian.h"
-
-#include "SDLnetsys.h"
-#include "SDL_net.h"
-
-
-const SDL_version *SDLNet_Linked_Version(void)
-{
-	static SDL_version linked_version;
-	SDL_NET_VERSION(&linked_version);
-	return(&linked_version);
-}
-
-/* Since the UNIX/Win32/BeOS code is so different from MacOS,
-   we'll just have two completely different sections here.
-*/
-static int SDLNet_started = 0;
-
-#ifndef __USE_W32_SOCKETS
-#include <signal.h>
-#endif
-
-#ifndef __USE_W32_SOCKETS
-
-int SDLNet_GetLastError(void)
-{
-	return errno;
-}
-
-void SDLNet_SetLastError(int err)
-{
-	errno = err;
-}
-
-#endif
-
-/* Initialize/Cleanup the network API */
-int  SDLNet_Init(void)
-{
-	if ( !SDLNet_started ) {
-#ifdef __USE_W32_SOCKETS
-		/* Start up the windows networking */
-		WORD version_wanted = MAKEWORD(1,1);
-		WSADATA wsaData;
-
-		if ( WSAStartup(version_wanted, &wsaData) != 0 ) {
-			SDLNet_SetError("Couldn't initialize Winsock 1.1\n");
-			return(-1);
-		}
-#else
-		/* SIGPIPE is generated when a remote socket is closed */
-		void (*handler)(int);
-		handler = signal(SIGPIPE, SIG_IGN);
-		if ( handler != SIG_DFL ) {
-			signal(SIGPIPE, handler);
-		}
-#endif
-	}
-	++SDLNet_started;
-	return(0);
-}
-void SDLNet_Quit(void)
-{
-	if ( SDLNet_started == 0 ) {
-		return;
-	}
-	if ( --SDLNet_started == 0 ) {
-#ifdef __USE_W32_SOCKETS
-		/* Clean up windows networking */
-		if ( WSACleanup() == SOCKET_ERROR ) {
-			if ( WSAGetLastError() == WSAEINPROGRESS ) {
-#ifndef _WIN32_WCE
-				WSACancelBlockingCall();
-#endif
-				WSACleanup();
-			}
-		}
-#else
-		/* Restore the SIGPIPE handler */
-		void (*handler)(int);
-		handler = signal(SIGPIPE, SIG_DFL);
-		if ( handler != SIG_IGN ) {
-			signal(SIGPIPE, handler);
-		}
-#endif
-	}
-}
-
-/* Resolve a host name and port to an IP address in network form */
-int SDLNet_ResolveHost(IPaddress *address, const char *host, Uint16 port)
-{
-	int retval = 0;
-
-	/* Perform the actual host resolution */
-	if ( host == NULL ) {
-		address->host = INADDR_ANY;
-	} else {
-		address->host = inet_addr(host);
-		if ( address->host == INADDR_NONE ) {
-			struct hostent *hp;
-
-			hp = gethostbyname(host);
-			if ( hp ) {
-				memcpy(&address->host,hp->h_addr,hp->h_length);
-			} else {
-				retval = -1;
-			}
-		}
-	}
-	address->port = SDL_SwapBE16(port);
-
-	/* Return the status */
-	return(retval);
-}
-
-/* Resolve an ip address to a host name in canonical form.
-   If the ip couldn't be resolved, this function returns NULL,
-   otherwise a pointer to a static buffer containing the hostname
-   is returned.  Note that this function is not thread-safe.
-*/
-/* Written by Miguel Angel Blanch.
- * Main Programmer of Arianne RPG.
- * http://come.to/arianne_rpg
- */
-const char *SDLNet_ResolveIP(const IPaddress *ip)
-{
-	struct hostent *hp;
-	struct in_addr in;
-
-	hp = gethostbyaddr((const char *)&ip->host, sizeof(ip->host), AF_INET);
-	if ( hp != NULL ) {
-		return hp->h_name;
-	}
-
-	in.s_addr = ip->host;
-	return inet_ntoa(in);
-}
-
-int SDLNet_GetLocalAddresses(IPaddress *addresses, int maxcount)
-{
-	int count = 0;
-#ifdef SIOCGIFCONF
-/* Defined on Mac OS X */
-#ifndef _SIZEOF_ADDR_IFREQ
-#define _SIZEOF_ADDR_IFREQ sizeof
-#endif
-	SOCKET sock;
-	struct ifconf conf;
-	char data[4096];
-	struct ifreq *ifr;
-	struct sockaddr_in *sock_addr;
-
-	sock = socket(AF_INET, SOCK_DGRAM, 0);
-	if ( sock == INVALID_SOCKET ) {
-		return 0;
-	}
-
-	conf.ifc_len = sizeof(data);
-	conf.ifc_buf = (caddr_t) data;
-	if ( ioctl(sock, SIOCGIFCONF, &conf) < 0 ) {
-		closesocket(sock);
-		return 0;
-	}
-
-	ifr = (struct ifreq*)data;
-	while ((char*)ifr < data+conf.ifc_len) {
-		if (ifr->ifr_addr.sa_family == AF_INET) {
-			if (count < maxcount) {
-				sock_addr = (struct sockaddr_in*)&ifr->ifr_addr;
-				addresses[count].host = sock_addr->sin_addr.s_addr;
-				addresses[count].port = sock_addr->sin_port;
-			}
-			++count;
-		}
-		ifr = (struct ifreq*)((char*)ifr + _SIZEOF_ADDR_IFREQ(*ifr));
-	}
-	closesocket(sock);
-#elif defined(__WIN32__)
-    PIP_ADAPTER_INFO pAdapterInfo;
-    PIP_ADAPTER_INFO pAdapter;
-	PIP_ADDR_STRING pAddress;
-    DWORD dwRetVal = 0;
-    ULONG ulOutBufLen = sizeof (IP_ADAPTER_INFO);
-
-    pAdapterInfo = (IP_ADAPTER_INFO *) SDL_malloc(sizeof (IP_ADAPTER_INFO));
-    if (pAdapterInfo == NULL) {
-		return 0;
-    }
-
-    if ((dwRetVal = GetAdaptersInfo(pAdapterInfo, &ulOutBufLen)) == ERROR_BUFFER_OVERFLOW) {
-        pAdapterInfo = (IP_ADAPTER_INFO *) SDL_realloc(pAdapterInfo, ulOutBufLen);
-        if (pAdapterInfo == NULL) {
-			return 0;
-        }
-		dwRetVal = GetAdaptersInfo(pAdapterInfo, &ulOutBufLen);
-    }
-
-    if (dwRetVal == NO_ERROR) {
-        for (pAdapter = pAdapterInfo; pAdapter; pAdapter = pAdapter->Next) {
-			for (pAddress = &pAdapterInfo->IpAddressList; pAddress; pAddress = pAddress->Next) {
-				if (count < maxcount) {
-					addresses[count].host = inet_addr(pAddress->IpAddress.String);
-					addresses[count].port = 0;
-				}
-				++count;
-			}
-        }
-    }
-	SDL_free(pAdapterInfo);
-#endif
-	return count;
-}
-
-#if !SDL_DATA_ALIGNED /* function versions for binary compatibility */
-
-/* Write a 16 bit value to network packet buffer */
-#undef SDLNet_Write16
-void   SDLNet_Write16(Uint16 value, void *areap)
-{
-	(*(Uint16 *)(areap) = SDL_SwapBE16(value));
-}
-
-/* Write a 32 bit value to network packet buffer */
-#undef SDLNet_Write32
-void   SDLNet_Write32(Uint32 value, void *areap)
-{
-	*(Uint32 *)(areap) = SDL_SwapBE32(value);
-}
-
-/* Read a 16 bit value from network packet buffer */
-#undef SDLNet_Read16
-Uint16 SDLNet_Read16(void *areap)
-{
-	return (SDL_SwapBE16(*(Uint16 *)(areap)));
-}
-
-/* Read a 32 bit value from network packet buffer */
-#undef SDLNet_Read32
-Uint32 SDLNet_Read32(void *areap)
-{
-	return (SDL_SwapBE32(*(Uint32 *)(areap)));
-}
-
-#endif /* !SDL_DATA_ALIGNED */

libs/SDL_net/SDLnetTCP.c

@@ -1,295 +0,0 @@
-/*
-  SDL_net:  An example cross-platform network library for use with SDL
-  Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
-
-  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.
-*/
-
-/* $Id$ */
-
-#include "SDLnetsys.h"
-#include "SDL_net.h"
-
-/* The network API for TCP sockets */
-
-/* Since the UNIX/Win32/BeOS code is so different from MacOS,
-   we'll just have two completely different sections here.
-*/
-
-struct _TCPsocket {
-	int ready;
-	SOCKET channel;
-	IPaddress remoteAddress;
-	IPaddress localAddress;
-	int sflag;
-};
-
-/* Open a TCP network socket
-   If 'remote' is NULL, this creates a local server socket on the given port,
-   otherwise a TCP connection to the remote host and port is attempted.
-   The newly created socket is returned, or NULL if there was an error.
-*/
-TCPsocket SDLNet_TCP_Open(IPaddress *ip)
-{
-	TCPsocket sock;
-	struct sockaddr_in sock_addr;
-
-	/* Allocate a TCP socket structure */
-	sock = (TCPsocket)malloc(sizeof(*sock));
-	if ( sock == NULL ) {
-		SDLNet_SetError("Out of memory");
-		goto error_return;
-	}
-
-	/* Open the socket */
-	sock->channel = socket(AF_INET, SOCK_STREAM, 0);
-	if ( sock->channel == INVALID_SOCKET ) {
-		SDLNet_SetError("Couldn't create socket");
-		goto error_return;
-	}
-
-	/* Connect to remote, or bind locally, as appropriate */
-	if ( (ip->host != INADDR_NONE) && (ip->host != INADDR_ANY) ) {
-
-	// #########  Connecting to remote
-	
-		memset(&sock_addr, 0, sizeof(sock_addr));
-		sock_addr.sin_family = AF_INET;
-		sock_addr.sin_addr.s_addr = ip->host;
-		sock_addr.sin_port = ip->port;
-
-		/* Connect to the remote host */
-		if ( connect(sock->channel, (struct sockaddr *)&sock_addr,
-				sizeof(sock_addr)) == SOCKET_ERROR ) {
-			SDLNet_SetError("Couldn't connect to remote host");
-			goto error_return;
-		}
-		sock->sflag = 0;
-	} else {
-
-	// ##########  Binding locally
-
-		memset(&sock_addr, 0, sizeof(sock_addr));
-		sock_addr.sin_family = AF_INET;
-		sock_addr.sin_addr.s_addr = INADDR_ANY;
-		sock_addr.sin_port = ip->port;
-
-/*
- * Windows gets bad mojo with SO_REUSEADDR:
- * http://www.devolution.com/pipermail/sdl/2005-September/070491.html
- *   --ryan.
- */
-#ifndef WIN32
-		/* allow local address reuse */
-		{ int yes = 1;
-			setsockopt(sock->channel, SOL_SOCKET, SO_REUSEADDR, (char*)&yes, sizeof(yes));
-		}
-#endif
-
-		/* Bind the socket for listening */
-		if ( bind(sock->channel, (struct sockaddr *)&sock_addr,
-				sizeof(sock_addr)) == SOCKET_ERROR ) {
-			SDLNet_SetError("Couldn't bind to local port");
-			goto error_return;
-		}
-		if ( listen(sock->channel, 5) == SOCKET_ERROR ) {
-			SDLNet_SetError("Couldn't listen to local port");
-			goto error_return;
-		}
-
-		/* Set the socket to non-blocking mode for accept() */
-#if defined(__BEOS__) && defined(SO_NONBLOCK)
-		/* On BeOS r5 there is O_NONBLOCK but it's for files only */
-		{
-			long b = 1;
-			setsockopt(sock->channel, SOL_SOCKET, SO_NONBLOCK, &b, sizeof(b));
-		}
-#elif defined(O_NONBLOCK)
-		{
-			fcntl(sock->channel, F_SETFL, O_NONBLOCK);
-		}
-#elif defined(WIN32)
-		{
-			unsigned long mode = 1;
-			ioctlsocket (sock->channel, FIONBIO, &mode);
-		}
-#elif defined(__OS2__)
-		{
-			int dontblock = 1;
-			ioctl(sock->channel, FIONBIO, &dontblock);
-		}
-#else
-#warning How do we set non-blocking mode on other operating systems?
-#endif
-		sock->sflag = 1;
-	}
-	sock->ready = 0;
-
-#ifdef TCP_NODELAY
-	/* Set the nodelay TCP option for real-time games */
-	{ int yes = 1;
-	setsockopt(sock->channel, IPPROTO_TCP, TCP_NODELAY, (char*)&yes, sizeof(yes));
-	}
-#endif /* TCP_NODELAY */
-
-	/* Fill in the channel host address */
-	sock->remoteAddress.host = sock_addr.sin_addr.s_addr;
-	sock->remoteAddress.port = sock_addr.sin_port;
-
-	/* The socket is ready */
-	return(sock);
-
-error_return:
-	SDLNet_TCP_Close(sock);
-	return(NULL);
-}
-
-/* Accept an incoming connection on the given server socket.
-   The newly created socket is returned, or NULL if there was an error.
-*/
-TCPsocket SDLNet_TCP_Accept(TCPsocket server)
-{
-	TCPsocket sock;
-	struct sockaddr_in sock_addr;
-	socklen_t sock_alen;
-
-	/* Only server sockets can accept */
-	if ( ! server->sflag ) {
-		SDLNet_SetError("Only server sockets can accept()");
-		return(NULL);
-	}
-	server->ready = 0;
-
-	/* Allocate a TCP socket structure */
-	sock = (TCPsocket)malloc(sizeof(*sock));
-	if ( sock == NULL ) {
-		SDLNet_SetError("Out of memory");
-		goto error_return;
-	}
-
-	/* Accept a new TCP connection on a server socket */
-	sock_alen = sizeof(sock_addr);
-	sock->channel = accept(server->channel, (struct sockaddr *)&sock_addr,
-								&sock_alen);
-	if ( sock->channel == INVALID_SOCKET ) {
-		SDLNet_SetError("accept() failed");
-		goto error_return;
-	}
-#ifdef WIN32
-	{
-		/* passing a zero value, socket mode set to block on */
-		unsigned long mode = 0;
-		ioctlsocket (sock->channel, FIONBIO, &mode);
-	}
-#elif defined(O_NONBLOCK)
-	{
-		int flags = fcntl(sock->channel, F_GETFL, 0);
-		fcntl(sock->channel, F_SETFL, flags & ~O_NONBLOCK);
-	}
-#endif /* WIN32 */
-	sock->remoteAddress.host = sock_addr.sin_addr.s_addr;
-	sock->remoteAddress.port = sock_addr.sin_port;
-
-	sock->sflag = 0;
-	sock->ready = 0;
-
-	/* The socket is ready */
-	return(sock);
-
-error_return:
-	SDLNet_TCP_Close(sock);
-	return(NULL);
-}
-
-/* Get the IP address of the remote system associated with the socket.
-   If the socket is a server socket, this function returns NULL.
-*/
-IPaddress *SDLNet_TCP_GetPeerAddress(TCPsocket sock)
-{
-	if ( sock->sflag ) {
-		return(NULL);
-	}
-	return(&sock->remoteAddress);
-}
-
-/* Send 'len' bytes of 'data' over the non-server socket 'sock'
-   This function returns the actual amount of data sent.  If the return value
-   is less than the amount of data sent, then either the remote connection was
-   closed, or an unknown socket error occurred.
-*/
-int SDLNet_TCP_Send(TCPsocket sock, const void *datap, int len)
-{
-	const Uint8 *data = (const Uint8 *)datap;	/* For pointer arithmetic */
-	int sent, left;
-
-	/* Server sockets are for accepting connections only */
-	if ( sock->sflag ) {
-		SDLNet_SetError("Server sockets cannot send");
-		return(-1);
-	}
-
-	/* Keep sending data until it's sent or an error occurs */
-	left = len;
-	sent = 0;
-	SDLNet_SetLastError(0);
-	do {
-		len = send(sock->channel, (const char *) data, left, 0);
-		if ( len > 0 ) {
-			sent += len;
-			left -= len;
-			data += len;
-		}
-	} while ( (left > 0) && ((len > 0) || (SDLNet_GetLastError() == EINTR)) );
-
-	return(sent);
-}
-
-/* Receive up to 'maxlen' bytes of data over the non-server socket 'sock',
-   and store them in the buffer pointed to by 'data'.
-   This function returns the actual amount of data received.  If the return
-   value is less than or equal to zero, then either the remote connection was
-   closed, or an unknown socket error occurred.
-*/
-int SDLNet_TCP_Recv(TCPsocket sock, void *data, int maxlen)
-{
-	int len;
-
-	/* Server sockets are for accepting connections only */
-	if ( sock->sflag ) {
-		SDLNet_SetError("Server sockets cannot receive");
-		return(-1);
-	}
-
-	SDLNet_SetLastError(0);
-	do {
-		len = recv(sock->channel, (char *) data, maxlen, 0);
-	} while ( SDLNet_GetLastError() == EINTR );
-
-	sock->ready = 0;
-	return(len);
-}
-
-/* Close a TCP network socket */
-void SDLNet_TCP_Close(TCPsocket sock)
-{
-	if ( sock != NULL ) {
-		if ( sock->channel != INVALID_SOCKET ) {
-			closesocket(sock->channel);
-		}
-		free(sock);
-	}
-}

libs/SDL_net/SDLnetUDP.c

@@ -1,528 +0,0 @@
-/*
-  SDL_net:  An example cross-platform network library for use with SDL
-  Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
-
-  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.
-*/
-
-/* $Id$ */
-
-#include "SDLnetsys.h"
-#include "SDL_net.h"
-
-#ifdef __WIN32__
-#define srandom	srand
-#define random	rand
-#endif
-
-struct UDP_channel {
-	int numbound;
-	IPaddress address[SDLNET_MAX_UDPADDRESSES];
-};
-
-struct _UDPsocket {
-	int ready;
-	SOCKET channel;
-	IPaddress address;
-
-	struct UDP_channel binding[SDLNET_MAX_UDPCHANNELS];
-
-	/* For debugging purposes */
-	int packetloss;
-};
-
-/* Allocate/free a single UDP packet 'size' bytes long.
-   The new packet is returned, or NULL if the function ran out of memory.
- */
-extern UDPpacket *SDLNet_AllocPacket(int size)
-{
-	UDPpacket *packet;
-	int error;
-
-
-	error = 1;
-	packet = (UDPpacket *)malloc(sizeof(*packet));
-	if ( packet != NULL ) {
-		packet->maxlen = size;
-		packet->data = (Uint8 *)malloc(size);
-		if ( packet->data != NULL ) {
-			error = 0;
-		}
-	}
-	if ( error ) {
-		SDLNet_SetError("Out of memory");
-		SDLNet_FreePacket(packet);
-		packet = NULL;
-	}
-	return(packet);
-}
-int SDLNet_ResizePacket(UDPpacket *packet, int newsize)
-{
-	Uint8 *newdata;
-
-	newdata = (Uint8 *)malloc(newsize);
-	if ( newdata != NULL ) {
-		free(packet->data);
-		packet->data = newdata;
-		packet->maxlen = newsize;
-	}
-	return(packet->maxlen);
-}
-extern void SDLNet_FreePacket(UDPpacket *packet)
-{
-	if ( packet ) {
-		if ( packet->data )
-			free(packet->data);
-		free(packet);
-	}
-}
-
-/* Allocate/Free a UDP packet vector (array of packets) of 'howmany' packets,
-   each 'size' bytes long.
-   A pointer to the packet array is returned, or NULL if the function ran out
-   of memory.
- */
-UDPpacket **SDLNet_AllocPacketV(int howmany, int size)
-{
-	UDPpacket **packetV;
-
-	packetV = (UDPpacket **)malloc((howmany+1)*sizeof(*packetV));
-	if ( packetV != NULL ) {
-		int i;
-		for ( i=0; i<howmany; ++i ) {
-			packetV[i] = SDLNet_AllocPacket(size);
-			if ( packetV[i] == NULL ) {
-				break;
-			}
-		}
-		packetV[i] = NULL;
-
-		if ( i != howmany ) {
-			SDLNet_SetError("Out of memory");
-			SDLNet_FreePacketV(packetV);
-			packetV = NULL;
-		}
-	}
-	return(packetV);
-}
-void SDLNet_FreePacketV(UDPpacket **packetV)
-{
-	if ( packetV ) {
-		int i;
-		for ( i=0; packetV[i]; ++i ) {
-			SDLNet_FreePacket(packetV[i]);
-		}
-		free(packetV);
-	}
-}
-
-/* Since the UNIX/Win32/BeOS code is so different from MacOS,
-   we'll just have two completely different sections here.
-*/
-
-/* Open a UDP network socket
-   If 'port' is non-zero, the UDP socket is bound to a fixed local port.
-*/
-UDPsocket SDLNet_UDP_Open(Uint16 port)
-{
-	UDPsocket sock;
-	struct sockaddr_in sock_addr;
-	socklen_t sock_len;
-
-	/* Allocate a UDP socket structure */
-	sock = (UDPsocket)malloc(sizeof(*sock));
-	if ( sock == NULL ) {
-		SDLNet_SetError("Out of memory");
-		goto error_return;
-	}
-	memset(sock, 0, sizeof(*sock));
-	memset(&sock_addr, 0, sizeof(sock_addr));
-	
-	/* Open the socket */
-	sock->channel = socket(AF_INET, SOCK_DGRAM, 0);
-	if ( sock->channel == INVALID_SOCKET ) 
-	{
-		SDLNet_SetError("Couldn't create socket");
-		goto error_return;
-	}
-
-	/* Bind locally, if appropriate */
-	sock_addr.sin_family = AF_INET;
-	sock_addr.sin_addr.s_addr = INADDR_ANY;
-	sock_addr.sin_port = SDL_SwapBE16(port);
-
-	/* Bind the socket for listening */
-	if ( bind(sock->channel, (struct sockaddr *)&sock_addr,
-			sizeof(sock_addr)) == SOCKET_ERROR ) {
-		SDLNet_SetError("Couldn't bind to local port");
-		goto error_return;
-	}
-
-	/* Get the bound address and port */
-	sock_len = sizeof(sock_addr);
-	if ( getsockname(sock->channel, (struct sockaddr *)&sock_addr, &sock_len) < 0 ) {
-perror("getsockname");
-		SDLNet_SetError("Couldn't get socket address");
-		goto error_return;
-	}
-
-	/* Fill in the channel host address */
-	sock->address.host = sock_addr.sin_addr.s_addr;
-	sock->address.port = sock_addr.sin_port;
-
-#ifdef SO_BROADCAST
-	/* Allow LAN broadcasts with the socket */
-	{ int yes = 1;
-		setsockopt(sock->channel, SOL_SOCKET, SO_BROADCAST, (char*)&yes, sizeof(yes));
-	}
-#endif
-#ifdef IP_ADD_MEMBERSHIP
-	/* Receive LAN multicast packets on 224.0.0.1
-	   This automatically works on Mac OS X, Linux and BSD, but needs
-	   this code on Windows.
-	*/
-	/* A good description of multicast can be found here:
-		http://www.docs.hp.com/en/B2355-90136/ch05s05.html
-	*/
-	/* FIXME: Add support for joining arbitrary groups to the API */
-	{
-		struct ip_mreq	g;
-
-		g.imr_multiaddr.s_addr = inet_addr("224.0.0.1");
-		g.imr_interface.s_addr = INADDR_ANY;
-		setsockopt(sock->channel, IPPROTO_IP, IP_ADD_MEMBERSHIP,
-			   (char*)&g, sizeof(g));
-	}
-#endif
-
-	/* The socket is ready */
-	
-	return(sock);
-
-error_return:
-	SDLNet_UDP_Close(sock);
-	
-	return(NULL);
-}
-
-void SDLNet_UDP_SetPacketLoss(UDPsocket sock, int percent)
-{
-	/* FIXME: We may want this behavior to be reproducible
-		  but there isn't a portable reentrant random
-		  number generator with good randomness.
-	*/
-	srandom(SDL_GetTicks());
-
-	if (percent < 0) {
-		percent = 0;
-	} else if (percent > 100) {
-		percent = 100;
-	}
-	sock->packetloss = percent;
-}
-
-/* Verify that the channel is in the valid range */
-static int ValidChannel(int channel)
-{
-	if ( (channel < 0) || (channel >= SDLNET_MAX_UDPCHANNELS) ) {
-		SDLNet_SetError("Invalid channel");
-		return(0);
-	}
-	return(1);
-}
-
-/* Bind the address 'address' to the requested channel on the UDP socket.
-   If the channel is -1, then the first unbound channel will be bound with
-   the given address as it's primary address.
-   If the channel is already bound, this new address will be added to the
-   list of valid source addresses for packets arriving on the channel.
-   If the channel is not already bound, then the address becomes the primary
-   address, to which all outbound packets on the channel are sent.
-   This function returns the channel which was bound, or -1 on error.
-*/
-int SDLNet_UDP_Bind(UDPsocket sock, int channel, const IPaddress *address)
-{
-	struct UDP_channel *binding;
-
-	if ( sock == NULL ) {
-		SDLNet_SetError("Passed a NULL socket");
-		return(-1);
-	}
-
-	if ( channel == -1 ) {
-		for ( channel=0; channel < SDLNET_MAX_UDPCHANNELS; ++channel ) {
-			binding = &sock->binding[channel];
-			if ( binding->numbound < SDLNET_MAX_UDPADDRESSES ) {
-				break;
-			}
-		}
-	} else {
-		if ( ! ValidChannel(channel) ) {
-			return(-1);
-		}
-		binding = &sock->binding[channel];
-	}
-	if ( binding->numbound == SDLNET_MAX_UDPADDRESSES ) {
-		SDLNet_SetError("No room for new addresses");
-		return(-1);
-	}
-	binding->address[binding->numbound++] = *address;
-	return(channel);
-}
-
-/* Unbind all addresses from the given channel */
-void SDLNet_UDP_Unbind(UDPsocket sock, int channel)
-{
-	if ( (channel >= 0) && (channel < SDLNET_MAX_UDPCHANNELS) ) {
-		sock->binding[channel].numbound = 0;
-	}
-}
-
-/* Get the primary IP address of the remote system associated with the
-   socket and channel.
-   If the channel is not bound, this function returns NULL.
- */
-IPaddress *SDLNet_UDP_GetPeerAddress(UDPsocket sock, int channel)
-{
-	IPaddress *address;
-
-	address = NULL;
-	switch (channel) {
-		case -1:
-			/* Return the actual address of the socket */
-			address = &sock->address;
-			break;
-		default:
-			/* Return the address of the bound channel */
-			if ( ValidChannel(channel) &&
-				(sock->binding[channel].numbound > 0) ) {
-				address = &sock->binding[channel].address[0];
-			}
-			break;
-	}
-	return(address);
-}
-
-/* Send a vector of packets to the the channels specified within the packet.
-   If the channel specified in the packet is -1, the packet will be sent to
-   the address in the 'src' member of the packet.
-   Each packet will be updated with the status of the packet after it has 
-   been sent, -1 if the packet send failed.
-   This function returns the number of packets sent.
-*/
-int SDLNet_UDP_SendV(UDPsocket sock, UDPpacket **packets, int npackets)
-{
-	int numsent, i, j;
-	struct UDP_channel *binding;
-	int status;
-	int sock_len;
-	struct sockaddr_in sock_addr;
-
-	if ( sock == NULL ) {
-		SDLNet_SetError("Passed a NULL socket");
-		return(0);
-	}
-
-	/* Set up the variables to send packets */
-	sock_len = sizeof(sock_addr);
-
-	numsent = 0;
-	for ( i=0; i<npackets; ++i ) 
-	{
-		/* Simulate packet loss, if desired */
-		if (sock->packetloss) {
-			if ((random()%100) <= sock->packetloss) {
-				packets[i]->status = packets[i]->len;
-				++numsent;
-				continue;
-			}
-		}
-
-		/* if channel is < 0, then use channel specified in sock */
-		
-		if ( packets[i]->channel < 0 ) 
-		{
-			sock_addr.sin_addr.s_addr = packets[i]->address.host;
-			sock_addr.sin_port = packets[i]->address.port;
-			sock_addr.sin_family = AF_INET;
-			status = sendto(sock->channel, 
-					packets[i]->data, packets[i]->len, 0,
-					(struct sockaddr *)&sock_addr,sock_len);
-			if ( status >= 0 )
-			{
-				packets[i]->status = status;
-				++numsent;
-			}
-		}
-		else 
-		{
-			/* Send to each of the bound addresses on the channel */
-#ifdef DEBUG_NET
-			printf("SDLNet_UDP_SendV sending packet to channel = %d\n", packets[i]->channel );
-#endif
-			
-			binding = &sock->binding[packets[i]->channel];
-			
-			for ( j=binding->numbound-1; j>=0; --j ) 
-			{
-				sock_addr.sin_addr.s_addr = binding->address[j].host;
-				sock_addr.sin_port = binding->address[j].port;
-				sock_addr.sin_family = AF_INET;
-				status = sendto(sock->channel, 
-						packets[i]->data, packets[i]->len, 0,
-						(struct sockaddr *)&sock_addr,sock_len);
-				if ( status >= 0 )
-				{
-					packets[i]->status = status;
-					++numsent;
-				}
-			}
-		}
-	}
-	
-	return(numsent);
-}
-
-int SDLNet_UDP_Send(UDPsocket sock, int channel, UDPpacket *packet)
-{
-	/* This is silly, but... */
-	packet->channel = channel;
-	return(SDLNet_UDP_SendV(sock, &packet, 1));
-}
-
-/* Returns true if a socket is has data available for reading right now */
-static int SocketReady(SOCKET sock)
-{
-	int retval = 0;
-	struct timeval tv;
-	fd_set mask;
-
-	/* Check the file descriptors for available data */
-	do {
-		SDLNet_SetLastError(0);
-
-		/* Set up the mask of file descriptors */
-		FD_ZERO(&mask);
-		FD_SET(sock, &mask);
-
-		/* Set up the timeout */
-		tv.tv_sec = 0;
-		tv.tv_usec = 0;
-
-		/* Look! */
-		retval = select(sock+1, &mask, NULL, NULL, &tv);
-	} while ( SDLNet_GetLastError() == EINTR );
-
-	return(retval == 1);
-}
-
-/* Receive a vector of pending packets from the UDP socket.
-   The returned packets contain the source address and the channel they arrived
-   on.  If they did not arrive on a bound channel, the the channel will be set
-   to -1.
-   This function returns the number of packets read from the network, or -1
-   on error.  This function does not block, so can return 0 packets pending.
-*/
-extern int SDLNet_UDP_RecvV(UDPsocket sock, UDPpacket **packets)
-{
-	int numrecv, i, j;
-	struct UDP_channel *binding;
-	socklen_t sock_len;
-	struct sockaddr_in sock_addr;
-
-	if ( sock == NULL ) {
-		return(0);
-	}
-
-	numrecv = 0;
-	while ( packets[numrecv] && SocketReady(sock->channel) ) 
-	{
-		UDPpacket *packet;
-
-		packet = packets[numrecv];
-		
-		sock_len = sizeof(sock_addr);
-		packet->status = recvfrom(sock->channel,
-				packet->data, packet->maxlen, 0,
-				(struct sockaddr *)&sock_addr,
-						&sock_len);
-		if ( packet->status >= 0 ) {
-			packet->len = packet->status;
-			packet->address.host = sock_addr.sin_addr.s_addr;
-			packet->address.port = sock_addr.sin_port;
-			packet->channel = -1;
-			
-			for (i=(SDLNET_MAX_UDPCHANNELS-1); i>=0; --i ) 
-			{
-				binding = &sock->binding[i];
-				
-				for ( j=binding->numbound-1; j>=0; --j ) 
-				{
-					if ( (packet->address.host == binding->address[j].host) &&
-					     (packet->address.port == binding->address[j].port) ) 
-					{
-						packet->channel = i;
-						goto foundit; /* break twice */
-					}
-				}
-			}
-foundit:
-			++numrecv;
-		} 
-		
-		else 
-		{
-			packet->len = 0;
-		}
-	}
-	
-	sock->ready = 0;
-	
-	return(numrecv);
-}
-
-/* Receive a single packet from the UDP socket.
-   The returned packet contains the source address and the channel it arrived
-   on.  If it did not arrive on a bound channel, the the channel will be set
-   to -1.
-   This function returns the number of packets read from the network, or -1
-   on error.  This function does not block, so can return 0 packets pending.
-*/
-int SDLNet_UDP_Recv(UDPsocket sock, UDPpacket *packet)
-{
-	UDPpacket *packets[2];
-
-	/* Receive a packet array of 1 */
-	packets[0] = packet;
-	packets[1] = NULL;
-	return(SDLNet_UDP_RecvV(sock, packets));
-}
-
-/* Close a UDP network socket */
-extern void SDLNet_UDP_Close(UDPsocket sock)
-{
-	if ( sock != NULL ) 
-	{
-		if ( sock->channel != INVALID_SOCKET ) 
-		{
-			closesocket(sock->channel);
-		}
-		
-		free(sock);
-	}
-}
-

libs/SDL_net/SDLnetselect.c

@@ -1,163 +0,0 @@
-/*
-  SDL_net:  An example cross-platform network library for use with SDL
-  Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
-
-  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.
-*/
-
-/* $Id$ */
-
-#include "SDLnetsys.h"
-#include "SDL_net.h"
-
-/* The select() API for network sockets */
-
-struct SDLNet_Socket {
-	int ready;
-	SOCKET channel;
-};
-
-struct _SDLNet_SocketSet {
-	int numsockets;
-	int maxsockets;
-	struct SDLNet_Socket **sockets;
-};
-
-/* Allocate a socket set for use with SDLNet_CheckSockets() 
-   This returns a socket set for up to 'maxsockets' sockets, or NULL if 
-   the function ran out of memory. 
- */
-SDLNet_SocketSet SDLNet_AllocSocketSet(int maxsockets)
-{
-	struct _SDLNet_SocketSet *set;
-	int i;
-
-	set = (struct _SDLNet_SocketSet *)malloc(sizeof(*set));
-	if ( set != NULL ) {
-		set->numsockets = 0;
-		set->maxsockets = maxsockets;
-		set->sockets = (struct SDLNet_Socket **)malloc
-					(maxsockets*sizeof(*set->sockets));
-		if ( set->sockets != NULL ) {
-			for ( i=0; i<maxsockets; ++i ) {
-				set->sockets[i] = NULL;
-			}
-		} else {
-			free(set);
-			set = NULL;
-		}
-	}
-	return(set);
-}
-
-/* Add a socket to a set of sockets to be checked for available data */
-int SDLNet_AddSocket(SDLNet_SocketSet set, SDLNet_GenericSocket sock)
-{
-	if ( sock != NULL ) {
-		if ( set->numsockets == set->maxsockets ) {
-			SDLNet_SetError("socketset is full");
-			return(-1);
-		}
-		set->sockets[set->numsockets++] = (struct SDLNet_Socket *)sock;
-	}
-	return(set->numsockets);
-}
-
-/* Remove a socket from a set of sockets to be checked for available data */
-int SDLNet_DelSocket(SDLNet_SocketSet set, SDLNet_GenericSocket sock)
-{
-	int i;
-
-	if ( sock != NULL ) {
-		for ( i=0; i<set->numsockets; ++i ) {
-			if ( set->sockets[i] == (struct SDLNet_Socket *)sock ) {
-				break;
-			}
-		}
-		if ( i == set->numsockets ) {
-			SDLNet_SetError("socket not found in socketset");
-			return(-1);
-		}
-		--set->numsockets;
-		for ( ; i<set->numsockets; ++i ) {
-			set->sockets[i] = set->sockets[i+1];
-		}
-	}
-	return(set->numsockets);
-}
-
-/* This function checks to see if data is available for reading on the
-   given set of sockets.  If 'timeout' is 0, it performs a quick poll,
-   otherwise the function returns when either data is available for
-   reading, or the timeout in milliseconds has elapsed, which ever occurs
-   first.  This function returns the number of sockets ready for reading,
-   or -1 if there was an error with the select() system call.
-*/
-int SDLNet_CheckSockets(SDLNet_SocketSet set, Uint32 timeout)
-{
-	int i;
-	SOCKET maxfd;
-	int retval;
-	struct timeval tv;
-	fd_set mask;
-
-	/* Find the largest file descriptor */
-	maxfd = 0;
-	for ( i=set->numsockets-1; i>=0; --i ) {
-		if ( set->sockets[i]->channel > maxfd ) {
-			maxfd = set->sockets[i]->channel;
-		}
-	}
-
-	/* Check the file descriptors for available data */
-	do {
-		SDLNet_SetLastError(0);
-
-		/* Set up the mask of file descriptors */
-		FD_ZERO(&mask);
-		for ( i=set->numsockets-1; i>=0; --i ) {
-			FD_SET(set->sockets[i]->channel, &mask);
-		}
-
-		/* Set up the timeout */
-		tv.tv_sec = timeout/1000;
-		tv.tv_usec = (timeout%1000)*1000;
-
-		/* Look! */
-		retval = select(maxfd+1, &mask, NULL, NULL, &tv);
-	} while ( SDLNet_GetLastError() == EINTR );
-
-	/* Mark all file descriptors ready that have data available */
-	if ( retval > 0 ) {
-		for ( i=set->numsockets-1; i>=0; --i ) {
-			if ( FD_ISSET(set->sockets[i]->channel, &mask) ) {
-				set->sockets[i]->ready = 1;
-			}
-		}
-	}
-	return(retval);
-}
- 
-/* Free a set of sockets allocated by SDL_NetAllocSocketSet() */
-extern void SDLNet_FreeSocketSet(SDLNet_SocketSet set)
-{
-	if ( set ) {
-		free(set->sockets);
-		free(set);
-	}
-}
-

libs/SDL_net/SDLnetsys.h

@@ -1,94 +0,0 @@
-/*
-  SDL_net:  An example cross-platform network library for use with SDL
-  Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
-
-  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.
-*/
-
-/* $Id$ */
-
-/* Include normal system headers */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef _WIN32_WCE
-#include <errno.h>
-#endif
-
-/* Include system network headers */
-#if defined(__WIN32__) || defined(WIN32)
-#define __USE_W32_SOCKETS
-#ifdef _WIN64
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <winsock.h>
-/* NOTE: windows socklen_t is signed
- * and is defined only for winsock2. */
-typedef int socklen_t;
-#endif /* W64 */
-#include <iphlpapi.h>
-#else /* UNIX */
-#include <sys/types.h>
-#ifdef __FreeBSD__
-#include <sys/socket.h>
-#endif
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <netinet/in.h>
-#ifndef __BEOS__
-#include <arpa/inet.h>
-#endif
-#ifdef linux /* FIXME: what other platforms have this? */
-#include <netinet/tcp.h>
-#endif
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netdb.h>
-#endif /* WIN32 */
-
-/* FIXME: What platforms need this? */
-#if 0
-typedef Uint32 socklen_t;
-#endif
-
-/* System-dependent definitions */
-#ifndef __USE_W32_SOCKETS
-#ifdef __OS2__
-#define closesocket     soclose
-#else  /* !__OS2__ */
-#define closesocket	close
-#endif /* __OS2__ */
-#define SOCKET	int
-#define INVALID_SOCKET	-1
-#define SOCKET_ERROR	-1
-#endif /* __USE_W32_SOCKETS */
-
-#ifdef __USE_W32_SOCKETS
-#define SDLNet_GetLastError WSAGetLastError
-#define SDLNet_SetLastError WSASetLastError
-#ifndef EINTR
-#define EINTR WSAEINTR
-#endif
-#else
-int SDLNet_GetLastError(void);
-void SDLNet_SetLastError(int err);
-#endif
-

libs/SDL_net/makefile

@@ -1,37 +0,0 @@
-#config
-INCLUDES=
-CFLAGS+=$(addprefix -I,$(INCLUDES))
-LIB=
-
-#source
-SRC=$(wildcard *.c)
-
-#objects
-OBJDIR=obj
-OBJ=$(addprefix $(OBJDIR)/,$(SRC:.c=.o))
-
-#output
-OUTDIR=out
-OUT=$(addprefix $(OUTDIR)/,libSDL_net.a)
-
-#targets
-all: $(OBJ) $(OUT)
-	ar -crs $(OUT) $(OBJ)
-
-$(OBJ): | $(OBJDIR)
-
-$(OUT): | $(OUTDIR)
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-$(OUTDIR):
-	mkdir $(OUTDIR)
-
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all

makefile

@@ -0,0 +1,23 @@
+#for use on Windows:
+
+#MKDIR=mkdir
+#RM=del /y
+
+CXXFLAGS+=-static-libgcc -static-libstdc++
+
+export
+
+OUTDIR=out
+
+all: $(OUTDIR)
+	$(MAKE) -C utils
+	$(MAKE) -C mapgen
+	$(MAKE) -C src
+
+$(OUTDIR):
+	mkdir $(OUTDIR)
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all

mapgen/makefile

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

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

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

rsc/config.cfg

@@ -1,19 +0,0 @@
-#configuration of the program
-server.host = 127.0.0.1
-server.port = 2000
-screen.w = 800
-screen.h = 600
-screen.f = false
-
-#directories
-fonts = rsc/graphics/fonts
-logos = rsc/graphics/logos
-sprites = rsc/graphics/sprites
-tilesets = rsc/graphics/tilesets
-interface = rsc/graphics/interface
-
-#debugging
-debug = true
-avatar = elliot2.bmp
-handle = UserName
-servername = foobar

server/client_data.hpp

@@ -1,32 +0,0 @@
-#ifndef CLIENTDATA_HPP_
-#define CLIENTDATA_HPP_
-
-#include "vector2.hpp"
-
-#include <string>
-
-struct ClientData {
-	ClientData() = default;
-	ClientData(int ID, int ch, std::string h, std::string a) {
-		playerID = ID;
-		channel = ch;
-		handle = h;
-		avatar = a;
-	}
-	void Update(double delta) {
-		position += motion * delta;
-	}
-
-	int playerID = -1;
-	int channel = -1;
-	Vector2 position;
-	Vector2 motion;
-	std::string handle;
-	std::string avatar;
-	enum class Command {
-		NORMAL,
-		CHANGED,
-	}command = Command::NORMAL;
-};
-
-#endif

server/main.cpp

@@ -1,26 +0,0 @@
-#include "server_application.hpp"
-
-#include <stdexcept>
-#include <iostream>
-
-using namespace std;
-
-int main(int, char**) {
-#ifdef DEBUG
-	cout << "Beginning server" << endl;
-#endif
-	try {
-		ServerApplication app;
-		app.Init();
-		app.Proc();
-		app.Quit();
-	}
-	catch(exception& e) {
-		cerr << "Fatal error: " << e.what() << endl;
-		return 1;
-	}
-#ifdef DEBUG
-	cout << "Clean exit" << endl;
-#endif
-	return 0;
-}

server/makefile

@@ -1,41 +0,0 @@
-#config
-INCLUDES=../common
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-LIB=../common/out/common.a -lmingw32 -lSDL_net -lSDLmain -lSDL -lwsock32 -liphlpapi
-
-#source
-SRC=$(filter-out unit.cpp main.cpp, $(wildcard *.cpp))
-
-#objects
-OBJDIR=obj
-OBJ=$(addprefix $(OBJDIR)/,$(SRC:.cpp=.o))
-
-#output
-OUTDIR=out
-
-#targets
-all: server unit
-
-server: $(OBJ) $(OUT)
-	$(CXX) $(CXXFLAGS) -o $(OUTDIR)/$@ main.cpp $(OBJ) $(LIB)
-
-unit: $(OBJ) $(OUT)
-	$(CXX) $(CXXFLAGS) -o $(OUTDIR)/$@ unit.cpp $(OBJ) $(LIB)
-
-$(OBJ): | $(OBJDIR)
-
-$(OUT): | $(OUTDIR)
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-$(OUTDIR):
-	mkdir $(OUTDIR)
-
-$(OBJDIR)/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all

server/server_application.cpp

@@ -1,185 +0,0 @@
-#include "server_application.hpp"
-
-#include <stdexcept>
-#include <iostream>
-
-using namespace std;
-
-void ServerApplication::Init() {
-	if (SDLNet_Init()) {
-		throw(runtime_error("Failed to initialize SDL_net"));
-	}
-	configUtil.Load("config.cfg");
-	netUtil.Open(configUtil.Integer("server.port"), sizeof(PacketData));
-	running = true;
-}
-
-void ServerApplication::Proc() {
-	while(running) {
-		//handle input
-		while(netUtil.Receive()) {
-			PacketData packet;
-			memcpy(reinterpret_cast<void*>(&packet), netUtil.GetInData(), sizeof(PacketData));
-			switch(packet.type) {
-//				case PacketList::NONE:
-//					//
-//				break;
-				case PacketList::PING:
-					Ping(&packet);
-				break;
-//				case PacketList::PONG:
-//					//
-//				break;
-				case PacketList::JOINREQUEST:
-					JoinRequest(&packet);
-				break;
-//				case PacketList::JOINCONFIRM:
-//					//
-//				break;
-				case PacketList::DISCONNECT:
-					Disconnect(packet.disconnect.playerID);
-				break;
-//				case PacketList::SYNCHRONIZE:
-//					//
-//				break;
-//				case PacketList::NEWPLAYER:
-//					//
-//				break;
-//				case PacketList::DELETEPLAYER:
-//					//
-//				break;
-				case PacketList::MOVEMENT:
-					Movement(&packet);
-				break;
-			}
-		}
-		//update the world
-//TODO	Delta::Calculate();
-//		for (auto it : clientMap) {
-//			it.second.Update(Delta::GetTime());
-//		}
-
-		//handle output...
-		//TODO...
-
-		SDL_Delay(10);
-	}
-}
-
-void ServerApplication::Quit() {
-	netUtil.Close();
-	SDLNet_Quit();
-}
-
-//-------------------------
-//network commands
-//-------------------------
-
-void ServerApplication::Ping(PacketData* packet) {
-	//respond to pings with the server name
-	if (!packet) {
-		throw(runtime_error("Ping() received null"));
-	}
-	packet->type = PacketList::PONG;
-	snprintf(packet->pong.metadata,PACKET_STRING_SIZE, "%s",configUtil.CString("servername"));
-	netUtil.Send(&netUtil.GetInPacket()->address, reinterpret_cast<void*>(packet), sizeof(PacketData));
-}
-
-void ServerApplication::JoinRequest(PacketData* packet) {
-	if (!packet || clientMap.size() >= maxClients) {
-		//rejection
-		return;
-	}
-	//add the player
-	int playerID = uniqueIndex++;
-	clientMap[playerID].playerID = playerID;
-	clientMap[playerID].channel = netUtil.Bind(&netUtil.GetInPacket()->address, -1);
-	clientMap[playerID].handle = packet->joinRequest.handle;
-	clientMap[playerID].avatar = packet->joinRequest.avatar;
-
-	//debug
-#ifdef DEBUG
-	cout << "New player:" << endl;
-	cout << "\tplayerID: " << clientMap[playerID].playerID << endl;
-	cout << "\tchannel: " << clientMap[playerID].channel << endl;
-	cout << "\thandle: " << clientMap[playerID].handle << endl;
-	cout << "\tavatar: " << clientMap[playerID].avatar << endl;
-#else
-	cout << "New player: " << playerID << endl;
-#endif
-
-	//join confirm
-	PacketData p;
-	p.type = PacketList::JOINCONFIRM;
-	p.joinConfirm.playerID = clientMap[playerID].playerID;
-	netUtil.Send(clientMap[playerID].channel, &p, sizeof(PacketData));
-
-	//send it out to the clients
-	NewClientData(playerID);
-
-#ifdef DEBUG
-	cout << "current players: " << clientMap.size() << endl;
-#endif
-}
-
-void ServerApplication::Disconnect(int playerID) {
-	if (clientMap.find(playerID) == clientMap.end()) {
-		return;
-	}
-	cout << "disconnecting: " << playerID << endl;
-
-	//delete the player from all clients
-	PacketData p;
-	p.type = PacketList::DELETEPLAYER;
-	p.deletePlayer.playerID = playerID;
-
-	netUtil.SendAll(&p, sizeof(PacketData));
-
-	//remove the player from the server
-	netUtil.Unbind(clientMap[playerID].channel);
-	clientMap.erase(playerID);
-
-#ifdef DEBUG
-	cout << "current players: " << clientMap.size() << endl;
-#endif
-}
-
-void ServerApplication::Movement(PacketData* packet) {
-	if (!packet) {
-		throw(runtime_error("Movement() received null"));
-	}
-	clientMap[packet->movement.playerID].position = packet->movement.position;
-	clientMap[packet->movement.playerID].motion = packet->movement.motion;
-	//simple relay
-	//TODO: SendClientData(packet->movement.playerID);
-	for (auto it : clientMap) {
-		netUtil.Send(it.second.channel, packet, sizeof(PacketData));
-	}
-}
-
-void ServerApplication::NewClientData(int playerID) {
-	if (clientMap.find(playerID) == clientMap.end()) {
-		throw(runtime_error("NewClientData() Failed to find the client"));
-	}
-	//create the packet to send
-	PacketData p;
-	p.type = PacketList::NEWPLAYER;
-	p.newPlayer.playerID = clientMap[playerID].playerID;
-	snprintf(p.newPlayer.handle, PACKET_STRING_SIZE, "%s", clientMap[playerID].handle.c_str());
-	snprintf(p.newPlayer.avatar, PACKET_STRING_SIZE, "%s", clientMap[playerID].avatar.c_str());
-	p.newPlayer.position = clientMap[playerID].position;
-	p.newPlayer.motion = clientMap[playerID].motion;
-
-	//send the packet
-	for (auto it : clientMap) {
-		netUtil.Send(it.second.channel, &p, sizeof(PacketData));
-	}
-}
-
-void ServerApplication::SendClientData(int playerID) {
-	//relay a client's data
-}
-
-void ServerApplication::SynchronizeClient(int playerID) {
-	//send all server data to a specific client
-}

server/server_application.hpp

@@ -1,44 +0,0 @@
-#ifndef SERVERAPPLICATION_HPP_
-#define SERVERAPPLICATION_HPP_
-
-#include "client_data.hpp"
-
-#include "packet_list.hpp"
-#include "config_utility.hpp"
-#include "udp_network_utility.hpp"
-
-#include <map>
-#include <string>
-
-class ServerApplication {
-public:
-	ServerApplication() = default;
-	~ServerApplication() = default;
-
-	void Init();
-	void Proc();
-	void Quit();
-
-private:
-	//network commands
-	void Ping(PacketData*);
-	void JoinRequest(PacketData*);
-	void Disconnect(int playerID);
-	void Movement(PacketData*);
-
-	void NewClientData(int playerID);
-	void SendClientData(int playerID);
-	void SynchronizeClient(int playerID);
-
-	//globals
-	ConfigUtility configUtil;
-	UDPNetworkUtility netUtil;
-
-	//members
-	bool running = false;
-	std::map<int, ClientData> clientMap;
-	int maxClients = SDLNET_MAX_UDPCHANNELS;
-	int uniqueIndex = 0;
-};
-
-#endif

server/unit.cpp

@@ -1,26 +0,0 @@
-#include "udp_network_utility.hpp"
-
-#include "SDL_net/SDL_net.h"
-
-#include <iostream>
-#include <string>
-
-using namespace std;
-
-int main(int, char**) {
-	if (SDLNet_Init()) {
-		cerr << "Failed to init SDL_net" << endl;
-		return -1;
-	}
-	UDPNetworkUtility netUtil;
-
-	netUtil.Open(0, 512);
-
-	string s = "Hello world";
-	netUtil.Send("127.0.0.1", 2000, (void*)s.c_str(), s.length());
-
-	netUtil.Close();
-
-	SDLNet_Quit();
-	return 0;
-}

src/application.cpp

@@ -0,0 +1,110 @@
+/* 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 "application.hpp"
+
+#include <stdexcept>
+#include <chrono>
+#include <sstream>
+
+//-------------------------
+//Scene headers
+//-------------------------
+
+//Add the custom scene headers here
+#include "shell_scene.hpp"
+
+//-------------------------
+//Public access members
+//-------------------------
+
+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(800, 600, 0, SDL_HWSURFACE|SDL_DOUBLEBUF);
+}
+
+void Application::Proc() {
+	LoadScene(SceneList::FIRST);
+
+	//prepare the time system
+	typedef std::chrono::steady_clock Clock;
+
+	std::chrono::duration<int, std::milli> delta(16);
+	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()) / std::chrono::duration<int, std::milli>::period::den);
+			simTime += delta;
+		}
+
+		//draw the game to the screen
+		activeScene->RenderFrame();
+	}
+
+	UnloadScene();
+}
+
+void Application::Quit() {
+	SDL_Quit();
+}
+
+//-------------------------
+//Private access members
+//-------------------------
+
+void Application::LoadScene(SceneList sceneIndex) {
+	UnloadScene();
+	switch(sceneIndex) {
+		//add scene creation calls here
+		case SceneList::FIRST:
+		case SceneList::SHELL:
+			activeScene = new ShellScene();
+		break;
+		default: {
+			std::ostringstream msg;
+			msg << "Failed to recognize the scene index: ";
+			msg << sceneIndex;
+			throw(std::logic_error(msg.str()));
+		}
+	}
+}
+
+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,28 +19,27 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef RASTERFONT_HPP_
-#define RASTERFONT_HPP_
+#ifndef APPLICATION_HPP_
+#define APPLICATION_HPP_
 
-#include "image.hpp"
+#include "scene_list.hpp"
+#include "base_scene.hpp"
 
-#include <string>
-
-class RasterFont {
+class Application {
 public:
-	RasterFont() = default;
-	RasterFont(SDL_Surface* p);
-	~RasterFont() = default;
+	Application() = default;
+	~Application() = default;
 
-	void DrawStringTo(std::string, SDL_Surface* const, Sint16 x, Sint16 y);
+	void Init(int argc, char** argv);
+	void Proc();
+	void Quit();
 
-	//Accessors and Mutators
-	SDL_Surface* SetSurface(SDL_Surface*);
-	SDL_Surface* GetSurface() const { return image.GetSurface(); }
-	Uint16 GetCharW() { return image.GetClipW(); }
-	Uint16 GetCharH() { return image.GetClipH(); }
 private:
-	Image image;
+	//Private access members
+	void LoadScene(SceneList sceneIndex);
+	void UnloadScene();
+
+	BaseScene* activeScene = nullptr;
 };
 
 #endif

src/base_scene.cpp

@@ -1,4 +1,4 @@
-/* Copyright: (c) Kayne Ruse 2013
+/* Copyright: (c) Kayne Ruse 2013, 2014
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -34,7 +34,7 @@ SDL_Surface* BaseScene::screen = nullptr;
 //-------------------------
 
 BaseScene::BaseScene() {
-	nextScene = SceneList::CONTINUE;
+	//
 }
 
 BaseScene::~BaseScene() {

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
@@ -28,18 +28,18 @@
 
 class BaseScene {
 public:
-	/* Public access members */
+	//Public access members
 	BaseScene();
 	virtual ~BaseScene();
 
-	/* Program control */
+	//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 */
+	//Frame loop
 	virtual void RunFrame(double delta);
 	virtual void RenderFrame();
 
@@ -50,7 +50,7 @@ protected:
 	virtual void FrameEnd() {}
 	virtual void Render(SDL_Surface* const screen) {}
 
-	/* Event handlers */
+	//Event handlers
 	virtual void QuitEvent() { SetNextScene(SceneList::QUIT); }
 	virtual void MouseMotion(SDL_MouseMotionEvent const&) {}
 	virtual void MouseButtonDown(SDL_MouseButtonEvent const&) {}
@@ -68,7 +68,7 @@ protected:
 
 private:
 	static SDL_Surface* screen;
-	SceneList nextScene;
+	SceneList nextScene = SceneList::CONTINUE;
 };
 
 #endif

src/main.cpp

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

src/makefile

@@ -0,0 +1,37 @@
+#config
+INCLUDES+=. ../utils ../mapgen
+LIBS+=../libcommon.a -lmingw32 -lSDLmain -lSDL
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
+
+#source
+CXXSRC=$(wildcard *.cpp)
+
+#objects
+OBJDIR=obj
+OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
+
+#output
+OUTDIR=../out
+OUT=$(addprefix $(OUTDIR)/,shell)
+
+#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 $@ $<
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all

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
@@ -19,8 +19,17 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "frame_rate.hpp"
+#ifndef SCENELIST_HPP_
+#define SCENELIST_HPP_
 
-int FrameRate::frameCount = 0;
-int FrameRate::lastFrameRate = 0;
-FrameRate::Clock::time_point FrameRate::tick = FrameRate::Clock::now();
+enum SceneList {
+	//these are reserved
+	QUIT,
+	CONTINUE,
+	FIRST,
+
+	//custom indexes
+	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,31 +19,38 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef SURFACEMANAGER_HPP_
-#define SURFACEMANAGER_HPP_
+#ifndef SHELLSCENE_HPP_
+#define SHELLSCENE_HPP_
 
-#include "SDL/SDL.h"
+#include "base_scene.hpp"
 
-#include <map>
-#include <string>
+#include "map_generator.hpp"
 
-class SurfaceManager {
+#include "image.hpp"
+
+class ShellScene : public BaseScene {
 public:
-	SurfaceManager() = default;
-	~SurfaceManager() noexcept;
+	//Public access members
+	ShellScene();
+	~ShellScene();
 
-	SDL_Surface* Load(std::string key, std::string fname);
-	SDL_Surface* Reload(std::string key, std::string fname);
-	SDL_Surface* Get(std::string key);
-	SDL_Surface* Set(std::string key, SDL_Surface* ptr);
-	void Free(std::string key);
-	void FreeAll();
+protected:
+	//Frame loop
+	void FrameStart();
+	void Update(double delta);
+	void FrameEnd();
+	void Render(SDL_Surface* const);
 
-	SDL_Surface* operator[](std::string key) { return Get(key); };
-private:
-	SDL_Surface* LoadSurface(std::string key, std::string fname);
-	typedef std::map<std::string, SDL_Surface*> MapType;
-	MapType surfaceMap;
+	//Event handlers
+	void MouseMotion(SDL_MouseMotionEvent const&);
+	void MouseButtonDown(SDL_MouseButtonEvent const&);
+	void MouseButtonUp(SDL_MouseButtonEvent const&);
+	void KeyDown(SDL_KeyboardEvent const&);
+	void KeyUp(SDL_KeyboardEvent const&);
+
+	//members
+	MapGenerator generator;
+	Image image;
 };
 
 #endif

utils/image.cpp

@@ -0,0 +1,145 @@
+/* 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 "image.hpp"
+
+#include <stdexcept>
+#include <sstream>
+
+Image& Image::operator=(Image const& rhs) {
+	//don't screw yourself
+	if (this == &rhs) {
+		return *this;
+	}
+
+	FreeSurface();
+
+	//Copy the other Image's stuff
+	surface = rhs.surface;
+	clip = rhs.clip;
+	local = false;
+}
+
+Image& Image::operator=(Image&& rhs) {
+	//don't screw yourself
+	if (this == &rhs) {
+		return *this;
+	}
+
+	FreeSurface();
+
+	//Steal the other Image's stuff
+	surface = rhs.surface;
+	clip = rhs.clip;
+	local = rhs.local;
+
+	rhs.surface = nullptr;
+	rhs.clip = {0, 0, 0, 0};
+	rhs.local = false;
+}
+
+SDL_Surface* Image::LoadSurface(std::string fname) {
+	FreeSurface();
+	SDL_Surface* p = SDL_LoadBMP(fname.c_str());
+	if (!p) {
+		std::ostringstream os;
+		os << "Failed to load file: " << fname;
+		throw(std::runtime_error(os.str()));
+	}
+	surface = p;
+	clip = {0, 0, (Uint16)surface->w, (Uint16)surface->h};
+	local = true;
+	SetTransparentColor(255, 0, 255); //default
+	return surface;
+}
+
+SDL_Surface* Image::CreateSurface(Uint16 w, Uint16 h) {
+	FreeSurface();
+	Uint32 rmask, gmask, bmask, amask;
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+    rmask = 0xff000000;
+    gmask = 0x00ff0000;
+    bmask = 0x0000ff00;
+    amask = 0x000000ff;
+#else
+    rmask = 0x000000ff;
+    gmask = 0x0000ff00;
+    bmask = 0x00ff0000;
+    amask = 0xff000000;
+#endif
+	SDL_Surface* p = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, 32, rmask, gmask, bmask, amask);
+	if (!p) {
+		throw(std::runtime_error("Failed to create Image surface"));
+	}
+	surface = p;
+	clip = {0, 0, (Uint16)surface->w, (Uint16)surface->h};
+	local = true;
+	SetTransparentColor(255, 0, 255); //default
+	return surface;
+}
+
+SDL_Surface* Image::SetSurface(SDL_Surface* p) {
+	FreeSurface();
+	if (!p) {
+		throw(std::invalid_argument("No surface pointer provided"));
+	}
+	surface = p;
+	clip = {0, 0, (Uint16)surface->w, (Uint16)surface->h};
+	local = false;
+	return surface;
+}
+
+void Image::FreeSurface() {
+	if (local) {
+		SDL_FreeSurface(surface);
+		local = false;
+	}
+	surface = nullptr;
+	clip = {0, 0, 0, 0};
+}
+
+void Image::DrawTo(SDL_Surface* dest, Sint16 x, Sint16 y) {
+	if (!surface) {
+		throw(std::logic_error("No image surface to draw"));
+	}
+	SDL_Rect sclip = clip, dclip = {x,y};
+	SDL_BlitSurface(surface, &sclip, dest, &dclip);
+}
+
+void Image::SetTransparentColor(Uint8 r, Uint8 g, Uint8 b) {
+	if (!surface) {
+		throw(std::logic_error("Failed to set the transparent color"));
+	}
+	if (!local) {
+		throw(std::logic_error("Cannot set the transparent color of a non-local surface"));
+	}
+	SDL_SetColorKey(surface, SDL_SRCCOLORKEY, SDL_MapRGB(surface->format, r, g, b));
+}
+
+void Image::ClearTransparentColor() {
+	if (!surface) {
+		throw(std::logic_error("Failed to clear the transparent color"));
+	}
+	if (!local) {
+		throw(std::logic_error("Cannot clear the transparent color of a non-local surface"));
+	}
+	SDL_SetColorKey(surface, 0, 0);
+}

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
@@ -23,17 +23,26 @@
 #define IMAGE_HPP_
 
 #include "SDL/SDL.h"
+#include <string>
 
 class Image {
 public:
 	Image() = default;
-	Image(SDL_Surface*);
-	Image(SDL_Surface*, SDL_Rect);
-	~Image() = default;
+	Image(Image const& rhs) { *this = rhs; }
+	Image(Image&& rhs) { *this = std::move(rhs); }
+	Image(std::string fname) { LoadSurface(fname); }
+	Image(Uint16 w, Uint16 h) { CreateSurface(w, h); }
+	Image(SDL_Surface* p) { SetSurface(p); }
+	~Image() { FreeSurface(); }
 
+	Image& operator=(Image const&);
+	Image& operator=(Image&&);
+
+	SDL_Surface* LoadSurface(std::string fname);
+	SDL_Surface* CreateSurface(Uint16 w, Uint16 h);
 	SDL_Surface* SetSurface(SDL_Surface*);
-	SDL_Surface* SetSurface(SDL_Surface*, SDL_Rect);
 	SDL_Surface* GetSurface() const { return surface; }
+	void FreeSurface();
 
 	void DrawTo(SDL_Surface* const, Sint16 x, Sint16 y);
 
@@ -50,9 +59,15 @@ public:
 	Sint16 GetClipY() const { return clip.y; }
 	Uint16 GetClipW() const { return clip.w; }
 	Uint16 GetClipH() const { return clip.h; }
+
+	bool GetLocal() const { return local; }
+
+	void SetTransparentColor(Uint8 r, Uint8 g, Uint8 b);
+	void ClearTransparentColor();
 protected:
 	SDL_Surface* surface = nullptr;
 	SDL_Rect clip = {0, 0, 0, 0};
+	bool local = false;
 };
 
 #endif

utils/makefile

@@ -1,18 +1,18 @@
 #config
-INCLUDES=
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-LIB=
+INCLUDES+=.
+LIBS+=
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
-SRC=$(wildcard *.cpp)
+CXXSRC=$(wildcard *.cpp)
 
 #objects
 OBJDIR=obj
-OBJ=$(addprefix $(OBJDIR)/,$(SRC:.cpp=.o))
+OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
 
 #output
-OUTDIR=out
-OUT=$(addprefix $(OUTDIR)/,common.a)
+OUTDIR=..
+OUT=$(addprefix $(OUTDIR)/,libcommon.a)
 
 #targets
 all: $(OBJ) $(OUT)

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,36 +19,27 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#include "image.hpp"
+#include "maths.hpp"
 
-Image::Image(SDL_Surface* p) {
-	SetSurface(p);
+double curve(double x) {
+	return 3.0 * pow(x, 2.0) - 2.0 * pow(x, 3.0);
 }
 
-Image::Image(SDL_Surface* p, SDL_Rect r) {
-	SetSurface(p, r);
+double snap(double x, double base) {
+	//snap to a grid (floating point version)
+	return floor(x / base) * base;
 }
 
-SDL_Surface* Image::SetSurface(SDL_Surface* p) {
-	if (!(surface = p)) {
-		clip = {0, 0, 0, 0};
+int snap(int x, int base) {
+	//snap to a grid (integer devision version)
+	if (x < 0) {
+		++x;
+		return x / base * base - base;
 	}
-	else {
-		clip = {0, 0, (Uint16)surface->w, (Uint16)surface->h};
-	}
-	return surface;
+	return x / base * base;
 }
 
-SDL_Surface* Image::SetSurface(SDL_Surface* const p, SDL_Rect r) {
-	surface = p;
-	clip = r;
-	return surface;
-}
-
-void Image::DrawTo(SDL_Surface* dest, Sint16 x, Sint16 y) {
-	if (!surface) {
-		return;
-	}
-	SDL_Rect sclip = clip, dclip = {x,y};
-	SDL_BlitSurface(surface, &sclip, dest, &dclip);
-}
+double scalarProduct(Vector2 lhs, Vector2 rhs) {
+	//the dot product
+	return lhs.x * rhs.x + lhs.y * rhs.y;
+}

utils/maths.hpp

@@ -0,0 +1,37 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef MATHS_HPP_
+#define MATHS_HPP_
+
+#include "vector2.hpp"
+
+//param: 0 to 1 inclusive
+double curve(double);
+
+//snap x to a grid of base
+double snap(double x, double base);
+int snap(int x, int base);
+
+//vector dot product
+double scalarProduct(Vector2, Vector2);
+
+#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,30 +19,24 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef FRAMERATE_HPP_
-#define FRAMERATE_HPP_
+#ifndef SIMPLERNG_HPP_
+#define SIMPLERNG_HPP_
 
-#include <chrono>
-
-class FrameRate {
+//a simple, stateless, random number generator
+class SimpleRNG {
 public:
-	typedef std::chrono::high_resolution_clock Clock;
+	SimpleRNG() { SetSeed(8891.0); }
+	SimpleRNG(double x) { SetSeed(x); }
+
+	double SetSeed(double s) { return seed = s; }
+	double GetSeed() { return seed; }
+
+	double operator()(double x) {
+		return (x + seed) * 11235.0 + 81321.0;
+	};
 
-	FrameRate() = delete;
-	static int Calculate() {
-		frameCount++;
-		if (Clock::now() - tick >= std::chrono::duration<int>(1)) {
-			lastFrameRate = frameCount;
-			frameCount = 0;
-			tick = Clock::now();
-		}
-		return lastFrameRate;
-	}
-	static int GetFrameRate() { return lastFrameRate; }
 private:
-	static int frameCount;
-	static int lastFrameRate;
-	static Clock::time_point tick;
+	double seed;
 };
 
-#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,50 +22,78 @@
 #ifndef VECTOR2_HPP_
 #define VECTOR2_HPP_
 
+#include <type_traits>
 #include <stdexcept>
 #include <cmath>
 
 class Vector2 {
 public:
-	double x = 0, y = 0;
+	double x, y;
+
 	Vector2() = default;
-	Vector2(double i, double j) {
-		x = i; y = j;
-	}
+	Vector2(double i, double j): x(i), y(j) {};
+	~Vector2() = default;
+	Vector2& operator=(Vector2 const&) = default;
+
 	double Length() const {
 		return sqrt(x*x+y*y);
 	}
 	double SquaredLength() const {
 		return x*x+y*y;
 	}
-
-	double operator[](size_t i) {
-		if (i >= 2)
-			throw(std::runtime_error("Out of range"));
-		return *(&x+i);
+	void Normalize() {
+		double l = Length();
+		x /= l;
+		y /= l;
 	}
 
 	//Arithmetic operators
-	Vector2 operator+(Vector2 v) const { return Vector2(x + v.x, y + v.y); }
-	Vector2 operator-(Vector2 v) const { return Vector2(x - v.x, y - v.y); }
-	Vector2 operator*(Vector2 v) const { return Vector2(x * v.x, y * v.y); }
-	Vector2 operator*(double d) const { return Vector2(x * d, y * d); }
+	Vector2 operator+(Vector2 v) const {
+		Vector2 ret;
+		ret.x = x + v.x;
+		ret.y = y + v.y;
+		return ret;
+	}
+	Vector2 operator-(Vector2 v) const {
+		Vector2 ret;
+		ret.x = x - v.x;
+		ret.y = y - v.y;
+		return ret;
+	}
+	Vector2 operator*(Vector2 v) const {
+		Vector2 ret;
+		ret.x = x * v.x;
+		ret.y = y * v.y;
+		return ret;
+	}
+	Vector2 operator*(double d) const {
+		Vector2 ret;
+		ret.x = x * d;
+		ret.y = y * d;
+		return ret;
+	}
 
 	Vector2 operator/(Vector2 v) {
 		if (!v.x || !v.y)
-			throw(std::runtime_error("Divide by zero"));
-		return Vector2(x / v.x, y / v.y);
+			throw(std::domain_error("Divide by zero"));
+		Vector2 ret;
+		ret.x = x / v.x;
+		ret.y = y / v.y;
+		return ret;
 	}
 	Vector2 operator/(double d) {
 		if (!d)
-			throw(std::runtime_error("Divide by zero"));
-		return Vector2(x / d, y / d);
+			throw(std::domain_error("Divide by zero"));
+		Vector2 ret;
+		ret.x = x / d;
+		ret.y = y / d;
+		return ret;
 	}
 
 	bool operator==(Vector2 v) { return (x == v.x && y == v.y); }
 	bool operator!=(Vector2 v) { return (x != v.x || y != v.y); }
 
-	//templates
+	//member templates (curry the above operators)
 	template<typename T> Vector2 operator+=(T t) { return *this = *this + t; }
 	template<typename T> Vector2 operator-=(T t) { return *this = *this - t; }
 	template<typename T> Vector2 operator*=(T t) { return *this = *this * t; }
@@ -74,4 +102,7 @@ public:
 	template<typename T> bool operator!=(T t) { return (x != t || y != t); }
 };
 
+//This is explicitly a POD
+static_assert(std::is_pod<Vector2>::value, "Vector2 is not a POD");
+
 #endif