From 93db98d0eaeb5d8bd6f39bf6e14139beb8ff28cf Mon Sep 17 00:00:00 2001 From: Jonathan Payne Date: Tue, 20 Mar 2012 21:26:24 -0700 Subject: [PATCH] fix SuddenDeath being scaled by LifeDifficulty by instead just not scaling it. --- Themes/default/Graphics/Player combo/default.lua | 1 + Themes/default/Graphics/Player judgment/default.lua | 4 ++++ src/LifeMeterBar.cpp | 8 ++++++++ 3 files changed, 13 insertions(+) diff --git a/Themes/default/Graphics/Player combo/default.lua b/Themes/default/Graphics/Player combo/default.lua index 4f74ee6438..88fca73c52 100644 --- a/Themes/default/Graphics/Player combo/default.lua +++ b/Themes/default/Graphics/Player combo/default.lua @@ -1,5 +1,6 @@ local c; local cf; +local canAnimate = false; local player = Var "Player"; local ShowComboAt = THEME:GetMetric("Combo", "ShowComboAt"); local Pulse = THEME:GetMetric("Combo", "PulseCommand"); diff --git a/Themes/default/Graphics/Player judgment/default.lua b/Themes/default/Graphics/Player judgment/default.lua index fadfa4c747..a25763d392 100644 --- a/Themes/default/Graphics/Player judgment/default.lua +++ b/Themes/default/Graphics/Player judgment/default.lua @@ -134,6 +134,10 @@ t[#t+1] = Def.ActorFrame { end; JudgmentMessageCommand=function(self, param) + -- Fix Player Combo animating when player successfully avoids a mine. + local msgParam = param; + MESSAGEMAN:Broadcast("TestJudgment",msgParam); + -- if param.Player ~= player then return end; if param.HoldNoteScore then return end; diff --git a/src/LifeMeterBar.cpp b/src/LifeMeterBar.cpp index c1c15b04ba..aa07a5cfa7 100644 --- a/src/LifeMeterBar.cpp +++ b/src/LifeMeterBar.cpp @@ -221,6 +221,14 @@ void LifeMeterBar::ChangeLife( float fDeltaLife ) fDeltaLife *= m_fLifeDifficulty; else fDeltaLife /= m_fLifeDifficulty; + break; + case SongOptions::DRAIN_SUDDEN_DEATH: + // This should always -1.0f; + if( fDeltaLife < 0 ) + fDeltaLife = -1.0f; + else + fDeltaLife = 0; + break; default: break; }