From b5e749885a7cb72342fd72694a70d7eaae522bf2 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 31 Mar 2003 03:11:31 +0000 Subject: [PATCH] graphics cleanup in default theme, SMMAX2 --- .../Graphics/ScreenEvaluation grades 1x8.png | Bin 0 -> 18066 bytes stepmania/Themes/default/metrics.ini | 12 +-- stepmania/src/GradeDisplay.cpp | 79 ++++++++---------- stepmania/src/GradeDisplay.h | 8 +- stepmania/src/MusicWheel.h | 1 - stepmania/src/MusicWheelItem.cpp | 7 +- stepmania/src/MusicWheelItem.h | 6 +- stepmania/src/ScreenEvaluation.cpp | 5 +- stepmania/src/SmallGradeDisplay.cpp | 64 -------------- stepmania/src/SmallGradeDisplay.h | 36 -------- stepmania/src/StepMania.dsp | 12 +-- stepmania/src/StepMania.vcproj | 6 -- stepmania/src/smpackage/onvertThemeDlg.cpp | 53 ++++++++++++ 13 files changed, 114 insertions(+), 175 deletions(-) create mode 100644 stepmania/Themes/default/Graphics/ScreenEvaluation grades 1x8.png delete mode 100644 stepmania/src/SmallGradeDisplay.cpp delete mode 100644 stepmania/src/SmallGradeDisplay.h diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation grades 1x8.png b/stepmania/Themes/default/Graphics/ScreenEvaluation grades 1x8.png new file mode 100644 index 0000000000000000000000000000000000000000..5342da49b21ee237edaf795483af196a5efe02e3 GIT binary patch literal 18066 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 WP-gkc7kqyVU~9S8;-MKi_WuAr6&vRO literal 0 HcmV?d00001 diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index f527f8c487..ac287d3ba6 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -69,15 +69,15 @@ NextScreen4=ScreenSelectDifficulty NextScreen5=ScreenSelectDifficulty JointPremiumOnCommand=x,550;y,84;xoffset,400;bounceend,0.5;xoffset,-400;glowshift;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.3 JointPremiumOffCommand=bouncebegin,0.5;xoffset,400 -Icon1OnCommand=x,60;y,84;xoffset,-800;sleep,0.20;decelerate,0.3;xoffset,800 +Icon1OnCommand=x,60;y,84;xoffset,-640;sleep,0.20;decelerate,0.3;xoffset,640 Icon1OffCommand=bouncebegin,0.5;zoomy,0 -Icon2OnCommand=x,140;y,84;xoffset,-800;sleep,0.15;decelerate,0.3;xoffset,800 +Icon2OnCommand=x,140;y,84;xoffset,-640;sleep,0.15;decelerate,0.3;xoffset,640 Icon2OffCommand=bouncebegin,0.5;zoomy,0 -Icon3OnCommand=x,220;y,84;xoffset,-800;sleep,0.10;decelerate,0.3;xoffset,800 +Icon3OnCommand=x,220;y,84;xoffset,-640;sleep,0.10;decelerate,0.3;xoffset,640 Icon3OffCommand=bouncebegin,0.5;zoomy,0 -Icon4OnCommand=x,300;y,84;xoffset,-800;sleep,0.05;decelerate,0.3;xoffset,800 +Icon4OnCommand=x,300;y,84;xoffset,-640;sleep,0.05;decelerate,0.3;xoffset,640 Icon4OffCommand=bouncebegin,0.5;zoomy,0 -Icon5OnCommand=x,380;y,84;xoffset,-800;sleep,0.00;decelerate,0.3;xoffset,800 +Icon5OnCommand=x,380;y,84;xoffset,-640;sleep,0.00;decelerate,0.3;xoffset,640 Icon5OffCommand=bouncebegin,0.5;zoomy,0 IconGainFocusCommand=glowshift;effectperiod,0.5 IconLoseFocusCommand=stopeffect @@ -123,6 +123,7 @@ HelpText= [ScreenSelectDifficulty] Choices=arcade-beginner,arcade-easy,arcade-medium,arcade-hard,nonstop,oni,endless +NumChoicesOnPage1=4 HelpText=Use &LEFT; &RIGHT; to select, then press START TimerSeconds=40 NextScreen1=ScreenSelectGroup @@ -132,7 +133,6 @@ NextScreen4=ScreenSelectGroup NextScreen5=ScreenInstructions NextScreen6=ScreenInstructions NextScreen7=ScreenInstructions -NumChoicesOnPage1=4 LockInputSeconds=0.8 SleepAfterChoiceSeconds=0.3 SleepAfterTweenOffSeconds=0.8 diff --git a/stepmania/src/GradeDisplay.cpp b/stepmania/src/GradeDisplay.cpp index 4d89b43643..b65e5f7ddf 100644 --- a/stepmania/src/GradeDisplay.cpp +++ b/stepmania/src/GradeDisplay.cpp @@ -26,17 +26,23 @@ const float GRADES_TO_SCROLL = NUM_GRADE_FRAMES*4; GradeDisplay::GradeDisplay() { - RageTextureID id( THEME->GetPathTo("Graphics",ssprintf("GradeDisplay grades 1x%d",NUM_GRADE_FRAMES)) ); - id.bStretch = true; - Load( id ); - StopAnimating(); - m_fTimeLeftInScroll = 0; m_bDoScrolling = 0; SetGrade( PLAYER_1, GRADE_NO_DATA ); } +bool GradeDisplay::Load( RageTextureID ID ) +{ + ID.bStretch = true; + Sprite::Load( ID ); + Sprite::StopAnimating(); + + if( Sprite::GetNumStates() != 8 || Sprite::GetNumStates() != 16 ) + RageException::Throw( "The grade graphic '%s' must have either 8 or 16 frames.", ID.filename.GetString() ); + return true; +} + void GradeDisplay::Update( float fDeltaTime ) { Sprite::Update( fDeltaTime ); @@ -74,55 +80,42 @@ void GradeDisplay::DrawPrimitives() Sprite::DrawPrimitives(); } +int GradeDisplay::GetFrameNo( PlayerNumber pn, Grade g ) +{ + // either 8, or 16 states + int iNumCols = Sprite::GetNumStates()==8 ? 1 : 2; + 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; + } +} + void GradeDisplay::SetGrade( PlayerNumber pn, Grade g ) { + m_PlayerNumber = pn; m_Grade = g; m_bDoScrolling = false; StopUsingCustomCoords(); - SetDiffuse( RageColor(1,1,1,1) ); + SetState( GetFrameNo(pn,g) ); + Sprite::SetDiffuse( RageColor(1,1,1,g==GRADE_NO_DATA ? 0 : 1) ); +} - // Ugly... This has to handle cases where the sprite has 7, 8, 14, or 16 states - int iNumCols = (this->GetNumStates()>8) ? 2 : 1; - switch( g ) - { - case GRADE_AAAA: SetState( 0*iNumCols+pn ); break; - case GRADE_AAA: SetState( 1*iNumCols+pn ); break; - case GRADE_AA: SetState( 2*iNumCols+pn ); break; - case GRADE_A: SetState( 3*iNumCols+pn ); break; - case GRADE_B: SetState( 4*iNumCols+pn ); break; - case GRADE_C: SetState( 5*iNumCols+pn ); break; - case GRADE_D: SetState( 6*iNumCols+pn ); break; - case GRADE_E: SetState( 7*iNumCols+pn ); break; - case GRADE_NO_DATA: SetDiffuse( RageColor(1,1,1,0) ); break; - default: ASSERT(0); - } -}; - -void GradeDisplay::SpinAndSettleOn( Grade g ) +void GradeDisplay::Spin() { - ASSERT( g != GRADE_NO_DATA ); - m_Grade = g; - m_bDoScrolling = true; - - SetDiffuse( RageColor(1,1,1,1) ); - - int iFrameNo=0; - switch( g ) - { - case GRADE_AAAA: iFrameNo = 0; break; - case GRADE_AAA: iFrameNo = 1; break; - case GRADE_AA: iFrameNo = 2; break; - case GRADE_A: iFrameNo = 3; break; - case GRADE_B: iFrameNo = 4; break; - case GRADE_C: iFrameNo = 5; break; - case GRADE_D: iFrameNo = 6; break; - case GRADE_E: iFrameNo = 7; break; - default: ASSERT(0); - } + int iFrameNo = GetFrameNo( m_PlayerNumber, m_Grade ); m_frectDestTexCoords = *m_pTexture->GetTextureCoordRect( iFrameNo ); m_frectStartTexCoords = m_frectDestTexCoords; diff --git a/stepmania/src/GradeDisplay.h b/stepmania/src/GradeDisplay.h index 4f6be1b983..6447d22963 100644 --- a/stepmania/src/GradeDisplay.h +++ b/stepmania/src/GradeDisplay.h @@ -21,17 +21,21 @@ class GradeDisplay : public Sprite { public: GradeDisplay(); - + virtual bool Load( RageTextureID ID ); + virtual void Update( float fDeltaTime ); virtual void DrawPrimitives(); void SetGrade( PlayerNumber pn, Grade g ); - void SpinAndSettleOn( Grade g ); + void Spin(); void SettleImmediately(); void SettleQuickly(); protected: + int GetFrameNo( PlayerNumber pn, Grade g ); + + PlayerNumber m_PlayerNumber; Grade m_Grade; // for scrolling; 0 = no, 1 = normal, 2 = quick diff --git a/stepmania/src/MusicWheel.h b/stepmania/src/MusicWheel.h index 9d03eb3333..74dd3fe719 100644 --- a/stepmania/src/MusicWheel.h +++ b/stepmania/src/MusicWheel.h @@ -18,7 +18,6 @@ #include "Quad.h" #include "TextBanner.h" #include "RandomSample.h" -#include "SmallGradeDisplay.h" #include "GameConstantsAndTypes.h" #include "MusicSortDisplay.h" #include "WheelNotifyIcon.h" diff --git a/stepmania/src/MusicWheelItem.cpp b/stepmania/src/MusicWheelItem.cpp index 6b431301c6..e0e8eb54ad 100644 --- a/stepmania/src/MusicWheelItem.cpp +++ b/stepmania/src/MusicWheelItem.cpp @@ -68,14 +68,14 @@ WheelItemDisplay::WheelItemDisplay() m_sprSectionBar.Load( THEME->GetPathTo("Graphics","MusicWheelItem section") ); m_sprSectionBar.SetXY( 0, 0 ); - m_textSectionName.LoadFromFont( THEME->GetPathTo("Fonts","MusicWheel section") ); + m_textSectionName.LoadFromFont( THEME->GetPathTo("Fonts","MusicWheelItem section") ); m_textSectionName.EnableShadow( false ); m_textSectionName.SetVertAlign( align_middle ); m_textSectionName.SetXY( SECTION_NAME_X, 0 ); m_textSectionName.SetZoom( SECTION_ZOOM ); - m_textRoulette.LoadFromFont( THEME->GetPathTo("Fonts","MusicWheel roulette") ); + m_textRoulette.LoadFromFont( THEME->GetPathTo("Fonts","MusicWheelItem roulette") ); m_textRoulette.EnableShadow( false ); m_textRoulette.TurnRainbowOn(); m_textRoulette.SetZoom( ROULETTE_ZOOM ); @@ -83,11 +83,12 @@ WheelItemDisplay::WheelItemDisplay() for( int p=0; pGetPathTo("Graphics","MusicWheelItem grades") ); m_GradeDisplay[p].SetZoom( 1.0f ); m_GradeDisplay[p].SetXY( GRADE_X(p), 0 ); } - m_textCourse.LoadFromFont( THEME->GetPathTo("Fonts","MusicWheel course") ); + m_textCourse.LoadFromFont( THEME->GetPathTo("Fonts","MusicWheelItem course") ); m_textCourse.EnableShadow( false ); m_textCourse.SetZoom( COURSE_ZOOM ); m_textCourse.SetHorizAlign( align_left ); diff --git a/stepmania/src/MusicWheelItem.h b/stepmania/src/MusicWheelItem.h index 13fe52c730..60363e87a5 100644 --- a/stepmania/src/MusicWheelItem.h +++ b/stepmania/src/MusicWheelItem.h @@ -11,6 +11,8 @@ ----------------------------------------------------------------------------- */ +#include "GradeDisplay.h" + enum WheelItemType { TYPE_SECTION, TYPE_SONG, TYPE_ROULETTE, TYPE_RANDOM, TYPE_COURSE }; @@ -52,9 +54,9 @@ public: // for a TYPE_MUSIC Sprite m_sprSongBar; - WheelNotifyIcon m_WheelNotifyIcon; + WheelNotifyIcon m_WheelNotifyIcon; TextBanner m_TextBanner; - SmallGradeDisplay m_GradeDisplay[NUM_PLAYERS]; + GradeDisplay m_GradeDisplay[NUM_PLAYERS]; // for TYPE_COURSE BitmapText m_textCourse; diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 4d9444bc1f..e8b1b1bbdb 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -335,10 +335,11 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type ) m_sprGradeFrame[p].Command( GRADE_FRAME_ON_COMMAND(p) ); this->AddChild( &m_sprGradeFrame[p] ); + m_Grades[p].Load( THEME->GetPathTo("Graphics","ScreenEvaluation grades") ); + m_Grades[p].SetGrade( (PlayerNumber)p, grade[p] ); if( SPIN_GRADES ) - m_Grades[p].SpinAndSettleOn( grade[p] ); + m_Grades[p].Spin(); else - m_Grades[p].SetGrade( (PlayerNumber)p, grade[p] ); m_Grades[p].Command( GRADE_ON_COMMAND(p) ); this->AddChild( &m_Grades[p] ); } diff --git a/stepmania/src/SmallGradeDisplay.cpp b/stepmania/src/SmallGradeDisplay.cpp deleted file mode 100644 index 9f4b595e56..0000000000 --- a/stepmania/src/SmallGradeDisplay.cpp +++ /dev/null @@ -1,64 +0,0 @@ -#include "global.h" -/* ------------------------------------------------------------------------------ - Class: SmallGradeDisplay - - Desc: See header. - - Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. - Chris Danford ------------------------------------------------------------------------------ -*/ - -#include "SmallGradeDisplay.h" -#include "RageUtil.h" -#include "GameConstantsAndTypes.h" -#include "PrefsManager.h" -#include "ThemeManager.h" - - -const float SCROLL_TIME = 5.0f; -const int NUM_GRADE_FRAMES = 7; -const float GRADE_FRAME_HEIGHT = 1/(float)NUM_GRADE_FRAMES; -const float GRADES_TO_SCROLL = NUM_GRADE_FRAMES*4; - - -SmallGradeDisplay::SmallGradeDisplay() -{ - Load( THEME->GetPathTo("Graphics","SmallGradeDisplay grades 2x9") ); - StopAnimating(); - - SetGrade( PLAYER_1, GRADE_NO_DATA ); -} - -void SmallGradeDisplay::Update( float fDeltaTime ) -{ - Sprite::Update( fDeltaTime ); -} - -void SmallGradeDisplay::DrawPrimitives() -{ - Sprite::DrawPrimitives(); -} - -void SmallGradeDisplay::SetGrade( PlayerNumber pn, Grade g ) -{ - m_Grade = g; - - SetDiffuse( RageColor(1,1,1,1) ); - - int iNumCols = 2; - switch( g ) - { - case GRADE_AAAA: SetState( 0*iNumCols+pn ); break; - case GRADE_AAA: SetState( 1*iNumCols+pn ); break; - case GRADE_AA: SetState( 2*iNumCols+pn ); break; - case GRADE_A: SetState( 3*iNumCols+pn ); break; - case GRADE_B: SetState( 4*iNumCols+pn ); break; - case GRADE_C: SetState( 5*iNumCols+pn ); break; - case GRADE_D: SetState( 6*iNumCols+pn ); break; - case GRADE_E: SetState( 7*iNumCols+pn ); break; - case GRADE_NO_DATA: SetState( 8*iNumCols+pn ); break; - default: ASSERT(0); - } -} diff --git a/stepmania/src/SmallGradeDisplay.h b/stepmania/src/SmallGradeDisplay.h deleted file mode 100644 index baa2052dea..0000000000 --- a/stepmania/src/SmallGradeDisplay.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef SMALLGRADEDISPLAY_H -#define SMALLGRADEDISPLAY_H -/* ------------------------------------------------------------------------------ - Class: SmallGradeDisplay - - Desc: The grade shows on ScreenEvaluation - - Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. - Chris Danford ------------------------------------------------------------------------------ -*/ - - -#include "Sprite.h" -#include "Grade.h" -#include "PlayerNumber.h" - - - -class SmallGradeDisplay : public Sprite -{ -public: - SmallGradeDisplay(); - - virtual void Update( float fDeltaTime ); - virtual void DrawPrimitives(); - - void SetGrade( PlayerNumber pn, Grade g ); - -protected: - - Grade m_Grade; -}; - -#endif diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index ea2e99fce1..3460737819 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -60,7 +60,7 @@ IntDir=.\../Release6 TargetDir=\stepmania\stepmania TargetName=StepMania SOURCE="$(InputPath)" -PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ +PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi # End Special Build Tool @@ -95,7 +95,7 @@ IntDir=.\../Debug6 TargetDir=\stepmania\stepmania TargetName=StepMania-debug SOURCE="$(InputPath)" -PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ +PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi # End Special Build Tool @@ -1180,14 +1180,6 @@ SOURCE=.\ScrollingList.h # End Source File # Begin Source File -SOURCE=.\SmallGradeDisplay.cpp -# End Source File -# Begin Source File - -SOURCE=.\SmallGradeDisplay.h -# End Source File -# Begin Source File - SOURCE=.\SnapDisplay.cpp # End Source File # Begin Source File diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj index 569b2b9d4e..a8b6ee87a7 100644 --- a/stepmania/src/StepMania.vcproj +++ b/stepmania/src/StepMania.vcproj @@ -1155,12 +1155,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ - - - - diff --git a/stepmania/src/smpackage/onvertThemeDlg.cpp b/stepmania/src/smpackage/onvertThemeDlg.cpp index 2d8478cd6d..e88e65949c 100644 --- a/stepmania/src/smpackage/onvertThemeDlg.cpp +++ b/stepmania/src/smpackage/onvertThemeDlg.cpp @@ -112,6 +112,30 @@ void ConvertThemeDlg::OnButtonConvert() RecursiveRename( sThemeDir, "gameplay ready", "______OBSOLETE gameplay ready" ); RecursiveRename( sThemeDir, "keep alive", "______OBSOLETE keep alive" ); RecursiveRename( sThemeDir, "menu style icons 1x9", "______OBSOLETE menu style icons 1x9" ); + RecursiveRename( sThemeDir, "game over", "______OBSOLETE game over" ); + RecursiveRename( sThemeDir, "stage extra1", "______OBSOLETE stage extra1" ); + RecursiveRename( sThemeDir, "stage extra2", "______OBSOLETE stage extra2" ); + RecursiveRename( sThemeDir, "stage final", "______OBSOLETE stage final" ); + RecursiveRename( sThemeDir, "stage oni", "______OBSOLETE stage oni" ); + RecursiveRename( sThemeDir, "stage parts 5x3", "______OBSOLETE stage parts 5x3" ); + RecursiveRename( sThemeDir, "stage stage", "______OBSOLETE stage stage" ); + RecursiveRename( sThemeDir, "edit background", "______OBSOLETE edit background" ); + RecursiveRename( sThemeDir, "Fonts\\bpmdisplay", "Fonts\\______OBSOLETE bpmdisplay" ); + RecursiveRename( sThemeDir, "Fonts\\evaluation new record", "Fonts\\______OBSOLETE evaluation new record" ); + RecursiveRename( sThemeDir, "Fonts\\evaluation stage", "Fonts\\______OBSOLETE evaluation stage" ); + RecursiveRename( sThemeDir, "Fonts\\gameplay stage", "Fonts\\______OBSOLETE gameplay stage" ); + RecursiveRename( sThemeDir, "Fonts\\normal2", "Fonts\\______OBSOLETE normal2" ); + RecursiveRename( sThemeDir, "Fonts\\select course num songs", "Fonts\\______OBSOLETE select course num songs" ); + RecursiveRename( sThemeDir, "Fonts\\select course total time", "Fonts\\______OBSOLETE select course total time" ); + RecursiveRename( sThemeDir, "Fonts\\select group num songs", "Fonts\\______OBSOLETE select group num songs" ); + RecursiveRename( sThemeDir, "Fonts\\select music hold", "Fonts\\______OBSOLETE select music hold" ); + RecursiveRename( sThemeDir, "Fonts\\select music stage", "Fonts\\______OBSOLETE select music stage" ); + RecursiveRename( sThemeDir, "Fonts\\small titles", "Fonts\\______OBSOLETE small titles" ); + RecursiveRename( sThemeDir, "Fonts\\stage", "Fonts\\______OBSOLETE stage" ); + RecursiveRename( sThemeDir, "Fonts\\survive time", "Fonts\\______OBSOLETE survive time" ); + RecursiveRename( sThemeDir, "menu style icons", "______OBSOLETE menu style icons" ); + RecursiveRename( sThemeDir, "music status icons", "______OBSOLETE music status icons" ); + RecursiveRename( sThemeDir, "ScreenSelectMusic music", "______OBSOLETE ScreenSelectMusic music" ); RecursiveRename( sThemeDir, "title menu logo", "ScreenLogo" ); RecursiveRename( sThemeDir, "BGAnimations\\appearance options", "BGAnimations\\ScreenAppearanceOptions background" ); RecursiveRename( sThemeDir, "BGAnimations\\caution", "BGAnimations\\ScreenCaution background" ); @@ -120,11 +144,16 @@ void ConvertThemeDlg::OnButtonConvert() RecursiveRename( sThemeDir, "BGAnimations\\edit menu", "BGAnimations\\ScreenEditMenu background" ); RecursiveRename( sThemeDir, "BGAnimations\\evaluation", "BGAnimations\\ScreenEvaluation background" ); RecursiveRename( sThemeDir, "BGAnimations\\gameplay options", "BGAnimations\\ScreenGameplayOptions background" ); + RecursiveRename( sThemeDir, "BGAnimations\\edit menu", "BGAnimations\\ScreenEditMenu background" ); + RecursiveRename( sThemeDir, "BGAnimations\\game options", "BGAnimations\\ScreenGameOptions background" ); + RecursiveRename( sThemeDir, "BGAnimations\\title menu", "BGAnimations\\ScreenLogo background" ); RecursiveRename( sThemeDir, "evaluation summary top edge", "ScreenEvaluationSummary header" ); RecursiveRename( sThemeDir, "top edge", "header" ); RecursiveRename( sThemeDir, "\\edit menu", "\\ScreenEditMenu" ); RecursiveRename( sThemeDir, "\\evaluation", "\\ScreenEvaluation" ); RecursiveRename( sThemeDir, "fallback banner", "Banner fallback" ); + RecursiveRename( sThemeDir, "Fonts\\music scroll", "Fonts\\ScreenMusicScroll titles" ); + RecursiveRename( sThemeDir, "fallback background", "Common fallback background" ); RecursiveRename( sThemeDir, "all music banner", "Banner all" ); RecursiveRename( sThemeDir, "try extra stage", "try extra" ); RecursiveRename( sThemeDir, "fallback cd title", "ScreenSelectMusic fallback cdtitle" ); @@ -189,6 +218,30 @@ void ConvertThemeDlg::OnButtonConvert() RecursiveRename( sThemeDir, "menu timer", "MenuTimer" ); RecursiveRename( sThemeDir, "appearance options", "ScreenAppearanceOptions" ); RecursiveRename( sThemeDir, "music scroll", "ScreenMusicScroll" ); + RecursiveRename( sThemeDir, "how to play", "ScreenInstructions" ); + RecursiveRename( sThemeDir, "background background", "background" ); + RecursiveRename( sThemeDir, "credits", "ScreenManager credits" ); + RecursiveRename( sThemeDir, "header1", "_shared1" ); + RecursiveRename( sThemeDir, "header2", "_shared2" ); + RecursiveRename( sThemeDir, "header3", "_shared3" ); + RecursiveRename( sThemeDir, "header4", "_shared4" ); + RecursiveRename( sThemeDir, "Fonts\\help", "Fonts\\Common help" ); + RecursiveRename( sThemeDir, "Fonts\\musicwheel text banner", "Fonts\\TextBanner" ); + RecursiveRename( sThemeDir, "Fonts\\normal", "Fonts\\Common normal" ); + RecursiveRename( sThemeDir, "Fonts\\option icons", "Fonts\\OptionIcon" ); + RecursiveRename( sThemeDir, "Fonts\\option explanation", "Fonts\\ScreenOptions explanation" ); + RecursiveRename( sThemeDir, "Fonts\\option item", "Fonts\\ScreenOptions item" ); + RecursiveRename( sThemeDir, "Fonts\\option title", "Fonts\\ScreenOptions title" ); + RecursiveRename( sThemeDir, "Fonts\\select course num songs", "Fonts\\ScreenOptions title" ); + RecursiveRename( sThemeDir, "Fonts\\select group button label", "Fonts\\GroupList label" ); + RecursiveRename( sThemeDir, "Fonts\\selectmusicsection", "Fonts\\MusicWheel section" ); + RecursiveRename( sThemeDir, "Fonts\\titlemenu", "Fonts\\ScreenTitleMenu choices" ); + RecursiveRename( sThemeDir, "numbers 5x3", "5x3" ); + RecursiveRename( sThemeDir, " (dither)", "" ); + RecursiveRename( sThemeDir, " (1alpha)", "" ); + RecursiveRename( sThemeDir, " (1 alpha)", "" ); + RecursiveRename( sThemeDir, " (0 alpha)", "" ); + RecursiveRename( sThemeDir, "edit header", "ScreenEdit header" ); AfxMessageBox( "Conversion Complete!" ); }