]> git.pond.sub.org Git - empserver/blobdiff - src/lib/commands/zdon.c
COPYING duplicates information from README. Remove. Move GPL from
[empserver] / src / lib / commands / zdon.c
index 27af2a9dec0619288fa939b530c18adf72270f42..a5905fce9003d3102d7b240890623553b3d56b63 100644 (file)
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, 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.
  *
  *  ---
  *
  * if an update should occur.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include "misc.h"
 #include "player.h"
 #include "nat.h"
 #include "file.h"
-#include "deity.h"
 #include "empthread.h"
 #include "commands.h"
 #include "optlist.h"
+#include "server.h"
 
 int
 zdon(void)
 {
-       extern  empth_sem_t *update_sem;
-       natid   whichcnum;
-       struct  natstr *natp;
-       register s_char *p;
+    natid whichcnum;
+    struct natstr *natp;
+    register s_char *p;
 
-       int     update;
-       int     checking;
-       int     wantupd;
-       int     totpop;
-       int     totwant;
-       int     dowant;
-       s_char  buf[1024];
+    int update;
+    int checking;
+    int wantupd;
+    int totpop;
+    int totwant;
+    int dowant;
+    s_char buf[1024];
 
-       if (!opt_DEMANDUPDATE) {
-           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);
-       } else {
-               p = getstarg(player->argp[1], "Want update? [Yes|No|Check] ", buf);
-       }
-       if (player->aborted)
-               return RET_FAIL;
+    if (!opt_DEMANDUPDATE) {
+       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);
+    } else {
+       p = getstarg(player->argp[1], "Want update? [Yes|No|Check] ", buf);
+    }
+    if (player->aborted)
+       return RET_FAIL;
 
-       if (!p) {
-               /* Default response is checking only */
-               checking = 1;
+    if (!p) {
+       /* Default response is checking only */
+       checking = 1;
+    } else {
+       checking = 0;
+       if (*p == 'n' || *p == 'N') {
+           wantupd = 0;
+       } else if (*p == 'y' || *p == 'Y') {
+           wantupd = 1;
        } else {
-               checking = 0;
-               if (*p == 'n' || *p == 'N') {
-                       wantupd = 0;
-               } else if (*p == 'y' || *p == 'Y') {
-                       wantupd = 1;
-               } else {
-                       /* Default response is checking only */
-                       checking = 1;
-               }
+           /* Default response is checking only */
+           checking = 1;
        }
+    }
 
-       if (!checking) {
-               if (!(natp = getnatp(whichcnum))) {
-                       pr("Unable to find country. %d\n", whichcnum);
-                       pr("Notify the Deity.\n");
-                       return RET_FAIL;
-               }
-               if (wantupd) {
-                       update = natp->nat_update | WUPD_WANT;
-                       natp->nat_missed = 0;
-                       pr("You (%d) now want an update.\n",
-                               whichcnum);
-               } else {
-                       update = natp->nat_update & ~WUPD_WANT;
-                       pr("You (%d) now DON'T want an update.\n",
-                               whichcnum);
-               }
-               natp->nat_update = update;
-               putnat(natp);
+    if (!checking) {
+       if (!(natp = getnatp(whichcnum))) {
+           pr("Unable to find country. %d\n", whichcnum);
+           pr("Notify the Deity.\n");
+           return RET_FAIL;
        }
-
-       dowant = demand_update_want(&totwant, &totpop, whichcnum);
-       if (checking) {
-               if (dowant) {
-                       pr("You want an update.\n");
-               } else
-                       pr("You DON'T want an update, yet.\n");
+       if (wantupd) {
+           if (influx(natp)) {
+               pr("Unable to request an update as the country is in flux\n");
+               return RET_FAIL;
+           }
+           update = natp->nat_update | WUPD_WANT;
+           natp->nat_missed = 0;
+           pr("You (%d) now want an update.\n", whichcnum);
+       } else {
+           update = natp->nat_update & ~WUPD_WANT;
+           pr("You (%d) now DON'T want an update.\n", whichcnum);
        }
+       natp->nat_update = update;
+       putnat(natp);
+    }
 
-       pr("%d of a total of %d lunatics want an update.\n", totwant, totpop);
+    dowant = demand_update_want(&totwant, &totpop, whichcnum);
+    if (checking) {
+       if (dowant) {
+           pr("You want an update.\n");
+       } else
+           pr("You DON'T want an update, yet.\n");
+    }
 
-       if (!checking && wantupd && demandupdatecheck()) {
-               pr("Here goes...\n");
-               empth_sem_signal(update_sem);
-       }
-       return RET_OK;
+    pr("%d of a total of %d lunatics want an update.\n", totwant, totpop);
+
+    if (!checking && wantupd && demandupdatecheck()) {
+       pr("Here goes...\n");
+       empth_sem_signal(update_sem);
+    }
+    return RET_OK;
 }