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 <armbru@pond.sub.org>

diff --git a/info/Unit-types.t b/info/Unit-types.t
index dea934777594a0f7997827de266a6dca5c2e0f86..ab390ef4da23461df480fcd9fd3d3cec8fa9cc6d 100644 (file)
--- 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 e2021034f5779dfe9c3ef22e1a8f01e596416f4e..9095d3279cce842e438ad37dd0e370cb78666356 100644 (file)
--- 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;