From: ehofman <ehofman>
Date: Sun, 23 Mar 2003 09:59:46 +0000 (+0000)
Subject: Frederic Bouvier's assorted set of MSVC fixes
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ef37b45dc7f73e30b259245cbd38f93fe3b5cd80;p=flightgear.git

Frederic Bouvier's assorted set of MSVC fixes
---

diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index 688975130..965d8c04d 100644
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -582,7 +582,7 @@ FGPanel::doMouseAction (int button, int updown, int x, int y)
 
   // Having fixed up the coordinates, fall through to the local
   // coordinate handler.
-  doLocalMouseAction(button, updown, x, y);
+  return doLocalMouseAction(button, updown, x, y);
 } 
 
 
diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index f96948796..6494a8f0d 100644
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -706,7 +706,7 @@ static bool
 do_dialog_close (const SGPropertyNode * arg)
 {
     NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
-    gui->closeActiveDialog();
+    return gui->closeActiveDialog();
 }
 
 
diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 0658c00d2..3cadc4467 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -1293,9 +1293,9 @@ parse_option (const string& arg)
                     break;
                 case OPTION_FUNC:
                     if ( pt->has_param && pos != string::npos ) {
-                        pt->func( arg.substr( pos + 1 ).c_str() );
+                        return pt->func( arg.substr( pos + 1 ).c_str() );
                     } else if ( !pt->has_param && pos == string::npos ) {
-                        pt->func( 0 );
+                        return pt->func( 0 );
                     } else if ( pt->has_param ) {
                         SG_LOG( SG_GENERAL, SG_ALERT, "Option '" << arg << "' needs a parameter" );
                         return FG_OPTIONS_ERROR;
diff --git a/src/MultiPlayer/multiplayrxmgr.cxx b/src/MultiPlayer/multiplayrxmgr.cxx
index e5bd29c6b..61ca69514 100644
--- a/src/MultiPlayer/multiplayrxmgr.cxx
+++ b/src/MultiPlayer/multiplayrxmgr.cxx
@@ -236,7 +236,7 @@ void FGMultiplayRxMgr::ProcessData(void) {
                     sCallsign = MsgHdr->sCallsign;
 
                     // Process the player data unless we generated it
-                    if (m_sCallsign != MsgHdr->sCallsign) {
+                    if (m_sCallsign != string(MsgHdr->sCallsign)) {
 
 
                         // Process messages