From 64c554261ebd37c1cc7ab9632b2585de47e721a6 Mon Sep 17 00:00:00 2001 From: Misa Date: Sun, 9 Jun 2024 10:14:27 -0700 Subject: [PATCH] Fix regression: Entities not moving Commit 53d725f78a3550b750d652a62ffe9d8b51dd0e18, intended to fix an overzealous commit, was itself overzealous. This is because it applied to all entities when it should only apply to entity-emitting entities. To fix this, `entityclonefix` needs to no-op if the entity is not an entity emitter. Fixes #1176. --- desktop_version/src/Entity.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp index c55e7ea0..f70246d7 100644 --- a/desktop_version/src/Entity.cpp +++ b/desktop_version/src/Entity.cpp @@ -1235,6 +1235,12 @@ static void entityclonefix(entclass* entity) const bool is_lies_emitter = entity->behave == 10; const bool is_factory_emitter = entity->behave == 12; + const bool is_emitter = is_lies_emitter || is_factory_emitter; + if (!is_emitter) + { + return; + } + const bool in_lies_emitter_room = game.roomx >= 113 && game.roomx <= 117 && game.roomy == 111; const bool in_factory_emitter_room =