fly/flightgear
1
0
Fork 0
Code Activity

Frederic Bouvier's assorted set of MSVC fixes

Browse source
This commit is contained in:
ehofman 2003-03-23 09:59:46 +00:00
parent 2d0cc7e1a8
commit ef37b45dc7
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Cockpit/panel.cxx
View file

@ -582,7 +582,7 @@ FGPanel::doMouseAction (int button, int updown, int x, int y)
// Having fixed up the coordinates, fall through to the local // Having fixed up the coordinates, fall through to the local
// coordinate handler. // coordinate handler.
doLocalMouseAction(button, updown, x, y); return doLocalMouseAction(button, updown, x, y);
} }

2
src/Main/fg_commands.cxx
View file

@ -706,7 +706,7 @@ static bool
do_dialog_close (const SGPropertyNode * arg) do_dialog_close (const SGPropertyNode * arg)
{ {
NewGUI * gui = (NewGUI *)globals->get_subsystem("gui"); NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
gui->closeActiveDialog(); return gui->closeActiveDialog();
} }

4
src/Main/options.cxx
View file

@ -1293,9 +1293,9 @@ parse_option (const string& arg)
break; break;
case OPTION_FUNC: case OPTION_FUNC:
if ( pt->has_param && pos != string::npos ) { 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 ) { } else if ( !pt->has_param && pos == string::npos ) {
pt->func( 0 ); return pt->func( 0 );
} else if ( pt->has_param ) { } else if ( pt->has_param ) {
SG_LOG( SG_GENERAL, SG_ALERT, "Option '" << arg << "' needs a parameter" ); SG_LOG( SG_GENERAL, SG_ALERT, "Option '" << arg << "' needs a parameter" );
return FG_OPTIONS_ERROR; return FG_OPTIONS_ERROR;

2
src/MultiPlayer/multiplayrxmgr.cxx
View file

@ -236,7 +236,7 @@ void FGMultiplayRxMgr::ProcessData(void) {
sCallsign = MsgHdr->sCallsign; sCallsign = MsgHdr->sCallsign;
// Process the player data unless we generated it // Process the player data unless we generated it
if (m_sCallsign != MsgHdr->sCallsign) { if (m_sCallsign != string(MsgHdr->sCallsign)) {
// Process messages // Process messages