lot of changes and cleans due to CSprite and other things

13 files changed, 226 insertions, 306 deletions

diff --git a/src/game/Area1Game1.py b/src/game/Area1Game1.py
index 332e21d..496983c 100644
--- a/src/game/Area1Game1.py
+++ b/src/game/Area1Game1.py
@@ -45,16 +45,13 @@ class Piece(CSprite):
     mState = None
 
     def __init__(self, aParent, aNum, aOrigin, aDestine):
-        CSprite.__init__(self)
-        # assign variables
+        CSprite.__init__(self, aOrigin[0], aOrigin[1])
         self.mNum = aNum
         self.mParent = aParent
         self.mOrigin = CVector(aOrigin[0], aOrigin[1])
-        self.setXY(self.mOrigin.getX(), self.mOrigin.getY())
         self.mDest = CVector(aDestine[0], aDestine[1])
         self.setState(STATE_STALE)
 
-
     def update(self):
         CSprite.update(self)
 
@@ -168,18 +165,15 @@ class CArea1Game1(CGameState):
         self.mBackground = Image.loadImage('assets/images/a1g1/A1G1-back.jpg', False)
         CGame().setBackground(self.mBackground)
         
-        self.mBox = CSprite()
-        self.mBox.setXY(420, 600)
+        self.mBox = CSprite(420, 600)
         self.mBox.loadImage('assets/images/a1g1/A1G1-caja.png')
         CGame().addChild(self.mBox)
         
-        self.mElisa = CSprite()
-        self.mElisa.setXY(12, 110)
+        self.mElisa = CSprite(12, 110)
         self.mElisa.loadImage('assets/images/a1g1/A1G1-silueta-elisa.png')
         CGame().addChild(self.mElisa)
         
-        self.mJuan = CSprite()
-        self.mJuan.setXY(670, 75)
+        self.mJuan = CSprite(670, 75)
         self.mJuan.loadImage('assets/images/a1g1/A1G1-silueta-juan.png')
         CGame().addChild(self.mJuan)
         
@@ -187,9 +181,8 @@ class CArea1Game1(CGameState):
         self.mBackImageN = Image.loadImage('assets/images/back.png')
         self.mBackImageB = Image.loadImage('assets/images/back_big.png')
 
-        self.mButtonBack = CSprite()
+        self.mButtonBack = CSprite(1170, 30)
         self.mButtonBack.setRegistrationPointOffset(22, 22)
-        self.mButtonBack.setXY(1170, 30)
         self.mButtonBack.setImage(self.mBackImageN)
         CGame().addChild(self.mButtonBack)
 
@@ -197,9 +190,8 @@ class CArea1Game1(CGameState):
         self.mHelpImageN = Image.loadImage('assets/images/help.png')
         self.mHelpImageB = Image.loadImage('assets/images/help_big.png')
         
-        self.mButtonHelp = CSprite()
+        self.mButtonHelp = CSprite(1110, 30)
         self.mButtonHelp.setRegistrationPointOffset(22, 22)
-        self.mButtonHelp.setXY(1110, 30)
         self.mButtonHelp.setImage(self.mHelpImageN)
         CGame().addChild(self.mButtonHelp)
         
@@ -243,7 +235,9 @@ class CArea1Game1(CGameState):
             size = p.getSize()
             p.setRegistrationPointOffset(size[0] / 2 , size[1] / 2)
             CGame().addChild(p)
-       
+
+        font28 = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
+
         # load the options
         pieces = [_('Mamas'), _('Ovarios'), _('Utero'), _('Vagina')]
         pieces = pieces + [_('Pene'), _('Próstata'), _('Testículos'), _('Vesículas')]
@@ -251,14 +245,14 @@ class CArea1Game1(CGameState):
             op = CLabel()
             op.bgColor = (0x99, 0x99, 0x66)
             op.fgColor = (0xFF, 0xFF, 0xFF)
-            op.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
-            op.set_center((600, 400))
-            op.set_size((200, 40))
-            op.set_text(unicode(name, 'UTF-8'))
+            op.font = font28
+            op.center = (600, 400)
+            op.size = (200, 40)
+            op.text = unicode(name, 'UTF-8')
+            op._update_image()
             self.mListOptions.append(op)
                 
-        self.mPoints = CPoints()
-        self.mPoints.setXY(250, 10)
+        self.mPoints = CPoints(250, 10)
         #self.mPoints.set_bads(55)
         #self.mPoints.set_goods(55)
         
@@ -269,16 +263,15 @@ class CArea1Game1(CGameState):
         alphasurface.fill((100,100,100))
         alphasurface.set_alpha(200)
 
-        self.mAlpha = CSprite()
-        self.mAlpha.setXY(0, 0)
+        self.mAlpha = CSprite(0, 0)
         self.mAlpha.setImage(alphasurface)
         CGame().addChild(self.mAlpha)
 
         self.mButtonAccept = CButton()
-        self.mButtonAccept.set_bgColor(NORMAL_COLOR)
-        self.mButtonAccept.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
-        self.mButtonAccept.set_center((600, 400))
-        self.mButtonAccept.set_size((200, 40))
+        self.mButtonAccept.bgColor = NORMAL_COLOR
+        self.mButtonAccept.font = font28
+        self.mButtonAccept.center = (600, 400)
+        self.mButtonAccept.size = (200, 40)
         self.mButtonAccept.set_text(_('Aceptar'))
         CGame().addChild(self.mButtonAccept)
 
diff --git a/src/game/Area1Game3.py b/src/game/Area1Game3.py
index af039aa..4640e79 100644
--- a/src/game/Area1Game3.py
+++ b/src/game/Area1Game3.py
@@ -83,39 +83,38 @@ class CArea1Game3(CGameState):
         self.mBackImageN = Image.loadImage('assets/images/back.png')
         self.mBackImageB = Image.loadImage('assets/images/back_big.png')
         
-        self.mButtonBack = CSprite()
+        self.mButtonBack = CSprite(1170, 30)
         self.mButtonBack.setRegistrationPointOffset(22, 22)
-        self.mButtonBack.setXY(1170, 30)
         self.mButtonBack.setImage(self.mBackImageN)
         CGame().addChild(self.mButtonBack)
 
         self.mLabelQuestion = Globe((500, 250), pico='None', text=' ')
         self.mLabelQuestion.set_center((600, 250))
 
+        font28 = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
+
         self.mButtonTrue = CButton()
-        self.mButtonTrue.set_bgColor((125, 255, 125))
-        self.mButtonTrue.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
-        self.mButtonTrue.set_center((460, 400))
-        self.mButtonTrue.set_size((200, 40))
+        self.mButtonTrue.bgColor = (125, 255, 125)
+        self.mButtonTrue.font = font28
+        self.mButtonTrue.center = (460, 400)
+        self.mButtonTrue.size = (200, 40)
         self.mButtonTrue.set_text(_('Verdadero'))
         
         self.mButtonFalse = CButton()
