Changeset 8858 for code/trunk/src/modules/objects/Script.cc
- Timestamp:
- Aug 23, 2011, 12:45:53 AM (13 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:ignore
-
old new 1 1 build 2 2 codeblocks 3 vs 3 4 dependencies
-
- Property svn:mergeinfo changed
/code/branches/output (added) merged: 8739-8740,8765,8771-8772,8774-8780,8787-8789,8794-8799,8801,8803-8812,8814,8816-8817,8820,8822,8825-8837,8840,8844,8846,8848-8850,8853-8854
- Property svn:ignore
-
code/trunk/src/modules/objects/Script.cc
r8706 r8858 137 137 return false; 138 138 139 COUT(4) << "Script (&" << this << ") triggered." << std::endl;139 orxout(verbose, context::misc::script) << "Script (&" << this << ") triggered." << endl; 140 140 141 141 PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger); … … 155 155 if(player == NULL) //TODO: Will this ever happen? If not, change in NotificationDispatcher as well. 156 156 { 157 COUT(4) << "The Script was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << std::endl;157 orxout(internal_warning) << "The Script was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << endl; 158 158 return false; 159 159 } … … 272 272 else 273 273 { 274 COUT(2) << "Invalid mode '" << mode << "' in Script object. Setting to 'normal'." << std::endl;274 orxout(internal_warning) << "Invalid mode '" << mode << "' in Script object. Setting to 'normal'." << endl; 275 275 this->setMode(ScriptMode::normal); 276 276 this->modeStr_ = Script::NORMAL; … … 323 323 else 324 324 { 325 COUT(2) << "Invalid times '" << times << "' in Script. Setting to infinity." << std::endl;325 orxout(internal_warning) << "Invalid times '" << times << "' in Script. Setting to infinity." << endl; 326 326 this->times_ = Script::INF; 327 327 this->remainingExecutions_ = Script::INF;
Note: See TracChangeset
for help on using the changeset viewer.