Changeset 4979 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Aug 10, 2005, 4:47:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Objects now get cleanly ereased.
This is a fix in the Weapon-class, that kills the Resurected Projectiles created for information-gathering

Location:

orxonox/trunk/src/world_entities/weapons

Files:

• projectile.cc (modified) (1 diff)
• test_gun.cc (modified) (2 diffs)
• weapon.cc (modified) (1 diff)

orxonox/trunk/src/world_entities/weapons/projectile.cc

@@ -39 +39 @@
   this->lifeCycle = 0.0;
   this->lifeSpan = 0.75f; /* sec */
+
+  this->remove();
 }
 

orxonox/trunk/src/world_entities/weapons/test_gun.cc

@@ -33 +33 @@
 #include "animation3d.h"
 #include "sound_engine.h"
+
+#include "null_parent.h"
 
 #include "fast_factory.h"
@@ -175 +177 @@
   Projectile* pj =  dynamic_cast<Projectile*>(this->getProjectileFactory()->resurrect());
 
+  pj->setParent(NullParent::getInstance());
 /*
   PNode* target = this->getWeaponManager()->getFixedTarget();

orxonox/trunk/src/world_entities/weapons/weapon.cc

@@ -127 +127 @@
   this->projectileFactory = FastFactory::searchFastFactory(projectile);
   if (this->projectileFactory == NULL)
+  {
+    PRINTF(1)("unable to find FastFactory for the Projectile.\n");
     return;
+  }
   else
   {
     // grabbing Parameters from the Projectile to have them at hand here.
-    this->projectileFactory->prepare(1);
     Projectile* pj = dynamic_cast<Projectile*>(this->projectileFactory->resurrect());
     this->minCharge = pj->getEnergyMin();
     this->maxCharge = pj->getEnergyMax();
     this->chargeable = pj->isChageable();
-  }
-};
+    this->projectileFactory->kill(pj);
+  }
+}
 
 /**