Changeset 2986 for code/branches/gametypes/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc

Timestamp:

May 18, 2009, 6:00:13 PM (15 years ago)

Author:

Aurelian

Message:

Respawning changed, not possible anymore, not completely working. Movable Entity is now able to cause damage.

File:

• code/branches/gametypes/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) (3 diffs)

code/branches/gametypes/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc

@@ -35 +35 @@
 #include "core/XMLPort.h"
 
-#include "orxonox/objects/worldentities/ControllableEntity.h"
+#include "orxonox/objects/worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -109 +109 @@
     WEMask.include(Class(WorldEntity));
     this->targetMask_ *= WEMask;
+
+    this->notifyMaskUpdate();
   }
 
@@ -133 +135 @@
         if(this->isForPlayer())
         {
-          ControllableEntity* player = dynamic_cast<ControllableEntity*>(entity);
+          Pawn* player = dynamic_cast<Pawn*>(entity);
           this->setTriggeringPlayer(player);
         }