Update copyright notice

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

diff --git a/src/lib/commands/zdon.c b/src/lib/commands/zdon.c
index 8a03ef587b361ab43b490101c6f4b1bcacabfad3..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-2007, 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
  */
 
 /*
@@ -54,7 +55,6 @@
 #include "commands.h"
 #include "optlist.h"
 #include "server.h"
-#include "wantupd.h"
 
 int
 zdon(void)
@@ -70,7 +70,8 @@ zdon(void)
     int dowant;
     char buf[1024];
 
-    if (update_demandpolicy == UDDEM_DISABLE) {
+    if (update_demand != UPD_DEMAND_SCHED
+       && update_demand != UPD_DEMAND_ASYNC) {
        pr("Demand updates are not enabled.\n");
        return RET_FAIL;
     }
@@ -111,7 +112,6 @@ zdon(void)
                pr("Unable to request an update as the country is in flux\n");
                return RET_FAIL;
            }
-           natp->nat_missed = 0;
            pr("You (%d) now want an update.\n", whichcnum);
        } else {
            pr("You (%d) now DON'T want an update.\n", whichcnum);
@@ -126,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");
-       update_trigger(0);
+       update_trigger();
     }
     return RET_OK;
 }