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

Pump interface: 

The pump gets the interfaces ExtractMaterialFromSource and InsertMaterialAtDrain that allow for overloading the pumping process
liquid_container
Mark 2016-01-25 22:14:30 +01:00
parent 3227a43b17
commit 35604ec1ac
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c
View File

@ -245,8 +245,8 @@ protected func Pumping()
{
// get new materials
var source_obj = GetSourceObject();
var mat = source_obj->ExtractLiquidAmount(source_obj.ApertureOffsetX, source_obj.ApertureOffsetY, GetPumpSpeed() / 10, true);
var mat = this->ExtractMaterialFromSource(source_obj, GetPumpSpeed() / 10);
// no material to pump?
if (mat)
{
@ -265,7 +265,7 @@ protected func Pumping()
while (i > 0)
{
var drain_obj = GetDrainObject();
if (GetDrainObject()->InsertMaterial(stored_material_index, drain_obj.ApertureOffsetX, drain_obj.ApertureOffsetY))
if (this->InsertMaterialAtDrain(drain_obj, stored_material_index, 1))
{
i--;
}
@ -298,6 +298,21 @@ protected func Pumping()
return;
}
// interface for the extraction logic
func ExtractMaterialFromSource(object source_obj, int amount)
{
return source_obj->ExtractLiquidAmount(source_obj.ApertureOffsetX, source_obj.ApertureOffsetY, amount, true);
}
// interface for the insertion logic
func InsertMaterialAtDrain(object drain_obj, int material_index, int amount)
{
while (--amount >= 0)
GetDrainObject()->InsertMaterial(material_index, drain_obj.ApertureOffsetX, drain_obj.ApertureOffsetY);
}
/** Re check state and change the state if needed */
func CheckState()
{