Changeset 6434 in orxonox.OLD for trunk

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: moved the projectiles to Projectiles

Location:

trunk/src

Files:

• story_entities/game_world.cc (modified) (1 diff)
• story_entities/game_world_data.cc (modified) (1 diff)
• story_entities/multi_player_world_data.cc (modified) (1 diff)
• world_entities/Makefile.am (modified) (6 diffs)
• world_entities/projectiles (added)
• world_entities/projectiles/bomb.cc (moved) (moved from trunk/src/world_entities/weapons/bomb.cc)
• world_entities/projectiles/bomb.h (moved) (moved from trunk/src/world_entities/weapons/bomb.h)
• world_entities/projectiles/guided_missile.cc (moved) (moved from trunk/src/world_entities/weapons/guided_missile.cc)
• world_entities/projectiles/guided_missile.h (moved) (moved from trunk/src/world_entities/weapons/guided_missile.h)
• world_entities/projectiles/laser.cc (moved) (moved from trunk/src/world_entities/weapons/laser.cc)
• world_entities/projectiles/laser.h (moved) (moved from trunk/src/world_entities/weapons/laser.h)
• world_entities/projectiles/projectile.cc (moved) (moved from trunk/src/world_entities/weapons/projectile.cc) (1 diff)
• world_entities/projectiles/projectile.h (moved) (moved from trunk/src/world_entities/weapons/projectile.h)
• world_entities/projectiles/rocket.cc (moved) (moved from trunk/src/world_entities/weapons/rocket.cc)
• world_entities/projectiles/rocket.h (moved) (moved from trunk/src/world_entities/weapons/rocket.h)
• world_entities/projectiles/test_bullet.cc (moved) (moved from trunk/src/world_entities/weapons/test_bullet.cc)
• world_entities/projectiles/test_bullet.h (moved) (moved from trunk/src/world_entities/weapons/test_bullet.h)
• world_entities/weapons/aiming_turret.cc (modified) (1 diff)
• world_entities/weapons/cannon.cc (modified) (1 diff)
• world_entities/weapons/targeting_turret.cc (modified) (2 diffs)
• world_entities/weapons/test_gun.cc (modified) (1 diff)
• world_entities/weapons/turret.cc (modified) (1 diff)
• world_entities/weapons/weapon.cc (modified) (1 diff)

trunk/src/story_entities/game_world.cc

@@ -36 +36 @@
 #include "terrain.h"
 #include "md2Model.h"
-#include "weapons/projectile.h"
+#include "world_entities/projectiles/projectile.h"
 #include "npcs/npc_test1.h"
 #include "playable.h"

trunk/src/story_entities/game_world_data.cc

@@ -34 +34 @@
 #include "terrain.h"
 #include "md2Model.h"
-#include "weapons/projectile.h"
+#include "world_entities/projectiles/projectile.h"
 #include "npcs/npc_test1.h"
 #include "playable.h"

trunk/src/story_entities/multi_player_world_data.cc

@@ -35 +35 @@
 #include "terrain.h"
 #include "md2Model.h"
-#include "weapons/projectile.h"
+#include "world_entities/projectiles/projectile.h"
 #include "npcs/npc_test1.h"
 #include "playable.h"

trunk/src/world_entities/Makefile.am

@@ -22 +22 @@
                   world_entities/character_attributes.cc \
                   world_entities/test_entity.cc \
+                  \
                   world_entities/weapons/weapon_manager.cc \
                   world_entities/weapons/weapon.cc \
-                  world_entities/weapons/projectile.cc \
                   world_entities/weapons/test_gun.cc \
                   world_entities/weapons/turret.cc \
@@ -30 +30 @@
                   world_entities/weapons/targeting_turret.cc \
                   world_entities/weapons/cannon.cc \
-                  world_entities/weapons/test_bullet.cc \
-                  world_entities/weapons/rocket.cc \
-                  world_entities/weapons/guided_missile.cc \
-                  world_entities/weapons/laser.cc \
                   world_entities/weapons/aim.cc \
-                  world_entities/weapons/bomb.cc \
                   world_entities/weapons/crosshair.cc \
+                  \
+                  world_entities/projectiles/projectile.cc \
+                  world_entities/projectiles/bomb.cc \
+                  world_entities/projectiles/laser.cc \
+                  world_entities/projectiles/test_bullet.cc \
+                  world_entities/projectiles/rocket.cc \
+                  world_entities/projectiles/guided_missile.cc \
+                  \
                   world_entities/power_ups/power_up.cc \
                   world_entities/power_ups/turret_power_up.cc \
@@ -42 +45 @@
                   world_entities/power_ups/weapon_power_up.cc \
                   world_entities/power_ups/param_power_up.cc \
+                  \
                   world_entities/space_ships/space_ship.cc \
                   world_entities/space_ships/helicopter.cc \
                   world_entities/creatures/md2_creature.cc \
+                  \
                   world_entities/spawning_point.cc
 
@@ -63 +68 @@
                  world_entities/character_attributes.h \
                  world_entities/test_entity.h \
+                 \
                  world_entities/weapons/weapon_manager.h \
                  world_entities/weapons/weapon.h \
-                 world_entities/weapons/projectile.h \
                  world_entities/weapons/test_gun.h \
                  world_entities/weapons/cannon.h \
@@ -71 +76 @@
                  world_entities/weapons/aiming_turret.h \
                  world_entities/weapons/targeting_turret.h \
-                 world_entities/weapons/test_bullet.h \
-                 world_entities/weapons/rocket.h \
-                 world_entities/weapons/guided_missile.h \
-                 world_entities/weapons/laser.h \
                  world_entities/weapons/aim.h \
-                 world_entities/weapons/bomb.h \
                  world_entities/weapons/crosshair.h \
+                 \
+                 world_entities/projectiles/projectile.h \
+                 world_entities/projectiles/bomb.h \
+                 world_entities/projectiles/laser.h \
+                 world_entities/projectiles/test_bullet.h \
+                 world_entities/projectiles/rocket.h \
+                 world_entities/projectiles/guided_missile.h \
+                 \
                  world_entities/power_ups/power_up.h \
                  world_entities/power_ups/turret_power_up.h \
@@ -83 +91 @@
                  world_entities/power_ups/param_power_up.h \
                  world_entities/power_ups/weapon_power_up.h \
+                 \
                  world_entities/space_ships/space_ship.h \
                  world_entities/space_ships/helicopter.h \
                  world_entities/creatures/md2_creature.h \
+                 \
                  world_entities/spawning_point.h

trunk/src/world_entities/projectiles/projectile.cc

@@ -20 +20 @@
 
 #include "world_entity.h"
-#include "weapon.h"
+#include "world_entities/weapons/weapon.h"
 #include "model.h"
 

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"