From 67a3a59a00b88464617c2dc5135366f06428372d Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 15 Apr 2003 05:51:41 +0000 Subject: [PATCH] fix SMEX glitches fix inconsistent fallback banner file name fix inaccurate grade being displayed for p2 --- .../Graphics/Common fallback banner.png | Bin 0 -> 10927 bytes stepmania/Themes/default/metrics.ini | 1 + stepmania/src/GradeDisplay.cpp | 36 ++++-- stepmania/src/MusicBannerWheel.cpp | 16 +-- stepmania/src/Screen.cpp | 120 +++++++++--------- stepmania/src/smpackage/onvertThemeDlg.cpp | 2 +- 6 files changed, 96 insertions(+), 79 deletions(-) create mode 100644 stepmania/Themes/default/Graphics/Common fallback banner.png diff --git a/stepmania/Themes/default/Graphics/Common fallback banner.png b/stepmania/Themes/default/Graphics/Common fallback banner.png new file mode 100644 index 0000000000000000000000000000000000000000..f99fe50bf023a2502f65f8322ea66211901769c8 GIT binary patch literal 10927 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 LJ=N;Rh=~6IZV(U0 literal 0 HcmV?d00001 diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 274bc416df..518db71ac8 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -546,6 +546,7 @@ TimerSeconds=60 NextScreen=ScreenGameplay [ScreenGameplay] +SongSelectScreen=ScreenSelectMusic PrevScreenArcade=ScreenSelectMusic PrevScreenNonstop=ScreenSelectCourse PrevScreenOni=ScreenSelectCourse diff --git a/stepmania/src/GradeDisplay.cpp b/stepmania/src/GradeDisplay.cpp index 9e236af083..c12ce78f70 100644 --- a/stepmania/src/GradeDisplay.cpp +++ b/stepmania/src/GradeDisplay.cpp @@ -83,20 +83,34 @@ void GradeDisplay::DrawPrimitives() int GradeDisplay::GetFrameNo( PlayerNumber pn, Grade g ) { // either 8, or 16 states - int iNumCols = Sprite::GetNumStates()==8 ? 1 : 2; + int iNumCols; + switch( Sprite::GetNumStates() ) + { + default: + ASSERT(0); + case 8: iNumCols=1; break; + case 16: iNumCols=2; break; + } + + int iFrame; switch( g ) { - case GRADE_AAAA: return 0*iNumCols+pn; break; - case GRADE_AAA: return 1*iNumCols+pn; break; - case GRADE_AA: return 2*iNumCols+pn; break; - case GRADE_A: return 3*iNumCols+pn; break; - case GRADE_B: return 4*iNumCols+pn; break; - case GRADE_C: return 5*iNumCols+pn; break; - case GRADE_D: return 6*iNumCols+pn; break; - case GRADE_E: return 7*iNumCols+pn; break; - case GRADE_NO_DATA: return 0; break; - default: ASSERT(0); return 0; + case GRADE_AAAA: iFrame = 0; break; + case GRADE_AAA: iFrame = 1; break; + case GRADE_AA: iFrame = 2; break; + case GRADE_A: iFrame = 3; break; + case GRADE_B: iFrame = 4; break; + case GRADE_C: iFrame = 5; break; + case GRADE_D: iFrame = 6; break; + case GRADE_E: iFrame = 7; break; + default: + ASSERT(0); + case GRADE_NO_DATA: iFrame = 0; break; } + iFrame *= iNumCols; + if( iNumCols==2 ) + iFrame += pn; + return iFrame; } void GradeDisplay::SetGrade( PlayerNumber pn, Grade g ) diff --git a/stepmania/src/MusicBannerWheel.cpp b/stepmania/src/MusicBannerWheel.cpp index d26a381048..8a9e60546b 100644 --- a/stepmania/src/MusicBannerWheel.cpp +++ b/stepmania/src/MusicBannerWheel.cpp @@ -125,10 +125,10 @@ void MusicBannerWheel::InsertNewBanner(int direction) else pSong = arraySongs[(arraySongs.size()-1) + (currentPos-2)]; // wrap around. (it does honestly!) - if( pSong == NULL ) sGraphicPath = (THEME->GetPathToG("fallback banner")); + if( pSong == NULL ) sGraphicPath = (THEME->GetPathToG("Common fallback banner")); else if (pSong->HasBanner()) sGraphicPath = (pSong->GetBannerPath()); else if (PREFSMAN->m_bUseBGIfNoBanner && pSong->HasBackground() ) sGraphicPath = (pSong->GetBannerPath()); - else sGraphicPath = (THEME->GetPathToG("fallback banner")); + else sGraphicPath = (THEME->GetPathToG("Common fallback banner")); elementtoreplace = scrlistPos - 2; if(elementtoreplace < 0) @@ -152,10 +152,10 @@ void MusicBannerWheel::InsertNewBanner(int direction) else pSong = arraySongs[0+ (((currentPos+2) - (arraySongs.size()-1)) - 1)]; // wrap around. (it does honestly!) - if( pSong == NULL ) sGraphicPath = (THEME->GetPathToG("fallback banner")); + if( pSong == NULL ) sGraphicPath = (THEME->GetPathToG("Common fallback banner")); else if (pSong->HasBanner()) sGraphicPath = (pSong->GetBannerPath()); else if (PREFSMAN->m_bUseBGIfNoBanner && pSong->HasBackground() ) sGraphicPath = (pSong->GetBannerPath()); - else sGraphicPath = (THEME->GetPathToG("fallback banner")); + else sGraphicPath = (THEME->GetPathToG("Common fallback banner")); elementtoreplace = scrlistPos + 2; if(elementtoreplace > MAXSONGSINBUFFER-1) @@ -197,10 +197,10 @@ void MusicBannerWheel::LoadSongData() { pSong = arraySongs[c]; - if( pSong == NULL ) asGraphicPaths.push_back(THEME->GetPathToG("fallback banner")); + if( pSong == NULL ) asGraphicPaths.push_back(THEME->GetPathToG("Common fallback banner")); else if (pSong->HasBanner()) asGraphicPaths.push_back(pSong->GetBannerPath()); else if (PREFSMAN->m_bUseBGIfNoBanner && pSong->HasBackground() ) asGraphicPaths.push_back(pSong->GetBannerPath()); - else asGraphicPaths.push_back(THEME->GetPathToG("fallback banner")); + else asGraphicPaths.push_back(THEME->GetPathToG("Common fallback banner")); } } } @@ -249,10 +249,10 @@ void MusicBannerWheel::LoadSongData() pSong = arraySongs[arraySongs.size()-1]; } - if( pSong == NULL ) asGraphicPaths.push_back(THEME->GetPathToG("fallback banner")); + if( pSong == NULL ) asGraphicPaths.push_back(THEME->GetPathToG("Common fallback banner")); else if (pSong->HasBanner()) asGraphicPaths.push_back(pSong->GetBannerPath()); else if (PREFSMAN->m_bUseBGIfNoBanner && pSong->HasBackground() ) asGraphicPaths.push_back(pSong->GetBannerPath()); - else asGraphicPaths.push_back(THEME->GetPathToG("fallback banner")); + else asGraphicPaths.push_back(THEME->GetPathToG("Common fallback banner")); } } if(SingleLoad != 1) diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp index bdd95e4992..a4bdf51846 100644 --- a/stepmania/src/Screen.cpp +++ b/stepmania/src/Screen.cpp @@ -276,65 +276,67 @@ Screen* Screen::Create( CString sClassName ) { Screen *ret = NULL; - if( sClassName=="ScreenAppearanceOptions" ) ret = new ScreenAppearanceOptions; - else if( sClassName=="ScreenCaution" ) ret = new ScreenCaution; - else if( sClassName=="ScreenEdit" ) ret = new ScreenEdit; - else if( sClassName=="ScreenEditMenu" ) ret = new ScreenEditMenu; - else if( sClassName=="ScreenEvaluationStage" ) ret = new ScreenEvaluationStage; - else if( sClassName=="ScreenEvaluationSummary" ) ret = new ScreenEvaluationSummary; - else if( sClassName=="ScreenEvaluationNonstop" ) ret = new ScreenEvaluationNonstop; - else if( sClassName=="ScreenEvaluationOni" ) ret = new ScreenEvaluationOni; - else if( sClassName=="ScreenEvaluationEndless" ) ret = new ScreenEvaluationEndless; - else if( sClassName=="ScreenEvaluationBattle" ) ret = new ScreenEvaluationBattle; - else if( sClassName=="ScreenEvaluationRave" ) ret = new ScreenEvaluationRave; - else if( sClassName=="ScreenEz2SelectPlayer" ) ret = new ScreenEz2SelectPlayer; - else if( sClassName=="ScreenSelectMode" ) ret = new ScreenSelectMode; - else if( sClassName=="ScreenGameOver" ) ret = new ScreenGameOver; - else if( sClassName=="ScreenGameplay" ) ret = new ScreenGameplay; - else if( sClassName=="ScreenGraphicOptions" ) ret = new ScreenGraphicOptions; - else if( sClassName=="ScreenHowToPlay" ) ret = new ScreenHowToPlay; - else if( sClassName=="ScreenInputOptions" ) ret = new ScreenInputOptions; - else if( sClassName=="ScreenMachineOptions" ) ret = new ScreenMachineOptions; - else if( sClassName=="ScreenMapControllers" ) ret = new ScreenMapControllers; - else if( sClassName=="ScreenInputOptions" ) ret = new ScreenInputOptions; - else if( sClassName=="ScreenMusicScroll" ) ret = new ScreenMusicScroll; - else if( sClassName=="ScreenPlayerOptions" ) ret = new ScreenPlayerOptions; - else if( sClassName=="ScreenSandbox" ) ret = new ScreenSandbox; - else if( sClassName=="ScreenSelectCourse" ) ret = new ScreenSelectCourse; - else if( sClassName=="ScreenSelectDifficulty" ) ret = new ScreenSelectDifficulty; - else if( sClassName=="ScreenSelectDifficultyEX" ) ret = new ScreenSelectDifficultyEX; - else if( sClassName=="ScreenSelectGame" ) ret = new ScreenSelectGame; - else if( sClassName=="ScreenSelectGroup" ) ret = new ScreenSelectGroup; - else if( sClassName=="ScreenSelectMusic" ) ret = new ScreenSelectMusic; - else if( sClassName=="ScreenSelectStyle5th" ) ret = new ScreenSelectStyle5th; - else if( sClassName=="ScreenSelectStyle" ) ret = new ScreenSelectStyle; - else if( sClassName=="ScreenSongOptions" ) ret = new ScreenSongOptions; - else if( sClassName=="ScreenStage" ) ret = new ScreenStage; - else if( sClassName=="ScreenTest" ) ret = new ScreenTest; - else if( sClassName=="ScreenTestFonts" ) ret = new ScreenTestFonts; - else if( sClassName=="ScreenTestSound" ) ret = new ScreenTestSound; - else if( sClassName=="ScreenTitleMenu" ) ret = new ScreenTitleMenu; - else if( sClassName=="ScreenEz2SelectMusic" ) ret = new ScreenEz2SelectMusic; - else if( sClassName=="ScreenWarning" ) ret = new ScreenWarning; - else if( sClassName=="ScreenRanking" ) ret = new ScreenRanking; - else if( sClassName=="ScreenMemoryCard" ) ret = new ScreenMemoryCard; - else if( sClassName=="ScreenCompany" ) ret = new ScreenCompany; - else if( sClassName=="ScreenIntroMovie" ) ret = new ScreenIntroMovie; - else if( sClassName=="ScreenAlbums" ) ret = new ScreenAlbums; - else if( sClassName=="ScreenLogo" ) ret = new ScreenLogo; - else if( sClassName=="ScreenUnlock" ) ret = new ScreenUnlock; - else if( sClassName=="ScreenDemonstration" ) ret = (ScreenGameplay*)new ScreenDemonstration; - else if( sClassName=="ScreenInstructions" ) ret = new ScreenInstructions; - else if( sClassName=="ScreenNameEntry" ) ret = new ScreenNameEntry; - else if( sClassName=="ScreenJukebox" ) ret = new ScreenJukebox; - else if( sClassName=="ScreenJukeboxMenu" ) ret = new ScreenJukeboxMenu; - else if( sClassName=="ScreenOptionsMenu" ) ret = new ScreenOptionsMenu; - else if( sClassName=="ScreenSoundOptions" ) ret = new ScreenSoundOptions; - else if( sClassName=="ScreenGameplayOptions" ) ret = new ScreenGameplayOptions; - else if( sClassName=="ScreenStyleSplash" ) ret = new ScreenStyleSplash; - else if( sClassName=="ScreenAutogenOptions" ) ret = new ScreenAutogenOptions; - else if( sClassName=="ScreenCredits" ) ret = new ScreenCredits; - else if( sClassName=="ScreenSelectCharacter" ) ret = new ScreenSelectCharacter; +#define IS( name ) (sClassName.CompareNoCase(name)==0) + + if( IS("ScreenAppearanceOptions") ) ret = new ScreenAppearanceOptions; + else if( IS("ScreenCaution") ) ret = new ScreenCaution; + else if( IS("ScreenEdit") ) ret = new ScreenEdit; + else if( IS("ScreenEditMenu") ) ret = new ScreenEditMenu; + else if( IS("ScreenEvaluationStage") ) ret = new ScreenEvaluationStage; + else if( IS("ScreenEvaluationSummary") ) ret = new ScreenEvaluationSummary; + else if( IS("ScreenEvaluationNonstop") ) ret = new ScreenEvaluationNonstop; + else if( IS("ScreenEvaluationOni") ) ret = new ScreenEvaluationOni; + else if( IS("ScreenEvaluationEndless") ) ret = new ScreenEvaluationEndless; + else if( IS("ScreenEvaluationBattle") ) ret = new ScreenEvaluationBattle; + else if( IS("ScreenEvaluationRave") ) ret = new ScreenEvaluationRave; + else if( IS("ScreenEz2SelectPlayer") ) ret = new ScreenEz2SelectPlayer; + else if( IS("ScreenSelectMode") ) ret = new ScreenSelectMode; + else if( IS("ScreenGameOver") ) ret = new ScreenGameOver; + else if( IS("ScreenGameplay") ) ret = new ScreenGameplay; + else if( IS("ScreenGraphicOptions") ) ret = new ScreenGraphicOptions; + else if( IS("ScreenHowToPlay") ) ret = new ScreenHowToPlay; + else if( IS("ScreenInputOptions") ) ret = new ScreenInputOptions; + else if( IS("ScreenMachineOptions") ) ret = new ScreenMachineOptions; + else if( IS("ScreenMapControllers") ) ret = new ScreenMapControllers; + else if( IS("ScreenInputOptions") ) ret = new ScreenInputOptions; + else if( IS("ScreenMusicScroll") ) ret = new ScreenMusicScroll; + else if( IS("ScreenPlayerOptions") ) ret = new ScreenPlayerOptions; + else if( IS("ScreenSandbox") ) ret = new ScreenSandbox; + else if( IS("ScreenSelectCourse") ) ret = new ScreenSelectCourse; + else if( IS("ScreenSelectDifficulty") ) ret = new ScreenSelectDifficulty; + else if( IS("ScreenSelectDifficultyEX") ) ret = new ScreenSelectDifficultyEX; + else if( IS("ScreenSelectGame") ) ret = new ScreenSelectGame; + else if( IS("ScreenSelectGroup") ) ret = new ScreenSelectGroup; + else if( IS("ScreenSelectMusic") ) ret = new ScreenSelectMusic; + else if( IS("ScreenSelectStyle5th") ) ret = new ScreenSelectStyle5th; + else if( IS("ScreenSelectStyle") ) ret = new ScreenSelectStyle; + else if( IS("ScreenSongOptions") ) ret = new ScreenSongOptions; + else if( IS("ScreenStage") ) ret = new ScreenStage; + else if( IS("ScreenTest") ) ret = new ScreenTest; + else if( IS("ScreenTestFonts") ) ret = new ScreenTestFonts; + else if( IS("ScreenTestSound") ) ret = new ScreenTestSound; + else if( IS("ScreenTitleMenu") ) ret = new ScreenTitleMenu; + else if( IS("ScreenEz2SelectMusic") ) ret = new ScreenEz2SelectMusic; + else if( IS("ScreenWarning") ) ret = new ScreenWarning; + else if( IS("ScreenRanking") ) ret = new ScreenRanking; + else if( IS("ScreenMemoryCard") ) ret = new ScreenMemoryCard; + else if( IS("ScreenCompany") ) ret = new ScreenCompany; + else if( IS("ScreenIntroMovie") ) ret = new ScreenIntroMovie; + else if( IS("ScreenAlbums") ) ret = new ScreenAlbums; + else if( IS("ScreenLogo") ) ret = new ScreenLogo; + else if( IS("ScreenUnlock") ) ret = new ScreenUnlock; + else if( IS("ScreenDemonstration") ) ret = (ScreenGameplay*)new ScreenDemonstration; + else if( IS("ScreenInstructions") ) ret = new ScreenInstructions; + else if( IS("ScreenNameEntry") ) ret = new ScreenNameEntry; + else if( IS("ScreenJukebox") ) ret = new ScreenJukebox; + else if( IS("ScreenJukeboxMenu") ) ret = new ScreenJukeboxMenu; + else if( IS("ScreenOptionsMenu") ) ret = new ScreenOptionsMenu; + else if( IS("ScreenSoundOptions") ) ret = new ScreenSoundOptions; + else if( IS("ScreenGameplayOptions") ) ret = new ScreenGameplayOptions; + else if( IS("ScreenStyleSplash") ) ret = new ScreenStyleSplash; + else if( IS("ScreenAutogenOptions") ) ret = new ScreenAutogenOptions; + else if( IS("ScreenCredits") ) ret = new ScreenCredits; + else if( IS("ScreenSelectCharacter") ) ret = new ScreenSelectCharacter; else RageException::Throw( "Invalid Screen class name '%s'", sClassName.GetString() ); return ret; diff --git a/stepmania/src/smpackage/onvertThemeDlg.cpp b/stepmania/src/smpackage/onvertThemeDlg.cpp index e88e65949c..7695c22521 100644 --- a/stepmania/src/smpackage/onvertThemeDlg.cpp +++ b/stepmania/src/smpackage/onvertThemeDlg.cpp @@ -151,7 +151,7 @@ void ConvertThemeDlg::OnButtonConvert() RecursiveRename( sThemeDir, "top edge", "header" ); RecursiveRename( sThemeDir, "\\edit menu", "\\ScreenEditMenu" ); RecursiveRename( sThemeDir, "\\evaluation", "\\ScreenEvaluation" ); - RecursiveRename( sThemeDir, "fallback banner", "Banner fallback" ); + RecursiveRename( sThemeDir, "fallback banner", "Common fallback banner" ); RecursiveRename( sThemeDir, "Fonts\\music scroll", "Fonts\\ScreenMusicScroll titles" ); RecursiveRename( sThemeDir, "fallback background", "Common fallback background" ); RecursiveRename( sThemeDir, "all music banner", "Banner all" );