(move_ground): Drop first parameter of map callback, it's not used.

Callers changed.  s_char purge.

diff --git a/include/prototypes.h b/include/prototypes.h
index 57eb74396bf58436569c1c753fa93d409dfc9b6a..00158dc9f4d53ee51cdd14772058f6d74b5f101b 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -524,9 +524,9 @@ extern int air_defense(coord, coord, natid, struct emp_qelem *,
                       struct emp_qelem *);
 /* move.c */
 extern int check_lmines(coord, coord, double);
-extern int move_ground(s_char *, struct sctstr *, struct sctstr *,
+extern int move_ground(struct sctstr *, struct sctstr *,
                       double, s_char *,
-                      int (*)(s_char *, coord, coord, s_char *),
+                      int (*)(coord, coord, char *),
                       int, int *);
 extern int fly_map(coord, coord);
 /* mslsub.c */

diff --git a/src/lib/commands/expl.c b/src/lib/commands/expl.c
index a2cab884d75ef5903832ce5af26ab0fc737bc7ed..7cb3e21d296f7966beac85ae76a788f1068d4356 100644 (file)
--- a/src/lib/commands/expl.c
+++ b/src/lib/commands/expl.c
@@ -45,7 +45,7 @@
 #include "optlist.h"
 #include "commands.h"
 
-static int explore_map(s_char *what, coord curx, coord cury, s_char *arg);
+static int explore_map(coord curx, coord cury, char *arg);
 
 int
 explore(void)
@@ -67,11 +67,11 @@ explore(void)
     int own, mob;
     int justtook;
     coord x, y;
-    s_char *p;
+    char *p;
     int n;
     int left;
-    s_char buf[1024];
-    s_char prompt[128];
+    char buf[1024];
+    char prompt[128];
 
     if (!(ip = whatitem(player->argp[1], "explore with what? (civ/mil) ")))
        return RET_SYN;
@@ -149,15 +149,17 @@ explore(void)
      * Now parse the path and return ending sector.
      */
     dam = 1;
-    mcost = move_ground((s_char *)ip, &sect, &endsect,
-                       weight, player->argp[4],
+    mcost = move_ground(&sect, &endsect, weight, player->argp[4],
                        explore_map, 1, &dam);
 
     if (dam) {
        left = effdamage(amount, dam);
        if (left < amount) {
            if (left) {
-               pr("%d of the %s you were exploring with were destroyed!\nOnly %d %s made it to %s\n", amount - left, ip->i_name, left, ip->i_name, xyas(endsect.sct_x, endsect.sct_y, player->cnum));
+               pr("%d of the %s you were exploring with were destroyed!\n"
+                  "Only %d %s made it to %s\n",
+                  amount - left, ip->i_name, left, ip->i_name,
+                  xyas(endsect.sct_x, endsect.sct_y, player->cnum));
            } else {
                pr("All of the %s you were exploring with were destroyed!\n", ip->i_name);
            }
@@ -277,7 +279,7 @@ explore(void)
 
 /*ARGSUSED*/
 static int
-explore_map(s_char *what, coord curx, coord cury, s_char *arg)
+explore_map(coord curx, coord cury, char *arg)
 {
     struct nstr_sect ns;
     struct sctstr sect;

diff --git a/src/lib/commands/move.c b/src/lib/commands/move.c
index 2e5556b879a0cdf99005417e77cf9e761da82a9b..e32d91dea544bf8e5156170d694eb4b34e539509 100644 (file)
--- a/src/lib/commands/move.c
+++ b/src/lib/commands/move.c
@@ -47,7 +47,7 @@
 #include "commands.h"
 
 
-static int cmd_move_map(s_char *what, coord curx, coord cury, s_char *arg);
+static int cmd_move_map(coord curx, coord cury, char *arg);
 
 int
 move(void)
@@ -72,9 +72,9 @@ move(void)
     int istest = 0;
     int n;
     coord x, y;
-    s_char *p;
-    s_char prompt[1024];
-    s_char buf[1024];
+    char *p;
+    char prompt[1024];
+    char buf[1024];
 
 
     istest = *player->argp[0] == 't';
@@ -188,8 +188,7 @@ move(void)
     dam = (istest ? 0 : 1);
     if (dam && !chance(weight / 200.0))
        dam = 0;
-    mcost = move_ground((s_char *)ip, &sect, &endsect,
-                       weight, player->argp[4],
+    mcost = move_ground(&sect, &endsect, weight, player->argp[4],
                        cmd_move_map, 0, &dam);
 
     if (dam) {
@@ -347,7 +346,7 @@ move(void)
  */
 /*ARGSUSED*/
 static int
-cmd_move_map(s_char *what, coord curx, coord cury, s_char *arg)
+cmd_move_map(coord curx, coord cury, char *arg)
 {
     player->argp[0] = "map";
     player->argp[1] = arg;

diff --git a/src/lib/commands/tran.c b/src/lib/commands/tran.c
index 4a7e82f26227e1467f4d50addda61505bc902998..9f356fbce27f6ebb992036e78a19523aea489c13 100644 (file)
--- a/src/lib/commands/tran.c
+++ b/src/lib/commands/tran.c
@@ -48,18 +48,18 @@
 #include "land.h"
 #include "commands.h"
 
-static int tran_map(s_char *what, coord curx, coord cury, s_char *arg);
+static int tran_map(coord curx, coord cury, char *arg);
 static int tran_nuke(void);
 static int tran_plane(void);
 
 int
 tran(void)
 {
-    s_char *what;
-    s_char buf[1024];
+    char *what;
+    char buf[1024];
 
-    what =
-       getstarg(player->argp[1], "transport what (nuke or plane): ", buf);
+    what = getstarg(player->argp[1], "transport what (nuke or plane): ",
+                   buf);
     if (what == 0)
        return RET_SYN;
     if (*what == 'n')
@@ -80,7 +80,7 @@ tran_nuke(void)
     coord x, y;
     coord dstx, dsty;
     int found;
-    s_char *p;
+    char *p;
     int nuketype;
     int moving;
     struct nukstr nuke;
@@ -88,7 +88,7 @@ tran_nuke(void)
     struct sctstr endsect;
     int mcost, dam;
     struct nstr_item nstr;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!(p = getstarg(player->argp[2], "from sector : ", buf)))
        return RET_SYN;
@@ -143,8 +143,7 @@ tran_nuke(void)
        return RET_FAIL;
     }
     dam = 0;
-    mcost = move_ground((s_char *)&nuke, &sect, &endsect,
-                       (double)ncp->n_weight * moving,
+    mcost = move_ground(&sect, &endsect, (double)ncp->n_weight * moving,
                        player->argp[5], tran_map, 0, &dam);
 
     if (mcost < 0)
@@ -246,8 +245,7 @@ tran_plane(void)
        return RET_FAIL;
     }
     dam = 1;
-    mcost = move_ground((s_char *)&plane, &sect, &endsect,
-                       (double)weight,
+    mcost = move_ground(&sect, &endsect, (double)weight,
                        player->argp[3], tran_map, 0, &dam);
     dam /= count;
     if (mcost < 0)
@@ -285,7 +283,7 @@ tran_plane(void)
  */
 /*ARGSUSED*/
 static int
-tran_map(s_char *what, coord curx, coord cury, s_char *arg)
+tran_map(coord curx, coord cury, char *arg)
 {
     player->argp[0] = "map";
     player->argp[1] = arg;

diff --git a/src/lib/subs/move.c b/src/lib/subs/move.c
index e2fe6cf1751293a4eebc971b228fe1b288bb77fe..5fdd967df13e9b4b7f6a94484dca6cc43fc70cf6 100644 (file)
--- a/src/lib/subs/move.c
+++ b/src/lib/subs/move.c
@@ -46,12 +46,12 @@
 #include "damage.h"
 #include "prototypes.h"
 
-static int move_map(s_char *what, coord curx, coord cury, s_char *arg);
+static int move_map(coord curx, coord cury, char *arg);
 
 int
-move_ground(s_char *what, struct sctstr *start, struct sctstr *end,
-           double weight, s_char *path,
-           int (*map)(s_char *, coord, coord, s_char *), int exploring,
+move_ground(struct sctstr *start, struct sctstr *end,
+           double weight, char *path,
+           int (*map)(coord, coord, char *), int exploring,
            int *dam)
 {
     struct sctstr sect, ending_sect;
@@ -59,7 +59,7 @@ move_ground(s_char *what, struct sctstr *start, struct sctstr *end,
     coord curx, cury, oldx, oldy;
     coord tmpx, tmpy;
     coord dx, dy;
-    s_char *movstr;
+    char *movstr;
     double sect_mcost;
     double total_mcost;
     double mv_cost;
@@ -68,10 +68,10 @@ move_ground(s_char *what, struct sctstr *start, struct sctstr *end,
     int intcost;
     int takedam = *dam;
     int out = 0;
-    s_char bpath[512];
-    s_char buf2[512];
-    s_char prompt[128];
-    s_char buf[1024];
+    char bpath[512];
+    char buf2[512];
+    char prompt[128];
+    char buf[1024];
 
     *end = *start;
     if (mobility <= 0.0)
@@ -114,9 +114,9 @@ move_ground(s_char *what, struct sctstr *start, struct sctstr *end,
        oldy = cury;
        if (!movstr || *movstr == 0) {
            if (exploring) {
-               map(what, curx, cury, NULL);
+               map(curx, cury, NULL);
            } else {
-               move_map(what, curx, cury, NULL);
+               move_map(curx, cury, NULL);
            }
            sprintf(prompt, "<%.1f: %c %s> ", mobility,
                    dchr[sect.sct_type].d_mnem,
@@ -161,7 +161,7 @@ move_ground(s_char *what, struct sctstr *start, struct sctstr *end,
        movstr++;
        if (dir == DIR_MAP) {
            if (!exploring)
-               map(what, curx, cury, movstr + 1);
+               map(curx, cury, movstr + 1);
            *movstr = 0;
            continue;
        } else if (dir == DIR_STOP)
@@ -250,7 +250,7 @@ move_ground(s_char *what, struct sctstr *start, struct sctstr *end,
 
 /*ARGSUSED*/
 static int
-move_map(s_char *what, coord curx, coord cury, s_char *arg)
+move_map(coord curx, coord cury, char *arg)
 {
     struct nstr_sect ns;
     struct sctstr sect;