Fix the nmea and garmin output to a) fake a GSA sentence, b) fix a y2k bug

[flightgear.git] / src / Scenery / FGTileLoader.cxx

diff --git a/src/Scenery/FGTileLoader.cxx b/src/Scenery/FGTileLoader.cxx
index 8f04c78c8a7fb106011a0637d87ee78025d79fc1..32cad6ead3f20b3e6aa3d5c6e7d2872bd3ddc06f 100644 (file)
--- a/src/Scenery/FGTileLoader.cxx
+++ b/src/Scenery/FGTileLoader.cxx
@@ -24,6 +24,8 @@
 #  include <config.h>
 #endif
 
+#include <simgear/compiler.h>
+
 #include <Main/globals.hxx>
 #include "FGTileLoader.hxx"
 #include "tileentry.hxx"
@@ -64,6 +66,19 @@ FGTileLoader::~FGTileLoader()
 #endif // ENABLE_THREADS
 }
 
+
+#if 0 // we don't ever want to do this I don't think
+/**
+ * 
+ */
+void FGTileLoader::reinit() {
+    while ( !tile_load_queue.empty() ) {
+       tile_load_queue.pop();
+    }
+}
+#endif
+
+
 /**
  * 
  */
@@ -77,11 +92,13 @@ FGTileLoader::add( FGTileEntry* tile )
     static bool beenhere = false;
     if (!beenhere)
     {
-       if ( globals->get_fg_scenery() != (string)"" ) {
-           tile_path.set( globals->get_fg_scenery() );
+       if ( !globals->get_fg_scenery().empty() ) {
+            tile_path = globals->get_fg_scenery();
        } else {
-           tile_path.set( globals->get_fg_root() );
-           tile_path.append( "Scenery" );
+            SGPath tmp;
+           tmp.set( globals->get_fg_root() );
+            tmp.append( "Scenery" );
+            tile_path = tmp.str();
        }
        beenhere = true;
     }
@@ -89,6 +106,7 @@ FGTileLoader::add( FGTileEntry* tile )
     tile_load_queue.push( tile );
 }
 
+#ifdef WISH_PLIB_WAS_THREADED // but it isn't
 /**
  * 
  */
@@ -97,6 +115,7 @@ FGTileLoader::remove( FGTileEntry* tile )
 {
     tile_free_queue.push( tile );
 }
+#endif
 
 /**
  * 
@@ -104,6 +123,7 @@ FGTileLoader::remove( FGTileEntry* tile )
 void
 FGTileLoader::update()
 {
+
 #ifdef ENABLE_THREADS
     // send a signal to the pager thread that it is allowed to load
     // another tile
@@ -112,24 +132,29 @@ FGTileLoader::update()
     mutex.unlock();
 #else
     if ( !tile_load_queue.empty() ) {
-        cout << "loading next tile ..." << endl;
+        // cout << "loading next tile ..." << endl;
         // load the next tile in the queue
         FGTileEntry* tile = tile_load_queue.front();
         tile_load_queue.pop();
+
         tile->load( tile_path, true );
-        FGTileMgr::loaded( tile );
+
+        FGTileMgr::ready_to_attach( tile );
     }
 
+#ifdef WISH_PLIB_WAS_THREADED // but it isn't
     if ( !tile_free_queue.empty() ) {
-        cout << "freeing next tile ..." << endl;
+        // cout << "freeing next tile ..." << endl;
         // free the next tile in the queue
         FGTileEntry* tile = tile_free_queue.front();
         tile_free_queue.pop();
        tile->free_tile();
        delete tile;
     }
+#endif
 
 #endif // ENABLE_THREADS
+
 }
 
 
@@ -156,14 +181,17 @@ FGTileLoader::LoaderThread::run()
 
        FGTileMgr::ready_to_attach( tile );
 
+#ifdef WISH_PLIB_WAS_THREADED // but it isn't
        // Handle and pending removals
        while ( !loader->tile_free_queue.empty() ) {
-           cout << "freeing next tile ..." << endl;
+           // cout << "freeing next tile ..." << endl;
            // free the next tile in the queue
            FGTileEntry* tile = loader->tile_free_queue.pop();
            tile->free_tile();
            delete tile;
        }
+#endif
+
     }
     pthread_cleanup_pop(1);
 }