actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix ScreenTitleMenu grabs wrong choice text

Browse Source
This commit is contained in:
Chris Danford
2004-02-13 07:45:21 +00:00
parent 817976ff1f
commit 8e0540d98a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelect.cpp
+1 -1
View File
@@ -31,7 +31,7 @@
#define CHOICE_NAMES THEME->GetMetric (m_sName,"ChoiceNames") #define CHOICE_NAMES THEME->GetMetric (m_sName,"ChoiceNames")
#define CHOICE( choice_name ) THEME->GetMetric (m_sName,ssprintf("Choice%s",choice_name.c_str())) #define CHOICE( sChoiceName ) THEME->GetMetric (m_sName,ssprintf("Choice%s",sChoiceName.c_str()))
#define NUM_CODES THEME->GetMetricI(m_sName,"NumCodes") #define NUM_CODES THEME->GetMetricI(m_sName,"NumCodes")
#define CODE( c ) THEME->GetMetric (m_sName,ssprintf("Code%d",c+1)) #define CODE( c ) THEME->GetMetric (m_sName,ssprintf("Code%d",c+1))
#define CODE_ACTION( c ) THEME->GetMetric (m_sName,ssprintf("Code%dAction",c+1)) #define CODE_ACTION( c ) THEME->GetMetric (m_sName,ssprintf("Code%dAction",c+1))
stepmania/src/ScreenTitleMenu.cpp
+4 -2
View File
@@ -53,7 +53,7 @@
#define MENU_ITEM_CREATE THEME->GetMetric("ScreenTitleMenu","MenuCommandOnCreate") #define MENU_ITEM_CREATE THEME->GetMetric("ScreenTitleMenu","MenuCommandOnCreate")
#define MENU_ITEM_SELECT_DELAY THEME->GetMetricF("ScreenTitleMenu","MenuCommandSelectDelay") #define MENU_ITEM_SELECT_DELAY THEME->GetMetricF("ScreenTitleMenu","MenuCommandSelectDelay")
#define NAME( choice ) THEME->GetMetric (m_sName,ssprintf("Name%d",choice+1)) #define NAME( sChoiceName ) THEME->GetMetric (m_sName,ssprintf("Name%s",sChoiceName.c_str()))
const ScreenMessage SM_PlayComment = ScreenMessage(SM_User+1); const ScreenMessage SM_PlayComment = ScreenMessage(SM_User+1);
const ScreenMessage SM_GoToAttractLoop = ScreenMessage(SM_User+13); const ScreenMessage SM_GoToAttractLoop = ScreenMessage(SM_User+13);
@@ -133,9 +133,11 @@ ScreenTitleMenu::ScreenTitleMenu( CString sClassName ) : ScreenSelect( sClassNam
{ {
for( unsigned i=0; i<m_aModeChoices.size(); i++ ) for( unsigned i=0; i<m_aModeChoices.size(); i++ )
{ {
ModeChoice &mc = m_aModeChoices[i];
m_textChoice[i].LoadFromFont( THEME->GetPathToF("ScreenTitleMenu choices") ); m_textChoice[i].LoadFromFont( THEME->GetPathToF("ScreenTitleMenu choices") );
m_textChoice[i].SetHorizAlign( (enum Actor::HorizAlign)MENU_TEXT_ALIGN ); m_textChoice[i].SetHorizAlign( (enum Actor::HorizAlign)MENU_TEXT_ALIGN );
m_textChoice[i].SetText( NAME(i) ); m_textChoice[i].SetText( NAME(mc.m_sName) );
m_textChoice[i].SetXY( CHOICES_X, CHOICES_START_Y + i*CHOICES_SPACING_Y ); m_textChoice[i].SetXY( CHOICES_X, CHOICES_START_Y + i*CHOICES_SPACING_Y );
m_textChoice[i].SetShadowLength( CHOICES_SHADOW_LENGTH ); m_textChoice[i].SetShadowLength( CHOICES_SHADOW_LENGTH );
m_textChoice[i].EnableShadow( true ); m_textChoice[i].EnableShadow( true );