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

Revert "Don't let trains load trains"

Browse source 
This reverts commit b1a0ff2fbd.

Land units with capability heavy can't be loaded on anything, and land
units carrying land units can't be loaded regardless of capabilities.
Commit b1a0ff2fbd additionally outlawed loading of trains on land
units, but not on ships.  Bad idea, because it complicates matters for
no good reason.  Revert it.

Doesn't affect the stock game, because its only train is heavy.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2018-05-10 17:00:24 +02:00
parent 85d8e7fcb1
commit c931758307
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
info/Unit-types.t
View file

@ -190,7 +190,7 @@ the unit can fire 'general unit flak' (see "info Flak")
.L spy .L spy
the unit is a spy the unit is a spy
.L train .L train
the unit is a train, and can't be loaded on land units the unit is a train
(see "info Railroad") (see "info Railroad")
.L heavy .L heavy
the unit cannot be carried on land units or ships, not even supply ships the unit cannot be carried on land units or ships, not even supply ships

2
src/lib/commands/load.c
View file

@ -912,7 +912,7 @@ load_land_land(struct sctstr *sectp, struct lndstr *lp, int noisy,
pr("%s can't be loaded onto itself!\n", prland(&land)); pr("%s can't be loaded onto itself!\n", prland(&land));
continue; continue;
} }
if (lchr[(int)land.lnd_type].l_flags & (L_HEAVY | L_TRAIN)) { if (lchr[(int)land.lnd_type].l_flags & L_HEAVY) {
if (noisy) if (noisy)
pr("%s is too heavy to load.\n", prland(&land)); pr("%s is too heavy to load.\n", prland(&land));
continue; continue;