Author: jtn Date: Mon Jun 16 23:59:58 2014 New Revision: 25164 URL: http://svn.gna.org/viewcvs/freeciv?rev=25164&view=rev Log: Allow unloading from a nested transport, in line with the recent change to allow loading onto such a transport.
See gna bug #22190. Modified: branches/S2_5/common/unit.c Modified: branches/S2_5/common/unit.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/unit.c?rev=25164&r1=25163&r2=25164&view=diff ============================================================================== --- branches/S2_5/common/unit.c (original) +++ branches/S2_5/common/unit.c Mon Jun 16 23:59:58 2014 @@ -807,7 +807,7 @@ return FALSE; } - /* Only top-level transporters may be loaded or loaded into. */ + /* Cannot load if cargo is already loaded onto something else. */ if (unit_transported(pcargo)) { return FALSE; } @@ -884,13 +884,6 @@ /* Make sure the unit's transporter exists and is known. */ if (unit_transport_get(pcargo) != ptrans) { - return FALSE; - } - - /* Only top-level transporters may be unloaded. However the unit being - * unloaded may be transporting other units (well, at least it's allowed - * here: elsewhere this may be disallowed). */ - if (unit_transport_get(ptrans)) { return FALSE; } _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits