From deec6a902a2c2675d4f741a6d18aa213f6624246 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sat, 14 Apr 2012 16:51:30 +0200 Subject: [PATCH] Fixed Bug with CarryHeavy-Display and reaction --- planet/Objects.ocd/Libraries.ocd/CarryHeavy.ocd/Script.c | 5 ++++- planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/planet/Objects.ocd/Libraries.ocd/CarryHeavy.ocd/Script.c b/planet/Objects.ocd/Libraries.ocd/CarryHeavy.ocd/Script.c index ff7778f41..c835bd8c1 100644 --- a/planet/Objects.ocd/Libraries.ocd/CarryHeavy.ocd/Script.c +++ b/planet/Objects.ocd/Libraries.ocd/CarryHeavy.ocd/Script.c @@ -232,7 +232,10 @@ protected func Entrance(object obj) if(obj->~GetCarryHeavy() == this) { liftheavy_carrier = obj; - DoLift(); + if(obj->GetAction() == "Walk") + DoLift(); + else + AddEffect("IntCarryHeavy",obj, 1, 1, this); } } diff --git a/planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c b/planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c index 3be3dc791..c7fdfaf28 100644 --- a/planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c +++ b/planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c @@ -551,8 +551,7 @@ public func CarryHeavy(object target) this->~OnCarryHeavyChange(carryheavy); // Update attach stuff - this->~OnHandFull(); - //this->~UpdateAttach(); + this->~OnSlotFull(); return true; }