From fe56764fbc285c27f039aa8782c9f8baff0aee27 Mon Sep 17 00:00:00 2001 From: Misa Date: Fri, 25 Sep 2020 15:05:50 -0700 Subject: [PATCH] Don't use bounds check for checktrigger() in twoframedelayfix() This is like the previous patch, but for twoframedelayfix(), because I forgot to read the comment that talked about twoframedelayfix(). --- desktop_version/src/Map.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp index 7d44e2cc..fbd77d8f 100644 --- a/desktop_version/src/Map.cpp +++ b/desktop_version/src/Map.cpp @@ -2101,7 +2101,7 @@ void mapclass::twoframedelayfix() || !custommode || game.deathseq != -1 // obj.checktrigger() sets obj.activetrigger and block_idx - || !INBOUNDS_VEC(obj.checktrigger(&block_idx), obj.entities) + || obj.checktrigger(&block_idx) <= -1 || !INBOUNDS_VEC(block_idx, obj.blocks) || obj.activetrigger < 300) {