Some autopilot fixes

[flightgear.git] / src / Scenery / tilemgr.cxx

diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx
index 52cadfd05a7956a857ba7ff2f35657e0684afd7e..5d7821307587f6aeb03019837d4ab1276cf8b669 100644 (file)
--- a/src/Scenery/tilemgr.cxx
+++ b/src/Scenery/tilemgr.cxx
@@ -209,7 +209,7 @@ void FGTileMgr::schedule_needed(const SGBucket& curr_bucket, double vis)
     // cout << "tile width = " << tile_width << "  tile_height = "
     //      << tile_height << endl;
 
-    double tileRangeM = min(vis,_maxTileRangeM->getDoubleValue());
+    double tileRangeM = std::min(vis,_maxTileRangeM->getDoubleValue());
     xrange = (int)(tileRangeM / tile_width) + 1;
     yrange = (int)(tileRangeM / tile_height) + 1;
     if ( xrange < 1 ) { xrange = 1; }
@@ -250,8 +250,9 @@ void FGTileMgr::schedule_needed(const SGBucket& curr_bucket, double vis)
 osg::Node*
 FGTileMgr::loadTileModel(const string& modelPath, bool cacheModel)
 {
-    SGPath fullPath;
-    if (fgGetBool("/sim/paths/use-custom-scenery-data") == true) {
+    SGPath fullPath = modelPath;
+    if ((fullPath.isRelative())&&
+        (fgGetBool("/sim/paths/use-custom-scenery-data") == true)) {
         string_list sc = globals->get_fg_scenery();
 
         for (string_list_iterator it = sc.begin(); it != sc.end(); ++it) {
@@ -265,8 +266,6 @@ FGTileMgr::loadTileModel(const string& modelPath, bool cacheModel)
                 }
             }
         }
-    } else {
-         fullPath.append(modelPath);
     }
     osg::Node* result = 0;
     try {
@@ -276,7 +275,7 @@ FGTileMgr::loadTileModel(const string& modelPath, bool cacheModel)
                                       new FGNasalModelData);
         else
             result=
-                SGModelLib::loadPagedModel(modelPath, globals->get_props(),
+                SGModelLib::loadPagedModel(fullPath.str(), globals->get_props(),
                                            new FGNasalModelData);
     } catch (const sg_io_exception& exc) {
         string m(exc.getMessage());