killed common, more inventory, other random stuff

27 files changed, 311 insertions, 274 deletions

diff --git a/include/brice.hpp b/include/brice.hpp
index 1c4eccf..96ec25e 100644
--- a/include/brice.hpp
+++ b/include/brice.hpp
@@ -2,7 +2,6 @@
  * @file brice.hpp
  * @brief A system for saving player information.
  */
-
 #ifndef BRICE_H_
 #define BRICE_H_
 
diff --git a/include/color.hpp b/include/color.hpp
new file mode 100644
index 0000000..2c89a1c
--- /dev/null
+++ b/include/color.hpp
@@ -0,0 +1,26 @@
+#ifndef COLOR_HPP_
+#define COLOR_HPP_
+
+/**
+ * Keeps track of an RGBA color.
+ */
+class Color{
+public:
+	float red;   /**< The amount of red, 0-255 or 0.0-1.0 depending on usage */
+	float green; /**< The amount of green */
+	float blue;  /**< The amount of blue */
+	float alpha; /**< Transparency */
+
+	Color(float r = 0, float g = 0, float b = 0, float a = 255)
+		: red(r), green(g), blue(b), alpha(a) {}
+
+	Color operator-(const float& a) {
+		return Color(red - a, green - a, blue - a, alpha);
+	}
+
+	Color operator+(const float& a) {
+		return Color(red + a, green + a, blue + a, alpha);
+	}
+};
+
+#endif // COLOR_HPP_
diff --git a/include/common.hpp b/include/common.hpp
index 1244464..b9be831 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -1,46 +1,9 @@
-#ifndef COMMON_H
-#define COMMON_H
-
 /**
- * @file common.h
- * @brief Common items needed by most other files.
+ * @file common.hpp
+ * @brief Common things needed by all files, in theory.
  */
-
-// standard library includes
-#include <iostream>
-#include <string>
-#include <vector>
-#include <cmath>
-#include <algorithm>
-#include <list>
-#include <iterator>
-
-// alternative windows thread library
-#ifndef __WIN32__
-#include <thread>
-#else
-#include <win32thread.hpp>
-#endif // __WIN32__
-
-// local library includes
-#define GLEW_STATIC
-#include <GL/glew.h>
-
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_opengl.h>
-#include <SDL2/SDL_image.h>
-#include <SDL2/SDL_mixer.h>
-
-#include <shader_utils.hpp>
-
-#define GLM_FORCE_RADIANS
-#include <glm/glm.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtc/type_ptr.hpp>
-#include <glm/gtc/noise.hpp>
-
-// game library includes
-#include <config.hpp>
+#ifndef COMMON_HPP_
+#define COMMON_HPP_
 
 // windows stuff
 #ifdef __WIN32__
@@ -48,128 +11,15 @@ using uint = unsigned int;
 #undef near
 #endif
 
