diff --git a/src/GameEngine.py b/src/GameEngine.py index 2c9dc8151..8bd5ce701 100644 --- a/src/GameEngine.py +++ b/src/GameEngine.py @@ -151,7 +151,6 @@ def __init__(self, config = None): Log.debug("GameEngine class init (GameEngine.py)...") self.mainMenu = None #placeholder for main menu object - to prevent reinstantiation - self.createdGuitarScene = False #MFH - so we only create ONE guitarscene...! self.currentScene = None self.versionString = version #stump: other version stuff moved to allow full version string to be retrieved without instantiating GameEngine diff --git a/src/GameResultsScene.py b/src/GameResultsScene.py index 303f35549..2ba5145e9 100644 --- a/src/GameResultsScene.py +++ b/src/GameResultsScene.py @@ -29,7 +29,7 @@ from __future__ import with_statement -from Scene import Scene, SuppressScene +from Scene import Scene import Scorekeeper import Dialogs import Song @@ -53,11 +53,7 @@ class GameResultsScene(Scene): def __init__(self, engine, libraryName, songName, scores = None, coOpType = False, careerMode = False): Scene.__init__(self, engine) - if self.engine.world.sceneName == "GameResultsScene": #MFH - dual / triple loading cycle fix - Log.warn("Extra GameResultsScene was instantiated, but detected and shut down. Cause unknown.") - raise SuppressScene #stump - else: - self.engine.world.sceneName = "GameResultsScene" + self.engine.world.sceneName = "GameResultsScene" self.logClassInits = self.engine.config.get("game", "log_class_inits") if self.logClassInits == 1: diff --git a/src/GuitarScene.py b/src/GuitarScene.py index b77568c53..29127b23b 100644 --- a/src/GuitarScene.py +++ b/src/GuitarScene.py @@ -32,7 +32,7 @@ from __future__ import with_statement -from Scene import Scene, SuppressScene +from Scene import Scene from Song import Note, TextEvent, PictureEvent, loadSong, Bars, VocalPhrase from Menu import Menu @@ -60,12 +60,7 @@ class GuitarScene(Scene): def __init__(self, engine, libraryName, songName): Scene.__init__(self, engine) - if self.engine.world.sceneName == "GuitarScene": #MFH - dual / triple loading cycle fix - Log.warn("Extra GuitarScene was instantiated, but detected and shut down. Cause unknown.") - raise SuppressScene #stump - else: - self.engine.createdGuitarScene = True - self.engine.world.sceneName = "GuitarScene" + self.engine.world.sceneName = "GuitarScene" self.playerList = self.players @@ -1588,7 +1583,6 @@ def __init__(self, engine, libraryName, songName): Dialogs.hideLoadingSplashScreen(self.engine, splash) splash = None - self.engine.createdGuitarScene = False #MFH - end of GuitarScene client initialization routine diff --git a/src/Scene.py b/src/Scene.py index 758d0c19c..0ac122ed0 100644 --- a/src/Scene.py +++ b/src/Scene.py @@ -29,10 +29,6 @@ from OpenGL.GL import * from OpenGL.GLU import * -#stump: raised by a scene constructor to abort scene processing -class SuppressScene(Exception): - pass - class Scene(BackgroundLayer, KeyListener): def __init__(self, engine): self.engine = engine diff --git a/src/SongChoosingScene.py b/src/SongChoosingScene.py index d89fe0ef7..f3f460042 100644 --- a/src/SongChoosingScene.py +++ b/src/SongChoosingScene.py @@ -24,7 +24,7 @@ from __future__ import with_statement -from Scene import Scene, SuppressScene +from Scene import Scene import os import time import Player @@ -58,11 +58,7 @@ class SongChoosingScene(Scene): def __init__(self, engine, libraryName = None, songName = None): Scene.__init__(self, engine) - if self.engine.world.sceneName == "SongChoosingScene": #MFH - dual / triple loading cycle fix - Log.warn("Extra SongChoosingScene was instantiated, but detected and shut down. Cause unknown.") - raise SuppressScene #stump - else: - self.engine.world.sceneName = "SongChoosingScene" + self.engine.world.sceneName = "SongChoosingScene" Song.updateSongDatabase(self.engine)