-        self.mButtonFalse.set_bgColor((125, 255, 125))
-        self.mButtonFalse.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
-        self.mButtonFalse.set_center((740, 400))
-        self.mButtonFalse.set_size((200, 40))  
+        self.mButtonFalse.bgColor = (125, 255, 125)
+        self.mButtonFalse.font = font28
+        self.mButtonFalse.center = (740, 400)
+        self.mButtonFalse.size = (200, 40)
         self.mButtonFalse.set_text(_('Falso'))
         
-        self.mBoy = CSprite()
+        self.mBoy = CSprite(100, 400)
         self.mBoy.loadImage('assets/images/a1g3/Juan-chico-costado-parado.png')
-        self.mBoy.setXY(100, 400)
         CGame().addChild(self.mBoy)
         
         elisa = Image.loadImage('assets/images/a1g3/Elisa-chica-costado-parada.png')
         elisa_rotated = pygame.transform.flip(elisa, True, False)
-        self.mGirl = CSprite()
+        self.mGirl = CSprite(900, 400)
         self.mGirl.setImage(elisa_rotated)
-        self.mGirl.setXY(900, 400)
         CGame().addChild(self.mGirl)
 
         # sabes que le pasa
@@ -137,8 +136,7 @@ class CArea1Game3(CGameState):
         self.mDialogBad = Globe((200, 75), pico='left', text=self.mBadA)
         self.mDialogBad.set_center((300, 300))
               
-        self.mPoints = CPoints()
-        self.mPoints.setXY(250, 10)
+        self.mPoints = CPoints(250, 10)
         CGame().addChild(self.mPoints)
         
         #self.mTime = self.mDialogBoy1.getTimeState()
@@ -148,7 +146,6 @@ class CArea1Game3(CGameState):
     def update(self):
         CGameState.update(self)
 
-        
         self.time = self.time + 1
         
         if self.mButtonBack.mouseOver():
diff --git a/src/game/Area1Game4.py b/src/game/Area1Game4.py
index c2a5763..49498c0 100644
--- a/src/game/Area1Game4.py
+++ b/src/game/Area1Game4.py
@@ -35,37 +35,35 @@ class CArea1Game4(CGameState):
         self.mBad = 0
         self.mGood = 0
         
-        self.mPoints = CPoints()
-        self.mPoints.setXY(250, 10)
+        self.mPoints = CPoints(250, 10)
         CGame().addChild(self.mPoints)
+
+        font26 = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 26)
     
         for i in area1game4_data.ITEMS.keys():
             t = area1game4_data.ITEMS[i]
             q = (unicode(t[0], 'UTF-8'), unicode(t[1], 'UTF-8'))
             self.mQuestions.append(q)
             button = CButton()
-            button.set_bgColor((255, 125, 0))
-            button.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 26)
-            #button.set_center((110, 650))
-            button.set_size((230, 40))  
-            button.set_text(q[1])
+            button.bgColor = (255, 125, 0)
+            button.font = font26
+            button.size = (230, 40)
+            button.text = q[1]
+            button._update_image()
             self.mButtonList.append(button)
             CGame().addChild(button)
 
         self.mBackground = Image.loadImage('assets/images/a1g4/a1game4.png', False)
         CGame().setBackground(self.mBackground)
         
-        self.mBook = CSprite()
-        self.mBook.setXY(316, 100)
+        self.mBook = CSprite(316, 100)
         self.mBook.loadImage('assets/images/a1g4/A1G4-libro.png')
         CGame().addChild(self.mBook)
         
-        self.mGoodSprite = CSprite()
-        self.mGoodSprite.setXY(300, 100)
+        self.mGoodSprite = CSprite(300, 100)
         self.mGoodSprite.loadImage('assets/images/a1g4/good.png')
         
-        self.mBadSprite = CSprite()
-        self.mBadSprite.setXY(300, 100)
+        self.mBadSprite = CSprite(300, 100)
         self.mBadSprite.loadImage('assets/images/a1g4/bad.png')
         
         self.mBsetted = False
@@ -74,9 +72,8 @@ class CArea1Game4(CGameState):
         self.mBackImageN = Image.loadImage('assets/images/back.png')
         self.mBackImageB = Image.loadImage('assets/images/back_big.png')
         
-        self.mButtonBack = CSprite()
+        self.mButtonBack = CSprite(1170, 30)
         self.mButtonBack.setRegistrationPointOffset(22, 22)
-        self.mButtonBack.setXY(1170, 30)
         self.mButtonBack.setImage(self.mBackImageN)
         CGame().addChild(self.mButtonBack)
         
@@ -92,7 +89,7 @@ class CArea1Game4(CGameState):
         
         self.mLabelQuestion = CMultiLabel()
         self.mLabelQuestion.bgColor = (252, 175, 23)
-        self.mLabelQuestion.set_font(fontSize=28)
+        self.mLabelQuestion.set_font('DejaVuSans.ttf', 28)
         self.mLabelQuestion.set_center((600, 250))
         self.mLabelQuestion.set_size((380, 150))
         self.mLabelQuestion.set_text(self.mQuestions[self.mQuestionsL[self.mCurrentQuestion]][0])
diff --git a/src/game/Area1Game5.py b/src/game/Area1Game5.py
index 2a7bb06..1f3e8cd 100644
--- a/src/game/Area1Game5.py
+++ b/src/game/Area1Game5.py
@@ -73,39 +73,38 @@ class CArea1Game5(CGameState):
         self.mBackImageN = Image.loadImage('assets/images/back.png')
         self.mBackImageB = Image.loadImage('assets/images/back_big.png')
         
-        self.mButtonBack = CSprite()
+        self.mButtonBack = CSprite(1170, 30)
         self.mButtonBack.setRegistrationPointOffset(22, 22)
-        self.mButtonBack.setXY(1170, 30)
         self.mButtonBack.setImage(self.mBackImageN)
         CGame().addChild(self.mButtonBack)
 
         self.mLabelQuestion = Globe((500, 150), pico='None', text=' ')
         self.mLabelQuestion.set_center((600, 250))
+        
+        font28 = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
 
         self.mButtonTrue = CButton()
-        self.mButtonTrue.set_bgColor((125, 255, 125))
-        self.mButtonTrue.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
-        self.mButtonTrue.set_center((460, 400))
-        self.mButtonTrue.set_size((200, 40))
+        self.mButtonTrue.bgColor = (125, 255, 125)
+        self.mButtonTrue.font = font28
+        self.mButtonTrue.center = (460, 400)
+        self.mButtonTrue.size = (200, 40)
         self.mButtonTrue.set_text(_('Verdadero'))
         
         self.mButtonFalse = CButton()
-        self.mButtonFalse.set_bgColor((125, 255, 125))
-        self.mButtonFalse.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
-        self.mButtonFalse.set_center((740, 400))
-        self.mButtonFalse.set_size((200, 40))  
+        self.mButtonFalse.bgColor = (125, 255, 125)
+        self.mButtonFalse.font = font28
+        self.mButtonFalse.center = (740, 400)
+        self.mButtonFalse.size = (200, 40)
         self.mButtonFalse.set_text(_('Falso'))
         
-        self.mBoy = CSprite()
+        self.mBoy = CSprite(100, 400)
         self.mBoy.loadImage('assets/images/a1g3/Juan-chico-costado-parado.png')
