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

ObjectInteractionMenu: More sensible use of the variables/if-clause 

The original implementation is ok, but why check the value if it would not change anyway? In the new implementation the variable lives only where it can actually change, and so does the if-clause.
liquid_container
Mark 2016-04-05 21:09:04 +02:00
parent fbfdcaf932
commit dfbeec20f8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
planet/Objects.ocd/HUD.ocd/ObjectInteractionMenu.ocd/Script.c
View File

@ -930,10 +930,11 @@ func TransferObjectsFromTo(array to_transfer, object source, object destination)
// Our target might have disappeared (e.g. a construction site completing after the first item).
if (!destination) break;
var handled = false;
// Does the object not want to leave the other container anyway?
if (!obj->Contained() || !obj->~QueryRejectDeparture(source))
{
var handled = false;
// If stackable, always try to grab a full stack.
// Imagine armory with 200 arrows, but not 10 stacks with 20 each but 200 stacks with 1 each.
// TODO: 200 stacks of 1 arrow would each merge into the stacks that are already in the target
@ -953,9 +954,10 @@ func TransferObjectsFromTo(array to_transfer, object source, object destination)
// Try to normally collect the object otherwise.
if (!handled && destination && obj)
handled = destination->Collect(obj, true);
if (handled)
successful_transfers += 1;
}
if (handled)
successful_transfers += 1;
}
return successful_transfers;