From 44b377d637484ca4b4709964d28b785d7b325ce1 Mon Sep 17 00:00:00 2001 From: Maikel de Vries Date: Wed, 28 Feb 2018 10:35:17 +0100 Subject: [PATCH] prevent floor switch from making object stuck while moving --- planet/Decoration.ocd/Room.ocd/FloorSwitch.ocd/Script.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/planet/Decoration.ocd/Room.ocd/FloorSwitch.ocd/Script.c b/planet/Decoration.ocd/Room.ocd/FloorSwitch.ocd/Script.c index 20cb4a636..c8a879b9a 100644 --- a/planet/Decoration.ocd/Room.ocd/FloorSwitch.ocd/Script.c +++ b/planet/Decoration.ocd/Room.ocd/FloorSwitch.ocd/Script.c @@ -44,6 +44,10 @@ public func CheckObjects() for (var obj in obj_on_switch) obj->SetPosition(obj->GetX(), obj->GetY() + change); SetPosition(GetX(), GetY() + change); + // Do not make objects stuck. + for (var obj in obj_on_switch) + if (obj->Stuck()) + obj->SetPosition(obj->GetX(), obj->GetY() - change); y_position += change; // Do moving of target door or perform user actions. if (y_position == desired_y)