-/**
- * Prints a formatted string to the terminal with file and line number, for debugging
- */
-#define DEBUG_printf(message, ...) DEBUG_prints(__FILE__, __LINE__, message, __VA_ARGS__)
-
-#define coalesce(v1, v2) ((v1 != nullptr) ? v1 : v2)
-
-#include <vector2.hpp>
-
-using vec2 = vector2<float>;
-using dim2 = vector2<int>;
-
-/**
- * A structure for three-dimensional points.
- */
-struct vec3 {
-	float x; /**< The x coordinate */
-	float y; /**< The y coordinate */
-	float z; /**< The z coordinate */
-
-	vec3(float _x = 0.0f, float _y = 0.0f, float _z = 1.0f)
-		: x(_x), y(_y), z(_z) {}
-};
-
-/**
- * This structure contains two sets of coordinates for ray drawing.
- */
-
-typedef struct {
-	vec2 start; /**< The start coordinate of the ray */
-	vec2 end;   /**< The end coordinate of the ray */
-} Ray;
-
-/**
- * Keeps track of an RGBA color.
- */
-class Color{
-public:
-	float red;   /**< The amount of red, 0-255 or 0.0-1.0 depending on usage */
-	float green; /**< The amount of green */
-	float blue;  /**< The amount of blue */
-	float alpha; /**< Transparency */
-
-	Color(float r = 0, float g = 0, float b = 0, float a = 255)
-		: red(r), green(g), blue(b), alpha(a) {}
-
-	Color operator-(const float& a) {
-		return Color(red - a, green - a, blue - a, alpha);
-	}
-
-	Color operator+(const float& a) {
-		return Color(red + a, green + a, blue + a, alpha);
-	}
-};
-
-/**
- * The amount of game ticks that should occur each second.
- */
-constexpr unsigned int TICKS_PER_SEC = 20;
-
-/**
- * The amount of milliseconds it takes for a game tick to fire.
- */
-constexpr float MSEC_PER_TICK = 1000.0f / TICKS_PER_SEC;
-
-/**
- * Separates a string into tokens using the given delimiter.
- *
- * @param  the string to parse
- * @param  the delimiting character
- * @return a vector of the tokens
- */
-std::vector<std::string> StringTokenizer(const std::string& str, char delim);
-
-/**
- * Returns a measurement in HLINEs
- *
- * @param the number of HLINEs, integer or decimal
- * @return the number in HLINEs
- */
-template<typename T>
-inline T HLINES(const T &n)
-{
-	return (static_cast<T>(game::HLINE) * n);
-}
-
-/**
- * A generically-named function to start the random number generator.
- * This currently redirects to the library's default, but allows for
- * a custom generator to be easily implemented.
- */
-#define randInit srand
-
-/**
- * Gets a random number (is a function).
- */
-#define randGet rand
-
 // defines pi for calculations that need it.
 constexpr float PI = 3.1415926535f;
 
-// references the variable in main.cpp, used for drawing with the player
-extern vec2 offset;
-
 /**
- *	Prints a formatted debug message to the console, along with the callee's file and line
- *	number.
+ * Gets millisecond count since epoch.
+ * @return number of milliseconds
  */
-void DEBUG_prints(const char* file, int line, const char *s,...);
-
 unsigned int millis(void);
 
-// reads the names of files in a directory into the given string vector
-int getdir(std::string dir, std::list<std::string>& files);
-
-// reads the given file into a buffer and returns a pointer to the buffer
-std::string readFile(const std::string& path);
-std::vector<std::string> readFileA(const std::string& path);
-
-// aborts the program, printing the given error
-void UserError(std::string reason);
-
 namespace std {
 	template<class T>
 	constexpr const T& clamp(const T& v, const T& lo, const T& hi) {
@@ -177,4 +27,4 @@ namespace std {
 	}
 }
 
-#endif // COMMON_H
+#endif // COMMON_HPP_
diff --git a/include/components.hpp b/include/components.hpp
index e0147b0..449f7c3 100644
--- a/include/components.hpp
+++ b/include/components.hpp
@@ -5,15 +5,18 @@
  * this allows the entity to change stats or skills on the go. This also allows every "object"
  * the be an entity, and it gives the game a much better customizability over xml.
  */
-
 #ifndef COMPONENTS_HPP
 #define COMPONENTS_HPP
 
-#include <entityx/entityx.h>
-#include <common.hpp>
-#include <texture.hpp>
+#include <string>
+#include <vector>
+
 #include <events.hpp>
-#include <atomic>
+#include <random.hpp>
+#include <texture.hpp>
+#include <vector2.hpp>
+
+#include <entityx/entityx.h>
 #include <tinyxml2.h>
 using namespace tinyxml2;
 
@@ -158,7 +161,7 @@ struct SpriteData {
 	vec2 offset_tex;
 	vec2 size_tex;
 
-	uint limb;
+	unsigned int limb;
 };
 
 using Frame = std::vector<std::pair<SpriteData, vec2>>;
diff --git a/include/config.hpp b/include/config.hpp
index e17df24..13596ff 100644
--- a/include/config.hpp
+++ b/include/config.hpp
@@ -71,4 +71,26 @@ namespace game {
 	}
 }
 
