From 31a694abfe318dd0b3dd07c4bf960aba73e8edba Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Thu, 28 Jan 2010 23:12:04 -0500 Subject: [PATCH] Force minimal time gain for survival. Granted, don't think the course mode works yet. --- Themes/_fallback/metrics.ini | 2 +- src/LifeMeterTime.cpp | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index da9cf2b46d..96b2d30c7e 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -377,9 +377,9 @@ DancePointsP2OffCommand= [LifeMeterTime] DangerThreshold=0.3 InitialValue=0.5 -# MeterWidth=0.0 MeterHeight=0.0 +MinLifeTime=1.0 [LyricDisplay] LyricFrontChangedCommand=LyricCommand,"Front" diff --git a/src/LifeMeterTime.cpp b/src/LifeMeterTime.cpp index f0f3397ad2..ac6792ea36 100644 --- a/src/LifeMeterTime.cpp +++ b/src/LifeMeterTime.cpp @@ -17,6 +17,7 @@ static ThemeMetric METER_WIDTH ("LifeMeterTime","MeterWidth"); static ThemeMetric METER_HEIGHT ("LifeMeterTime","MeterHeight"); static ThemeMetric DANGER_THRESHOLD ("LifeMeterTime","DangerThreshold"); static ThemeMetric INITIAL_VALUE ("LifeMeterTime","InitialValue"); +static ThemeMetric MIN_LIFE_TIME ("LifeMeterTime","MinLifeTime"); static const float g_fTimeMeterSecondsChangeInit[] = { @@ -92,7 +93,10 @@ void LifeMeterTime::OnLoadSong() ASSERT( pCourse ); float fOldLife = m_fLifeTotalLostSeconds; - m_fLifeTotalGainedSeconds += pCourse->m_vEntries[GAMESTATE->GetCourseSongIndex()].fGainSeconds; + float fGainSeconds = pCourse->m_vEntries[GAMESTATE->GetCourseSongIndex()].fGainSeconds; + if( MIN_LIFE_TIME > fGainSeconds ) + fGainSeconds = MIN_LIFE_TIME; + m_fLifeTotalGainedSeconds += fGainSeconds; m_soundGainLife.Play(); SendLifeChangedMessage( fOldLife, TapNoteScore_Invalid, HoldNoteScore_Invalid ); }