- Timestamp:
- May 23, 2009, 9:57:52 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/gametypes (added) merged: 2827,2903,2905-2906,2933-2936,2952,2954,2961,2970-2971,2978,2985-2986,3019-3020
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc
r3028 r3033 35 35 #include "core/XMLPort.h" 36 36 37 #include "orxonox/objects/worldentities/ ControllableEntity.h"37 #include "orxonox/objects/worldentities/pawns/Pawn.h" 38 38 39 39 namespace orxonox … … 109 109 WEMask.include(Class(WorldEntity)); 110 110 this->targetMask_ *= WEMask; 111 112 this->notifyMaskUpdate(); 111 113 } 112 114 … … 133 135 if(this->isForPlayer()) 134 136 { 135 ControllableEntity* player = dynamic_cast<ControllableEntity*>(entity);137 Pawn* player = dynamic_cast<Pawn*>(entity); 136 138 this->setTriggeringPlayer(player); 137 139 }
Note: See TracChangeset
for help on using the changeset viewer.