Changeset 10758 in orxonox.OLD for branches/presentation/src/world_entities/world_entity.cc

Timestamp:

Jun 21, 2007, 1:37:21 AM (17 years ago)

Author:

nicolasc

Message:

added shield functionality, reverted paeddae's MP patch - does not work

File:

• branches/presentation/src/world_entities/world_entity.cc (modified) (5 diffs)

branches/presentation/src/world_entities/world_entity.cc

@@ -354 +354 @@
   // extract the mount points
   // Patrick: they get extracted automaticaly now within the model finalization process
-  /*
+  
 
   if(model != NULL)
@@ -362 +362 @@
     PRINTF(0)("Worldentity %s has no mount points", (this->getName()).c_str());
     return;
-  }*/
+  }
 
   // first get all mount points from the model
@@ -823 +823 @@
  * @returns the shield left (this->shieldMax - shiled + this->shield)
  */
-float WorldEntity::increaseShield(float shiled)
+float WorldEntity::increaseShield(float shield)
 {
   this->shield += shield;
@@ -1007 +1007 @@
   if ( !damageable )
     return;
-  
-  this->decreaseHealth(damage);
+
+  if (this->getShieldActive())
+    damage = this->decreaseShield(damage*2);
+  this->decreaseHealth(damage/2);
 
   if( this->getHealth() > 0)
@@ -1187 +1189 @@
 
 void WorldEntity::regen(float time){
-  static float tmp;
-  increaseHealth(time * this->healthRegen);
-  increaseShield(time * this->shieldRegen);
+  
+  printf("regen: %f, %f, %f ****************** ", time, this->healthRegen, this->shieldRegen);
+  float tmp;
+  this->increaseHealth(time * this->healthRegen);
+  this->increaseShield(time * this->shieldRegen);