From 47e08af623fa4ae607ce5f9b016b5e6dd11d7a44 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Thu, 10 Jul 2003 03:39:30 +0000 Subject: [PATCH] key for testing incoming (temporary) --- stepmania/src/ScreenGameplay.cpp | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 6b93c96005..ff6c2332ca 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -471,10 +471,15 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration ) : Screen("ScreenGameplay") for( p=0; pIsPlayerEnabled(PlayerNumber(p)) ) + if( !GAMESTATE->IsPlayerEnabled(p) ) continue; m_DifficultyIcon[p].Load( THEME->GetPathToG("ScreenGameplay difficulty icons 2x5") ); + + // UGLY HACK: Don't show difficulty icon for CPU. + if( GAMESTATE->m_PlayMode == PLAY_MODE_CPU_BATTLE && GAMESTATE->IsCpuPlayer(p) ) + m_DifficultyIcon[p].SetZoom( 0 ); + /* Position it in LoadNextSong. */ this->AddChild( &m_DifficultyIcon[p] ); } @@ -1366,6 +1371,21 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ m_textDebug.SetDiffuse( RageColor(1,1,1,0) ); } break; + // testing: + case SDLK_PAUSE: + { + if( GAMESTATE->m_PlayerOptions[PLAYER_1].m_fPerspectiveTilt == -1 ) // incoming + { + for( int p=0; pm_PlayerOptions[PLAYER_1].m_fPerspectiveTilt = 0; + } + else + { + for( int p=0; pm_PlayerOptions[PLAYER_1].m_fPerspectiveTilt = -1; + } + } + break; } } @@ -1603,10 +1623,9 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) switch( GAMESTATE->m_PlayMode ) { case PLAY_MODE_HUMAN_BATTLE: - case PLAY_MODE_CPU_BATTLE: case PLAY_MODE_RAVE: { - PlayerNumber winner = GAMESTATE->GetWinner(); + PlayerNumber winner = GAMESTATE->GetBestPlayer(); switch( winner ) { case PLAYER_INVALID: