[Orxonox-commit 6766] r11394 - in code/branches/Dialogue_FS17: data/levels src/modules/dialogue

[rrogge at orxonox.net]

Author: rrogge
Date: 2017-04-06 16:17:58 +0200 (Thu, 06 Apr 2017)
New Revision: 11394

Modified:
   code/branches/Dialogue_FS17/data/levels/events.oxw
   code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc
Log:
DialogueManager not loadable

Modified: code/branches/Dialogue_FS17/data/levels/events.oxw
===================================================================
--- code/branches/Dialogue_FS17/data/levels/events.oxw	2017-04-06 13:40:23 UTC (rev 11393)
+++ code/branches/Dialogue_FS17/data/levels/events.oxw	2017-04-06 14:17:58 UTC (rev 11394)
@@ -56,6 +56,15 @@
       works with all amounts of objects from zero to infinity. In the examples I used two objects each.
     -->
 
+<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 -->
     <!--

Modified: code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc
===================================================================
--- code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc	2017-04-06 13:40:23 UTC (rev 11393)
+++ code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc	2017-04-06 14:17:58 UTC (rev 11394)
@@ -14,7 +14,7 @@
 
 namespace orxonox {
 	//ManageScopedSingleton(DialogueManager, ScopeID::ROOT, false);
-	RegisterAbstractClass(DialogueManager).inheritsFrom<Configurable>();
+	RegisterAbstractClass(DialogueManager).inheritsFrom<BaseObject>();
 
 
 
@@ -22,8 +22,8 @@
 
 	DialogueManager::DialogueManager(Context* context): BaseObject(context){
 		RegisterObject(DialogueManager);
-		this->setConfigValues();
 		
+		
 
 	}
 	
@@ -49,8 +49,10 @@
 
 	bool DialogueManager::execute(bool bTriggered, BaseObject* trigger)
     {  
-        if(!bTriggered) return false;
+        //if(!bTriggered) return false;
 
+
+
         orxout() << "bTriggered is " << bTriggered;
         //orxout() << " 1 " << mystring << endl;
         return false;