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

producer library does not request power if producer is not a consumer (#1602)

shapetextures
Maikel de Vries 2016-01-12 22:17:32 +01:00
parent f0a03b303b
commit 82b090c7ca
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
planet/Objects.ocd/Libraries.ocd/Structures.ocd/Producer.ocd/Script.c
View File

@ -619,8 +619,10 @@ protected func FxProcessProductionStart(object target, proplist effect, int temp
// But first hold the production until the power system gives it ok. // But first hold the production until the power system gives it ok.
// Always register the power request even if power need is zero. The // Always register the power request even if power need is zero. The
// power network handles this correctly and a producer may decide to // power network handles this correctly and a producer may decide to
// change its power need during production. // change its power need during production. Only do this for producers
RegisterPowerRequest(this->PowerNeed()); // which are power consumers.
if (this->~IsPowerConsumer())
RegisterPowerRequest(this->PowerNeed());
return FX_OK; return FX_OK;
} }
@ -659,8 +661,6 @@ protected func FxProcessProductionTimer(object target, proplist effect, int time
// Add effect interval to production duration. // Add effect interval to production duration.
effect.Duration += effect.Interval; effect.Duration += effect.Interval;
//Log("Production in progress on %i, %d frames, %d time", effect.Product, effect.Duration, time);
// Check if production time has been reached. // Check if production time has been reached.
if (effect.Duration >= ProductionTime(effect.Product)) if (effect.Duration >= ProductionTime(effect.Product))
return FX_Execute_Kill; return FX_Execute_Kill;
@ -673,21 +673,20 @@ protected func FxProcessProductionStop(object target, proplist effect, int reaso
if (temp) if (temp)
return FX_OK; return FX_OK;
// no need to consume power anymore // No need to consume power anymore. Always unregister even if there's a queue left to
// always unregister even if there's a queue left to process, because OnNotEnoughPower relies on it // process, because OnNotEnoughPower relies on it and it gives other producers the chance
// and it gives other producers the chance to get some power // to get some power. Do not unregister if this producer does not consumer power.
UnregisterPowerRequest(); if (this->~IsPowerConsumer())
UnregisterPowerRequest();
if (reason != 0) if (reason != 0)
return FX_OK; return FX_OK;
// Callback to the producer. // Callback to the producer.
//Log("Production finished on %i after %d frames", effect.Product, effect.Duration);
this->~OnProductionFinish(effect.Product); this->~OnProductionFinish(effect.Product);
// Create product. // Create product.
var product = CreateObject(effect.Product); var product = CreateObject(effect.Product);
OnProductEjection(product); OnProductEjection(product);
return FX_OK; return FX_OK;
} }