From 3bcb5b96b04efc3a32c816ab7522338698f0d75d Mon Sep 17 00:00:00 2001 From: Kevin Slaughter Date: Sat, 26 Apr 2003 06:48:17 +0000 Subject: [PATCH] Changed old `difficulty icons 1x5' to match new 1x7 --- stepmania/src/ScreenCredits.cpp | 1 + stepmania/src/ScreenEvaluation.cpp | 2 +- stepmania/src/ScreenSelectDifficultyEX.cpp | 9 +++++++++ stepmania/src/ScreenSelectDifficultyEX.h | 2 ++ stepmania/src/ScreenSelectMusic.cpp | 2 +- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenCredits.cpp b/stepmania/src/ScreenCredits.cpp index aeddf49bdb..b171be805b 100644 --- a/stepmania/src/ScreenCredits.cpp +++ b/stepmania/src/ScreenCredits.cpp @@ -116,6 +116,7 @@ const CreditLine CREDIT_LINES[] = {0,"TheChip"}, {0,"WarriorBob (David H)"}, {0,"Mike Waltson"}, + {0,"Kevin Slaughter (Miryokuteki)"}, {0,""}, {0,""}, {0,""}, diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index bc0d789963..0e8ff09bbd 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -282,7 +282,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type ) : Screen(sCl if( !GAMESTATE->IsPlayerEnabled(p) ) 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].SetName( ssprintf("DifficultyIconP%d",p+1) ); UtilSetXYAndOnCommand( m_DifficultyIcon[p], "ScreenEvaluation" ); diff --git a/stepmania/src/ScreenSelectDifficultyEX.cpp b/stepmania/src/ScreenSelectDifficultyEX.cpp index e37949d22d..507063c02e 100644 --- a/stepmania/src/ScreenSelectDifficultyEX.cpp +++ b/stepmania/src/ScreenSelectDifficultyEX.cpp @@ -60,6 +60,15 @@ ScreenSelectDifficultyEX::ScreenSelectDifficultyEX() : ScreenSelect( "ScreenSele for( p=0; pGetPathToG("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 ); m_bChosen[p] = false; diff --git a/stepmania/src/ScreenSelectDifficultyEX.h b/stepmania/src/ScreenSelectDifficultyEX.h index 821343d9e7..a1089352d9 100644 --- a/stepmania/src/ScreenSelectDifficultyEX.h +++ b/stepmania/src/ScreenSelectDifficultyEX.h @@ -18,6 +18,7 @@ #include "RandomSample.h" #include "ScreenSelect.h" #include "Sprite.h" +#include "DifficultyIcon.h" class ScreenSelectDifficultyEX : public ScreenSelect { @@ -53,6 +54,7 @@ protected: // Sprite m_sprExplanation; Will implement properly soon -- Miryokuteki Sprite m_sprInfo[NUM_PLAYERS]; // Sprite m_sprMore; Will implement properly soon -- Miryokuteki + DifficultyIcon m_sprDifficultyIcon[NUM_PLAYERS]; Sprite m_sprOK[NUM_PLAYERS]; Sprite m_sprPicture[NUM_PLAYERS]; diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index ec20a615eb..cfacd0afd2 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -113,7 +113,7 @@ ScreenSelectMusic::ScreenSelectMusic() : Screen("ScreenSelectMusic") this->AddChild( &m_sprDifficultyFrame[p] ); 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] ); m_AutoGenIcon[p].SetName( ssprintf("AutogenIconP%d",p+1) );