PLIB net removed from FlightGear

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

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 1cfe91ba2054598a255eb6a71c0eb8811d26582e..fc28ce963aa92b55d85b408fc04cac727fcdd8ee 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -48,13 +48,13 @@
 #include <simgear/props/props.hxx>
 #include <simgear/timing/sg_time.hxx>
 #include <simgear/math/sg_random.h>
+#include <simgear/io/raw_socket.hxx>
 
 #include <Time/light.hxx>
 #include <Aircraft/replay.hxx>
 #include <Cockpit/cockpit.hxx>
 #include <Cockpit/hud.hxx>
 #include <Model/panelnode.hxx>
-#include <Model/modelmgr.hxx>
 #include <Model/acmodel.hxx>
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
@@ -149,16 +149,6 @@ static void fgMainLoop( void ) {
     
     globals->get_subsystem_mgr()->update(sim_dt);
 
-    // run Nasal's settimer() loops right before the view manager
-    globals->get_event_mgr()->update(sim_dt);
-
-    // pick up model coordidnates that Nasal code may have set relative to the
-    // aircraft's
-    globals->get_model_mgr()->update(sim_dt);
-
-    // update the view angle as late as possible, but before sound calculations
-    globals->get_viewmgr()->update(real_dt);
-
     // Update the sound manager last so it can use the CPU while the GPU
     // is processing the scenery (doubled the frame-rate for me) -EMH-
 #ifdef ENABLE_AUDIO_SUPPORT
@@ -375,33 +365,12 @@ static void fgIdleFunction ( void ) {
         globals->set_tile_mgr( new FGTileMgr );
 
 
-        ////////////////////////////////////////////////////////////////////
-        // Initialize the general model subsystem.
-        ////////////////////////////////////////////////////////////////////
-        globals->set_model_mgr(new FGModelMgr);
-        globals->get_model_mgr()->init();
-        globals->get_model_mgr()->bind();
         fgSplashProgress("loading aircraft");
 
 
     } else if ( idle_state == 5 ) {
         idle_state++;
 
-        ////////////////////////////////////////////////////////////////////
-        // Initialize the 3D aircraft model subsystem (has a dependency on
-        // the scenery subsystem.)
-        ////////////////////////////////////////////////////////////////////
-        FGAircraftModel* acm = new FGAircraftModel;
-        globals->set_aircraft_model(acm);
-        globals->add_subsystem("aircraft-model", acm, SGSubsystemMgr::DISPLAY);
-
-        ////////////////////////////////////////////////////////////////////
-        // Initialize the view manager subsystem.
-        ////////////////////////////////////////////////////////////////////
-        FGViewMgr *viewmgr = new FGViewMgr;
-        globals->set_viewmgr( viewmgr );
-        viewmgr->init();
-        viewmgr->bind();
         fgSplashProgress("generating sky elements");
 
 
@@ -620,8 +589,8 @@ int fgMainInit( int argc, char **argv ) {
     fgRegisterIdleHandler( &fgIdleFunction );
     fgRegisterDrawHandler( &FGRenderer::update );
 
-    // Initialize plib net interface
-    netInit( &argc, argv );
+    // Initialize sockets (WinSock needs this)
+    simgear::Socket::initSockets();
 
     // Clouds3D requires an alpha channel
     fgOSOpenWindow(true /* request stencil buffer */);