From 7f5657901c3a63d4587acdd63e6f478d6bf08840 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 11 Mar 2008 10:41:11 +0000 Subject: [PATCH] better name: DifficultyMeter -> DifficultyDisplay --- .../ScreenSelectMusic overlay/default.lua | 10 +-- ...er.redir => DifficultyDisplay meter.redir} | 0 ...x1.png => DifficultyDisplay ticks 2x1.png} | Bin ... ticks.ini => DifficultyDisplay ticks.ini} | 0 ...edir => DifficultyDisplayEdit meter.redir} | 0 ...me.redir => DifficultyDisplay frame.redir} | 0 stepmania/Themes/default/metrics.ini | 80 +++++++++--------- stepmania/src/DifficultyList.cpp | 2 +- stepmania/src/DifficultyList.h | 4 +- stepmania/src/EditMenu.cpp | 4 +- stepmania/src/EditMenu.h | 6 +- stepmania/src/Makefile.am | 2 +- stepmania/src/ScreenGameplay.cpp | 2 +- stepmania/src/ScreenNetSelectMusic.cpp | 16 ++-- stepmania/src/ScreenNetSelectMusic.h | 4 +- stepmania/src/StepMania-net2003.vcproj | 12 +-- 16 files changed, 71 insertions(+), 71 deletions(-) rename stepmania/Themes/default/Fonts/{DifficultyMeter meter.redir => DifficultyDisplay meter.redir} (100%) mode change 100755 => 100644 rename stepmania/Themes/default/Fonts/{DifficultyMeter ticks 2x1.png => DifficultyDisplay ticks 2x1.png} (100%) rename stepmania/Themes/default/Fonts/{DifficultyMeter ticks.ini => DifficultyDisplay ticks.ini} (100%) rename stepmania/Themes/default/Fonts/{DifficultyMeterEdit meter.redir => DifficultyDisplayEdit meter.redir} (100%) rename stepmania/Themes/default/Graphics/{DifficultyMeter frame.redir => DifficultyDisplay frame.redir} (100%) diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic overlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic overlay/default.lua index 9f50fa2159..8d5e1234a0 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic overlay/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic overlay/default.lua @@ -16,13 +16,13 @@ local function Autogen(pn) return t; end -local function DifficultyMeter(pn) +local function DifficultyDisplay(pn) local function set(self, player) self:SetFromGameState( player ); end - local t = Def.DifficultyMeter { - Type="DifficultyMeter"; -- metrics section + local t = Def.DifficultyDisplay { + Type="DifficultyDisplay"; -- metrics section }; if pn == PLAYER_1 then @@ -412,12 +412,12 @@ local t = Def.ActorFrame { -- OffCommand=cmd(linear,0.5;zoomy,0); --}; - --DifficultyMeter(PLAYER_1) .. { + --DifficultyDisplay(PLAYER_1) .. { -- BeginCommand=cmd(player,PLAYER_1;x,SCREEN_CENTER_X-254;y,SCREEN_CENTER_Y-20); -- OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); -- OffCommand=cmd(linear,0.5;zoomy,0); --}; - --DifficultyMeter(PLAYER_2) .. { + --DifficultyDisplay(PLAYER_2) .. { -- BeginCommand=cmd(player,PLAYER_2;x,SCREEN_CENTER_X-121;y,SCREEN_CENTER_Y-20); -- OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); -- OffCommand=cmd(linear,0.5;zoomy,0); diff --git a/stepmania/Themes/default/Fonts/DifficultyMeter meter.redir b/stepmania/Themes/default/Fonts/DifficultyDisplay meter.redir old mode 100755 new mode 100644 similarity index 100% rename from stepmania/Themes/default/Fonts/DifficultyMeter meter.redir rename to stepmania/Themes/default/Fonts/DifficultyDisplay meter.redir diff --git a/stepmania/Themes/default/Fonts/DifficultyMeter ticks 2x1.png b/stepmania/Themes/default/Fonts/DifficultyDisplay ticks 2x1.png similarity index 100% rename from stepmania/Themes/default/Fonts/DifficultyMeter ticks 2x1.png rename to stepmania/Themes/default/Fonts/DifficultyDisplay ticks 2x1.png diff --git a/stepmania/Themes/default/Fonts/DifficultyMeter ticks.ini b/stepmania/Themes/default/Fonts/DifficultyDisplay ticks.ini similarity index 100% rename from stepmania/Themes/default/Fonts/DifficultyMeter ticks.ini rename to stepmania/Themes/default/Fonts/DifficultyDisplay ticks.ini diff --git a/stepmania/Themes/default/Fonts/DifficultyMeterEdit meter.redir b/stepmania/Themes/default/Fonts/DifficultyDisplayEdit meter.redir similarity index 100% rename from stepmania/Themes/default/Fonts/DifficultyMeterEdit meter.redir rename to stepmania/Themes/default/Fonts/DifficultyDisplayEdit meter.redir diff --git a/stepmania/Themes/default/Graphics/DifficultyMeter frame.redir b/stepmania/Themes/default/Graphics/DifficultyDisplay frame.redir similarity index 100% rename from stepmania/Themes/default/Graphics/DifficultyMeter frame.redir rename to stepmania/Themes/default/Graphics/DifficultyDisplay frame.redir diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index d5632595b3..14e8ca95c4 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1660,14 +1660,14 @@ DifficultyIconP2X=SCREEN_CENTER_X+106 DifficultyIconP2Y=SCREEN_CENTER_Y-160 DifficultyIconP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT DifficultyIconP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -DifficultyMeterP1X=SCREEN_CENTER_X-106 -DifficultyMeterP1Y=SCREEN_CENTER_Y-160 -DifficultyMeterP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT -DifficultyMeterP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -DifficultyMeterP2X=SCREEN_CENTER_X+106 -DifficultyMeterP2Y=SCREEN_CENTER_Y-160 -DifficultyMeterP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT -DifficultyMeterP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT +DifficultyDisplayP1X=SCREEN_CENTER_X-106 +DifficultyDisplayP1Y=SCREEN_CENTER_Y-160 +DifficultyDisplayP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT +DifficultyDisplayP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT +DifficultyDisplayP2X=SCREEN_CENTER_X+106 +DifficultyDisplayP2Y=SCREEN_CENTER_Y-160 +DifficultyDisplayP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT +DifficultyDisplayP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT ScoreNumberP1X=SCREEN_CENTER_X-160 ScoreNumberP1Y=SCREEN_CENTER_Y+140 ScoreNumberP2X=SCREEN_CENTER_X+160 @@ -1954,7 +1954,7 @@ LifePercentChangeCheckpointHit=0.002 [LifeMeterTime] Fallback="LifeMeterBar" -[DifficultyMeter] +[DifficultyDisplay] FrameX=0 FrameY=0 FrameOnCommand= @@ -1973,8 +1973,8 @@ MeterY=0 MeterOnCommand=shadowlength,0 MeterSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyColor(param.Difficulty)) end end -[DifficultyMeterEdit] -Fallback="DifficultyMeter" +[DifficultyDisplayEdit] +Fallback="DifficultyDisplay" ShowMeter=true MeterX=-70 MeterY=0 @@ -3733,41 +3733,41 @@ PrevScreen="ScreenOptionsService" ScrollRandom=false ScrollRoulette=false -[ScreenGameplay DifficultyMeterP1] -Fallback="DifficultyMeter" +[ScreenGameplay DifficultyDisplayP1] +Fallback="DifficultyDisplay" -[ScreenGameplay DifficultyMeterP2] -Fallback="DifficultyMeter" +[ScreenGameplay DifficultyDisplayP2] +Fallback="DifficultyDisplay" -[ScreenGameplayExtra DifficultyMeterP1] -Fallback="DifficultyMeter" +[ScreenGameplayExtra DifficultyDisplayP1] +Fallback="DifficultyDisplay" -[ScreenGameplayExtra DifficultyMeterP2] -Fallback="DifficultyMeter" +[ScreenGameplayExtra DifficultyDisplayP2] +Fallback="DifficultyDisplay" -[ScreenDemonstration DifficultyMeterP1] -Fallback="DifficultyMeter" +[ScreenDemonstration DifficultyDisplayP1] +Fallback="DifficultyDisplay" -[ScreenDemonstration DifficultyMeterP2] -Fallback="DifficultyMeter" +[ScreenDemonstration DifficultyDisplayP2] +Fallback="DifficultyDisplay" -[ScreenEvaluation DifficultyMeterP1] -Fallback="DifficultyMeter" +[ScreenEvaluation DifficultyDisplayP1] +Fallback="DifficultyDisplay" -[ScreenEvaluation DifficultyMeterP2] -Fallback="DifficultyMeter" +[ScreenEvaluation DifficultyDisplayP2] +Fallback="DifficultyDisplay" -[ScreenGameplayMultiplayer DifficultyMeterP1] -Fallback="DifficultyMeter" +[ScreenGameplayMultiplayer DifficultyDisplayP1] +Fallback="DifficultyDisplay" -[ScreenGameplaySyncMachine DifficultyMeterP1] -Fallback="DifficultyMeter" +[ScreenGameplaySyncMachine DifficultyDisplayP1] +Fallback="DifficultyDisplay" -[ScreenGameplayShared DifficultyMeterP1] -Fallback="DifficultyMeter" +[ScreenGameplayShared DifficultyDisplayP1] +Fallback="DifficultyDisplay" -[ScreenGameplayShared DifficultyMeterP2] -Fallback="DifficultyMeter" +[ScreenGameplayShared DifficultyDisplayP2] +Fallback="DifficultyDisplay" [ScreenEdit] PrepareScreens=GetEditModeSubScreens() @@ -4039,11 +4039,11 @@ LineHighlightX=0 ColorSelected=color("1,1,1,1") ColorNotSelected=color("0.7,0.7,0.7,1") -[ScreenJukebox DifficultyMeterP1] -Fallback="ScreenGameplay DifficultyMeterP1" +[ScreenJukebox DifficultyDisplayP1] +Fallback="ScreenGameplay DifficultyDisplayP1" -[ScreenJukebox DifficultyMeterP2] -Fallback="ScreenGameplay DifficultyMeterP2" +[ScreenJukebox DifficultyDisplayP2] +Fallback="ScreenGameplay DifficultyDisplayP2" [ScreenOptionsManage] Fallback="ScreenOptionsSimple" @@ -4380,7 +4380,7 @@ CursorP1HideCommand=linear,.3;diffusealpha,0 CursorP2HideCommand=linear,.3;diffusealpha,0 [DifficultyListRow] -Fallback=DifficultyMeter +Fallback=DifficultyDisplay FrameX=0 FrameY=0 FrameOnCommand= diff --git a/stepmania/src/DifficultyList.cpp b/stepmania/src/DifficultyList.cpp index 1cf132ce18..72179a39fa 100644 --- a/stepmania/src/DifficultyList.cpp +++ b/stepmania/src/DifficultyList.cpp @@ -4,7 +4,7 @@ #include "Song.h" #include "Steps.h" #include "Style.h" -#include "DifficultyMeter.h" +#include "DifficultyDisplay.h" #include "StepsUtil.h" #include "CommonMetrics.h" #include "Foreach.h" diff --git a/stepmania/src/DifficultyList.h b/stepmania/src/DifficultyList.h index 22e1e778b2..e072b8ed7f 100644 --- a/stepmania/src/DifficultyList.h +++ b/stepmania/src/DifficultyList.h @@ -3,7 +3,7 @@ #include "ActorFrame.h" #include "PlayerNumber.h" -#include "DifficultyMeter.h" +#include "DifficultyDisplay.h" #include "ThemeMetric.h" class Song; @@ -44,7 +44,7 @@ private: struct Line { - DifficultyMeter m_Meter; + DifficultyDisplay m_Meter; }; vector m_Lines; diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp index 2862e90a0d..d33d6f9322 100644 --- a/stepmania/src/EditMenu.cpp +++ b/stepmania/src/EditMenu.cpp @@ -174,12 +174,12 @@ void EditMenu::Load( const RString &sType ) this->AddChild( &m_SongTextBanner ); m_Meter.SetName( "Meter" ); - m_Meter.Load( "DifficultyMeterEdit" ); + m_Meter.Load( "DifficultyDisplayEdit" ); ActorUtil::SetXY( m_Meter, sType ); this->AddChild( &m_Meter ); m_SourceMeter.SetName( "SourceMeter" ); - m_SourceMeter.Load( "DifficultyMeterEdit" ); + m_SourceMeter.Load( "DifficultyDisplayEdit" ); ActorUtil::SetXY( m_SourceMeter, sType ); this->AddChild( &m_SourceMeter ); diff --git a/stepmania/src/EditMenu.h b/stepmania/src/EditMenu.h index f2a9600d88..fae953f84c 100644 --- a/stepmania/src/EditMenu.h +++ b/stepmania/src/EditMenu.h @@ -7,7 +7,7 @@ #include "FadingBanner.h" #include "TextBanner.h" #include "GameConstantsAndTypes.h" -#include "DifficultyMeter.h" +#include "DifficultyDisplay.h" #include "RageSound.h" #include "EnumHelper.h" #include "ThemeMetric.h" @@ -94,8 +94,8 @@ private: FadingBanner m_GroupBanner; FadingBanner m_SongBanner; TextBanner m_SongTextBanner; - DifficultyMeter m_Meter; - DifficultyMeter m_SourceMeter; + DifficultyDisplay m_Meter; + DifficultyDisplay m_SourceMeter; struct StepsAndDifficulty diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index 07f0e37558..443ed562bb 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -312,8 +312,8 @@ Transition.cpp Transition.h ActorsInMenus = \ ActiveAttackList.cpp ActiveAttackList.h BPMDisplay.cpp BPMDisplay.h ComboGraph.cpp ComboGraph.h \ CourseContentsList.cpp CourseContentsList.h \ +DifficultyDisplay.cpp DifficultyDisplay.h \ DifficultyList.cpp DifficultyList.h \ -DifficultyMeter.cpp DifficultyMeter.h \ DualScrollBar.cpp DualScrollBar.h \ EditMenu.cpp EditMenu.h FadingBanner.cpp FadingBanner.h \ GradeDisplay.cpp GradeDisplay.h GraphDisplay.cpp GraphDisplay.h \ diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index efa124831f..314c010e6f 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -50,7 +50,7 @@ #include "ActiveAttackList.h" #include "Player.h" #include "DifficultyIcon.h" -#include "DifficultyMeter.h" +#include "DifficultyDisplay.h" #include "XmlFile.h" #include "Background.h" #include "Foreground.h" diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp index be0e4ffe7b..223909122e 100644 --- a/stepmania/src/ScreenNetSelectMusic.cpp +++ b/stepmania/src/ScreenNetSelectMusic.cpp @@ -67,10 +67,10 @@ void ScreenNetSelectMusic::Init() ON_COMMAND( m_DifficultyIcon[p] ); m_DC[p] = GAMESTATE->m_PreferredDifficulty[p]; - m_DifficultyMeters[p].SetName( ssprintf("MeterP%d",p+1) ); - m_DifficultyMeters[p].Load( "DifficultyMeter" ); - LOAD_ALL_COMMANDS_AND_SET_XY_AND_ON_COMMAND( m_DifficultyMeters[p] ); - this->AddChild( &m_DifficultyMeters[p] ); + m_DifficultyDisplays[p].SetName( ssprintf("MeterP%d",p+1) ); + m_DifficultyDisplays[p].Load( "DifficultyDisplay" ); + LOAD_ALL_COMMANDS_AND_SET_XY_AND_ON_COMMAND( m_DifficultyDisplays[p] ); + this->AddChild( &m_DifficultyDisplays[p] ); } m_MusicWheel.SetName( "MusicWheel" ); @@ -452,7 +452,7 @@ void ScreenNetSelectMusic::TweenOffScreen() FOREACH_EnabledPlayer (pn) { - OFF_COMMAND( m_DifficultyMeters[pn] ); + OFF_COMMAND( m_DifficultyDisplays[pn] ); OFF_COMMAND( m_DifficultyIcon[pn] ); OFF_COMMAND( m_OptionIconRow[pn] ); } @@ -488,7 +488,7 @@ void ScreenNetSelectMusic::UpdateDifficulties( PlayerNumber pn ) { if ( GAMESTATE->m_pCurSong == NULL ) { - m_DifficultyMeters[pn].SetFromStepsTypeAndMeterAndDifficulty( StepsType_Invalid, 0, Difficulty_Beginner ); + m_DifficultyDisplays[pn].SetFromStepsTypeAndMeterAndDifficulty( StepsType_Invalid, 0, Difficulty_Beginner ); m_DifficultyIcon[pn].SetFromSteps( pn, NULL ); //It will blank it out return; } @@ -506,9 +506,9 @@ void ScreenNetSelectMusic::UpdateDifficulties( PlayerNumber pn ) GAMESTATE->m_pCurSteps[pn].Set( pSteps ); if ( ( m_DC[pn] < NUM_Difficulty ) && ( m_DC[pn] >= Difficulty_Beginner ) ) - m_DifficultyMeters[pn].SetFromSteps( pSteps ); + m_DifficultyDisplays[pn].SetFromSteps( pSteps ); else - m_DifficultyMeters[pn].SetFromStepsTypeAndMeterAndDifficulty( StepsType_Invalid, 0, Difficulty_Beginner ); + m_DifficultyDisplays[pn].SetFromStepsTypeAndMeterAndDifficulty( StepsType_Invalid, 0, Difficulty_Beginner ); } void ScreenNetSelectMusic::MusicChanged() diff --git a/stepmania/src/ScreenNetSelectMusic.h b/stepmania/src/ScreenNetSelectMusic.h index ff1df4ccb0..6ae4f9a9ac 100644 --- a/stepmania/src/ScreenNetSelectMusic.h +++ b/stepmania/src/ScreenNetSelectMusic.h @@ -8,7 +8,7 @@ #include "Sprite.h" #include "DifficultyIcon.h" #include "Difficulty.h" -#include "DifficultyMeter.h" +#include "DifficultyDisplay.h" #include "MusicWheel.h" #include "OptionIconRow.h" #include "BPMDisplay.h" @@ -68,7 +68,7 @@ private: Difficulty m_DC[NUM_PLAYERS]; void UpdateDifficulties( PlayerNumber pn ); - DifficultyMeter m_DifficultyMeters[NUM_PLAYERS]; + DifficultyDisplay m_DifficultyDisplays[NUM_PLAYERS]; RageSound m_soundChangeOpt; RageSound m_soundChangeSel; diff --git a/stepmania/src/StepMania-net2003.vcproj b/stepmania/src/StepMania-net2003.vcproj index 31811ea354..2906e5d94a 100644 --- a/stepmania/src/StepMania-net2003.vcproj +++ b/stepmania/src/StepMania-net2003.vcproj @@ -1358,18 +1358,18 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ + + + + - - - -