From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 6 Feb 2011 09:06:38 +0000 (+0100)
Subject: Use relations_with() for US==THEM || getrel(NP, THEM)
X-Git-Tag: v4.3.27~126
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=bdf63bc5faf3ef719a60f2b2e0dccf82878a38da

Use relations_with() for US==THEM || getrel(NP, THEM)

Replace patterns like "US == THEM || getrel(NP, THEM)...", where NP is
known to be getnatp(US), by "relations_with(US, THEM)...".  No
functional change.

Adds a few calls to getnatp() hidden in relations_with(), though.
Keeping that optimized isn't worth it.
---

diff --git a/src/lib/commands/coun.c b/src/lib/commands/coun.c
index 1464d77b4..c6a3fe8de 100644
--- a/src/lib/commands/coun.c
+++ b/src/lib/commands/coun.c
@@ -68,7 +68,7 @@ coun_list(struct natstr *natp)
     if (getplayer(cn)
 	&& (player->god
 	    || natp->nat_stat == STAT_GOD
-	    || cn == player->cnum || getrel(natp, player->cnum) == ALLIED))
+	    || relations_with(cn, player->cnum) == ALLIED))
 	pr(" Now logged on                     ");
     else if (player->god) {
 	if (natp->nat_last_login == 0)
diff --git a/src/lib/commands/flash.c b/src/lib/commands/flash.c
index ffdba7a51..87c244a89 100644
--- a/src/lib/commands/flash.c
+++ b/src/lib/commands/flash.c
@@ -63,8 +63,8 @@ flash(void)
 	}
     } else {
 	/* Ok, we are a normal country, can we flash them? */
-	if (to->nat_stat != STAT_GOD && tocn != player->cnum
-	    && getrel(to, player->cnum) < FRIENDLY) {
+	if (to->nat_stat != STAT_GOD
+	    && relations_with(tocn, player->cnum) < FRIENDLY) {
 	    pr("%s is not a deity or friendly with us.\n", to->nat_cnam);
 	    return RET_SYN;
 	}
@@ -166,8 +166,8 @@ sendmessage(struct natstr *to, char *message, int verbose)
 
     if (to) {
 	/* flash */
-	if (player->god || to->nat_cnum == player->cnum
-	    || getrel(to, player->cnum) == ALLIED) {
+	if (player->god
+	    || relations_with(to->nat_cnum, player->cnum) == ALLIED) {
 	    /* Can see TO logged in anyway, so it's okay to tell */
 	    if (rejected)
 		pr("%s is not accepting flashes\n", to->nat_cnam);
diff --git a/src/lib/commands/orig.c b/src/lib/commands/orig.c
index 55f7f39e7..9dfb8b92d 100644
--- a/src/lib/commands/orig.c
+++ b/src/lib/commands/orig.c
@@ -67,8 +67,7 @@ orig(void)
 	cnum = natarg(p, NULL);
 	if (!(np = getnatp(cnum)))
 	    return RET_SYN;
-	if (!player->god && player->cnum != cnum
-	    && getrel(np, player->cnum) != ALLIED) {
+	if (!player->god && relations_with(cnum, player->cnum) != ALLIED) {
 	    pr("Country %s is not allied with you!\n", np->nat_cnam);
 	    return RET_FAIL;
 	}