From 59edd60ebec61bf24dd27063f85bcd049fd0af13 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Thu, 19 Jan 2017 16:20:13 -0500
Subject: killed common, more inventory, other random stuff

---
 include/world.hpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'include/world.hpp')

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_
-- 
cgit v1.2.3