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

Bugfix: Errors in UnitTest upon destruction of the pipe

liquid_container
Mark 2016-02-06 09:06:50 +01:00
parent d6f600bbd2
commit 06f3e26ad5
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/PipeLine.ocd/Script.c
View File

@ -91,9 +91,6 @@ public func GetPipeKit()
}
else
{
if (GetActionTarget(0)->GetID() == Pipe) return GetActionTarget(0);
if (GetActionTarget(1)->GetID() == Pipe) return GetActionTarget(1);
FatalError("Unexpected error: This pipe has lost its pipe kit!");
}
}

8
planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/Script.c
View File

@ -45,6 +45,14 @@ protected func Hit()
Sound("Hits::GeneralHit?");
}
private func Destruction()
{
// remove the line first, so that it does not provoke errors on destruction
var line = GetConnectedLine();
if (line) line->RemoveObject();
}
public func IsToolProduct() { return true;}
public func CanBeStackedWith(object other)