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 0000000000..5342da49b2 Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenEvaluation grades 1x8.png differ 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!" ); }