Oops on invalid arguments in setrel(), setcont(), setrej()

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

diff --git a/src/lib/subs/rej.c b/src/lib/subs/rej.c
index f2702972a5d07a448e5a8b6bc83b98377087d0ce..544cc35a5fafaf7d32d8ec557be949d39ef250ce 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-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,43 +26,39 @@
  *  ---
  *
  *  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
 setrel(natid us, natid them, int rel)
 {
-    struct natstr *mynp;
-    struct natstr *themnp;
-    s_char *myname = cname(us);
-    s_char *themname;
+    struct natstr *mynp = getnatp(us);
+    struct natstr *themnp = getnatp(them);
+    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;
-    int theirrel;
+    char *addendum = NULL;
 
-    if (rel < AT_WAR)
+    if (CANT_HAPPEN(rel < AT_WAR))
        rel = AT_WAR;
-    if (rel > ALLIED)
+    if (CANT_HAPPEN(rel > ALLIED))
        rel = ALLIED;
-    if (!(mynp = getnatp(us)))
-       return RET_FAIL;
-    if (!(themnp = getnatp(them)))
+    if (CANT_HAPPEN(!mynp || !themnp))
        return RET_FAIL;
     if ((oldrel = getrel(mynp, them)) == rel)
        return RET_FAIL;
@@ -85,42 +81,14 @@ setrel(natid us, natid them, int rel)
        n_up = N_UP_HOSTILE;
        n_down = N_DOWN_HOSTILE;
     } else if (rel < HOSTILE) {
-       if (opt_SLOW_WAR) {
-           struct natstr *natp2;
-           double cost;
-
-           if (!player->god) {
-               natp2 = themnp;
-               theirrel = getrel(natp2, us);
-               if (theirrel <= MOBILIZATION) {
-                   rel = theirrel;
-                   cost = 0;
-               } else if (us == player->cnum && !update_pending) {
-                   if (mynp->nat_money < War_Cost) {
-                       mpr(us, "You don't have the money!\n");
-                       return RET_FAIL;
-                   }
-                   rel = MOBILIZATION;
-                   cost = War_Cost;
-               } else {        /* nreport is forcing us to decl war */
-                   return RET_FAIL;
-               }
-               if (rel >= oldrel) {
-                   if (us == player->cnum && !update_pending)
-                       mpr(us, "No change required for that!\n");
-                   return RET_FAIL;
-               }
-               player->dolcost += cost;
-           }
-       }
        addendum = "Declaration made (give 'em hell).";
        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",
@@ -148,9 +116,9 @@ setrel(natid us, natid them, int rel)
 int
 setcont(natid us, natid them, int contact)
 {
-    struct natstr *np;
+    struct natstr *np = getnatp(us);
 
-    if ((np = getnatp(us)) == 0)
+    if (CANT_HAPPEN(!np))
        return 0;
     putcontact(np, them, contact);
     putnat(np);
@@ -160,9 +128,9 @@ setcont(natid us, natid them, int contact)
 int
 setrej(natid us, natid them, int how, int what)
 {
-    struct natstr *np;
+    struct natstr *np = getnatp(us);
 
-    if ((np = getnatp(us)) == 0)
+    if (CANT_HAPPEN(!np))
        return 0;
     putreject(np, them, how, what);
     putnat(np);