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

Timestamp:

Nov 24, 2006, 11:58:23 PM (17 years ago)

Author:

nicolasc

Message:

updated damage() to use tick
added collidesWith() to Projectile

File:

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

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

@@ -521 +521 @@
 
 
-int SpaceShip::getShieldCur () { return this->shieldCur; }
-int SpaceShip::getShieldMax () { return this->shieldMax; }
-
-int SpaceShip::getArmorCur () { return this->armorCur; }
-int SpaceShip::getArmorMax () { return this->armorMax; }
-
-int SpaceShip::getElectronicCur () { return this->electronicCur; }
-int SpaceShip::getElectronicMax () { return this->electronicMax; }
-
-void SpaceShip::damage(int pDamage, int eDamage){
+void SpaceShip::damage(float pDamage, float eDamage){
 if( this->shieldActive) {
     if( this->shieldCur > pDamage) {
@@ -540 +531 @@
       pDamage = pDamage - this->shieldCur;
       if( !this->shieldActive) {
-        this->armorCur = pDamage / 2; // remaining damages hits armor at half rate
+        this->armorCur -= pDamage / 2; // remaining damages hits armor at half rate
         this->electronicCur -= eDamage;
       }
@@ -552 +543 @@
 }
 
-void SpaceShip::regen(){
-  int time = 1; // FIXME implement tick time calculation
-  if (this->shieldCur == this->shieldMax){}
-  else {
-    if( this->shieldCur + this->shieldRegen * time > shieldMax)
+void SpaceShip::regen(float time){
+  float tmp;
+  if (this->shieldCur != this->shieldMax){
+    tmp =  this->shieldCur + this->shieldRegen * time;
+    if( tmp > 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->shieldCur = tmp;
+    this->shieldActive = ( this->shieldActive || this->shieldCur > shieldTH);
+  }
+  if (this->electronicCur != this->electronicMax){
+    tmp = this->electronicCur + this->electronicRegen * time;
+    if ( tmp > electronicMax)
       this->electronicCur = this->electronicMax;
     else
-      this->electronicCur += this->electronicRegen * time;
-  }
-}
-
+      this->electronicCur = tmp;
+  }
+}