-        self.mBoy.setXY(100, 400)
         CGame().addChild(self.mBoy)
         
         elisa = Image.loadImage('assets/images/a1g3/Elisa-chica-costado-parada.png')
         elisa_rotated = pygame.transform.flip(elisa, True, False)
-        self.mGirl = CSprite()
+        self.mGirl = CSprite(900, 400)
         self.mGirl.setImage(elisa_rotated)
-        self.mGirl.setXY(900, 400)
         CGame().addChild(self.mGirl)
 
         # que es..
@@ -123,8 +122,7 @@ class CArea1Game5(CGameState):
         self.mDialogBad = Globe((200, 75), pico='left', text=self.mBadA)
         self.mDialogBad.set_center((300, 300))
               
-        self.mPoints = CPoints()
-        self.mPoints.setXY(250, 10)
+        self.mPoints = CPoints(250, 10)
         CGame().addChild(self.mPoints)
         
         #self.mTime = self.mDialogBoy1.getTimeState()
diff --git a/src/game/Area1Game6.py b/src/game/Area1Game6.py
index a01e54b..ff440db 100644
--- a/src/game/Area1Game6.py
+++ b/src/game/Area1Game6.py
@@ -49,16 +49,14 @@ class Piece(CSprite):
     mState = None
 
     def __init__(self, aParent, aNum, aOrigin, aDestine):
-        CSprite.__init__(self)
+        CSprite.__init__(self, aOrigin[0], aOrigin[1])
         
         self.mNum = aNum
         self.mParent = aParent
         self.mOrigin = CVector(aOrigin[0], aOrigin[1])
-        self.setXY(self.mOrigin.getX(), self.mOrigin.getY())
         self.mDest = CVector(aDestine[0], aDestine[1])
         self.setState(STATE_STALE)
 
-
     def update(self):
         CSprite.update(self)
 
@@ -165,17 +163,15 @@ class CArea1Game6(CGameState):
         self.mBackImageN = Image.loadImage('assets/images/back.png')
         self.mBackImageB = Image.loadImage('assets/images/back_big.png')
         
-        self.mButtonBack = CSprite()
+        self.mButtonBack = CSprite(1170, 30)
         self.mButtonBack.setRegistrationPointOffset(22, 22)
-        self.mButtonBack.setXY(1170, 30)
         self.mButtonBack.setImage(self.mBackImageN)
         CGame().addChild(self.mButtonBack)
         
         self.mBackground = Image.loadImage('assets/images/a1g6/A1G6-fondo.jpg', False)
         CGame().setBackground(self.mBackground)
         
-        self.mBase = CSprite()
-        self.mBase.setXY(DX, DY)
+        self.mBase = CSprite(DX, DY)
         self.mBase.loadImage('assets/images/a1g6/A1G6-base-crucigrama.png', True)
         CGame().addChild(self.mBase)
         
@@ -263,27 +259,25 @@ class CArea1Game6(CGameState):
         self.dic_help = area1game6_data.HELP
         self.list_temp = self.dic_help.keys()
         
+        font28 = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
+
         self.mListHelps = []
         # Label with the Help (for mouseover)
         for i in range(7):
             l = CMultiLabel()
             l.bgColor = (255, 125, 50)
-            l.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
-            l.set_center((DX + 910, DY + 75))
-            l.set_size((350, 150))
-            l.set_text(unicode(self.dic_help[i], 'UTF-8'))
+            l.font = font28
+            l.center = (DX + 910, DY + 75)
+            l.size = (350, 150)
+            l.text = unicode(self.dic_help[i], 'UTF-8')
+            l._update_image()
             self.mListHelps.append(l)
         
-
-        #CGame().addChild(self.mHelp01)
-        
-        self.mPoints = CPoints()
-        self.mPoints.setXY(100, 10)
+        self.mPoints = CPoints(100, 10)
         CGame().addChild(self.mPoints)
         
         
     def update(self):
-        #print "menu update"
         CGameState.update(self)
         
         if self.mButtonBack.mouseOver():
@@ -300,7 +294,6 @@ class CArea1Game6(CGameState):
                 self.mButtonBack.setImage(self.mBackImageN)
        
         if self.mButtonBack.clicked():
-            #print "clicked clicked back of a1g6"
             hs = HallState.CHallState()
             CGame().setState(hs)
             hs.setCurrentGame(5)
@@ -309,23 +302,7 @@ class CArea1Game6(CGameState):
         x = CMouse().getX()
         y = CMouse().getY()
         
-        #hay algo mas eficiente?
-        if CMath.pointInsideRectangle(x,y, WORD1):
-            self.mHelpActive = 0
-        elif CMath.pointInsideRectangle(x,y, WORD2a) or CMath.pointInsideRectangle(x,y, WORD2b):
-            self.mHelpActive = 1
-        elif CMath.pointInsideRectangle(x,y, WORD3a) or CMath.pointInsideRectangle(x,y, WORD3b):
-            self.mHelpActive = 2
-        elif CMath.pointInsideRectangle(x,y, WORD4a) or CMath.pointInsideRectangle(x,y, WORD4b):
-            self.mHelpActive = 3
-        elif CMath.pointInsideRectangle(x,y, WORD5a) or CMath.pointInsideRectangle(x,y, WORD5b):
-            self.mHelpActive = 4
-        elif CMath.pointInsideRectangle(x,y, WORD6):
-            self.mHelpActive = 5
-        elif CMath.pointInsideRectangle(x,y, WORD7):
-            self.mHelpActive = 6
-        else:
-            self.mHelpActive = None
+        self.mHelpActive = self._get_help(x, y)
         
         # this optimize the repetitive remove/add the same sprite
         if not (self.mHelpPrevious == self.mHelpActive):
@@ -334,7 +311,24 @@ class CArea1Game6(CGameState):
             if self.mHelpActive is not None:
                 CGame().addChild(self.mListHelps[self.mHelpActive])
             self.mHelpPrevious = self.mHelpActive
-        
+
+    def _get_help(self, x, y):
+        if CMath.pointInsideRectangle(x,y, WORD1):
+            return 0
+        elif CMath.pointInsideRectangle(x,y, WORD2a) or CMath.pointInsideRectangle(x,y, WORD2b):
+            return 1
+        elif CMath.pointInsideRectangle(x,y, WORD3a) or CMath.pointInsideRectangle(x,y, WORD3b):
+            return 2
+        elif CMath.pointInsideRectangle(x,y, WORD4a) or CMath.pointInsideRectangle(x,y, WORD4b):
+            return 3
+        elif CMath.pointInsideRectangle(x,y, WORD5a) or CMath.pointInsideRectangle(x,y, WORD5b):
+            return 4
+        elif CMath.pointInsideRectangle(x,y, WORD6):
+            return 5
+        elif CMath.pointInsideRectangle(x,y, WORD7):
+            return 6
+        else:
+            return None
         
     def destroy(self):
         CGameState.destroy(self)
@@ -345,6 +339,7 @@ class CArea1Game6(CGameState):
         for piece in self.mListPieces:
             CGame().removeChild(piece)
             piece = None
