From 4223e09cc8eecd078e93fbaab44aba0a918dab07 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 6 Feb 2005 03:32:53 +0000 Subject: [PATCH] GetPathTo -> GetPath --- stepmania/src/ActorUtil.cpp | 6 +- stepmania/src/BGAnimationLayer.cpp | 2 +- stepmania/src/Background.cpp | 12 ++-- stepmania/src/Banner.cpp | 10 ++-- stepmania/src/BeginnerHelper.cpp | 6 +- stepmania/src/CombinedLifeMeterTug.cpp | 8 +-- stepmania/src/ComboGraph.cpp | 3 +- stepmania/src/CourseEntryDisplay.cpp | 10 ++-- stepmania/src/DifficultyDisplay.cpp | 2 +- stepmania/src/DifficultyList.cpp | 6 +- stepmania/src/DualScrollBar.cpp | 4 +- stepmania/src/EditCoursesMenu.cpp | 12 ++-- stepmania/src/EditCoursesSongMenu.cpp | 10 ++-- stepmania/src/EditMenu.cpp | 10 ++-- stepmania/src/GrooveGraph.cpp | 2 +- stepmania/src/GrooveRadar.cpp | 4 +- stepmania/src/GroupList.cpp | 4 +- stepmania/src/Inventory.cpp | 7 +-- stepmania/src/LifeMeterBar.cpp | 12 ++-- stepmania/src/LifeMeterBattery.cpp | 9 ++- stepmania/src/LyricDisplay.cpp | 2 +- stepmania/src/MemoryCardDisplay.cpp | 2 +- stepmania/src/MemoryCardManager.cpp | 8 +-- stepmania/src/ModeSwitcher.cpp | 10 ++-- stepmania/src/MusicBannerWheel.cpp | 38 ++++++++---- stepmania/src/MusicList.cpp | 2 +- stepmania/src/MusicSortDisplay.cpp | 2 +- stepmania/src/MusicWheel.cpp | 10 ++-- stepmania/src/MusicWheelItem.cpp | 14 ++--- stepmania/src/NoteField.cpp | 6 +- stepmania/src/OptionsCursor.cpp | 3 +- stepmania/src/PaneDisplay.cpp | 8 +-- stepmania/src/Player.cpp | 10 ++-- stepmania/src/ScoreDisplayBattle.cpp | 4 +- stepmania/src/ScoreDisplayPercentage.cpp | 2 +- stepmania/src/ScoreDisplayRave.cpp | 6 +- stepmania/src/ScreenAttract.cpp | 6 +- stepmania/src/ScreenBookkeeping.cpp | 6 +- stepmania/src/ScreenCenterImage.cpp | 4 +- stepmania/src/ScreenCredits.cpp | 8 +-- stepmania/src/ScreenDemonstration.cpp | 2 +- stepmania/src/ScreenEdit.cpp | 20 +++---- stepmania/src/ScreenEditCoursesMenu.cpp | 4 +- stepmania/src/ScreenEditMenu.cpp | 10 ++-- stepmania/src/ScreenEnding.cpp | 8 +-- stepmania/src/ScreenEndlessBreak.cpp | 10 ++-- stepmania/src/ScreenEvaluation.cpp | 58 +++++++++--------- stepmania/src/ScreenEz2SelectMusic.cpp | 62 +++++++++----------- stepmania/src/ScreenEz2SelectMusic.h | 4 -- stepmania/src/ScreenEz2SelectPlayer.cpp | 6 +- stepmania/src/ScreenGameplay.cpp | 17 ++---- stepmania/src/ScreenHowToPlay.cpp | 6 +- stepmania/src/ScreenJukebox.cpp | 4 +- stepmania/src/ScreenMapControllers.cpp | 10 ++-- stepmania/src/ScreenMiniMenu.cpp | 16 ++--- stepmania/src/ScreenMusicScroll.cpp | 2 +- stepmania/src/ScreenNameEntry.cpp | 14 ++--- stepmania/src/ScreenNameEntryTraditional.cpp | 22 +++---- stepmania/src/ScreenNetRoom.cpp | 2 +- stepmania/src/ScreenNetSelectMusic.cpp | 4 +- stepmania/src/ScreenNetworkOptions.cpp | 2 +- stepmania/src/ScreenOptions.cpp | 26 ++++---- stepmania/src/ScreenOptionsMaster.cpp | 2 +- stepmania/src/ScreenPlayerOptions.cpp | 8 ++- stepmania/src/ScreenProfileOptions.cpp | 2 +- stepmania/src/ScreenRanking.cpp | 28 ++++----- stepmania/src/ScreenSMOnlineLogin.cpp | 8 ++- stepmania/src/ScreenSelect.cpp | 2 +- stepmania/src/ScreenSelectCharacter.cpp | 17 +++--- stepmania/src/ScreenSelectDifficulty.cpp | 19 +++--- stepmania/src/ScreenSelectGroup.cpp | 10 ++-- stepmania/src/ScreenSelectMaster.cpp | 29 ++++----- stepmania/src/ScreenSelectMode.cpp | 25 ++++---- stepmania/src/ScreenSelectMusic.cpp | 6 +- stepmania/src/ScreenSelectStyle.cpp | 25 ++++---- stepmania/src/ScreenSetTime.cpp | 4 +- stepmania/src/ScreenSongOptions.cpp | 2 +- stepmania/src/ScreenStyleSplash.cpp | 2 +- stepmania/src/ScreenSystemLayer.cpp | 10 ++-- stepmania/src/ScreenTestInput.cpp | 4 +- stepmania/src/ScreenTestLights.cpp | 4 +- stepmania/src/ScreenTestSound.cpp | 4 +- stepmania/src/ScreenTextEntry.cpp | 10 ++-- stepmania/src/ScreenTitleMenu.cpp | 4 +- stepmania/src/ScreenUnlock.cpp | 12 ++-- stepmania/src/ScreenWithMenuElements.cpp | 15 +++-- stepmania/src/ScrollBar.cpp | 10 ++-- stepmania/src/ScrollingList.cpp | 2 +- stepmania/src/SnapDisplay.cpp | 2 +- stepmania/src/StepMania.cpp | 2 +- stepmania/src/WheelNotifyIcon.cpp | 2 +- 91 files changed, 422 insertions(+), 447 deletions(-) diff --git a/stepmania/src/ActorUtil.cpp b/stepmania/src/ActorUtil.cpp index f9ada70518..b4add56ff4 100644 --- a/stepmania/src/ActorUtil.cpp +++ b/stepmania/src/ActorUtil.cpp @@ -108,7 +108,7 @@ Actor* ActorUtil::LoadFromActorFile( const CString& sAniDir, const XNode* pNode if( pSong && pSong->HasBackground() ) sFile = pSong->GetBackgroundPath(); else - sFile = THEME->GetPathToG("Common fallback background"); + sFile = THEME->GetPathG("Common","fallback background"); /* Always load song backgrounds with SongBGTexture. It sets texture properties; * if we load a background without setting those properties, we'll end up @@ -137,7 +137,7 @@ Actor* ActorUtil::LoadFromActorFile( const CString& sAniDir, const XNode* pNode if( pSong && pSong->HasBanner() ) sFile = pSong->GetBannerPath(); else - sFile = THEME->GetPathToG("Common fallback banner"); + sFile = THEME->GetPathG("Common","fallback banner"); TEXTUREMAN->DisableOddDimensionWarning(); @@ -172,7 +172,7 @@ Actor* ActorUtil::LoadFromActorFile( const CString& sAniDir, const XNode* pNode if( pCourse && pCourse->HasBanner() ) sFile = pCourse->m_sBannerPath; else - sFile = THEME->GetPathToG("Common fallback banner"); + sFile = THEME->GetPathG("Common","fallback banner"); TEXTUREMAN->DisableOddDimensionWarning(); Sprite* pSprite = new Sprite; diff --git a/stepmania/src/BGAnimationLayer.cpp b/stepmania/src/BGAnimationLayer.cpp index 8e227fb2a5..491050e4c0 100644 --- a/stepmania/src/BGAnimationLayer.cpp +++ b/stepmania/src/BGAnimationLayer.cpp @@ -85,7 +85,7 @@ void BGAnimationLayer::LoadFromAniLayerFile( const CString& sPath ) if( pSong && pSong->HasBackground() ) sSongBGPath = pSong->GetBackgroundPath(); else - sSongBGPath = THEME->GetPathToG("Common fallback background"); + sSongBGPath = THEME->GetPathG("Common","fallback background"); Sprite* pSprite = new Sprite; pSprite->LoadBG( sSongBGPath ); diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp index 44d9c30371..bf56dbe846 100644 --- a/stepmania/src/Background.cpp +++ b/stepmania/src/Background.cpp @@ -51,11 +51,11 @@ void Background::Init() return; m_bInitted = true; - m_DangerAll.LoadFromAniDir( THEME->GetPathToB("ScreenGameplay danger all") ); + m_DangerAll.LoadFromAniDir( THEME->GetPathB("ScreenGameplay","danger all") ); FOREACH_PlayerNumber( p ) - m_DangerPlayer[p].LoadFromAniDir( THEME->GetPathToB(ssprintf("ScreenGameplay danger p%d",p+1)) ); + m_DangerPlayer[p].LoadFromAniDir( THEME->GetPathB("ScreenGameplay",ssprintf("danger p%d",p+1)) ); FOREACH_PlayerNumber( p ) - m_DeadPlayer[p].LoadFromAniDir( THEME->GetPathToB(ssprintf("ScreenGameplay dead p%d",p+1)) ); + m_DeadPlayer[p].LoadFromAniDir( THEME->GetPathB("ScreenGameplay",ssprintf("dead p%d",p+1)) ); bool bOneOrMoreChars = false; bool bShowingBeginnerHelper = false; @@ -121,7 +121,8 @@ Actor *MakeVisualization( const CString &sVisPath ) pFrame->DeleteChildrenWhenDone(); const Song* pSong = GAMESTATE->m_pCurSong; - CString sSongBGPath = pSong && pSong->HasBackground() ? pSong->GetBackgroundPath() : THEME->GetPathToG("Common fallback background"); + CString sSongBGPath = + (pSong && pSong->HasBackground()) ? pSong->GetBackgroundPath() : THEME->GetPathG("Common","fallback background"); Sprite* pSprite = new Sprite; pSprite->LoadBG( sSongBGPath ); @@ -402,7 +403,8 @@ void Background::LoadFromSong( const Song* pSong ) bStaticBackgroundUsed = true; if( bStaticBackgroundUsed ) { - CString sSongBGPath = pSong->HasBackground() ? pSong->GetBackgroundPath() : THEME->GetPathToG("Common fallback background"); + CString sSongBGPath = + pSong->HasBackground() ? pSong->GetBackgroundPath() : THEME->GetPathG("Common","fallback background"); Sprite* pSprite = new Sprite; pSprite->LoadBG( sSongBGPath ); pSprite->StretchTo( FullScreenRectF ); diff --git a/stepmania/src/Banner.cpp b/stepmania/src/Banner.cpp index aada9e42fb..e08fee4b74 100644 --- a/stepmania/src/Banner.cpp +++ b/stepmania/src/Banner.cpp @@ -33,7 +33,7 @@ void Banner::CacheGlobalBanners() bool Banner::Load( RageTextureID ID ) { if( ID.filename == "" ) - ID = THEME->GetPathToG("Common fallback banner"); + ID = THEME->GetPathG("Common","fallback banner"); ID = SongBannerTexture(ID); @@ -140,7 +140,7 @@ void Banner::LoadIconFromCharacter( Character* pCharacter ) void Banner::LoadTABreakFromCharacter( Character* pCharacter ) { - if( pCharacter == NULL ) Load( THEME->GetPathToG("Common fallback takingabreak") ); + if( pCharacter == NULL ) Load( THEME->GetPathG("Common","fallback takingabreak") ); else { Load( pCharacter->GetTakingABreakPath() ); @@ -150,18 +150,18 @@ void Banner::LoadTABreakFromCharacter( Character* pCharacter ) void Banner::LoadFallback() { - Load( THEME->GetPathToG("Common fallback banner") ); + Load( THEME->GetPathG("Common","fallback banner") ); } void Banner::LoadRoulette() { - Load( THEME->GetPathToG("Banner roulette") ); + Load( THEME->GetPathG("Banner","roulette") ); m_bScrolling = (bool)SCROLL_RANDOM; } void Banner::LoadRandom() { - Load( THEME->GetPathToG("Banner random") ); + Load( THEME->GetPathG("Banner","random") ); m_bScrolling = (bool)SCROLL_ROULETTE; } diff --git a/stepmania/src/BeginnerHelper.cpp b/stepmania/src/BeginnerHelper.cpp index d3240f14a5..e969592212 100644 --- a/stepmania/src/BeginnerHelper.cpp +++ b/stepmania/src/BeginnerHelper.cpp @@ -140,10 +140,10 @@ bool BeginnerHelper::Initialize( int iDancePadType ) // Load the Background and flash.. Flash only shows if the BG does. if(m_bShowBackground) { - m_sBackground.Load( THEME->GetPathToG("BeginnerHelper background") ); + m_sBackground.Load( THEME->GetPathG("BeginnerHelper","background") ); this->AddChild(&m_sBackground); m_sBackground.SetXY(SCREEN_CENTER_X, SCREEN_CENTER_Y); - m_sFlash.Load(THEME->GetPathToG("BeginnerHelper flash")); + m_sFlash.Load(THEME->GetPathG("BeginnerHelper","flash")); m_sFlash.SetXY(SCREEN_CENTER_X, SCREEN_CENTER_Y); m_sFlash.SetDiffuseAlpha(0); } @@ -152,7 +152,7 @@ bool BeginnerHelper::Initialize( int iDancePadType ) for(int lsc=0; lscGetPathToG("BeginnerHelper stepcircle")); + m_sStepCircle[lsc][lsce].Load(THEME->GetPathG("BeginnerHelper","stepcircle")); m_sStepCircle[lsc][lsce].SetZoom(0); // Hide until needed. this->AddChild(&m_sStepCircle[lsc][lsce]); diff --git a/stepmania/src/CombinedLifeMeterTug.cpp b/stepmania/src/CombinedLifeMeterTug.cpp index 896c501f17..262d71edaa 100644 --- a/stepmania/src/CombinedLifeMeterTug.cpp +++ b/stepmania/src/CombinedLifeMeterTug.cpp @@ -16,17 +16,17 @@ CombinedLifeMeterTug::CombinedLifeMeterTug() { FOREACH_PlayerNumber( p ) { - CString sStreamPath = THEME->GetPathToG(ssprintf("CombinedLifeMeterTug stream p%d",p+1)); - CString sTipPath = THEME->GetPathToG(ssprintf("CombinedLifeMeterTug tip p%d",p+1)); + CString sStreamPath = THEME->GetPathG("CombinedLifeMeterTug",ssprintf("stream p%d",p+1)); + CString sTipPath = THEME->GetPathG("CombinedLifeMeterTug",ssprintf("tip p%d",p+1)); m_Stream[p].Load( sStreamPath, METER_WIDTH, sTipPath ); this->AddChild( &m_Stream[p] ); } m_Stream[PLAYER_2].SetZoomX( -1 ); - m_sprSeparator.Load( THEME->GetPathToG(ssprintf("CombinedLifeMeterTug separator")) ); + m_sprSeparator.Load( THEME->GetPathG("CombinedLifeMeterTug","separator") ); this->AddChild( &m_sprSeparator ); - m_sprFrame.Load( THEME->GetPathToG(ssprintf("CombinedLifeMeterTug frame")) ); + m_sprFrame.Load( THEME->GetPathG("CombinedLifeMeterTug","frame") ); this->AddChild( &m_sprFrame ); diff --git a/stepmania/src/ComboGraph.cpp b/stepmania/src/ComboGraph.cpp index 919faf18b7..ed8466eeaf 100644 --- a/stepmania/src/ComboGraph.cpp +++ b/stepmania/src/ComboGraph.cpp @@ -30,8 +30,7 @@ void ComboGraph::Load( CString Path, const StageStats &s, PlayerNumber pn ) LOG->Trace("combo %i is %f+%f", i, combo.fStartSecond, combo.fSizeSeconds); Sprite *sprite = new Sprite; sprite->SetName( "ComboBar" ); - const CString path = ssprintf( "%s %s", Path.c_str(), IsMax? "max":"normal" ); - sprite->Load( THEME->GetPathToG(path) ); + sprite->Load( THEME->GetPathToG(Path + IsMax?"max":"normal") ); const float start = SCALE( combo.fStartSecond, s.m_player[pn].fFirstSecond, s.m_player[pn].fLastSecond, 0.0f, 1.0f ); const float size = SCALE( combo.fSizeSeconds, 0, s.m_player[pn].fLastSecond-s.m_player[pn].fFirstSecond, 0.0f, 1.0f ); diff --git a/stepmania/src/CourseEntryDisplay.cpp b/stepmania/src/CourseEntryDisplay.cpp index 565e7331c3..ba4c4df9c3 100644 --- a/stepmania/src/CourseEntryDisplay.cpp +++ b/stepmania/src/CourseEntryDisplay.cpp @@ -19,7 +19,7 @@ void CourseEntryDisplay::Load() { m_sprFrame.SetName( "Bar" ); - m_sprFrame.Load( THEME->GetPathToG("CourseEntryDisplay bar") ); + m_sprFrame.Load( THEME->GetPathG("CourseEntryDisplay","bar") ); SET_XY_AND_ON_COMMAND( &m_sprFrame ); this->AddChild( &m_sprFrame ); @@ -27,7 +27,7 @@ void CourseEntryDisplay::Load() this->m_size.y = (float) m_sprFrame.GetTexture()->GetSourceFrameHeight(); m_textNumber.SetName( "Number" ); - m_textNumber.LoadFromFont( THEME->GetPathToF("CourseEntryDisplay number") ); + m_textNumber.LoadFromFont( THEME->GetPathF("CourseEntryDisplay","number") ); SET_XY_AND_ON_COMMAND( &m_textNumber ); this->AddChild( &m_textNumber ); @@ -43,18 +43,18 @@ void CourseEntryDisplay::Load() continue; // skip m_textFoot[pn].SetName( SEPARATE_COURSE_METERS? ssprintf("FootP%i", pn+1):CString("Foot") ); - m_textFoot[pn].LoadFromTextureAndChars( THEME->GetPathToG("CourseEntryDisplay difficulty 2x1"),"10" ); + m_textFoot[pn].LoadFromTextureAndChars( THEME->GetPathG("CourseEntryDisplay","difficulty 2x1"),"10" ); SET_XY_AND_ON_COMMAND( &m_textFoot[pn] ); this->AddChild( &m_textFoot[pn] ); m_textDifficultyNumber[pn].SetName( SEPARATE_COURSE_METERS? ssprintf("DifficultyP%i", pn+1):CString("Difficulty") ); - m_textDifficultyNumber[pn].LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textDifficultyNumber[pn].LoadFromFont( THEME->GetPathF("Common","normal") ); SET_XY_AND_ON_COMMAND( &m_textDifficultyNumber[pn] ); this->AddChild( &m_textDifficultyNumber[pn] ); } m_textModifiers.SetName( "Modifiers" ); - m_textModifiers.LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textModifiers.LoadFromFont( THEME->GetPathF("Common","normal") ); SET_XY_AND_ON_COMMAND( &m_textModifiers ); this->AddChild( &m_textModifiers ); } diff --git a/stepmania/src/DifficultyDisplay.cpp b/stepmania/src/DifficultyDisplay.cpp index f12149b4ca..746d8818ab 100644 --- a/stepmania/src/DifficultyDisplay.cpp +++ b/stepmania/src/DifficultyDisplay.cpp @@ -13,7 +13,7 @@ DifficultyDisplay::DifficultyDisplay() int diff; for( diff = DIFFICULTY_BEGINNER; diff <= DIFFICULTY_CHALLENGE; ++diff ) { - m_difficulty[diff].Load( THEME->GetPathToG(ssprintf("DifficultyDisplay bar %dx1",NUM_DIFFICULTIES)) ); + m_difficulty[diff].Load( THEME->GetPathG("DifficultyDisplay",ssprintf("bar %dx1",NUM_DIFFICULTIES)) ); m_difficulty[diff].SetState(diff); m_difficulty[diff].StopAnimating(); this->AddChild( &m_difficulty[diff] ); diff --git a/stepmania/src/DifficultyList.cpp b/stepmania/src/DifficultyList.cpp index 3797389301..8cb15262be 100644 --- a/stepmania/src/DifficultyList.cpp +++ b/stepmania/src/DifficultyList.cpp @@ -42,7 +42,7 @@ void DifficultyList::Load() FOREACH_HumanPlayer( pn ) { - m_Cursors[pn].Load( THEME->GetPathToG(ssprintf("%s cursor p%i",m_sName.c_str(), pn+1)) ); + m_Cursors[pn].Load( THEME->GetPathG(m_sName,ssprintf("cursor p%i",pn+1)) ); m_Cursors[pn]->SetName( ssprintf("CursorP%i",pn+1) ); /* Hack: we need to tween cursors both up to down (cursor motion) and visible to @@ -63,11 +63,11 @@ void DifficultyList::Load() this->AddChild( &m_Lines[m].m_Meter ); m_Lines[m].m_Description.SetName( "Description" ); - m_Lines[m].m_Description.LoadFromFont( THEME->GetPathToF(ssprintf("%s description",m_sName.c_str())) ); + m_Lines[m].m_Description.LoadFromFont( THEME->GetPathF(m_sName,"description") ); this->AddChild( &m_Lines[m].m_Description ); m_Lines[m].m_Number.SetName( "Number" ); - m_Lines[m].m_Number.LoadFromFont( THEME->GetPathToF(ssprintf("%s number",m_sName.c_str())) ); + m_Lines[m].m_Number.LoadFromFont( THEME->GetPathF(m_sName,"number") ); this->AddChild( &m_Lines[m].m_Number ); } diff --git a/stepmania/src/DualScrollBar.cpp b/stepmania/src/DualScrollBar.cpp index 57fe5b0536..8aa2e1331e 100644 --- a/stepmania/src/DualScrollBar.cpp +++ b/stepmania/src/DualScrollBar.cpp @@ -14,14 +14,14 @@ void DualScrollBar::Load() FOREACH_PlayerNumber( pn ) { m_sprScrollThumbUnderHalf[pn].SetName( ssprintf("ThumbP%i", pn+1) ); - m_sprScrollThumbUnderHalf[pn].Load( THEME->GetPathToG( ssprintf("%s thumb p%i", m_sName.c_str(), pn+1) ) ); + m_sprScrollThumbUnderHalf[pn].Load( THEME->GetPathG(m_sName,ssprintf("thumb p%i",pn+1)) ); this->AddChild( &m_sprScrollThumbUnderHalf[pn] ); } FOREACH_PlayerNumber( pn ) { m_sprScrollThumbOverHalf[pn].SetName( ssprintf("ThumbP%i", pn+1) ); - m_sprScrollThumbOverHalf[pn].Load( THEME->GetPathToG( ssprintf("%s thumb p%i", m_sName.c_str(), pn+1) ) ); + m_sprScrollThumbOverHalf[pn].Load( THEME->GetPathG(m_sName, ssprintf("thumb p%i",pn+1)) ); this->AddChild( &m_sprScrollThumbOverHalf[pn] ); } diff --git a/stepmania/src/EditCoursesMenu.cpp b/stepmania/src/EditCoursesMenu.cpp index b1e1e2cd5c..3da75b85d1 100644 --- a/stepmania/src/EditCoursesMenu.cpp +++ b/stepmania/src/EditCoursesMenu.cpp @@ -85,7 +85,7 @@ EditCoursesMenu::EditCoursesMenu() for( int i=0; i<2; i++ ) { - m_sprArrows[i].Load( THEME->GetPathToG(ssprintf("EditCoursesMenu %s",(i==0?"left":"right"))) ); + m_sprArrows[i].Load( THEME->GetPathG("EditCoursesMenu",i==0?"left":"right") ); m_sprArrows[i].SetX( ARROWS_X(i) ); this->AddChild( &m_sprArrows[i] ); } @@ -97,14 +97,14 @@ EditCoursesMenu::EditCoursesMenu() for( int i=0; iGetPathToF("Common title") ); + m_textLabel[i].LoadFromFont( THEME->GetPathF("Common","title") ); m_textLabel[i].SetXY( ROW_LABELS_X, ROW_Y(i) ); m_textLabel[i].SetText( RowToString((Row)i) ); m_textLabel[i].SetZoom( 0.8f ); m_textLabel[i].SetHorizAlign( Actor::align_left ); this->AddChild( &m_textLabel[i] ); - m_textValue[i].LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textValue[i].LoadFromFont( THEME->GetPathF("Common","normal") ); m_textValue[i].SetXY( ROW_VALUE_X(i), ROW_Y(i) ); m_textValue[i].SetText( "blah" ); m_textValue[i].SetZoom( 0.6f ); @@ -122,9 +122,9 @@ EditCoursesMenu::EditCoursesMenu() this->AddChild( &m_EntryTextBanner ); - m_soundChangeRow.Load( THEME->GetPathToS("EditCoursesMenu row") ); - m_soundChangeValue.Load( THEME->GetPathToS("EditCoursesMenu value") ); - m_soundSave.Load( THEME->GetPathToS("EditCoursesMenu save") ); + m_soundChangeRow.Load( THEME->GetPathS("EditCoursesMenu","row") ); + m_soundChangeValue.Load( THEME->GetPathS("EditCoursesMenu","value") ); + m_soundSave.Load( THEME->GetPathS("EditCoursesMenu","save") ); // fill in data structures diff --git a/stepmania/src/EditCoursesSongMenu.cpp b/stepmania/src/EditCoursesSongMenu.cpp index 4f4a95eb0d..7672c8b54d 100644 --- a/stepmania/src/EditCoursesSongMenu.cpp +++ b/stepmania/src/EditCoursesSongMenu.cpp @@ -31,21 +31,21 @@ EditCoursesSongMenu::EditCoursesSongMenu() for( int i=0; i<2; i++ ) { - m_sprArrows[i].Load( THEME->GetPathToG(ssprintf("EditCoursesSongMenu %s",(i==0?"left":"right"))) ); + m_sprArrows[i].Load( THEME->GetPathG("EditCoursesSongMenu",i==0?"left":"right") ); m_sprArrows[i].SetX( ARROWS_X(i) ); this->AddChild( &m_sprArrows[i] ); } for( int i=0; iGetPathToF("Common title") ); + m_textLabel[i].LoadFromFont( THEME->GetPathF("Common","title") ); m_textLabel[i].SetXY( ROW_LABELS_X, ROW_Y(i) ); m_textLabel[i].SetText( RowToString((Row)i) ); m_textLabel[i].SetZoom( 0.8f ); m_textLabel[i].SetHorizAlign( Actor::align_left ); this->AddChild( &m_textLabel[i] ); - m_textValue[i].LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textValue[i].LoadFromFont( THEME->GetPathF("Common","normal") ); m_textValue[i].SetXY( ROW_VALUE_X(i), ROW_Y(i) ); m_textValue[i].SetText( "blah" ); m_textValue[i].SetZoom( 0.6f ); @@ -53,8 +53,8 @@ EditCoursesSongMenu::EditCoursesSongMenu() } - m_soundChangeRow.Load( THEME->GetPathToS("EditCoursesSongMenu row") ); - m_soundChangeValue.Load( THEME->GetPathToS("EditCoursesSongMenu value") ); + m_soundChangeRow.Load( THEME->GetPathS("EditCoursesSongMenu","row") ); + m_soundChangeValue.Load( THEME->GetPathS("EditCoursesSongMenu","value") ); // fill in data structures SONGMAN->GetGroupNames( m_aGroups ); diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp index b60afd68a6..d4566dcb53 100644 --- a/stepmania/src/EditMenu.cpp +++ b/stepmania/src/EditMenu.cpp @@ -37,7 +37,7 @@ EditMenu::EditMenu() for( int i=0; i<2; i++ ) { - m_sprArrows[i].Load( THEME->GetPathToG(ssprintf("EditMenu %s",(i==0?"left":"right"))) ); + m_sprArrows[i].Load( THEME->GetPathG("EditMenu",i==0?"left":"right") ); m_sprArrows[i].SetX( ARROWS_X(i) ); this->AddChild( &m_sprArrows[i] ); } @@ -55,14 +55,14 @@ EditMenu::EditMenu() for( int i=0; iGetPathToF("Common title") ); + m_textLabel[i].LoadFromFont( THEME->GetPathF("Common","title") ); m_textLabel[i].SetXY( ROW_LABELS_X, ROW_Y(i) ); m_textLabel[i].SetText( RowToString((Row)i) ); m_textLabel[i].SetZoom( 0.8f ); m_textLabel[i].SetHorizAlign( Actor::align_left ); this->AddChild( &m_textLabel[i] ); - m_textValue[i].LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textValue[i].LoadFromFont( THEME->GetPathF("Common","normal") ); m_textValue[i].SetXY( ROW_VALUE_X(i), ROW_Y(i) ); m_textValue[i].SetText( "blah" ); m_textValue[i].SetZoom( 0.8f ); @@ -90,8 +90,8 @@ EditMenu::EditMenu() this->AddChild( &m_SourceMeter ); - m_soundChangeRow.Load( THEME->GetPathToS("EditMenu row") ); - m_soundChangeValue.Load( THEME->GetPathToS("EditMenu value") ); + m_soundChangeRow.Load( THEME->GetPathS("EditMenu","row") ); + m_soundChangeValue.Load( THEME->GetPathS("EditMenu","value") ); // fill in data structures diff --git a/stepmania/src/GrooveGraph.cpp b/stepmania/src/GrooveGraph.cpp index ee0a1bf5ad..b8b67d2bb0 100644 --- a/stepmania/src/GrooveGraph.cpp +++ b/stepmania/src/GrooveGraph.cpp @@ -29,7 +29,7 @@ GrooveGraph::GrooveGraph() for( int i=0; iGetPathToG("GrooveGraph base") ); + m_sprBase.Load( THEME->GetPathG("GrooveGraph","base") ); this->AddChild( &m_sprBase ); for( int c=0; cGetPathToG("GrooveRadar labels 1x5") ); + m_sprRadarLabels[c].Load( THEME->GetPathG("GrooveRadar","labels 1x5") ); m_sprRadarLabels[c].StopAnimating(); m_sprRadarLabels[c].SetState( c ); m_sprRadarLabels[c].SetXY( LABEL_OFFSET_X(c), LABEL_OFFSET_Y(c) ); @@ -63,7 +63,7 @@ void GrooveRadar::TweenOffScreen() GrooveRadar::GrooveRadarValueMap::GrooveRadarValueMap() { - m_sprRadarBase.Load( THEME->GetPathToG("GrooveRadar base") ); + m_sprRadarBase.Load( THEME->GetPathG("GrooveRadar","base") ); this->AddChild( &m_sprRadarBase ); FOREACH_PlayerNumber( p ) diff --git a/stepmania/src/GroupList.cpp b/stepmania/src/GroupList.cpp index 5c430d0e61..e751988c5d 100644 --- a/stepmania/src/GroupList.cpp +++ b/stepmania/src/GroupList.cpp @@ -60,8 +60,8 @@ void GroupList::Load( const CStringArray& asGroupNames ) m_textLabels.push_back( label ); m_ButtonFrames.push_back( frame ); - button->Load( THEME->GetPathToG("GroupList bar") ); - label->LoadFromFont( THEME->GetPathToF("GroupList label") ); + button->Load( THEME->GetPathG("GroupList","bar") ); + label->LoadFromFont( THEME->GetPathF("GroupList","label") ); label->SetShadowLength( 2 ); label->SetText( SONGMAN->ShortenGroupName( asGroupNames[i] ) ); diff --git a/stepmania/src/Inventory.cpp b/stepmania/src/Inventory.cpp index df32b83a6c..2e0ff944ae 100644 --- a/stepmania/src/Inventory.cpp +++ b/stepmania/src/Inventory.cpp @@ -73,15 +73,14 @@ void Inventory::Load( PlayerState* pPlayerState ) switch( GAMESTATE->m_PlayMode ) { case PLAY_MODE_BATTLE: - m_soundAcquireItem.Load( THEME->GetPathToS("Inventory aquire item") ); + m_soundAcquireItem.Load( THEME->GetPathS("Inventory","aquire item") ); for( unsigned i=0; iGetPathToS( ssprintf("Inventory use item %u",i+1) ); - pSound->Load( sPath ); + pSound->Load( THEME->GetPathS("Inventory",ssprintf("use item %u",i+1)) ); m_vpSoundUseItem.push_back( pSound ); } - m_soundItemEnding.Load( THEME->GetPathToS("Inventory item ending") ); + m_soundItemEnding.Load( THEME->GetPathS("Inventory","item ending") ); break; } } diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp index 805b477c24..6a21258c95 100644 --- a/stepmania/src/LifeMeterBar.cpp +++ b/stepmania/src/LifeMeterBar.cpp @@ -39,23 +39,19 @@ public: RageTextureID ID; ID.bStretch = true; - sGraphicPath = ssprintf("LifeMeterBar %snormal", bExtra?"extra ":""); - ID.filename = THEME->GetPathToG(sGraphicPath); + ID.filename = THEME->GetPathG("LifeMeterBar",ssprintf("%snormal", bExtra?"extra ":"")); m_sprStreamNormal.Load( ID ); m_sprStreamNormal.SetUseZBuffer( true ); - sGraphicPath = ssprintf("LifeMeterBar %shot", bExtra?"extra ":""); - ID.filename = THEME->GetPathToG(sGraphicPath); + ID.filename = THEME->GetPathG("LifeMeterBar",ssprintf("%shot", bExtra?"extra ":"")); m_sprStreamHot.Load( ID ); m_sprStreamHot.SetUseZBuffer( true ); - sGraphicPath = ssprintf("LifeMeterBar %spassing", bExtra?"extra ":""); - ID.filename = THEME->GetPathToG(sGraphicPath); + ID.filename = THEME->GetPathG("LifeMeterBar",ssprintf("%spassing", bExtra?"extra ":"")); m_sprStreamPassing.Load( ID ); m_sprStreamPassing.SetUseZBuffer( true ); - sGraphicPath = ssprintf("LifeMeterBar %sframe", bExtra?"extra ":""); - ID.filename = THEME->GetPathToG(sGraphicPath); + ID.filename = THEME->GetPathG("LifeMeterBar",ssprintf("%sframe", bExtra?"extra ":"")); m_sprFrame.Load( ID ); } diff --git a/stepmania/src/LifeMeterBattery.cpp b/stepmania/src/LifeMeterBattery.cpp index 536ff6df6a..68a4e020cb 100644 --- a/stepmania/src/LifeMeterBattery.cpp +++ b/stepmania/src/LifeMeterBattery.cpp @@ -21,9 +21,8 @@ LifeMeterBattery::LifeMeterBattery() m_fBatteryBlinkTime = 0; - - m_soundGainLife.Load( THEME->GetPathToS("LifeMeterBattery gain") ); - m_soundLoseLife.Load( THEME->GetPathToS("LifeMeterBattery lose"),true ); + m_soundGainLife.Load( THEME->GetPathS("LifeMeterBattery","gain") ); + m_soundLoseLife.Load( THEME->GetPathS("LifeMeterBattery","lose"),true ); } void LifeMeterBattery::Load( PlayerNumber pn ) @@ -32,10 +31,10 @@ void LifeMeterBattery::Load( PlayerNumber pn ) bool bPlayerEnabled = GAMESTATE->IsPlayerEnabled(pn); - m_sprFrame.Load( THEME->GetPathToG("LifeMeterBattery frame") ); + m_sprFrame.Load( THEME->GetPathG("LifeMeterBattery","frame") ); this->AddChild( &m_sprFrame ); - m_sprBattery.Load( THEME->GetPathToG("LifeMeterBattery lives 1x4") ); + m_sprBattery.Load( THEME->GetPathG("LifeMeterBattery","lives 1x4") ); m_sprBattery.StopAnimating(); if( bPlayerEnabled ) this->AddChild( &m_sprBattery ); diff --git a/stepmania/src/LyricDisplay.cpp b/stepmania/src/LyricDisplay.cpp index a81b6df958..32d35e41e4 100644 --- a/stepmania/src/LyricDisplay.cpp +++ b/stepmania/src/LyricDisplay.cpp @@ -15,7 +15,7 @@ LyricDisplay::LyricDisplay() { for( int i=0; i<2; i++ ) { - m_textLyrics[i].LoadFromFont( THEME->GetPathToF("LyricDisplay text") ); + m_textLyrics[i].LoadFromFont( THEME->GetPathF("LyricDisplay","text") ); m_textLyrics[i].SetDiffuse( RageColor(1,1,1,1) ); this->AddChild(&m_textLyrics[i]); } diff --git a/stepmania/src/MemoryCardDisplay.cpp b/stepmania/src/MemoryCardDisplay.cpp index 9b4fe43c28..a1bf262f3c 100644 --- a/stepmania/src/MemoryCardDisplay.cpp +++ b/stepmania/src/MemoryCardDisplay.cpp @@ -19,7 +19,7 @@ void MemoryCardDisplay::Load( PlayerNumber pn ) { MemoryCardState mcs = (MemoryCardState)i; CString sState = MemoryCardStateToString(mcs); - m_spr[i].Load( THEME->GetPathToG(ssprintf("MemoryCardDisplay %s p%d",sState.c_str(),pn+1)) ); + m_spr[i].Load( THEME->GetPathG("MemoryCardDisplay",ssprintf("%s p%d",sState.c_str(),pn+1)) ); m_spr[i].SetHidden( true ); this->AddChild( &m_spr[i] ); } diff --git a/stepmania/src/MemoryCardManager.cpp b/stepmania/src/MemoryCardManager.cpp index 55d48a5900..a737149154 100644 --- a/stepmania/src/MemoryCardManager.cpp +++ b/stepmania/src/MemoryCardManager.cpp @@ -246,10 +246,10 @@ MemoryCardManager::MemoryCardManager() } /* These can play at any time. Preload them, so we don't cause a skip in gameplay. */ - m_soundReady.Load( THEME->GetPathToS("MemoryCardManager ready"), true ); - m_soundError.Load( THEME->GetPathToS("MemoryCardManager error"), true ); - m_soundTooLate.Load( THEME->GetPathToS("MemoryCardManager too late"), true ); - m_soundDisconnect.Load( THEME->GetPathToS("MemoryCardManager disconnect"), true ); + m_soundReady.Load( THEME->GetPathS("MemoryCardManager","ready"), true ); + m_soundError.Load( THEME->GetPathS("MemoryCardManager","error"), true ); + m_soundTooLate.Load( THEME->GetPathS("MemoryCardManager","too late"), true ); + m_soundDisconnect.Load( THEME->GetPathS("MemoryCardManager","disconnect"), true ); } MemoryCardManager::~MemoryCardManager() diff --git a/stepmania/src/ModeSwitcher.cpp b/stepmania/src/ModeSwitcher.cpp index d583571916..468063d0b5 100644 --- a/stepmania/src/ModeSwitcher.cpp +++ b/stepmania/src/ModeSwitcher.cpp @@ -27,23 +27,23 @@ ModeSwitcher::ModeSwitcher() { - m_Nextmode.LoadFromFont( THEME->GetPathToF("ModeSwitcher stylenames") ); + m_Nextmode.LoadFromFont( THEME->GetPathF("ModeSwitcher","stylenames") ); m_Nextmode.SetXY(NEXTMODE_X,NEXTMODE_Y); m_Nextmode.SetZoom(NEXTMODE_ZOOM); m_Nextmode.SetText(GetNextStyleName()); - m_Prevmode.LoadFromFont( THEME->GetPathToF("ModeSwitcher stylenames") ); + m_Prevmode.LoadFromFont( THEME->GetPathF("ModeSwitcher","stylenames") ); m_Prevmode.SetXY(PREVMODE_X,PREVMODE_Y); m_Prevmode.SetText(GetPrevStyleName()); m_Prevmode.SetZoom(PREVMODE_ZOOM); - m_Stylename.LoadFromFont( THEME->GetPathToF("ModeSwitcher stylenames") ); + m_Stylename.LoadFromFont( THEME->GetPathF("ModeSwitcher","stylenames") ); m_Stylename.SetXY(CURRMODE_X,CURRMODE_Y); m_Stylename.SetText(GetStyleName()); m_Stylename.SetZoom(CURRMODE_ZOOM); - m_NextIcon.Load( THEME->GetPathToG("ModeSwitcher nexticon")); + m_NextIcon.Load( THEME->GetPathG("ModeSwitcher","nexticon")); m_NextIcon.SetXY( NEXTICON_X, NEXTICON_Y); - m_PrevIcon.Load( THEME->GetPathToG("ModeSwitcher previcon")); + m_PrevIcon.Load( THEME->GetPathG("ModeSwitcher","previcon")); m_PrevIcon.SetXY( PREVICON_X, PREVICON_Y); this->AddChild( &m_NextIcon ); diff --git a/stepmania/src/MusicBannerWheel.cpp b/stepmania/src/MusicBannerWheel.cpp index 9e312cd349..2543a04508 100644 --- a/stepmania/src/MusicBannerWheel.cpp +++ b/stepmania/src/MusicBannerWheel.cpp @@ -108,7 +108,7 @@ MusicBannerWheel::MusicBannerWheel() LoadSongData(); #ifdef DEBUG - m_debugtext.LoadFromFont( THEME->GetPathToF("small titles") ); + m_debugtext.LoadFromFont( THEME->GetPathF("small","titles") ); m_debugtext.SetXY( 0, -120 ); this->AddChild(&m_debugtext); #endif @@ -146,9 +146,12 @@ void MusicBannerWheel::InsertNewBanner(int direction) else pSong = arraySongs[(arraySongs.size()-1) + (currentPos-2)]; // wrap around. (it does honestly!) - if( pSong == NULL ) sGraphicPath = (THEME->GetPathToG("Common fallback banner")); - else if (pSong->HasBanner()) sGraphicPath = (pSong->GetBannerPath()); - else sGraphicPath = (THEME->GetPathToG("Common fallback banner")); + if( pSong == NULL ) + sGraphicPath = THEME->GetPathG("Common","fallback banner"); + else if (pSong->HasBanner()) + sGraphicPath = pSong->GetBannerPath(); + else + sGraphicPath = THEME->GetPathG("Common","fallback banner"); elementtoreplace = scrlistPos - 2; if(elementtoreplace < 0) @@ -172,9 +175,12 @@ 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("Common fallback banner")); - else if (pSong->HasBanner()) sGraphicPath = (pSong->GetBannerPath()); - else sGraphicPath = (THEME->GetPathToG("Common fallback banner")); + if( pSong == NULL ) + sGraphicPath = THEME->GetPathG("Common","fallback banner"); + else if (pSong->HasBanner()) + sGraphicPath = pSong->GetBannerPath(); + else + sGraphicPath = THEME->GetPathG("Common","fallback banner"); elementtoreplace = scrlistPos + 2; if(elementtoreplace > MAXSONGSINBUFFER-1) @@ -223,9 +229,12 @@ void MusicBannerWheel::LoadSongData() { pSong = arraySongs[c]; - if( pSong == NULL ) asGraphicPaths.push_back(THEME->GetPathToG("Common fallback banner")); - else if (pSong->HasBanner()) asGraphicPaths.push_back(pSong->GetBannerPath()); - else asGraphicPaths.push_back(THEME->GetPathToG("Common fallback banner")); + if( pSong == NULL ) + asGraphicPaths.push_back(THEME->GetPathG("Common","fallback banner")); + else if (pSong->HasBanner()) + asGraphicPaths.push_back(pSong->GetBannerPath()); + else + asGraphicPaths.push_back(THEME->GetPathG("Common","fallback banner")); } } } @@ -274,9 +283,12 @@ void MusicBannerWheel::LoadSongData() pSong = arraySongs[arraySongs.size()-1]; } - if( pSong == NULL ) asGraphicPaths.push_back(THEME->GetPathToG("Common fallback banner")); - else if (pSong->HasBanner()) asGraphicPaths.push_back(pSong->GetBannerPath()); - else asGraphicPaths.push_back(THEME->GetPathToG("Common fallback banner")); + if( pSong == NULL ) + asGraphicPaths.push_back(THEME->GetPathG("Common","fallback banner")); + else if (pSong->HasBanner()) + asGraphicPaths.push_back(pSong->GetBannerPath()); + else + asGraphicPaths.push_back(THEME->GetPathG("Common","fallback banner")); } } if(SingleLoad != 1) diff --git a/stepmania/src/MusicList.cpp b/stepmania/src/MusicList.cpp index d46516906f..dd46dc993b 100644 --- a/stepmania/src/MusicList.cpp +++ b/stepmania/src/MusicList.cpp @@ -23,7 +23,7 @@ void MusicList::Load() { for( int i=0; iGetPathToF("MusicList titles") ); + m_textTitles[i].LoadFromFont( THEME->GetPathF("MusicList","titles") ); m_textTitles[i].SetXY( START_X + i*SPACING_X, START_Y ); m_textTitles[i].RunCommands( INIT_COMMAND ); this->AddChild( &m_textTitles[i] ); diff --git a/stepmania/src/MusicSortDisplay.cpp b/stepmania/src/MusicSortDisplay.cpp index e4f47da589..bcef545dfd 100644 --- a/stepmania/src/MusicSortDisplay.cpp +++ b/stepmania/src/MusicSortDisplay.cpp @@ -10,7 +10,7 @@ MusicSortDisplay::MusicSortDisplay() void MusicSortDisplay::Set( SortOrder so ) { - Load( THEME->GetPathToG(ssprintf("MusicSortDisplay %s",SortOrderToString(so).c_str())) ); + Load( THEME->GetPathG("MusicSortDisplay",SortOrderToString(so)) ); } /* diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index 91e3074224..f1697ae294 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -126,7 +126,7 @@ void MusicWheel::Load() GAMESTATE->m_CurStyle = GAMEMAN->STYLE_DANCE_SINGLE; */ - m_sprHighlight.Load( THEME->GetPathToG("MusicWheel highlight") ); + m_sprHighlight.Load( THEME->GetPathG("MusicWheel","highlight") ); m_sprHighlight->SetName( "Highlight" ); this->AddChild( m_sprHighlight ); ActorUtil::OnCommand( m_sprHighlight, "MusicWheel" ); @@ -136,10 +136,10 @@ void MusicWheel::Load() this->AddChild( &m_ScrollBar ); /* We play a lot of this one, so precache it. */ - m_soundChangeMusic.Load( THEME->GetPathToS("MusicWheel change"), true ); - m_soundChangeSort.Load( THEME->GetPathToS("MusicWheel sort") ); - m_soundExpand.Load( THEME->GetPathToS("MusicWheel expand") ); - m_soundLocked.Load( THEME->GetPathToS("MusicWheel locked"), true ); + m_soundChangeMusic.Load( THEME->GetPathS("MusicWheel","change"), true ); + m_soundChangeSort.Load( THEME->GetPathS("MusicWheel","sort") ); + m_soundExpand.Load( THEME->GetPathS("MusicWheel","expand") ); + m_soundLocked.Load( THEME->GetPathS("MusicWheel","locked"), true ); m_iSelection = 0; diff --git a/stepmania/src/MusicWheelItem.cpp b/stepmania/src/MusicWheelItem.cpp index fa5af3ffed..a76faf44ac 100644 --- a/stepmania/src/MusicWheelItem.cpp +++ b/stepmania/src/MusicWheelItem.cpp @@ -53,15 +53,15 @@ MusicWheelItem::MusicWheelItem() m_TextBanner.SetXY( SONG_NAME_X, 0 ); m_All.AddChild( &m_TextBanner ); - m_sprSongBar.Load( THEME->GetPathToG("MusicWheelItem song") ); + m_sprSongBar.Load( THEME->GetPathG("MusicWheelItem","song") ); m_sprSongBar.SetXY( 0, 0 ); m_All.AddChild( &m_sprSongBar ); - m_sprSectionBar.Load( THEME->GetPathToG("MusicWheelItem section") ); + m_sprSectionBar.Load( THEME->GetPathG("MusicWheelItem","section") ); m_sprSectionBar.SetXY( 0, 0 ); m_All.AddChild( &m_sprSectionBar ); - m_textSectionName.LoadFromFont( THEME->GetPathToF("MusicWheelItem section") ); + m_textSectionName.LoadFromFont( THEME->GetPathF("MusicWheelItem","section") ); m_textSectionName.SetShadowLength( 0 ); m_textSectionName.SetVertAlign( align_middle ); m_textSectionName.SetXY( SECTION_NAME_X, 0 ); @@ -69,7 +69,7 @@ MusicWheelItem::MusicWheelItem() m_All.AddChild( &m_textSectionName ); - m_textRoulette.LoadFromFont( THEME->GetPathToF("MusicWheelItem roulette") ); + m_textRoulette.LoadFromFont( THEME->GetPathF("MusicWheelItem","roulette") ); m_textRoulette.SetShadowLength( 0 ); m_textRoulette.TurnRainbowOn(); m_textRoulette.SetZoom( ROULETTE_ZOOM ); @@ -78,19 +78,19 @@ MusicWheelItem::MusicWheelItem() FOREACH_PlayerNumber( p ) { - m_GradeDisplay[p].Load( THEME->GetPathToG("MusicWheelItem grades") ); + m_GradeDisplay[p].Load( THEME->GetPathG("MusicWheelItem","grades") ); m_GradeDisplay[p].SetZoom( 1.0f ); m_GradeDisplay[p].SetXY( GRADE_X(p), 0 ); m_All.AddChild( &m_GradeDisplay[p] ); } m_textCourse.SetName( "CourseName" ); - m_textCourse.LoadFromFont( THEME->GetPathToF("MusicWheelItem course") ); + m_textCourse.LoadFromFont( THEME->GetPathF("MusicWheelItem","course") ); SET_XY_AND_ON_COMMAND( &m_textCourse ); m_All.AddChild( &m_textCourse ); m_textSort.SetName( "Sort" ); - m_textSort.LoadFromFont( THEME->GetPathToF("MusicWheelItem sort") ); + m_textSort.LoadFromFont( THEME->GetPathF("MusicWheelItem","sort") ); SET_XY_AND_ON_COMMAND( &m_textSort ); m_All.AddChild( &m_textSort ); } diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp index c6288463f6..0078b4d3d4 100644 --- a/stepmania/src/NoteField.cpp +++ b/stepmania/src/NoteField.cpp @@ -22,13 +22,13 @@ NoteField::NoteField() { m_pNoteData = NULL; - m_textMeasureNumber.LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textMeasureNumber.LoadFromFont( THEME->GetPathF("Common","normal") ); m_textMeasureNumber.SetZoom( 1.0f ); m_rectMarkerBar.SetShadowLength( 0 ); m_rectMarkerBar.SetEffectDiffuseShift( 2, RageColor(1,1,1,0.5f), RageColor(0.5f,0.5f,0.5f,0.5f) ); - m_sprBars.Load( THEME->GetPathToG("NoteField bars") ); + m_sprBars.Load( THEME->GetPathG("NoteField","bars") ); m_sprBars.StopAnimating(); m_iBeginMarker = m_iEndMarker = -1; @@ -672,7 +672,7 @@ void NoteField::DrawPrimitives() if( bIsAttack ) { Sprite sprite; - sprite.Load( THEME->GetPathToG("NoteField attack "+tn.sAttackModifiers) ); + sprite.Load( THEME->GetPathG("NoteField","attack "+tn.sAttackModifiers) ); float fBeat = NoteRowToBeat(i); nd->display[c].DrawActor( &sprite, c, fBeat, bIsInSelectionRange ? fSelectedRangeGlow : m_fPercentFadeToFail, 1, m_fYReverseOffsetPixels, false ); } diff --git a/stepmania/src/OptionsCursor.cpp b/stepmania/src/OptionsCursor.cpp index c6967b8d4d..dc78f9439f 100644 --- a/stepmania/src/OptionsCursor.cpp +++ b/stepmania/src/OptionsCursor.cpp @@ -15,8 +15,7 @@ OptionsCursor::OptionsCursor() void OptionsCursor::Load( PlayerNumber pn, bool bUnderline ) { - CString sFileName = bUnderline ? "OptionsCursor underline" : "OptionsCursor cursor"; - CString sPath = THEME->GetPathToG(sFileName); + CString sPath = THEME->GetPathG("OptionsCursor",bUnderline?"underline":"cursor"); m_sprLeft.Load( sPath ); m_sprMiddle.Load( sPath ); diff --git a/stepmania/src/PaneDisplay.cpp b/stepmania/src/PaneDisplay.cpp index b4ac61cfb6..d9d3880f16 100644 --- a/stepmania/src/PaneDisplay.cpp +++ b/stepmania/src/PaneDisplay.cpp @@ -76,7 +76,7 @@ void PaneDisplay::Load( PlayerNumber pn ) { m_PlayerNumber = pn; - m_sprPaneUnder.Load( THEME->GetPathToG( ssprintf("PaneDisplay under p%i", pn+1)) ); + m_sprPaneUnder.Load( THEME->GetPathG("PaneDisplay",ssprintf("under p%i",pn+1)) ); m_sprPaneUnder->SetName( "Under" ); ON_COMMAND( m_sprPaneUnder ); this->AddChild( m_sprPaneUnder ); @@ -114,12 +114,12 @@ void PaneDisplay::Load( PlayerNumber pn ) if( g_Contents[p].type == NUM_PANES ) continue; /* skip, disabled */ - m_textContents[p].LoadFromFont( THEME->GetPathToF( "PaneDisplay text" ) ); + m_textContents[p].LoadFromFont( THEME->GetPathF("PaneDisplay","text") ); m_textContents[p].SetName( ssprintf("%sText", g_Contents[p].name) ); SET_XY_AND_ON_COMMAND( m_textContents[p] ); m_ContentsFrame.AddChild( &m_textContents[p] ); - m_Labels[p].Load( THEME->GetPathToG( ssprintf("PaneDisplay %s label", g_Contents[p].name)) ); + m_Labels[p].Load( THEME->GetPathG("PaneDisplay",CString(g_Contents[p].name)+" label") ); m_Labels[p]->SetName( ssprintf("%sLabel", g_Contents[p].name) ); SET_XY_AND_ON_COMMAND( m_Labels[p] ); m_ContentsFrame.AddChild( m_Labels[p] ); @@ -128,7 +128,7 @@ void PaneDisplay::Load( PlayerNumber pn ) m_ContentsFrame.SetXY( SHIFT_X(m_PlayerNumber), SHIFT_Y(m_PlayerNumber) ); this->AddChild( &m_ContentsFrame ); - m_sprPaneOver.Load( THEME->GetPathToG( ssprintf("PaneDisplay over p%i", pn+1)) ); + m_sprPaneOver.Load( THEME->GetPathG("PaneDisplay",ssprintf("over p%i", pn+1)) ); m_sprPaneOver->SetName( "Over" ); ON_COMMAND( m_sprPaneOver ); this->AddChild( m_sprPaneOver ); diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index a5db37c2d3..7bfaeb7a45 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -118,7 +118,7 @@ void Player::Init( m_pPrimaryScoreKeeper = pPrimaryScoreKeeper; m_pSecondaryScoreKeeper = pSecondaryScoreKeeper; - m_soundMine.Load( THEME->GetPathToS("Player mine"), true ); + m_soundMine.Load( THEME->GetPathS("Player","mine"), true ); /* Attacks can be launched in course modes and in battle modes. They both come * here to play, but allow loading a different sound for different modes. */ @@ -126,12 +126,12 @@ void Player::Init( { case PLAY_MODE_RAVE: case PLAY_MODE_BATTLE: - m_soundAttackLaunch.Load( THEME->GetPathToS("Player battle attack launch"), true ); - m_soundAttackEnding.Load( THEME->GetPathToS("Player battle attack ending"), true ); + m_soundAttackLaunch.Load( THEME->GetPathS("Player","battle attack launch"), true ); + m_soundAttackEnding.Load( THEME->GetPathS("Player","battle attack ending"), true ); break; default: - m_soundAttackLaunch.Load( THEME->GetPathToS("Player course attack launch"), true ); - m_soundAttackEnding.Load( THEME->GetPathToS("Player course attack ending"), true ); + m_soundAttackLaunch.Load( THEME->GetPathS("Player","course attack launch"), true ); + m_soundAttackEnding.Load( THEME->GetPathS("Player","course attack ending"), true ); break; } diff --git a/stepmania/src/ScoreDisplayBattle.cpp b/stepmania/src/ScoreDisplayBattle.cpp index 1b604fc31a..c1df0d7e36 100644 --- a/stepmania/src/ScoreDisplayBattle.cpp +++ b/stepmania/src/ScoreDisplayBattle.cpp @@ -17,7 +17,7 @@ ScoreDisplayBattle::ScoreDisplayBattle() { LOG->Trace( "ScoreDisplayBattle::ScoreDisplayBattle()" ); - m_sprFrame.Load( THEME->GetPathToG("ScoreDisplayBattle frame") ); + m_sprFrame.Load( THEME->GetPathG("ScoreDisplayBattle","frame") ); this->AddChild( &m_sprFrame ); for( int i=0; iGetPathToG("ScoreDisplayBattle icon "+sNewModifier) ); + m_ItemIcon[s].Load( THEME->GetPathG("ScoreDisplayBattle","icon "+sNewModifier) ); m_ItemIcon[s].StopTweening(); ActorCommands acmds( ParseCommands( "diffuse,1,1,1,1;zoom,1;" diff --git a/stepmania/src/ScoreDisplayPercentage.cpp b/stepmania/src/ScoreDisplayPercentage.cpp index 0481a7850a..99166055f5 100644 --- a/stepmania/src/ScoreDisplayPercentage.cpp +++ b/stepmania/src/ScoreDisplayPercentage.cpp @@ -7,7 +7,7 @@ ScoreDisplayPercentage::ScoreDisplayPercentage() { - m_sprFrame.Load( THEME->GetPathToG("ScoreDisplayNormal frame") ); + m_sprFrame.Load( THEME->GetPathG("ScoreDisplayNormal","frame") ); this->AddChild( &m_sprFrame ); m_Percent.SetName( "ScoreDisplayPercentage Percent" ); diff --git a/stepmania/src/ScoreDisplayRave.cpp b/stepmania/src/ScoreDisplayRave.cpp index eccb224de0..7fdc8f3d73 100644 --- a/stepmania/src/ScoreDisplayRave.cpp +++ b/stepmania/src/ScoreDisplayRave.cpp @@ -22,7 +22,7 @@ ScoreDisplayRave::ScoreDisplayRave() for( int i=0; iGetPathToG(ssprintf("ScoreDisplayRave stream level%d",i+1)) ); + m_sprMeter[i].Load( THEME->GetPathG("ScoreDisplayRave",ssprintf("stream level%d",i+1)) ); m_sprMeter[i].SetCropRight( 1.f ); this->AddChild( &m_sprMeter[i] ); } @@ -41,8 +41,8 @@ void ScoreDisplayRave::Init( const PlayerState* pPlayerState ) PlayerNumber pn = pPlayerState->m_PlayerNumber; - m_sprFrameBase.Load( THEME->GetPathToG(ssprintf("ScoreDisplayRave frame base p%d",pn+1)) ); - m_sprFrameOverlay.Load( THEME->GetPathToG(ssprintf("ScoreDisplayRave frame overlay p%d",pn+1)) ); + m_sprFrameBase.Load( THEME->GetPathG("ScoreDisplayRave",ssprintf("frame base p%d",pn+1)) ); + m_sprFrameOverlay.Load( THEME->GetPathG("ScoreDisplayRave",ssprintf("frame overlay p%d",pn+1)) ); for( int i=0; iGetElementName() won't // work until the object has been fully constructed. - m_In.Load( THEME->GetPathToB(m_sName+" in") ); + m_In.Load( THEME->GetPathB(m_sName,"in") ); m_In.StartTransitioning(); m_In.SetDrawOrder( DRAW_ORDER_TRANSITIONS ); this->AddChild( &m_In ); - m_Out.Load( THEME->GetPathToB(m_sName+" out") ); + m_Out.Load( THEME->GetPathB(m_sName,"out") ); m_Out.SetDrawOrder( DRAW_ORDER_TRANSITIONS ); this->AddChild( &m_Out ); @@ -137,7 +137,7 @@ void ScreenAttract::Update( float fDelta ) } if( GAMESTATE->IsTimeToPlayAttractSounds() ) - SOUND->PlayMusic( THEME->GetPathToS(m_sName + " music") ); + SOUND->PlayMusic( THEME->GetPathS(m_sName,"music") ); else SOUND->PlayMusic( "" ); // stop music } diff --git a/stepmania/src/ScreenBookkeeping.cpp b/stepmania/src/ScreenBookkeeping.cpp index b3fa2824e7..70716850d4 100644 --- a/stepmania/src/ScreenBookkeeping.cpp +++ b/stepmania/src/ScreenBookkeeping.cpp @@ -20,7 +20,7 @@ ScreenBookkeeping::ScreenBookkeeping( CString sClassName ) : ScreenWithMenuEleme { LOG->Trace( "ScreenBookkeeping::ScreenBookkeeping()" ); - m_textTitle.LoadFromFont( THEME->GetPathToF("Common title") ); + m_textTitle.LoadFromFont( THEME->GetPathF("Common","title") ); m_textTitle.SetText( "header" ); m_textTitle.SetXY( SCREEN_CENTER_X, 60 ); m_textTitle.SetDiffuse( RageColor(1,1,1,1) ); @@ -31,7 +31,7 @@ ScreenBookkeeping::ScreenBookkeeping( CString sClassName ) : ScreenWithMenuEleme { float fX = SCALE( i, 0.f, NUM_BOOKKEEPING_COLS-1, SCREEN_LEFT+50, SCREEN_RIGHT-160 ); float fY = SCREEN_CENTER_Y+16; - m_textCols[i].LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textCols[i].LoadFromFont( THEME->GetPathF("Common","normal") ); m_textCols[i].SetText( ssprintf("%d",i) ); m_textCols[i].SetXY( fX, fY ); m_textCols[i].SetDiffuse( RageColor(1,1,1,1) ); @@ -41,7 +41,7 @@ ScreenBookkeeping::ScreenBookkeeping( CString sClassName ) : ScreenWithMenuEleme ChangeView( (View)0 ); - SOUND->PlayMusic( THEME->GetPathToS("ScreenBookkeeping music") ); + SOUND->PlayMusic( THEME->GetPathS("ScreenBookkeeping","music") ); } ScreenBookkeeping::~ScreenBookkeeping() diff --git a/stepmania/src/ScreenCenterImage.cpp b/stepmania/src/ScreenCenterImage.cpp index 726ad922a6..9cd0acbddb 100644 --- a/stepmania/src/ScreenCenterImage.cpp +++ b/stepmania/src/ScreenCenterImage.cpp @@ -24,14 +24,14 @@ ScreenCenterImage::ScreenCenterImage( CString sClassName ) : ScreenWithMenuEleme m_textHelp->SetTips(strArray); #endif - m_textInstructions.LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textInstructions.LoadFromFont( THEME->GetPathF("Common","normal") ); m_textInstructions.SetText( "" ); m_textInstructions.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y ); m_textInstructions.SetDiffuse( RageColor(0,1,0,0) ); m_textInstructions.SetZoom( 0.8f ); this->AddChild( &m_textInstructions ); - SOUND->PlayMusic( THEME->GetPathToS("ScreenCenterImage music") ); + SOUND->PlayMusic( THEME->GetPathS("ScreenCenterImage","music") ); } diff --git a/stepmania/src/ScreenCredits.cpp b/stepmania/src/ScreenCredits.cpp index b2470ee7e6..64dcdf10cc 100644 --- a/stepmania/src/ScreenCredits.cpp +++ b/stepmania/src/ScreenCredits.cpp @@ -199,12 +199,12 @@ ScreenCredits::ScreenCredits( CString sName ) : ScreenAttract( sName ) } Sprite* pBackground = new Sprite; - pBackground->LoadBG( pSong->HasBackground() ? pSong->GetBackgroundPath() : THEME->GetPathToG("Common fallback background") ); + pBackground->LoadBG( pSong->HasBackground() ? pSong->GetBackgroundPath() : THEME->GetPathG("Common","fallback background") ); pBackground->ScaleToClipped( BACKGROUNDS_WIDTH, BACKGROUNDS_HEIGHT ); m_ScrollerBackgrounds.AddChild( pBackground ); Sprite* pFrame = new Sprite; - pFrame->Load( THEME->GetPathToG("ScreenCredits background frame") ); + pFrame->Load( THEME->GetPathG("ScreenCredits","background frame") ); m_ScrollerFrames.AddChild( pFrame ); } const int iFirst = -2, iLast = NUM_BACKGROUNDS+2; @@ -232,7 +232,7 @@ ScreenCredits::ScreenCredits( CString sName ) : ScreenAttract( sName ) for( unsigned i=0; iLoadFromFont( THEME->GetPathToF("ScreenCredits titles") ); + pText->LoadFromFont( THEME->GetPathF("ScreenCredits","titles") ); pText->SetText( CREDIT_LINES[i].text ); switch( CREDIT_LINES[i].colorIndex ) { @@ -251,7 +251,7 @@ ScreenCredits::ScreenCredits( CString sName ) : ScreenAttract( sName ) fTime = max( fTime, TEXTS_SCROLL_SECONDS_PER_ITEM*(iLast-iFirst) ); } - m_Overlay.LoadFromAniDir( THEME->GetPathToB("ScreenCredits overlay") ); + m_Overlay.LoadFromAniDir( THEME->GetPathB("ScreenCredits","overlay") ); m_Overlay.PlayCommand( "On" ); this->AddChild( &m_Overlay ); diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp index 6e25929f9f..8e276476a8 100644 --- a/stepmania/src/ScreenDemonstration.cpp +++ b/stepmania/src/ScreenDemonstration.cpp @@ -43,7 +43,7 @@ void ScreenDemonstration::Init() } - m_Overlay.LoadFromAniDir( THEME->GetPathToB("ScreenDemonstration overlay") ); + m_Overlay.LoadFromAniDir( THEME->GetPathB("ScreenDemonstration","overlay") ); m_Overlay.PlayCommand( "On" ); this->AddChild( &m_Overlay ); diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index 57ca3d4ab6..af3c871dcb 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -560,15 +560,15 @@ ScreenEdit::ScreenEdit( CString sName ) : Screen( sName ) GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerController = PC_HUMAN; m_Player.SetXY( PLAYER_X, PLAYER_Y ); - m_In.Load( THEME->GetPathToB("ScreenEdit in") ); + m_In.Load( THEME->GetPathB("ScreenEdit","in") ); m_In.StartTransitioning(); - m_Out.Load( THEME->GetPathToB("ScreenEdit out") ); + m_Out.Load( THEME->GetPathB("ScreenEdit","out") ); m_sprOverlay.LoadAndSetName( m_sName, "Overlay" ); SET_XY_AND_ON_COMMAND( m_sprOverlay ); - m_textHelp.LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textHelp.LoadFromFont( THEME->GetPathF("Common","normal") ); m_textHelp.SetXY( HELP_TEXT_X, HELP_TEXT_Y ); m_textHelp.SetHorizAlign( Actor::align_left ); m_textHelp.SetVertAlign( Actor::align_top ); @@ -576,7 +576,7 @@ ScreenEdit::ScreenEdit( CString sName ) : Screen( sName ) m_textHelp.SetText( HELP_TEXT ); m_textHelp.SetShadowLength( 0 ); - m_textInfo.LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textInfo.LoadFromFont( THEME->GetPathF("Common","normal") ); m_textInfo.SetXY( INFO_TEXT_X, INFO_TEXT_Y ); m_textInfo.SetHorizAlign( Actor::align_left ); m_textInfo.SetVertAlign( Actor::align_top ); @@ -584,14 +584,14 @@ ScreenEdit::ScreenEdit( CString sName ) : Screen( sName ) m_textInfo.SetShadowLength( 0 ); //m_textInfo.SetText(); // set this below every frame - m_soundChangeLine.Load( THEME->GetPathToS("ScreenEdit line") ); - m_soundChangeSnap.Load( THEME->GetPathToS("ScreenEdit snap") ); - m_soundMarker.Load( THEME->GetPathToS("ScreenEdit marker") ); + m_soundChangeLine.Load( THEME->GetPathS("ScreenEdit","line") ); + m_soundChangeSnap.Load( THEME->GetPathS("ScreenEdit","snap") ); + m_soundMarker.Load( THEME->GetPathS("ScreenEdit","marker") ); m_soundMusic.Load( m_pSong->GetMusicPath() ); - m_soundAssistTick.Load( THEME->GetPathToS("ScreenEdit assist tick") ); + m_soundAssistTick.Load( THEME->GetPathS("ScreenEdit","assist tick") ); this->HandleScreenMessage( SM_DoUpdateTextInfo ); } @@ -1149,7 +1149,7 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ GAMEMAN->StepsTypeToString( pSteps->m_StepsType ).c_str(), DifficultyToString( pSteps->GetDifficulty() ).c_str(), pSteps->GetDescription().c_str() ) ); - SOUND->PlayOnce( THEME->GetPathToS("ScreenEdit switch") ); + SOUND->PlayOnce( THEME->GetPathS("ScreenEdit","switch") ); } break; case EDIT_BUTTON_BPM_UP: @@ -1767,7 +1767,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, int* iAnswers ) SCREENMAN->SystemMessage( "Saved as SM and DWI." ); else SCREENMAN->SystemMessage( "Saved as SM." ); - SOUND->PlayOnce( THEME->GetPathToS("ScreenEdit save") ); + SOUND->PlayOnce( THEME->GetPathS("ScreenEdit","save") ); } break; case reload: diff --git a/stepmania/src/ScreenEditCoursesMenu.cpp b/stepmania/src/ScreenEditCoursesMenu.cpp index 8039556745..8406968f63 100644 --- a/stepmania/src/ScreenEditCoursesMenu.cpp +++ b/stepmania/src/ScreenEditCoursesMenu.cpp @@ -33,14 +33,14 @@ ScreenEditCoursesMenu::ScreenEditCoursesMenu( CString sName ) : ScreenWithMenuEl m_textExplanation.SetName( "Explanation" ); - m_textExplanation.LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textExplanation.LoadFromFont( THEME->GetPathF("Common","normal") ); SET_XY_AND_ON_COMMAND( m_textExplanation ); m_textExplanation.SetText( EXPLANATION_TEXT ); this->AddChild( &m_textExplanation ); this->SortByDrawOrder(); - SOUND->PlayMusic( THEME->GetPathToS("ScreenEditCoursesMenu music") ); + SOUND->PlayMusic( THEME->GetPathS("ScreenEditCoursesMenu","music") ); } void ScreenEditCoursesMenu::HandleScreenMessage( const ScreenMessage SM ) diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp index 02e4bdc484..1e6b8d76e5 100644 --- a/stepmania/src/ScreenEditMenu.cpp +++ b/stepmania/src/ScreenEditMenu.cpp @@ -34,14 +34,14 @@ ScreenEditMenu::ScreenEditMenu( CString sName ) : ScreenWithMenuElements( sName m_textExplanation.SetName( "Explanation" ); - m_textExplanation.LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textExplanation.LoadFromFont( THEME->GetPathF("Common","normal") ); SET_XY_AND_ON_COMMAND( m_textExplanation ); m_textExplanation.SetText( EXPLANATION_TEXT ); this->AddChild( &m_textExplanation ); this->SortByDrawOrder(); - SOUND->PlayMusic( THEME->GetPathToS("ScreenEditMenu music") ); + SOUND->PlayMusic( THEME->GetPathS("ScreenEditMenu","music") ); } void ScreenEditMenu::HandleScreenMessage( const ScreenMessage SM ) @@ -145,7 +145,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn ) pSong->AddSteps( pNewNotes ); SCREENMAN->SystemMessage( "Steps created from copy." ); - SOUND->PlayOnce( THEME->GetPathToS("ScreenEditMenu create") ); + SOUND->PlayOnce( THEME->GetPathS("ScreenEditMenu","create") ); m_Selector.RefreshNotes(); pSong->Save(); } @@ -163,7 +163,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn ) pSong->AddSteps( pNewNotes ); SCREENMAN->SystemMessage( "Steps created from AutoGen." ); - SOUND->PlayOnce( THEME->GetPathToS("ScreenEditMenu create") ); + SOUND->PlayOnce( THEME->GetPathS("ScreenEditMenu","create") ); m_Selector.RefreshNotes(); pSong->Save(); } @@ -180,7 +180,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn ) pSong->AddSteps( pNewNotes ); SCREENMAN->SystemMessage( "Blank Steps created." ); - SOUND->PlayOnce( THEME->GetPathToS("ScreenEditMenu create") ); + SOUND->PlayOnce( THEME->GetPathS("ScreenEditMenu","create") ); m_Selector.RefreshNotes(); pSong->Save(); } diff --git a/stepmania/src/ScreenEnding.cpp b/stepmania/src/ScreenEnding.cpp index ea372ff037..52ef521e38 100644 --- a/stepmania/src/ScreenEnding.cpp +++ b/stepmania/src/ScreenEnding.cpp @@ -208,7 +208,7 @@ ScreenEnding::ScreenEnding( CString sClassName ) : ScreenAttract( sClassName, fa Profile* pProfile = PROFILEMAN->GetProfile( p ); - m_textPlayerName[p].LoadFromFont( THEME->GetPathToF("ScreenEnding player name") ); + m_textPlayerName[p].LoadFromFont( THEME->GetPathF("ScreenEnding","player name") ); m_textPlayerName[p].SetText( pProfile ? pProfile->GetDisplayName() : CString("NO CARD") ); m_textPlayerName[p].SetName( ssprintf("PlayerNameP%d",p+1) ); SET_XY_AND_ON_COMMAND( m_textPlayerName[p] ); @@ -221,13 +221,13 @@ ScreenEnding::ScreenEnding( CString sClassName ) : ScreenAttract( sClassName, fa FOREACH_EndingStatsLine( i ) { - m_Lines[i][p].title.LoadFromFont( THEME->GetPathToF("ScreenEnding stats title") ); + m_Lines[i][p].title.LoadFromFont( THEME->GetPathF("ScreenEnding","stats title") ); m_Lines[i][p].title.SetText( GetStatsLineTitle(p, i) ); m_Lines[i][p].title.SetName( ssprintf("StatsTitleP%dLine%d",p+1,i+1) ); SET_XY_AND_ON_COMMAND( m_Lines[i][p].title ); this->AddChild( &m_Lines[i][p].title ); - m_Lines[i][p].value.LoadFromFont( THEME->GetPathToF("ScreenEnding stats value") ); + m_Lines[i][p].value.LoadFromFont( THEME->GetPathF("ScreenEnding","stats value") ); m_Lines[i][p].value.SetText( GetStatsLineValue(p, i) ); m_Lines[i][p].value.SetName( ssprintf("StatsValueP%dLine%d",p+1,i+1) ); SET_XY_AND_ON_COMMAND( m_Lines[i][p].value ); @@ -235,7 +235,7 @@ ScreenEnding::ScreenEnding( CString sClassName ) : ScreenAttract( sClassName, fa } m_sprRemoveMemoryCard[p].SetName( ssprintf("RemoveCardP%d",p+1) ); - m_sprRemoveMemoryCard[p].Load( THEME->GetPathToG(ssprintf("ScreenEnding remove card P%d",p+1)) ); + m_sprRemoveMemoryCard[p].Load( THEME->GetPathG("ScreenEnding",ssprintf("remove card P%d",p+1)) ); SET_XY_AND_ON_COMMAND( m_sprRemoveMemoryCard[p] ); this->AddChild( &m_sprRemoveMemoryCard[p] ); } diff --git a/stepmania/src/ScreenEndlessBreak.cpp b/stepmania/src/ScreenEndlessBreak.cpp index fdb3abd19f..dde7535ac1 100644 --- a/stepmania/src/ScreenEndlessBreak.cpp +++ b/stepmania/src/ScreenEndlessBreak.cpp @@ -19,7 +19,7 @@ ScreenEndlessBreak::ScreenEndlessBreak( CString sName ) : Screen( sName ) if( GAMESTATE->m_pCurCharacters[0] != NULL ) m_sprBreakPicture.LoadTABreakFromCharacter( GAMESTATE->m_pCurCharacters[0] ); else - m_sprBreakPicture.Load( THEME->GetPathToG("Common fallback takingabreak") ); + m_sprBreakPicture.Load( THEME->GetPathG("Common","fallback takingabreak") ); else if( GAMESTATE->GetNumPlayersEnabled() > 1 ) // More than 1 player is present. { PlayerNumber pn; @@ -36,7 +36,7 @@ ScreenEndlessBreak::ScreenEndlessBreak( CString sName ) : Screen( sName ) } } else // Characters not enabled. - m_sprBreakPicture.Load( THEME->GetPathToG("Common fallback takingabreak") ); + m_sprBreakPicture.Load( THEME->GetPathG("Common","fallback takingabreak") ); m_sprBreakPicture.SetX( SCREEN_CENTER_X ); m_sprBreakPicture.SetY( SCREEN_CENTER_Y ); this->AddChild(&m_sprBreakPicture); @@ -45,16 +45,16 @@ ScreenEndlessBreak::ScreenEndlessBreak( CString sName ) : Screen( sName ) m_fCountdownSecs = (float)(PREFSMAN->m_iEndlessBreakLength*60); // Stored in minutes. //BitmapText stuff - m_textTimeRemaining.LoadFromFont( THEME->GetPathToF("Common Normal") ); + m_textTimeRemaining.LoadFromFont( THEME->GetPathF("Common","normal") ); m_textTimeRemaining.SetText( SecondsToMMSSMsMs(m_fCountdownSecs) ); m_textTimeRemaining.SetX( SCREEN_CENTER_X ); m_textTimeRemaining.SetY( SCREEN_CENTER_Y ); //Transition stuff - m_In.Load( THEME->GetPathToB("ScreenEndlessBreak In") ); + m_In.Load( THEME->GetPathB("ScreenEndlessBreak","In") ); this->AddChild(&m_In); m_In.StartTransitioning(); - m_Out.Load( THEME->GetPathToB("ScreenEndlessBreak Out") ); + m_Out.Load( THEME->GetPathB("ScreenEndlessBreak","Out") ); this->AddChild(&m_Out); m_bExiting = false; } diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 04b72465af..08e1954541 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -280,7 +280,7 @@ void ScreenEvaluation::Init() { EvalSoundSequence temp; temp.fTime = SOUNDSEQ_TIME(snd); - temp.sSound.Load(THEME->GetPathToS(SOUNDSEQ_NAME(snd),false)); + temp.sSound.Load( THEME->GetPathToS(SOUNDSEQ_NAME(snd)) ); m_SoundSequences.push_back(temp); } // } @@ -297,7 +297,7 @@ void ScreenEvaluation::Init() // // load other sounds // - m_soundStart.Load( THEME->GetPathToS("ScreenEvaluation start") ); + m_soundStart.Load( THEME->GetPathS("ScreenEvaluation","start") ); // @@ -327,12 +327,12 @@ void ScreenEvaluation::Init() SET_XY_AND_ON_COMMAND( m_LargeBanner ); this->AddChild( &m_LargeBanner ); - m_sprLargeBannerFrame.Load( THEME->GetPathToG("ScreenEvaluation banner frame") ); + m_sprLargeBannerFrame.Load( THEME->GetPathG("ScreenEvaluation","banner frame") ); m_sprLargeBannerFrame->SetName( "LargeBannerFrame" ); SET_XY_AND_ON_COMMAND( m_sprLargeBannerFrame ); this->AddChild( m_sprLargeBannerFrame ); - m_sprStage.Load( THEME->GetPathToG("ScreenEvaluation stage "+GAMESTATE->GetStageText()) ); + m_sprStage.Load( THEME->GetPathG("ScreenEvaluation","stage "+GAMESTATE->GetStageText()) ); m_sprStage->SetName( "Stage" ); SET_XY_AND_ON_COMMAND( m_sprStage ); this->AddChild( m_sprStage ); @@ -350,7 +350,7 @@ void ScreenEvaluation::Init() SET_XY_AND_ON_COMMAND( m_SmallBanner[i] ); this->AddChild( &m_SmallBanner[i] ); - m_sprSmallBannerFrame[i].Load( THEME->GetPathToG("ScreenEvaluation banner frame") ); + m_sprSmallBannerFrame[i].Load( THEME->GetPathG("ScreenEvaluation","banner frame") ); m_sprSmallBannerFrame[i]->SetName( ssprintf("SmallBanner%d",i+1) ); SET_XY_AND_ON_COMMAND( m_sprSmallBannerFrame[i] ); this->AddChild( m_sprSmallBannerFrame[i] ); @@ -365,7 +365,7 @@ void ScreenEvaluation::Init() SET_XY_AND_ON_COMMAND( m_LargeBanner ); this->AddChild( &m_LargeBanner ); - m_sprLargeBannerFrame.Load( THEME->GetPathToG("ScreenEvaluation banner frame") ); + m_sprLargeBannerFrame.Load( THEME->GetPathG("ScreenEvaluation","banner frame") ); m_sprLargeBannerFrame->SetName( "LargeBannerFrame" ); SET_XY_AND_ON_COMMAND( m_sprLargeBannerFrame ); this->AddChild( m_sprLargeBannerFrame ); @@ -383,7 +383,7 @@ void ScreenEvaluation::Init() { FOREACH_EnabledPlayer( p ) { - m_DifficultyIcon[p].Load( THEME->GetPathToG(ssprintf("ScreenEvaluation difficulty icons")) ); + m_DifficultyIcon[p].Load( THEME->GetPathG("ScreenEvaluation","difficulty icons") ); switch( m_Type ) { case stage: @@ -416,7 +416,7 @@ void ScreenEvaluation::Init() SET_XY_AND_ON_COMMAND( m_DifficultyMeter[p] ); this->AddChild( &m_DifficultyMeter[p] ); - m_textPlayerOptions[p].LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textPlayerOptions[p].LoadFromFont( THEME->GetPathF("Common","normal") ); CString sPO = GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.GetThemedString(); sPO.Replace( ", ", PLAYER_OPTIONS_SEPARATOR ); m_textPlayerOptions[p].SetName( ssprintf("PlayerOptionsP%d",p+1) ); @@ -426,7 +426,7 @@ void ScreenEvaluation::Init() if( GAMESTATE->IsDisqualified(p) ) { - m_sprDisqualified[p].Load( THEME->GetPathToG("ScreenEvaluation disqualified") ); + m_sprDisqualified[p].Load( THEME->GetPathG("ScreenEvaluation","disqualified") ); m_sprDisqualified[p]->SetName( ssprintf("DisqualifiedP%d",p+1) ); SET_XY_AND_ON_COMMAND( m_sprDisqualified[p] ); this->AddChild( m_sprDisqualified[p] ); @@ -448,13 +448,13 @@ void ScreenEvaluation::Init() { FOREACH_EnabledPlayer( p ) { - m_sprGraphFrame[p].Load( THEME->GetPathToG(ssprintf("ScreenEvaluation graph frame p%d",p+1)) ); + m_sprGraphFrame[p].Load( THEME->GetPathG("ScreenEvaluation",ssprintf("graph frame p%d",p+1)) ); m_sprGraphFrame[p]->SetName( ssprintf("GraphFrameP%d",p+1) ); SET_XY_AND_ON_COMMAND( m_sprGraphFrame[p] ); this->AddChild( m_sprGraphFrame[p] ); m_Graph[p].SetName( ssprintf("GraphP%i",p+1) ); - m_Graph[p].Load( THEME->GetPathToG(ssprintf("%s graph p%i",m_sName.c_str(), p+1)), GRAPH_START_HEIGHT ); + m_Graph[p].Load( THEME->GetPathG(m_sName,ssprintf("graph p%i", p+1)), GRAPH_START_HEIGHT ); m_Graph[p].LoadFromStageStats( stageStats.m_player[p] ); SET_XY_AND_ON_COMMAND( m_Graph[p] ); this->AddChild( &m_Graph[p] ); @@ -480,12 +480,12 @@ void ScreenEvaluation::Init() { FOREACH_EnabledPlayer( p ) { - m_sprGradeFrame[p].Load( THEME->GetPathToG(ssprintf("ScreenEvaluation grade frame p%d",p+1)) ); + m_sprGradeFrame[p].Load( THEME->GetPathG("ScreenEvaluation",ssprintf("grade frame p%d",p+1)) ); m_sprGradeFrame[p]->SetName( ssprintf("GradeFrameP%d",p+1) ); SET_XY_AND_ON_COMMAND( m_sprGradeFrame[p] ); this->AddChild( m_sprGradeFrame[p] ); - m_Grades[p].Load( THEME->GetPathToG("ScreenEvaluation grades") ); + m_Grades[p].Load( THEME->GetPathG("ScreenEvaluation","grades") ); m_Grades[p].SetGrade( p, grade[p] ); m_Grades[p].SetName( ssprintf("GradeP%d",p+1) ); SET_XY_AND_ON_COMMAND( m_Grades[p] ); @@ -493,7 +493,7 @@ void ScreenEvaluation::Init() m_Grades[p].Spin(); this->AddChild( &m_Grades[p] ); - m_sprGrade[p].Load( THEME->GetPathToG( "ScreenEvaluation grade "+ GradeToString(grade[p]) ) ); + m_sprGrade[p].Load( THEME->GetPathG("ScreenEvaluation","grade "+GradeToString(grade[p])) ); m_sprGrade[p]->SetName( ssprintf("GradeP%d",p+1) ); SET_XY_AND_ON_COMMAND( m_sprGrade[p] ); this->AddChild( m_sprGrade[p] ); @@ -507,7 +507,7 @@ void ScreenEvaluation::Init() { FOREACH_EnabledPlayer( p ) { - m_sprPercentFrame[p].Load( THEME->GetPathToG(ssprintf("ScreenEvaluation percent frame p%d",p+1)) ); + m_sprPercentFrame[p].Load( THEME->GetPathG("ScreenEvaluation",ssprintf("percent frame p%d",p+1)) ); m_sprPercentFrame[p]->SetName( ssprintf("PercentFrameP%d",p+1) ); SET_XY_AND_ON_COMMAND( m_sprPercentFrame[p] ); this->AddChild( m_sprPercentFrame[p] ); @@ -530,20 +530,20 @@ void ScreenEvaluation::Init() { FOREACH_EnabledPlayer( p ) { - m_sprBonusFrame[p].Load( THEME->GetPathToG(ssprintf("ScreenEvaluation bonus frame p%d",p+1)) ); + m_sprBonusFrame[p].Load( THEME->GetPathG("ScreenEvaluation",ssprintf("bonus frame p%d",p+1)) ); m_sprBonusFrame[p]->SetName( ssprintf("BonusFrameP%d",p+1) ); SET_XY_AND_ON_COMMAND( m_sprBonusFrame[p] ); this->AddChild( m_sprBonusFrame[p] ); for( int r=0; rGetPathToG(ssprintf("ScreenEvaluation bar possible p%d",p+1)) ); + m_sprPossibleBar[p][r].Load( THEME->GetPathG("ScreenEvaluation",ssprintf("bar possible p%d",p+1)) ); m_sprPossibleBar[p][r].SetWidth( m_sprPossibleBar[p][r].GetUnzoomedWidth() * stageStats.m_player[p].radarPossible[r] ); m_sprPossibleBar[p][r].SetName( ssprintf("BarPossible%dP%d",r+1,p+1) ); SET_XY_AND_ON_COMMAND( m_sprPossibleBar[p][r] ); this->AddChild( &m_sprPossibleBar[p][r] ); - m_sprActualBar[p][r].Load( THEME->GetPathToG(ssprintf("ScreenEvaluation bar actual p%d",p+1)) ); + m_sprActualBar[p][r].Load( THEME->GetPathG("ScreenEvaluation",ssprintf("bar actual p%d",p+1)) ); // should be out of the possible bar, not actual (whatever value that is at) m_sprActualBar[p][r].SetWidth( m_sprPossibleBar[p][r].GetUnzoomedWidth() * stageStats.m_player[p].radarActual[r] ); @@ -568,7 +568,7 @@ void ScreenEvaluation::Init() { FOREACH_EnabledPlayer( p ) { - m_sprSurvivedFrame[p].Load( THEME->GetPathToG(ssprintf("ScreenEvaluation survived frame p%d",p+1)) ); + m_sprSurvivedFrame[p].Load( THEME->GetPathG("ScreenEvaluation",ssprintf("survived frame p%d",p+1)) ); m_sprSurvivedFrame[p]->SetName( ssprintf("SurvivedFrameP%d",p+1) ); SET_XY_AND_ON_COMMAND( m_sprSurvivedFrame[p] ); this->AddChild( m_sprSurvivedFrame[p] ); @@ -617,7 +617,7 @@ void ScreenEvaluation::Init() if( SHOW_JUDGMENT(l) ) { - m_sprJudgeLabels[l].Load( THEME->GetPathToG( "ScreenEvaluation judge labels" ) ); + m_sprJudgeLabels[l].Load( THEME->GetPathG("ScreenEvaluation","judge labels") ); m_sprJudgeLabels[l].StopAnimating(); m_sprJudgeLabels[l].SetState( l ); m_sprJudgeLabels[l].SetName( ssprintf("%sLabel",JUDGE_STRING[l]) ); @@ -660,7 +660,7 @@ void ScreenEvaluation::Init() if( !SHOW_STAT(l) ) continue; - m_sprStatsLabel[l].Load( THEME->GetPathToG( ssprintf("ScreenEvaluation label %s", STATS_STRING[l]) ) ); + m_sprStatsLabel[l].Load( THEME->GetPathG("ScreenEvaluation",ssprintf("label %s", STATS_STRING[l])) ); m_sprStatsLabel[l]->StopAnimating(); m_sprStatsLabel[l]->SetName( ssprintf("%sLabel",STATS_STRING[l]) ); SET_XY_AND_ON_COMMAND( m_sprStatsLabel[l] ); @@ -668,7 +668,7 @@ void ScreenEvaluation::Init() FOREACH_EnabledPlayer( p ) { - m_textStatsText[l][p].LoadFromFont( THEME->GetPathToF("ScreenEvaluation stats") ); + m_textStatsText[l][p].LoadFromFont( THEME->GetPathF("ScreenEvaluation","stats") ); m_textStatsText[l][p].SetDiffuse( PlayerToColor(p) ); m_textStatsText[l][p].SetName( ssprintf("%sTextP%d",STATS_STRING[l],p+1) ); SET_XY_AND_ON_COMMAND( m_textStatsText[l][p] ); @@ -691,7 +691,7 @@ void ScreenEvaluation::Init() // if( SHOW_SCORE_AREA ) { - m_sprScoreLabel.Load( THEME->GetPathToG("ScreenEvaluation score label") ); + m_sprScoreLabel.Load( THEME->GetPathG("ScreenEvaluation","score label") ); m_sprScoreLabel->SetName( "ScoreLabel" ); SET_XY_AND_ON_COMMAND( m_sprScoreLabel ); this->AddChild( m_sprScoreLabel ); @@ -710,7 +710,7 @@ void ScreenEvaluation::Init() if( SHOW_TOTAL_SCORE_AREA ) { - m_sprTotalScoreLabel.Load( THEME->GetPathToG("ScreenEvaluation totalscore label") ); + m_sprTotalScoreLabel.Load( THEME->GetPathG("ScreenEvaluation","totalscore label") ); m_sprTotalScoreLabel->SetName( "TotalScoreLabel" ); SET_XY_AND_ON_COMMAND( m_sprTotalScoreLabel ); this->AddChild( m_sprTotalScoreLabel ); @@ -739,7 +739,7 @@ void ScreenEvaluation::Init() // if( SHOW_TIME_AREA ) { - m_sprTimeLabel.Load( THEME->GetPathToG("ScreenEvaluation time label") ); + m_sprTimeLabel.Load( THEME->GetPathG("ScreenEvaluation","time label") ); m_sprTimeLabel->SetName( "TimeLabel" ); SET_XY_AND_ON_COMMAND( m_sprTimeLabel ); this->AddChild( m_sprTimeLabel ); @@ -809,15 +809,15 @@ void ScreenEvaluation::Init() if( PREFSMAN->m_bAllowExtraStage && m_bTryExtraStage ) { - m_sprTryExtraStage.Load( THEME->GetPathToG(GAMESTATE->IsExtraStage()?"ScreenEvaluation try extra2":"ScreenEvaluation try extra1") ); + m_sprTryExtraStage.Load( THEME->GetPathG("ScreenEvaluation",GAMESTATE->IsExtraStage()?"try extra2":"try extra1") ); m_sprTryExtraStage->SetName( "TryExtraStage" ); SET_XY_AND_ON_COMMAND( m_sprTryExtraStage ); this->AddChild( m_sprTryExtraStage ); if( GAMESTATE->IsExtraStage() ) - SOUND->PlayOnce( THEME->GetPathToS("ScreenEvaluation try extra2") ); + SOUND->PlayOnce( THEME->GetPathS("ScreenEvaluation","try extra2") ); else - SOUND->PlayOnce( THEME->GetPathToS("ScreenEvaluation try extra1") ); + SOUND->PlayOnce( THEME->GetPathS("ScreenEvaluation","try extra1") ); } else if( bOneHasNewTopRecord && ANNOUNCER->HasSoundsFor("evaluation new record") ) { @@ -865,7 +865,7 @@ void ScreenEvaluation::Init() this->SortByDrawOrder(); - SOUND->PlayMusic( THEME->GetPathToS("ScreenEvaluation music") ); + SOUND->PlayMusic( THEME->GetPathS("ScreenEvaluation","music") ); m_timerSoundSequences.SetZero(); // zero the sound sequence timer m_timerSoundSequences.Touch(); // set the timer going :] m_fScreenCreateTime = RageTimer::GetTimeSinceStart(); diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp index 4f630bc84d..4069f4af03 100644 --- a/stepmania/src/ScreenEz2SelectMusic.cpp +++ b/stepmania/src/ScreenEz2SelectMusic.cpp @@ -19,6 +19,7 @@ #include "ScreenDimensions.h" #include "PlayerState.h" #include "Command.h" +#include "RageLog.h" #define PREV_SCREEN THEME->GetMetric ("ScreenEz2SelectMusic","PrevScreen") #define SCROLLING_LIST_X THEME->GetMetricF("ScreenEz2SelectMusic","ScrollingListX") @@ -81,7 +82,7 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic( CString sName ) : ScreenWithMenuElem if(PREVIEWMUSICMODE == 4) { - m_soundBackMusic.Load( THEME->GetPathToS("ScreenEz2SelectMusic music")); + m_soundBackMusic.Load( THEME->GetPathS("ScreenEz2SelectMusic","music")); m_soundBackMusic.Play(); } @@ -94,11 +95,11 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic( CString sName ) : ScreenWithMenuElem - m_soundButtonPress.Load( THEME->GetPathToS("ScreenEz2SelectMusic buttonpress")); - m_soundMusicChange.Load( THEME->GetPathToS("ScreenEz2SelectMusic change")); - m_soundMusicCycle.Load( THEME->GetPathToS("ScreenEz2SelectMusic cycle")); + m_soundButtonPress.Load( THEME->GetPathS("ScreenEz2SelectMusic","buttonpress")); + m_soundMusicChange.Load( THEME->GetPathS("ScreenEz2SelectMusic","change")); + m_soundMusicCycle.Load( THEME->GetPathS("ScreenEz2SelectMusic","cycle")); - m_ChoiceListFrame.Load( THEME->GetPathToG("ScreenEz2SelectMusic list frame")); + m_ChoiceListFrame.Load( THEME->GetPathG("ScreenEz2SelectMusic","list frame")); m_ChoiceListFrame.SetXY( SCROLLING_LIST_X, SCROLLING_LIST_Y); this->AddChild( &m_ChoiceListFrame ); @@ -111,15 +112,10 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic( CString sName ) : ScreenWithMenuElem this->AddChild( &m_MusicBannerWheel ); - m_ChoiceListHighlight.Load( THEME->GetPathToG("ScreenEz2SelectMusic list highlight")); + m_ChoiceListHighlight.Load( THEME->GetPathG("ScreenEz2SelectMusic","list highlight")); m_ChoiceListHighlight.SetXY( SCROLLING_LIST_X, SCROLLING_LIST_Y); this->AddChild( &m_ChoiceListHighlight ); - #ifdef DEBUG - m_debugtext.LoadFromFont( THEME->GetPathToF("small titles") ); - m_debugtext.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y ); - this->AddChild(&m_debugtext); - #endif FOREACH_PlayerNumber( p ) { @@ -127,27 +123,27 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic( CString sName ) : ScreenWithMenuElem // m_FootMeter[p].SetShadowLength( 2 ); // this->AddChild( &m_FootMeter[p] ); - m_SpeedIcon[p].Load( THEME->GetPathToG("ScreenEz2SelectMusic speedicon")); + m_SpeedIcon[p].Load( THEME->GetPathG("ScreenEz2SelectMusic","speedicon")); m_SpeedIcon[p].SetXY( SPEEDICON_X(p), SPEEDICON_Y(p) ); m_SpeedIcon[p].SetDiffuse( RageColor(0,0,0,0) ); this->AddChild(&m_SpeedIcon[p] ); - m_MirrorIcon[p].Load( THEME->GetPathToG("ScreenEz2SelectMusic mirroricon")); + m_MirrorIcon[p].Load( THEME->GetPathG("ScreenEz2SelectMusic","mirroricon")); m_MirrorIcon[p].SetXY( MIRRORICON_X(p), MIRRORICON_Y(p) ); m_MirrorIcon[p].SetDiffuse( RageColor(0,0,0,0) ); this->AddChild(&m_MirrorIcon[p] ); - m_ShuffleIcon[p].Load( THEME->GetPathToG("ScreenEz2SelectMusic shuffleicon")); + m_ShuffleIcon[p].Load( THEME->GetPathG("ScreenEz2SelectMusic","shuffleicon")); m_ShuffleIcon[p].SetXY( SHUFFLEICON_X(p), SHUFFLEICON_Y(p) ); m_ShuffleIcon[p].SetDiffuse( RageColor(0,0,0,0) ); this->AddChild(&m_ShuffleIcon[p] ); - m_HiddenIcon[p].Load( THEME->GetPathToG("ScreenEz2SelectMusic hiddenicon")); + m_HiddenIcon[p].Load( THEME->GetPathG("ScreenEz2SelectMusic","hiddenicon")); m_HiddenIcon[p].SetXY( HIDDENICON_X(p), HIDDENICON_Y(p) ); m_HiddenIcon[p].SetDiffuse( RageColor(0,0,0,0) ); this->AddChild(&m_HiddenIcon[p] ); - m_VanishIcon[p].Load( THEME->GetPathToG("ScreenEz2SelectMusic vanishicon")); + m_VanishIcon[p].Load( THEME->GetPathG("ScreenEz2SelectMusic","vanishicon")); m_VanishIcon[p].SetXY( VANISHICON_X(p), VANISHICON_Y(p) ); m_VanishIcon[p].SetDiffuse( RageColor(0,0,0,0) ); this->AddChild(&m_VanishIcon[p] ); @@ -157,42 +153,42 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic( CString sName ) : ScreenWithMenuElem m_iSelection[p] = 0; } - m_Guide.Load( THEME->GetPathToG("ScreenEz2SelectMusic guide")); + m_Guide.Load( THEME->GetPathG("ScreenEz2SelectMusic","guide")); m_Guide.SetXY( GUIDE_X, GUIDE_Y ); this->AddChild( &m_Guide ); - m_InfoFrame.Load( THEME->GetPathToG("ScreenEz2SelectMusic infoframe") ); + m_InfoFrame.Load( THEME->GetPathG("ScreenEz2SelectMusic","infoframe") ); m_InfoFrame.SetXY( INFOFRAME_X, INFOFRAME_Y ); this->AddChild( &m_InfoFrame ); #ifdef _XBOX //shorten filenames for FATX - m_PumpDifficultyCircle.Load( THEME->GetPathToG("ScreenEz2SelectMusic diff frame")); + m_PumpDifficultyCircle.Load( THEME->GetPathG("ScreenEz2SelectMusic","diff frame")); #else - m_PumpDifficultyCircle.Load( THEME->GetPathToG("ScreenEz2SelectMusic difficulty frame")); + m_PumpDifficultyCircle.Load( THEME->GetPathG("ScreenEz2SelectMusic","difficulty frame")); #endif m_PumpDifficultyCircle.SetXY( PUMP_DIFF_X, PUMP_DIFF_Y ); this->AddChild( &m_PumpDifficultyCircle ); - m_PumpDifficultyRating.LoadFromFont( THEME->GetPathToF("ScreenEz2SelectMusic difficulty") ); + m_PumpDifficultyRating.LoadFromFont( THEME->GetPathF("ScreenEz2SelectMusic","difficulty") ); m_PumpDifficultyRating.SetXY( PUMP_DIFF_X, PUMP_DIFF_Y ); this->AddChild(&m_PumpDifficultyRating); - m_CurrentGroup.LoadFromFont( THEME->GetPathToF("ScreenEz2SelectMusic GroupName") ); + m_CurrentGroup.LoadFromFont( THEME->GetPathF("ScreenEz2SelectMusic","GroupName") ); m_CurrentGroup.SetXY( GROUPNAME_X, GROUPNAME_Y ); this->AddChild(&m_CurrentGroup ); - m_CurrentTitle.LoadFromFont( THEME->GetPathToF("ScreenEz2SelectMusic GroupName") ); + m_CurrentTitle.LoadFromFont( THEME->GetPathF("ScreenEz2SelectMusic","GroupName") ); m_CurrentTitle.SetXY( TITLE_X, TITLE_Y ); this->AddChild(&m_CurrentTitle ); - m_CurrentSubTitle.LoadFromFont( THEME->GetPathToF("ScreenEz2SelectMusic GroupName") ); + m_CurrentSubTitle.LoadFromFont( THEME->GetPathF("ScreenEz2SelectMusic","GroupName") ); m_CurrentSubTitle.SetXY( SUBTITLE_X, SUBTITLE_Y ); m_CurrentSubTitle.SetZoom(0.8f); this->AddChild(&m_CurrentTitle ); - m_CurrentArtist.LoadFromFont( THEME->GetPathToF("ScreenEz2SelectMusic GroupName") ); + m_CurrentArtist.LoadFromFont( THEME->GetPathF("ScreenEz2SelectMusic","GroupName") ); m_CurrentArtist.SetXY( ARTIST_X, ARTIST_Y ); this->AddChild(&m_CurrentArtist ); @@ -201,7 +197,7 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic( CString sName ) : ScreenWithMenuElem m_DifficultyRating.SetY(DIFFICULTYRATING_Y); this->AddChild(&m_DifficultyRating); - m_sprOptionsMessage.Load( THEME->GetPathToG("ScreenEz2SelectMusic options message") ); + m_sprOptionsMessage.Load( THEME->GetPathG("ScreenEz2SelectMusic","options message") ); m_sprOptionsMessage.StopAnimating(); m_sprOptionsMessage.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y ); m_sprOptionsMessage.SetZoom( 1 ); @@ -215,11 +211,11 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic( CString sName ) : ScreenWithMenuElem } m_sprBalloon.SetName( "Balloon" ); - TEXTUREMAN->CacheTexture( THEME->GetPathToG("ScreenSelectMusic balloon long") ); - TEXTUREMAN->CacheTexture( THEME->GetPathToG("ScreenSelectMusic balloon marathon") ); + TEXTUREMAN->CacheTexture( THEME->GetPathG("ScreenSelectMusic","balloon long") ); + TEXTUREMAN->CacheTexture( THEME->GetPathG("ScreenSelectMusic","balloon marathon") ); this->AddChild( &m_sprBalloon ); - m_soundOptionsChange.Load( THEME->GetPathToS("ScreenEz2SelectMusic options") ); + m_soundOptionsChange.Load( THEME->GetPathS("ScreenEz2SelectMusic","options") ); m_bGoToOptions = false; m_bMadeChoice = false; @@ -314,9 +310,7 @@ void ScreenEz2SelectMusic::UpdateOptions(PlayerNumber pn, int nosound) { sOptions = GAMESTATE->m_pPlayerState[pn]->m_PlayerOptions.GetString(); - #ifdef DEBUG - m_debugtext.SetText( "DEBUG: " + sOptions ); - #endif + LOG->Trace( "DEBUG: " + sOptions ); asOptions.clear(); split( sOptions, ", ", asOptions, true ); @@ -617,13 +611,13 @@ void ScreenEz2SelectMusic::MusicChanged() if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fMarathonVerSongSeconds ) { m_sprBalloon.StopTweening(); - m_sprBalloon.Load( THEME->GetPathToG("ScreenSelectMusic balloon marathon") ); + m_sprBalloon.Load( THEME->GetPathG("ScreenSelectMusic","balloon marathon") ); SET_XY_AND_ON_COMMAND( m_sprBalloon ); } else if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fLongVerSongSeconds ) { m_sprBalloon.StopTweening(); - m_sprBalloon.Load( THEME->GetPathToG("ScreenSelectMusic balloon long") ); + m_sprBalloon.Load( THEME->GetPathG("ScreenSelectMusic","balloon long") ); SET_XY_AND_ON_COMMAND( m_sprBalloon ); } else diff --git a/stepmania/src/ScreenEz2SelectMusic.h b/stepmania/src/ScreenEz2SelectMusic.h index 73f8d4abe9..42710e29c3 100644 --- a/stepmania/src/ScreenEz2SelectMusic.h +++ b/stepmania/src/ScreenEz2SelectMusic.h @@ -81,10 +81,6 @@ protected: int i_ErrorDetected; - #ifdef DEBUG - BitmapText m_debugtext; - #endif - int iConfirmSelection; }; diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp index 212cd34d23..cc17281608 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.cpp +++ b/stepmania/src/ScreenEz2SelectPlayer.cpp @@ -48,7 +48,7 @@ ScreenEz2SelectPlayer::ScreenEz2SelectPlayer( CString sName ) : ScreenWithMenuEl FOREACH_PlayerNumber( p ) { - m_sprJoinFrame[p].Load( THEME->GetPathToG("ScreenEz2SelectPlayer join frame 1x2") ); + m_sprJoinFrame[p].Load( THEME->GetPathG("ScreenEz2SelectPlayer","join frame 1x2") ); m_sprJoinFrame[p].StopAnimating(); m_sprJoinFrame[p].SetState( p ); m_sprJoinFrame[p].SetXY( JOIN_FRAME_X(p), JOIN_FRAME_Y(p) ); @@ -57,7 +57,7 @@ ScreenEz2SelectPlayer::ScreenEz2SelectPlayer( CString sName ) : ScreenWithMenuEl if( GAMESTATE->m_bSideIsJoined[p] ) m_sprJoinFrame[p].SetZoomY( 0 ); - m_sprJoinMessage[p].Load( THEME->GetPathToG("ScreenEz2SelectPlayer join message 2x2") ); + m_sprJoinMessage[p].Load( THEME->GetPathG("ScreenEz2SelectPlayer","join message 2x2") ); m_sprJoinMessage[p].StopAnimating(); m_sprJoinMessage[p].SetState( p ); m_sprJoinMessage[p].SetXY( JOIN_MESSAGE_X(p), JOIN_MESSAGE_Y(p) ); @@ -79,7 +79,7 @@ ScreenEz2SelectPlayer::ScreenEz2SelectPlayer( CString sName ) : ScreenWithMenuEl SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select player intro") ); - SOUND->PlayMusic( THEME->GetPathToS("ScreenSelectPlayer music") ); + SOUND->PlayMusic( THEME->GetPathS("ScreenSelectPlayer","music") ); TweenOnScreen(); } diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 30cb73823e..b4e9d9dbe0 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -309,15 +309,13 @@ void ScreenGameplay::Init() m_SongFinished.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 ); this->AddChild( &m_SongFinished ); + + bool bBattery = GAMESTATE->m_SongOptions.m_LifeType==SongOptions::LIFE_BATTERY; + // // Add LifeFrame // - CString sLifeFrameName; - if( GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY ) - sLifeFrameName = m_sName+" oni life frame"; - else - sLifeFrameName = m_sName+" life frame"; - m_sprLifeFrame.Load( THEME->GetPathToG(sLifeFrameName) ); + m_sprLifeFrame.Load( THEME->GetPathG(m_sName,bBattery?"oni life frame":"life frame") ); m_sprLifeFrame.SetName( "LifeFrame" ); SET_XY( m_sprLifeFrame ); this->AddChild( &m_sprLifeFrame ); @@ -325,12 +323,7 @@ void ScreenGameplay::Init() // // Add score frame // - CString sScoreFrameName; - if( GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY ) - sScoreFrameName = m_sName+" oni score frame"; - else - sScoreFrameName = m_sName+" score frame"; - m_sprScoreFrame.Load( THEME->GetPathToG(sScoreFrameName) ); + m_sprScoreFrame.Load( THEME->GetPathG(m_sName,bBattery?"oni score frame":"score frame") ); m_sprScoreFrame.SetName( "ScoreFrame" ); SET_XY( m_sprScoreFrame ); this->AddChild( &m_sprScoreFrame ); diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp index ff71a7f0fe..2939f9cd8d 100644 --- a/stepmania/src/ScreenHowToPlay.cpp +++ b/stepmania/src/ScreenHowToPlay.cpp @@ -74,12 +74,12 @@ ScreenHowToPlay::ScreenHowToPlay( CString sName ) : ScreenAttract( sName ) m_pmCharacter = NULL; m_pmDancePad = NULL; - m_In.Load( THEME->GetPathToB("ScreenHowToPlay in") ); + m_In.Load( THEME->GetPathB("ScreenHowToPlay","in") ); m_In.StartTransitioning(); - m_Out.Load( THEME->GetPathToB("ScreenHowToPlay out") ); + m_Out.Load( THEME->GetPathB("ScreenHowToPlay","out") ); - m_Overlay.LoadFromAniDir( THEME->GetPathToB("ScreenHowToPlay overlay") ); + m_Overlay.LoadFromAniDir( THEME->GetPathB("ScreenHowToPlay","overlay") ); m_Overlay.PlayCommand("On"); this->AddChild( &m_Overlay ); diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp index 84cf153326..a34d4b7f0a 100644 --- a/stepmania/src/ScreenJukebox.cpp +++ b/stepmania/src/ScreenJukebox.cpp @@ -178,11 +178,11 @@ void ScreenJukebox::Init() return; } - m_In.Load( THEME->GetPathToB("ScreenDemonstration in") ); + m_In.Load( THEME->GetPathB("ScreenDemonstration","in") ); this->AddChild( &m_In ); m_In.StartTransitioning(); - m_Out.Load( THEME->GetPathToB("ScreenDemonstration out") ); + m_Out.Load( THEME->GetPathB("ScreenDemonstration","out") ); this->AddChild( &m_Out ); ClearMessageQueue(); // remove all of the messages set in ScreenGameplay that animate "ready", "here we go", etc. diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp index 57ca2678c8..6ecd5a495d 100644 --- a/stepmania/src/ScreenMapControllers.cpp +++ b/stepmania/src/ScreenMapControllers.cpp @@ -52,14 +52,14 @@ ScreenMapControllers::ScreenMapControllers( CString sClassName ) : ScreenWithMen CString sName = GAMESTATE->GetCurrentGame()->m_szButtonNames[b]; CString sSecondary = GAMEMAN->GetMenuButtonSecondaryFunction( GAMESTATE->GetCurrentGame(), b ); - m_textName[b].LoadFromFont( THEME->GetPathToF("Common title") ); + m_textName[b].LoadFromFont( THEME->GetPathF("Common","title") ); m_textName[b].SetXY( SCREEN_CENTER_X, -6 ); m_textName[b].SetText( sName ); m_textName[b].SetZoom( 0.7f ); m_textName[b].SetShadowLength( 2 ); m_Line[b].AddChild( &m_textName[b] ); - m_textName2[b].LoadFromFont( THEME->GetPathToF("Common title") ); + m_textName2[b].LoadFromFont( THEME->GetPathF("Common","title") ); m_textName2[b].SetXY( SCREEN_CENTER_X, +6 ); m_textName2[b].SetText( sSecondary ); m_textName2[b].SetZoom( 0.5f ); @@ -70,7 +70,7 @@ ScreenMapControllers::ScreenMapControllers( CString sClassName ) : ScreenWithMen { for( int s=0; sGetPathToF("ScreenMapControllers entry") ); + m_textMappedTo[p][b][s].LoadFromFont( THEME->GetPathF("ScreenMapControllers","entry") ); m_textMappedTo[p][b][s].SetXY( BUTTON_COLUMN_X[p*NUM_GAME_TO_DEVICE_SLOTS+s], 0 ); m_textMappedTo[p][b][s].SetZoom( 0.5f ); m_textMappedTo[p][b][s].SetShadowLength( 0 ); @@ -83,7 +83,7 @@ ScreenMapControllers::ScreenMapControllers( CString sClassName ) : ScreenWithMen m_Line[b].RunCommands( (b%2)? ODD_LINE_IN : EVEN_LINE_IN ); } - m_textError.LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textError.LoadFromFont( THEME->GetPathF("Common","normal") ); m_textError.SetText( "" ); m_textError.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y ); m_textError.SetDiffuse( RageColor(0,1,0,0) ); @@ -97,7 +97,7 @@ ScreenMapControllers::ScreenMapControllers( CString sClassName ) : ScreenWithMen m_iWaitingForPress = 0; - SOUND->PlayMusic( THEME->GetPathToS("ScreenMapControllers music") ); + SOUND->PlayMusic( THEME->GetPathS("ScreenMapControllers","music") ); Refresh(); } diff --git a/stepmania/src/ScreenMiniMenu.cpp b/stepmania/src/ScreenMiniMenu.cpp index d22b8640e1..b1ba60bc4e 100644 --- a/stepmania/src/ScreenMiniMenu.cpp +++ b/stepmania/src/ScreenMiniMenu.cpp @@ -40,13 +40,13 @@ ScreenMiniMenu::ScreenMiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMes ASSERT( m_Def.rows.size() <= MAX_MENU_ROWS ); - m_Background.LoadFromAniDir( THEME->GetPathToB("ScreenMiniMenu background") ); + m_Background.LoadFromAniDir( THEME->GetPathB("ScreenMiniMenu","background") ); m_Background.PlayCommand("On"); this->AddChild( &m_Background ); float fHeightOfAll = min( SCREEN_HEIGHT-80, (m_Def.rows.size()-1)*SPACING_Y ); - m_textTitle.LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textTitle.LoadFromFont( THEME->GetPathF("Common","normal") ); m_textTitle.SetText( m_Def.title ); m_textTitle.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y - fHeightOfAll/2 - 30 ); m_textTitle.SetZoom( 0.8f ); @@ -68,7 +68,7 @@ ScreenMiniMenu::ScreenMiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMes else fY = SCREEN_CENTER_Y; - m_textLabel[i].LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textLabel[i].LoadFromFont( THEME->GetPathF("Common","normal") ); m_textLabel[i].SetText( line.name ); m_textLabel[i].SetY( fY ); m_textLabel[i].SetZoom( ZOOM_NOT_SELECTED ); @@ -76,7 +76,7 @@ ScreenMiniMenu::ScreenMiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMes m_textLabel[i].SetDiffuse( line.enabled ? COLOR_ENABLED : COLOR_DISABLED ); this->AddChild( &m_textLabel[i] ); - m_textAnswer[i].LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textAnswer[i].LoadFromFont( THEME->GetPathF("Common","normal") ); m_textAnswer[i].SetY( fY ); m_textAnswer[i].SetZoom( ZOOM_NOT_SELECTED ); m_textAnswer[i].SetHorizAlign( Actor::align_right ); @@ -124,11 +124,11 @@ ScreenMiniMenu::ScreenMiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMes m_textAnswer[k].SetX( fAnswerX ); } - m_In.Load( THEME->GetPathToB("ScreenMiniMenu in") ); + m_In.Load( THEME->GetPathB("ScreenMiniMenu","in") ); m_In.StartTransitioning(); this->AddChild( &m_In ); - m_Out.Load( THEME->GetPathToB("ScreenMiniMenu out") ); + m_Out.Load( THEME->GetPathB("ScreenMiniMenu","out") ); this->AddChild( &m_Out ); } @@ -222,7 +222,7 @@ void ScreenMiniMenu::BeforeLineChanged() m_textAnswer[m_iCurLine].SetEffectNone(); m_textLabel[m_iCurLine].SetZoom( ZOOM_NOT_SELECTED ); m_textAnswer[m_iCurLine].SetZoom( ZOOM_NOT_SELECTED ); - SOUND->PlayOnce( THEME->GetPathToS("ScreenMiniMenu row") ); + SOUND->PlayOnce( THEME->GetPathS("ScreenMiniMenu","row") ); } void ScreenMiniMenu::AfterLineChanged() @@ -235,7 +235,7 @@ void ScreenMiniMenu::AfterLineChanged() void ScreenMiniMenu::AfterAnswerChanged() { - SOUND->PlayOnce( THEME->GetPathToS("ScreenMiniMenu row") ); + SOUND->PlayOnce( THEME->GetPathS("ScreenMiniMenu","row") ); int iAnswerInRow = m_iCurAnswers[m_iCurLine]; CString sAnswerText = m_Def.rows[m_iCurLine].choices[iAnswerInRow]; m_textAnswer[m_iCurLine].SetText( sAnswerText ); diff --git a/stepmania/src/ScreenMusicScroll.cpp b/stepmania/src/ScreenMusicScroll.cpp index ac493b2d84..9f4b5a5311 100644 --- a/stepmania/src/ScreenMusicScroll.cpp +++ b/stepmania/src/ScreenMusicScroll.cpp @@ -34,7 +34,7 @@ ScreenMusicScroll::ScreenMusicScroll( CString sClassName ) : ScreenAttract( sCla m_textLines.push_back(bt); Song* pSong = arraySongs[i]; - bt->LoadFromFont( THEME->GetPathToF("ScreenMusicScroll titles") ); + bt->LoadFromFont( THEME->GetPathF("ScreenMusicScroll","titles") ); bt->SetText( pSong->GetFullDisplayTitle(), pSong->GetFullTranslitTitle() ); bt->SetDiffuse( SONGMAN->GetSongColor(pSong) ); bt->SetZoom( TEXT_ZOOM ); diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp index 7b9c03e400..9cfaa99a01 100644 --- a/stepmania/src/ScreenNameEntry.cpp +++ b/stepmania/src/ScreenNameEntry.cpp @@ -207,7 +207,7 @@ ScreenNameEntry::ScreenNameEntry( CString sClassName ) : Screen( sClassName ) float ColX = fPlayerX + pStyle->m_ColumnInfo[p][t].fXOffset; - m_textSelectedChars[p][t].LoadFromFont( THEME->GetPathToF("ScreenNameEntry letters") ); + m_textSelectedChars[p][t].LoadFromFont( THEME->GetPathF("ScreenNameEntry","letters") ); m_textSelectedChars[p][t].SetX( ColX ); m_textSelectedChars[p][t].SetY( GRAY_ARROWS_Y ); m_textSelectedChars[p][t].SetDiffuse( g_SelectedCharsColor ); @@ -216,14 +216,14 @@ ScreenNameEntry::ScreenNameEntry( CString sClassName ) : Screen( sClassName ) m_textSelectedChars[p][t].SetText( m_sSelectedName[p].substr(t,1) ); this->AddChild( &m_textSelectedChars[p][t] ); // draw these manually - m_textScrollingChars[p][t].LoadFromFont( THEME->GetPathToF("ScreenNameEntry letters") ); + m_textScrollingChars[p][t].LoadFromFont( THEME->GetPathF("ScreenNameEntry","letters") ); m_textScrollingChars[p][t].SetX( ColX ); m_textScrollingChars[p][t].SetY( GRAY_ARROWS_Y ); m_textScrollingChars[p][t].SetDiffuse( g_ScrollingCharsColor ); //this->AddChild( &m_textScrollingChars[p][t] ); // draw these manually } - m_textCategory[p].LoadFromFont( THEME->GetPathToF("ScreenNameEntry category") ); + m_textCategory[p].LoadFromFont( THEME->GetPathF("ScreenNameEntry","category") ); m_textCategory[p].SetX( fPlayerX ); m_textCategory[p].SetY( CATEGORY_Y ); m_textCategory[p].SetZoom( CATEGORY_ZOOM ); @@ -247,16 +247,16 @@ ScreenNameEntry::ScreenNameEntry( CString sClassName ) : Screen( sClassName ) m_Timer.SetXY( TIMER_X, TIMER_Y ); this->AddChild( &m_Timer ); - m_In.Load( THEME->GetPathToB("ScreenNameEntry in") ); + m_In.Load( THEME->GetPathB("ScreenNameEntry","in") ); m_In.StartTransitioning(); // this->AddChild( &m_In ); // draw and update this manually too - m_Out.Load( THEME->GetPathToB("ScreenNameEntry out") ); + m_Out.Load( THEME->GetPathB("ScreenNameEntry","out") ); // this->AddChild( &m_Out ); // draw and update this manually too - m_soundStep.Load( THEME->GetPathToS("ScreenNameEntry step") ); + m_soundStep.Load( THEME->GetPathS("ScreenNameEntry","step") ); - SOUND->PlayMusic( THEME->GetPathToS("ScreenNameEntry music") ); + SOUND->PlayMusic( THEME->GetPathS("ScreenNameEntry","music") ); m_fFakeBeat = 0; } diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp index 1c64811df3..b3d8f60d7e 100644 --- a/stepmania/src/ScreenNameEntryTraditional.cpp +++ b/stepmania/src/ScreenNameEntryTraditional.cpp @@ -201,7 +201,7 @@ ScreenNameEntryTraditional::ScreenNameEntryTraditional( CString sClassName ) : S } m_sprNameFrame[p].SetName( ssprintf("EntryFrameP%i",p+1) ); - m_sprNameFrame[p].Load( THEME->GetPathToG( ssprintf("ScreenNameEntryTraditional name frame p%i",p+1) ) ); + m_sprNameFrame[p].Load( THEME->GetPathG("ScreenNameEntryTraditional",ssprintf("name frame p%i",p+1)) ); SET_XY_AND_ON_COMMAND( m_sprNameFrame[p] ); this->AddChild( &m_sprNameFrame[p] ); @@ -210,7 +210,7 @@ ScreenNameEntryTraditional::ScreenNameEntryTraditional( CString sClassName ) : S this->AddChild( &m_Keyboard[p] ); /* Add letters to m_Keyboard. */ - const CString fontpath = THEME->GetPathToF("ScreenNameEntryTraditional letters"); + const CString fontpath = THEME->GetPathF("ScreenNameEntryTraditional","letters"); const wstring Chars = CStringToWstring(KEYBOARD_LETTERS); for( unsigned ch = 0; ch < Chars.size(); ++ch ) { @@ -256,11 +256,11 @@ ScreenNameEntryTraditional::ScreenNameEntryTraditional( CString sClassName ) : S } m_sprCursor[p].SetName( ssprintf("CursorP%i",p+1) ); - m_sprCursor[p].Load( THEME->GetPathToG( ssprintf("ScreenNameEntryTraditional cursor p%i",p+1) ) ); + m_sprCursor[p].Load( THEME->GetPathG("ScreenNameEntryTraditional",ssprintf("cursor p%i",p+1)) ); m_Keyboard[p].AddChild( &m_sprCursor[p] ); m_textSelection[p].SetName( ssprintf("SelectionP%i",p+1) ); - m_textSelection[p].LoadFromFont( THEME->GetPathToF("ScreenNameEntryTraditional entry") ); + m_textSelection[p].LoadFromFont( THEME->GetPathF("ScreenNameEntryTraditional","entry") ); SET_XY_AND_ON_COMMAND( m_textSelection[p] ); this->AddChild( &m_textSelection[p] ); @@ -366,14 +366,14 @@ ScreenNameEntryTraditional::ScreenNameEntryTraditional( CString sClassName ) : S if( grade != GRADE_NO_DATA ) { display.m_Grade.SetName( ssprintf("GradeP%i",p+1) ); - display.m_Grade.Load( THEME->GetPathToG("ScreenNameEntryTraditional grades") ); + display.m_Grade.Load( THEME->GetPathG("ScreenNameEntryTraditional","grades") ); display.m_Grade.SetGrade( p, grade ); SET_ON( display.m_Grade ); this->AddChild( &display.m_Grade ); } display.m_Difficulty.SetName( ssprintf("DifficultyP%i",p+1) ); - display.m_Difficulty.Load( THEME->GetPathToG("ScreenNameEntryTraditional difficulty icons") ); + display.m_Difficulty.Load( THEME->GetPathG("ScreenNameEntryTraditional","difficulty icons") ); if( GAMESTATE->IsCourseMode() ) display.m_Difficulty.SetFromTrail( p, pTrail ); else @@ -399,7 +399,7 @@ ScreenNameEntryTraditional::ScreenNameEntryTraditional( CString sClassName ) : S /* We always show the banner frame (if any), because fading from a graphic to * itself is ugly. */ display.m_sprBannerFrame.SetName( ssprintf("BannerFrameP%i",p+1) ); - display.m_sprBannerFrame.Load( THEME->GetPathToG(ssprintf("ScreenNameEntryTraditional banner frame p%i",p+1)) ); + display.m_sprBannerFrame.Load( THEME->GetPathG("ScreenNameEntryTraditional",ssprintf("banner frame p%i",p+1)) ); SET_XY_AND_ON_COMMAND( display.m_sprBannerFrame ); this->AddChild( &display.m_sprBannerFrame ); } @@ -408,11 +408,11 @@ ScreenNameEntryTraditional::ScreenNameEntryTraditional( CString sClassName ) : S this->PostScreenMessage( SM_ChangeDisplayedFeat, FEAT_INTERVAL ); - m_soundKey.Load( THEME->GetPathToS("ScreenNameEntryTraditional key") ); - m_soundChange.Load( THEME->GetPathToS("ScreenNameEntryTraditional change",true) ); - m_soundInvalid.Load( THEME->GetPathToS("ScreenNameEntryTraditional invalid",true) ); + m_soundKey.Load( THEME->GetPathS("ScreenNameEntryTraditional","key") ); + m_soundChange.Load( THEME->GetPathS("ScreenNameEntryTraditional","change",true) ); + m_soundInvalid.Load( THEME->GetPathS("ScreenNameEntryTraditional","invalid",true) ); - SOUND->PlayMusic( THEME->GetPathToS("ScreenNameEntryTraditional music") ); + SOUND->PlayMusic( THEME->GetPathS("ScreenNameEntryTraditional","music") ); this->SortByDrawOrder(); } diff --git a/stepmania/src/ScreenNetRoom.cpp b/stepmania/src/ScreenNetRoom.cpp index 39d0658265..26584ea5ac 100644 --- a/stepmania/src/ScreenNetRoom.cpp +++ b/stepmania/src/ScreenNetRoom.cpp @@ -29,7 +29,7 @@ REGISTER_SCREEN_CLASS( ScreenNetRoom ); ScreenNetRoom::ScreenNetRoom( const CString& sName ) : ScreenNetSelectBase( sName ) { GAMESTATE->FinishStage(); - m_soundChangeSel.Load( THEME->GetPathToS("ScreenNetRoom change sel")); + m_soundChangeSel.Load( THEME->GetPathS("ScreenNetRoom","change sel")); m_iRoomPlace = 0; m_SelectMode = SelectRooms; diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp index 1e5c222005..4a2c3ea168 100644 --- a/stepmania/src/ScreenNetSelectMusic.cpp +++ b/stepmania/src/ScreenNetSelectMusic.cpp @@ -87,8 +87,8 @@ ScreenNetSelectMusic::ScreenNetSelectMusic( const CString& sName ) : ScreenNetSe } //Load SFX next - m_soundChangeOpt.Load( THEME->GetPathToS( m_sName + " change opt" ) ); - m_soundChangeSel.Load( THEME->GetPathToS( m_sName + " change sel" ) ); + m_soundChangeOpt.Load( THEME->GetPathS(m_sName,"change opt") ); + m_soundChangeSel.Load( THEME->GetPathS(m_sName,"change sel") ); NSMAN->ReportNSSOnOff(1); NSMAN->ReportPlayerOptions(); diff --git a/stepmania/src/ScreenNetworkOptions.cpp b/stepmania/src/ScreenNetworkOptions.cpp index 5a692641a5..802e1f05a7 100644 --- a/stepmania/src/ScreenNetworkOptions.cpp +++ b/stepmania/src/ScreenNetworkOptions.cpp @@ -56,7 +56,7 @@ ScreenNetworkOptions::ScreenNetworkOptions( CString sClassName ) : ScreenOptions g_NetworkOptionsLines, NUM_NETWORK_OPTIONS_LINES ); - SOUND->PlayMusic( THEME->GetPathToS("ScreenMachineOptions music") ); + SOUND->PlayMusic( THEME->GetPathS("ScreenMachineOptions","music") ); } diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 54e2d6bf97..e3a6ab8b45 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -105,11 +105,11 @@ ScreenOptions::ScreenOptions( CString sClassName ) : ScreenWithMenuElements(sCla m_OptionsNavigation = PREFSMAN->m_bArcadeOptionsNavigation? NAV_THREE_KEY:NAV_FIVE_KEY; - m_SoundChangeCol.Load( THEME->GetPathToS("ScreenOptions change"), true ); - m_SoundNextRow.Load( THEME->GetPathToS("ScreenOptions next"), true ); - m_SoundPrevRow.Load( THEME->GetPathToS("ScreenOptions prev"), true ); - m_SoundToggleOn.Load( THEME->GetPathToS("ScreenOptions toggle on") ); - m_SoundToggleOff.Load( THEME->GetPathToS("ScreenOptions toggle off") ); + m_SoundChangeCol.Load( THEME->GetPathS("ScreenOptions","change"), true ); + m_SoundNextRow.Load( THEME->GetPathS("ScreenOptions","next"), true ); + m_SoundPrevRow.Load( THEME->GetPathS("ScreenOptions","prev"), true ); + m_SoundToggleOn.Load( THEME->GetPathS("ScreenOptions","toggle on") ); + m_SoundToggleOff.Load( THEME->GetPathS("ScreenOptions","toggle off") ); // add everything to m_framePage so we can animate everything at once this->AddChild( &m_framePage ); @@ -214,7 +214,7 @@ void ScreenOptions::InitMenu( InputMode im, OptionRowData OptionRows[], int iNum } } - m_sprPage.Load( THEME->GetPathToG(m_sName+" page") ); + m_sprPage.Load( THEME->GetPathG(m_sName,"page") ); m_sprPage->SetName( "Page" ); SET_XY_AND_ON_COMMAND( m_sprPage ); m_framePage.AddChild( m_sprPage ); @@ -222,7 +222,7 @@ void ScreenOptions::InitMenu( InputMode im, OptionRowData OptionRows[], int iNum // init line highlights FOREACH_HumanPlayer( p ) { - m_sprLineHighlight[p].Load( THEME->GetPathToG("ScreenOptions line highlight") ); + m_sprLineHighlight[p].Load( THEME->GetPathG("ScreenOptions","line highlight") ); m_sprLineHighlight[p].SetName( "LineHighlight" ); m_sprLineHighlight[p].SetX( SCREEN_CENTER_X ); m_framePage.AddChild( &m_sprLineHighlight[p] ); @@ -265,7 +265,7 @@ void ScreenOptions::InitMenu( InputMode im, OptionRowData OptionRows[], int iNum // init text BitmapText *bt = new BitmapText; textItems.push_back( bt ); - bt->LoadFromFont( THEME->GetPathToF("ScreenOptions item") ); + bt->LoadFromFont( THEME->GetPathF("ScreenOptions","item") ); CString sText = optline.choices[c]; if( CAPITALIZE_ALL_OPTION_NAMES ) sText.MakeUpper(); @@ -317,7 +317,7 @@ void ScreenOptions::InitMenu( InputMode im, OptionRowData OptionRows[], int iNum const int iChoiceInRowWithFocus = row.m_iChoiceInRowWithFocus[p]; - bt->LoadFromFont( THEME->GetPathToF("ScreenOptions item") ); + bt->LoadFromFont( THEME->GetPathF("ScreenOptions","item") ); bt->SetText( optline.choices[iChoiceInRowWithFocus] ); bt->SetZoom( ITEMS_ZOOM ); bt->SetShadowLength( 0 ); @@ -365,7 +365,7 @@ void ScreenOptions::InitMenu( InputMode im, OptionRowData OptionRows[], int iNum BitmapText *bt = new BitmapText; row.m_textItems.push_back( bt ); - bt->LoadFromFont( THEME->GetPathToF("ScreenOptions item") ); + bt->LoadFromFont( THEME->GetPathF("ScreenOptions","item") ); bt->SetText( THEME->GetMetric("OptionNames","Exit") ); bt->SetZoom( ITEMS_ZOOM ); bt->SetShadowLength( 0 ); @@ -378,7 +378,7 @@ void ScreenOptions::InitMenu( InputMode im, OptionRowData OptionRows[], int iNum // add explanation here so it appears on top FOREACH_PlayerNumber( p ) { - m_textExplanation[p].LoadFromFont( THEME->GetPathToF("ScreenOptions explanation") ); + m_textExplanation[p].LoadFromFont( THEME->GetPathF("ScreenOptions","explanation") ); m_textExplanation[p].SetZoom( EXPLANATION_ZOOM ); m_textExplanation[p].SetShadowLength( 0 ); m_framePage.AddChild( &m_textExplanation[p] ); @@ -390,7 +390,7 @@ void ScreenOptions::InitMenu( InputMode im, OptionRowData OptionRows[], int iNum { FOREACH_HumanPlayer( p ) { - m_textPlayerName[p].LoadFromFont( THEME->GetPathToF( "ScreenOptions player") ); + m_textPlayerName[p].LoadFromFont( THEME->GetPathF("ScreenOptions","player") ); m_textPlayerName[p].SetName( ssprintf("PlayerNameP%i",p+1) ); m_textPlayerName[p].SetText( GAMESTATE->GetPlayerDisplayName(p) ); SET_XY_AND_ON_COMMAND( m_textPlayerName[p] ); @@ -410,7 +410,7 @@ void ScreenOptions::InitMenu( InputMode im, OptionRowData OptionRows[], int iNum m_framePage.AddChild( &m_ScrollBar ); } - m_sprMore.Load( THEME->GetPathToG( "ScreenOptions more") ); + m_sprMore.Load( THEME->GetPathG( "ScreenOptions","more") ); m_sprMore->SetName( "ScreenOptions", "More" ); SET_XY_AND_ON_COMMAND( m_sprMore ); COMMAND( m_sprMore, m_bMoreShown? "ShowMore":"HideMore" ); diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp index 1b6fc45856..a53ed17d33 100644 --- a/stepmania/src/ScreenOptionsMaster.cpp +++ b/stepmania/src/ScreenOptionsMaster.cpp @@ -292,7 +292,7 @@ ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ): /* If this file doesn't exist, leave the music alone (eg. ScreenPlayerOptions music sample * left over from ScreenSelectMusic). If you really want to play no music, add a redir * to _silent. */ - CString MusicPath = THEME->GetPathToS( ssprintf("%s music", m_sName.c_str()), true ); + CString MusicPath = THEME->GetPathS( m_sName, "music", true ); if( MusicPath != "" ) SOUND->PlayMusic( MusicPath ); diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index 35642d27a7..44a1a63f7c 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -29,12 +29,14 @@ ScreenPlayerOptions::ScreenPlayerOptions( CString sClassName ) : /* If we're going to "press start for more options" or skipping options * entirely, we need a different fade out. XXX: this is a hack */ if( PREFSMAN->m_ShowSongOptions == PrefsManager::NO || GAMESTATE->m_bEditing ) - m_Out.Load( THEME->GetPathToB("ScreenPlayerOptions direct out") ); /* direct to stage */ + { + m_Out.Load( THEME->GetPathB("ScreenPlayerOptions","direct out") ); /* direct to stage */ + } else if( m_bAskOptionsMessage ) { - m_Out.Load( THEME->GetPathToB("ScreenPlayerOptions option out") ); /* optional song options */ + m_Out.Load( THEME->GetPathB("ScreenPlayerOptions","option out") ); /* optional song options */ - m_sprOptionsMessage.Load( THEME->GetPathToG("ScreenPlayerOptions options") ); + m_sprOptionsMessage.Load( THEME->GetPathG("ScreenPlayerOptions","options") ); m_sprOptionsMessage.StopAnimating(); m_sprOptionsMessage.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y ); m_sprOptionsMessage.SetZoom( 1 ); diff --git a/stepmania/src/ScreenProfileOptions.cpp b/stepmania/src/ScreenProfileOptions.cpp index 0a1290d489..1c11e2eddd 100644 --- a/stepmania/src/ScreenProfileOptions.cpp +++ b/stepmania/src/ScreenProfileOptions.cpp @@ -72,7 +72,7 @@ ScreenProfileOptions::ScreenProfileOptions( CString sClassName ) : ScreenOptions g_ProfileOptionsLines, NUM_PROFILE_OPTIONS_LINES ); - SOUND->PlayMusic( THEME->GetPathToS("ScreenMachineOptions music") ); + SOUND->PlayMusic( THEME->GetPathS("ScreenMachineOptions","music") ); } void ScreenProfileOptions::ImportOptions() diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp index 7eca6a67a3..755e35f956 100644 --- a/stepmania/src/ScreenRanking.cpp +++ b/stepmania/src/ScreenRanking.cpp @@ -101,19 +101,19 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName ) this->AddChild( &m_sprBannerFrame ); m_textCategory.SetName( "Category" ); - m_textCategory.LoadFromFont( THEME->GetPathToF("ScreenRanking category") ); + m_textCategory.LoadFromFont( THEME->GetPathF("ScreenRanking","category") ); m_textCategory.SetShadowLength( 0 ); m_textCategory.SetHidden( true ); this->AddChild( &m_textCategory ); m_textCourseTitle.SetName( "CourseTitle" ); - m_textCourseTitle.LoadFromFont( THEME->GetPathToF("ScreenRanking course title") ); + m_textCourseTitle.LoadFromFont( THEME->GetPathF("ScreenRanking","course title") ); m_textCourseTitle.SetShadowLength( 0 ); m_textCourseTitle.SetHidden( true ); this->AddChild( &m_textCourseTitle ); m_textStepsType.SetName( "StepsType" ); - m_textStepsType.LoadFromFont( THEME->GetPathToF("ScreenRanking steps type") ); + m_textStepsType.LoadFromFont( THEME->GetPathF("ScreenRanking","steps type") ); m_textStepsType.SetShadowLength( 0 ); m_textStepsType.SetHidden( true ); this->AddChild( &m_textStepsType ); @@ -122,29 +122,29 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName ) for( int l=0; lGetPathToG( ssprintf("ScreenRanking bullets 1x%d",NUM_RANKING_LINES) ) ); + m_sprBullets[l].Load( THEME->GetPathG( "ScreenRanking", ssprintf("bullets 1x%d",NUM_RANKING_LINES) ) ); m_sprBullets[l].SetState( l ); m_sprBullets[l].StopAnimating(); m_sprBullets[l].SetHidden( true ); this->AddChild( &m_sprBullets[l] ); m_textNames[l].SetName( ssprintf("Name%d",l+1) ); - m_textNames[l].LoadFromFont( THEME->GetPathToF("ScreenRanking name") ); + m_textNames[l].LoadFromFont( THEME->GetPathF("ScreenRanking","name") ); m_textNames[l].SetHidden( true ); this->AddChild( &m_textNames[l] ); m_textScores[l].SetName( ssprintf("Score%d",l+1) ); - m_textScores[l].LoadFromFont( THEME->GetPathToF("ScreenRanking score") ); + m_textScores[l].LoadFromFont( THEME->GetPathF("ScreenRanking","score") ); m_textScores[l].SetHidden( true ); this->AddChild( &m_textScores[l] ); m_textPoints[l].SetName( ssprintf("Points%d",l+1) ); - m_textPoints[l].LoadFromFont( THEME->GetPathToF("ScreenRanking points") ); + m_textPoints[l].LoadFromFont( THEME->GetPathF("ScreenRanking","points") ); m_textPoints[l].SetHidden( true ); this->AddChild( &m_textPoints[l] ); m_textTime[l].SetName( ssprintf("Time%d",l+1) ); - m_textTime[l].LoadFromFont( THEME->GetPathToF("ScreenRanking time") ); + m_textTime[l].LoadFromFont( THEME->GetPathF("ScreenRanking","time") ); m_textTime[l].SetHidden( true ); this->AddChild( &m_textTime[l] ); @@ -192,18 +192,18 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName ) pStepsScoreRowItem->m_sprSongFrame.SetName( "SongFrame" ); pStepsScoreRowItem->m_sprSongFrame.SetHidden( true ); - pStepsScoreRowItem->m_sprSongFrame.Load( THEME->GetPathToG("ScreenRanking song frame") ); + pStepsScoreRowItem->m_sprSongFrame.Load( THEME->GetPathG("ScreenRanking","song frame") ); pStepsScoreRowItem->AddChild( &pStepsScoreRowItem->m_sprSongFrame ); pStepsScoreRowItem->m_textSongTitle.SetName( "SongTitle" ); pStepsScoreRowItem->m_textSongTitle.SetHidden( true ); - pStepsScoreRowItem->m_textSongTitle.LoadFromFont( THEME->GetPathToF("ScreenRanking song title") ); + pStepsScoreRowItem->m_textSongTitle.LoadFromFont( THEME->GetPathF("ScreenRanking","song title") ); pStepsScoreRowItem->AddChild( &pStepsScoreRowItem->m_textSongTitle ); for( int d=0; dm_textStepsScore[d].SetName( "StepsScore" ); - pStepsScoreRowItem->m_textStepsScore[d].LoadFromFont( THEME->GetPathToF("ScreenRanking steps score") ); + pStepsScoreRowItem->m_textStepsScore[d].LoadFromFont( THEME->GetPathF("ScreenRanking","steps score") ); pStepsScoreRowItem->m_textStepsScore[d].SetHidden( true ); pStepsScoreRowItem->AddChild( &pStepsScoreRowItem->m_textStepsScore[d] ); } @@ -240,18 +240,18 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName ) pCourseScoreRowItem->m_sprSongFrame.SetName( "CourseListFrame" ); pCourseScoreRowItem->m_sprSongFrame.SetHidden( true ); - pCourseScoreRowItem->m_sprSongFrame.Load( THEME->GetPathToG("ScreenRanking course frame") ); + pCourseScoreRowItem->m_sprSongFrame.Load( THEME->GetPathG("ScreenRanking","course frame") ); pCourseScoreRowItem->AddChild( &pCourseScoreRowItem->m_sprSongFrame ); pCourseScoreRowItem->m_textSongTitle.SetName( "CourseListTitle" ); pCourseScoreRowItem->m_textSongTitle.SetHidden( true ); - pCourseScoreRowItem->m_textSongTitle.LoadFromFont( THEME->GetPathToF("ScreenRanking course list title") ); + pCourseScoreRowItem->m_textSongTitle.LoadFromFont( THEME->GetPathF("ScreenRanking","course list title") ); pCourseScoreRowItem->AddChild( &pCourseScoreRowItem->m_textSongTitle ); FOREACH_ShownCourseDifficulty(d) { pCourseScoreRowItem->m_textStepsScore[d].SetName( "CourseListScore" ); - pCourseScoreRowItem->m_textStepsScore[d].LoadFromFont( THEME->GetPathToF("ScreenRanking course list score") ); + pCourseScoreRowItem->m_textStepsScore[d].LoadFromFont( THEME->GetPathF("ScreenRanking","course list score") ); pCourseScoreRowItem->m_textStepsScore[d].SetHidden( true ); pCourseScoreRowItem->AddChild( &pCourseScoreRowItem->m_textStepsScore[d] ); } diff --git a/stepmania/src/ScreenSMOnlineLogin.cpp b/stepmania/src/ScreenSMOnlineLogin.cpp index abac755a54..f5bd2c38df 100644 --- a/stepmania/src/ScreenSMOnlineLogin.cpp +++ b/stepmania/src/ScreenSMOnlineLogin.cpp @@ -31,13 +31,15 @@ OptionRowData g_ProfileLine[1] = { g_ProfileLine[0].choices.clear(); PROFILEMAN->GetLocalProfileNames( g_ProfileLine[0].choices ); - if(!g_ProfileLine[0].choices.size()) { + if(!g_ProfileLine[0].choices.size()) + { SCREENMAN->SystemMessage("You Must Define A Profile!"); SCREENMAN->SetNewScreen("ScreenProfileOptions"); } - else { + else + { InitMenu(INPUTMODE_SHARE_CURSOR, g_ProfileLine, 1); - SOUND->PlayMusic( THEME->GetPathToS("ScreenMachineOptions music")); + SOUND->PlayMusic( THEME->GetPathS("ScreenMachineOptions","music")); Row &row = *m_Rows.back(); BitmapText *bt = row.m_textItems.back(); bt->SetText("Login"); //Change "Exit" Text diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp index 3400a61a17..3b52be2bb5 100644 --- a/stepmania/src/ScreenSelect.cpp +++ b/stepmania/src/ScreenSelect.cpp @@ -98,7 +98,7 @@ void ScreenSelect::Update( float fDelta ) { /* Don't play sounds during the ctor, since derived classes havn't loaded yet. */ SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(m_sName+" intro") ); - SOUND->PlayMusic( THEME->GetPathToS(m_sName+" music") ); + SOUND->PlayMusic( THEME->GetPathS(m_sName,"music") ); } if( !IsTransitioning() ) diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp index f189b88035..3fc62641f1 100644 --- a/stepmania/src/ScreenSelectCharacter.cpp +++ b/stepmania/src/ScreenSelectCharacter.cpp @@ -87,12 +87,9 @@ ScreenSelectCharacter::ScreenSelectCharacter( CString sClassName ) : ScreenWithM } - FOREACH_PlayerNumber( p ) + FOREACH_EnabledPlayer( p ) { - if( !GAMESTATE->IsPlayerEnabled(p) ) - continue; - - m_sprTitle[p].Load( THEME->GetPathToG("ScreenSelectCharacter title 2x2") ); + m_sprTitle[p].Load( THEME->GetPathG("ScreenSelectCharacter","title 2x2") ); m_sprTitle[p].SetState( GAMESTATE->IsHumanPlayer(p) ? p : 2+p ); m_sprTitle[p].StopAnimating(); m_sprTitle[p].RunCommands( TITLE_ON_COMMAND(p) ); @@ -102,7 +99,7 @@ ScreenSelectCharacter::ScreenSelectCharacter( CString sClassName ) : ScreenWithM m_sprCard[p].RunCommands( CARD_ON_COMMAND(p) ); this->AddChild( &m_sprCard[p] ); - m_sprCardArrows[p].Load( THEME->GetPathToG("ScreenSelectCharacter card arrows") ); + m_sprCardArrows[p].Load( THEME->GetPathG("ScreenSelectCharacter","card arrows") ); m_sprCardArrows[p].RunCommands( CARD_ARROWS_ON_COMMAND(p) ); this->AddChild( &m_sprCardArrows[p] ); @@ -114,7 +111,7 @@ ScreenSelectCharacter::ScreenSelectCharacter( CString sClassName ) : ScreenWithM if(GAMESTATE->m_PlayMode == PLAY_MODE_BATTLE || GAMESTATE->m_PlayMode == PLAY_MODE_RAVE) { - m_sprAttackFrame[p].Load( THEME->GetPathToG("ScreenSelectCharacter attack frame 1x2") ); + m_sprAttackFrame[p].Load( THEME->GetPathG("ScreenSelectCharacter","attack frame 1x2") ); m_sprAttackFrame[p].StopAnimating(); m_sprAttackFrame[p].SetState( p ); m_sprAttackFrame[p].RunCommands( ATTACK_FRAME_ON_COMMAND(p) ); @@ -132,16 +129,16 @@ ScreenSelectCharacter::ScreenSelectCharacter( CString sClassName ) : ScreenWithM } } - m_sprExplanation.Load( THEME->GetPathToG("ScreenSelectCharacter explanation") ); + m_sprExplanation.Load( THEME->GetPathG("ScreenSelectCharacter","explanation") ); m_sprExplanation.RunCommands( EXPLANATION_ON_COMMAND ); this->AddChild( &m_sprExplanation ); - m_soundChange.Load( THEME->GetPathToS("ScreenSelectCharacter change") ); + m_soundChange.Load( THEME->GetPathS("ScreenSelectCharacter","change") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select group intro") ); - SOUND->PlayMusic( THEME->GetPathToS("ScreenSelectCharacter music") ); + SOUND->PlayMusic( THEME->GetPathS("ScreenSelectCharacter","music") ); FOREACH_PlayerNumber( p ) { diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp index 1724cdad2d..11adb0c672 100644 --- a/stepmania/src/ScreenSelectDifficulty.cpp +++ b/stepmania/src/ScreenSelectDifficulty.cpp @@ -52,24 +52,21 @@ ScreenSelectDifficulty::ScreenSelectDifficulty( CString sClassName ) : ScreenSel { for( unsigned choice=0; choiceGetPathToG(sPictureFile) ); + m_sprPicture[page][choice].Load( THEME->GetPathG(m_sName,ssprintf("picture%d",c+1)) ); m_framePages.AddChild( &m_sprPicture[page][choice] ); m_sprInfo[page][choice].SetName( ssprintf("InfoPage%dChoice%d",page+1,choice+1) ); - m_sprInfo[page][choice].Load( THEME->GetPathToG(sInfoFile) ); + m_sprInfo[page][choice].Load( THEME->GetPathG(m_sName,ssprintf("info%d",c+1)) ); m_framePages.AddChild( &m_sprInfo[page][choice] ); } m_sprMore[page].SetName( ssprintf("MorePage%d",page+1) ); - m_sprMore[page].Load( THEME->GetPathToG( ssprintf("%s more page%d", m_sName.c_str(),page+1) ) ); + m_sprMore[page].Load( THEME->GetPathG(m_sName,ssprintf("more page%d",page+1)) ); m_framePages.AddChild( &m_sprMore[page] ); m_sprExplanation[page].SetName( ssprintf("ExplanationPage%d",page+1) ); - m_sprExplanation[page].Load( THEME->GetPathToG( m_sName + " explanation") ); + m_sprExplanation[page].Load( THEME->GetPathG(m_sName,"explanation") ); m_sprExplanation[page].StopAnimating(); m_sprExplanation[page].SetState( page ); m_framePages.AddChild( &m_sprExplanation[page] ); @@ -85,20 +82,20 @@ ScreenSelectDifficulty::ScreenSelectDifficulty( CString sClassName ) : ScreenSel continue; m_sprShadow[p].SetName( "Shadow" ); - m_sprShadow[p].Load( THEME->GetPathToG( m_sName + " shadow 2x1") ); + m_sprShadow[p].Load( THEME->GetPathG(m_sName,"shadow 2x1") ); m_sprShadow[p].StopAnimating(); m_sprShadow[p].SetState( p ); m_sprShadow[p].SetDiffuse( RageColor(0,0,0,0.6f) ); m_framePages.AddChild( &m_sprShadow[p] ); m_sprCursor[p].SetName( "Cursor" ); - m_sprCursor[p].Load( THEME->GetPathToG( m_sName + " cursor 2x1") ); + m_sprCursor[p].Load( THEME->GetPathG(m_sName,"cursor 2x1") ); m_sprCursor[p].StopAnimating(); m_sprCursor[p].SetState( p ); m_framePages.AddChild( &m_sprCursor[p] ); m_sprOK[p].SetName( "OK" ); - m_sprOK[p].Load( THEME->GetPathToG( m_sName + " ok 2x1") ); + m_sprOK[p].Load( THEME->GetPathG(m_sName,"ok 2x1") ); m_sprOK[p].SetState( p ); m_sprOK[p].StopAnimating(); m_sprOK[p].SetDiffuse( RageColor(1,1,1,0) ); @@ -107,7 +104,7 @@ ScreenSelectDifficulty::ScreenSelectDifficulty( CString sClassName ) : ScreenSel this->AddChild( &m_framePages ); - m_soundChange.Load( THEME->GetPathToS( m_sName + " change"), true ); + m_soundChange.Load( THEME->GetPathS(m_sName,"change"), true ); m_soundDifficult.Load( ANNOUNCER->GetPathTo("select difficulty challenge") ); m_fLockInputTime = LOCK_INPUT_SECONDS; diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp index 467626ff0a..49240c8cbd 100644 --- a/stepmania/src/ScreenSelectGroup.cpp +++ b/stepmania/src/ScreenSelectGroup.cpp @@ -91,7 +91,7 @@ ScreenSelectGroup::ScreenSelectGroup( CString sClassName ) : ScreenWithMenuEleme m_bChosen = false; m_sprExplanation.SetName( "Explanation" ); - m_sprExplanation.Load( THEME->GetPathToG("ScreenSelectGroup explanation") ); + m_sprExplanation.Load( THEME->GetPathG("ScreenSelectGroup","explanation") ); this->AddChild( &m_sprExplanation ); // these guys get loaded SetSong and TweenToSong @@ -100,7 +100,7 @@ ScreenSelectGroup::ScreenSelectGroup( CString sClassName ) : ScreenWithMenuEleme this->AddChild( &m_Banner ); m_sprFrame.SetName( "Frame" ); - m_sprFrame.Load( THEME->GetPathToG("ScreenSelectGroup frame") ); + m_sprFrame.Load( THEME->GetPathG("ScreenSelectGroup","frame") ); this->AddChild( &m_sprFrame ); m_textNumber.SetName( "Number" ); @@ -108,7 +108,7 @@ ScreenSelectGroup::ScreenSelectGroup( CString sClassName ) : ScreenWithMenuEleme this->AddChild( &m_textNumber ); m_sprContents.SetName( "Contents" ); - m_sprContents.Load( THEME->GetPathToG("ScreenSelectGroup contents") ); + m_sprContents.Load( THEME->GetPathG("ScreenSelectGroup","contents") ); this->AddChild( &m_sprContents ); m_MusicList.SetName( "MusicList" ); @@ -119,11 +119,11 @@ ScreenSelectGroup::ScreenSelectGroup( CString sClassName ) : ScreenWithMenuEleme this->AddChild( &m_GroupList ); - m_soundChange.Load( THEME->GetPathToS("ScreenSelectGroup change") ); + m_soundChange.Load( THEME->GetPathS("ScreenSelectGroup","change") ); SOUND->PlayOnceFromAnnouncer( "select group intro" ); - SOUND->PlayMusic( THEME->GetPathToS("ScreenSelectGroup music") ); + SOUND->PlayMusic( THEME->GetPathS("ScreenSelectGroup","music") ); AfterChange(); TweenOnScreen(); diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp index d007ba09d0..5fb73819cb 100644 --- a/stepmania/src/ScreenSelectMaster.cpp +++ b/stepmania/src/ScreenSelectMaster.cpp @@ -69,8 +69,7 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl { for( int i=0; iGetPathToG(sFName) ); + m_sprCursor[i][0].Load( THEME->GetPathG(m_sName,ssprintf("Cursor Part%d",i+1)) ); m_sprCursor[i][0]->SetName( ssprintf("CursorPart%d",i+1) ); this->AddChild( m_sprCursor[i][0] ); } @@ -81,8 +80,7 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl { FOREACH_HumanPlayer( p ) { - CString sFName = ssprintf("%s Cursor Part%d P%d", m_sName.c_str(),i+1,p+1); - m_sprCursor[i][p].Load( THEME->GetPathToG(sFName) ); + m_sprCursor[i][p].Load( THEME->GetPathG(m_sName,ssprintf("Cursor Part%d P%d",i+1,p+1)) ); m_sprCursor[i][p]->SetName( ssprintf("CursorPart%dP%d",i+1,p+1) ); this->AddChild( m_sprCursor[i][p] ); } @@ -108,8 +106,7 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl { const GameCommand& mc = m_aGameCommands[c]; - CString sFName = ssprintf("%s Scroll Choice%s", m_sName.c_str(),mc.m_sName.c_str()); - m_sprScroll[c][0].Load( THEME->GetPathToG(sFName) ); + m_sprScroll[c][0].Load( THEME->GetPathG(m_sName,ssprintf("%s Scroll Choice%s",mc.m_sName.c_str())) ); m_sprScroll[c][0]->SetName( ssprintf("Scroll") ); m_sprScroll[c][0]->PlayCommand( "Init" ); m_Scroller[0].AddChild( m_sprScroll[c][0] ); @@ -133,8 +130,7 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl { const GameCommand& mc = m_aGameCommands[c]; - CString sFName = ssprintf("%s Scroll Choice%s P%d", m_sName.c_str(),mc.m_sName.c_str(),p+1); - m_sprScroll[c][p].Load( THEME->GetPathToG(sFName) ); + m_sprScroll[c][p].Load( THEME->GetPathG(m_sName,ssprintf("Scroll Choice%s P%d",mc.m_sName.c_str(),p+1)) ); m_sprScroll[c][p]->SetName( ssprintf("ScrollP%d",p+1) ); m_sprScroll[c][p]->PlayCommand( "Init" ); m_Scroller[p].AddChild( m_sprScroll[c][p] ); @@ -150,8 +146,7 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl // init icon for( int i=0; iGetPathToG(sFName) ); + m_sprIcon[i][c].Load( THEME->GetPathG(m_sName,ssprintf("Icon Part%d Choice%s",i+1,mc.m_sName.c_str())) ); m_sprIcon[i][c]->SetName( ssprintf("IconPart%dChoice%s",i+1,mc.m_sName.c_str()) ); this->AddChild( m_sprIcon[i][c] ); } @@ -161,8 +156,7 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl { for( int i=0; iGetPathToG(sFName) ); + m_sprPreview[i][c][0].Load( THEME->GetPathG(m_sName,ssprintf("Preview Part%d Choice%s",i+1,mc.m_sName.c_str())) ); m_sprPreview[i][c][0]->SetName( ssprintf("PreviewPart%d",i+1) ); this->AddChild( m_sprPreview[i][c][0] ); } @@ -173,8 +167,7 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl { for( int i=0; iGetPathToG(sFName) ); + m_sprPreview[i][c][p].Load( THEME->GetPathG(m_sName,ssprintf("Preview Part%d Choice%s P%d",i+1,mc.m_sName.c_str(),p+1)) ); m_sprPreview[i][c][p]->SetName( ssprintf("PreviewPart%dP%d",i+1,p+1) ); this->AddChild( m_sprPreview[i][c][p] ); } @@ -185,11 +178,11 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl for( int page=0; pageGetPathToG( ssprintf("%s more page%d",m_sName.c_str(), page+1) ) ); + m_sprMore[page].Load( THEME->GetPathG(m_sName, ssprintf("more page%d",page+1)) ); m_sprMore[page]->SetName( ssprintf("MorePage%d",page+1) ); this->AddChild( m_sprMore[page] ); - m_sprExplanation[page].Load( THEME->GetPathToG( ssprintf("%s explanation page%d",m_sName.c_str(), page+1) ) ); + m_sprExplanation[page].Load( THEME->GetPathG(m_sName, ssprintf("explanation page%d",page+1)) ); m_sprExplanation[page]->SetName( ssprintf("ExplanationPage%d",page+1) ); this->AddChild( m_sprExplanation[page] ); } @@ -201,9 +194,9 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl m_bChosen[p] = false; } - m_soundChange.Load( THEME->GetPathToS( ssprintf("%s change", m_sName.c_str())), true ); + m_soundChange.Load( THEME->GetPathS(m_sName,"change"), true ); m_soundDifficult.Load( ANNOUNCER->GetPathTo("select difficulty challenge") ); - m_soundStart.Load( THEME->GetPathToS( ssprintf("%s start", m_sName.c_str())) ); + m_soundStart.Load( THEME->GetPathS(m_sName,"start") ); // init m_Next order info for( int dir = 0; dir < NUM_DIRS; ++dir ) diff --git a/stepmania/src/ScreenSelectMode.cpp b/stepmania/src/ScreenSelectMode.cpp index 8269a34310..867ef8c782 100644 --- a/stepmania/src/ScreenSelectMode.cpp +++ b/stepmania/src/ScreenSelectMode.cpp @@ -44,14 +44,14 @@ ScreenSelectMode::ScreenSelectMode( CString sClassName ) : ScreenSelect( sClassN SET_XY( m_CurChar[pn] ); } m_bSelected = false; - m_ChoiceListFrame.Load( THEME->GetPathToG("ScreenSelectMode list frame")); + m_ChoiceListFrame.Load( THEME->GetPathG("ScreenSelectMode","list frame")); m_ChoiceListFrame.SetXY( SCROLLING_LIST_X, SCROLLING_LIST_Y); m_ChoiceListFrame.SetName("ChoiceListFrame"); this->AddChild( &m_ChoiceListFrame ); - m_soundModeChange.Load( THEME->GetPathToS("ScreenSelectMode modechange")); - m_soundConfirm.Load( THEME->GetPathToS("ScreenSelectMode modeconfirm")); - m_soundStart.Load( THEME->GetPathToS("ScreenSelectMode menustart")); + m_soundModeChange.Load( THEME->GetPathS("ScreenSelectMode","modechange")); + m_soundConfirm.Load( THEME->GetPathS("ScreenSelectMode","modeconfirm")); + m_soundStart.Load( THEME->GetPathS("ScreenSelectMode","menustart")); for( unsigned i=0; iGetPathToG(sElementName); + CString sElementPath = THEME->GetPathG("ScreenSelectMode",mc.m_sName); arrayLocations.push_back( sElementPath ); @@ -100,7 +99,7 @@ ScreenSelectMode::ScreenSelectMode( CString sClassName ) : ScreenSelect( sClassN } } for(pn=0;pnGetPathToG("ScreenSelectMode nochar") ); + m_CurChar[pn].Load( THEME->GetPathG("ScreenSelectMode","nochar") ); } // m_ScrollingList.UseSpriteType(BANNERTYPE); @@ -109,12 +108,12 @@ ScreenSelectMode::ScreenSelectMode( CString sClassName ) : ScreenSelect( sClassN m_ScrollingList.SetName("ScrollingList"); this->AddChild( &m_ScrollingList ); - m_ChoiceListHighlight.Load( THEME->GetPathToG("ScreenSelectMode list highlight")); + m_ChoiceListHighlight.Load( THEME->GetPathG("ScreenSelectMode","list highlight")); m_ChoiceListHighlight.SetXY( SCROLLING_LIST_X, SCROLLING_LIST_Y ); m_ChoiceListHighlight.SetName("ChoiceListHighlight"); this->AddChild(&m_ChoiceListHighlight); - m_Guide.Load( THEME->GetPathToG("select mode guide")); + m_Guide.Load( THEME->GetPathG("select mode","guide")); m_Guide.SetXY( GUIDE_X, GUIDE_Y ); m_Guide.SetName("Guide"); this->AddChild( &m_Guide ); @@ -392,10 +391,10 @@ void ScreenSelectMode::MenuUp(PlayerNumber pn) if(apCharactersToUse[m_iCurrentChar[pn]]->GetSongSelectIconPath() != "") m_CurChar[pn].Load( apCharactersToUse[m_iCurrentChar[pn]]->GetSongSelectIconPath() ); else - m_CurChar[pn].Load( THEME->GetPathToG("ScreenSelectMode chariconmissing") ); + m_CurChar[pn].Load( THEME->GetPathG("ScreenSelectMode","chariconmissing") ); } else - m_CurChar[pn].Load( THEME->GetPathToG("ScreenSelectMode nochar") ); + m_CurChar[pn].Load( THEME->GetPathG("ScreenSelectMode","nochar") ); } } @@ -437,10 +436,10 @@ void ScreenSelectMode::MenuDown(PlayerNumber pn) if(apCharactersToUse[m_iCurrentChar[pn]]->GetSongSelectIconPath() != "") m_CurChar[pn].Load( apCharactersToUse[m_iCurrentChar[pn]]->GetSongSelectIconPath() ); else - m_CurChar[pn].Load( THEME->GetPathToG("ScreenSelectMode chariconmissing") ); + m_CurChar[pn].Load( THEME->GetPathG("ScreenSelectMode","chariconmissing") ); } else - m_CurChar[pn].Load( THEME->GetPathToG("ScreenSelectMode nochar") ); + m_CurChar[pn].Load( THEME->GetPathG("ScreenSelectMode","nochar") ); } } diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index b5cb5285c1..2c1b83396c 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -187,7 +187,7 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : ScreenWithMenuEleme this->AddChild( &m_GrooveGraph ); m_textSongOptions.SetName( "SongOptions" ); - m_textSongOptions.LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textSongOptions.LoadFromFont( THEME->GetPathF("Common","normal") ); SET_XY( m_textSongOptions ); this->AddChild( &m_textSongOptions ); @@ -309,9 +309,9 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : ScreenWithMenuEleme this->AddChild( &m_sprNonPresence[p] ); } - m_bgOptionsOut.Load( THEME->GetPathToB(m_sName+" options out") ); + m_bgOptionsOut.Load( THEME->GetPathB(m_sName,"options out") ); // this->AddChild( &m_bgOptionsOut ); // drawn on top - m_bgNoOptionsOut.Load( THEME->GetPathToB(m_sName+" no options out") ); + m_bgNoOptionsOut.Load( THEME->GetPathB(m_sName,"no options out") ); // this->AddChild( &m_bgNoOptionsOut ); // drawn on top m_soundDifficultyEasier.Load( THEME->GetPathS(m_sName,"difficulty easier") ); diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp index f200361725..d4da8122d8 100644 --- a/stepmania/src/ScreenSelectStyle.cpp +++ b/stepmania/src/ScreenSelectStyle.cpp @@ -33,15 +33,14 @@ ScreenSelectStyle::ScreenSelectStyle( CString sClassName ) : ScreenSelect( sClas // // Load icon // - CString sIconElementName = ssprintf("%s icon%d",m_sName.c_str(), i+1); - CString sIconPath = THEME->GetPathToG(sIconElementName); + CString sIconPath = THEME->GetPathG(m_sName,ssprintf("icon%d",i+1)); m_textIcon[i].SetName( ssprintf("Icon%d",i+1) ); m_sprIcon[i].SetName( ssprintf("Icon%d",i+1) ); if( sIconPath.empty() ) // element doesn't exist { - m_textIcon[i].LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textIcon[i].LoadFromFont( THEME->GetPathF("Common","normal") ); m_textIcon[i].SetText( mc.m_sName ); m_textIcon[i].SetZoom(0.5f); this->AddChild( &m_textIcon[i] ); @@ -56,11 +55,10 @@ ScreenSelectStyle::ScreenSelectStyle( CString sClassName ) : ScreenSelect( sClas // // Load Picture // - CString sPictureElementName = ssprintf("%s picture%d",m_sName.c_str(),i+1); - CString sPicturePath = THEME->GetPathToG(sPictureElementName); + CString sPicturePath = THEME->GetPathG(m_sName, ssprintf("picture%d",i+1)); if( sPicturePath != "" ) { - m_sprPicture[i].SetName( ssprintf("Picture") ); + m_sprPicture[i].SetName( "Picture" ); m_sprPicture[i].Load( sPicturePath ); m_sprPicture[i].SetDiffuse( RageColor(1,1,1,0) ); this->AddChild( &m_sprPicture[i] ); @@ -70,11 +68,10 @@ ScreenSelectStyle::ScreenSelectStyle( CString sClassName ) : ScreenSelect( sClas // // Load info // - CString sInfoElementName = ssprintf("%s info%d",m_sName.c_str(),i+1); - CString sInfoPath = THEME->GetPathToG(sInfoElementName); + CString sInfoPath = THEME->GetPathG(m_sName,ssprintf("info%d",i+1)); if( sInfoPath != "" ) { - m_sprInfo[i].SetName( ssprintf("Info") ); + m_sprInfo[i].SetName( "Info" ); m_sprInfo[i].Load( sInfoPath ); m_sprInfo[i].SetDiffuse( RageColor(1,1,1,0) ); this->AddChild( &m_sprInfo[i] ); @@ -83,11 +80,11 @@ ScreenSelectStyle::ScreenSelectStyle( CString sClassName ) : ScreenSelect( sClas m_sprWarning.SetName( "Warning" ); - m_sprWarning.Load( THEME->GetPathToG(m_sName+" warning") ); + m_sprWarning.Load( THEME->GetPathG(m_sName,"warning") ); this->AddChild( &m_sprWarning ); m_sprExplanation.SetName( "Explanation" ); - m_sprExplanation.Load( THEME->GetPathToG(m_sName + " explanation") ); + m_sprExplanation.Load( THEME->GetPathG(m_sName,"explanation") ); this->AddChild( &m_sprExplanation ); @@ -106,17 +103,17 @@ ScreenSelectStyle::ScreenSelectStyle( CString sClassName ) : ScreenSelect( sClas switch( PREFSMAN->GetPremium() ) { case PREMIUM_DOUBLES: - m_sprPremium.Load( THEME->GetPathToG(m_sName + " doubles premium") ); + m_sprPremium.Load( THEME->GetPathG(m_sName,"doubles premium") ); this->AddChild( &m_sprPremium ); break; case PREMIUM_JOINT: - m_sprPremium.Load( THEME->GetPathToG(m_sName + " joint premium") ); + m_sprPremium.Load( THEME->GetPathG(m_sName,"joint premium") ); this->AddChild( &m_sprPremium ); break; } - m_soundChange.Load( THEME->GetPathToS(m_sName + " change"), true ); + m_soundChange.Load( THEME->GetPathS(m_sName,"change"), true ); // diff --git a/stepmania/src/ScreenSetTime.cpp b/stepmania/src/ScreenSetTime.cpp index 3298f9ced0..c7ba6ad1fb 100644 --- a/stepmania/src/ScreenSetTime.cpp +++ b/stepmania/src/ScreenSetTime.cpp @@ -51,13 +51,13 @@ ScreenSetTime::ScreenSetTime( CString sClassName ) : ScreenWithMenuElements( sCl BitmapText &title = m_textTitle[s]; BitmapText &value = m_textValue[s]; - title.LoadFromFont( THEME->GetPathToF("Common title") ); + title.LoadFromFont( THEME->GetPathF("Common","title") ); title.SetDiffuse( RageColor(1,1,1,1) ); title.SetText( SetTimeSelectionToString(s) ); title.SetXY( GetTitleX(s), GetTitleY(s) ); this->AddChild( &title ); - value.LoadFromFont( THEME->GetPathToF("Common normal") ); + value.LoadFromFont( THEME->GetPathF("Common","normal") ); value.SetDiffuse( RageColor(1,1,1,1) ); value.SetXY( GetValueX(s), GetValueY(s) ); this->AddChild( &value ); diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp index d7a4e9103b..c19afdc601 100644 --- a/stepmania/src/ScreenSongOptions.cpp +++ b/stepmania/src/ScreenSongOptions.cpp @@ -24,7 +24,7 @@ ScreenSongOptions::ScreenSongOptions( CString sClassName ) : * fade in. */ if(PREFSMAN->m_ShowSongOptions == PrefsManager::ASK) { - m_In.Load( THEME->GetPathToB("ScreenSongOptions option in") ); + m_In.Load( THEME->GetPathB("ScreenSongOptions","option in") ); m_In.StartTransitioning(); } } diff --git a/stepmania/src/ScreenStyleSplash.cpp b/stepmania/src/ScreenStyleSplash.cpp index 7bc180ba94..608e9a6777 100644 --- a/stepmania/src/ScreenStyleSplash.cpp +++ b/stepmania/src/ScreenStyleSplash.cpp @@ -84,7 +84,7 @@ void ScreenStyleSplash::MenuBack( PlayerNumber pn ) return; this->ClearMessageQueue(); Back( SM_GoToPrevScreen ); - SOUND->PlayOnce( THEME->GetPathToS("menu back") ); + SOUND->PlayOnce( THEME->GetPathS("menu","back") ); } void ScreenStyleSplash::DrawPrimitives() diff --git a/stepmania/src/ScreenSystemLayer.cpp b/stepmania/src/ScreenSystemLayer.cpp index 70e9c2ab3f..bcb3d5e7b7 100644 --- a/stepmania/src/ScreenSystemLayer.cpp +++ b/stepmania/src/ScreenSystemLayer.cpp @@ -56,7 +56,7 @@ ScreenSystemLayer::ScreenSystemLayer() : Screen("ScreenSystemLayer") /* This is somewhat big. Let's put it on the right side, where it'll * obscure the 2P side during gameplay; there's nowhere to put it that * doesn't obscure something, and it's just a diagnostic. */ - m_textSkips[i].LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textSkips[i].LoadFromFont( THEME->GetPathF("Common","normal") ); m_textSkips[i].SetXY( SKIP_LEFT, SKIP_TOP + SKIP_Y_DIST*i ); m_textSkips[i].SetHorizAlign( Actor::align_left ); m_textSkips[i].SetVertAlign( Actor::align_top ); @@ -74,22 +74,22 @@ ScreenSystemLayer::ScreenSystemLayer() : Screen("ScreenSystemLayer") void ScreenSystemLayer::ReloadCreditsText() { - m_textMessage.LoadFromFont( THEME->GetPathToF("ScreenSystemLayer message") ); + m_textMessage.LoadFromFont( THEME->GetPathF("ScreenSystemLayer","message") ); m_textMessage.SetName( "Message" ); SET_XY_AND_ON_COMMAND( m_textMessage ); - m_textStats.LoadFromFont( THEME->GetPathToF("ScreenSystemLayer stats") ); + m_textStats.LoadFromFont( THEME->GetPathF("ScreenSystemLayer","stats") ); m_textStats.SetName( "Stats" ); SET_XY_AND_ON_COMMAND( m_textStats ); - m_textTime.LoadFromFont( THEME->GetPathToF("ScreenSystemLayer time") ); + m_textTime.LoadFromFont( THEME->GetPathF("ScreenSystemLayer","time") ); m_textTime.SetName( "Time" ); m_textTime.SetHidden( !PREFSMAN->m_bTimestamping ); SET_XY_AND_ON_COMMAND( m_textTime ); FOREACH_PlayerNumber( p ) { - m_textCredits[p].LoadFromFont( THEME->GetPathToF("ScreenManager credits") ); + m_textCredits[p].LoadFromFont( THEME->GetPathF("ScreenManager","credits") ); m_textCredits[p].SetName( ssprintf("CreditsP%d",p+1) ); SET_XY_AND_ON_COMMAND( &m_textCredits[p] ); } diff --git a/stepmania/src/ScreenTestInput.cpp b/stepmania/src/ScreenTestInput.cpp index 8787a09cb3..eb4cc5baf1 100644 --- a/stepmania/src/ScreenTestInput.cpp +++ b/stepmania/src/ScreenTestInput.cpp @@ -17,14 +17,14 @@ ScreenTestInput::ScreenTestInput( CString sClassName ) : ScreenWithMenuElements( LOG->Trace( "ScreenTestInput::ScreenTestInput()" ); - m_textInputs.LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textInputs.LoadFromFont( THEME->GetPathF("Common","normal") ); m_textInputs.SetText( "" ); m_textInputs.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y ); m_textInputs.SetDiffuse( RageColor(1,1,1,1) ); m_textInputs.SetZoom( 0.8f ); this->AddChild( &m_textInputs ); - SOUND->PlayMusic( THEME->GetPathToS("ScreenTestInput music") ); + SOUND->PlayMusic( THEME->GetPathS("ScreenTestInput","music") ); } diff --git a/stepmania/src/ScreenTestLights.cpp b/stepmania/src/ScreenTestLights.cpp index 500c5af36f..ce2fbc15f3 100644 --- a/stepmania/src/ScreenTestLights.cpp +++ b/stepmania/src/ScreenTestLights.cpp @@ -17,14 +17,14 @@ ScreenTestLights::ScreenTestLights( CString sClassName ) : ScreenWithMenuElement LOG->Trace( "ScreenTestLights::ScreenTestLights()" ); - m_textInputs.LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textInputs.LoadFromFont( THEME->GetPathF("Common","normal") ); m_textInputs.SetText( "" ); m_textInputs.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y ); m_textInputs.SetDiffuse( RageColor(1,1,1,1) ); m_textInputs.SetZoom( 0.8f ); this->AddChild( &m_textInputs ); - SOUND->PlayMusic( THEME->GetPathToS("ScreenTestLights music") ); + SOUND->PlayMusic( THEME->GetPathS("ScreenTestLights","music") ); LIGHTSMAN->SetLightsMode( LIGHTSMODE_TEST ); } diff --git a/stepmania/src/ScreenTestSound.cpp b/stepmania/src/ScreenTestSound.cpp index 171d86ab15..2d244ba703 100644 --- a/stepmania/src/ScreenTestSound.cpp +++ b/stepmania/src/ScreenTestSound.cpp @@ -12,7 +12,7 @@ ScreenTestSound::ScreenTestSound( CString sClassName ) : Screen( sClassName ) this->AddChild(&HEEEEEEEEELP); HEEEEEEEEELP.SetXY(450, 400); - HEEEEEEEEELP.LoadFromFont( THEME->GetPathToF("Common normal") ); + HEEEEEEEEELP.LoadFromFont( THEME->GetPathF("Common","normal") ); HEEEEEEEEELP.SetZoom(.5); HEEEEEEEEELP.SetText( "p Play\n" @@ -24,7 +24,7 @@ ScreenTestSound::ScreenTestSound( CString sClassName ) : Screen( sClassName ) for( int i = 0; i < nsounds; ++i ) { this->AddChild(&s[i].txt); - s[i].txt.LoadFromFont( THEME->GetPathToF("Common normal") ); + s[i].txt.LoadFromFont( THEME->GetPathF("Common","normal") ); s[i].txt.SetZoom(.5); } diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp index f5c9356ead..b31ef95828 100644 --- a/stepmania/src/ScreenTextEntry.cpp +++ b/stepmania/src/ScreenTextEntry.cpp @@ -43,10 +43,10 @@ ScreenTextEntry::ScreenTextEntry( CString sClassName, CString sQuestion, CString m_sAnswer = CStringToWstring(sInitialAnswer); m_bCancelled = false; - m_Background.LoadFromAniDir( THEME->GetPathToB("ScreenPrompt background") ); + m_Background.LoadFromAniDir( THEME->GetPathB("ScreenPrompt","background") ); this->AddChild( &m_Background ); - m_textQuestion.LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textQuestion.LoadFromFont( THEME->GetPathF("Common","normal") ); m_textQuestion.SetText( sQuestion ); m_textQuestion.SetXY( QUESTION_X, QUESTION_Y ); this->AddChild( &m_textQuestion ); @@ -57,16 +57,16 @@ ScreenTextEntry::ScreenTextEntry( CString sClassName, CString sQuestion, CString m_rectAnswerBox.SetZoomY( ANSWER_HEIGHT ); this->AddChild( &m_rectAnswerBox ); - m_textAnswer.LoadFromFont( THEME->GetPathToF("Common title") ); + m_textAnswer.LoadFromFont( THEME->GetPathF("Common","title") ); m_textAnswer.SetXY( ANSWER_X, ANSWER_Y ); UpdateText(); this->AddChild( &m_textAnswer ); - m_In.Load( THEME->GetPathToB("ScreenPrompt in") ); + m_In.Load( THEME->GetPathB("ScreenPrompt","in") ); m_In.StartTransitioning(); this->AddChild( &m_In ); - m_Out.Load( THEME->GetPathToB("ScreenPrompt out") ); + m_Out.Load( THEME->GetPathB("ScreenPrompt","out") ); this->AddChild( &m_Out ); } diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp index 4f95821d97..3d4661490c 100644 --- a/stepmania/src/ScreenTitleMenu.cpp +++ b/stepmania/src/ScreenTitleMenu.cpp @@ -60,13 +60,13 @@ ScreenTitleMenu::ScreenTitleMenu( CString sScreenName ) : this->AddChild( m_sprLogo ); SET_XY_AND_ON_COMMAND( m_sprLogo ); - m_textVersion.LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textVersion.LoadFromFont( THEME->GetPathF("Common","normal") ); m_textVersion.SetName( "Version" ); m_textVersion.SetText( PRODUCT_VER ); this->AddChild( &m_textVersion ); SET_XY_AND_ON_COMMAND( m_textVersion ); - m_textSongs.LoadFromFont( THEME->GetPathToF("Common normal") ); + m_textSongs.LoadFromFont( THEME->GetPathF("Common","normal") ); m_textSongs.SetName( "Songs" ); CString text = ssprintf("%d songs in %d groups, %d courses", SONGMAN->GetNumSongs(), SONGMAN->GetNumGroups(), SONGMAN->GetNumCourses() ); if( PREFSMAN->m_bUseUnlockSystem ) diff --git a/stepmania/src/ScreenUnlock.cpp b/stepmania/src/ScreenUnlock.cpp index 7dfef64c4c..8abab43daa 100644 --- a/stepmania/src/ScreenUnlock.cpp +++ b/stepmania/src/ScreenUnlock.cpp @@ -42,7 +42,7 @@ ScreenUnlock::ScreenUnlock( CString sClassName ) : ScreenAttract( sClassName ) return; } - PointsUntilNextUnlock.LoadFromFont( THEME->GetPathToF("Common normal") ); + PointsUntilNextUnlock.LoadFromFont( THEME->GetPathF("Common","normal") ); PointsUntilNextUnlock.SetHorizAlign( Actor::align_left ); apActorCommands IconCommand = ICON_COMMAND; @@ -66,7 +66,7 @@ ScreenUnlock::ScreenUnlock( CString sClassName ) : ScreenAttract( sClassName ) Sprite* entry = new Sprite; // new unlock graphic - entry->Load( THEME->GetPathToG(ssprintf("ScreenUnlock %d icon", i)) ); + entry->Load( THEME->GetPathG("ScreenUnlock",ssprintf("%d icon", i)) ); // set graphic location entry->SetName( ssprintf("Unlock%d",i) ); @@ -114,7 +114,7 @@ ScreenUnlock::ScreenUnlock( CString sClassName ) : ScreenAttract( sClassName ) BitmapText* text = new BitmapText; - text->LoadFromFont( THEME->GetPathToF("ScreenUnlock text") ); + text->LoadFromFont( THEME->GetPathF("ScreenUnlock","text") ); text->SetHorizAlign( Actor::align_left ); text->SetZoom(ScrollingTextZoom); @@ -181,7 +181,7 @@ ScreenUnlock::ScreenUnlock( CString sClassName ) : ScreenAttract( sClassName ) Sprite* IconCount = new Sprite; // new unlock graphic - IconCount->Load( THEME->GetPathToG(ssprintf("ScreenUnlock %d icon", i)) ); + IconCount->Load( THEME->GetPathG("ScreenUnlock",ssprintf("%d icon", i)) ); // set graphic location IconCount->SetXY( UNLOCK_TEXT_SCROLL_ICON_X, ScrollingTextStartY); @@ -251,7 +251,7 @@ ScreenUnlock::ScreenUnlock( CString sClassName ) : ScreenAttract( sClassName ) BitmapText* NewText = new BitmapText; - NewText->LoadFromFont( THEME->GetPathToF("ScreenUnlock text") ); + NewText->LoadFromFont( THEME->GetPathF("ScreenUnlock","text") ); NewText->SetHorizAlign( Actor::align_left ); CString title = pSong->m_pSong->GetDisplayMainTitle(); @@ -274,7 +274,7 @@ ScreenUnlock::ScreenUnlock( CString sClassName ) : ScreenAttract( sClassName ) // new unlock graphic Sprite* NewIcon = new Sprite; - NewIcon->Load( THEME->GetPathToG(ssprintf("ScreenUnlock %d icon", NextIcon)) ); + NewIcon->Load( THEME->GetPathG("ScreenUnlock",ssprintf("%d icon", NextIcon)) ); NewIcon->SetXY( UNLOCK_TEXT_SCROLL_ICON_X, ScrollingTextStartY); NewIcon->SetHeight(UNLOCK_TEXT_SCROLL_ICON_SIZE); NewIcon->SetWidth(UNLOCK_TEXT_SCROLL_ICON_SIZE); diff --git a/stepmania/src/ScreenWithMenuElements.cpp b/stepmania/src/ScreenWithMenuElements.cpp index 03ef4fdd85..474e1a66a1 100644 --- a/stepmania/src/ScreenWithMenuElements.cpp +++ b/stepmania/src/ScreenWithMenuElements.cpp @@ -30,16 +30,15 @@ ScreenWithMenuElements::ScreenWithMenuElements( CString sClassName ) : Screen( s this->SetName( sClassName ); - m_autoHeader.Load( THEME->GetPathToG(m_sName+" header") ); + m_autoHeader.Load( THEME->GetPathG(m_sName,"header") ); m_autoHeader->SetName("Header"); SET_XY_AND_ON_COMMAND( m_autoHeader ); this->AddChild( m_autoHeader ); if( STYLE_ICON && GAMESTATE->m_pCurStyle ) { - CString sIconFileName = CString("MenuElements icon ") + GAMESTATE->GetCurrentStyle()->m_szName; m_sprStyleIcon.SetName( "StyleIcon" ); - m_sprStyleIcon.Load( THEME->GetPathToG(sIconFileName) ); + m_sprStyleIcon.Load( THEME->GetPathG("MenuElements",CString("icon ")+GAMESTATE->GetCurrentStyle()->m_szName) ); m_sprStyleIcon.StopAnimating(); m_sprStyleIcon.SetState( GAMESTATE->m_MasterPlayerNumber ); SET_XY_AND_ON_COMMAND( m_sprStyleIcon ); @@ -68,7 +67,7 @@ ScreenWithMenuElements::ScreenWithMenuElements( CString sClassName ) : Screen( s this->AddChild( m_MenuTimer ); } - m_autoFooter.Load( THEME->GetPathToG(m_sName+" footer") ); + m_autoFooter.Load( THEME->GetPathG(m_sName,"footer") ); m_autoFooter->SetName("Footer"); SET_XY_AND_ON_COMMAND( m_autoFooter ); this->AddChild( m_autoFooter ); @@ -81,20 +80,20 @@ ScreenWithMenuElements::ScreenWithMenuElements( CString sClassName ) : Screen( s m_textHelp->SetTips( asHelpTips ); this->AddChild( m_textHelp ); - m_sprOverlay.Load( THEME->GetPathToB(m_sName+" overlay") ); + m_sprOverlay.Load( THEME->GetPathB(m_sName,"overlay") ); m_sprOverlay->SetName("Overlay"); SET_XY_AND_ON_COMMAND( m_sprOverlay ); this->AddChild( m_sprOverlay ); - m_In.Load( THEME->GetPathToB(m_sName+" in") ); + m_In.Load( THEME->GetPathB(m_sName,"in") ); m_In.SetDrawOrder( DRAW_ORDER_TRANSITIONS ); this->AddChild( &m_In ); - m_Out.Load( THEME->GetPathToB(m_sName+" out") ); + m_Out.Load( THEME->GetPathB(m_sName,"out") ); m_Out.SetDrawOrder( DRAW_ORDER_TRANSITIONS ); this->AddChild( &m_Out ); - m_Back.Load( THEME->GetPathToB("Common back") ); + m_Back.Load( THEME->GetPathB("Common","back") ); m_Back.SetDrawOrder( DRAW_ORDER_TRANSITIONS ); this->AddChild( &m_Back ); diff --git a/stepmania/src/ScrollBar.cpp b/stepmania/src/ScrollBar.cpp index 28c98ec80b..4a48025f07 100644 --- a/stepmania/src/ScrollBar.cpp +++ b/stepmania/src/ScrollBar.cpp @@ -7,25 +7,25 @@ ScrollBar::ScrollBar() { - m_sprBackground.Load( THEME->GetPathToG("ScrollBar parts 1x3") ); + m_sprBackground.Load( THEME->GetPathG("ScrollBar","parts 1x3") ); m_sprBackground.StopAnimating(); m_sprBackground.SetState( 1 ); this->AddChild( &m_sprBackground ); - m_sprScrollThumbPart1.Load( THEME->GetPathToG("ScrollBar thumb") ); + m_sprScrollThumbPart1.Load( THEME->GetPathG("ScrollBar","thumb") ); m_sprScrollThumbPart1.StopAnimating(); this->AddChild( &m_sprScrollThumbPart1 ); - m_sprScrollThumbPart2.Load( THEME->GetPathToG("ScrollBar thumb") ); + m_sprScrollThumbPart2.Load( THEME->GetPathG("ScrollBar","thumb") ); m_sprScrollThumbPart2.StopAnimating(); this->AddChild( &m_sprScrollThumbPart2 ); - m_sprTopButton.Load( THEME->GetPathToG("ScrollBar parts 1x3") ); + m_sprTopButton.Load( THEME->GetPathG("ScrollBar","parts 1x3") ); m_sprTopButton.StopAnimating(); m_sprTopButton.SetState( 0 ); this->AddChild( &m_sprTopButton ); - m_sprBottomButton.Load( THEME->GetPathToG("ScrollBar parts 1x3") ); + m_sprBottomButton.Load( THEME->GetPathG("ScrollBar","parts 1x3") ); m_sprBottomButton.StopAnimating(); m_sprBottomButton.SetState( 2 ); this->AddChild( &m_sprBottomButton ); diff --git a/stepmania/src/ScrollingList.cpp b/stepmania/src/ScrollingList.cpp index 4aebd14aec..5cdad1d83b 100644 --- a/stepmania/src/ScrollingList.cpp +++ b/stepmania/src/ScrollingList.cpp @@ -58,7 +58,7 @@ ScrollingList::ScrollingList() m_iBounceDir=0; m_iBounceWait=0; m_sprBannerMask.SetName( "Banner" ); // use the same metrics and animation as Banner - m_sprBannerMask.Load( THEME->GetPathToG("ScreenSelectMusic banner mask") ); + m_sprBannerMask.Load( THEME->GetPathG("ScreenSelectMusic","banner mask") ); m_sprBannerMask.SetClearZBuffer( true ); m_sprBannerMask.SetBlendMode( BLEND_NO_EFFECT ); // don't draw to color buffer m_sprBannerMask.SetZWrite( true ); // do draw to the zbuffer diff --git a/stepmania/src/SnapDisplay.cpp b/stepmania/src/SnapDisplay.cpp index ae3a42defe..042036e589 100644 --- a/stepmania/src/SnapDisplay.cpp +++ b/stepmania/src/SnapDisplay.cpp @@ -10,7 +10,7 @@ SnapDisplay::SnapDisplay() { for( int i=0; i<2; i++ ) { - m_sprIndicators[i].Load( THEME->GetPathToG("SnapDisplay icon 8x1") ); + m_sprIndicators[i].Load( THEME->GetPathG("SnapDisplay","icon 8x1") ); m_sprIndicators[i].StopAnimating(); this->AddChild( &m_sprIndicators[i] ); } diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index b72f3b3151..a72f30854e 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -98,7 +98,7 @@ static RageDisplay::VideoModeParams GetCurVideoModeParams() PREFSMAN->m_bTrilinearFiltering, PREFSMAN->m_bAnisotropicFiltering, WINDOW_TITLE, - THEME->GetPathToG("Common window icon"), + THEME->GetPathG("Common","window icon"), PREFSMAN->m_bPAL, PREFSMAN->m_fDisplayAspectRatio ); diff --git a/stepmania/src/WheelNotifyIcon.cpp b/stepmania/src/WheelNotifyIcon.cpp index 747f092c81..a557ca8740 100644 --- a/stepmania/src/WheelNotifyIcon.cpp +++ b/stepmania/src/WheelNotifyIcon.cpp @@ -11,7 +11,7 @@ WheelNotifyIcon::WheelNotifyIcon() { - Load( THEME->GetPathToG("WheelNotifyIcon icons 4x2") ); + Load( THEME->GetPathG("WheelNotifyIcon","icons 4x2") ); StopAnimating(); }