Update copyright notice

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

diff --git a/src/lib/commands/deli.c b/src/lib/commands/deli.c
index 14df1e6a0f2a6da53a1f63a777d338aeeabaf65c..22e086178940eff41f7efd435b9dc66ba2c88092 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-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,28 +19,23 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  deli.c: Set deliveries from a sector
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
+#include <config.h>
+
+#include "commands.h"
 #include "item.h"
-#include "file.h"
 #include "path.h"
-#include "nsc.h"
-#include "nat.h"
-#include "commands.h"
 
 int
 deli(void)
@@ -51,26 +46,20 @@ deli(void)
     int thresh;
     int sx, sy;
     struct nstr_sect nstr;
-    s_char buf[1024];
-    s_char prompt[128];
-    s_char *p;
+    char buf[1024];
+    char prompt[128];
+    char *p;
 
     if ((ich = whatitem(player->argp[1], "deliver what? ")) == 0)
        return RET_SYN;
-    /*
-       if (ich->i_vtype == I_CIVIL || ich->i_vtype == I_MILIT) {
-       pr("You cannot deliver people!\n");
-       return RET_FAIL;
-       }
-     */
     if (!snxtsct(&nstr, player->argp[2]))
        return RET_SYN;
 
-    while (!player->aborted && nxtsct(&nstr, &sect) > 0) {
+    while (nxtsct(&nstr, &sect) > 0) {
        if (!player->owner)
            continue;
 
-       del = sect.sct_del[ich->i_vtype];
+       del = sect.sct_del[ich->i_uid];
        thresh = del & ~0x7;
        dir = del & 0x7;
 
@@ -80,29 +69,34 @@ deli(void)
        if (!(p = getstarg(player->argp[3], prompt, buf)) || !*p)
            return RET_SYN;
        if (*p != 'q') {
-           sprintf(prompt, "%s %s %s direction? ",
-                   xyas(nstr.x, nstr.y, player->cnum),
-                   dchr[sect.sct_type].d_name, ich->i_name);
            if (((*p >= '0') && (*p <= '9')) || *p == '+') {
                thresh = atoi(p) & ~0x7;
                if (*p == '+')
                    p = NULL;
                else {
+                   sprintf(prompt, "%s %s %s direction? ",
+                           xyas(nstr.x, nstr.y, player->cnum),
+                           dchr[sect.sct_type].d_name, ich->i_name);
                    p = getstarg(player->argp[4], prompt, buf);
+                   if (!p)
+                       return RET_FAIL;
                }
            }
            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;
+           sect.sct_del[ich->i_uid] = del;
            putsect(&sect);
        }