Changeset 5356 in orxonox.OLD for trunk/src/world_entities/weapons/turret.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/turret.cc (modified) (3 diffs)

trunk/src/world_entities/weapons/turret.cc

@@ -28 +28 @@
 
 #include "factory.h"
-#include "fast_factory.h"
 
 CREATE_FACTORY(Turret);
@@ -93 +92 @@
 
 
-  this->setProjectile(CL_TEST_BULLET);
+  this->setProjectileType(CL_TEST_BULLET);
 
 
@@ -133 +132 @@
 void Turret::fire()
 {
-  Projectile* pj =  dynamic_cast<Projectile*>(this->getProjectileFactory()->resurrect());
+  Projectile* pj = this->getProjectile();
+  if (pj == NULL)
+    return;
 
   PNode* target = this->getWeaponManager()->getFixedTarget();