more entityx, main.cpp cleanup

1 files changed, 8 insertions, 4 deletions

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.
 	 */