+        self.mListPieces = None
         if self.mHelpActive:
             CGame().removeChild(self.mHelpActive)
         self.mButtonBack = None
diff --git a/src/game/CreditsState.py b/src/game/CreditsState.py
index ad1b8d2..1d546be 100644
--- a/src/game/CreditsState.py
+++ b/src/game/CreditsState.py
@@ -25,9 +25,8 @@ class CCreditsState(CGameState):
         self.mBackImageN = Image.loadImage('assets/images/back.png')
         self.mBackImageB = Image.loadImage('assets/images/back_big.png')
         
-        self.mButtonBack = CSprite()
+        self.mButtonBack = CSprite(1170, 30)
         self.mButtonBack.setRegistrationPointOffset(22, 22)
-        self.mButtonBack.setXY(1170, 30)
         self.mButtonBack.setImage(self.mBackImageN)
         CGame().addChild(self.mButtonBack)
         
@@ -38,10 +37,10 @@ class CCreditsState(CGameState):
         self.mCredits = CMultiLabel()
         self.mCredits.bgColor = (255, 125, 50)
         self.mCredits.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
-        self.mCredits.set_center((600, 300))
-        self.mCredits.set_size((600, 400))
-        
-        self.mCredits.set_text(text)
+        self.mCredits.center = (600, 300)
+        self.mCredits.size = (600, 400)
+        self.mCredits.text = text
+        self.mCredits._update_image()
         CGame().addChild(self.mCredits)
         
         
@@ -71,3 +70,4 @@ class CCreditsState(CGameState):
         CGame().removeChild(self.mCredits)
         self.mButtonBack = None
         self.mBackground = None
+
diff --git a/src/game/HallState.py b/src/game/HallState.py
index bc4ca0a..377dcb2 100644
--- a/src/game/HallState.py
+++ b/src/game/HallState.py
@@ -2,7 +2,6 @@
 
 import pygame
 import SelectAreaState
-# import CSelectAreaState
 from api.GameState import CGameState
 from api.Game import CGame
 import api.Image as CImage
@@ -47,9 +46,8 @@ class CHallState(CGameState):
         self.mBackImageN = Image.loadImage('assets/images/back.png')
         self.mBackImageB = Image.loadImage('assets/images/back_big.png')
         
-        self.mButtonBack = CSprite()
+        self.mButtonBack = CSprite(1170, 30)
         self.mButtonBack.setRegistrationPointOffset(22, 22)
-        self.mButtonBack.setXY(1170, 30)
         self.mButtonBack.setImage(self.mBackImageN)
         CGame().addChild(self.mButtonBack)
         
@@ -58,9 +56,8 @@ class CHallState(CGameState):
             img = CImage.loadImage(path, False)
             self.mBackgroundList.append(img)
        
-        self.mDoor = CSprite()
-        self.mDoor.setXY(400, 50)
-        self.mFrameImageDoor = Image.loadImage('assets/images/hall/A1-puerta-resaltada.png')
+        self.mDoor = CSprite(400, 50)
+        self.mFrameImageDoor = Image.loadImage('assets/images/hall/highlight_door.png')
         self.mDoor.setImage(self.mFrameImageDoor)
         
         self.mStar1 = Image.loadImage('assets/images/hall/star1.png')
@@ -71,14 +68,12 @@ class CHallState(CGameState):
         self.mSmallRightArrow = pygame.transform.flip(self.mSmallLeftArrow, True, False)
         self.mBigRightArrow = pygame.transform.flip(self.mBigLeftArrow, True, False)
         
-        self.mLeftArrow = CSprite()
-        self.mLeftArrow.setXY(75, 422)
+        self.mLeftArrow = CSprite(75, 422)
         self.mLeftArrow.setRegistrationPointOffset(55, 23)
         self.mLeftArrow.setImage(self.mSmallLeftArrow)
         CGame().addChild(self.mLeftArrow)
         
-        self.mRightArrow = CSprite()
-        self.mRightArrow.setXY(1125, 422)
+        self.mRightArrow = CSprite(1125, 422)
         self.mRightArrow.setRegistrationPointOffset(55, 23)
         self.mRightArrow.setImage(self.mSmallRightArrow)
         CGame().addChild(self.mRightArrow)
@@ -93,12 +88,11 @@ class CHallState(CGameState):
         #TODO no solo area 1
         a1 = par.getArea(1)
         for i in range(6):
-            s = CSprite()
+            s = CSprite(730, 40)
             if a1[i] == 0:
                 s.setImage(self.mStar1)
             else:
                 s.setImage(self.mStar2)
-            s.setXY(730, 40)
             self.mAreaStates.append(s)
         
         
@@ -108,7 +102,6 @@ class CHallState(CGameState):
         CGame().addChild(self.mAreaStates[self.mCurrentSelectedArea])
         
     def update(self):
-        #print "menu update"
         CGameState.update(self)
         
         if self.mButtonBack.mouseOver():
diff --git a/src/game/HelpState.py b/src/game/HelpState.py
index 143d580..c3b85d5 100644
--- a/src/game/HelpState.py
+++ b/src/game/HelpState.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import pygame
 import MenuState
 from api.GameState import CGameState
 from api.Game import CGame
@@ -8,8 +7,6 @@ from api.Sprite2 import CSprite
 from api.MultiLabel import CMultiLabel
 import api.Image as Image
 
-from assets.data import credits_data
-
 
 class CHelpState(CGameState):
     
@@ -25,9 +22,8 @@ class CHelpState(CGameState):
         self.mBackImageN = Image.loadImage('assets/images/back.png')
         self.mBackImageB = Image.loadImage('assets/images/back_big.png')
         
-        self.mButtonBack = CSprite()
+        self.mButtonBack = CSprite(1170, 30)
         self.mButtonBack.setRegistrationPointOffset(22, 22)
-        self.mButtonBack.setXY(1170, 30)
         self.mButtonBack.setImage(self.mBackImageN)
         CGame().addChild(self.mButtonBack)
         
diff --git a/src/game/MenuState.py b/src/game/MenuState.py
index a5e7c8e..ccc6e1c 100644
--- a/src/game/MenuState.py
+++ b/src/game/MenuState.py
@@ -22,45 +22,50 @@ class CMenuState(CGameState):
         self.mBackground = Image.loadImage('assets/images/selectArea/background.jpg', False)
         CGame().setBackground(self.mBackground)
         
+        font32 = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 32)
+
         self.mButtonPlay = CButton()
         self.mButtonPlay.bgColor = NORMAL_COLOR
         self.mButtonPlay.fgColor = (0xFF, 0xFF, 0xFF)
-        self.mButtonPlay.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 32)
+        self.mButtonPlay.font = font32
         self.mButtonPlay.center = (600, 370)
         self.mButtonPlay.size = (200, 40)
