edit: Drop pointless doland() variables old, des

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

diff --git a/src/lib/commands/edit.c b/src/lib/commands/edit.c
index 183979d3843f589647e0579690e39dc8ea70b44b..200c1eaaf34f3bebc2108390768767f7299776a1 100644 (file)
--- a/src/lib/commands/edit.c
+++ b/src/lib/commands/edit.c
@@ -430,40 +430,37 @@ warn_deprecated(char key)
 static int
 edit_sect(struct sctstr *sect, char op, int arg, char *p)
 {
-    natid newown, oldown;
     coord newx, newy;
-    int new, old;
-    int des;
+    int new;
+
     switch (op) {
     case 'o':
-       if (arg < 0)
+       if (arg < 0 || arg >= MAXNOC)
            return RET_SYN;
-       newown = (natid)LIMIT_TO(arg, 0, MAXNOC - 1);
        pr("Owner of %s changed from %s to %s.\n",
           xyas(sect->sct_x, sect->sct_y, player->cnum),
-          prnatid(sect->sct_own), prnatid(newown));
+          prnatid(sect->sct_own), prnatid(arg));
        if (sect->sct_own) {
            wu(player->cnum, sect->sct_own,
               "Sector %s lost to deity intervention\n",
               xyas(sect->sct_x, sect->sct_y, sect->sct_own));
        }
        benefit(sect->sct_own, 0);
-       sect->sct_own = newown;
-       if (newown) {
-           wu(player->cnum, newown,
+       sect->sct_own = arg;
+       if (arg) {
+           wu(player->cnum, arg,
               "Sector %s gained from deity intervention\n",
-              xyas(sect->sct_x, sect->sct_y, newown));
+              xyas(sect->sct_x, sect->sct_y, arg));
        }
-       benefit(newown, 1);
+       benefit(arg, 1);
        break;
     case 'O':
-       if (arg < 0)
+       if (arg < 0 || arg >= MAXNOC)
            return RET_SYN;
-       oldown = (natid)LIMIT_TO(arg, 0, MAXNOC - 1);
        pr("Old owner of %s changed from %s to %s.\n",
           xyas(sect->sct_x, sect->sct_y, player->cnum),
-          prnatid(sect->sct_oldown), prnatid(oldown));
-       sect->sct_oldown = oldown;
+          prnatid(sect->sct_oldown), prnatid(arg));
+       sect->sct_oldown = arg;
        break;
     case 'e':
        new = LIMIT_TO(arg, 0, 100);
@@ -507,47 +504,47 @@ edit_sect(struct sctstr *sect, char op, int arg, char *p)
        break;
     case 'l':
        new = LIMIT_TO(arg, 0, 127);
-       pr("Loyalty of %s changed from %d to %d%%\n",
+       pr("Loyalty of %s changed from %d to %d\n",
           xyas(sect->sct_x, sect->sct_y, player->cnum),
           sect->sct_loyal, new);
        sect->sct_loyal = (unsigned char)new;
        break;
     case 'x':
-       old = sect->sct_che;
        new = LIMIT_TO(arg, 0, CHE_MAX);
        pr("Guerillas in %s changed from %d to %d\n",
-          xyas(sect->sct_x, sect->sct_y, player->cnum), old, new);
+          xyas(sect->sct_x, sect->sct_y, player->cnum),
+          sect->sct_che, new);
        sect->sct_che = new;
        break;
     case 'X':
-       old = sect->sct_che_target;
-       new = LIMIT_TO(arg, 0, MAXNOC - 1);
+       if (arg < 0 || arg >= MAXNOC)
+           return RET_SYN;
        pr("Che target of %s changed from %s to %s.\n",
           xyas(sect->sct_x, sect->sct_y, player->cnum),
-          prnatid(old), prnatid(new));
-       sect->sct_che_target = new;
-       if (new == 0)
+          prnatid(sect->sct_che_target), prnatid(arg));
+       sect->sct_che_target = arg;
+       if (arg == 0)
            sect->sct_che = 0;
        break;
     case 'p':
-       old = sect->sct_pstage;
        new = LIMIT_TO(arg, 0, PLG_EXPOSED);
-       pr("Plague stage of %s changed from %d to %d%%\n",
-          xyas(sect->sct_x, sect->sct_y, player->cnum), old, new);
+       pr("Plague stage of %s changed from %d to %d\n",
+          xyas(sect->sct_x, sect->sct_y, player->cnum),
+          sect->sct_pstage, new);
        sect->sct_pstage = new;
        break;
     case 't':
-       old = sect->sct_ptime;
        new = LIMIT_TO(arg, 0, 255);
