Changeset 5356 in orxonox.OLD for trunk/src/world_entities/weapons/test_gun.cc

Timestamp:

Oct 10, 2005, 8:17:44 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: saver Weapon-Projectile-generation and Stuff

File:

• trunk/src/world_entities/weapons/test_gun.cc (modified) (2 diffs)

trunk/src/world_entities/weapons/test_gun.cc

@@ -134 +134 @@
   this->setActionSound(WA_SHOOT, "sound/shot1.wav");
 
-  this->setProjectile(CL_TEST_BULLET);
-  this->getProjectileFactory()->prepare(20);
+  this->setProjectileType(CL_TEST_BULLET);
+  this->prepareProjectiles(20);
 }
 
@@ -178 +178 @@
 void TestGun::fire()
 {
-  Projectile* pj =  dynamic_cast<Projectile*>(this->getProjectileFactory()->resurrect());
+  Projectile* pj =  this->getProjectile();
+  if (pj == NULL)
+    return;
 
   pj->setParent(NullParent::getInstance());