remove unused DifficultyMeter. Do this in Lua if wnated.
This commit is contained in:
@@ -1069,19 +1069,10 @@ DifficultyIconP2X=
|
|||||||
DifficultyIconP2Y=
|
DifficultyIconP2Y=
|
||||||
DifficultyIconP2OnCommand=hidden,1
|
DifficultyIconP2OnCommand=hidden,1
|
||||||
DifficultyIconP2OffCommand=
|
DifficultyIconP2OffCommand=
|
||||||
DifficultyMeterP1X=
|
|
||||||
DifficultyMeterP1Y=
|
|
||||||
DifficultyMeterP1OnCommand=hidden,1
|
|
||||||
DifficultyMeterP1OffCommand=
|
|
||||||
DifficultyMeterP2X=
|
|
||||||
DifficultyMeterP2Y=
|
|
||||||
DifficultyMeterP2OnCommand=hidden,1
|
|
||||||
DifficultyMeterP2OffCommand=
|
|
||||||
PlayerOptionsSeparator=","
|
PlayerOptionsSeparator=","
|
||||||
MaxComboNumDigits=4
|
MaxComboNumDigits=4
|
||||||
StyleIcon=true
|
StyleIcon=true
|
||||||
ShowBannerArea=true
|
ShowBannerArea=true
|
||||||
ShowDifficultyMeters=true
|
|
||||||
ShowJudgmentLabels=true
|
ShowJudgmentLabels=true
|
||||||
ShowW1=true
|
ShowW1=true
|
||||||
ShowW2=true
|
ShowW2=true
|
||||||
|
|||||||
@@ -56,7 +56,6 @@ XToString( StatLine );
|
|||||||
// metrics that are specific to classes derived from ScreenEvaluation
|
// metrics that are specific to classes derived from ScreenEvaluation
|
||||||
#define SHOW_BANNER_AREA THEME->GetMetricB(m_sName,"ShowBannerArea")
|
#define SHOW_BANNER_AREA THEME->GetMetricB(m_sName,"ShowBannerArea")
|
||||||
#define SHOW_GRADE_AREA THEME->GetMetricB(m_sName,"ShowGradeArea")
|
#define SHOW_GRADE_AREA THEME->GetMetricB(m_sName,"ShowGradeArea")
|
||||||
#define SHOW_DIFFICULTY_METERS THEME->GetMetricB(m_sName,"ShowDifficultyMeters")
|
|
||||||
#define SHOW_POINTS_AREA THEME->GetMetricB(m_sName,"ShowPointsArea")
|
#define SHOW_POINTS_AREA THEME->GetMetricB(m_sName,"ShowPointsArea")
|
||||||
#define SHOW_BONUS_AREA THEME->GetMetricB(m_sName,"ShowBonusArea")
|
#define SHOW_BONUS_AREA THEME->GetMetricB(m_sName,"ShowBonusArea")
|
||||||
#define SHOW_SURVIVED_AREA THEME->GetMetricB(m_sName,"ShowSurvivedArea")
|
#define SHOW_SURVIVED_AREA THEME->GetMetricB(m_sName,"ShowSurvivedArea")
|
||||||
@@ -324,19 +323,6 @@ void ScreenEvaluation::Init()
|
|||||||
SET_XY( m_DifficultyIcon[p] );
|
SET_XY( m_DifficultyIcon[p] );
|
||||||
this->AddChild( &m_DifficultyIcon[p] );
|
this->AddChild( &m_DifficultyIcon[p] );
|
||||||
|
|
||||||
if( SHOW_DIFFICULTY_METERS )
|
|
||||||
{
|
|
||||||
m_DifficultyMeter[p].SetName( ssprintf("DifficultyMeterP%d",p+1) );
|
|
||||||
m_DifficultyMeter[p].Load( ssprintf("ScreenEvaluation DifficultyMeterP%d",p+1) );
|
|
||||||
if( GAMESTATE->IsCourseMode() )
|
|
||||||
m_DifficultyMeter[p].SetFromTrail( GAMESTATE->m_pCurTrail[p] );
|
|
||||||
else
|
|
||||||
m_DifficultyMeter[p].SetFromSteps( GAMESTATE->m_pCurSteps[p] );
|
|
||||||
ActorUtil::LoadAllCommands( m_DifficultyMeter[p], m_sName );
|
|
||||||
SET_XY( m_DifficultyMeter[p] );
|
|
||||||
this->AddChild( &m_DifficultyMeter[p] );
|
|
||||||
}
|
|
||||||
|
|
||||||
m_textPlayerOptions[p].LoadFromFont( THEME->GetPathF(m_sName,"PlayerOptions") );
|
m_textPlayerOptions[p].LoadFromFont( THEME->GetPathF(m_sName,"PlayerOptions") );
|
||||||
m_textPlayerOptions[p].SetName( ssprintf("PlayerOptionsP%d",p+1) );
|
m_textPlayerOptions[p].SetName( ssprintf("PlayerOptionsP%d",p+1) );
|
||||||
ActorUtil::LoadAllCommands( m_textPlayerOptions[p], m_sName );
|
ActorUtil::LoadAllCommands( m_textPlayerOptions[p], m_sName );
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
#include "GradeDisplay.h"
|
#include "GradeDisplay.h"
|
||||||
#include "Banner.h"
|
#include "Banner.h"
|
||||||
#include "DifficultyIcon.h"
|
#include "DifficultyIcon.h"
|
||||||
#include "DifficultyMeter.h"
|
|
||||||
#include "PercentageDisplay.h"
|
#include "PercentageDisplay.h"
|
||||||
#include "ActorUtil.h"
|
#include "ActorUtil.h"
|
||||||
#include "RageSound.h"
|
#include "RageSound.h"
|
||||||
@@ -61,7 +60,6 @@ protected:
|
|||||||
Banner m_LargeBanner;
|
Banner m_LargeBanner;
|
||||||
AutoActor m_sprLargeBannerFrame;
|
AutoActor m_sprLargeBannerFrame;
|
||||||
DifficultyIcon m_DifficultyIcon[NUM_PLAYERS];
|
DifficultyIcon m_DifficultyIcon[NUM_PLAYERS];
|
||||||
DifficultyMeter m_DifficultyMeter[NUM_PLAYERS];
|
|
||||||
BitmapText m_textPlayerOptions[NUM_PLAYERS];
|
BitmapText m_textPlayerOptions[NUM_PLAYERS];
|
||||||
Banner m_SmallBanner[MAX_SONGS_TO_SHOW];
|
Banner m_SmallBanner[MAX_SONGS_TO_SHOW];
|
||||||
AutoActor m_sprSmallBannerFrame[MAX_SONGS_TO_SHOW];
|
AutoActor m_sprSmallBannerFrame[MAX_SONGS_TO_SHOW];
|
||||||
|
|||||||
Reference in New Issue
Block a user