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

Clean up a little

Browse Source
This commit is contained in:
Josh Allen
2006-11-24 16:03:49 +00:00
parent 529444f44c
commit 86cbc8accd
1 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenNetEvaluation.cpp
+9 -19
View File
@@ -26,7 +26,6 @@ void ScreenNetEvaluation::Init()
ScreenEvaluation::Init(); ScreenEvaluation::Init();
m_bHasStats = false; m_bHasStats = false;
m_pActivePlayer = PLAYER_1;
m_iCurrentPlayer = 0; m_iCurrentPlayer = 0;
FOREACH_PlayerNumber (pn) FOREACH_PlayerNumber (pn)
@@ -58,19 +57,18 @@ void ScreenNetEvaluation::Init()
void ScreenNetEvaluation::RedoUserTexts() void ScreenNetEvaluation::RedoUserTexts()
{ {
m_iActivePlayers = NSMAN->m_ActivePlayers; m_iActivePlayers = NSMAN->m_ActivePlayers;
//If unessiary, just don't do this function.
//If unnecessary, just don't do this function.
if ( m_iActivePlayers == (int)m_textUsers.size() ) if ( m_iActivePlayers == (int)m_textUsers.size() )
return; return;
for( unsigned int i=0; i < m_textUsers.size(); ++i )
this->RemoveChild( &m_textUsers[i] );
float cx = THEME->GetMetricF("ScreenNetEvaluation",ssprintf("User%dX",m_iShowSide)); float cx = THEME->GetMetricF("ScreenNetEvaluation",ssprintf("User%dX",m_iShowSide));
float cy = THEME->GetMetricF("ScreenNetEvaluation",ssprintf("User%dY",m_iShowSide)); float cy = THEME->GetMetricF("ScreenNetEvaluation",ssprintf("User%dY",m_iShowSide));
m_iCurrentPlayer = 0; m_iCurrentPlayer = 0;
for( int i=0; i<m_iActivePlayers; ++i )
if (i < m_textUsers.size())
this->RemoveChild( &m_textUsers[i] );
m_textUsers.resize(m_iActivePlayers); m_textUsers.resize(m_iActivePlayers);
for( int i=0; i<m_iActivePlayers; ++i ) for( int i=0; i<m_iActivePlayers; ++i )
@@ -93,10 +91,9 @@ void ScreenNetEvaluation::MenuLeft( const InputEventPlus &input )
void ScreenNetEvaluation::MenuUp( const InputEventPlus &input ) void ScreenNetEvaluation::MenuUp( const InputEventPlus &input )
{ {
if ( m_iActivePlayers == 0 ) if ( (m_iActivePlayers == 0) || !m_bHasStats )
return;
if (!m_bHasStats)
return; return;
COMMAND( m_textUsers[m_iCurrentPlayer], "DeSel" ); COMMAND( m_textUsers[m_iCurrentPlayer], "DeSel" );
m_iCurrentPlayer = (m_iCurrentPlayer + m_iActivePlayers - 1) % m_iActivePlayers; m_iCurrentPlayer = (m_iCurrentPlayer + m_iActivePlayers - 1) % m_iActivePlayers;
COMMAND( m_textUsers[m_iCurrentPlayer], "Sel" ); COMMAND( m_textUsers[m_iCurrentPlayer], "Sel" );
@@ -110,10 +107,9 @@ void ScreenNetEvaluation::MenuRight( const InputEventPlus &input )
void ScreenNetEvaluation::MenuDown( const InputEventPlus &input ) void ScreenNetEvaluation::MenuDown( const InputEventPlus &input )
{ {
if ( m_iActivePlayers == 0 ) if ( (m_iActivePlayers == 0) || !m_bHasStats )
return;
if ( !m_bHasStats )
return; return;
COMMAND( m_textUsers[m_iCurrentPlayer], "DeSel" ); COMMAND( m_textUsers[m_iCurrentPlayer], "DeSel" );
m_iCurrentPlayer = (m_iCurrentPlayer + 1) % m_iActivePlayers; m_iCurrentPlayer = (m_iCurrentPlayer + 1) % m_iActivePlayers;
COMMAND( m_textUsers[m_iCurrentPlayer], "Sel" ); COMMAND( m_textUsers[m_iCurrentPlayer], "Sel" );
@@ -128,12 +124,6 @@ void ScreenNetEvaluation::HandleScreenMessage( const ScreenMessage SM )
LOG->Trace("SMNETDebug:%d,%d",m_iActivePlayers,NSMAN->m_ActivePlayers); LOG->Trace("SMNETDebug:%d,%d",m_iActivePlayers,NSMAN->m_ActivePlayers);
//XXX: This does remove functionalty, but until
// the cause for the strange snowball ScreenManager
// crash can be found... this is the only way.
if ( m_iActivePlayers != NSMAN->m_ActivePlayers )
return;
RedoUserTexts(); RedoUserTexts();
LOG->Trace("SMNETCheckpoint"); LOG->Trace("SMNETCheckpoint");