From 2c43ac6bac7f45ceec637af95d47f3ef2aa390bc Mon Sep 17 00:00:00 2001 From: Maikel de Vries Date: Mon, 26 Feb 2018 12:25:00 +0100 Subject: [PATCH] item spawn: prevent pickung up two carry heavy objects --- planet/Objects.ocd/Environment.ocd/ItemSpawn.ocd/Script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/planet/Objects.ocd/Environment.ocd/ItemSpawn.ocd/Script.c b/planet/Objects.ocd/Environment.ocd/ItemSpawn.ocd/Script.c index af16f15d0..6f1344218 100644 --- a/planet/Objects.ocd/Environment.ocd/ItemSpawn.ocd/Script.c +++ b/planet/Objects.ocd/Environment.ocd/ItemSpawn.ocd/Script.c @@ -107,7 +107,7 @@ private func FxSpawnTimer(object target, proplist effect, int time) var plr = crew->GetOwner(); if (!spawn_list[plr] && Visibility[plr+1] && spawn_id) { - if (crew->ContentsCount() < crew.MaxContentsCount || (spawn_id->~IsCarryHeavy() && !crew->IsCarryingHeavy())) + if ((!spawn_id->~IsCarryHeavy() && crew->ContentsCount() < crew.MaxContentsCount) || (spawn_id->~IsCarryHeavy() && !crew->IsCarryingHeavy())) { // Special way to pick up carry heavy objects instantly without animation. if (spawn_id->~IsCarryHeavy())