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

Holding start to give up leaves gameplay instead of going to next song.

Browse Source
This commit is contained in:
Kyzentun
2014-12-22 03:52:08 -07:00
parent 7ee2938917
commit 55fb14cd10
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenGameplay.cpp
+15 -5
View File
@@ -1831,6 +1831,7 @@ void ScreenGameplay::Update( float fDeltaTime )
// update give up // update give up
bool bGiveUpTimerFired = !m_GiveUpTimer.IsZero() && m_GiveUpTimer.Ago() > GIVE_UP_SECONDS; bool bGiveUpTimerFired = !m_GiveUpTimer.IsZero() && m_GiveUpTimer.Ago() > GIVE_UP_SECONDS;
m_gave_up= bGiveUpTimerFired;
bool bAllHumanHaveBigMissCombo = true; bool bAllHumanHaveBigMissCombo = true;
@@ -2526,16 +2527,23 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi ) FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi )
{ {
// Mark failure. // Mark failure.
if( GAMESTATE->GetPlayerFailType(pi->GetPlayerState()) != FailType_Off && if(GAMESTATE->GetPlayerFailType(pi->GetPlayerState()) != FailType_Off
(pi->m_pLifeMeter && pi->m_pLifeMeter->IsFailing()) ) && (pi->m_pLifeMeter && pi->m_pLifeMeter->IsFailing()))
{
pi->GetPlayerStageStats()->m_bFailed = true; pi->GetPlayerStageStats()->m_bFailed = true;
}
if( !pi->GetPlayerStageStats()->m_bFailed ) if( !pi->GetPlayerStageStats()->m_bFailed )
{
pi->GetPlayerStageStats()->m_iSongsPassed++; pi->GetPlayerStageStats()->m_iSongsPassed++;
}
// set a life record at the point of failure // set a life record at the point of failure
if( pi->GetPlayerStageStats()->m_bFailed ) if( pi->GetPlayerStageStats()->m_bFailed )
pi->GetPlayerStageStats()->SetLifeRecordAt( 0, STATSMAN->m_CurStageStats.m_fGameplaySeconds ); {
pi->GetPlayerStageStats()->SetLifeRecordAt(
0, STATSMAN->m_CurStageStats.m_fGameplaySeconds );
}
} }
/* If all players have *really* failed (bFailed, not the life meter or /* If all players have *really* failed (bFailed, not the life meter or
@@ -2544,9 +2552,11 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
const bool bStopCourseEarly = STOP_COURSE_EARLY; const bool bStopCourseEarly = STOP_COURSE_EARLY;
const bool bIsLastSong = IsLastSong(); const bool bIsLastSong = IsLastSong();
LOG->Trace( "bAllReallyFailed = %d, bStopCourseEarly = %d, bIsLastSong = %d", bAllReallyFailed, bStopCourseEarly, bIsLastSong ); LOG->Trace( "bAllReallyFailed = %d, bStopCourseEarly = %d, "
"bIsLastSong = %d, m_gave_up = %d", bAllReallyFailed, bStopCourseEarly,
bIsLastSong, m_gave_up );
if( bStopCourseEarly || bAllReallyFailed || bIsLastSong ) if( bStopCourseEarly || bAllReallyFailed || bIsLastSong || m_gave_up )
{ {
// Time to leave from ScreenGameplay // Time to leave from ScreenGameplay
HandleScreenMessage( SM_LeaveGameplay ); HandleScreenMessage( SM_LeaveGameplay );
src/ScreenGameplay.h
+1
View File
@@ -276,6 +276,7 @@ protected:
BitmapText m_textDebug; BitmapText m_textDebug;
RageTimer m_GiveUpTimer; RageTimer m_GiveUpTimer;
bool m_gave_up;
void AbortGiveUp( bool bShowText ); void AbortGiveUp( bool bShowText );
Transition m_Ready; Transition m_Ready;