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

Timestamp:

Jun 21, 2007, 1:30:36 PM (17 years ago)

Author:

rennerc

Message:

shield init

File:

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

branches/presentation/src/world_entities/world_entity.cc

@@ -100 +100 @@
   this->forwardDamageToParent = false;
   this->damageable = false;
+  
+  this->loadShield( 0, 0, 0, 0 );
 
   // registering default reactions:
@@ -1015 +1017 @@
   if (this->getShieldActive())
     damage = this->decreaseShield(damage*2);
-  this->decreaseHealth(damage/2);
+
+  this->decreaseHealth(damage);
 
   if( this->getHealth() > 0)