marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed Bug with CarryHeavy-Display and reaction

rope
Bernhard Bonigl 2012-04-14 16:51:30 +02:00
parent c75f70e387
commit deec6a902a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
planet/Objects.ocd/Libraries.ocd/CarryHeavy.ocd/Script.c
View File

@ -232,7 +232,10 @@ protected func Entrance(object obj)
if(obj->~GetCarryHeavy() == this) if(obj->~GetCarryHeavy() == this)
{ {
liftheavy_carrier = obj; liftheavy_carrier = obj;
DoLift(); if(obj->GetAction() == "Walk")
DoLift();
else
AddEffect("IntCarryHeavy",obj, 1, 1, this);
} }
} }

3
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
View File

@ -551,8 +551,7 @@ public func CarryHeavy(object target)
this->~OnCarryHeavyChange(carryheavy); this->~OnCarryHeavyChange(carryheavy);
// Update attach stuff // Update attach stuff
this->~OnHandFull(); this->~OnSlotFull();
//this->~UpdateAttach();
return true; return true;
} }