From c8f000af024cfd96104c4146e189fc401f028869 Mon Sep 17 00:00:00 2001 From: Misa Date: Fri, 25 Sep 2020 14:57:59 -0700 Subject: [PATCH] Don't use bounds check for result of checktrigger(), it's a gamestate checktrigger() returns a gamestate number, not the index of an entity. Whoops. --- desktop_version/src/Entity.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp index 94c17487..23d5471f 100644 --- a/desktop_version/src/Entity.cpp +++ b/desktop_version/src/Entity.cpp @@ -4650,7 +4650,7 @@ void entityclass::entitycollisioncheck() // WARNING: If updating this code, don't forget to update Map.cpp mapclass::twoframedelayfix() activetrigger = -1; int block_idx = -1; - if (INBOUNDS_VEC(checktrigger(&block_idx), entities) && INBOUNDS_VEC(block_idx, blocks)) + if (checktrigger(&block_idx) > -1 && INBOUNDS_VEC(block_idx, blocks)) { // Load the block's script if its gamestate is out of range if (blocks[block_idx].script != "" && (activetrigger < 300 || activetrigger > 336))