From 5e3a97c45f30784f0e054ea3fd466355e248348a Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 28 Feb 2003 06:36:45 +0000 Subject: [PATCH] remove all battle-related theme elements fix order of options on ScreenOptionsMenu default theme uses ScreenSelectDifficulty, NOT ScreenSelectDifficultyEx --- stepmania/Themes/default/metrics.ini | 2 +- stepmania/src/Inventory.cpp | 12 +++++++++--- stepmania/src/ScreenOptionsMenu.cpp | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 5401fb6ada..d46e9d64d6 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -72,7 +72,7 @@ PreviewX=160 PreviewY=240 HelpText=Use &LEFT; &RIGHT; to select, then press START TimerSeconds=40 -NextScreen=ScreenSelectDifficultyEx +NextScreen=ScreenSelectDifficulty [ScreenSelectStyle5th] HelpText=Use &LEFT; &RIGHT; to select, then press START diff --git a/stepmania/src/Inventory.cpp b/stepmania/src/Inventory.cpp index c7c9b2ed87..b978742cba 100644 --- a/stepmania/src/Inventory.cpp +++ b/stepmania/src/Inventory.cpp @@ -26,9 +26,15 @@ Inventory::Inventory() { RefreshPossibleItems(); - m_soundAcquireItem.Load( THEME->GetPathTo("Sounds","gameplay battle aquire item") ); - m_soundUseItem.Load( THEME->GetPathTo("Sounds","gameplay battle use item") ); - m_soundItemEnding.Load( THEME->GetPathTo("Sounds","gameplay battle item ending") ); + // don't load battle sounds if they're not going to be used + switch( GAMESTATE->m_PlayMode ) + { + case PLAY_MODE_BATTLE: + m_soundAcquireItem.Load( THEME->GetPathTo("Sounds","gameplay battle aquire item") ); + m_soundUseItem.Load( THEME->GetPathTo("Sounds","gameplay battle use item") ); + m_soundItemEnding.Load( THEME->GetPathTo("Sounds","gameplay battle item ending") ); + break; + } } void Inventory::RefreshPossibleItems() diff --git a/stepmania/src/ScreenOptionsMenu.cpp b/stepmania/src/ScreenOptionsMenu.cpp index 31ce8162da..2b0ddf70af 100644 --- a/stepmania/src/ScreenOptionsMenu.cpp +++ b/stepmania/src/ScreenOptionsMenu.cpp @@ -40,8 +40,8 @@ enum { OptionRowData g_OptionsMenuLines[NUM_OPTIONS_MENU_LINES] = { { "", 1, {"Appearance Options"} }, + { "", 1, {"Config Key/Joy Mappings"} }, { "", 1, {"Input Options"} }, - { "", 1, {"Config Key/Joy"} }, { "", 1, {"Gameplay Options"} }, { "", 1, {"Graphic Options"} }, { "", 1, {"Machine Options"} },