Changeset 4828 in orxonox.OLD for orxonox

Timestamp:

Jul 9, 2005, 12:51:04 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: less includes

Location:

orxonox/trunk/src/world_entities/weapons

Files:

• weapon.cc (modified) (2 diffs)
• weapon_manager.cc (modified) (1 diff)

orxonox/trunk/src/world_entities/weapons/weapon.cc

@@ -15 +15 @@
 */
 
+#include "weapon.h"
 #include "weapon_manager.h"
-#include "weapon.h"
+
 #include "vector.h"
 #include "projectile.h"
 #include "list.h"
-#include "world.h"
+#include "state.h"
 
 /**
@@ -32 +33 @@
   this->setRelCoor(coordinate);
   this->setRelDir(direction);
-  WorldInterface* wi = WorldInterface::getInstance();
-  this->worldEntities = wi->getEntityList();
+  this->worldEntities = State::getWorldEntityList();
 }
 

orxonox/trunk/src/world_entities/weapons/weapon_manager.cc

@@ -19 +19 @@
 #include "weapon_manager.h"
 #include "weapon.h"
-#include "stdincl.h"
-#include "world_entity.h"
+
 #include "vector.h"
-#include "model.h"
-#include "projectile.h"
 #include "list.h"
-#include "world.h"
 
 using namespace std;