fly/fgdata
1
0
Fork 0
Code Activity

Animated jetways: Remove obsolete use-custom-scenery-data property

Browse source
This commit is contained in:
Ryan M 2013-02-04 15:42:08 -08:00 committed by James Turner
parent 658b1fe6ce
commit 9b19d5e20e
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Nasal/jetways/jetways.nas
View file

@ -373,20 +373,17 @@ var Jetway =
var model_file = ""; var model_file = "";
var model_dir = ""; var model_dir = "";
var airline_file = ""; var airline_file = "";
if (props.globals.getNode("/sim/paths/use-custom-scenery-data", 1).getBoolValue()) # search in scenery directories
foreach (var scenery_path; scenery)
{ {
# search in scenery directories model_dir = scenery_path ~ "/Models/Airport/Jetway";
foreach (var scenery_path; scenery) model_file = model_dir ~ "/" ~ model ~ ".xml";
{ airline_file = model_dir ~ "/" ~ model ~ ".airline." ~ airline ~ ".xml";
model_dir = scenery_path ~ "/Models/Airport/Jetway"; print_debug("Trying to load a jetway model from " ~ model_file);
model_file = model_dir ~ "/" ~ model ~ ".xml"; if (io.stat(model_file) == nil) continue;
airline_file = model_dir ~ "/" ~ model ~ ".airline." ~ airline ~ ".xml"; model_tree = io.read_properties(model_file);
print_debug("Trying to load a jetway model from " ~ model_file); if (io.stat(airline_file) != nil) props.copy(io.read_properties(airline_file), model_tree);
if (io.stat(model_file) == nil) continue; break;
model_tree = io.read_properties(model_file);
if (io.stat(airline_file) != nil) props.copy(io.read_properties(airline_file), model_tree);
break;
}
} }
if (model_tree == nil) if (model_tree == nil)
{ {
@ -715,8 +712,12 @@ var toggle_jetway_from_model = func(model)
var load_airport_jetways = func(airport) var load_airport_jetways = func(airport)
{ {
if (isin(loaded_airports, airport)) return; if (isin(loaded_airports, airport)) return;
var tree = props.globals.getNode("/sim/paths/use-custom-scenery-data", 1).getBoolValue() ? io.read_airport_properties(airport, "jetways") : (io.stat(root ~ "/AI/Airports/" ~ airport ~ "/jetways.xml") == nil ? nil : io.read_properties(root ~ "/AI/Airports/" ~ airport ~ "/jetways.xml")); var tree = io.read_airport_properties(airport, "jetways");
if (tree == nil) return; if (tree == nil)
{
tree = io.read_properties(root ~ "/AI/Airports/" ~ airport ~ "/jetways.xml");
if (tree == nil) return;
}
append(loaded_airports, airport); append(loaded_airports, airport);
print_debug("Loading jetways for airport " ~ airport); print_debug("Loading jetways for airport " ~ airport);
var nodes = tree.getChildren("jetway"); var nodes = tree.getChildren("jetway");