remove unused DifficultyIcon. Do this in Lua if wanted.
This commit is contained in:
@@ -1061,14 +1061,6 @@ PlayerType="PlayerShared"
|
|||||||
Fallback="ScreenWithMenuElements"
|
Fallback="ScreenWithMenuElements"
|
||||||
Class="ScreenEvaluation"
|
Class="ScreenEvaluation"
|
||||||
Summary=false
|
Summary=false
|
||||||
DifficultyIconP1X=
|
|
||||||
DifficultyIconP1Y=
|
|
||||||
DifficultyIconP1OnCommand=hidden,1
|
|
||||||
DifficultyIconP1OffCommand=
|
|
||||||
DifficultyIconP2X=
|
|
||||||
DifficultyIconP2Y=
|
|
||||||
DifficultyIconP2OnCommand=hidden,1
|
|
||||||
DifficultyIconP2OffCommand=
|
|
||||||
PlayerOptionsSeparator=","
|
PlayerOptionsSeparator=","
|
||||||
MaxComboNumDigits=4
|
MaxComboNumDigits=4
|
||||||
StyleIcon=true
|
StyleIcon=true
|
||||||
|
|||||||
@@ -313,16 +313,6 @@ void ScreenEvaluation::Init()
|
|||||||
{
|
{
|
||||||
FOREACH_EnabledPlayer( p )
|
FOREACH_EnabledPlayer( p )
|
||||||
{
|
{
|
||||||
m_DifficultyIcon[p].Load( THEME->GetPathG(m_sName,"difficulty icons") );
|
|
||||||
if( GAMESTATE->IsCourseMode() )
|
|
||||||
m_DifficultyIcon[p].SetFromTrail( p, GAMESTATE->m_pCurTrail[p] );
|
|
||||||
else
|
|
||||||
m_DifficultyIcon[p].SetFromSteps( p, GAMESTATE->m_pCurSteps[p] );
|
|
||||||
m_DifficultyIcon[p].SetName( ssprintf("DifficultyIconP%d",p+1) );
|
|
||||||
ActorUtil::LoadAllCommands( m_DifficultyIcon[p], m_sName );
|
|
||||||
SET_XY( m_DifficultyIcon[p] );
|
|
||||||
this->AddChild( &m_DifficultyIcon[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 );
|
||||||
|
|||||||
@@ -8,7 +8,6 @@
|
|||||||
#include "BitmapText.h"
|
#include "BitmapText.h"
|
||||||
#include "GradeDisplay.h"
|
#include "GradeDisplay.h"
|
||||||
#include "Banner.h"
|
#include "Banner.h"
|
||||||
#include "DifficultyIcon.h"
|
|
||||||
#include "PercentageDisplay.h"
|
#include "PercentageDisplay.h"
|
||||||
#include "ActorUtil.h"
|
#include "ActorUtil.h"
|
||||||
#include "RageSound.h"
|
#include "RageSound.h"
|
||||||
@@ -59,7 +58,6 @@ protected:
|
|||||||
// banner area
|
// banner area
|
||||||
Banner m_LargeBanner;
|
Banner m_LargeBanner;
|
||||||
AutoActor m_sprLargeBannerFrame;
|
AutoActor m_sprLargeBannerFrame;
|
||||||
DifficultyIcon m_DifficultyIcon[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];
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
#include "Quad.h"
|
#include "Quad.h"
|
||||||
#include "BitmapText.h"
|
#include "BitmapText.h"
|
||||||
#include "ScreenMessage.h"
|
#include "ScreenMessage.h"
|
||||||
|
#include "DifficultyIcon.h"
|
||||||
|
|
||||||
class ScreenNetEvaluation: public ScreenEvaluation
|
class ScreenNetEvaluation: public ScreenEvaluation
|
||||||
{
|
{
|
||||||
@@ -20,6 +21,7 @@ protected:
|
|||||||
void UpdateStats( );
|
void UpdateStats( );
|
||||||
private:
|
private:
|
||||||
Quad m_rectUsersBG;
|
Quad m_rectUsersBG;
|
||||||
|
DifficultyIcon m_DifficultyIcon[NUM_PLAYERS];
|
||||||
|
|
||||||
vector<BitmapText> m_textUsers;
|
vector<BitmapText> m_textUsers;
|
||||||
int m_iCurrentPlayer;
|
int m_iCurrentPlayer;
|
||||||
|
|||||||
Reference in New Issue
Block a user