From 4aa08017627b35f3b2470525d93c9eaf61b6739f Mon Sep 17 00:00:00 2001 From: Maikel de Vries Date: Mon, 15 Jan 2018 17:32:48 +0100 Subject: [PATCH] speed up ladder search by clonks using Find_Property --- planet/Objects.ocd/Libraries.ocd/LadderClimb.ocd/Script.c | 2 +- planet/Objects.ocd/Libraries.ocd/LadderControl.ocd/Script.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/planet/Objects.ocd/Libraries.ocd/LadderClimb.ocd/Script.c b/planet/Objects.ocd/Libraries.ocd/LadderClimb.ocd/Script.c index 6cd1baf53..c7ff11771 100644 --- a/planet/Objects.ocd/Libraries.ocd/LadderClimb.ocd/Script.c +++ b/planet/Objects.ocd/Libraries.ocd/LadderClimb.ocd/Script.c @@ -84,7 +84,7 @@ public func FxIntSearchLadderTimer(object target, proplist effect, int time) // Find a ladder which can be climbed. var ladder; - for (ladder in FindObjects(Find_AtRect(-5, -10, 10, 8), Find_Func("IsLadder"), Find_NoContainer(), Find_Layer(GetObjectLayer()))) + for (ladder in FindObjects(Find_AtRect(-5, -10, 10, 8), Find_NoContainer(), Find_Property("IsLadder"), Find_Layer(GetObjectLayer()))) { // Don't climb ladders that are blocked. if (ladder->~CanNotBeClimbed(false, this) || IsBlockedLadder(ladder)) diff --git a/planet/Objects.ocd/Libraries.ocd/LadderControl.ocd/Script.c b/planet/Objects.ocd/Libraries.ocd/LadderControl.ocd/Script.c index c476469b5..1d314b4cc 100644 --- a/planet/Objects.ocd/Libraries.ocd/LadderControl.ocd/Script.c +++ b/planet/Objects.ocd/Libraries.ocd/LadderControl.ocd/Script.c @@ -9,7 +9,8 @@ local master; local next_segment; local prev_segment; -public func IsLadder() { return true; } +// Ladders are being searched for by FindObject and friends using a property. +local IsLadder = true; public func SetMaster(object new_master, int new_index) {