Remove /sim/paths/use-custom-scenery-data.

Scenery people tell me that this is always set to true
today. Thus we can remove this property as this allows
me for some further osg loader cleanups.

diff --git a/src/Airports/simple.cxx b/src/Airports/simple.cxx
index d9ac0e676f5355d3dc174a0e055788862caa881b..33fd4ec7a80b37c87728b60b3e7c36589dc760e2 100644 (file)
--- a/src/Airports/simple.cxx
+++ b/src/Airports/simple.cxx
@@ -403,12 +403,6 @@ void FGAirport::loadProcedures() const
 
 void FGAirport::loadSceneryDefinitions() const
 {  
-  // allow users to disable the scenery data in the short-term
-  // longer term, this option can probably disappear
-  if (!fgGetBool("/sim/paths/use-custom-scenery-data")) {
-    return; 
-  }
-  
   SGPath path;
   SGPropertyNode_ptr rootNode = new SGPropertyNode;
   if (XMLLoader::findAirportData(ident(), "threshold", path)) {

diff --git a/src/Airports/xmlloader.cxx b/src/Airports/xmlloader.cxx
index b2ce07ed4b3fdbb28975f48a48685f4db96b6994..71082a331732b96c96459835d468df87f452feca 100644 (file)
--- a/src/Airports/xmlloader.cxx
+++ b/src/Airports/xmlloader.cxx
@@ -38,44 +38,14 @@ XMLLoader::~XMLLoader() {}
 
 void XMLLoader::load(FGAirportDynamics* d) {
   FGAirportDynamicsXMLLoader visitor(d);
-  if (fgGetBool("/sim/paths/use-custom-scenery-data") == false) {
-   SGPath parkpath( globals->get_fg_root() );
-   parkpath.append( "/AI/Airports/" );
-   parkpath.append( d->getId() );
-   parkpath.append( "parking.xml" );
-   SG_LOG(SG_GENERAL, SG_DEBUG, "running old loader:" << parkpath.c_str());
-   if (parkpath.exists()) {
-       try {
-           readXML(parkpath.str(), visitor);
-           d->init();
-       } 
-       catch (const sg_exception &) {
-       }
-   }
-  } else {
-    if(loadAirportXMLDataIntoVisitor(d->getId(), "groundnet", visitor)) {
-        d->init();
-    }
+  if(loadAirportXMLDataIntoVisitor(d->getId(), "groundnet", visitor)) {
+    d->init();
   }
 }
 
 void XMLLoader::load(FGRunwayPreference* p) {
   FGRunwayPreferenceXMLLoader visitor(p);
-  if (fgGetBool("/sim/paths/use-custom-scenery-data") == false) {
-    SGPath rwyPrefPath( globals->get_fg_root() );
-    rwyPrefPath.append( "AI/Airports/" );
-    rwyPrefPath.append( p->getId() );
-    rwyPrefPath.append( "rwyuse.xml" );
-    if (rwyPrefPath.exists()) {
-        try {
-            readXML(rwyPrefPath.str(), visitor);
-        } 
-        catch (const sg_exception &) {
-        }
-     }
-  } else {
-    loadAirportXMLDataIntoVisitor(p->getId(), "rwyuse", visitor);
-  }
+  loadAirportXMLDataIntoVisitor(p->getId(), "rwyuse", visitor);
 }
 
 void XMLLoader::load(FGSidStar* p) {

diff --git a/src/Navaids/navdb.cxx b/src/Navaids/navdb.cxx
index 36ccf9cdffa12335852bf9f16af6d0021b0cb245..385e1db22510cc2e29ede392965fe15ed3e8dae3 100644 (file)
--- a/src/Navaids/navdb.cxx
+++ b/src/Navaids/navdb.cxx
@@ -241,10 +241,6 @@ bool fgNavDBInit( FGNavList *navlist, FGNavList *loclist, FGNavList *gslist,
 
 SGPropertyNode* ilsDataForRunwayAndNavaid(FGRunway* aRunway, const std::string& aNavIdent)
 {
-  if (!fgGetBool("/sim/paths/use-custom-scenery-data")) {
-    return NULL; 
-  }
-  
   if (!aRunway) {
     return NULL;
   }

diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx
index 3d7ec82d8278a4cd02cb6afd836b1e148ba5bedd..e0b59d4fc1efe03c0c77a079509a22589e59c1e8 100644 (file)
--- a/src/Scenery/tilemgr.cxx
+++ b/src/Scenery/tilemgr.cxx
@@ -224,8 +224,7 @@ osg::Node*
 FGTileMgr::loadTileModel(const string& modelPath, bool cacheModel)
 {
     SGPath fullPath = modelPath;
-    if ((fullPath.isRelative())&&
-        (fgGetBool("/sim/paths/use-custom-scenery-data") == true)) {
+    if (fullPath.isRelative()) {
         string_list sc = globals->get_fg_scenery();
 
         for (string_list_iterator it = sc.begin(); it != sc.end(); ++it) {