liibmodel

1 files changed, 8 insertions, 5 deletions

diff --git a/src/core/entity.h b/src/core/entity.h
index 7e6493a..ba86c53 100644
--- a/src/core/entity.h
+++ b/src/core/entity.h
@@ -7,16 +7,19 @@
 #ifndef __INCLUDED_CORE_ENTITY_H__
 #define __INCLUDED_CORE_ENTITY_H__
 
+#include "model/model.h"
+#include "math/axis.h"
+#include "math/mathlib.h"
+
 namespace core
 {
+
 class Entity;
 class EntityControlable;
+
 }
 
-#include "core/model.h"
 #include "core/player.h"
-#include "math/axis.h"
-#include "math/mathlib.h"
 
 #include <iostream>
 #include <string>
@@ -77,7 +80,7 @@ public:
 	inline std::string const & modelname() { return entity_modelname; }
 
 	/// pointer to the model, is used client-side
-	inline Model * model() { return entity_model; }
+	inline model::Model * model() { return entity_model; }
 
 	/// dirty flag
 	inline bool dirty() const { return entity_dirty; }
@@ -145,7 +148,7 @@ public:
 	float 			entity_radius;
 	std::string		entity_name;
 	std::string		entity_modelname;
-	Model			*entity_model;
+	model::Model		*entity_model;
 	Shape 			entity_shape;	
 	math::Color 		entity_color;
 	unsigned int		entity_moduletypeid;