Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsrc/states/Area1Game1.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/states/Area1Game1.py b/src/states/Area1Game1.py
index fb1c14d..c2658df 100755
--- a/src/states/Area1Game1.py
+++ b/src/states/Area1Game1.py
@@ -176,8 +176,8 @@ class CArea1Game1(CGameState):
# Constructor
# '''
- def __init__(self, aScreen):
- CGameState.__init__(self, aScreen)
+ def __init__(self):
+ CGameState.__init__(self)
#self.mInstructions = CMultiLabel()
#CGame().addChild(self.mInstructions)
#print self.mX
@@ -191,20 +191,20 @@ class CArea1Game1(CGameState):
self.mButtonBack.set_center((110, 650))
self.mButtonBack.set_size((200, 40))
self.mButtonBack.set_text(_('Volver'))
- self.addChild(self.mButtonBack)
+ CGame().addChild(self.mButtonBack)
self.mBackground = Image.loadImage('assets/images/a1game1.png', False)
- self.setBackground(self.mBackground)
+ CGame().setBackground(self.mBackground)
# load the pieces
# parameters: aParent, aNum, aOrigin, aDestine
self.mPiece1 = Piece(self, 0, (824.0, 693.0), (487.0, 169.0))
self.mPiece1.setImage('assets/images/piece1.png', False)
- self.addChild(self.mPiece1)
+ CGame().addChild(self.mPiece1)
self.mPiece9 = Piece(self, 8, (676.0, 680.0), (776.0, 353.0))
self.mPiece9.setImage('assets/images/piece9.png', False)
- self.addChild(self.mPiece9)
+ CGame().addChild(self.mPiece9)
# load the options
self.mOption1 = CSprite()
@@ -227,7 +227,7 @@ class CArea1Game1(CGameState):
if self.mButtonBack.clicked():
print "clicked clicked back of a1g1"
#cs = CHelpState()
- ms = MenuState.CMenuState(self.mScreen)
+ ms = MenuState.CMenuState()
CGame().setState(ms)
#def render(self):
@@ -238,11 +238,11 @@ class CArea1Game1(CGameState):
CGameState.destroy(self)
#self.mInstructions.destroy()
self.mInstructions = None
- self.removeChild(self.mButtonBack)
- self.removeChild(self.mPiece1)
- self.removeChild(self.mPiece9)
- self.removeChild(self.mOption1)
- self.removeChild(self.mOption9)
+ CGame().removeChild(self.mButtonBack)
+ CGame().removeChild(self.mPiece1)
+ CGame().removeChild(self.mPiece9)
+ CGame().removeChild(self.mOption1)
+ CGame().removeChild(self.mOption9)
#self.mButtonPlay.destroy()
self.mButtonBack = None
self.mBackground = None