fly/flightgear
1
0
Fork 0
Code Activity

How on earth???? Replace "and" by && and "or" by || to match C++ more closely........

Browse source
This commit is contained in:
ehofman 2004-07-23 07:33:24 +00:00
parent 025a1e2491
commit ef84402da1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Main/main.cxx
View file

@ -1209,7 +1209,7 @@ static void fgMainLoop( void ) {
if ( global_multi_loop > 0) { if ( global_multi_loop > 0) {
// first run the flight model each frame until it is intialized // first run the flight model each frame until it is intialized
// then continue running each frame only after initial scenery load is complete. // then continue running each frame only after initial scenery load is complete.
if (!cur_fdm_state->get_inited() or fgGetBool("sim/sceneryloaded")) { if (!cur_fdm_state->get_inited() || fgGetBool("sim/sceneryloaded")) {
fgUpdateTimeDepCalcs(); fgUpdateTimeDepCalcs();
} else { } else {
// only during scenery load // only during scenery load
@ -1339,7 +1339,7 @@ static void fgMainLoop( void ) {
// END Tile Manager udpates // END Tile Manager udpates
if (!fgGetBool("sim/sceneryloaded") and globals->get_tile_mgr()->all_queues_empty() and cur_fdm_state->get_inited()) { if (!fgGetBool("sim/sceneryloaded") && globals->get_tile_mgr()->all_queues_empty() && cur_fdm_state->get_inited()) {
fgSetBool("sim/sceneryloaded",true); fgSetBool("sim/sceneryloaded",true);
// probably not efficient way to popup msg, but is done only during scenery load // probably not efficient way to popup msg, but is done only during scenery load
NewGUI * gui = (NewGUI *)globals->get_subsystem("gui"); NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
@ -1512,7 +1512,7 @@ void fgReshape( int width, int height ) {
// which happens in the sound manager destructor. // which happens in the sound manager destructor.
void fgExitCleanup() { void fgExitCleanup() {
delete globals; delete globals;
fgOSExit(0); // fgOSExit(0);
} }