-       pr("Plague time of %s changed from %d to %d%%\n",
-          xyas(sect->sct_x, sect->sct_y, player->cnum), old, new);
+       pr("Plague time of %s changed from %d to %d\n",
+          xyas(sect->sct_x, sect->sct_y, player->cnum),
+          sect->sct_ptime, new);
        sect->sct_ptime = new;
        break;
     case 'F':
-       old = sect->sct_fallout;
        new = LIMIT_TO(arg, 0, FALLOUT_MAX);
        pr("Fallout for sector %s changed from %d to %d\n",
-          xyas(sect->sct_x, sect->sct_y, player->cnum), old, new);
+          xyas(sect->sct_x, sect->sct_y, player->cnum),
+          sect->sct_fallout, new);
        sect->sct_fallout = new;
        break;
     case 'a':
@@ -578,23 +575,23 @@ edit_sect(struct sctstr *sect, char op, int arg, char *p)
        sect->sct_dist_y = newy;
        break;
     case 's':
-       des = sct_typematch(p);
-       if (des < 0)
+       new = sct_typematch(p);
+       if (new < 0)
            return RET_SYN;
        pr("Designation for sector %s changed from %c to %c\n",
           xyas(sect->sct_x, sect->sct_y, player->cnum),
-          dchr[sect->sct_type].d_mnem, dchr[des].d_mnem);
-       set_coastal(sect, sect->sct_type, des);
-       sect->sct_type = des;
+          dchr[sect->sct_type].d_mnem, dchr[new].d_mnem);
+       set_coastal(sect, sect->sct_type, new);
+       sect->sct_type = new;
        break;
     case 'S':
-       des = sct_typematch(p);
-       if (des < 0)
+       new = sct_typematch(p);
+       if (new < 0)
            return RET_SYN;
        pr("New designation for sector %s changed from %c to %c\n",
           xyas(sect->sct_x, sect->sct_y, player->cnum),
-          dchr[sect->sct_newtype].d_mnem, dchr[des].d_mnem);
-       sect->sct_newtype = des;
+          dchr[sect->sct_newtype].d_mnem, dchr[new].d_mnem);
+       sect->sct_newtype = new;
        break;
     case 'R':
        new = LIMIT_TO(arg, 0, 100);
@@ -739,15 +736,15 @@ edit_ship(struct shpstr *ship, char op, int arg, char *p)
        ef_set_uid(EF_SHIP, ship, arg);
        break;
     case 'O':
+       if (arg < 0 || arg >= MAXNOC)
+           return RET_SYN;
        if (ship->shp_own)
            wu(player->cnum, ship->shp_own,
               "%s taken from you by deity intervention!\n", prship(ship));
-       if (arg && arg < MAXNOC) {
+       if (arg)
            wu(player->cnum, (natid)arg,
               "%s given to you by deity intervention!\n", prship(ship));
-           ship->shp_own = (natid)arg;
-       } else if (!arg)
-           ship->shp_effic = 0;
+       ship->shp_own = arg;
        break;
     case 'L':
        if (!sarg_xy(p, &newx, &newy))
@@ -835,16 +832,15 @@ edit_land(struct lndstr *land, char op, int arg, char *p)
        ef_set_uid(EF_LAND, land, arg);
        break;
     case 'O':
+       if (arg < 0 || arg >= MAXNOC)
+           return RET_SYN;
        if (land->lnd_own)
            wu(player->cnum, land->lnd_own,
               "%s taken from you by deity intervention!\n", prland(land));
-
-       if (arg && arg < MAXNOC) {
+       if (arg)
            wu(player->cnum, (natid)arg,
               "%s given to you by deity intervention!\n", prland(land));
-           land->lnd_own = (natid)arg;
-       } else if (!arg)
-           land->lnd_effic = 0;
+       land->lnd_own = arg;
        break;
     case 'L':
        if (!sarg_xy(p, &newx, &newy))
@@ -949,16 +945,16 @@ edit_plane(struct plnstr *plane, char op, int arg, char *p)
        plane->pln_y = newy;
        break;
     case 'O':
+       if (arg < 0 || arg >= MAXNOC)
+           return RET_SYN;
        if (plane->pln_own)
            wu(player->cnum, plane->pln_own,
               "%s taken from you by deity intervention!\n",
               prplane(plane));
-       if (arg && arg < MAXNOC) {
-           plane->pln_own = (natid)arg;
-           wu(player->cnum, plane->pln_own,
+       if (arg)
+           wu(player->cnum, arg,
               "%s given to you by deity intervention!\n", prplane(plane));
-       } else if (!arg)
-           plane->pln_effic = 0;
+       plane->pln_own = arg;
        break;
     case 'e':
        plane->pln_effic = LIMIT_TO(arg, PLANE_MINEFF, 100);