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

Timestamp:

Dec 3, 2006, 3:26:08 PM (18 years ago)

Author:

nicolasc

Message:

update regen(); add new model for hbolt

File:

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

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

@@ -626 +626 @@
     }
     else { // shield <= pDamage
-      this->shieldCur = 0;
-      this->shieldActive = false; //shield collaptses
+      this->shieldCur -=pDamage;
+      this->shieldActive = false; //shield collapses
       pDamage = pDamage - this->shieldCur;
       if( !this->shieldActive) {
@@ -641 +641 @@
   if( this->armorCur <= 0) { /* FIXME implement shipcrash*/ }
 }
+
 
 void SpaceShip::regen(float time){
@@ -671 +672 @@
 }
 
+
 /**
  * Weapon regeneration
@@ -679 +681 @@
   float energy  = ( this->reactorOutput * this->weaponEnergyShare + this->weaponEnergyRegen) * time;
   Weapon* weapon;
-  for( int i=0; i < this->weaponMan.getSlotCount(); i++)
+  for( unsigned int i=0; i < this->weaponMan.getSlotCount(); i++)
   {
     weapon = this->weaponMan.getWeapon(i);
@@ -692 +694 @@
 }
 
+
 void SpaceShip::enterPlaymode(Playable::Playmode playmode)
 {
 }
 
+
 void SpaceShip::movement (float dt)
 {