From a898b4f3703fb451b47e746ef21e8e30dc61fba8 Mon Sep 17 00:00:00 2001 From: Andrew Wong Date: Sun, 3 Aug 2003 15:32:35 +0000 Subject: [PATCH] lifebar should be non-progressive and life difficulty 4 on extra stage regardless of options --- stepmania/src/LifeMeterBar.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp index 3c686a8e8d..119d1a551e 100644 --- a/stepmania/src/LifeMeterBar.cpp +++ b/stepmania/src/LifeMeterBar.cpp @@ -473,6 +473,16 @@ void LifeMeterBar::UpdateNonstopLifebar(const int cleared, // if (cleared > total) cleared = total; // clear/total <= 1 // if (total == 0) total = 1; // no division by 0 + if (GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2()) + { // extra stage is its own thing, should not be progressive + // and it should be as difficult as life 4 + // (e.g. it should not depend on life settings) + + m_iProgressiveLifebar = 0; + m_fLifeDifficulty = 1.0f; + return; + } + if (total > 1) m_fLifeDifficulty = m_fBaseLifeDifficulty - 0.2f * (int)(ProgressiveLifebarDifficulty * cleared / (total - 1)); else