COPYING duplicates information from README. Remove. Move GPL from

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

diff --git a/src/lib/commands/deli.c b/src/lib/commands/deli.c
index 07820cf651e47a85734cbdec58b05bc65eb4a88d..0426c530d1911c6c9ff1d88e960ef2e96884f990 100644 (file)
--- a/src/lib/commands/deli.c
+++ b/src/lib/commands/deli.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
@@ -31,10 +31,11 @@
  *     
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "player.h"
 #include "xy.h"
-#include "var.h"
 #include "sect.h"
 #include "item.h"
 #include "file.h"
@@ -47,9 +48,9 @@ int
 deli(void)
 {
     struct sctstr sect;
-    register int dir, del;
-    register struct ichrstr *ich;
-    register int thresh;
+    int dir, del;
+    struct ichrstr *ich;
+    int thresh;
     int sx, sy;
     struct nstr_sect nstr;
     s_char buf[1024];
@@ -67,7 +68,7 @@ deli(void)
     if (!snxtsct(&nstr, player->argp[2]))
        return RET_SYN;
 
-    while (nxtsct(&nstr, &sect) > 0) {
+    while (!player->aborted && nxtsct(&nstr, &sect) > 0) {
        if (!player->owner)
            continue;
 
@@ -94,14 +95,17 @@ deli(void)
            }
            if (p && *p) {
                dir = chkdir(*p, DIR_STOP, DIR_LAST);
-               if (dir < 0)
+               if (dir < 0) {
+                   pr("'%c' is not a valid direction...\n", *p);
+                   direrr(NULL, NULL, NULL);
                    return RET_SYN;
+               }
            }
 
            if (!check_sect_ok(&sect))
                continue;
 
-           thresh = min(thresh, ITEM_MAX) & ~7;
+           thresh = MIN(thresh, ITEM_MAX) & ~7;
            del = thresh | dir;
            sect.sct_del[ich->i_vtype] = del;
            putsect(&sect);