Changeset 11428 for code/branches/Dialogue_FS17/src/modules

Timestamp:

May 18, 2017, 4:06:53 PM (7 years ago)

Author:

rrogge

Message:

Alles funktionioniert so weit, bloss kann man pro Spiel bloss einmal einen Dialog durchlaufen

Location:

code/branches/Dialogue_FS17/src/modules/dialogue

Files:

• DialogueManager.cc (modified) (4 diffs)
• DialogueManager.h (modified) (1 diff)
• NextQuestion.cc (modified) (2 diffs)

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

@@ -74 +74 @@
         void DialogueManager::a1clicked(void){
                 
-                assert((currentQuestion->retposQues())[0]);
-                orxout() << "a14 clicked" << endl;
-                orxout() << currentQuestion->possibleQuestions[0] << endl;
+                
                 currentQuestion = currentQuestion->possibleQuestions[0];
                 update(currentQuestion);
@@ -84 +82 @@
         void DialogueManager::a2clicked(void){
                 orxout() << "a2 clicked" << endl;
+
+                currentQuestion = currentQuestion->possibleQuestions[1];
+                update(currentQuestion);
+
                 
         }
@@ -92 +94 @@
          }
 
-        
+        bool DialogueManager::theEnd(){
+        if((currentQuestion->possibleQuestions).empty()) {
+                orxout() << "endtrue" << endl;
+                return true;}
+        else return false;
+        }
 
         
@@ -98 +105 @@
         /*
         
-        bool DialogueManager::theEnd(){
-        if(currentQuestion->retposQues()) return true;
-        else return false;
-        }
+        
         
 

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

@@ -48 +48 @@
                 void a1clicked(void); //tolua_export
                 void a2clicked(void); //tolua_export
-                        //bool theEnd(); 
+                bool theEnd(); //tolua_export 
                 void update(NextQuestion* nq);
 

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

@@ -20 +20 @@
         DialogueManager& m = DialogueManager::getInstance();
         m.registerquestion(this);
-       
+       //possibleQuestions=nullptr;
         
     }
@@ -114 +114 @@
 
         std::vector<NextQuestion*> NextQuestion::retposQues(){
-                orxout() << "fish" << endl;
-                assert(possibleQuestions[0]);
-                orxout() << possibleQuestions.size() << endl;
+                //if(possibleQuestions.size()==0) return NULL;
+        
+                orxout() << "SIZE" << possibleQuestions.size() << endl;
                 return possibleQuestions;
         }