(move_ground): Remove superflous parameter `mobility'. Callers

changed.  Edit for clarity.  No functional changes.

diff --git a/include/prototypes.h b/include/prototypes.h
index 4ca6c779a136eb4617c09929823a10182ef3ca8f..dca8442d1fa4d7cb4eeeb55232bece8abac0aad6 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -570,7 +570,7 @@ extern int air_defense(coord, coord, natid, struct emp_qelem *,
 /* move.c */
 extern int check_lmines(coord, coord, double);
 extern int move_ground(s_char *, struct sctstr *, struct sctstr *,
-                      double, double, s_char *,
+                      double, s_char *,
                       int (*)(s_char *, coord, coord, s_char *),
                       int, int *);
 extern int fly_map(coord, coord);

diff --git a/src/lib/commands/expl.c b/src/lib/commands/expl.c
index 17d95f587976fc0564a4bee394ab67e85df04621..5e13cc693e97037b1f7edae557386628b411736e 100644 (file)
--- a/src/lib/commands/expl.c
+++ b/src/lib/commands/expl.c
@@ -155,7 +155,7 @@ explore(void)
      */
     dam = 1;
     mcost = move_ground((s_char *)ip, &sect, &endsect,
-                       (double)sect.sct_mobil, weight, player->argp[4],
+                       weight, player->argp[4],
                        explore_map, 1, &dam);
 
     if (dam) {
@@ -207,7 +207,7 @@ explore(void)
     if (!player->god && chksect.sct_own && chksect.sct_own != player->cnum
        && chksect.sct_type != SCT_SANCT) {
        pr("Somebody beat you there!\n");
-       /* Send them xback home */
+       /* Send them back home */
        getsect(start.sct_x, start.sct_y, &sect);
        if (sect.sct_own != own) {
            pr("Someone captured the sector you started from!\n");

diff --git a/src/lib/commands/move.c b/src/lib/commands/move.c
index f60bb47da6bda3b2468140ffb0fde4dc302da4d7..ddaa418c6e7973dcb5db59f8f4c83d675fa9efae 100644 (file)
--- a/src/lib/commands/move.c
+++ b/src/lib/commands/move.c
@@ -201,7 +201,7 @@ move(void)
     if (dam && !chance(weight / 200.0))
        dam = 0;
     mcost = move_ground((s_char *)ip, &sect, &endsect,
-                       (double)sect.sct_mobil, weight, player->argp[4],
+                       weight, player->argp[4],
                        cmd_move_map, 0, &dam);
 
     if (dam) {

diff --git a/src/lib/commands/tran.c b/src/lib/commands/tran.c
index 80ca0ed6cc60702b0395cb7c5fd4e34aec2ceeeb..945bc2c13c429c6e4434103ff701bcf590abf795 100644 (file)
--- a/src/lib/commands/tran.c
+++ b/src/lib/commands/tran.c
@@ -176,7 +176,6 @@ tran_nuke(void)
     }
     dam = 0;
     mcost = move_ground((s_char *)&nuke, &sect, &endsect,
-                       (double)sect.sct_mobil,
                        (double)ncp->n_weight * moving,
                        player->argp[5], tran_map, 0, &dam);
 
@@ -293,7 +292,7 @@ tran_plane(void)
     }
     dam = 1;
     mcost = move_ground((s_char *)&plane, &sect, &endsect,
-                       (double)sect.sct_mobil, (double)weight,
+                       (double)weight,
                        player->argp[3], tran_map, 0, &dam);
     dam /= count;
     if (mcost < 0)

diff --git a/src/lib/subs/move.c b/src/lib/subs/move.c
index d20175e7443819fe27d7bd5eafe8bd91d914907a..a405b707df87c013372df516997feb1abd54719e 100644 (file)
--- a/src/lib/subs/move.c
+++ b/src/lib/subs/move.c
@@ -50,12 +50,9 @@ static int move_map(s_char *what, coord curx, coord cury, s_char *arg);
 
 int
 move_ground(s_char *what, struct sctstr *start, struct sctstr *end,
-           double mobility, double weight, s_char *path,
-           int (*map) (s_char *, coord, coord, s_char *), int exploring,
+           double weight, s_char *path,
+           int (*map)(s_char *, coord, coord, s_char *), int exploring,
            int *dam)
-
-
-                               /* RESULT */
 {
     struct sctstr sect, ending_sect;
     struct sctstr next, dsect;
@@ -68,6 +65,7 @@ move_ground(s_char *what, struct sctstr *start, struct sctstr *end,
     double sect_mcost;
     double total_mcost;
     double mv_cost;
+    double mobility = (double)start->sct_mobil;
     int dir;
     int intcost;
     int takedam = (*dam), out = 0;
@@ -87,9 +85,8 @@ move_ground(s_char *what, struct sctstr *start, struct sctstr *end,
            return -1;
        }
        pr("Looking for best path to %s\n", path);
-       path =
-           BestLandPath(buf2, start, &ending_sect, &total_mcost,
-                        MOB_ROAD);
+       path = BestLandPath(buf2, start, &ending_sect, &total_mcost,
+                           MOB_ROAD);
        if (exploring && (path != (s_char *)0)) /* take off the 'h' */
            *(path + strlen(path) - 1) = '\0';
        if (path == (s_char *)0)
@@ -106,18 +103,14 @@ move_ground(s_char *what, struct sctstr *start, struct sctstr *end,
        }
     }
     movstr = path;
-    tmpx = start->sct_x;
-    curx = tmpx;
-    tmpy = start->sct_y;
-    cury = tmpy;
+    curx = start->sct_x;
+    cury = start->sct_y;
     total_mcost = 0.0;
     if (getsect(curx, cury, &sect) < 0) {
        logerror("move_path: getsect %d,%d", curx, cury);
        return -1;
     }
     for (;;) {
-       tmpx = curx;
-       tmpy = cury;
        oldx = curx;
        oldy = cury;
        if (movstr == 0 || *movstr == 0) {
@@ -133,8 +126,8 @@ move_ground(s_char *what, struct sctstr *start, struct sctstr *end,
        }
        if (movstr && sarg_xy(movstr, &dx, &dy)) {
            if (getsect(dx, dy, &dsect)) {
-               movstr =
-                   BestLandPath(buf2, &sect, &dsect, &mv_cost, MOB_ROAD);
+               movstr = BestLandPath(buf2, &sect, &dsect, &mv_cost,
+                                     MOB_ROAD);
            } else {
                pr("Invalid destination sector!\n");
                movstr = (s_char *)0;
@@ -156,8 +149,11 @@ move_ground(s_char *what, struct sctstr *start, struct sctstr *end,
                }
            }
        }
-       if (movstr == 0 || *movstr == 0)
-           movstr = dirch;
+       if (movstr == 0 || *movstr == 0) {
+           buf2[0] = dirch[DIR_STOP];
+           buf2[1] = 0;
+           movstr = buf2;
+       }
        if ((dir = chkdir(*movstr, DIR_STOP, DIR_MAP)) < 0) {
            pr("\"%c\" is not legal...", *movstr);
            direrr("'%c' to stop ", "'%c' to view ", "& '%c' to map\n");
@@ -183,8 +179,8 @@ move_ground(s_char *what, struct sctstr *start, struct sctstr *end,
         * next sector.  Mobility, terrain,
         * or ownership may prevent us.
         */
-       tmpx += diroff[dir][0];
-       tmpy += diroff[dir][1];
+       tmpx = curx + diroff[dir][0];
+       tmpy = cury + diroff[dir][1];
        if (getsect(tmpx, tmpy, &next) < 0) {
            pr("You can't go there...\n");
            *movstr = 0;
@@ -194,17 +190,13 @@ move_ground(s_char *what, struct sctstr *start, struct sctstr *end,
            if ((next.sct_type == SCT_SANCT) &&
                (next.sct_own != player->cnum)) {
                pr("Converts, huh?\n");
-               *end = next;
-               intcost = (int)total_mcost;
-               if (chance(total_mcost - intcost))
-                   intcost++;
-               return intcost;
+               *movstr = 0;
+               continue;
            }
            getvec(VT_ITEM, vec, (s_char *)&next, EF_SECTOR);
            sect_mcost = sector_mcost(&next, MOB_ROAD);
-           if ((!player->owner && (!exploring ||
-                                   (vec[I_MILIT] || vec[I_CIVIL]))) ||
-               sect_mcost == -1.0) {
+           if ((!player->owner && (!exploring || vec[I_MILIT] || vec[I_CIVIL]))
+               || sect_mcost == -1.0) {
                /* already-owned, or prohibited terrain */
                pr("You can't go there...\n");
                *movstr = 0;
@@ -238,8 +230,8 @@ move_ground(s_char *what, struct sctstr *start, struct sctstr *end,
         */
        if (takedam && chance(weight / 100.0) &&
            ((curx != oldx) || (cury != oldy)))
-           (*dam) +=
-               ground_interdict(curx, cury, player->cnum, "commodities");
+           (*dam) += ground_interdict(curx, cury, player->cnum,
+                                      "commodities");
        if (*dam >= 100)
            break;
     }