From 061e3c282c1a43800eb95393233f93aa86f7f9e6 Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 8 Mar 2024 06:07:15 -0800 Subject: [PATCH] Broly: fix underflow on remaining timer - Fix Fuel Canister setting player's hitlag to -1, causing SPB to stop thinking --- src/objects/broly.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/objects/broly.hpp b/src/objects/broly.hpp index d75a7fc4b..64f7f58da 100644 --- a/src/objects/broly.hpp +++ b/src/objects/broly.hpp @@ -44,7 +44,7 @@ struct Broly : Mobj bool valid() const { return duration(); } - tic_t remaining() const { return tics - kBufferTics; } + tic_t remaining() const { return tics > kBufferTics ? tics - kBufferTics : 0u; } Fixed linear() const { return (remaining() * FRACUNIT) / duration(); }