Change pln_mine() parameters to match pln_dropoff()

This moves getting the target sector from caller into pln_mine().
Makes sense, because that's where it's put.

diff --git a/include/prototypes.h b/include/prototypes.h
index 57e8b8cfba96f6787116af5602ec7d95dcef5ee9..8c7791e8cd6d92521029d929a0edb25c0e7b8ba6 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -544,7 +544,7 @@ extern int could_be_on_ship(struct plnstr *, struct shpstr *);
 extern int put_plane_on_ship(struct plnstr *, struct shpstr *);
 extern void pln_dropoff(struct emp_qelem *, struct ichrstr *,
                        coord, coord, int);
-extern void pln_mine(struct emp_qelem *list, struct sctstr *sectp);
+extern void pln_mine(struct emp_qelem *, coord, coord);
 extern int pln_capable(struct plnstr *, int, int);
 extern int pln_airbase_ok(struct plnstr *, int, int);
 extern int carrier_planes(struct shpstr *, int);

diff --git a/src/lib/commands/drop.c b/src/lib/commands/drop.c
index 004bab6bf8aebf11fd12818c3d92bf321ad51310..a3317af5e578e5ca157f57844828b69c829ae4cc 100644 (file)
--- a/src/lib/commands/drop.c
+++ b/src/lib/commands/drop.c
@@ -129,9 +129,8 @@ drop(void)
     if (QEMPTY(&bomb_list)) {
        pr("No planes got through fighter defenses\n");
     } else {
-       getsect(tx, ty, &target);
        if (wantflags & P_MINE)
-           pln_mine(&bomb_list, &target);
+           pln_mine(&bomb_list, tx, ty);
        else
            pln_dropoff(&bomb_list, ip, tx, ty, -1);
     }

diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c
index defe08abf788d5d7c0740e536d01804deac5d01d..cd38013741c9261ba674a283cc5fe063d8c565d3 100644 (file)
--- a/src/lib/subs/plnsub.c
+++ b/src/lib/subs/plnsub.c
@@ -309,11 +309,12 @@ pln_dropoff(struct emp_qelem *list, struct ichrstr *ip, coord tx, coord ty,
 }
 
 void
-pln_mine(struct emp_qelem *list, struct sctstr *sectp)
+pln_mine(struct emp_qelem *list, coord tx, coord ty)
 {
     struct emp_qelem *qp;
     struct plist *plp;
     int amt;
+    struct sctstr sect;
 
     amt = 0;
     for (qp = list->q_forw; qp != list; qp = qp->q_forw) {
@@ -322,16 +323,16 @@ pln_mine(struct emp_qelem *list, struct sctstr *sectp)
 
     }
     if (amt > 0) {
-       if (sectp->sct_type != SCT_WATER) {
+       getsect(tx, ty, &sect);
+       if (sect.sct_type != SCT_WATER) {
            pr("Your seamines have no effect here.\n");
            return;
        }
-       sectp->sct_mines = MIN(sectp->sct_mines + amt, MINES_MAX);
-       pr("%d mines laid in %s.\n", amt,
-          xyas(sectp->sct_x, sectp->sct_y, player->cnum));
-       if (map_set(player->cnum, sectp->sct_x, sectp->sct_y, 'X', 0))
+       sect.sct_mines = MIN(sect.sct_mines + amt, MINES_MAX);
+       pr("%d mines laid in %s.\n", amt, xyas(tx, ty, player->cnum));
+       if (map_set(player->cnum, tx, ty, 'X', 0))
            writemap(player->cnum);
-       putsect(sectp);
+       putsect(&sect);
     }
 }