Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlan Aguiar <alanjas@hotmail.com>2013-09-10 05:39:29 (GMT)
committer Alan Aguiar <alanjas@hotmail.com>2013-09-10 05:39:29 (GMT)
commit472449fbe8d5f97816227ad44fd97d8f85319b4e (patch)
treecff9eb8de796af232b7018eeecee753f65ad0e25 /src
parent1999a491d4c6a7d93fb595b1081e8d11bd6bbbc4 (diff)
remove old direct buttons
Diffstat (limited to 'src')
-rw-r--r--src/game/MenuState.py12
-rw-r--r--src/game/PresentationState.py7
2 files changed, 9 insertions, 10 deletions
diff --git a/src/game/MenuState.py b/src/game/MenuState.py
index 3cf13a1..b232a1e 100644
--- a/src/game/MenuState.py
+++ b/src/game/MenuState.py
@@ -62,14 +62,14 @@ class CMenuState(CGameState):
self.mButtonCredits.set_text('Créditos')
CGame().addChild(self.mButtonCredits)
- self.mButtonPlay = CButton()
+ """self.mButtonPlay = CButton()
self.mButtonPlay.bgColor = (0x99, 0x99, 0x66)
self.mButtonPlay.fgColor = (0xFF, 0xFF, 0xFF)
self.mButtonPlay.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
self.mButtonPlay.set_center((600, 50))
self.mButtonPlay.set_size((200, 40))
self.mButtonPlay.set_text('Jugar')
- CGame().addChild(self.mButtonPlay)
+ CGame().addChild(self.mButtonPlay)"""
self.mButtonHelp = CButton()
self.mButtonHelp.bgColor = (0x99, 0x99, 0x66)
@@ -141,11 +141,11 @@ class CMenuState(CGameState):
CGame().setState(cs)
return
- elif self.mButtonPlay.clicked():
+ """elif self.mButtonPlay.clicked():
print "clicked play"
selectArea = CSelectAreaState()
CGame().setState(selectArea)
- return
+ return"""
elif self.mButtonPresentation.clicked():
print "clicked presentation"
@@ -211,7 +211,7 @@ class CMenuState(CGameState):
#self.mInstructions.destroy()
self.mInstructions = None
CGame().removeChild(self.mButtonCredits)
- CGame().removeChild(self.mButtonPlay)
+ #CGame().removeChild(self.mButtonPlay)
CGame().removeChild(self.mButtonPresentation)
CGame().removeChild(self.mButtonPartida)
CGame().removeChild(self.mButtonHelp)
@@ -223,7 +223,7 @@ class CMenuState(CGameState):
CGame().removeChild(self.mButtonA2G2)
#self.mButtonPlay.destroy()
self.mButtonCredits = None
- self.mButtonPlay = None
+ #self.mButtonPlay = None
self.mButtonExit = None
self.mButtonExit = None
self.mButtonA1G1 = None
diff --git a/src/game/PresentationState.py b/src/game/PresentationState.py
index 7a22024..b4336d7 100644
--- a/src/game/PresentationState.py
+++ b/src/game/PresentationState.py
@@ -2,7 +2,7 @@
from api.GameState import CGameState
from api.Game import CGame
-from game.CreditsState import CCreditsState
+from game.SelectPartidaState import CSelectPartidaState
from api.Sprite2 import CSprite
import api.Image as Image
@@ -45,9 +45,8 @@ class CPresentationState(CGameState):
if self.mCount > 150:
print "clicked credits"
- #cs = CHelpState()
- cs = CCreditsState()
- CGame().setState(cs)
+ partida = CSelectPartidaState()
+ CGame().setState(partida)
return
def destroy(self):