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

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: remake of the Projectile and TestBullet

File:

• orxonox/trunk/src/world_entities/weapons/weapon.cc (modified) (1 diff)

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

@@ -122 +122 @@
     printf("next action will be %s in %f seconds\n", actionToChar(action), this->stateDuration);
     this->requestedAction = action;
+  }
+}
+
+
+/**
+ * adds energy to the Weapon
+ * @param energyToAdd The amount of energy
+ * @returns the amount of energy we did not pick up, because the weapon is already full
+ */
+float Weapon::increaseEnergy(float energyToAdd)
+{
+  float maxAddEnergy = this->energyMax - this->energy;
+
+  if (maxAddEnergy >= energyToAdd)
+  {
+    this->energy += energyToAdd;
+    return 0.0;
+  }
+  else
+  {
+    this->energy += maxAddEnergy;
+    return energyToAdd - maxAddEnergy;
   }
 }