killed common, more inventory, other random stuff

1 files changed, 15 insertions, 37 deletions

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_