Fix line endings

[flightgear.git] / src / Main / main.cxx

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index f972a59ac3c81f72a2004c3b49868f1d52b29a55..4adc55995c47a9e4efd0e586866355155dc6ead7 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -74,12 +74,7 @@
 #include <Time/fg_timer.hxx>
 #include <Environment/environment_mgr.hxx>
 #include <GUI/new_gui.hxx>
-
-#ifdef FG_MPLAYER_AS
 #include <MultiPlayer/multiplaymgr.hxx>
-#endif
-
-
 
 #include "fg_commands.hxx"
 #include "fg_io.hxx"
@@ -454,19 +449,20 @@ static void fgMainLoop( void ) {
     ++frames;
 #endif
 
+    // Update any multiplayer's network queues, the AIMultiplayer
+    // implementation is an AI model and depends on that
+    globals->get_multiplayer_mgr()->Update();
+
     // Run ATC subsystem
     if (fgGetBool("/sim/atc/enabled"))
         globals->get_ATC_mgr()->update(delta_time_sec);
 
     // Run the AI subsystem
+    // FIXME: run that also if we have multiplying enabled since the
+    // multiplayer information is interpreted by an AI model
     if (fgGetBool("/sim/ai-traffic/enabled"))
         globals->get_AI_mgr()->update(delta_time_sec);
 
-#ifdef FG_MPLAYER_AS
-    // Update any multiplayer models
-    globals->get_multiplayer_mgr()->Update();
-#endif
-
     // Run flight model
 
     // Calculate model iterations needed for next frame