Update copyright notice

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

diff --git a/src/lib/commands/deli.c b/src/lib/commands/deli.c
index bb7cbd6273965e0035ac6f83f1372047c7a023d0..b196abb789c89cc12dfd98b543db0ea3c80528cb 100644 (file)
--- a/src/lib/commands/deli.c
+++ b/src/lib/commands/deli.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,9 +25,9 @@
  *  ---
  *
  *  deli.c: Set deliveries from a sector
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
 #include <config.h>
@@ -50,12 +49,12 @@ deli(void)
     char prompt[128];
     char *p;
 
-    if ((ich = whatitem(player->argp[1], "deliver what? ")) == 0)
+    if (!(ich = whatitem(player->argp[1], "deliver what? ")))
        return RET_SYN;
     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;
 
@@ -66,18 +65,21 @@ deli(void)
        sprintf(prompt, "%s %s %s threshold or direction or 'query'? ",
                xyas(nstr.x, nstr.y, player->cnum),
                dchr[sect.sct_type].d_name, ich->i_name);
-       if (!(p = getstarg(player->argp[3], prompt, buf)) || !*p)
+       p = getstarg(player->argp[3], prompt, buf);
+       if (!p || !*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) {