From 04877e33dade0c7de2e2cc6ef62a01f697a67860 Mon Sep 17 00:00:00 2001 From: Maikel de Vries Date: Mon, 8 Feb 2016 11:36:37 +0100 Subject: [PATCH] do not test permeable solid mask on the elevator case in master This messes up so many things as one could have expected. Instead we do the sensible thing and enable it only in the test scenario. For future reference all sequences involving an elevator and NPC clonks are broken with this feature. --- .../Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/Script.c | 2 -- planet/Tests.ocf/PermeableSolidMasks.ocs/System.ocg/Basement.c | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/Script.c index df1815e18..3218782e4 100644 --- a/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/Script.c @@ -93,8 +93,6 @@ private func Initialize() front->SetAction("Attach", this); back->SetAction("Attach", this); - SetHalfVehicleSolidMask(true); - return _inherited(...); } diff --git a/planet/Tests.ocf/PermeableSolidMasks.ocs/System.ocg/Basement.c b/planet/Tests.ocf/PermeableSolidMasks.ocs/System.ocg/Basement.c index da3e4a8ee..9e23610ae 100644 --- a/planet/Tests.ocf/PermeableSolidMasks.ocs/System.ocg/Basement.c +++ b/planet/Tests.ocf/PermeableSolidMasks.ocs/System.ocg/Basement.c @@ -1,8 +1,9 @@ #appendto Basement #appendto WoodenBridge +#appendto ElevatorCase protected func Initialize() { _inherited(); SetHalfVehicleSolidMask(true); -} \ No newline at end of file +}