Gets the game to a semi-playable state (hobbledy)

Todo: Game Menus as Dialogs
stump · May 17, 2010 · c1c4657 · c1c4657
1 parent 50b8ad4
commit c1c4657
Show file tree

Hide file tree

Showing 3 changed files with 135 additions and 132 deletions.
diff --git a/src/Data.py b/src/Data.py
@@ -399,6 +399,7 @@ def loadFonts(self, uiPath):
     self.scoreFont = self.fontDict["score"]
     self.songListFont = self.fontDict["songlist"]
     self.streakFont = self.fontDict["streak"]
+    self.streakFont2 = self.fontDict["streak"]
 
   def loadPartImages(self):
     self.partImages = []

diff --git a/src/GameResultsScene.py b/src/GameResultsScene.py
@@ -33,7 +33,7 @@
 import Dialogs
 import Song
 import Data
-from Menu import Menu
+#from Menu import Menu
 from Audio import Sound
 from Language import _
 
@@ -165,7 +165,7 @@ def __init__(self, engine, libraryName, songName, scores = None, coOpType = Fals
         (_("Quit"),           self.quit),
       ]
 
-    self.menu = Menu(self.engine, items, onCancel = self.quit, name = "gameresult", pos = (self.engine.theme.result_menu_x, self.engine.theme.result_menu_y))
+    #self.menu = Menu(self.engine, items, onCancel = self.quit, name = "gameresult", pos = (self.engine.theme.result_menu_x, self.engine.theme.result_menu_y))
 
     #Get theme information
     themename  = self.engine.data.themeLabel
@@ -430,40 +430,41 @@ def keyPressed(self, key, unicode):
       if self.detailedScores:
         self.detailedScores = False
       if self.resultStep == 3:
-        self.engine.view.pushLayer(self.menu)
+        #self.engine.view.pushLayer(self.menu)
+        self.changeSong()
         self.resultStep += 1
 
   def quit(self):
     self.background = None
     self.song = None
-    self.engine.view.popLayer(self.menu)
+    #self.engine.view.popLayer(self.menu)
     self.engine.world.finishGame()
 
   def replay(self):
     self.background = None
     self.song = None
-    self.engine.view.popLayer(self.menu)
+    #self.engine.view.popLayer(self.menu)
     self.engine.world.createScene("GuitarScene", libraryName = self.libraryName, songName = self.songName, Players = len(self.playerList))
 
   def replaySetlist(self):
     self.background = None
     self.song = None
-    self.engine.view.popLayer(self.menu)
+    #self.engine.view.popLayer(self.menu)
     self.engine.world.songQueue.replayFullQueue()
     self.engine.world.createScene("SongChoosingScene")
 
   def endSetlist(self):
     self.background = None
     self.song = None
-    self.engine.view.popLayer(self.menu)
+    #self.engine.view.popLayer(self.menu)
     self.engine.world.songQueue.reset()
     self.engine.world.playingQueue = False
     self.engine.world.createScene("SongChoosingScene")
 
   def changeSong(self):
     self.background = None
     self.song = None
-    self.engine.view.popLayer(self.menu)
+    #self.engine.view.popLayer(self.menu)
     if self.engine.world.playingQueue:
       if self.coOpScoring:
         self.engine.world.songQueue.addScores(self.coOpScoring)