Changeset 11071 for code/trunk/src/modules/objects/triggers/Trigger.cc
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/modules/objects/triggers/Trigger.cc
r10624 r11071 37 37 #include "core/CoreIncludes.h" 38 38 #include "core/GameMode.h" 39 #include "core/XMLPort.h"40 39 #include "core/command/ConsoleCommandIncludes.h" 41 40 … … 86 85 { 87 86 88 }89 90 /**91 @brief92 Method for creating a Trigger object through XML.93 */94 void Trigger::XMLPort(Element& xmlelement, XMLPort::Mode mode)95 {96 SUPER(Trigger, XMLPort, xmlelement, mode);97 87 } 98 88 … … 203 193 Returns true if the Trigger should be triggered and false if not. 204 194 */ 205 bool Trigger::isTriggered(TriggerMode ::Valuemode)195 bool Trigger::isTriggered(TriggerMode mode) 206 196 { 207 197 // If the trigger has sub-triggers. … … 234 224 { 235 225 // Iterate over all sub-triggers. 236 for ( std::set<TriggerBase*>::iterator it = this->children_.begin(); it != this->children_.end(); ++it)237 { 238 if (! (*it)->isActive())226 for (TriggerBase* child : this->children_) 227 { 228 if (!child->isActive()) 239 229 return false; 240 230 } … … 252 242 { 253 243 // Iterate over all sub-triggers. 254 for ( std::set<TriggerBase*>::iterator it = this->children_.begin(); it != this->children_.end(); ++it)255 { 256 if ( (*it)->isActive())244 for (TriggerBase* child : this->children_) 245 { 246 if (child->isActive()) 257 247 return true; 258 248 } … … 270 260 { 271 261 bool test = false; 272 for ( std::set<TriggerBase*>::iterator it = this->children_.begin(); it != this->children_.end(); ++it)273 { 274 if (test && (*it)->isActive())262 for (TriggerBase* child : this->children_) 263 { 264 if (test && child->isActive()) 275 265 return false; 276 if ( (*it)->isActive())266 if (child->isActive()) 277 267 test = true; 278 268 } … … 346 336 { 347 337 // Iterate over all Triggers. 348 for ( ObjectList<Trigger>::iterator it = ObjectList<Trigger>::begin(); it != ObjectList<Trigger>::end(); ++it)349 it->setVisible(bVisible);338 for (Trigger* trigger : ObjectList<Trigger>()) 339 trigger->setVisible(bVisible); 350 340 } 351 341
Note: See TracChangeset
for help on using the changeset viewer.