Changeset 10708 in orxonox.OLD for branches/presentation/src/world_entities/npcs/adm_turret.cc

Timestamp:

Jun 16, 2007, 11:15:39 AM (17 years ago)

Author:

rennerc

Message:

improved damage handling for adm

File:

• branches/presentation/src/world_entities/npcs/adm_turret.cc (modified) (4 diffs)

branches/presentation/src/world_entities/npcs/adm_turret.cc

@@ -242 +242 @@
 void AdmTurret::addCannons( const TiXmlElement * root )
 {
-  this->cannons = new WorldEntity();
+  this->cannons = new DamageForwardingWorldEntity( this );
         this->cannons->setParent(this);
         this->cannons->loadParams( root );
@@ -250 +250 @@
 
         this->cannons->toList( getOMListNumber() );
+        this->cannons->setForwardDamageToParent( true );
 }
 
@@ -260 +261 @@
         //this->weapon->setAbsCoor( this->cannons->getAbsCoor() );
         this->weapon->setAbsDir( this->weapon->getAbsDir() * Quaternion( PI, Vector(0, 1, 0) ) );
+        
+        this->weapon->setForwardDamageToParent( true );
 }
 
 void AdmTurret::addSensor( const TiXmlElement * root )
 {
-  this->sensor = new WorldEntity();
+  this->sensor = new DamageForwardingWorldEntity( this );
         this->sensor->setParent(this);
         this->sensor->loadParams( root );
@@ -270 +273 @@
         //this->sensor->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
         //this->sensor->addNodeFlags(PNODE_PROHIBIT_CHILD_DELETE);
-        this->sensor->toList( getOMListNumber() );
+        
 }