fly/flightgear
1
0
Fork 0
Code Activity

Tests: load loadprioirty.xml

Browse source 
Otherwise we screw up Nasal load order.
This commit is contained in:
James Turner 2020-07-02 12:13:53 +01:00
parent 39cedd1256
commit c3fce7e436
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test_suite/FGTestApi/testGlobals.cxx
View file

@ -21,6 +21,7 @@
#include <simgear/structure/event_mgr.hxx> #include <simgear/structure/event_mgr.hxx>
#include <simgear/timing/timestamp.hxx> #include <simgear/timing/timestamp.hxx>
#include <simgear/math/sg_geodesy.hxx> #include <simgear/math/sg_geodesy.hxx>
#include <simgear/props/props_io.hxx>
#include <Airports/airport.hxx> #include <Airports/airport.hxx>
#include <Navaids/FlightPlan.hxx> #include <Navaids/FlightPlan.hxx>
@ -111,6 +112,11 @@ void initStandardNasal(bool withCanvas)
auto nasalNode = globals->get_props()->getNode("nasal", true); auto nasalNode = globals->get_props()->getNode("nasal", true);
// load loadpriority.xml, for default modules load order
auto nasalLoadPriority = globals->get_props()->getNode("/sim/nasal-load-priority",true);
readProperties(globals->get_fg_root() / "Nasal/loadpriority.xml", nasalLoadPriority);
// set various props to reduce Nasal errors // set various props to reduce Nasal errors
auto props = globals->get_props(); auto props = globals->get_props();
props->setStringValue("sim/flight-model", "null"); props->setStringValue("sim/flight-model", "null");