diff --git a/include/nat.h b/include/nat.h index 0d5683ae..f3993054 100644 --- a/include/nat.h +++ b/include/nat.h @@ -177,8 +177,6 @@ struct rejectstr { unsigned char rej_rejects[MAXNOC]; }; -extern char *relates[]; - /* procedures relating to nation stuff */ #define putnat(p) ef_write(EF_NATION, (p)->nat_cnum, (p)) @@ -205,6 +203,7 @@ extern char *relatename(struct natstr *np, natid other); extern char *natstate(struct natstr *np); extern enum relations getrel(struct natstr *np, natid them); extern enum relations relations_with(natid, natid); +extern char *relations_string(enum relations); extern int nat_accepts(natid, natid, enum rej_comm); extern int in_contact(natid, natid); extern void agecontact(struct natstr *np); diff --git a/src/lib/common/nat.c b/src/lib/common/nat.c index 35b941fe..35fdb2c4 100644 --- a/src/lib/common/nat.c +++ b/src/lib/common/nat.c @@ -41,11 +41,6 @@ #include "sect.h" #include "tel.h" -char *relates[] = { - /* must match enum relations */ - "At War", "Hostile", "Neutral", "Friendly", "Allied" -}; - char * cname(natid n) { @@ -59,7 +54,7 @@ cname(natid n) char * relatename(struct natstr *np, natid other) { - return relates[getrel(np, other)]; + return relations_string(getrel(np, other)); } char * @@ -89,6 +84,17 @@ relations_with(natid us, natid them) return us == them ? ALLIED : getrel(getnatp(us), them); } +char * +relations_string(enum relations rel) +{ + static char *relates[] = { + /* must match enum relations */ + "At War", "Hostile", "Neutral", "Friendly", "Allied" + }; + + return relates[rel]; +} + int nat_accepts(natid us, natid them, enum rej_comm what) { diff --git a/src/lib/subs/rej.c b/src/lib/subs/rej.c index c72fcb32..3f63dc6f 100644 --- a/src/lib/subs/rej.c +++ b/src/lib/subs/rej.c @@ -86,11 +86,11 @@ setrel(natid us, natid them, enum relations rel) if (addendum && us == player->cnum && !update_running) pr("%s\n", addendum); mpr(us, "Diplomatic relations with %s %s to \"%s\".\n", - cname(them), whichway, relates[rel]); + cname(them), whichway, relations_string(rel)); if (nat_accepts(them, us, REJ_TELE)) mpr(them, "Country %s has %s their relations with you to \"%s\"!\n", - prnat(mynp), whichway, relates[rel]); + prnat(mynp), whichway, relations_string(rel)); mynp->nat_relate[them] = rel; putnat(mynp);