+/**
+ * The amount of game ticks that should occur each second.
+ */
+constexpr unsigned int TICKS_PER_SEC = 20;
+
+/**
+ * The amount of milliseconds it takes for a game tick to fire.
+ */
+constexpr float MSEC_PER_TICK = 1000.0f / TICKS_PER_SEC;
+
+/**
+ * Returns a measurement in HLINEs
+ *
+ * @param the number of HLINEs, integer or decimal
+ * @return the number in HLINEs
+ */
+template<typename T>
+inline T HLINES(const T &n)
+{
+	return (static_cast<T>(game::HLINE) * n);
+}
+
 #endif //CONFIG_H
diff --git a/include/debug.hpp b/include/debug.hpp
new file mode 100644
index 0000000..e773a51
--- /dev/null
+++ b/include/debug.hpp
@@ -0,0 +1,19 @@
+/**
+ * @file debug.hpp
+ * @brief Debugging utilities
+ */
+#ifndef DEBUG_HPP_
+#define DEBUG_HPP_
+
+/**
+ * Prints a formatted string to the terminal with file and line number, for debugging
+ */
+#define DEBUG_printf(message, ...) DEBUG_prints(__FILE__, __LINE__, message, __VA_ARGS__)
+
+/**
+ *	Prints a formatted debug message to the console, along with the callee's file and line
+ *	number.
+ */
+void DEBUG_prints(const char* file, int line, const char *s,...);
+
+#endif // DEBUG_HPP_
diff --git a/include/engine.hpp b/include/engine.hpp
index 417522d..fda9980 100644
--- a/include/engine.hpp
+++ b/include/engine.hpp
@@ -6,10 +6,12 @@
 #ifndef ENGINE_HPP_
 #define ENGINE_HPP_
 
+#include <atomic>
+#include <chrono>
+#include <thread>
+
 #include <entityx/entityx.h>
-#include <entityx/deps/Dependencies.h>
 
-#include <texture.hpp>
 #include <components.hpp>
 #include <events.hpp>
 
@@ -63,9 +65,6 @@ public:
 	}
 };
 
