Changeset 4947 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons/weapon.cc

Timestamp:

Jul 23, 2005, 11:17:27 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ProjectileFactory now handled in Weapon-class

File:

• orxonox/trunk/src/world_entities/weapons/weapon.cc (modified) (3 diffs)

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

@@ -80 +80 @@
   this->emissionPoint.setParent(this);
 
-  this->projectile = NULL;
+  this->projectile = CL_NULL;
+  this->projectileFactory = NULL;
 
   this->hideInactive = true;
@@ -93 +94 @@
 }
 
+/**
+ * sets the Projectile to use for this weapon.
+ * @param projectile The ID of the Projectile to use
+ *
+ * be aware, that this function does not create Factories, as this is job of Bullet-classes.
+ */
+bool Weapon::setProjectile(ClassID projectile)
+{
+  if (projectile == CL_NULL)
+    return false;
+  this->projectile = projectile;
+  this->projectileFactory = FastFactory::searchFastFactory(projectile);
+  if (this->projectileFactory == NULL)
+    return false;
+};
 
 /**
@@ -446 +462 @@
   bool retVal = true;
 
-  if (this->projectile == NULL)
+//  if (this->projectile == NULL)
   {
     PRINTF(2)("There was no projectile assigned to the Weapon.\n");