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

Moved more constants into theme metrics

Browse Source
This commit is contained in:
Chris Danford
2002-08-22 09:31:32 +00:00
parent a0cf0fde6b
commit 822f8dd3a6
38 changed files with 1380 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+9 -4
View File
@@ -692,6 +692,7 @@ void ScreenGameplay::LoadNextSong( bool bFirstLoad )
m_Player[p].Load( (PlayerNumber)p, &newNoteData, m_pLifeMeter[p], m_pScoreDisplay[p] );
}
m_Background.LoadFromSong( GAMESTATE->m_pCurSong );
m_Background.LoadFromSong( GAMESTATE->m_pCurSong );
m_Background.SetDiffuseColor( D3DXCOLOR(0.5f,0.5f,0.5f,1) );
m_Background.BeginTweeningQueued( 2 );
@@ -922,7 +923,7 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ
if( GAMESTATE->m_bDemonstration )
{
if( MenuI.button == MENU_BUTTON_START && !m_Fade.IsClosing() )
if( MenuI.button==MENU_BUTTON_START && !m_Fade.IsClosing() )
{
m_soundMusic.Stop();
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","insert coin") );
@@ -930,6 +931,10 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ
this->SendScreenMessage( SM_GoToTitleMenu, 0 );
// m_Fade.CloseWipingRight( SM_GoToTitleMenu );
}
else if( DeviceI.device==DEVICE_KEYBOARD && DeviceI.button==DIK_ESCAPE && !m_Fade.IsClosing() )
{
this->SendScreenMessage( SM_BeginFadingToTitleMenu, 0 );
}
return; // don't fall through below
}
@@ -1410,12 +1415,12 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
ShowSavePrompt( SM_GoToScreenAfterFail );
break;
}
if( PREFSMAN->m_bEventMode )
if( GAMESTATE->m_PlayMode == PLAY_MODE_ONI || GAMESTATE->m_PlayMode == PLAY_MODE_ENDLESS )
SCREENMAN->SetNewScreen( new ScreenEvaluation(false) );
else if( PREFSMAN->m_bEventMode )
this->SendScreenMessage( SM_GoToScreenAfterBack, 0 );
else if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
SCREENMAN->SetNewScreen( new ScreenEvaluation(true) );
else if( GAMESTATE->m_PlayMode == PLAY_MODE_ONI || GAMESTATE->m_PlayMode == PLAY_MODE_ENDLESS )
SCREENMAN->SetNewScreen( new ScreenEvaluation(false) );
else
SCREENMAN->SetNewScreen( new ScreenGameOver );
break;