fly/flightgear
1
0
Fork 0
Code Activity

Kill the Aircraft/foo path warning.

Browse source 
We probably need a warning for cross-aircraft paths, but leaving that
for a separate change since I’m worried it will warn on MP aircraft.

Maybe better checked in the Python scripts than in the app?
This commit is contained in:
James Turner 2017-03-25 15:40:11 +00:00
parent 9e122eaf81
commit 31e933d836
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Main/globals.cxx
View file

@ -88,14 +88,6 @@ public:
const char* aircraftDir = fgGetString("/sim/aircraft-dir"); const char* aircraftDir = fgGetString("/sim/aircraft-dir");
string_list aircraftDirPieces(sgPathBranchSplit(aircraftDir)); string_list aircraftDirPieces(sgPathBranchSplit(aircraftDir));
if (!aircraftDirPieces.empty() && (aircraftDirPieces.back() == pieces[1])) { if (!aircraftDirPieces.empty() && (aircraftDirPieces.back() == pieces[1])) {
// disable this warning for release builds
SGPath betterPath;
for (unsigned int i=2; i<pieces.size(); ++i) {
betterPath.append(pieces[i]);
}
SG_LOG(SG_AIRCRAFT, SG_DEV_WARN, "resolved path:" << aResource << " using /sim/aircraft-dir.\n"
"This is legacy behaviour, change to an aircraft relative path:" << betterPath);
// current aircraft-dir matches resource aircraft // current aircraft-dir matches resource aircraft
SGPath r(aircraftDir); SGPath r(aircraftDir);
for (unsigned int i=2; i<pieces.size(); ++i) { for (unsigned int i=2; i<pieces.size(); ++i) {