Rename add argument "new" to "player"

This makes the correct choice for player countries obvious.  Keep
recognizing "new" for now, but deprecate it.

diff --git a/info/add.t b/info/add.t
index 579ded4a32ba726f2e77bb1e853abe9f32abd58e..676a0615a66e67b48ee80c96a0cc65c7f4a08667 100644 (file)
--- a/info/add.t
+++ b/info/add.t
@@ -1,8 +1,8 @@
 .TH Command ADD
 .NA add "Add/Remove a country in the game"
 .LV Expert
 .TH Command ADD
 .NA add "Add/Remove a country in the game"
 .LV Expert

-.SY "add <NAT> <NAME> <REP> <visitor|new|god|delete>"
-.EX add 1 bunky mypass n
+.SY "add <NAT> <NAME> <REP> <visitor|player|god|delete>"
+.EX add 1 bunky mypass p

 This adds a new player country to the game.  Use \*Qnewcap\*U to
 create its sanctuary.
 .EX add 2 visitor visitor v
 This adds a new player country to the game.  Use \*Qnewcap\*U to
 create its sanctuary.
 .EX add 2 visitor visitor v

diff --git a/src/lib/commands/add.c b/src/lib/commands/add.c
index 456110a77ebec6723d2b29eceae68ff2db99052c..6bb4fdc6bf18576e4a15709e4a92ddd0d1ab6c6e 100644 (file)
--- a/src/lib/commands/add.c
+++ b/src/lib/commands/add.c
@@ -86,7 +86,7 @@ add(void)
     }
     strcpy(pname, p);
     p = getstarg(player->argp[4],
     }
     strcpy(pname, p);
     p = getstarg(player->argp[4],

-                "Status? (visitor, new, god, delete) ", buf);
+                "Status? (visitor, player, god, delete) ", buf);

     if (!p || !*p)
        return RET_SYN;
     switch (*p) {
     if (!p || !*p)
        return RET_SYN;
     switch (*p) {


@@ -94,6 +94,10 @@ add(void)
        stat = STAT_VIS;
        break;
     case 'n':
        stat = STAT_VIS;
        break;
     case 'n':

+       pr("Argument 'new' is deprecated and will go away in a future release.\n"
+          "Use 'player' instead.\n");
+       /* fall through */
+    case 'p':

        stat = STAT_NEW;
        break;
     case 'g':
        stat = STAT_NEW;
        break;
     case 'g':

diff --git a/src/util/fairland.c b/src/util/fairland.c
index 87e14e6ff8bb42e47c4fb53387c030e92bb66fbd..37bd940f29d2aec7e06aff3162b354714389ffd4 100644 (file)
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -1153,7 +1153,7 @@ write_newcap_script(void)
     }
 
     for (c = 0; c < nc; ++c) {
     }
 
     for (c = 0; c < nc; ++c) {

-       fprintf(script, "add %d %d %d n\n", c + 1, c + 1, c + 1);
+       fprintf(script, "add %d %d %d p\n", c + 1, c + 1, c + 1);

        if (AIRPORT_MARKER)
            fprintf(script, "des %d,%d -\n", capx[c], capy[c]);
        fprintf(script, "newcap %d %d,%d\n", c + 1, capx[c], capy[c]);
        if (AIRPORT_MARKER)
            fprintf(script, "des %d,%d -\n", capx[c], capy[c]);
        fprintf(script, "newcap %d %d,%d\n", c + 1, capx[c], capy[c]);