fly/flightgear
1
0
Fork 0
Code Activity

Make sure also not to try running AI_mgr when compiling fgfs with --disable-atcdcl. FlightGear can now actually run without segfaulting when compiled this way.

Browse source
This commit is contained in:
Durk Talsma 2010-06-27 10:08:26 +02:00
parent 4466729987
commit 3c60bf6511
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Main/main.cxx
View file

@ -346,14 +346,18 @@ static void fgMainLoop( void ) {
// Run ATC subsystem // Run ATC subsystem
if (fgGetBool("/sim/atc/enabled")) if (fgGetBool("/sim/atc/enabled"))
globals->get_ATC_mgr()->update(delta_time_sec); globals->get_ATC_mgr()->update(delta_time_sec);
#endif
// Run the AI subsystem // Run the AI subsystem
// FIXME: run that also if we have multiplaying enabled since the // NOTE: the AI_mgr has nothing to do with the AIModels subsystem.
// multiplayer information is interpreted by an AI model // There was previously a comment here stating that the
// AI_mgr code should be run then multiplayer is enabled.
// Multiplayer relies on AIModels, and not on the old and
// depricated AI_mgr system. So, we can safely skip the following
// two lines at compile time when compiling with --disable-atcdcl
if (fgGetBool("/sim/ai-traffic/enabled")) if (fgGetBool("/sim/ai-traffic/enabled"))
globals->get_AI_mgr()->update(delta_time_sec); globals->get_AI_mgr()->update(delta_time_sec);
#endif
globals->get_subsystem_mgr()->update(delta_time_sec); globals->get_subsystem_mgr()->update(delta_time_sec);
globals->get_aircraft_model()->update(delta_time_sec); globals->get_aircraft_model()->update(delta_time_sec);