Changeset 11394 for code/branches

Timestamp:

Apr 6, 2017, 4:17:58 PM (8 years ago)

Author:

rrogge

Message:

DialogueManager not loadable

Location:

code/branches/Dialogue_FS17

Files:

• data/levels/events.oxw (modified) (1 diff)
• src/modules/dialogue/DialogueManager.cc (modified) (3 diffs)

code/branches/Dialogue_FS17/data/levels/events.oxw

@@ -57 +57 @@
     -->
 
+<DistanceTrigger name="test" position="0,0,0" target="Pawn" distance=25 stayActive="true"/>
+    <Backlight position="0,0,0" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,0,0"/>
+    <DialogueManager question="Hello World3">
+      <events>
+        <execute>
+           <EventListener event="test" />
+        </execute>
+      </events>
+    </DialogueManager>
 
     <!-- red -->

code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc

@@ -15 +15 @@
 namespace orxonox {
         //ManageScopedSingleton(DialogueManager, ScopeID::ROOT, false);
-        RegisterAbstractClass(DialogueManager).inheritsFrom<Configurable>();
+        RegisterAbstractClass(DialogueManager).inheritsFrom<BaseObject>();
 
 
@@ -23 +23 @@
         DialogueManager::DialogueManager(Context* context): BaseObject(context){
                 RegisterObject(DialogueManager);
-                this->setConfigValues();
+                
                 
 
@@ -50 +50 @@
         bool DialogueManager::execute(bool bTriggered, BaseObject* trigger)
     {  
-        if(!bTriggered) return false;
+        //if(!bTriggered) return false;
+
+
 
         orxout() << "bTriggered is " << bTriggered;