From b8ff93249b18b11508013222d4fc552dc6619d23 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 21 Jan 2002 09:27:34 +0000 Subject: [PATCH] fixed "Hall of mirrors" --- stepmania/src/StepMania.cpp | 5 ----- stepmania/src/ThemeManager.cpp | 1 + stepmania/src/ThemeManager.h | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index 1c7bf23774..bda2c9bc5e 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -309,9 +309,6 @@ HRESULT CreateObjects( HWND hWnd ) WM = new WindowManager; // throw something up on the screen while the game resources are loading - // super hack! Why do we crash unless we have rendered one frame before drawing anything? - Render(); - ShowFrame(); WM->SetNewWindow( new WindowLoading ); Render(); ShowFrame(); @@ -339,8 +336,6 @@ HRESULT CreateObjects( HWND hWnd ) //WM->SetNewWindow( new WindowPlayerOptions ); WM->SetNewWindow( new WindowTitleMenu ); - //Sleep(2000); // let the disk operations catch up - DXUtil_Timer( TIMER_START ); // Start the accurate timer diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index d24a3283c8..02152424e5 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -85,6 +85,7 @@ CString ThemeManager::GetPathTo( ThemeElement te, CString sThemeName ) case SOUND_MENU_SWOOSH: sAssetPath = "Sounds\\menu swoosh"; break; case SOUND_MENU_BACK: sAssetPath = "Sounds\\menu back"; break; case SOUND_TRAINING_MUSIC: sAssetPath = "Sounds\\training music"; break; + case SOUND_INVALID: sAssetPath = "Sounds\\invalid"; break; case FONT_OUTLINE: sAssetPath = "Fonts\\Outline"; break; case FONT_NORMAL: sAssetPath = "Fonts\\Normal"; break; diff --git a/stepmania/src/ThemeManager.h b/stepmania/src/ThemeManager.h index 4e45421d05..dfdf613f7d 100644 --- a/stepmania/src/ThemeManager.h +++ b/stepmania/src/ThemeManager.h @@ -75,6 +75,7 @@ enum ThemeElement { SOUND_MENU_SWOOSH, SOUND_MENU_BACK, SOUND_TRAINING_MUSIC, + SOUND_INVALID, FONT_OUTLINE, FONT_NORMAL,