fly/flightgear
1
0
Fork 0
Code Activity

Deterministic loading sequence for Nasal scripts

Browse source 
Avoid loading Nasal scripts in (random) file system order
This commit is contained in:
ThorstenB 2011-05-29 18:44:15 +02:00
parent 11bb6ef146
commit 3c8a80d968
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Scripting/NasalSys.cxx
View file

@ -805,10 +805,19 @@ void FGNasalSys::update(double)
_context = naNewContext();
}
bool pathSortPredicate(const SGPath& p1, const SGPath& p2)
{
return p1.file() < p2.file();
}
// Loads all scripts in given directory
void FGNasalSys::loadScriptDirectory(simgear::Dir nasalDir)
{
simgear::PathList scripts = nasalDir.children(simgear::Dir::TYPE_FILE, ".nas");
// sort scripts, avoid loading sequence effects due to file system's
// random directory order
std::sort(scripts.begin(), scripts.end(), pathSortPredicate);
for (unsigned int i=0; i<scripts.size(); ++i) {
SGPath fullpath(scripts[i]);
SGPath file = fullpath.file();