Fix: BarDrain setting not saved, "sudden death" not so sudden on easier judge difficulties
This commit is contained in:
@@ -347,10 +347,16 @@ void LifeMeterBar::ChangeLife( TapNoteScore score )
|
|||||||
m_iMissCombo++;
|
m_iMissCombo++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
switch( GAMESTATE->m_SongOptions.m_DrainType )
|
||||||
|
{
|
||||||
|
case SongOptions::DRAIN_NORMAL:
|
||||||
|
case SongOptions::DRAIN_NO_RECOVER:
|
||||||
if( fDeltaLife > 0 )
|
if( fDeltaLife > 0 )
|
||||||
fDeltaLife *= m_fLifeDifficulty;
|
fDeltaLife *= m_fLifeDifficulty;
|
||||||
else
|
else
|
||||||
fDeltaLife /= m_fLifeDifficulty;
|
fDeltaLife /= m_fLifeDifficulty;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
m_fLifePercentage += fDeltaLife;
|
m_fLifePercentage += fDeltaLife;
|
||||||
CLAMP( m_fLifePercentage, 0, 1 );
|
CLAMP( m_fLifePercentage, 0, 1 );
|
||||||
|
|||||||
@@ -293,6 +293,7 @@ void ScreenPlayerOptions::ImportOptions()
|
|||||||
SongOptions &so = GAMESTATE->m_SongOptions;
|
SongOptions &so = GAMESTATE->m_SongOptions;
|
||||||
|
|
||||||
m_iSelectedOption[0][SO_LIFE] = so.m_LifeType;
|
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;
|
m_iSelectedOption[0][SO_BAT_LIVES] = so.m_iBatteryLives-1;
|
||||||
|
|
||||||
if ( m_iSelectedOption[0][SO_BAT_LIVES] < 0 )
|
if ( m_iSelectedOption[0][SO_BAT_LIVES] < 0 )
|
||||||
|
|||||||
Reference in New Issue
Block a user