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.
This commit is contained in:
Glenn Maynard
2003-10-10 03:23:36 +00:00
parent 04d7f58014
commit 8afe89d22f
+5 -5
View File
@@ -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(