Update copyright notice

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

diff --git a/src/lib/commands/zdon.c b/src/lib/commands/zdon.c
index 8bb84d052bd77deb7fcff7fc5f843a512892d281..5da6ad56bc812ed619f109e6158e3cfa61c28ea7 100644 (file)
--- a/src/lib/commands/zdon.c
+++ b/src/lib/commands/zdon.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2016, 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,10 +25,10 @@
  *  ---
  *
  *  zdon.c: Update right now
- * 
+ *
  *  Known contributors to this file:
  *     Doug Hay, 1990
- *     Markus Armbruster, 2007
+ *     Markus Armbruster, 2007-2010
  */
 
 /*
@@ -41,13 +40,6 @@
  *         Y  = Yes, wants an update.
  *         N  = No, change status to not wanting an update.
  *         C  = Check (the default), check how many want an update.
- *
- * Sets/Unsets a nation flag.
- *
- * Only considers NORMAL, active countries.  No Deities or sanctuaries.
- *
- * After the change, send a message to the "tm" for it to check
- * if an update should occur.
  */
 
 #include <config.h>
@@ -59,7 +51,7 @@
 int
 zdon(void)
 {
-    natid whichcnum;
+    int whichcnum;
     struct natstr *natp;
     char *p;
 
@@ -75,31 +67,26 @@ zdon(void)
        pr("Demand updates are not enabled.\n");
        return RET_FAIL;
     }
-    whichcnum = player->cnum;
-    p = NULL;
-    if (player->god) {
-       /* Deity syntax "country what" */
-       whichcnum = onearg(player->argp[1], "Which country no.? ");
-       if ((whichcnum > 0) && (getnatp(whichcnum)))
-           p = getstarg(player->argp[2], "Want update? [Yes|No|Check] ",
-                        buf);
+    p = getstarg(player->argp[1], "Want update? [Yes|No|Check] ", buf);
+    if (!p)
+       return RET_SYN;
+    if (*p == 'y' || *p == 'Y') {
+       checking = 0;
+       wantupd = 1;
+    } else if (*p == 'n' || *p == 'N') {
+       checking = 0;
+       wantupd = 0;
     } else {
-       p = getstarg(player->argp[1], "Want update? [Yes|No|Check] ", buf);
+       checking = 1;
+       wantupd = 0;
     }
-    if (player->aborted)
-       return RET_FAIL;
 
-    checking = 1;
-    wantupd = 0;
-    if (p) {
-       if (*p == 'y' || *p == 'Y') {
-           checking = 0;
-           wantupd = 1;
-       } else if  (*p == 'n' || *p == 'N') {
-           checking = 0;
-           wantupd = 0;
-       }
-    }
+    if (player->god) {
+       whichcnum = natarg(player->argp[2], "for which country? ");
+       if (whichcnum < 0)
+           return RET_SYN;
+    } else
+       whichcnum = player->cnum;
 
     if (!(natp = getnatp(whichcnum))) {
        pr("Unable to find country. %d\n", whichcnum);