From b8095439f4b44a31f6dd42f0ebdca5bc961eb052 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 24 Oct 2003 04:56:17 +0000 Subject: [PATCH] Fix last arcade stage graphic not being cached; fix this correctly. --- stepmania/src/GameState.cpp | 7 ++----- stepmania/src/ScreenSelectMusic.cpp | 5 +++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 1edbe06f7d..2a69cd6bb5 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -309,11 +309,8 @@ void GameState::GetAllStageTexts( CStringArray &out ) out.push_back( "final" ); out.push_back( "extra1" ); out.push_back( "extra2" ); - if (!(PREFSMAN->m_bEventMode)) - { - for( int stage = 0; stage < (PREFSMAN->m_iNumArcadeStages)-1; ++stage ) - out.push_back( ssprintf("%d",stage+1) ); - } + for( int stage = 0; stage < PREFSMAN->m_iNumArcadeStages; ++stage ) + out.push_back( ssprintf("%d",stage+1) ); } int GameState::GetCourseSongIndex() diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 19150de29e..8348195a4a 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -133,8 +133,9 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : Screen( sClassName GAMESTATE->GetAllStageTexts( StageTexts ); for( unsigned i = 0; i < StageTexts.size(); ++i ) { - CString path = THEME->GetPathToG( "ScreenSelectMusic stage "+StageTexts[i] ); - TEXTUREMAN->CacheTexture( path ); + CString path = THEME->GetPathToG( "ScreenSelectMusic stage "+StageTexts[i], true ); + if( path != "" ) + TEXTUREMAN->CacheTexture( path ); } }