Fix automatic supply of defending and reacting units

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

diff --git a/src/lib/commands/supp.c b/src/lib/commands/supp.c
index 9af50a83d7838b7a4b8a07329fe784c981a711c9..61f64c041104039196ef3462556350561ca22849 100644 (file)
--- a/src/lib/commands/supp.c
+++ b/src/lib/commands/supp.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,24 +19,22 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  supp.c: supply land units
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  */
 
-#include "misc.h"
-#include "player.h"
-#include "land.h"
-#include "nsc.h"
-#include "file.h"
+#include <config.h>
+
 #include "commands.h"
+#include "land.h"
 
 int
 supp(void)
@@ -45,17 +43,17 @@ supp(void)
     struct nstr_item ni;
     struct lndstr land;
 
-    if (!snxtitem(&ni, EF_LAND, player->argp[1]))
+    if (!snxtitem(&ni, EF_LAND, player->argp[1], NULL))
        return RET_SYN;
 
     nunits = 0;
-    while (nxtitem(&ni, (s_char *)&land)) {
+    while (nxtitem(&ni, &land)) {
        if (!player->owner || land.lnd_own == 0)
            continue;
        nunits++;
        resupply_all(&land);
        putland(land.lnd_uid, &land);
-       if (has_supply(&land))
+       if (lnd_in_supply(&land))
            pr("%s has supplies\n", prland(&land));
        else
            pr("%s is out of supply\n", prland(&land));