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

Timestamp:

Jun 17, 2007, 2:25:20 PM (17 years ago)

Author:

rennerc

Message:

player cannot shoot throu walls
per default worldentities cannot be killed
weapon correct again

File:

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

branches/presentation/src/world_entities/world_entity.cc

@@ -99 +99 @@
   
   this->forwardDamageToParent = false;
+  this->damageable = false;
 
   // registering default reactions:
@@ -183 +184 @@
   
   LoadParam(root, "forwardDamageToParent", this, WorldEntity, setForwardDamageToParent);
+  
+  LoadParam(root, "damageable", this, WorldEntity, setDamageable);
 
   // Track
@@ -994 +997 @@
   bool dead = this->getHealth()<=0;
   
+  if ( !damageable )
+    return;
+  
   this->decreaseHealth(damage);