Frederic Bouvier's assorted set of MSVC fixes

diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index 6889751302d63506dfafc14098a33ffe86dbd857..965d8c04de38fe9c88254f8d353c1210d48b97c2 100644 (file)
--- 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 f96948796bf11df8197996f00a0be4a2723f25a9..6494a8f0d3e94901aa5cdc04c7876f39ca37e358 100644 (file)
--- 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 0658c00d2cdc5c4a207756da0aabd176d6d69a3c..3cadc446741d4ad2fc974bf4ef4ea90ea4760ff0 100644 (file)
--- 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 e5bd29c6b0b902540d7eadaa91ec07a7bcf17ecc..61ca69514c5da91c911deed778b52d6030d028e1 100644 (file)
--- 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