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 07ab8408016b16cb22259a1a68840f715674a342..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"
@@ -90,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;
     }