empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove pointless variables from setrel()

Browse source
This commit is contained in:
Markus Armbruster 2011-02-05 10:18:30 +01:00
parent 985ec19f8b
commit 2b3e11d35d
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib/subs/rej.c
View file

@ -46,8 +46,6 @@ setrel(natid us, natid them, int rel)
{ {
struct natstr *mynp = getnatp(us); struct natstr *mynp = getnatp(us);
struct natstr *themnp = getnatp(them); struct natstr *themnp = getnatp(them);
char *myname = cname(us);
char *themname;
int oldrel; int oldrel;
char *whichway; char *whichway;
int n_up = 0; int n_up = 0;
@ -65,7 +63,6 @@ setrel(natid us, natid them, int rel)
oldrel = getrel(mynp, them); oldrel = getrel(mynp, them);
if (oldrel == rel) if (oldrel == rel)
return; return;
themname = cname(them);
if (rel > oldrel) if (rel > oldrel)
whichway = "upgraded"; whichway = "upgraded";
else else
@ -91,11 +88,11 @@ setrel(natid us, natid them, int rel)
if (addendum && us == player->cnum && !update_running) if (addendum && us == player->cnum && !update_running)
pr("%s\n", addendum); pr("%s\n", addendum);
mpr(us, "Diplomatic relations with %s %s to \"%s\".\n", 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)) if (!(getrejects(us, themnp) & REJ_TELE))
mpr(them, mpr(them,
"Country %s (#%d) has %s their relations with you to \"%s\"!\n", "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); putrel(mynp, them, rel);
putnat(mynp); putnat(mynp);