more entityx, main.cpp cleanup

6 files changed, 37 insertions, 35 deletions

diff --git a/include/common.hpp b/include/common.hpp
index 8d74cda..15442a7 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -245,27 +245,6 @@ constexpr const float PI = 3.1415926535f;
 // references the variable in main.cpp, used for drawing with the player
 extern vec2 offset;
 
-// reference to the shader programs we use throughout
-extern GLuint textShader;
-extern GLint textShader_attribute_coord;
-extern GLint textShader_attribute_tex;
-extern GLint textShader_uniform_texture;
-extern GLint textShader_uniform_color;
-
-extern GLuint worldShader;
-extern GLint worldShader_attribute_coord;
-extern GLint worldShader_attribute_tex;
-extern GLint worldShader_uniform_texture;
-extern GLint worldShader_uniform_texture_normal;
-extern GLint worldShader_uniform_color;
-extern GLint worldShader_uniform_transform;
-extern GLint worldShader_uniform_ambient;
-extern GLint worldShader_uniform_light;
-extern GLint worldShader_uniform_light_color;
-extern GLint worldShader_uniform_light_impact;
-extern GLint worldShader_uniform_light_amt;
-
-extern Color ambient;
 /**
  *	Prints a formatted debug message to the console, along with the callee's file and line
  *	number.
diff --git a/include/engine.hpp b/include/engine.hpp
new file mode 100644
index 0000000..0fabdb3
--- /dev/null
+++ b/include/engine.hpp
@@ -0,0 +1,17 @@
+#ifndef ENGINE_HPP_
+#define ENGINE_HPP_
+
+#include <entityx/entityx.h>
+
+#include <events.hpp>
+
+namespace game {
+    extern entityx::EventManager events;
+    extern entityx::EntityManager entities;
+
+    inline void endGame(void) {
+        events.emit<GameEndEvent>();
+    }
+}
+
+#endif // ENGINE_HPP_
diff --git a/include/events.hpp b/include/events.hpp
index aa3ca07..1fe7d7a 100644
--- a/include/events.hpp
+++ b/include/events.hpp
@@ -8,24 +8,31 @@
 #include <SDL2/SDL.h>
 
  struct MouseScrollEvent {
- 	MouseScrollEvent(int sd)
+ 	MouseScrollEvent(int sd = 0)
  		: scrollDistance(sd) {}
 
  	int scrollDistance;
  };
 
 struct KeyDownEvent {
-    KeyDownEvent(SDL_Keycode kc)
+    KeyDownEvent(SDL_Keycode kc = 0)
         : keycode(kc) {}
 
     SDL_Keycode keycode;
 };
 
 struct KeyUpEvent {
-    KeyUpEvent(SDL_Keycode kc)
+    KeyUpEvent(SDL_Keycode kc = 0)
         : keycode(kc) {}
 
     SDL_Keycode keycode;
 };
 
+struct GameEndEvent {
+    GameEndEvent(bool r = true)
+        : really(r) {}
+
+    bool really;
+};
+
 #endif // EVENTS_HPP_
diff --git a/include/inventory.hpp b/include/inventory.hpp
index 9a42aa4..533318c 100644
--- a/include/inventory.hpp
+++ b/include/inventory.hpp
@@ -18,8 +18,10 @@ class Entity;
 class Item {
 private:
 	bool beingUsed;
+
 protected:
 	std::vector<Entity*> interact;
+	
 public:
 
 	// what we want to call each item
diff --git a/include/ui.hpp b/include/ui.hpp
index f276882..8671393 100644
--- a/include/ui.hpp
+++ b/include/ui.hpp
@@ -149,13 +149,6 @@ namespace ui {
 
 	void quitGame();
 
-
-
-	/*
-	 *	Handle keyboard/mouse events.
-	*/
-	void handleEvents(void);
-
 	/*
 	 *	Toggle the black overlay thing.
 	*/
diff --git a/include/world.hpp b/include/world.hpp
index 92a07b2..6b26452 100644
--- a/include/world.hpp
+++ b/include/world.hpp
@@ -131,7 +131,7 @@ public:
 };
 
 /**
- * The world class. 
+ * The world class.
  * This class handles entity creation, management, and deletion. Most
  * world-related operations have to be done through this class, such as
  * drawing.
@@ -262,7 +262,7 @@ protected:
 	 * This function is only called in the world destructor.
 	 */
 	void deleteEntities(void);
-	
+
 	/**
 	 * Draws background textures.
 	 */
@@ -271,7 +271,7 @@ protected:
 public:
 
 	CoolArray<Particles>    particles;
-	
+
 	/**
 	 * A vector of pointers to all entities from the other vectors.
 	 * This is used to mass-manage entities, or operate on entities
@@ -330,6 +330,10 @@ public:
 	 */
 	float getWorldStart(void) const;
 
+	inline unsigned int getEntityCount(void) const {
+		return entity.size();
+	}
+
 	/**
 	 * Gets a pointer to the most recently created light.
 	 * This is used to update properties of the light outside of the
@@ -413,7 +417,7 @@ public:
 	 * Adopts an NPC from another world, taking its ownership.
 	 */
 	void adoptNPC(NPC *e);
-	
+
 	/**
 	 * Adopts a mob from another world, taking its ownership.
 	 */