-#include <atomic>
-#include <chrono>
-
 class LockableEntityManager : public entityx::EntityManager {
 private:
 	std::atomic_bool locked;
diff --git a/include/error.hpp b/include/error.hpp
new file mode 100644
index 0000000..ef61c91
--- /dev/null
+++ b/include/error.hpp
@@ -0,0 +1,13 @@
+#ifndef ERROR_HPP_
+#define ERROR_HPP_
+
+#include <string>
+#include <iostream>
+
+inline void UserError(const std::string& why)
+{
+	std::cout << "User error: " << why << "!\n";
+	abort();
+}
+
+#endif // ERROR_HPP_
diff --git a/include/events.hpp b/include/events.hpp
index 1f06544..5939c3d 100644
--- a/include/events.hpp
+++ b/include/events.hpp
@@ -8,7 +8,9 @@
 #include <SDL2/SDL.h>
 
 #include <string>
-#include <common.hpp>
+
+#include <config.hpp>
+#include <vector2.hpp>
 
 class World;
 
diff --git a/include/fileio.hpp b/include/fileio.hpp
new file mode 100644
index 0000000..c5e33ec
--- /dev/null
+++ b/include/fileio.hpp
@@ -0,0 +1,15 @@
+#ifndef FILEIO_HPP_
+#define FILEIO_HPP_
+
+#include <string>
+#include <list>
+#include <vector>
+
+// reads the names of files in a directory into the given string vector
+int getdir(std::string dir, std::list<std::string>& files);
+
+// reads the given file into a buffer and returns a pointer to the buffer
+std::string readFile(const std::string& path);
+std::vector<std::string> readFileA(const std::string& path);
+
+#endif // FILEIO_HPP_
diff --git a/include/gametime.hpp b/include/gametime.hpp
index 988533a..e06a0d3 100644
--- a/include/gametime.hpp
+++ b/include/gametime.hpp
@@ -2,7 +2,6 @@
  * @file gametime.hpp
  * @brief Handles time related operations
  */
-
 #ifndef GAMETIME_H_
 #define GAMETIME_H_
 
diff --git a/include/glm.hpp b/include/glm.hpp
new file mode 100644
index 0000000..9fd533f
--- /dev/null
+++ b/include/glm.hpp
@@ -0,0 +1,14 @@
+/**
+ * @file glm.hpp
+ * @brief Includes needed GLM files.
+ */
+#ifndef GLM_HPP_
+#define GLM_HPP_
+
+#define GLM_FORCE_RADIANS
+#include <glm/glm.hpp>
+#include <glm/gtc/matrix_transform.hpp>
+#include <glm/gtc/type_ptr.hpp>
+#include <glm/gtc/noise.hpp>
+
+#endif // GLM_HPP_
diff --git a/include/inventory.hpp b/include/inventory.hpp
index 44ed148..2e261ae 100644
--- a/include/inventory.hpp
+++ b/include/inventory.hpp
@@ -1,21 +1,41 @@
+/**
+ * @file inventory.hpp
+ * @brief Provides an inventory for the player.
+ */
 #ifndef INVENTORY_HPP_
 #define INVENTORY_HPP_
 
+#include <GL/glew.h>
+#include <SDL2/SDL_opengl.h>
+
+#include <string>
+#include <vector>
+
 #include <entityx/entityx.h>
+#include <tinyxml2.h>
+using namespace tinyxml2;
 
-#include <components.hpp>
 #include <events.hpp>
+#include <texture.hpp>
 
+/**
+ * @struct Item
+ * Contains the information neccessary for an item.
+ */
 struct Item {
-	std::string name;
-	std::string type;
-	int value;
-	int stackSize;
-	Texture sprite;
+	std::string name; /**< The name of the item */
+	std::string type; /**< The type of the item */
+	int value;        /**< The value/worth of the item */
+	int stackSize;    /**< The stack size of the item */
+	Texture sprite;   /**< The texture for the item (in inventory) */
 
 	Item(void)
 		: value(0), stackSize(1) {}
 
+	/**
+	 * Constructs an item from XML.
+	 * @param the xml element (<item />)
+	 */
 	Item(XMLElement *e) {
 		name = e->StrAttribute("name");
 		type = e->StrAttribute("type");
@@ -29,35 +49,62 @@ struct Item {
 	}
 };
 
+/**
+ * @struct InventoryEntry
+ * Describes a slot in the player's inventory.
+ */
 struct InventoryEntry {
-	Item* item;
-	int count;
-	vec2 loc;
+	Item* item; /**< Pointer to info on what item this slot contains */
+	int count;  /**< The quantity of this item stored here */
+
+	vec2 loc;   /**< Used by render, to determine slot location on screen */
 
 	InventoryEntry(void)
 		: item(nullptr), count(0) {}
 };
 
+/**
+ * @class InventorySystem
+ * Handles the player's inventory system.
+ */
 class InventorySystem : public entityx::System<InventorySystem>, public entityx::Receiver<InventorySystem> {
 private:
+	/**
+	 * A vector for the player's inventory slots.
+	 */
     std::vector<InventoryEntry> items;
 
+    void loadItems(void);
+
 public:
-    InventorySystem(int size = 4) {
+    InventorySystem(int size = 20) {
 		items.resize(size);
 		loadItems();
 	}
 
     void configure(entityx::EventManager &ev);
-
-    void loadItems(void);
-
     void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override;
-
     void receive(const KeyDownEvent &kde);
+	void receive(const MouseClickEvent &mce);
+
 	void render(void);
 
+	/**
+	 * Adds 'count' 'name's to the inventory.
+	 * @param name the name of the item
+	 * @param count the quantity of the item to give
+	 */
 	void add(const std::string& name, int count);
+
+	/**
+	 * Takes 'count' 'name's from the inventory.
+	 * If the inventory does not contain enough of the item, no items are taken
+	 * and false is returned.
+	 * @param name the name of the item
+	 * @param count the quantity of the item to take
+	 * @return true if the operation could be completed
+	 */
+	bool take(const std::string& name, int count);
 };
 
 #endif // INVENTORY_HPP_
diff --git a/include/particle.hpp b/include/particle.hpp
index 48a8938..f49e055 100644
--- a/include/particle.hpp
+++ b/include/particle.hpp
@@ -1,10 +1,10 @@
 #ifndef PARTICLE_HPP_
 #define PARTICLE_HPP_
 
-#include <common.hpp>
 #include <texture.hpp>
+#include <vector2.hpp>
 
-#include <list>
+#include <vector>
 
 #include <entityx/entityx.h>
 
diff --git a/include/player.hpp b/include/player.hpp
index 85dc821..56886e3 100644
--- a/include/player.hpp
+++ b/include/player.hpp
@@ -2,16 +2,15 @@
  * @file player.hpp
  * @brief The player system
  */
-
 #ifndef PLAYER_HPP_
 #define PLAYER_HPP_
 
 #include <entityx/entityx.h>
 
+#include <components.hpp>
 #include <events.hpp>
 #include <engine.hpp>
-#include <components.hpp>
-#include <common.hpp>
+#include <vector2.hpp>
 
 /**
  * The constant velocity the player is given when moved with the arrow keys.
diff --git a/include/quest.hpp b/include/quest.hpp
index cb43eca..27b533d 100644
--- a/include/quest.hpp
+++ b/include/quest.hpp
@@ -2,7 +2,6 @@
  * @file quest.hpp
  * Quest handling.
  */
-
 #ifndef QUEST_HPP_
 #define QUEST_HPP_
 
diff --git a/include/random.hpp b/include/random.hpp
new file mode 100644
index 0000000..198861d
--- /dev/null
+++ b/include/random.hpp
@@ -0,0 +1,20 @@
+/**
+ * @file random.hpp
+ * @brief Facilities to generate random numbers.
+ */
+#ifndef RANDOM_HPP_
+#define RANDOM_HPP_
+
+/**
+ * A generically-named function to start the random number generator.
+ * This currently redirects to the library's default, but allows for
+ * a custom generator to be easily implemented.
+ */
+#define randInit srand
+
+/**
+ * Gets a random number (is a function).
+ */
+#define randGet rand
+
+#endif // RANDOM_HPP_
diff --git a/include/render.hpp b/include/render.hpp
index 997d7d0..a21fcdd 100644
--- a/include/render.hpp
+++ b/include/render.hpp
@@ -6,8 +6,8 @@
 #include <GL/glew.h>
 #include <SDL2/SDL_opengl.h>
 
-#include <common.hpp>
 #include <shader_utils.hpp>
+#include <vector2.hpp>
 
 /**
  * @class Shader
diff --git a/include/shader_utils.hpp b/include/shader_utils.hpp
index 06ac318..011b265 100644
--- a/include/shader_utils.hpp
+++ b/include/shader_utils.hpp
@@ -13,6 +13,7 @@
 #include <GL/glew.h>
 
 #include <SDL2/SDL.h>
+#include <SDL2/SDL_opengl.h>
 
 char* file_read(const char* filename);
 void print_log(GLuint object);
diff --git a/include/texture.hpp b/include/texture.hpp
index 43db1b6..fb4e588 100644
--- a/include/texture.hpp
+++ b/include/texture.hpp
@@ -6,7 +6,14 @@
 #ifndef TEXTURE_HPP_
 #define TEXTURE_HPP_
 
-#include <common.hpp>
+#include <string>
+#include <vector>
+
+#include <GL/glew.h> // must
+#include <SDL2/SDL_opengl.h>
+
+#include <color.hpp>
+#include <vector2.hpp>
 
 /**
  * When defined, DEBUG allows extra messages to be printed to the terminal for
diff --git a/include/ui.hpp b/include/ui.hpp
index 67c1010..ac415f5 100644
--- a/include/ui.hpp
+++ b/include/ui.hpp
@@ -1,49 +1,27 @@
-/* ----------------------------------------------------------------------------
-** The user interface system.
-**
-** This file contains everything user-interface related.
-** --------------------------------------------------------------------------*/
-#ifndef UI_H
-#define UI_H
+/**
+ * @file ui.hpp
+ * @brief the user interface system.
+ */
+#ifndef UI_HPP_
+#define UI_HPP_
 
-#define DEBUG
-#define SDL_KEY e.key.keysym.sym
-
-/* ----------------------------------------------------------------------------
-** Includes section
-** --------------------------------------------------------------------------*/
-
-// standard library headers
 #include <cstdarg>
-#include <cstdint>
-#include <thread>
-
-// local game headers
-#include <common.hpp>
-#include <config.hpp>
-//#include <inventory.hpp>
-#include <ui_menu.hpp>
-#include <events.hpp>
+#include <string>
 
-// local library headers
+#include <entityx/entityx.h>
+#include <GL/glew.h>
 #include <SDL2/SDL_opengl.h>
 
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifndef __WIN32__
-#	include <bmpimage.hpp>
-#endif // __WIN32__
+#include <color.hpp>
+#include <events.hpp>
+#include <vector2.hpp>
 
-/* ----------------------------------------------------------------------------
-** The UI namespace
-** --------------------------------------------------------------------------*/
+#define DEBUG
+#define SDL_KEY e.key.keysym.sym
 
 void setControl(int index, SDL_Keycode key);
 SDL_Keycode getControl(int index);
 
-#include <entityx/entityx.h>
-
 class InputSystem : public entityx::System<InputSystem>, public entityx::Receiver<InputSystem> {
 public:
 	inline void configure(entityx::EventManager &ev) {
@@ -168,4 +146,4 @@ namespace ui {
 	void takeScreenshot(GLubyte *pixels);
 }
 
-#endif // UI_H
+#endif // UI_HPP_
diff --git a/include/ui_menu.hpp b/include/ui_menu.hpp
index b45a76d..5288161 100644
--- a/include/ui_menu.hpp
+++ b/include/ui_menu.hpp
@@ -1,56 +1,53 @@
 #ifndef UI_MENU_H_
 #define UI_MENU_H_
 
-#include <common.hpp>
+#include <string>
+#include <vector>
+
+#include <color.hpp>
 #include <config.hpp>
 #include <ui.hpp>
+#include <vector2.hpp>
 
-typedef void (*menuFunc)(void);
+using MenuAction = std::function<void(void)>;
 
 class Menu;
 
 class menuItem {
 public:
 	int member;
-	Menu *child;
+	Menu* child;
 
 	vec2 loc;
 	dim2 dim;
 	Color color;
 	std::string text;
-	//union {
-		struct {
-			menuFunc func;
-		} button;
-
-		struct {
-			float minValue;
-			float maxValue;
-            float sliderLoc;
-			float *var;
-		} slider;
-	//};
-
-	menuItem(){}
-	~menuItem(){
-		//button.text = NULL;
-		//slider.text = NULL;
-
-		//delete[] button.text;
-		//delete[] slider.text;
-		//delete slider.var;
-	}
+
+	struct {
+		MenuAction func;
+	} button;
+
+	struct {
+		float minValue;
+		float maxValue;
+        float sliderLoc;
+		float* var;
+	} slider;
+
+	menuItem(void) {}
+
+	menuItem(vec2 l, dim2 d, Color c, std::string t, Menu* ch = nullptr)
+		: child(ch), loc(l), dim(d), color(c), text(t) {}
 };
 
 class Menu {
 public:
 	std::vector<menuItem> items;
-	Menu *parent;
+	Menu* parent;
 
-	~Menu()
-	{
+	~Menu(void) {
 		items.clear();
-		parent = NULL;
+		parent = nullptr;
 	}
 
 	void gotoParent(void);
@@ -58,7 +55,7 @@ public:
 
 namespace ui {
     namespace menu {
-        menuItem createButton(vec2 l, dim2 d, Color c, const char* t, menuFunc f);
+        menuItem createButton(vec2 l, dim2 d, Color c, const char* t, MenuAction f);
         menuItem createChildButton(vec2 l, dim2 d, Color c, const char* ti, Menu *_child);
         menuItem createParentButton(vec2 l, dim2 d, Color c, const char* t);
         menuItem createSlider(vec2 l, dim2 d, Color c, float min, float max, const char* t, float* v);
diff --git a/include/ui_quest.hpp b/include/ui_quest.hpp
index d770011..a46483a 100644
--- a/include/ui_quest.hpp
+++ b/include/ui_quest.hpp
@@ -2,12 +2,13 @@
  * @file ui_quest.hpp
  * @brief Handles UI elements related to quests.
  */
-
 #ifndef UI_QUEST_HPP_
 #define UI_QUEST_HPP_
 
 #include <ui.hpp>
-#include <common.hpp>
+#include <vector2.hpp>
+
+extern vec2 offset;
 
 namespace ui {
 	namespace quest {
diff --git a/include/vector2.hpp b/include/vector2.hpp
index debaee9..17e47d1 100644
--- a/include/vector2.hpp
+++ b/include/vector2.hpp
@@ -77,4 +77,7 @@ struct vector2 {
 	}
 };
 
+using vec2 = vector2<float>;
+using dim2 = vector2<int>;
+
 #endif // VECTOR2_HPP_
diff --git a/include/vector3.hpp b/include/vector3.hpp
new file mode 100644
index 0000000..ee09eae
--- /dev/null
+++ b/include/vector3.hpp
@@ -0,0 +1,19 @@
+#ifndef VECTOR3_HPP_
+#define VECTOR3_HPP_
+
+/**
+ * A structure for three-dimensional points.
+ */
+template<typename T>
+struct vector3 {
+	T x; /**< The x coordinate */
+	T y; /**< The y coordinate */
+	T z; /**< The z coordinate */
+
+	vector3(T _x = 0, T _y = 0, T _z = 1)
+		: x(_x), y(_y), z(_z) {}
+};
+
+using vec3 = vector3<float>;
+
+#endif // VECTOR3_HPP_
diff --git a/include/weather.hpp b/include/weather.hpp
index 8e148dd..58a0cfa 100644
--- a/include/weather.hpp
+++ b/include/weather.hpp
@@ -1,11 +1,15 @@
 #ifndef WEATHER_HPP_
 #define WEATHER_HPP_
 
+#include <string>
+
 #include <entityx/entityx.h>
 
-#include <common.hpp>
+#include <config.hpp>
 #include <particle.hpp>
 
+extern vec2 offset;
+
 /**
  * The weather type enum.
  * This enum contains every type of weather currently implemented in the game.
diff --git a/include/world.hpp b/include/world.hpp
index 9b68314..fe7d819 100644
--- a/include/world.hpp
+++ b/include/world.hpp
@@ -2,23 +2,24 @@
  * @file  world.hpp
  * @brief The world system
  */
+#ifndef WORLD_HPP_
+#define WORLD_HPP_
 
-#ifndef WORLD_H
-#define WORLD_H
+#include <string>
+#include <thread>
+#include <vector>
 
-// library includes
+#include <SDL2/SDL_mixer.h>
 #include <entityx/entityx.h>
 
-// local game includes
-#include <common.hpp>
-#include <coolarray.hpp>
-#include <events.hpp>
-#include <texture.hpp>
-#include <components.hpp>
 #include <tinyxml2.h>
-
 using namespace tinyxml2;
 
+#include <components.hpp>
+#include <events.hpp>
+#include <texture.hpp>
+#include <vector2.hpp>
+
 /**
  * The background type enum.
  * Used to choose which set of background images should be used.
@@ -178,4 +179,4 @@ public:
 	void load(const std::string& file);
 };
 
-#endif // WORLD_H
+#endif // WORLD_HPP_