prnat() prnatid(): New, common country name (#number) formatting

[empserver] / src / lib / commands / setsect.c

diff --git a/src/lib/commands/setsect.c b/src/lib/commands/setsect.c
index 7163a7f9d15dbc738a02c41ff47d72193922f689..db76d53235d813ed20de1c1cc215c1a402b82146 100644 (file)
--- a/src/lib/commands/setsect.c
+++ b/src/lib/commands/setsect.c
@@ -100,9 +100,9 @@ setsector(void)
            case 'w':
                if ((amt < 0) || (amt > MAXNOC - 1))
                    return RET_SYN;
-               pr("Owner of %s changed from %s (#%d) to %s (#%d).\n",
+               pr("Owner of %s changed from %s to %s.\n",
                   xyas(sect.sct_x, sect.sct_y, player->cnum),
-                  cname(sect.sct_own), sect.sct_own, cname(amt), amt);
+                  prnatid(sect.sct_own), prnatid(amt));
                if (sect.sct_own) {
                    wu(player->cnum, sect.sct_own,
                       "Sector %s lost to deity intervention\n",
@@ -117,10 +117,9 @@ setsector(void)
            case 'l':
                if ((amt < 0) || (amt > MAXNOC - 1))
                    return RET_SYN;
-               pr("Old owner of %s changed from %s (#%d) to %s (#%d).\n",
+               pr("Old owner of %s changed from %s to %s.\n",
                   xyas(sect.sct_x, sect.sct_y, player->cnum),
-                  cname(sect.sct_oldown),
-                  sect.sct_oldown, cname(amt), amt);
+                  prnatid(sect.sct_oldown), prnatid(amt));
                sect.sct_oldown = (natid)amt;
                break;
            default: