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

Timestamp:

Jan 25, 2006, 6:02:36 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: now Weapons get Loaded on pickup

File:

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

trunk/src/world_entities/weapons/weapon.cc

@@ -126 +126 @@
 }
 
+
 /**
  * sets the Projectile to use for this weapon.
@@ -156 +157 @@
 }
 
+
 /**
  * @see bool Weapon::setProjectile(ClassID projectile)
@@ -175 +177 @@
 }
 
+
 /**
  * prepares Projectiles of the Weapon
@@ -186 +189 @@
     PRINTF(2)("unable to create %d projectile for Weapon %s (%s)\n", count, this->getName(), this->getClassName());
 }
+
 
 /**
@@ -218 +222 @@
   this->emissionPoint.setRelCoor(point);
 }
+
 
 /**
@@ -247 +252 @@
 }
 
+
 /**
  * creates/returns an Animation3D for a certain State.
@@ -325 +331 @@
 }
 
+
 /**
  * adds energy to the Weapon
@@ -345 +352 @@
   }
 }
+
 
 ////////////////////////////////////////////////////////////
@@ -519 +527 @@
     this->animation[state]->replay();
 
-  this->stateDuration = this->times[state] + this->stateDuration;
+  this->stateDuration += this->times[state];
   this->currentState = state;
 }