From ce5789681c9a6c41c480454f8762ea981541ec20 Mon Sep 17 00:00:00 2001 From: HumanoidSandvichDispenser Date: Fri, 25 Nov 2022 13:56:38 -0800 Subject: [PATCH] fix screen shake stacking and not resetting, fixes #1 --- Utils/PlayerCamera.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Utils/PlayerCamera.cs b/Utils/PlayerCamera.cs index 78f974b..076ee23 100644 --- a/Utils/PlayerCamera.cs +++ b/Utils/PlayerCamera.cs @@ -21,6 +21,10 @@ namespace SupaLidlGame.Utils _timeLeft -= delta; Offset = RandomOffset(_intensity); } + else + { + Offset = Vector2.Zero; + } if (_intensity > 0) { @@ -30,8 +34,8 @@ namespace SupaLidlGame.Utils public void Shake(float intensity, double time) { - _intensity += intensity; - _timeLeft += time; + _intensity = Mathf.Max(_intensity, intensity); + _timeLeft = Math.Max(_timeLeft, time); } private Vector2 RandomOffset(float intensity)