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

Timestamp:

Feb 7, 2006, 8:56:57 PM (18 years ago)

Author:

bensch

Message:

power ups can only be picked up once

Location:

trunk/src/world_entities/weapons

Files:

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

trunk/src/world_entities/weapons/weapon.cc

@@ -115 +115 @@
   WorldEntity::loadParams(root);
 
-  LoadParam(root, "projectile", this, Weapon, setProjectileType)
+  LoadParam(root, "projectile", this, Weapon, setProjectileTypeC)
   .describe("Sets the name of the Projectile to load onto the Entity");
 
@@ -164 +164 @@
  * @param projectile the Name of the Projectile.
  */
-void Weapon::setProjectileType(const char* projectile)
+void Weapon::setProjectileTypeC(const char* projectile)
 {
   if (projectile == NULL)

trunk/src/world_entities/weapons/weapon.h

@@ -111 +111 @@
     inline long getCapability() const { return this->capability; };
     void setProjectileType(ClassID projectile);
-    void setProjectileType(const char* projectile);
+    void setProjectileTypeC(const char* projectile);
     /** @returns The projectile's classID */
     inline ClassID getProjectileType() { return this->projectile; };