/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * 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.
*
* ---
*
* rej.c: Various relations setting routines
- *
+ *
* Known contributors to this file:
* Dave Pare, 1994
*/
#include <config.h>
-#include "misc.h"
-#include "nat.h"
#include "file.h"
+#include "nat.h"
#include "news.h"
+#include "optlist.h"
#include "player.h"
#include "prototypes.h"
-#include "optlist.h"
#include "server.h"
int
{
struct natstr *mynp;
struct natstr *themnp;
- s_char *myname = cname(us);
- s_char *themname;
+ char *myname = cname(us);
+ char *themname;
int oldrel;
- s_char *whichway;
+ char *whichway;
int n_up = 0;
int n_down = 0;
- s_char *addendum = 0;
+ char *addendum = 0;
int theirrel;
if (rel < AT_WAR)
if (theirrel <= MOBILIZATION) {
rel = theirrel;
cost = 0;
- } else if (us == player->cnum && !update_pending) {
+ } else if (us == player->cnum && !update_running) {
if (mynp->nat_money < War_Cost) {
mpr(us, "You don't have the money!\n");
return RET_FAIL;
return RET_FAIL;
}
if (rel >= oldrel) {
- if (us == player->cnum && !update_pending)
+ if (us == player->cnum && !update_running)
mpr(us, "No change required for that!\n");
return RET_FAIL;
}
n_down = N_DECL_WAR;
}
- if (addendum && us == player->cnum && !update_pending)
+ if (addendum && us == player->cnum && !update_running)
pr("%s\n", addendum);
- mpr(us, "Diplomatic relations with %s %s to \"%s\".\n", themname,
- whichway, relates[rel]);
+ mpr(us, "Diplomatic relations with %s %s to \"%s\".\n",
+ themname, whichway, relates[rel]);
if (!(getrejects(us, themnp) & REJ_TELE))
mpr(them,
"Country %s (#%d) has %s their relations with you to \"%s\"!\n",