comment a lot of debug prints

14 files changed, 21 insertions, 79 deletions

diff --git a/src/game/Area1Game1.py b/src/game/Area1Game1.py
index 6e48488..16e0221 100644
--- a/src/game/Area1Game1.py
+++ b/src/game/Area1Game1.py
@@ -75,7 +75,7 @@ class Piece(CSprite):
                 if (d < self.MIN_DISTANCE):
                     self.setState(STATE_ADJUST)
                 else:
-                    print 'set return'
+                    #print 'set return'
                     self.setState(STATE_RETURN)
                 self.mParent.mActivePiece = None
 
@@ -322,8 +322,6 @@ class CArea1Game1(CGameState):
         CGame().removeChild(self.mAlpha)
         CGame().removeChild(self.mDialog)
         CGame().removeChild(self.mButtonAccept)
-
-        print "CArea1Game1 destroy"
         
     def doEvents(self, aEvent):
         print aEvent.type
diff --git a/src/game/Area1Game3.py b/src/game/Area1Game3.py
index f942fc0..9eea915 100644
--- a/src/game/Area1Game3.py
+++ b/src/game/Area1Game3.py
@@ -268,10 +268,7 @@ class CArea1Game3(CGameState):
             return False
        
     def destroy(self):
-        print 'destroy a1g3'
         CGameState.destroy(self)
-        #self.mInstructions.destroy()
-        self.mInstructions = None
 
         CGame().removeChild(self.mButtonBack)
         CGame().removeChild(self.mLabelQuestion)
diff --git a/src/game/Area1Game4.py b/src/game/Area1Game4.py
index ffbc634..c2a5763 100644
--- a/src/game/Area1Game4.py
+++ b/src/game/Area1Game4.py
@@ -150,8 +150,8 @@ class CArea1Game4(CGameState):
                         CGame().addChild(self.mBadSprite)
                     self.mLocalState = STATE_ANIM
                     
-                else:
-                    print 'fin preguntas'
+                #else:
+                    #print 'fin preguntas'
         else:
             self.mAnimCounter = self.mAnimCounter + 1
             if self.mAnimCounter > TIME_ANIM:
@@ -167,7 +167,7 @@ class CArea1Game4(CGameState):
                     CGame().addChild(self.mLabelEnd)
                     CGame().removeChild(self.mBook)
                     CGame().removeChild(self.mLabelQuestion)
-                    print 'ultima'
+                    #print 'ultima'
         
         
     def destroy(self):
@@ -188,5 +188,3 @@ class CArea1Game4(CGameState):
             b = self.mButtonList[i]
             CGame().removeChild(b)
             b = None
-
-        print "CArea1Game4 destroy"
diff --git a/src/game/Area1Game5.py b/src/game/Area1Game5.py
index fc58fb3..50caabf 100644
--- a/src/game/Area1Game5.py
+++ b/src/game/Area1Game5.py
@@ -239,10 +239,7 @@ class CArea1Game5(CGameState):
 
        
     def destroy(self):
-        print 'destroy a1g5'
         CGameState.destroy(self)
-        #self.mInstructions.destroy()
-        self.mInstructions = None
 
         CGame().removeChild(self.mButtonBack)
         CGame().removeChild(self.mLabelQuestion)
diff --git a/src/game/Area1Game6.py b/src/game/Area1Game6.py
index a73a718..3f11d7e 100644
--- a/src/game/Area1Game6.py
+++ b/src/game/Area1Game6.py
@@ -342,27 +342,17 @@ class CArea1Game6(CGameState):
         
     def destroy(self):
         CGameState.destroy(self)
-        #self.mInstructions.destroy()
-        self.mInstructions = None
         CGame().removeChild(self.mButtonBack)
         CGame().removeChild(self.mPoints)
         CGame().removeChild(self.mBase)
-        
         # remove pieces from the game
         for piece in self.mListPieces:
             CGame().removeChild(piece)
             piece = None
-        
         if self.mHelpActive:
             CGame().removeChild(self.mHelpActive)
-        
-        #self.mButtonPlay.destroy()
         self.mButtonBack = None
         self.mBackground = None
-
         self.mWord01 = None
         self.mHelp01 = None
-        
         self.mPoints = None
-
-        print "CArea1Game6 destroy"
diff --git a/src/game/Area2Game2.py b/src/game/Area2Game2.py
index 1e64603..b1912f7 100644
--- a/src/game/Area2Game2.py
+++ b/src/game/Area2Game2.py
@@ -226,5 +226,3 @@ class CArea2Game2(CGameState):
         self.mPoints = None
         self.mButtonTrue = None
         self.mButtonFalse = None
-
-        print "CArea2Game2 destroy"
\ No newline at end of file
diff --git a/src/game/BoyHall.py b/src/game/BoyHall.py
index 882b89b..5c178af 100644
--- a/src/game/BoyHall.py
+++ b/src/game/BoyHall.py
@@ -149,7 +149,7 @@ class CBoyHall(CSprite):
             else:
                 self.setImage(self.mFrameImage[1])
             self.mAnim.init(1, self.DELAY_FRAMES_WALKING, False)
