fix answers order in a1g4

1 files changed, 26 insertions, 18 deletions

diff --git a/src/game/Area1Game4.py b/src/game/Area1Game4.py
index effd431..f3f7554 100644
--- a/src/game/Area1Game4.py
+++ b/src/game/Area1Game4.py
@@ -146,25 +146,33 @@ class CArea1Game4(CGameState):
             answer = 5
             
         if not(answer == -1):
-            n = self.mQuestionsL.index(answer)
-            print self.mQuestionsL
-            print n
-            print self.mCurrentQuestion
-            if (self.mCurrentQuestion == n):
-                b = self.mButtonList[answer]
-                b.mclicked = False
-                CGame().removeChild(b)
-                        
-                self.mGood = self.mGood + 1
-                self.mPoints.set_goods(self.mGood)
-            else:
-                self.mBad = self.mBad + 1
-                self.mPoints.set_bads(self.mBad)
-                print 'le erro'
-            
-            self.mCurrentQuestion = self.mCurrentQuestion + 1
+            n = -1
             if self.mCurrentQuestion < 6:
-                self.mLabelQuestion.set_text(self.mQuestions[self.mCurrentQuestion][0])
+                n = self.mQuestionsL[self.mCurrentQuestion]
+                """print 'current question', self.mCurrentQuestion
+                print self.mQuestionsL
+                print 'n', n
+                print 'answer', answer"""
+                if (answer == n):
+                    b = self.mButtonList[answer]
+                    b.mclicked = False
+                    CGame().removeChild(b)
+                            
+                    self.mGood = self.mGood + 1
+                    self.mPoints.set_goods(self.mGood)
+                else:
+                    self.mBad = self.mBad + 1
+                    self.mPoints.set_bads(self.mBad)
+                    
+                
+                self.mCurrentQuestion = self.mCurrentQuestion + 1
+                if not(self.mCurrentQuestion == 6):
+                    self.mLabelQuestion.set_text(self.mQuestions[self.mQuestionsL[self.mCurrentQuestion]][0])
+                else:
+                    CGame().removeChild(self.mLabelQuestion)
+                    print 'ultima'
+            else:
+                print 'fin preguntas'