Update copyright notice

[empserver] / src / lib / subs / rej.c

diff --git a/src/lib/subs/rej.c b/src/lib/subs/rej.c
index f2702972a5d07a448e5a8b6bc83b98377087d0ce..1adb7ab681c1d29b7262bc3771863ce29b6b3870 100644 (file)
--- a/src/lib/subs/rej.c
+++ b/src/lib/subs/rej.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-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,20 +26,19 @@
  *  ---
  *
  *  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
@@ -47,13 +46,13 @@ setrel(natid us, natid them, int rel)
 {
     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)
@@ -95,7 +94,7 @@ setrel(natid us, natid them, int rel)
                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;
@@ -106,7 +105,7 @@ setrel(natid us, natid them, int rel)
                    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;
                }
@@ -117,10 +116,10 @@ setrel(natid us, natid them, int rel)
        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",