From 65f5517e2ed771e9be935766dcee90ac1a7cf348 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 16 Aug 2006 22:53:39 +0000 Subject: [PATCH] difficulty meter in xml --- stepmania/Themes/default/metrics.ini | 9 --------- stepmania/src/ScreenSelectMusic.cpp | 10 ---------- stepmania/src/ScreenSelectMusic.h | 2 -- 3 files changed, 21 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 6be6dd3af6..59397417c1 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -511,15 +511,6 @@ MachineRankX= MachineRankY= MachineRankOnCommand=hidden,1 MachineRankOffCommand= -MeterType=DifficultyMeter -MeterP1X=SCREEN_CENTER_X-254 -MeterP1Y=SCREEN_CENTER_Y-20 -MeterP1OnCommand=zoomy,0;linear,0.5;zoomy,1 -MeterP1OffCommand=linear,0.5;zoomy,0 -MeterP2X=SCREEN_CENTER_X-121 -MeterP2Y=SCREEN_CENTER_Y-20 -MeterP2OnCommand=zoomy,0;linear,0.5;zoomy,1 -MeterP2OffCommand=linear,0.5;zoomy,0 NumSongsX= NumSongsY= NumSongsOnCommand=hidden,1 diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 439c9230ed..65576e5e05 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -32,7 +32,6 @@ const int NUM_SCORE_DIGITS = 9; -#define METER_TYPE THEME->GetMetric ( m_sName, "MeterType" ) #define SHOW_OPTIONS_MESSAGE_SECONDS THEME->GetMetricF( m_sName, "ShowOptionsMessageSeconds" ) AutoScreenMessage( SM_AllowOptionsMenuRepeat ) @@ -155,11 +154,6 @@ void ScreenSelectMusic::Init() FOREACH_HumanPlayer( p ) { - m_DifficultyMeter[p].SetName( ssprintf("MeterP%d",p+1) ); - m_DifficultyMeter[p].Load( METER_TYPE ); - SET_XY( m_DifficultyMeter[p] ); - this->AddChild( &m_DifficultyMeter[p] ); - m_sprHighScoreFrame[p].SetName( ssprintf("ScoreFrameP%d",p+1) ); m_sprHighScoreFrame[p].Load( THEME->GetPathG(m_sName,ssprintf("score frame p%d",p+1)) ); SET_XY( m_sprHighScoreFrame[p] ); @@ -926,8 +920,6 @@ void ScreenSelectMusic::AfterStepsChange( const vector &vpns ) } m_textHighScore[pn].SetText( ssprintf("%*i", NUM_SCORE_DIGITS, iScore) ); - - m_DifficultyMeter[pn].SetFromGameState( pn ); } } @@ -954,8 +946,6 @@ void ScreenSelectMusic::AfterTrailChange( const vector &vpns ) } m_textHighScore[pn].SetText( ssprintf("%*i", NUM_SCORE_DIGITS, iScore) ); - - m_DifficultyMeter[pn].SetFromGameState( pn ); } } diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index 7e23c66699..deb3f9fa62 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -10,7 +10,6 @@ #include "MusicWheel.h" #include "Banner.h" #include "FadingBanner.h" -#include "DifficultyMeter.h" #include "DifficultyDisplay.h" #include "RageUtil_BackgroundLoader.h" #include "ThemeMetric.h" @@ -81,7 +80,6 @@ protected: Sprite m_sprCDTitleFront, m_sprCDTitleBack; BitmapText m_textNumSongs; BitmapText m_textTotalTime; - DifficultyMeter m_DifficultyMeter[NUM_PLAYERS]; Sprite m_sprHighScoreFrame[NUM_PLAYERS]; BitmapText m_textHighScore[NUM_PLAYERS]; MusicWheel m_MusicWheel;