From 8afe89d22f196414aba75ff8ce7a76644af45238 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 10 Oct 2003 03:23:36 +0000 Subject: [PATCH] Cleanup: read game prefs right after theme and announcer are set up, so we don't waste time with default metrics that'll just be overridden right away. Load ANNOUNCER earlier to do this. --- stepmania/src/StepMania.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index b3677e6c3f..df0b0098f5 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -781,11 +781,15 @@ int main(int argc, char* argv[]) GAMEMAN = new GameManager; THEME = new ThemeManager; + ANNOUNCER = new AnnouncerManager; + + /* Set up the theme and announcer. */ + ReadGamePrefsFromDisk(); + NOTESKIN = new NoteSkinManager; SOUNDMAN = new RageSoundManager(PREFSMAN->m_sSoundDrivers); SOUNDMAN->SetPrefs(PREFSMAN->m_fSoundVolume); SOUND = new RageSounds; - ANNOUNCER = new AnnouncerManager; PROFILEMAN = new ProfileManager; INPUTFILTER = new InputFilter; INPUTMAPPER = new InputMapper; @@ -797,10 +801,6 @@ int main(int argc, char* argv[]) SONGMAN = new SongManager( loading_window ); // this takes a long time to load delete loading_window; // destroy this before init'ing Display - /* XXX: Why do we reload global prefs? PREFSMAN loads them in the ctor. -glenn */ - PREFSMAN->ReadGlobalPrefsFromDisk(); - ReadGamePrefsFromDisk(); - DISPLAY = CreateDisplay(); TEXTUREMAN = new RageTextureManager(); TEXTUREMAN->SetPrefs(