/*
* 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-2011, 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,
* 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/>.
*
* ---
*
* ---
*
* zdon.c: Update right now
- *
+ *
* Known contributors to this file:
* Doug Hay, 1990
+ * Markus Armbruster, 2007-2008
*/
/*
#include "commands.h"
#include "optlist.h"
#include "server.h"
-#include "wantupd.h"
int
zdon(void)
{
- natid whichcnum;
+ int whichcnum;
struct natstr *natp;
char *p;
- int update;
int checking;
int wantupd;
int totpop;
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;
}
- 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);
- }
- 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') {
- wantupd = 1;
- } else {
- /* Default response is checking only */
- checking = 1;
- }
+ 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);
pr("Notify the Deity.\n");
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);
}
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;
}