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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-11-09 04:47:33 +00:00
parent c48e4fe8bc
commit 9a0457a84b
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LifeMeterBattery.cpp
+1 -1
View File
@@ -64,7 +64,7 @@ void LifeMeterBattery::Load( const PlayerState *pPlayerState, PlayerStageStats *
void LifeMeterBattery::OnSongEnded() void LifeMeterBattery::OnSongEnded()
{ {
if( m_pPlayerStageStats->bFailedEarlier ) if( m_pPlayerStageStats->bFailed || m_pPlayerStageStats->bFailedEarlier )
return; return;
if( m_iLivesLeft < GAMESTATE->m_SongOptions.GetSong().m_iBatteryLives ) if( m_iLivesLeft < GAMESTATE->m_SongOptions.GetSong().m_iBatteryLives )
stepmania/src/ScreenGameplay.cpp
+2 -5
View File
@@ -2449,11 +2449,8 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
// give a little life back between stages // give a little life back between stages
FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi ) FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi )
{ {
if( !pi->GetPlayerStageStats()->bFailed ) if( pi->m_pLifeMeter )
{ pi->m_pLifeMeter->OnSongEnded();
if( pi->m_pLifeMeter )
pi->m_pLifeMeter->OnSongEnded();
}
} }
GAMESTATE->m_bLoadingNextSong = true; GAMESTATE->m_bLoadingNextSong = true;