fly/flightgear
1
0
Fork 0
Code Activity

Fix for incorrect subsystem grouping introduced in c5aa3ca0f1.

Browse source 
Some of the subsystems created in the fg_init fgCreateSubsystems() function were accidentally
shifted into the subsystem group SGSubsystemMgr::GENERAL, as these subsystems cannot be currently
registered with the subsystem manager and still have to use the non-templated subsystem manager
add() function.
This commit is contained in:
Edward d'Auvergne 2022-11-28 21:46:49 +01:00
parent 0a85e23cde
commit 790b553500
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Main/fg_init.cxx
View file

@ -1051,7 +1051,7 @@ void fgCreateSubsystems(bool duringReset) {
// autopilot.) // autopilot.)
mgr->add<FGSystemMgr>(); mgr->add<FGSystemMgr>();
mgr->add<FGInstrumentMgr>(); mgr->add<FGInstrumentMgr>();
mgr->add("xml-autopilot", FGXMLAutopilotGroup::createInstance("autopilot")); mgr->add("xml-autopilot", FGXMLAutopilotGroup::createInstance("autopilot"), SGSubsystemMgr::FDM);
} }
// SGSubsystemMgr::POST_FDM // SGSubsystemMgr::POST_FDM
@ -1106,7 +1106,7 @@ void fgCreateSubsystems(bool duringReset) {
mgr->add<CanvasMgr>(); mgr->add<CanvasMgr>();
auto canvasGui = new GUIMgr; auto canvasGui = new GUIMgr;
mgr->add("CanvasGUI", canvasGui); mgr->add("CanvasGUI", canvasGui, SGSubsystemMgr::DISPLAY);
auto guiCamera = flightgear::getGUICamera(flightgear::CameraGroup::getDefault()); auto guiCamera = flightgear::getGUICamera(flightgear::CameraGroup::getDefault());
canvasGui->setGUIViewAndCamera(globals->get_renderer()->getView(), guiCamera); canvasGui->setGUIViewAndCamera(globals->get_renderer()->getView(), guiCamera);
@ -1117,7 +1117,7 @@ void fgCreateSubsystems(bool duringReset) {
// ordering here is important : Nasal (via events), then models, then views // ordering here is important : Nasal (via events), then models, then views
if (!duringReset) { if (!duringReset) {
mgr->add<FGLight>(); mgr->add<FGLight>();
mgr->add("events", globals->get_event_mgr()); mgr->add("events", globals->get_event_mgr(), SGSubsystemMgr::DISPLAY);
} }
mgr->add<FGAircraftModel>(); mgr->add<FGAircraftModel>();