Update copyright notice

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

diff --git a/src/lib/commands/zdon.c b/src/lib/commands/zdon.c
index c97e226cfb7f3239939728870b1168cc16d860ac..284b6442b5577ec876bf5604110b5f3d54506a5c 100644 (file)
--- a/src/lib/commands/zdon.c
+++ b/src/lib/commands/zdon.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -29,6 +29,7 @@
  * 
  *  Known contributors to this file:
  *     Doug Hay, 1990
+ *     Markus Armbruster, 2007
  */
 
 /*
@@ -52,7 +53,6 @@
 #include <config.h>
 
 #include "commands.h"
-#include "empthread.h"
 #include "optlist.h"
 #include "server.h"
 
@@ -63,7 +63,6 @@ zdon(void)
     struct natstr *natp;
     char *p;
 
-    int update;
     int checking;
     int wantupd;
     int totpop;
@@ -71,7 +70,8 @@ zdon(void)
     int dowant;
     char buf[1024];
 
-    if (!opt_DEMANDUPDATE) {
+    if (update_demand != UPD_DEMAND_SCHED
+       && update_demand != UPD_DEMAND_ASYNC) {
        pr("Demand updates are not enabled.\n");
        return RET_FAIL;
     }
@@ -89,18 +89,15 @@ zdon(void)
     if (player->aborted)
        return RET_FAIL;
 
-    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') {
+    checking = 1;
+    wantupd = 0;
+    if (p) {
+       if (*p == 'y' || *p == 'Y') {
+           checking = 0;
            wantupd = 1;
-       } else {
-           /* Default response is checking only */
-           checking = 1;
+       } else if  (*p == 'n' || *p == 'N') {
+           checking = 0;
+           wantupd = 0;
        }
     }
 
@@ -115,14 +112,11 @@ zdon(void)
                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;
+       natp->nat_update = wantupd;
        putnat(natp);
     }
 
@@ -132,17 +126,13 @@ zdon(void)
            pr("You want an update.\n");
        } else
            pr("You DON'T want an update, yet.\n");
-       pr("You have missed the vote on a demand update %d times.\n",
-          natp->nat_missed);
-       pr("It takes %d misses to veto a demand update.\n",
-          update_missed);
     }
 
     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);
+       update_trigger();
     }
     return RET_OK;
 }