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

remove old, redundant "NextScreen%d" metric

Browse Source
This commit is contained in:
Chris Danford
2005-07-13 19:21:03 +00:00
parent 6f9d4caf0f
commit a6a70e41ae
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelect.cpp
+3 -9
View File
@@ -11,11 +11,10 @@
#include "Command.h" #include "Command.h"
#define CHOICE_NAMES THEME->GetMetric (m_sName,"ChoiceNames") #define CHOICE_NAMES THEME->GetMetric (m_sName,"ChoiceNames")
#define CHOICE( sChoiceName ) THEME->GetMetricM(m_sName,ssprintf("Choice%s",sChoiceName.c_str())) #define CHOICE( s ) THEME->GetMetricM(m_sName,ssprintf("Choice%s",s.c_str()))
#define CODE_NAMES THEME->GetMetric (m_sName,"CodeNames") #define CODE_NAMES THEME->GetMetric (m_sName,"CodeNames")
#define CODE( s ) THEME->GetMetric (m_sName,ssprintf("Code%s",s.c_str())) #define CODE( s ) THEME->GetMetric (m_sName,ssprintf("Code%s",s.c_str()))
#define CODE_ACTION( s ) THEME->GetMetricM(m_sName,ssprintf("Code%sAction",s.c_str())) #define CODE_ACTION( s ) THEME->GetMetricM(m_sName,ssprintf("Code%sAction",s.c_str()))
#define NEXT_SCREEN( c ) THEME->GetMetric (m_sName,ssprintf("NextScreen%d",c+1))
#define IDLE_TIMEOUT_SCREEN THEME->GetMetric (m_sName,"IdleTimeoutScreen") #define IDLE_TIMEOUT_SCREEN THEME->GetMetric (m_sName,"IdleTimeoutScreen")
#define ALLOW_DISABLED_PLAYER_INPUT THEME->GetMetricB(m_sName,"AllowDisabledPlayerInput") #define ALLOW_DISABLED_PLAYER_INPUT THEME->GetMetricB(m_sName,"AllowDisabledPlayerInput")
#define UPDATE_ON_MESSAGE THEME->GetMetric (m_sName,"UpdateOnMessage") #define UPDATE_ON_MESSAGE THEME->GetMetric (m_sName,"UpdateOnMessage")
@@ -178,7 +177,8 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
{ {
FOREACH_HumanPlayer( p ) FOREACH_HumanPlayer( p )
{ {
GameCommand gc = m_aGameCommands[this->GetSelectionIndex(p)]; int iIndex = this->GetSelectionIndex(p);
GameCommand &gc = m_aGameCommands[iIndex];
CString sThisScreen = gc.GetAndClearScreen(); CString sThisScreen = gc.GetAndClearScreen();
if( m_sNextScreen == "" ) if( m_sNextScreen == "" )
m_sNextScreen = sThisScreen; m_sNextScreen = sThisScreen;
@@ -200,12 +200,6 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
} }
} }
if( m_sNextScreen == "" )
{
const int iSelectionIndex = GetSelectionIndex(GAMESTATE->m_MasterPlayerNumber);
m_sNextScreen = NEXT_SCREEN(iSelectionIndex);
}
SCREENMAN->ConcurrentlyPrepareScreen( m_sNextScreen ); SCREENMAN->ConcurrentlyPrepareScreen( m_sNextScreen );
} }
else if( SM == SM_AllDoneChoosing ) /* It's our turn to tween out. */ else if( SM == SM_AllDoneChoosing ) /* It's our turn to tween out. */