From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 5 Feb 2011 09:18:30 +0000 (+0100)
Subject: Remove pointless variables from setrel()
X-Git-Tag: v4.3.27~148
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=2b3e11d35dd6172017bd3b8e0bdeb01864ceab7b;hp=985ec19f8b37ab43a2bbd45d592798d470d62ace

Remove pointless variables from setrel()
---

diff --git a/src/lib/subs/rej.c b/src/lib/subs/rej.c
index 05a2a8145..8c3fbca97 100644
--- a/src/lib/subs/rej.c
+++ b/src/lib/subs/rej.c
@@ -46,8 +46,6 @@ setrel(natid us, natid them, int rel)
 {
     struct natstr *mynp = getnatp(us);
     struct natstr *themnp = getnatp(them);
-    char *myname = cname(us);
-    char *themname;
     int oldrel;
     char *whichway;
     int n_up = 0;
@@ -65,7 +63,6 @@ setrel(natid us, natid them, int rel)
     oldrel = getrel(mynp, them);
     if (oldrel == rel)
 	return;
-    themname = cname(them);
     if (rel > oldrel)
 	whichway = "upgraded";
     else
@@ -91,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]);
+	    cname(us), us, whichway, relates[rel]);
 
     putrel(mynp, them, rel);
     putnat(mynp);