Changeset 3034 for code/trunk/src/orxonox/objects
- Timestamp:
- May 23, 2009, 10:05:58 PM (16 years ago)
- Location:
- code/trunk/src/orxonox/objects/worldentities
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/orxonox/objects/worldentities/pawns/Spectator.cc
r2896 r3034 112 112 void Spectator::changedFlareVisibility() 113 113 { 114 if ( this->greetingFlare_)114 if (this->greetingFlare_) 115 115 this->greetingFlare_->setVisible(this->bGreetingFlareVisible_); 116 116 } -
code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc
r3033 r3034 86 86 { 87 87 Identifier* targetId = ClassByString(targets); 88 88 89 89 //! Checks whether the target is (or is derived from) a ControllableEntity. 90 90 Identifier* controllableEntityId = Class(ControllableEntity); … … 93 93 this->setForPlayer(true); 94 94 } 95 95 96 96 if (!targetId) 97 97 { … … 131 131 if (distanceVec.length() < this->distance_) 132 132 { 133 134 // !If the target is a player (resp. is a, or is derived from a, ControllableEntity) the triggeringPlayer is set to the target entity.133 134 // If the target is a player (resp. is a, or is derived from a, ControllableEntity) the triggeringPlayer is set to the target entity. 135 135 if(this->isForPlayer()) 136 136 { 137 137 Pawn* player = dynamic_cast<Pawn*>(entity); 138 139 140 138 this->setTriggeringPlayer(player); 139 } 140 141 141 return true; 142 142 }
Note: See TracChangeset
for help on using the changeset viewer.