Changeset 9953 in orxonox.OLD for branches/playability/src/world_entities/space_ships/space_ship.cc

Timestamp:

Nov 24, 2006, 9:10:24 AM (18 years ago)

Author:

nicolasc

Message:

renamed shield() to regen as Regenration Handler, defined damage in projectile

File:

• branches/playability/src/world_entities/space_ships/space_ship.cc (modified) (2 diffs)

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -540 +540 @@
       pDamage = pDamage - this->shieldCur;
       if( !this->shieldActive) {
-        this->armorCur = this->armorCur -  pDamage / 2; // remaining damages hits armor at half rate
-        this->electronicCur = this->electronicCur - eDamage;
+        this->armorCur = pDamage / 2; // remaining damages hits armor at half rate
+        this->electronicCur -= eDamage;
       }
     }
@@ -552 +552 @@
 }
 
-void SpaceShip::shield(){
+void SpaceShip::regen(){
   int time = 1; // FIXME implement tick time calculation
-  if( this->shieldCur + this->shieldRegen * time > shieldMax)
-    this->shield = this->shieldMax;
-  else
-    this-shieldCur = this->shieldCur + this->shieldRegen * time;
-
-  if( this->shieldCur > shieldTH)
-    this->shieldActive = true;
-}
-
+  if (this->shieldCur == this->shieldMax){}
+  else {
+    if( this->shieldCur + this->shieldRegen * time > shieldMax)
+      this->shieldCur = this->shieldMax;
+    else
+      this->shieldCur += this->shieldRegen * time;
+    if( this->shieldCur > shieldTH)
+      this->shieldActive = true;
+  }
+  if (this->electronicCur == this->electronicMax){}
+  else{
+    if (this->electronicCur + this->electronicRegen * time > electronicMax)
+      this->electronicCur = this->electronicMax;
+    else
+      this->electronicCur += this->electronicRegen * time;
+  }
+}
+