Replacing getrel(NP, THEM), where NP is known to be getnatp(US), by
relations_with(US, THEM) makes a difference only when US equals THEM.
Replace in places where it's obvious that they're not equal.
Adds a few calls to getnatp() hidden in relations_with(). Keeping
that optimized isn't worth it.
pr("You can only give to normal countries...\n");
return RET_FAIL;
}
pr("You can only give to normal countries...\n");
return RET_FAIL;
}
- if (getrel(natp, player->cnum) < FRIENDLY) {
+ if (relations_with(n, player->cnum) < FRIENDLY) {
pr("You can only cede to a country that is friendly towards you...\n");
return RET_FAIL;
}
pr("You can only cede to a country that is friendly towards you...\n");
return RET_FAIL;
}
- if (getrel(natp, (natid)ni.cur) == rel)
+ if (relations_with(who, (natid)ni.cur) == rel)
continue;
setrel(who, (natid)ni.cur, rel);
}
continue;
setrel(who, (natid)ni.cur, rel);
}
/* This isn't us. Can we see it? */
if (natp->nat_stat == STAT_VIS) {
/* Yes, we can see visitors are logged on */
/* This isn't us. Can we see it? */
if (natp->nat_stat == STAT_VIS) {
/* Yes, we can see visitors are logged on */
- } else if (getrel(natp, player->cnum) < ALLIED) {
+ } else if (relations_with(joe->cnum, player->cnum) < ALLIED) {
/* This is a non-allied country, don't show it. */
return 0;
}
/* This is a non-allied country, don't show it. */
return 0;
}
return;
if (us == them)
return;
return;
if (us == them)
return;
- oldrel = getrel(mynp, them);
+ oldrel = relations_with(us, them);
if (oldrel == rel)
return;
if (rel > oldrel)
if (oldrel == rel)
return;
if (rel > oldrel)
continue;
}
if (!opt_ALL_BLEED) {
continue;
}
if (!opt_ALL_BLEED) {
- if (getrel(np, j) != ALLIED)
+ if (relations_with(i, j) != ALLIED)
- if (getrel(other, i) != ALLIED)
+ if (relations_with(j, i) != ALLIED)
continue;
res[i] += levels[j][NAT_RLEV];
tech[i] += levels[j][NAT_TLEV];
continue;
res[i] += levels[j][NAT_RLEV];
tech[i] += levels[j][NAT_TLEV];