nat_reset() is no longer used with STAT_SANCT, simplify

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

diff --git a/src/lib/commands/add.c b/src/lib/commands/add.c
index 8a1aaba1abbec1f49aff96b22e01425de0848283..a7f1b00aec3ad200fc5f11bb1f2954c4ba40af55 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],
-                "Status? (visitor, new, active, god, delete) ", buf);
+                "Status? (visitor, player, god, delete) ", buf);
     if (!p || !*p)
        return RET_SYN;
     switch (*p) {
@@ -94,11 +94,12 @@ add(void)
        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 'a':
-       stat = STAT_ACTIVE;
-       break;
     case 'g':
        stat = STAT_GOD;
        break;
@@ -109,14 +110,9 @@ add(void)
        pr("Illegal status\n");
        return RET_SYN;
     }
+    nat_reset(natp, natp->nat_cnum, stat);
     strcpy(natp->nat_cnam, cntryname);
     strcpy(natp->nat_pnam, pname);
-    if (stat == STAT_NEW || stat == STAT_VIS)
-       nat_reset(natp, stat, 0, 0);
-    else {
-       natp->nat_stat = stat;
-       pr("No special initializations done...\n");
-    }
     putnat(natp);
     return 0;
 }