From e86cad12347e628edd08716ddce298bea1afa037 Mon Sep 17 00:00:00 2001 From: Charles Lohr Date: Tue, 17 Jan 2006 06:11:22 +0000 Subject: [PATCH] Fix SMOnline in StepMania --- stepmania/src/ScreenGameplay.cpp | 2 +- stepmania/src/ScreenSMOnlineLogin.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 7179fdcea8..22a5ef0d0d 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -569,7 +569,7 @@ void ScreenGameplay::Init() { m_bShowScoreboard = PREFSMAN->m_bEnableScoreboard.Get(); PlayerNumber pn = GAMESTATE->GetFirstDisabledPlayer(); - if( pn != PLAYER_INVALID ) + if( ( pn != PLAYER_INVALID ) && ( m_bShowScoreboard ) ) { FOREACH_NSScoreBoardColumn( col ) { diff --git a/stepmania/src/ScreenSMOnlineLogin.cpp b/stepmania/src/ScreenSMOnlineLogin.cpp index 6d3e36fc23..9516272f3c 100644 --- a/stepmania/src/ScreenSMOnlineLogin.cpp +++ b/stepmania/src/ScreenSMOnlineLogin.cpp @@ -28,6 +28,7 @@ static LocalizedString DEFINE_A_PROFILE( "ScreenSMOnlineLogin", "You must define void ScreenSMOnlineLogin::Init() { ScreenOptions::Init(); + m_iPlayer = 0; g_ProfileLine[0].m_vsChoices.clear(); PROFILEMAN->GetLocalProfileDisplayNames( g_ProfileLine[0].m_vsChoices ); @@ -95,7 +96,9 @@ static LocalizedString ENTER_YOUR_PASSWORD ( "ScreenSMOnlineLogin", "Enter your void ScreenSMOnlineLogin::HandleScreenMessage(const ScreenMessage SM) { - CString sLoginQuestion = YOU_ARE_LOGGING_ON_AS.GetValue()+"\n" + GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer) + "\n\n"+ENTER_YOUR_PASSWORD.GetValue(); + CString sLoginQuestion; + if ( GAMESTATE->IsPlayerEnabled((PlayerNumber) m_iPlayer) ) + sLoginQuestion = YOU_ARE_LOGGING_ON_AS.GetValue()+"\n" + GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer) + "\n\n"+ENTER_YOUR_PASSWORD.GetValue(); if( SM == SM_PasswordDone ) {