empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename add argument "new" to "player"

Browse source 
This makes the correct choice for player countries obvious.  Keep
recognizing "new" for now, but deprecate it.
This commit is contained in:
Markus Armbruster 2011-10-30 16:29:32 +01:00
parent 3fb00c79d9
commit 373f20a8b5
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
info/add.t
View file

@ -1,8 +1,8 @@
.TH Command ADD .TH Command ADD
.NA add "Add/Remove a country in the game" .NA add "Add/Remove a country in the game"
.LV Expert .LV Expert
.SY "add <NAT> <NAME> <REP> <visitor|new|god|delete>" .SY "add <NAT> <NAME> <REP> <visitor|player|god|delete>"
.EX add 1 bunky mypass n .EX add 1 bunky mypass p
This adds a new player country to the game. Use \*Qnewcap\*U to This adds a new player country to the game. Use \*Qnewcap\*U to
create its sanctuary. create its sanctuary.
.EX add 2 visitor visitor v .EX add 2 visitor visitor v

6
src/lib/commands/add.c
View file

@ -86,7 +86,7 @@ add(void)
} }
strcpy(pname, p); strcpy(pname, p);
p = getstarg(player->argp[4], p = getstarg(player->argp[4],
"Status? (visitor, new, god, delete) ", buf); "Status? (visitor, player, god, delete) ", buf);
if (!p || !*p) if (!p || !*p)
return RET_SYN; return RET_SYN;
switch (*p) { switch (*p) {
@ -94,6 +94,10 @@ add(void)
stat = STAT_VIS; stat = STAT_VIS;
break; break;
case 'n': 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; stat = STAT_NEW;
break; break;
case 'g': case 'g':

2
src/util/fairland.c
View file

@ -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) if (AIRPORT_MARKER)
fprintf(script, "des %d,%d -\n", capx[c], capy[c]); fprintf(script, "des %d,%d -\n", capx[c], capy[c]);
fprintf(script, "newcap %d %d,%d\n", c + 1, capx[c], capy[c]); fprintf(script, "newcap %d %d,%d\n", c + 1, capx[c], capy[c]);