fly/flightgear
1
0
Fork 0
Code Activity

Drop sorting of Nasal scripts.

Browse source 
simgear::Dir now always provides results in a deterministic order.
This commit is contained in:
ThorstenB 2012-10-13 12:42:48 +02:00
parent 395c317627
commit 60eaa22fda
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Scripting/NasalSys.cxx
View file

@ -13,7 +13,6 @@
#include <sys/stat.h>
#include <fstream>
#include <sstream>
#include <algorithm> // for std::sort
#include <simgear/nasal/nasal.h>
#include <simgear/props/props.hxx>
@ -635,10 +634,8 @@ bool pathSortPredicate(const SGPath& p1, const SGPath& p2)
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);
// Note: simgear::Dir already reports file entries in a deterministic order,
// so a fixed loading sequence is guaranteed (same for every user)
for (unsigned int i=0; i<scripts.size(); ++i) {
SGPath fullpath(scripts[i]);
SGPath file = fullpath.file();