-        self.mButtonPlay.set_text(unicode(_('Jugar'), 'UTF-8'))
+        self.mButtonPlay.text = unicode(_('Jugar'), 'UTF-8')
+        self.mButtonPlay._update_image()
         CGame().addChild(self.mButtonPlay)
         
         self.mButtonCredits = CButton()
         self.mButtonCredits.bgColor = NORMAL_COLOR
         self.mButtonCredits.fgColor = (0xFF, 0xFF, 0xFF)
-        self.mButtonCredits.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 32)
+        self.mButtonCredits.font = font32
         self.mButtonCredits.center = (600, 420)
         self.mButtonCredits.size = (200, 40)
-        self.mButtonCredits.set_text(unicode(_('Créditos'), 'UTF-8'))
+        self.mButtonCredits.text = unicode(_('Créditos'), 'UTF-8')
+        self.mButtonCredits._update_image()
         CGame().addChild(self.mButtonCredits)
         
         self.mButtonHelp = CButton()
         self.mButtonHelp.bgColor = NORMAL_COLOR
         self.mButtonHelp.fgColor = (0xFF, 0xFF, 0xFF)
-        self.mButtonHelp.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 32)
+        self.mButtonHelp.font = font32
         self.mButtonHelp.center = (600, 470)
         self.mButtonHelp.size = (200, 40)
-        self.mButtonHelp.set_text(unicode(_('Ayuda'), 'UTF-8'))
+        self.mButtonHelp.text = unicode(_('Ayuda'), 'UTF-8')
+        self.mButtonHelp._update_image()
         CGame().addChild(self.mButtonHelp)
         
         self.mButtonExit = CButton()
         self.mButtonExit.bgColor = NORMAL_COLOR
         self.mButtonExit.fgColor = (0xFF, 0xFF, 0xFF)
-        self.mButtonExit.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 32)
+        self.mButtonExit.font = font32
         self.mButtonExit.center = (600, 520)
         self.mButtonExit.size = (200, 40)
-        self.mButtonExit.set_text(unicode(_('Salir'), 'UTF-8'))
+        self.mButtonExit.text = unicode(_('Salir'), 'UTF-8')
+        self.mButtonExit._update_image()
         CGame().addChild(self.mButtonExit)
        
         
     def update(self):
-        #print "menu update"
         CGameState.update(self)
         
         if self.mButtonPlay.mouseOver():
@@ -84,14 +89,11 @@ class CMenuState(CGameState):
             self.mButtonExit.set_bgColor(NORMAL_COLOR)
         
         if self.mButtonCredits.clicked():
-            #print "clicked credits"
-            #cs = CHelpState()
             cs = CCreditsState()
             CGame().setState(cs)
             return
        
         elif self.mButtonPlay.clicked():
-            #print "clicked play"
             partida = CSelectPartidaState()
             CGame().setState(partida)
             return
@@ -102,7 +104,6 @@ class CMenuState(CGameState):
             return
             
         elif self.mButtonExit.clicked():
-            #print 'exit'
             CGame().destroy()
             exit()
 
diff --git a/src/game/PresentationState.py b/src/game/PresentationState.py
index c051b2b..3178f37 100644
--- a/src/game/PresentationState.py
+++ b/src/game/PresentationState.py
@@ -18,33 +18,25 @@ class CPresentationState(CGameState):
         self.mBackground = Image.loadImage('assets/images/selectArea/background.jpg', False)
         CGame().setBackground(self.mBackground)
         
-        self.mElisa = CSprite()
+        self.mElisa = CSprite(834, 300)
         #ancho = 216 -> 1200 - 216 - juan.X = 834
-        self.mElisa.setXY(834, 300)
-        elisa = Image.loadImage('assets/images/selectArea/T-elisa.png')
-        self.mElisa.setImage(elisa)
+        self.mElisa.loadImage('assets/images/selectArea/T-elisa.png')
         CGame().addChild(self.mElisa)
         
-        self.mJuan = CSprite()
-        self.mJuan.setXY(150, 300)
-        juan = Image.loadImage('assets/images/selectArea/T-juan.png')
-        self.mJuan.setImage(juan)
+        self.mJuan = CSprite(150, 300)
+        self.mJuan.loadImage('assets/images/selectArea/T-juan.png')
         CGame().addChild(self.mJuan)
         
-        self.mTitle = CSprite()
+        self.mTitle = CSprite(376, 450)
         #ancho = 447 -> (1200 - 447 ) / 2 = 376
-        self.mTitle.setXY(376, 450)
-        self.mImageTitle = Image.loadImage('assets/images/selectArea/T-rotulo.png')
-        self.mTitle.setImage(self.mImageTitle)
+        self.mTitle.loadImage('assets/images/selectArea/T-rotulo.png')
         CGame().addChild(self.mTitle)
         
     def update(self):
-        #print "menu update"
         CGameState.update(self)
         self.mCount = self.mCount + 1
         
         if self.mCount > 150:
-            #print "time ends"
             ms = MenuState.CMenuState()
             CGame().setState(ms)
             return
@@ -55,7 +47,6 @@ class CPresentationState(CGameState):
         if self.mactive == True:
             if CMouse().release():
                 self.mactive = False
-                #print "click"
                 ms = MenuState.CMenuState()
                 CGame().setState(ms)
                 return
@@ -72,3 +63,4 @@ class CPresentationState(CGameState):
         self.mTitle.destroy()
         self.mTitle = None
         self.mBackground = None
+
diff --git a/src/game/SelectAreaState.py b/src/game/SelectAreaState.py
index b92efe7..d035bc1 100644
--- a/src/game/SelectAreaState.py
+++ b/src/game/SelectAreaState.py
@@ -32,9 +32,8 @@ class CSelectAreaState(CGameState):
         self.mBackImageN = Image.loadImage('assets/images/back.png')
         self.mBackImageB = Image.loadImage('assets/images/back_big.png')
         
-        self.mButtonBack = CSprite()
+        self.mButtonBack = CSprite(1170, 30)
         self.mButtonBack.setRegistrationPointOffset(22, 22)
-        self.mButtonBack.setXY(1170, 30)
         self.mButtonBack.setImage(self.mBackImageN)
         CGame().addChild(self.mButtonBack)
         
@@ -43,49 +42,48 @@ class CSelectAreaState(CGameState):
             self.mAreas_list.append(unicode(a, 'UTF-8'))
 
         #escuela
-        self.mArea1 = CSprite()
-        self.mArea1.setXY(55, 193)
-        self.mFrameImageArea1 = Image.loadImage('assets/images/selectArea/M-resaltado-A1.png', True)
-        self.mArea1.setImage(self.mFrameImageArea1)
+        self.mArea1 = CSprite(55, 193)
+        self.mArea1.loadImage('assets/images/selectArea/M-resaltado-A1.png')
         self.mArea1Is = False
+
+        font28 = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
         
         self.mLabelA1 = CMultiLabel()
         self.mLabelA1.bgColor = (255, 125, 50)
         self.mLabelA1.fgColor = (0xFF, 0xFF, 0xFF)
-        self.mLabelA1.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
-        self.mLabelA1.set_center((300, 320))
-        self.mLabelA1.set_size((320, 80))
-        self.mLabelA1.set_text(self.mAreas_list[0])
+        self.mLabelA1.font = font28
+        self.mLabelA1.center = (300, 320)
+        self.mLabelA1.size = (320, 80)
+        self.mLabelA1.text = self.mAreas_list[0]
+        self.mLabelA1._update_image()
         
         #patio
