empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix transport to reject planes loaded on land units

Browse source 
The transported plane remains on its carrier.  When the land unit
moves, the plane is teleported right back to it.  Broken since
Chainsaw 3 added land units.

While there, improve the message for planes on ships.
This commit is contained in:
Markus Armbruster 2011-07-16 09:10:46 +02:00
parent 5b0cf9c2a3
commit 41dc6de306
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib/commands/tran.c
View file

@ -170,7 +170,12 @@ tran_plane(void)
continue; continue;
type = plane.pln_type; type = plane.pln_type;
if (plane.pln_ship >= 0) { if (plane.pln_ship >= 0) {
pr("%s is at sea and can't be transported\n", prplane(&plane)); pr("%s is stowed on ship #%d, and can't be transported\n",
prplane(&plane), plane.pln_ship);
return RET_FAIL;
} else if (plane.pln_land >= 0) {
pr("%s is stowed on land #%d, and can't be transported\n",
prplane(&plane), plane.pln_land);
return RET_FAIL; return RET_FAIL;
} else if (plane.pln_harden != 0) { } else if (plane.pln_harden != 0) {
pr("%s has been hardened and can't be transported\n", pr("%s has been hardened and can't be transported\n",