Changeset 8858 for code/trunk/src/modules/questsystem/QuestEffectBeacon.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/questsystem/QuestEffectBeacon.cc
r8706 r8858 79 79 XMLPortEventSink(QuestEffectBeacon, BaseObject, "execute", execute, xmlelement, mode); //TODO: Change BaseObject to MultiTrigger as soon as MultiTrigger is the base of all triggers. 80 80 81 COUT(4) << "New QuestEffectBeacon created." << std::endl;81 orxout(verbose, context::quests) << "New QuestEffectBeacon created." << endl; 82 82 } 83 83 … … 108 108 if(!(this->isActive())) // If the QuestEffectBeacon is inactive it cannot be executed. 109 109 { 110 COUT(4) << "The QuestEffectBeacon is inactive." << std::endl;110 orxout(verbose, context::quests) << "The QuestEffectBeacon is inactive." << endl; 111 111 return false; 112 112 } … … 128 128 if(player == NULL) 129 129 { 130 COUT(4) << "The QuestEffectBeacon was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << std::endl;131 return false; 132 } 133 134 COUT(4) << "QuestEffectBeacon executed on player: " << player << " ." << std::endl;130 orxout(verbose, context::quests) << "The QuestEffectBeacon was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << endl; 131 return false; 132 } 133 134 orxout(verbose, context::quests) << "QuestEffectBeacon executed on player: " << player << " ." << endl; 135 135 136 136 bool temp = QuestEffect::invokeEffects(player, this->effects_); // Invoke the QuestEffects on the PlayerInfo. … … 221 221 this->effects_.push_back(effect); 222 222 223 COUT(4) << "A QuestEffect was added to a QuestEffectBeacon." << std::endl;223 orxout(verbose, context::quests) << "A QuestEffect was added to a QuestEffectBeacon." << endl; 224 224 return true; 225 225 }
Note: See TracChangeset
for help on using the changeset viewer.