-            print 'set stale'
+            #print 'set stale'
                     
         elif (aState == self.STATE_WALKING):
             
@@ -172,7 +172,7 @@ class CBoyHall(CSprite):
                 self.setImage(self.mFrameImage[0])
                 self.mAnim.init(3, self.DELAY_FRAMES_WALKING, True, 0)
                 self.mLastSense = 1
-            print 'set walk'
+            #print 'set walk'
         self.mState = aState
 
     def getState(self):
diff --git a/src/game/CreditsState.py b/src/game/CreditsState.py
index d5563cb..ac52cd2 100644
--- a/src/game/CreditsState.py
+++ b/src/game/CreditsState.py
@@ -68,7 +68,7 @@ class CCreditsState(CGameState):
                 self.mButtonBack.setImage(self.mBackImageN)
         
         if self.mButtonBack.clicked():
-            print "clicked back......"
+            #print "clicked back......"
             ms = MenuState.CMenuState()
             CGame().setState(ms)
         
@@ -78,8 +78,3 @@ class CCreditsState(CGameState):
         CGame().removeChild(self.mCredits)
         self.mButtonBack = None
         self.mBackground = None
-        #CGame().removeChild(self.mGlobe)
-        print "CMenuState destroy"
-        
-    def doEvents(self, aEvent):
-        print aEvent.type
diff --git a/src/game/HallState.py b/src/game/HallState.py
index 28e02a8..ac5cc25 100644
--- a/src/game/HallState.py
+++ b/src/game/HallState.py
@@ -227,6 +227,3 @@ class CHallState(CGameState):
         self.mStar1 = None
         self.mStar2 = None
         self.mBackground = None
-        
-    def doEvents(self, aEvent):
-        print aEvent.type
diff --git a/src/game/MenuState.py b/src/game/MenuState.py
index d5ce1a8..d42fe26 100644
--- a/src/game/MenuState.py
+++ b/src/game/MenuState.py
@@ -94,33 +94,33 @@ class CMenuState(CGameState):
             self.mButtonExit.set_bgColor(NORMAL_COLOR)
         
         if self.mButtonCredits.clicked():
-            print "clicked credits"
+            #print "clicked credits"
             #cs = CHelpState()
             cs = CCreditsState()
             CGame().setState(cs)
             return
         
         elif self.mButtonPresentation.clicked():
-            print "clicked presentation"
+            #print "clicked presentation"
             presentation = CPresentationState()
             CGame().setState(presentation)
             return
         
         elif self.mButtonPlay.clicked():
-            print "clicked play"
+            #print "clicked play"
             partida = CSelectPartidaState()
             CGame().setState(partida)
             return
                 
-        elif self.mButtonHelp.clicked():
+            """elif self.mButtonHelp.clicked():
             print "clicked help"
             #cs = CHelpState()
             hp = CCreditsState()
             CGame().setState(hp)
-            return
+            return"""
             
         elif self.mButtonExit.clicked():
-            print 'exit'
+            #print 'exit'
             CGame().destroy()
             exit()
 
diff --git a/src/game/PresentationState.py b/src/game/PresentationState.py
index 5fb0077..23772a3 100644
--- a/src/game/PresentationState.py
+++ b/src/game/PresentationState.py
@@ -56,7 +56,7 @@ class CPresentationState(CGameState):
         if self.mactive == True:
             if CMouse().release():
                 self.mactive = False
-                print "click"
+                #print "click"
                 ms = MenuState.CMenuState()
                 CGame().setState(ms)
                 return
@@ -73,8 +73,3 @@ class CPresentationState(CGameState):
         self.mTitle.destroy()
         self.mTitle = None
         self.mBackground = None
-        print "CMenuState destroy"
-        
-    def doEvents(self, aEvent):
-        print aEvent.type
-
diff --git a/src/game/SelectAreaState.py b/src/game/SelectAreaState.py
index 24e8424..e8a95ee 100644
--- a/src/game/SelectAreaState.py
+++ b/src/game/SelectAreaState.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-
 import pygame
 import MenuState
 from api.GameState import CGameState
@@ -15,7 +14,6 @@ from HallState import CHallState
 from assets.data import selectArea_data
 
 
-
 class CSelectAreaState(CGameState):
 
     mBackground = None    
@@ -178,11 +176,8 @@ class CSelectAreaState(CGameState):
                 self.mArea3Is = False
 
     def destroy(self):
-        print 'select area state destroy'
-        CGame().removeChild(self.mButtonBack )
-        self.mButtonBack = None
-        
         CGameState.destroy(self)
+        
         CGame().removeChild(self.mButtonBack)
         self.mButtonBack = None
         CGame().removeChild(self.mArea1)
