Changeset 6434 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Jan 8, 2006, 2:00:48 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: moved the projectiles to Projectiles

Location:

trunk/src/world_entities/weapons

Files:

• aiming_turret.cc (modified) (1 diff)
• cannon.cc (modified) (1 diff)
• targeting_turret.cc (modified) (2 diffs)
• test_gun.cc (modified) (1 diff)
• turret.cc (modified) (1 diff)
• weapon.cc (modified) (1 diff)

trunk/src/world_entities/weapons/aiming_turret.cc

@@ -19 +19 @@
 #include "weapon_manager.h"
 #include "aim.h"
-#include "projectile.h"
+#include "world_entities/projectiles/projectile.h"
 
 #include "model.h"

trunk/src/world_entities/weapons/cannon.cc

@@ -25 +25 @@
 #include "world_entity.h"
 #include "model.h"
-#include "test_bullet.h"
+#include "world_entities/projectiles/projectile.h"
 #include "weapon_manager.h"
 #include "factory.h"

trunk/src/world_entities/weapons/targeting_turret.cc

@@ -19 +19 @@
 #include "weapon_manager.h"
 #include "aim.h"
-#include "projectile.h"
+#include "world_entities/projectiles/projectile.h"
 
 #include "model.h"
@@ -119 +119 @@
 void TargetingTurret::tick(float dt)
 {
-  
+
   this->target->tick(dt);
 }

trunk/src/world_entities/weapons/test_gun.cc

@@ -22 +22 @@
 
 #include "test_gun.h"
+#include "world_entities/projectiles/projectile.h"
 
 #include "world_entity.h"
 #include "static_model.h"
-#include "test_bullet.h"
 #include "weapon_manager.h"
 #include "factory.h"

trunk/src/world_entities/weapons/turret.cc

@@ -18 +18 @@
 
 #include "weapon_manager.h"
-#include "projectile.h"
+#include "world_entities/projectiles/projectile.h"
 
 #include "model.h"

trunk/src/world_entities/weapons/weapon.cc

@@ -22 +22 @@
 
 #include "fast_factory.h"
-#include "projectile.h"
+#include "world_entities/projectiles/projectile.h"
 
 #include "resource_manager.h"