-        self.mArea2 = CSprite()
-        self.mArea2.setXY(110, 380)
-        self.mFrameImageArea2 = Image.loadImage('assets/images/selectArea/M-resaltado-A2.png', True)
-        self.mArea2.setImage(self.mFrameImageArea2)
+        self.mArea2 = CSprite(110, 380)
+        self.mArea2.loadImage('assets/images/selectArea/M-resaltado-A2.png')
         self.mArea2Is = False
         
         self.mLabelA2 = CMultiLabel()
         self.mLabelA2.bgColor = (255, 125, 50)
         self.mLabelA2.fgColor = (0xFF, 0xFF, 0xFF)
-        self.mLabelA2.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
-        self.mLabelA2.set_center((600, 600))
-        self.mLabelA2.set_size((350, 80))
-        self.mLabelA2.set_text(self.mAreas_list[1])
+        self.mLabelA2.font = font28
+        self.mLabelA2.center = (600, 600)
+        self.mLabelA2.size = (350, 80)
+        self.mLabelA2.text = self.mAreas_list[1]
+        self.mLabelA2._update_image()
         
         #casa
-        self.mArea3 = CSprite()
-        self.mArea3.setXY(705, 105)
-        self.mFrameImageArea3 = Image.loadImage('assets/images/selectArea/M-resaltado-A3.png', True)
-        self.mArea3.setImage(self.mFrameImageArea3)
+        self.mArea3 = CSprite(705, 105)
+        self.mArea3.loadImage('assets/images/selectArea/M-resaltado-A3.png')
         self.mArea3Is = False
         
         self.mLabelA3 = CMultiLabel()
         self.mLabelA3.bgColor = (255, 125, 50)
         self.mLabelA3.fgColor = (0xFF, 0xFF, 0xFF)
-        self.mLabelA3.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
-        self.mLabelA3.set_center((950, 300))
-        self.mLabelA3.set_size((280, 80))
-        self.mLabelA3.set_text(self.mAreas_list[2])
+        self.mLabelA3.font = font28
+        self.mLabelA3.center = (950, 300)
+        self.mLabelA3.size = (280, 80)
+        self.mLabelA3.text = self.mAreas_list[2]
+        self.mLabelA3._update_image()
 
     def update(self):
 
@@ -167,16 +165,13 @@ class CSelectAreaState(CGameState):
         CGame().removeChild(self.mLabelA1)
         self.mArea1.destroy()
         self.mArea1 = None
-        self.mFrameImageArea1 = None
         CGame().removeChild(self.mArea2)
         CGame().removeChild(self.mLabelA2)
         self.mArea2.destroy()
         self.mArea2 = None
-        self.mFrameImageArea2 = None
         CGame().removeChild(self.mArea3)
         CGame().removeChild(self.mLabelA3)
         self.mArea3.destroy()
         self.mArea3 = None
-        self.mFrameImageArea3 = None
         self.mBackground = None
 
diff --git a/src/game/SelectCharacterState.py b/src/game/SelectCharacterState.py
index 4507bd9..18da7d8 100644
--- a/src/game/SelectCharacterState.py
+++ b/src/game/SelectCharacterState.py
@@ -21,25 +21,19 @@ class CSelectCharacterState(CGameState):
         
         border = Image.loadImage('assets/images/selectPartida/border.png')
         
-        self.mElisa = CSprite()
+        self.mElisa = CSprite(684, 250)
         #ancho = 216 -> 1200 - 216 - juan.X = 834
-        self.mElisa.setXY(684, 250)
-        elisa = Image.loadImage('assets/images/selectArea/T-elisa.png')
-        self.mElisa.setImage(elisa)
+        self.mElisa.loadImage('assets/images/selectArea/T-elisa.png')
         CGame().addChild(self.mElisa)
         
-        self.mBorderElisa = CSprite()
-        self.mBorderElisa.setXY(674, 240)
+        self.mBorderElisa = CSprite(674, 240)
         self.mBorderElisa.setImage(border)
         
-        self.mJuan = CSprite()
-        self.mJuan.setXY(300, 250)
-        juan = Image.loadImage('assets/images/selectArea/T-juan.png')
-        self.mJuan.setImage(juan)
+        self.mJuan = CSprite(300, 250)
+        self.mJuan.loadImage('assets/images/selectArea/T-juan.png')
         CGame().addChild(self.mJuan)
         
-        self.mBorderJuan = CSprite()
-        self.mBorderJuan.setXY(290, 240)
+        self.mBorderJuan = CSprite(290, 240)
         self.mBorderJuan.setImage(border)
                 
         mes = _('Selecciona tu personaje')
@@ -47,14 +41,13 @@ class CSelectCharacterState(CGameState):
         self.mMessage.bgColor = (255, 125, 50)
         self.mMessage.fgColor = (0xFF, 0xFF, 0xFF)
         self.mMessage.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
-        self.mMessage.set_center((600, 150))
-        self.mMessage.set_size((400, 40))
+        self.mMessage.center = (600, 150)
+        self.mMessage.size = (400, 40)
         self.mMessage.set_text(unicode(mes, 'UTF-8'))
         CGame().addChild(self.mMessage)
         
        
     def update(self):
-        #print "menu update"
         CGameState.update(self)
 
         if self.mJuan.clicked():
diff --git a/src/game/SelectPartidaState.py b/src/game/SelectPartidaState.py
index 942e9d6..6cc1a30 100644
--- a/src/game/SelectPartidaState.py
+++ b/src/game/SelectPartidaState.py
@@ -52,93 +52,85 @@ class CSelectPartidaState(CGameState):
         self.mBackImageN = Image.loadImage('assets/images/back.png')
         self.mBackImageB = Image.loadImage('assets/images/back_big.png')
         
-        self.mButtonBack = CSprite()
+        self.mButtonBack = CSprite(1170, 30)
         self.mButtonBack.setRegistrationPointOffset(22, 22)
-        self.mButtonBack.setXY(1170, 30)
         self.mButtonBack.setImage(self.mBackImageN)
         CGame().addChild(self.mButtonBack)
         
         delete = Image.loadImage('assets/images/selectPartida/delete.png')
         
-        self.mDeletePartida1 = CSprite()
-        self.mDeletePartida1.setXY(350, 240)
+        self.mDeletePartida1 = CSprite(350, 240)
         self.mDeletePartida1.setImage(delete)
         
-        self.mDeletePartida2 = CSprite()
-        self.mDeletePartida2.setXY(700, 240)
+        self.mDeletePartida2 = CSprite(700, 240)
         self.mDeletePartida2.setImage(delete)
         
-        self.mDeletePartida3 = CSprite()
-        self.mDeletePartida3.setXY(1050, 240)
+        self.mDeletePartida3 = CSprite(1050, 240)
         self.mDeletePartida3.setImage(delete)
         
         recuadro = Image.loadImage('assets/images/selectPartida/recuadro.png')
