From c90d422101c570a2a4f8addf47364fe264f6ff8d Mon Sep 17 00:00:00 2001 From: Sergey Alirzaev Date: Mon, 7 Dec 2020 15:53:55 +0300 Subject: [PATCH 1/2] Avoid fusing with the last critter if no proper critter is found fixes https://github.com/CleverRaven/Cataclysm-DDA/issues/36348 --- src/monattack.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/monattack.cpp b/src/monattack.cpp index 63830bda4c29f..17b70a29ca448 100644 --- a/src/monattack.cpp +++ b/src/monattack.cpp @@ -5761,6 +5761,7 @@ bool mattack::zombie_fuse( monster *z ) critter = g->critter_at( p ); if( critter != nullptr && critter->faction == z->faction && critter != z && critter->get_size() <= z->get_size() ) { + critter = nullptr; break; } } From 1140d2cf94cf19bbd5da34d5919d089c77a4a598 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Tue, 8 Dec 2020 13:05:13 -0800 Subject: [PATCH 2/2] Update src/monattack.cpp --- src/monattack.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/monattack.cpp b/src/monattack.cpp index 17b70a29ca448..4b9c0ecbf5fc1 100644 --- a/src/monattack.cpp +++ b/src/monattack.cpp @@ -5761,9 +5761,9 @@ bool mattack::zombie_fuse( monster *z ) critter = g->critter_at( p ); if( critter != nullptr && critter->faction == z->faction && critter != z && critter->get_size() <= z->get_size() ) { - critter = nullptr; break; } + critter = nullptr; } if( critter == nullptr || ( z->has_effect( effect_grown_of_fuse ) &&