From 867a86fd796b1ae410bd1be6b46786fbef802451 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <kayneruse@gmail.com>
Date: Sat, 28 May 2016 13:01:19 +1000
Subject: [PATCH] Fixed Missing #include<functional>

---
 README.md                           |  2 --
 client/entities/barrier_manager.hpp |  1 +
 server/combat/barrier_manager.hpp   |  1 +
 server/combat/combat_instance.hpp   |  2 ++
 todo.txt                            | 39 ++++++++++++++---------------
 5 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index c6da3a6..36d184f 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
-This project is officially cancelled. It's too big, it's taken too much from me, and I can't keep going anymore.
-
 ## Outline
 
 Tortuga is a 2D MMORPG featuring permadeath, with an emphasis on multiplayer cooperation, exploration and customization. The game runs on customizable public and private servers.
diff --git a/client/entities/barrier_manager.hpp b/client/entities/barrier_manager.hpp
index dcbbb27..64ab6f9 100644
--- a/client/entities/barrier_manager.hpp
+++ b/client/entities/barrier_manager.hpp
@@ -23,6 +23,7 @@
 
 #include "base_barrier.hpp"
 
+#include <functional>
 #include <list>
 #include <string>
 
diff --git a/server/combat/barrier_manager.hpp b/server/combat/barrier_manager.hpp
index 497dfdf..c784e36 100644
--- a/server/combat/barrier_manager.hpp
+++ b/server/combat/barrier_manager.hpp
@@ -27,6 +27,7 @@
 #include "sqlite3.h"
 
 #include <algorithm>
+#include <functional>
 #include <list>
 #include <map>
 
diff --git a/server/combat/combat_instance.hpp b/server/combat/combat_instance.hpp
index 99fc48e..c2e94db 100644
--- a/server/combat/combat_instance.hpp
+++ b/server/combat/combat_instance.hpp
@@ -24,6 +24,8 @@
 #include "character_data.hpp"
 #include "creature_data.hpp"
 
+#include <functional>
+
 class CombatInstance {
 public:
 	CombatInstance();
diff --git a/todo.txt b/todo.txt
index f576031..5fc5c6d 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,26 +1,25 @@
 TODO: Resource manager
+TODO: Add the TextureLoader
 TODO: Consistency for bounds names
 TODO: Cross compiler (to replace dead linux PC ;_;)
-TODO: New button graphics
+TODO: New button graphics?
 TODO: New typeface
 TODO: Account passwords (list)
-	* backbone account server OR
-	* social network login OR
-	* ...
-	* salts & hashes
-	* login screen prompting for username & password
-
+TODO: backbone account server OR
+TODO: social network login OR
+TODO: salts & hashes
+TODO: login screen prompting for username & password
 TODO: Features
-	* Make sure login errors are sent to the client
-	* Add the "home" parameter to the server's config file
-	* Waypoints, with positions and trigger zones (collision areas) for doors, monster spawns, etc. (trigger system)
-	* Fix shoddy movement
-	* Remove the big "Shut Down" button (currently broken...)
-	* Make a way for the server owner to control the server directly
-	* The TileSheet class should implement the surface itself
-	* Time delay for requesting region packets
-	* A proper logging system
-	* Fix the const-ness of accessors
-	* Add a screenshot of the game to README.md
-	* joystick/gamepad support
-	* add the tilesheet to the map system
\ No newline at end of file
+TODO: Make sure login errors are sent to the client
+TODO: Add the "home" parameter to the server's config file
+TODO: Fix shoddy movement
+TODO: Better UI system
+TODO: Make a way for the server owner to control the server directly
+TODO: The TileSheet class should implement the surface itself
+TODO: Time delay for requesting region packets
+TODO: A proper logging system
+TODO: Fix the const-ness of accessors
+TODO: Add a screenshot of the game to README.md
+TODO: joystick/gamepad support
+TODO: add the tilesheet to the map system
+TODO: Better collision logic
\ No newline at end of file