Changeset 4950 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons

Timestamp:

Jul 24, 2005, 12:36:58 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more loadability functionality in Weapon and FastFactory

Location:

orxonox/trunk/src/world_entities/weapons

Files:

• weapon.cc (modified) (2 diffs)
• weapon.h (modified) (1 diff)
• weapon_manager.h (modified) (1 diff)

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

@@ -96 +96 @@
  * sets the Projectile to use for this weapon.
  * @param projectile The ID of the Projectile to use
+ * @returns true, if it was sucessfull, false on error
  *
  * be aware, that this function does not create Factories, as this is job of Bullet-classes.
@@ -117 +118 @@
   }
 };
+
+/**
+ * @see bool Weapon::setProjectile(ClassID projectile)
+ * @param projectile the Name of the Projectile.
+ * @return true if
+ */
+bool Weapon::setProjectile(const char* projectile)
+{
+  if (projectile == NULL)
+    return false;
+  FastFactory* tmpFac = FastFactory::searchFastFactory(projectile);
+  if (tmpFac != NULL)
+  {
+    this->setProjectile(tmpFac->getStoredID());
+  }
+}
 
 /**

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

@@ -95 +95 @@
     // FUNCTIONS TO SET THE WEAPONS PROPERTIES.
     bool setProjectile(ClassID projectile);
+    bool setProjectile(const char* projectile);
     /** @returns The projectile's classID */
     inline ClassID getProjectile() { return this->projectile; };

orxonox/trunk/src/world_entities/weapons/weapon_manager.h

@@ -85 +85 @@
 {
   int           number;
-  bool          occupied;
   long          capability;