fly/flightgear
1
0
Fork 0
Code Activity

Use --fg-aircraft paths for AI model

Browse source 
Firstly search model in $fg-root/AI/ path,
if not found, search model in --fg-aircraft paths,
if not found, search model in $fg-root/Aircraft path

This commit should solve the complaint "I have an aircraft in a separate Aircraft/ folder
but during MP session other user are shown with the aircraft from the $fg-root/Aircraft path
instead of this behaviour I want to see the aircraft from my separate Aircraft/ folder"
This commit is contained in:
Clément de l'Hamaide 2014-01-21 00:06:43 +01:00
parent a46114da9a
commit 695a9be75d
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/AIModel/AIBase.cxx
View file

@ -358,6 +358,14 @@ bool FGAIBase::init(bool search_in_AI_path)
BOOST_FOREACH(SGPath p, globals->get_data_paths("AI")) { BOOST_FOREACH(SGPath p, globals->get_data_paths("AI")) {
paths.push_back(p.str()); paths.push_back(p.str());
} }
// search models in --fg-aircraft paths;
// when a copy of an aircraft is in --fg-aircraft paths
// we want to load this one instead of the default one from fgdata/Aircraft
BOOST_FOREACH(SGPath p, globals->get_aircraft_paths()) {
paths.push_back(p.str());
}
f = osgDB::findDataFile(model_path, opt.get()); f = osgDB::findDataFile(model_path, opt.get());
} }