# HG changeset patch # User Matti Hamalainen # Date 1395093218 -7200 # Node ID cd489f20cf9ddd50ec29ab4a87195d666c5f03b6 # Parent ee5492ccba8e591c615923f14583af723dca636e Move check for worldconfig later, we need to fetch maputils & co before that. diff -r ee5492ccba8e -r cd489f20cf9d tools/makegmaps.php --- a/tools/makegmaps.php Mon Mar 17 21:55:20 2014 +0200 +++ b/tools/makegmaps.php Mon Mar 17 23:53:38 2014 +0200 @@ -298,15 +298,6 @@ // -// Include continent and tradelane configuration -// -if (!file_exists($cfg["worldConfig"])) - die("Required continent/tradelane configuration file '".$cfg["worldConfig"]."' not found.\n"); - -require $cfg["worldConfig"]; - - -// // Create htaccess files // stMakeHtAccessFile($cfg["urlTilePrefix"], $cfg["pathTileData"], ""); @@ -356,6 +347,15 @@ // +// Include continent and tradelane configuration +// +if (!file_exists($cfg["worldConfig"])) + die("Required continent/tradelane configuration file '".$cfg["worldConfig"]."' not found.\n"); + +require $cfg["worldConfig"]; + + +// // Generate continents JavasScript data file /// echo "* Generating $worldJS ...\n";