Update copyright notice

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

diff --git a/src/lib/subs/rej.c b/src/lib/subs/rej.c
index 77faac4b650e282bedf5ab8a08e057539b017c28..1d078e086000abd3b40afe134ee95664a8739e7a 100644 (file)
--- a/src/lib/subs/rej.c
+++ b/src/lib/subs/rej.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2015, 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,
@@ -14,8 +14,7 @@
  *  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/>.
  *
  *  ---
  *
@@ -29,6 +28,7 @@
  *
  *  Known contributors to this file:
  *     Dave Pare, 1994
+ *     Markus Armbruster, 2005-2013
  */
 
 #include <config.h>
@@ -41,30 +41,28 @@
 #include "prototypes.h"
 #include "server.h"
 
-int
+void
 setrel(natid us, natid them, int rel)
 {
-    struct natstr *mynp;
-    struct natstr *themnp;
-    char *myname = cname(us);
-    char *themname;
+    struct natstr *mynp = getnatp(us);
+    struct natstr *themnp = getnatp(them);
     int oldrel;
     char *whichway;
     int n_up = 0;
     int n_down = 0;
     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)))
-       return RET_FAIL;
-    if ((oldrel = getrel(mynp, them)) == rel)
-       return RET_FAIL;
-    themname = cname(them);
+    if (CANT_HAPPEN(!mynp || !themnp))
+       return;
+    if (us == them)
+       return;
+    oldrel = relations_with(us, them);
+    if (oldrel == rel)
+       return;
     if (rel > oldrel)
        whichway = "upgraded";
     else
@@ -90,11 +88,11 @@ setrel(natid us, natid them, int rel)
     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]);
+       cname(them), whichway, relates[rel]);
     if (!(getrejects(us, themnp) & REJ_TELE))
        mpr(them,
-           "Country %s (#%d) has %s their relations with you to \"%s\"!\n",
-           myname, us, whichway, relates[rel]);
+           "Country %s has %s their relations with you to \"%s\"!\n",
+           prnat(mynp), whichway, relates[rel]);
 
     putrel(mynp, them, rel);
     putnat(mynp);
@@ -111,30 +109,26 @@ setrel(natid us, natid them, int rel)
     }
     if (opt_HIDDEN)
        setcont(them, us, FOUND_TELE);
-
-    return RET_OK;
 }
 
-int
+void
 setcont(natid us, natid them, int contact)
 {
-    struct natstr *np;
+    struct natstr *np = getnatp(us);
 
-    if (!(np = getnatp(us)))
-       return 0;
+    if (CANT_HAPPEN(!np))
+       return;
     putcontact(np, them, contact);
     putnat(np);
-    return 1;
 }
 
-int
+void
 setrej(natid us, natid them, int how, int what)
 {
-    struct natstr *np;
+    struct natstr *np = getnatp(us);
 
-    if (!(np = getnatp(us)))
-       return 0;
+    if (CANT_HAPPEN(!np))
+       return;
     putreject(np, them, how, what);
     putnat(np);
-    return 1;
 }