Simplify tests for presence of load

[empserver] / src / lib / commands / load.c

diff --git a/src/lib/commands/load.c b/src/lib/commands/load.c
index ba01f2f66df485589fd4d2c6bb2a18628d58ce0c..8bdb1091fc080add16b928405f7702aabd3f05cb 100644 (file)
--- a/src/lib/commands/load.c
+++ b/src/lib/commands/load.c
@@ -529,7 +529,7 @@ load_land_ship(struct sctstr *sectp, struct shpstr *sp, int noisy,
                       prland(&land), land.lnd_land);
                continue;
            }
-           if (lnd_nland(&land)) {
+           if (lnd_first_on_land(&land) >= 0) {
                if (noisy)
                    pr("%s cannot be loaded since it is carrying units\n",
                       prland(&land));
@@ -977,7 +977,7 @@ load_land_land(struct sctstr *sectp, struct lndstr *lp, int noisy,
                       prland(&land), land.lnd_land);
                continue;
            }
-           if (lnd_nland(&land)) {
+           if (lnd_first_on_land(&land) >= 0) {
                if (noisy)
                    pr("%s cannot be loaded since it is carrying units\n",
                       prland(&land));