Changeset 11394 for code/branches/Dialogue_FS17/src/modules/dialogue
- Timestamp:
- Apr 6, 2017, 4:17:58 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc
r11393 r11394 15 15 namespace orxonox { 16 16 //ManageScopedSingleton(DialogueManager, ScopeID::ROOT, false); 17 RegisterAbstractClass(DialogueManager).inheritsFrom< Configurable>();17 RegisterAbstractClass(DialogueManager).inheritsFrom<BaseObject>(); 18 18 19 19 … … 23 23 DialogueManager::DialogueManager(Context* context): BaseObject(context){ 24 24 RegisterObject(DialogueManager); 25 this->setConfigValues();25 26 26 27 27 … … 50 50 bool DialogueManager::execute(bool bTriggered, BaseObject* trigger) 51 51 { 52 if(!bTriggered) return false; 52 //if(!bTriggered) return false; 53 54 53 55 54 56 orxout() << "bTriggered is " << bTriggered;
Note: See TracChangeset
for help on using the changeset viewer.