Fix: BarDrain setting not saved, "sudden death" not so sudden on easier judge difficulties

This commit is contained in:
Chris Danford
2003-08-29 04:17:04 +00:00
parent 92b7594d6d
commit 90655d4a4e
2 changed files with 11 additions and 4 deletions
+10 -4
View File
@@ -347,10 +347,16 @@ void LifeMeterBar::ChangeLife( TapNoteScore score )
m_iMissCombo++;
}
if( fDeltaLife > 0 )
fDeltaLife *= m_fLifeDifficulty;
else
fDeltaLife /= m_fLifeDifficulty;
switch( GAMESTATE->m_SongOptions.m_DrainType )
{
case SongOptions::DRAIN_NORMAL:
case SongOptions::DRAIN_NO_RECOVER:
if( fDeltaLife > 0 )
fDeltaLife *= m_fLifeDifficulty;
else
fDeltaLife /= m_fLifeDifficulty;
break;
}
m_fLifePercentage += fDeltaLife;
CLAMP( m_fLifePercentage, 0, 1 );
+1
View File
@@ -293,6 +293,7 @@ void ScreenPlayerOptions::ImportOptions()
SongOptions &so = GAMESTATE->m_SongOptions;
m_iSelectedOption[0][SO_LIFE] = so.m_LifeType;
m_iSelectedOption[0][SO_DRAIN] = so.m_DrainType;
m_iSelectedOption[0][SO_BAT_LIVES] = so.m_iBatteryLives-1;
if ( m_iSelectedOption[0][SO_BAT_LIVES] < 0 )