Change setrel(), setcont(), setrej() to return void

Nobody cares for their value anyway.

diff --git a/include/prototypes.h b/include/prototypes.h
index e7cdb6b5f546dab4ebedae91a905a11d835e7def..f0ddb711b215adc8c89d4068597dd31130496598 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -585,9 +585,9 @@ extern int delty(struct range *, coord);
 extern void radmap(int, int, int, double, int, double);
 extern void rad_map_set(natid, int, int, int, double, int);
 /* rej.c */
-extern int setrel(natid, natid, int);
-extern int setcont(natid, natid, int);
-extern int setrej(natid, natid, int, int);
+extern void setrel(natid, natid, int);
+extern void setcont(natid, natid, int);
+extern void setrej(natid, natid, int, int);
 /* retreat.c */
 extern void retreat_ship(struct shpstr *, char);
 extern void retreat_land(struct lndstr *, char);

diff --git a/src/lib/subs/rej.c b/src/lib/subs/rej.c
index 544cc35a5fafaf7d32d8ec557be949d39ef250ce..9663e7299998ed0af0fcbe8186246be52a01f70c 100644 (file)
--- a/src/lib/subs/rej.c
+++ b/src/lib/subs/rej.c
@@ -41,7 +41,7 @@
 #include "prototypes.h"
 #include "server.h"
 
-int
+void
 setrel(natid us, natid them, int rel)
 {
     struct natstr *mynp = getnatp(us);
@@ -59,9 +59,10 @@ setrel(natid us, natid them, int rel)
     if (CANT_HAPPEN(rel > ALLIED))
        rel = ALLIED;
     if (CANT_HAPPEN(!mynp || !themnp))
-       return RET_FAIL;
-    if ((oldrel = getrel(mynp, them)) == rel)
-       return RET_FAIL;
+       return;
+    oldrel = getrel(mynp, them);
+    if (oldrel == rel)
+       return;
     themname = cname(them);
     if (rel > oldrel)
        whichway = "upgraded";
@@ -109,30 +110,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 = getnatp(us);
 
     if (CANT_HAPPEN(!np))
-       return 0;
+       return;
     putcontact(np, them, contact);
     putnat(np);
-    return 1;
 }
 
-int
+void
 setrej(natid us, natid them, int how, int what)
 {
     struct natstr *np = getnatp(us);
 
     if (CANT_HAPPEN(!np))
-       return 0;
+       return;
     putreject(np, them, how, what);
     putnat(np);
-    return 1;
 }