Viewer update from Jim Wilson:

[flightgear.git] / src / GUI / gui.cxx

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index abae196636d066dce800bf097f85b24d63dc0575..4c8e4b7cc81fec29a4231c3fa0d383ec3d64562a 100644 (file)
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -167,7 +167,7 @@ void guiErrorMessage (const char *txt, const sg_throwable &throwable)
     string msg = txt;
     msg += '\n';
     msg += throwable.getFormattedMessage();
-    if (throwable.getOrigin() != (string)"") {
+    if (!throwable.getOrigin().empty()) {
       msg += "\n (reported by ";
       msg += throwable.getOrigin();
       msg += ')';
@@ -525,8 +525,8 @@ void fgHiResDump()
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
     ssgSetCamera( (sgVec4 *)globals->get_current_view()->get_VIEW() );
-    float fov = globals->get_current_view()->get_fov();
-    ssgSetFOV(fov, fov * globals->get_current_view()->get_fov_ratio());
+    ssgSetFOV( globals->get_current_view()->get_h_fov(),
+              globals->get_current_view()->get_v_fov() );
     // ssgSetNearFar( 10.0f, 120000.0f );
     ssgSetNearFar( 0.5f, 1200000.0f );
 
@@ -1034,6 +1034,7 @@ void guiInit()
     // Set up our Dialog Boxes
     ConfirmExitDialogInit();
     NewAirportInit();
+       
 #ifdef FG_NETWORK_OLK
     NewNetIdInit();
     NewNetFGDInit();
@@ -1059,7 +1060,7 @@ void guiInit()
     // Set up menu bar toggle
     gui_menu_on = ~0;
 
-    if (fgGetString("/sim/flight-model") == "ada") {
+    if (!strcmp("/sim/flight-model", "ada")) {
         guiToggleMenu(); // Menu off by default
     }
 }