Mercurial > hg > batmud > gmap2
changeset 287:695d01a321ec gmap2
Fix maps build process to match with new Maputils.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Wed, 09 Mar 2016 22:41:06 +0200 |
parents | 0fa142c7b5ac |
children | 4e6886674e40 |
files | tools/makegmaps.php |
diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tools/makegmaps.php Wed Feb 10 16:57:13 2016 +0200 +++ b/tools/makegmaps.php Wed Mar 09 22:41:06 2016 +0200 @@ -292,8 +292,8 @@ stQueryConfigItems(1); stQueryConfigItems(2); - $cfg["pathRawMaps"] = $cfg["pathMapUtils"]."maps/"; - $cfg["pathLocFiles"] = $cfg["pathMapUtils"]."maps/"; + $cfg["pathRawMaps"] = $cfg["pathMapUtils"]."world/"; + $cfg["pathLocFiles"] = $cfg["pathMapUtils"]."world/"; $cfg["worldConfig"] = $cfg["pathMapUtils"]."www/world.inc.php"; stQueryConfigItems(3); @@ -317,7 +317,8 @@ $worldJS = $cfg["pathGMap"]."world.js"; $tradelaneOut = $cfg["pathGMap"]."tradelane.json"; $tradelaneOverlay = $cfg["pathGMap"]."trlines.json"; -$binMkLoc = $cfg["pathMapUtils"]."mkloc"; +$tgtMkLoc = "bin/mkloc"; +$binMkLoc = $cfg["pathMapUtils"].$tgtMkLoc; $rawSuffix = ".new"; $rawAltSuffix = ".map"; @@ -364,7 +365,7 @@ passthru($tmp) == 0 or die("Error executing: ".$tmp."\n"); } -$tmp = "cd ".escapeshellarg($cfg["pathMapUtils"])." && ".$cfg["binMake"]." ".escapeshellarg(basename($binMkLoc)); +$tmp = "cd ".escapeshellarg($cfg["pathMapUtils"])." && ".$cfg["binMake"]." ".escapeshellarg($tgtMkLoc); echo "* $tmp\n"; passthru($tmp) == 0 or die("Error executing: ".$tmp."\n");