From c931758307aea980775d25dcd361f12b8b4b442f Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 10 May 2018 17:00:24 +0200 Subject: [PATCH] Revert "Don't let trains load trains" This reverts commit b1a0ff2fbd87d3c332de1e0a41b3ddea133c77b1. 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 b1a0ff2fbd8 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 --- info/Unit-types.t | 2 +- src/lib/commands/load.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/info/Unit-types.t b/info/Unit-types.t index dea93477..ab390ef4 100644 --- a/info/Unit-types.t +++ b/info/Unit-types.t @@ -190,7 +190,7 @@ the unit can fire 'general unit flak' (see "info Flak") .L spy the unit is a spy .L train -the unit is a train, and can't be loaded on land units +the unit is a train (see "info Railroad") .L heavy the unit cannot be carried on land units or ships, not even supply ships diff --git a/src/lib/commands/load.c b/src/lib/commands/load.c index e2021034..9095d327 100644 --- a/src/lib/commands/load.c +++ b/src/lib/commands/load.c @@ -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)); 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) pr("%s is too heavy to load.\n", prland(&land)); continue;