-        self.mPartida1 = CSprite()
-        self.mPartida1.setXY(114, 254)
+        self.mPartida1 = CSprite(114, 254)
         self.mPartida1.setImage(recuadro)
         CGame().addChild(self.mPartida1)
         
         border = Image.loadImage('assets/images/selectPartida/recuadro-interno2.png')
-        self.mBorderPartida1 = CSprite()
-        self.mBorderPartida1.setXY(100, 240)
+        self.mBorderPartida1 = CSprite(100, 240)
         self.mBorderPartida1.setImage(border)
         
-        self.mPartida2 = CSprite()
-        self.mPartida2.setXY(464, 254)
+        self.mPartida2 = CSprite(464, 254)
         self.mPartida2.setImage(recuadro)
         CGame().addChild(self.mPartida2)
         
-        self.mBorderPartida2 = CSprite()
-        self.mBorderPartida2.setXY(450, 240)
+        self.mBorderPartida2 = CSprite(450, 240)
         self.mBorderPartida2.setImage(border)
         
-        self.mPartida3 = CSprite()
-        self.mPartida3.setXY(815, 254)
+        self.mPartida3 = CSprite(815, 254)
         self.mPartida3.setImage(recuadro)
         CGame().addChild(self.mPartida3)
         
-        self.mBorderPartida3 = CSprite()
-        self.mBorderPartida3.setXY(800, 240)
+        self.mBorderPartida3 = CSprite(800, 240)
         self.mBorderPartida3.setImage(border)
+
+        font28 = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
                 
         mes = _('Selecciona una partida')
         self.mMessage = CLabel()
         self.mMessage.bgColor = NORMAL_COLOR
         self.mMessage.fgColor = (0xFF, 0xFF, 0xFF)
-        self.mMessage.set_font('DejaVuSans.ttf', 28)
-        self.mMessage.set_center((600, 150))
-        self.mMessage.set_size((400, 40))
-        self.mMessage.set_text(unicode(mes, 'UTF-8'))
+        self.mMessage.font = font28
+        self.mMessage.center = (600, 150)
+        self.mMessage.size = (400, 40)
+        self.mMessage.text = unicode(mes, 'UTF-8')
+        self.mMessage._update_image()
         CGame().addChild(self.mMessage)
         
         mes = unicode(_('Partida %s'), 'UTF-8')
         self.mLabel1 = CLabel()
-        #self.mLabel1.bgColor = (255, 125, 50)
         self.mLabel1.bgColor = (218, 224, 152)
         self.mLabel1.fgColor = (0xFF, 0xFF, 0xFF)
-        self.mLabel1.set_font('DejaVuSans.ttf', 28)
-        self.mLabel1.set_center((250, 300))
-        self.mLabel1.set_size((150, 40))
-        self.mLabel1.set_text(mes % 1)
-        #CGame().addChild(self.mLabel1)
+        self.mLabel1.font = font28
+        self.mLabel1.center = (250, 300)
+        self.mLabel1.size = (150, 40)
+        self.mLabel1.text = mes % 1
+        self.mLabel1._update_image()
         
         self.mLabel2 = CLabel()
         self.mLabel2.bgColor = (218, 224, 152)
         self.mLabel2.fgColor = (0xFF, 0xFF, 0xFF)
-        self.mLabel2.set_font('DejaVuSans.ttf', 28)
-        self.mLabel2.set_center((600, 300))
-        self.mLabel2.set_size((150, 40))
-        self.mLabel2.set_text(mes % 2)
-        #CGame().addChild(self.mLabel2)
+        self.mLabel2.font = font28
+        self.mLabel2.center = (600, 300)
+        self.mLabel2.size = (150, 40)
+        self.mLabel2.text = mes % 2
+        self.mLabel2._update_image()
         
         self.mLabel3 = CLabel()
         self.mLabel3.bgColor = (218, 224, 152)
         self.mLabel3.fgColor = (0xFF, 0xFF, 0xFF)
-        self.mLabel3.set_font('DejaVuSans.ttf', 28)
-        self.mLabel3.set_center((950, 300))
-        self.mLabel3.set_size((150, 40))
-        self.mLabel3.set_text(mes % 3)
-        #CGame().addChild(self.mLabel3)
+        self.mLabel3.font = font28
+        self.mLabel3.center = (950, 300)
+        self.mLabel3.size = (150, 40)
+        self.mLabel3.text = mes % 3
+        self.mLabel3._update_image()
         
         juan = Image.loadImage('assets/images/selectPartida/T-juan.png')
         elisa = Image.loadImage('assets/images/selectPartida/T-elisa.png')
@@ -149,38 +141,33 @@ class CSelectPartidaState(CGameState):
         self.mEmpty1 = CLabel()
         self.mEmpty1.bgColor = (218, 224, 152)
         self.mEmpty1.fgColor = (0xFF, 0xFF, 0xFF)
-        self.mEmpty1.set_font('DejaVuSans.ttf', 28)
-        self.mEmpty1.set_center((250, 450))
-        self.mEmpty1.set_size((200, 40))
-        self.mEmpty1.set_text(mes)
-        #CGame().addChild(self.mEmpty1)
+        self.mEmpty1.font = font28
+        self.mEmpty1.center = (250, 450)
+        self.mEmpty1.size = (200, 40)
+        self.mEmpty1.text = mes
+        self.mEmpty1._update_image()
         
         self.mEmpty2 = CLabel()
         self.mEmpty2.bgColor = (218, 224, 152)
         self.mEmpty2.fgColor = (0xFF, 0xFF, 0xFF)
-        self.mEmpty2.set_font('DejaVuSans.ttf', 28)
-        self.mEmpty2.set_center((600, 450))
-        self.mEmpty2.set_size((200, 40))
-        self.mEmpty2.set_text(mes)
-        #CGame().addChild(self.mEmpty2)
+        self.mEmpty2.font = font28
+        self.mEmpty2.center = (600, 450)
+        self.mEmpty2.size = (200, 40)
+        self.mEmpty2.text = mes
+        self.mEmpty2._update_image()
         
         self.mEmpty3 = CLabel()
         self.mEmpty3.bgColor = (218, 224, 152)
         self.mEmpty3.fgColor = (0xFF, 0xFF, 0xFF)
-        self.mEmpty3.set_font('DejaVuSans.ttf', 28)
-        self.mEmpty3.set_center((950, 450))
-        self.mEmpty3.set_size((200, 40))
-        self.mEmpty3.set_text(mes)
-        #CGame().addChild(self.mEmpty3)
-        
-        self.mChar1 = CSprite()
-        self.mChar1.setXY(200, 310)
-        
-        self.mChar2 = CSprite()
-        self.mChar2.setXY(550, 310)
+        self.mEmpty3.font = font28
+        self.mEmpty3.center = (950, 450)
+        self.mEmpty3.size = (200, 40)
+        self.mEmpty3.text = mes
+        self.mEmpty3._update_image()
         
-        self.mChar3 = CSprite()
-        self.mChar3.setXY(900, 310)
+        self.mChar1 = CSprite(200, 310)
+        self.mChar2 = CSprite(550, 310)
+        self.mChar3 = CSprite(900, 310)
         
         ##########################################################
         