@@ -201,6 +196,4 @@ class CSelectAreaState(CGameState):
         self.mArea3 = None
         self.mFrameImageArea3 = None
         self.mBackground = None
-        
-    def doEvents(self, aEvent):
-        print aEvent.type
+
diff --git a/src/game/SelectCharacterState.py b/src/game/SelectCharacterState.py
index 57bf457..daee4e2 100644
--- a/src/game/SelectCharacterState.py
+++ b/src/game/SelectCharacterState.py
@@ -1,14 +1,11 @@
 # -*- coding: utf-8 -*-
 
 import pygame
-
 from api.GameState import CGameState
 from api.Label import CLabel
 from api.Game import CGame
 from api.Sprite2 import CSprite
-
 from SelectAreaState import CSelectAreaState
-
 import api.Image as Image
 
 from gettext import gettext as _
@@ -20,7 +17,6 @@ class CSelectCharacterState(CGameState):
 
     def init(self):
         CGameState.__init__(self)
-
         
         self.mBackground = Image.loadImage('assets/images/selectArea/background.jpg', False)
         CGame().setBackground(self.mBackground)
@@ -64,7 +60,7 @@ class CSelectCharacterState(CGameState):
         CGameState.update(self)
 
         if self.mJuan.clicked():
-            print "clicked Juan"
+            #print "clicked Juan"
             par = CGame().getCurrentPartida()
             CGame().setCharacter(par, 'Juan')
             ms = CSelectAreaState()
@@ -72,7 +68,7 @@ class CSelectCharacterState(CGameState):
             return
         
         elif self.mElisa.clicked():
-            print "clicked Elisa"
+            #print "clicked Elisa"
             par = CGame().getCurrentPartida()
             CGame().setCharacter(par, 'Elisa')
             ms = CSelectAreaState()
@@ -102,4 +98,3 @@ class CSelectCharacterState(CGameState):
         CGame().removeChild(self.mMessage)
         self.mMessage = None
         self.mBackground = None
-        print "CMenuState destroy"
diff --git a/src/game/SelectPartidaState.py b/src/game/SelectPartidaState.py
index 276e8a9..e30f97f 100644
--- a/src/game/SelectPartidaState.py
+++ b/src/game/SelectPartidaState.py
@@ -403,7 +403,7 @@ class CSelectPartidaState(CGameState):
             if self.mFlag == 0:
                                 
                 if self.mPartida1.clicked():
-                    print "partida 1"
+                    #print "partida 1"
                     if self.misEmptyP1:
                         ch = CSelectCharacterState()
                     else:
@@ -414,7 +414,7 @@ class CSelectPartidaState(CGameState):
                     return
                     
                 elif self.mPartida2.clicked():
-                    print "partida 2"
+                    #print "partida 2"
                     if self.misEmptyP2:
                         ch = CSelectCharacterState()
                     else:
@@ -425,7 +425,7 @@ class CSelectPartidaState(CGameState):
                     return
                 
                 elif self.mPartida3.clicked():
-                    print "partida 3"
+                    #print "partida 3"
                     if self.misEmptyP3:
                         ch = CSelectCharacterState()
                     else:
@@ -514,13 +514,10 @@ class CSelectPartidaState(CGameState):
             
     def destroy(self):
         CGameState.destroy(self)
-        
         CGame().removeChild(self.mButtonBack )
         self.mButtonBack = None
-
         CGame().removeChild(self.mMessage)
         self.mMessage = None
-        
         CGame().removeChild(self.mPartida1)
         self.mPartida1 = None
         CGame().removeChild(self.mBorderPartida1)
@@ -530,7 +527,6 @@ class CSelectPartidaState(CGameState):
         CGame().removeChild(self.mChar1)
         self.mChar1 = None
         CGame().removeChild(self.mEmpty1)
-        
         CGame().removeChild(self.mPartida2)
         self.mPartida2 = None
         CGame().removeChild(self.mBorderPartida2)
@@ -540,7 +536,6 @@ class CSelectPartidaState(CGameState):
         CGame().removeChild(self.mChar2)
         self.mChar2 = None
         CGame().removeChild(self.mEmpty2)
-        
         CGame().removeChild(self.mPartida3)
         self.mPartida3 = None
         CGame().removeChild(self.mBorderPartida3)
@@ -550,19 +545,13 @@ class CSelectPartidaState(CGameState):
         CGame().removeChild(self.mChar3)
         self.mChar3 = None
         CGame().removeChild(self.mEmpty3)
-    
         for e in self.mP1_Stars:
             CGame().removeChild(e)
-            
         for e in self.mP2_Stars:
             CGame().removeChild(e)
-            
         for e in self.mP3_Stars:
             CGame().removeChild(e)
-        
         CGame().removeChild(self.mDeletePartida1)
         CGame().removeChild(self.mDeletePartida2)
         CGame().removeChild(self.mDeletePartida3)
-        
         self.mBackground = None
-        print "CMenuState destroy"