forked from Mirrors/openclonk
Renamed Library_Tank to Library_PipeControl
The library did not depend on the Library_LiquidContainer script at all, removed that include and added it to the previous includers. Removed the IsLiquidTank() identifier, because it was unused.master
parent
94e200f201
commit
00b1b37787
|
@ -8,7 +8,8 @@
|
|||
|
||||
#include Library_Structure
|
||||
#include Library_Ownable
|
||||
#include Library_Tank
|
||||
#include Library_LiquidContainer
|
||||
#include Library_PipeControl
|
||||
|
||||
|
||||
public func Initialize()
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[DefCore]
|
||||
id=Library_Tank
|
||||
id=Library_PipeControl
|
||||
Version=8,0
|
||||
Category=C4D_StaticBack
|
||||
HideInCreator=true
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
/**
|
||||
Liquid Tank
|
||||
A structure that can contain liquids. Connecting pipes to the
|
||||
structure can be allowed, but this has to be implemented by the
|
||||
Pipe Control
|
||||
|
||||
Provides the interface for adding pipes (source, drain, air) to an object.
|
||||
|
||||
Connecting pipes has to be implemented by the
|
||||
object. This is controlled with the callbacks
|
||||
- QueryConnectPipe
|
||||
- OnPipeConnect
|
||||
- OnPipeDisconnect
|
||||
in that structure.
|
||||
|
||||
@author Marky
|
||||
*/
|
||||
|
||||
#include Library_LiquidContainer
|
||||
@author Maikel, Marky
|
||||
*/
|
||||
|
||||
|
||||
static const LIBRARY_TANK_Menu_Action_Add_Drain = "adddrain";
|
||||
|
@ -47,8 +47,6 @@ public func Construction()
|
|||
_inherited(...);
|
||||
}
|
||||
|
||||
public func IsLiquidTank() { return true; }
|
||||
|
||||
|
||||
/*-- Menu Entries --*/
|
||||
|
||||
|
|
|
@ -9,7 +9,8 @@
|
|||
#include Library_Ownable
|
||||
#include Library_Producer
|
||||
#include Library_LampPost
|
||||
#include Library_Tank
|
||||
#include Library_LiquidContainer
|
||||
#include Library_PipeControl
|
||||
|
||||
|
||||
// Foundry does not need power.
|
||||
|
|
|
@ -12,7 +12,8 @@
|
|||
#include Library_Ownable
|
||||
#include Library_PowerConsumer
|
||||
#include Library_PowerProducer
|
||||
#include Library_Tank
|
||||
#include Library_LiquidContainer
|
||||
#include Library_PipeControl
|
||||
#include Library_ResourceSelection
|
||||
|
||||
static const PUMP_Menu_Action_Switch_On = "on";
|
||||
|
@ -38,7 +39,6 @@ local stored_material_amount;
|
|||
/** This object is a liquid pump, thus pipes can be connected. */
|
||||
public func IsLiquidPump() { return true; }
|
||||
public func IsLiquidContainer() { return false; }
|
||||
public func IsLiquidTank() { return false; }
|
||||
|
||||
|
||||
// The pump is rather complex for players. If anything happened, tell it to the player via the interaction menu.
|
||||
|
|
|
@ -11,7 +11,8 @@
|
|||
#include Library_Ownable
|
||||
#include Library_PowerProducer
|
||||
#include Library_Flag
|
||||
#include Library_Tank
|
||||
#include Library_LiquidContainer
|
||||
#include Library_PipeControl
|
||||
|
||||
local DefaultFlagRadius = 200;
|
||||
|
||||
|
|
|
@ -6,7 +6,8 @@
|
|||
*/
|
||||
|
||||
#include Library_ElevatorControl
|
||||
#include Library_Tank
|
||||
#include Library_LiquidContainer
|
||||
#include Library_PipeControl
|
||||
|
||||
|
||||
local move_dir;
|
||||
|
|
|
@ -7,7 +7,8 @@
|
|||
|
||||
#include Library_Structure
|
||||
#include Library_Ownable
|
||||
#include Library_Tank
|
||||
#include Library_LiquidContainer
|
||||
#include Library_PipeControl
|
||||
|
||||
|
||||
/*-- Pipeline --*/
|
||||
|
|
Loading…
Reference in New Issue