Changeset 11395 for code/branches

Timestamp:

Apr 6, 2017, 4:18:21 PM (8 years ago)

Author:

patricwi

Message:

dialogue classes added

Location:

code/branches/HUD_HS16

Files:

• data/levels/events.oxw (modified) (2 diffs)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/dialogue (added)
• src/modules/dialogue/CMakeLists.txt (added)
• src/modules/dialogue/Dialogue.layout (added)
• src/modules/dialogue/Dialogue.lua (added)
• src/modules/dialogue/DialogueManager.cc (added)
• src/modules/dialogue/DialogueManager.h (added)
• src/modules/dialogue/DialoguePrereqs.h (added)
• src/modules/dialogue/NextQuestion.cc (added)
• src/modules/dialogue/NextQuestion.h (added)
• src/modules/pickup/DDDialogue.cc (modified) (3 diffs)

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

@@ -77 +77 @@
     <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"/>
-    <DDDialogue string="Hello World3" >
+    <DialogueManager question="Hello World3">
       <events>
         <execute>
@@ -83 +83 @@
         </execute>
       </events>
-    </DDDialogue>
+    </DialogueManager>
+
 
     <!-- orange -->

code/branches/HUD_HS16/src/modules/CMakeLists.txt

@@ -27 +27 @@
 
 ADD_SUBDIRECTORY(designtools)
+ADD_SUBDIRECTORY(dialogue)
 ADD_SUBDIRECTORY(gametypes)
 ADD_SUBDIRECTORY(notifications)

code/branches/HUD_HS16/src/modules/pickup/DDDialogue.cc

@@ -9 +9 @@
     RegisterClass(DDDialogue);
 
+
     /**
     @brief
@@ -18 +19 @@
     }
 
+    //getResponses
 
     bool DDDialogue::execute(bool bTriggered, BaseObject* trigger)
     {  
         if(!bTriggered) return false;
+
+        
 
         orxout() << "bTriggered is " << bTriggered;
@@ -45 +49 @@
         XMLPortEventSink(DDDialogue, BaseObject, "execute", execute, xmlelement, mode); 
     }
+
+
 }