Use the new path finder for land paths, drop old A*

[empserver] / src / lib / subs / move.c

diff --git a/src/lib/subs/move.c b/src/lib/subs/move.c
index 5b9b45761ad967b0ff581c84960698adabd4ba30..57abc754388357f26a291ef6dff92d78ce9694fe 100644 (file)
--- a/src/lib/subs/move.c
+++ b/src/lib/subs/move.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,9 +25,9 @@
  *  ---
  *
  *  move.c: Move something somewhere.
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
 #include <config.h>
@@ -64,8 +63,8 @@ move_ground(struct sctstr *start, struct sctstr *end,
     int intcost;
     int takedam = *dam;
     int out = 0;
-    char bpath[512];
-    char buf2[512];
+    char bpath[1024];
+    char buf2[1024];
     char prompt[128];
     char buf[1024];
 
@@ -206,8 +205,8 @@ move_ground(struct sctstr *start, struct sctstr *end,
            mobility -= sect_mcost;
            total_mcost += sect_mcost;
        }
-       curx = tmpx;
-       cury = tmpy;
+       curx = next.sct_x;
+       cury = next.sct_y;
        if (cury != start->sct_y)
            out = 1;
        if (curx != start->sct_x)
@@ -300,7 +299,7 @@ fly_map(coord curx, coord cury)
     i = 0;
     while (i < 7 && nxtsct(&ns, &sect)) {
        /* Nasty: this relies on the iteration order */
-       if (!(view[i] = player->bmap[sctoff(ns.x, ns.y)]))
+       if (!(view[i] = player->bmap[sect.sct_uid]))
            view[i] = ' ';
        i++;
     }
@@ -318,7 +317,7 @@ check_lmines(coord x, coord y, double weight)
     int dam = 0;
 
     getsect(x, y, &sect);
-    if (sect.sct_mines > 0 &&
+    if (SCT_LANDMINES(&sect) > 0 &&
        sect.sct_oldown != player->cnum &&
        chance(DMINE_LHITCHANCE(sect.sct_mines)) && chance(weight / 100.0)) {
        pr_beep();