[Rails-commits] SF.net SVN: rails:[1570] trunk/18xx/rails/game/MapManager.java

[<ev...@us...>]

Revision: 1570
          http://rails.svn.sourceforge.net/rails/?rev=1570&view=rev
Author:   evos
Date:     2011-06-07 15:44:23 +0000 (Tue, 07 Jun 2011)

Log Message:
-----------
Map root directory fix: default is the "data" directory

Modified Paths:
--------------
    trunk/18xx/rails/game/MapManager.java

Modified: trunk/18xx/rails/game/MapManager.java
===================================================================
--- trunk/18xx/rails/game/MapManager.java	2011-06-07 15:25:30 UTC (rev 1569)
+++ trunk/18xx/rails/game/MapManager.java	2011-06-07 15:44:23 UTC (rev 1570)
@@ -157,7 +157,11 @@
         mapImageUsed = Util.hasValue(mapImageFilename) 
             && "yes".equalsIgnoreCase(Config.get("map.image.display"));
         if (mapImageUsed) {
-            mapImageFilepath = Config.get("map.root_directory") + "/" + mapImageFilename;
+            String rootDirectory = Config.get("map.root_directory");
+            if (!Util.hasValue(rootDirectory)) {
+                rootDirectory = "data";
+            }
+            mapImageFilepath = rootDirectory + "/" + mapImageFilename;
         }
         
         for (String hexName : mHexes.keySet()) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.