better name: DifficultyMeter -> DifficultyDisplay

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 {
+	local t = Def.DifficultyDisplay {
-		Type="DifficultyMeter"; -- metrics section
+		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);

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
+DifficultyDisplayP1X=SCREEN_CENTER_X-106
-DifficultyMeterP1Y=SCREEN_CENTER_Y-160
+DifficultyDisplayP1Y=SCREEN_CENTER_Y-160
-DifficultyMeterP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
+DifficultyDisplayP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
-DifficultyMeterP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
+DifficultyDisplayP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
-DifficultyMeterP2X=SCREEN_CENTER_X+106
+DifficultyDisplayP2X=SCREEN_CENTER_X+106
-DifficultyMeterP2Y=SCREEN_CENTER_Y-160
+DifficultyDisplayP2Y=SCREEN_CENTER_Y-160
-DifficultyMeterP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
+DifficultyDisplayP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
-DifficultyMeterP2OffCommand=sleep,0.8;accelerate,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]
+[DifficultyDisplayEdit]
-Fallback="DifficultyMeter"
+Fallback="DifficultyDisplay"
 ShowMeter=true
 MeterX=-70
 MeterY=0
@@ -3733,41 +3733,41 @@ PrevScreen="ScreenOptionsService"
 ScrollRandom=false
 ScrollRoulette=false
 
-[ScreenGameplay DifficultyMeterP1]
+[ScreenGameplay DifficultyDisplayP1]
-Fallback="DifficultyMeter"
+Fallback="DifficultyDisplay"
 
-[ScreenGameplay DifficultyMeterP2]
+[ScreenGameplay DifficultyDisplayP2]
-Fallback="DifficultyMeter"
+Fallback="DifficultyDisplay"
 
-[ScreenGameplayExtra DifficultyMeterP1]
+[ScreenGameplayExtra DifficultyDisplayP1]
-Fallback="DifficultyMeter"
+Fallback="DifficultyDisplay"
 
-[ScreenGameplayExtra DifficultyMeterP2]
+[ScreenGameplayExtra DifficultyDisplayP2]
-Fallback="DifficultyMeter"
+Fallback="DifficultyDisplay"
 
-[ScreenDemonstration DifficultyMeterP1]
+[ScreenDemonstration DifficultyDisplayP1]
-Fallback="DifficultyMeter"
+Fallback="DifficultyDisplay"
 
-[ScreenDemonstration DifficultyMeterP2]
+[ScreenDemonstration DifficultyDisplayP2]
-Fallback="DifficultyMeter"
+Fallback="DifficultyDisplay"
 
-[ScreenEvaluation DifficultyMeterP1]
+[ScreenEvaluation DifficultyDisplayP1]
-Fallback="DifficultyMeter"
+Fallback="DifficultyDisplay"
 
-[ScreenEvaluation DifficultyMeterP2]
+[ScreenEvaluation DifficultyDisplayP2]
-Fallback="DifficultyMeter"
+Fallback="DifficultyDisplay"
 
-[ScreenGameplayMultiplayer DifficultyMeterP1]
+[ScreenGameplayMultiplayer DifficultyDisplayP1]
-Fallback="DifficultyMeter"
+Fallback="DifficultyDisplay"
 
-[ScreenGameplaySyncMachine DifficultyMeterP1]
+[ScreenGameplaySyncMachine DifficultyDisplayP1]
-Fallback="DifficultyMeter"
+Fallback="DifficultyDisplay"
 
-[ScreenGameplayShared DifficultyMeterP1]
+[ScreenGameplayShared DifficultyDisplayP1]
-Fallback="DifficultyMeter"
+Fallback="DifficultyDisplay"
 
-[ScreenGameplayShared DifficultyMeterP2]
+[ScreenGameplayShared DifficultyDisplayP2]
-Fallback="DifficultyMeter"
+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]
+[ScreenJukebox DifficultyDisplayP1]
-Fallback="ScreenGameplay DifficultyMeterP1"
+Fallback="ScreenGameplay DifficultyDisplayP1"
 
-[ScreenJukebox DifficultyMeterP2]
+[ScreenJukebox DifficultyDisplayP2]
-Fallback="ScreenGameplay DifficultyMeterP2"
+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=

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"

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<Line>	m_Lines;
 

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 );
 

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;
+	DifficultyDisplay	m_Meter;
-	DifficultyMeter	m_SourceMeter;
+	DifficultyDisplay	m_SourceMeter;
 
 
 	struct StepsAndDifficulty

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 \

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"

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_DifficultyDisplays[p].SetName( ssprintf("MeterP%d",p+1) );
-		m_DifficultyMeters[p].Load( "DifficultyMeter" );
+		m_DifficultyDisplays[p].Load( "DifficultyDisplay" );
-		LOAD_ALL_COMMANDS_AND_SET_XY_AND_ON_COMMAND( m_DifficultyMeters[p] );
+		LOAD_ALL_COMMANDS_AND_SET_XY_AND_ON_COMMAND( m_DifficultyDisplays[p] );
-		this->AddChild( &m_DifficultyMeters[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()

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;

stepmania/src/StepMania-net2003.vcproj

@@ -1358,18 +1358,18 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 			<File
 				RelativePath="CourseContentsList.h">
 			</File>
+			<File
+				RelativePath=".\DifficultyDisplay.cpp">
+			</File>
+			<File
+				RelativePath=".\DifficultyDisplay.h">
+			</File>
 			<File
 				RelativePath="DifficultyList.cpp">
 			</File>
 			<File
 				RelativePath="DifficultyList.h">
 			</File>
-			<File
-				RelativePath="DifficultyMeter.cpp">
-			</File>
-			<File
-				RelativePath="DifficultyMeter.h">
-			</File>
 			<File
 				RelativePath="DualScrollBar.cpp">
 			</File>