Changeset 11432

Timestamp:

May 18, 2017, 5:05:53 PM (8 years ago)

Author:

rrogge

Message:

Reload works now

Location:

code/branches/Dialogue_FS17

Files:

• data/gui/scripts/Dialogue.lua (modified) (2 diffs)
• data/levels/events.oxw (modified) (1 diff)
• src/modules/dialogue/DialogueManager.cc (modified) (2 diffs)
• src/modules/dialogue/DialogueManager.h (modified) (2 diffs)
• src/modules/dialogue/NextQuestion.cc (modified) (1 diff)
• src/modules/dialogue/NextQuestion.h (modified) (1 diff)

code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua

@@ -128 +128 @@
 
 function P.cleanup(destroyDetails)
+    
     if P.wrapper ~= nil then
         winMgr:destroyWindow(P.wrapper)
@@ -141 +142 @@
         end
     end
+    orxonox.DialogueManager:getInstance():clean()
 end
 

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

@@ -63 +63 @@
      <possibleQuestions> 
         <NextQuestion  question="Are you sure?" a1="yep let me continue" a2="no actually not" />
-        <NextQuestion  question="Why?" a1="Got a dentist's appointment" a2="this sucks" />
+        <NextQuestion  question="Why?" a1="Got a dentist's appointment" a2="this sucks" >
+        <possibleQuestions>
+          <NextQuestion  question="Are your teeth that bad mate?" a1="yep" a2="leave me alone godammit" />
+          <NextQuestion  question="You suck" a1="..." a2="Im going now okay" />
+        </possibleQuestions>
+      </NextQuestion>
       </possibleQuestions>    
       <events>

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

@@ -47 +47 @@
                 
         }
+        void DialogueManager::setCurrentQuestion(NextQuestion* nq){
+                currentQuestion=nq;
+                
+        }
 
         std::string DialogueManager::getquestion(void){
@@ -92 +96 @@
                 this->setanswers1(nq->getanswers1());
                 this->setanswers2(nq->getanswers2());
+                depth=depth+1;
+                
+                
          }
-
+        void DialogueManager::clean(){
+                orxout() <<" depth " << depth << endl;
+                //allQuestions.at(2*depth+1);
+        }
         bool DialogueManager::theEnd(){
         if((currentQuestion->possibleQuestions).empty()) {

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

@@ -50 +50 @@
                 bool theEnd(); //tolua_export 
                 void update(NextQuestion* nq);
+                void clean(); //tolua_export
+                void setCurrentQuestion(NextQuestion* q);
 
 private:
@@ -57 +59 @@
         std::string a2;
         std::string question;
+        int depth = 0;
         static DialogueManager* singletonPtr_s;
 

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

@@ -77 +77 @@
                 
         m.setquestion(question);
+        m.setCurrentQuestion(this);
         m.setanswers1(a1);
         m.setanswers2(a2);

code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.h

@@ -49 +49 @@
                 std::string a1;
                 std::string a2;
-                
+