fly/flightgear
1
0
Fork 0
Code Activity

Automate TerraSync integration with the scenery / dir creation. Now can be used with only --enable-terrasync (and some patience)

Browse source
This commit is contained in:
James Turner 2011-10-16 21:46:27 +01:00
parent 3d0254f6ec
commit 407a495546
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Main/options.cxx
View file

@ -1953,9 +1953,33 @@ void Options::processOptions()
if (envp) { if (envp) {
globals->append_fg_scenery(envp); globals->append_fg_scenery(envp);
} }
// terrasync directory fixup
if (fgGetBool("/sim/terrasync/enabled")) {
string terrasyncDir = fgGetString("/sim/terrasync/scenery-dir");
if (terrasyncDir.empty()) {
SGPath p(fgGetString("/sim/fg-home"));
p.append("TerraSync");
if (!p.exists()) {
simgear::Dir dd(p);
dd.create(0700);
}
terrasyncDir = p.str();
SG_LOG(SG_GENERAL, SG_INFO,
"Using default TerraSync dir: " << terrasyncDir);
fgSetString("/sim/terrasync/scenery-dir", terrasyncDir);
}
const string_list& scenery_paths(globals->get_fg_scenery());
if (std::find(scenery_paths.begin(), scenery_paths.end(), terrasyncDir) == scenery_paths.end()) {
// terrasync dir is not in the scenery paths, add it
globals->append_fg_scenery(terrasyncDir);
}
}
if (globals->get_fg_scenery().empty()) { if (globals->get_fg_scenery().empty()) {
// no scenery paths set *at all*, use the data in FG_ROOT // no scenery paths set *at all*, use the data in FG_ROOT
SGPath root(globals->get_fg_root()); SGPath root(globals->get_fg_root());
root.append("Scenery"); root.append("Scenery");
globals->append_fg_scenery(root.str()); globals->append_fg_scenery(root.str());