Changed old `difficulty icons 1x5' to match new 1x7

This commit is contained in:
Kevin Slaughter
2003-04-26 06:48:17 +00:00
parent c2302b3776
commit 3bcb5b96b0
5 changed files with 14 additions and 2 deletions
+1
View File
@@ -116,6 +116,7 @@ const CreditLine CREDIT_LINES[] =
{0,"TheChip"}, {0,"TheChip"},
{0,"WarriorBob (David H)"}, {0,"WarriorBob (David H)"},
{0,"Mike Waltson"}, {0,"Mike Waltson"},
{0,"Kevin Slaughter (Miryokuteki)"},
{0,""}, {0,""},
{0,""}, {0,""},
{0,""}, {0,""},
+1 -1
View File
@@ -282,7 +282,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type ) : Screen(sCl
if( !GAMESTATE->IsPlayerEnabled(p) ) if( !GAMESTATE->IsPlayerEnabled(p) )
continue; // skip continue; // skip
m_DifficultyIcon[p].Load( THEME->GetPathToG("ScreenEvaluation difficulty icons 1x5") ); m_DifficultyIcon[p].Load( THEME->GetPathToG("ScreenEvaluation difficulty icons 1x7") );
m_DifficultyIcon[p].SetFromNotes( (PlayerNumber)p, GAMESTATE->m_pCurNotes[p] ); m_DifficultyIcon[p].SetFromNotes( (PlayerNumber)p, GAMESTATE->m_pCurNotes[p] );
m_DifficultyIcon[p].SetName( ssprintf("DifficultyIconP%d",p+1) ); m_DifficultyIcon[p].SetName( ssprintf("DifficultyIconP%d",p+1) );
UtilSetXYAndOnCommand( m_DifficultyIcon[p], "ScreenEvaluation" ); UtilSetXYAndOnCommand( m_DifficultyIcon[p], "ScreenEvaluation" );
@@ -60,6 +60,15 @@ ScreenSelectDifficultyEX::ScreenSelectDifficultyEX() : ScreenSelect( "ScreenSele
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
{ {
m_sprDifficultyIcon[p].Load( THEME->GetPathToG("ScreenSelectMusic difficulty icons 1x7") );
m_sprDifficultyIcon[p].SetX( 200 );
m_sprDifficultyIcon[p].SetY( 200 );
m_sprDifficultyIcon[p].SetZoom( 10 );
m_sprDifficultyIcon[p].SetState( 5 ); // 0=BEG, 1=LGT, 2=STD, 3=HVY, 4=NS/ONI
//this->AddChild( &m_sprDifficultyIcon[p] );
CLAMP( m_iChoice[p], 0, (int)m_ModeChoices.size()-1 ); CLAMP( m_iChoice[p], 0, (int)m_ModeChoices.size()-1 );
m_bChosen[p] = false; m_bChosen[p] = false;
+2
View File
@@ -18,6 +18,7 @@
#include "RandomSample.h" #include "RandomSample.h"
#include "ScreenSelect.h" #include "ScreenSelect.h"
#include "Sprite.h" #include "Sprite.h"
#include "DifficultyIcon.h"
class ScreenSelectDifficultyEX : public ScreenSelect class ScreenSelectDifficultyEX : public ScreenSelect
{ {
@@ -53,6 +54,7 @@ protected:
// Sprite m_sprExplanation; Will implement properly soon -- Miryokuteki // Sprite m_sprExplanation; Will implement properly soon -- Miryokuteki
Sprite m_sprInfo[NUM_PLAYERS]; Sprite m_sprInfo[NUM_PLAYERS];
// Sprite m_sprMore; Will implement properly soon -- Miryokuteki // Sprite m_sprMore; Will implement properly soon -- Miryokuteki
DifficultyIcon m_sprDifficultyIcon[NUM_PLAYERS];
Sprite m_sprOK[NUM_PLAYERS]; Sprite m_sprOK[NUM_PLAYERS];
Sprite m_sprPicture[NUM_PLAYERS]; Sprite m_sprPicture[NUM_PLAYERS];
+1 -1
View File
@@ -113,7 +113,7 @@ ScreenSelectMusic::ScreenSelectMusic() : Screen("ScreenSelectMusic")
this->AddChild( &m_sprDifficultyFrame[p] ); this->AddChild( &m_sprDifficultyFrame[p] );
m_DifficultyIcon[p].SetName( ssprintf("DifficultyIconP%d",p+1) ); m_DifficultyIcon[p].SetName( ssprintf("DifficultyIconP%d",p+1) );
m_DifficultyIcon[p].Load( THEME->GetPathToG("ScreenSelectMusic difficulty icons 1x5") ); m_DifficultyIcon[p].Load( THEME->GetPathToG("ScreenSelectMusic difficulty icons 1x7") );
this->AddChild( &m_DifficultyIcon[p] ); this->AddChild( &m_DifficultyIcon[p] );
m_AutoGenIcon[p].SetName( ssprintf("AutogenIconP%d",p+1) ); m_AutoGenIcon[p].SetName( ssprintf("AutogenIconP%d",p+1) );