Changeset 10179 in orxonox.OLD

Timestamp:

Jan 3, 2007, 7:07:43 PM (17 years ago)

Author:

marcscha

Message:

Acid Launcher and Acid Splash (projectile) finished.
This time including the missing source file

Location:

branches/playability/src/world_entities

Files:

• WorldEntities.am (modified) (4 diffs)
• projectiles/acid_splash.cc (added)
• projectiles/acid_splash.h (added)
• weapons/acid_launcher.cc (added)
• weapons/acid_launcher.h (added)
• weapons/swarm_launcher.cc (modified) (1 diff)

branches/playability/src/world_entities/WorldEntities.am

@@ -42 +42 @@
                 world_entities/weapons/swarm_launcher.cc \
                 world_entities/weapons/spike_launcher.cc \
+                world_entities/weapons/acid_launcher.cc \
                 \
                 world_entities/projectiles/lbolt.cc \
@@ -57 +58 @@
                 world_entities/projectiles/spike.cc \
                 world_entities/projectiles/spike_ball.cc \
+                world_entities/projectiles/acid_splash.cc \
                 \
                 world_entities/power_ups/turret_power_up.cc \
@@ -158 +160 @@
                 weapons/swarm_launcher.h \
                 weapons/spike_launcher.h \
+                weapons/acid_launcher.h \
                 \
                 projectiles/lbolt.h \
@@ -173 +176 @@
                 projectiles/spike.h \
                 projectiles/spike_ball.h \
+                projectiles/acid_splash.h \
                 \
                 power_ups/turret_power_up.h \

branches/playability/src/world_entities/weapons/swarm_launcher.cc

@@ -163 +163 @@
       pj->setAbsDir(this->getAbsDir());
       dynamic_cast<SwarmProjectile*>(pj)->setTarget( (PNode*)(*eIterator) );
-      pj->toList(OM_GROUP_01_PROJ);
+      //pj->toList(OM_GROUP_01_PROJ);
       pj->activate();
     }