@@ -199,34 +186,31 @@ class CSelectPartidaState(CGameState):
             #gets the area 1 levels
             a1 = par.getArea(1)
             for i in range(6):
-                s = CSprite()
+                s = CSprite(150 + 30 * i, 510)
                 if a1[i] == 0:
                     s.setImage(star1)
                 else:
                     s.setImage(star2)
-                s.setXY(150 + 30 * i, 510)
                 self.mP1_Stars.append(s)
                 CGame().addChild(s)
             #gets the area 2 levels
             a2 = par.getArea(2) 
             for i in range(6):
-                s = CSprite()
+                s = CSprite(150 + 30 * i, 540)
                 if a2[i] == 0:
                     s.setImage(star1)
                 else:
                     s.setImage(star2)
-                s.setXY(150 + 30 * i, 540)
                 self.mP1_Stars.append(s)
                 CGame().addChild(s)
             #gets the area 3 levels
             a3 = par.getArea(3) 
             for i in range(6):
-                s = CSprite()
+                s = CSprite(150 + 30 * i, 570)
                 if a3[i] == 0:
                     s.setImage(star1)
                 else:
                     s.setImage(star2)
-                s.setXY(150 + 30 * i, 570)
                 self.mP1_Stars.append(s)
                 CGame().addChild(s)
 
@@ -246,34 +230,31 @@ class CSelectPartidaState(CGameState):
             #gets the area 1 levels
             a1 = par.getArea(1)
             for i in range(6):
-                s = CSprite()
+                s = CSprite(500 + 30 * i, 510)
                 if a1[i] == 0:
                     s.setImage(star1)
                 else:
                     s.setImage(star2)
-                s.setXY(500 + 30 * i, 510)
                 self.mP2_Stars.append(s)
                 CGame().addChild(s)
             #gets the area 2 levels
             a2 = par.getArea(2) 
             for i in range(6):
-                s = CSprite()
+                s = CSprite(500 + 30 * i, 540)
                 if a2[i] == 0:
                     s.setImage(star1)
                 else:
                     s.setImage(star2)
-                s.setXY(500 + 30 * i, 540)
                 self.mP2_Stars.append(s)
                 CGame().addChild(s)
             #gets the area 3 levels
             a3 = par.getArea(3) 
             for i in range(6):
-                s = CSprite()
+                s = CSprite(500 + 30 * i, 570)
                 if a3[i] == 0:
                     s.setImage(star1)
                 else:
                     s.setImage(star2)
-                s.setXY(500 + 30 * i, 570)
                 self.mP2_Stars.append(s)
                 CGame().addChild(s)
 
@@ -293,34 +274,31 @@ class CSelectPartidaState(CGameState):
             #gets the area 1 levels
             a1 = par.getArea(1)
             for i in range(6):
-                s = CSprite()
+                s = CSprite(850 + 30 * i, 510)
                 if a1[i] == 0:
                     s.setImage(star1)
                 else:
                     s.setImage(star2)
-                s.setXY(850 + 30 * i, 510)
                 self.mP3_Stars.append(s)
                 CGame().addChild(s)
             #gets the area 2 levels
             a2 = par.getArea(2) 
             for i in range(6):
-                s = CSprite()
+                s = CSprite(850 + 30 * i, 540)
                 if a2[i] == 0:
                     s.setImage(star1)
                 else:
                     s.setImage(star2)
-                s.setXY(850 + 30 * i, 540)
                 self.mP3_Stars.append(s)
                 CGame().addChild(s)
             #gets the area 3 levels
             a3 = par.getArea(3) 
             for i in range(6):
-                s = CSprite()
+                s = CSprite(850 + 30 * i, 570)
                 if a3[i] == 0:
                     s.setImage(star1)
                 else:
                     s.setImage(star2)
-                s.setXY(850 + 30 * i, 570)
                 self.mP3_Stars.append(s)
                 CGame().addChild(s)
                 
@@ -330,8 +308,7 @@ class CSelectPartidaState(CGameState):
         alphasurface.fill((100,100,100))
         alphasurface.set_alpha(200)
 
-        self.mAlpha = CSprite()
-        self.mAlpha.setXY(0, 0)
+        self.mAlpha = CSprite(0, 0)
         self.mAlpha.setImage(alphasurface)
         
         msg = _('¿Estás seguro que deseas\neliminar la partida?')
@@ -339,17 +316,17 @@ class CSelectPartidaState(CGameState):
         self.mDialog.set_center((600, 300))
         
         self.mButtonTrue = CButton()
-        self.mButtonTrue.set_bgColor(NORMAL_COLOR)
-        self.mButtonTrue.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
-        self.mButtonTrue.set_center((460, 400))
-        self.mButtonTrue.set_size((200, 40))
+        self.mButtonTrue.bgColor = NORMAL_COLOR
+        self.mButtonTrue.font = font28
+        self.mButtonTrue.center = (460, 400)
+        self.mButtonTrue.size = (200, 40)
         self.mButtonTrue.set_text(_('Aceptar'))
         
         self.mButtonFalse = CButton()
-        self.mButtonFalse.set_bgColor(NORMAL_COLOR)
-        self.mButtonFalse.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
-        self.mButtonFalse.set_center((740, 400))
-        self.mButtonFalse.set_size((200, 40))  
+        self.mButtonFalse.bgColor = NORMAL_COLOR
+        self.mButtonFalse.font = font28
+        self.mButtonFalse.center = (740, 400)
+        self.mButtonFalse.size = (200, 40) 
         self.mButtonFalse.set_text(_('Cancelar'))
 
     def addDialog(self):
@@ -360,7 +337,6 @@ class CSelectPartidaState(CGameState):
         CGame().addChild(self.mButtonFalse, 2)
         
     def update(self):
-        #print "menu update"
         CGameState.update(self)
         
         if self.mButtonBack.mouseOver():
@@ -403,36 +379,30 @@ class CSelectPartidaState(CGameState):
             if self.mFlag == 0:
                                 
                 if self.mPartida1.clicked():
-                    #print "partida 1"
                     if self.misEmptyP1:
                         ch = CSelectCharacterState()
                     else:
                         ch = CSelectAreaState()
                     CGame().setState(ch)
                     CGame().setCurrentPartida(1)
-                    #ch.setPartida(1)
                     return
                     
                 elif self.mPartida2.clicked():
-                    #print "partida 2"
                     if self.misEmptyP2:
                         ch = CSelectCharacterState()
                     else:
                         ch = CSelectAreaState()
                     CGame().setState(ch)
                     CGame().setCurrentPartida(2)
-                    #ch.setPartida(2)
                     return
                 
                 elif self.mPartida3.clicked():
-                    #print "partida 3"
                     if self.misEmptyP3:
                         ch = CSelectCharacterState()
                     else:
                         ch = CSelectAreaState()
                     CGame().setState(ch)
                     CGame().setCurrentPartida(3)
-                    #ch.setPartida(3)
                     return
                 
             x = CMouse().getX()