[Flightgear-devel] Re: [Flightgear-cvslogs] CVS: FlightGear/src/Main main.cxx, 1.151, 1.152 options.cxx, 1.52, 1.53

[Curtis L. Olson]

I should point out that the reason these were setup as "cout" was so 
that we wouldn't lose all output if someone compiled with the 
--without-logging option.  Now that our default output is much less 
verbose, people are probably not compiling with this option so it's 
probably not a big deal ... but that was the reason we used cout's here.

Curt.

Erik Hofman wrote:

Update of /var/cvs/FlightGear-0.9/FlightGear/src/Main
In directory baron:/tmp/cvs-serv29723
Modified Files:
	main.cxx options.cxx 
Log Message:

Frederic Bouvier:

trying the --show-aircraft option, I noticed that I had 
no output. This is because there are still output to 
cout or cerr, that are not triggering my console patch 
for windows. The patch attached use SG_LOG instead. 
A request to hit a key is also added because otherwise,
the console window will disappear as soon as the program 
stop.

This problem is minor though given the fact that fgfs.exe 
is shipped with fgrun that do show the available aircraft 
in a much nicer manner.

Index: main.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/Main/main.cxx,v
retrieving revision 1.151
retrieving revision 1.152
diff -C2 -r1.151 -r1.152
*** a/main.cxx	19 Mar 2004 03:30:18 -0000	1.151
--- b/main.cxx	30 Mar 2004 09:05:05 -0000	1.152
***************
*** 1511,1518 ****
         // tell the operator how to use this application
 
!         cerr << endl << "Base package check failed ... " \
              << "Found version " << base_version << " at: " \
!              << globals->get_fg_root() << endl;
!         cerr << "Please upgrade to version: " << required_version << endl;
         exit(-1);
     }
--- 1511,1522 ----
         // tell the operator how to use this application
 
!         SG_LOG( SG_GENERAL, SG_ALERT, endl << "Base package check failed ... " \
              << "Found version " << base_version << " at: " \
!              << globals->get_fg_root() );
!         SG_LOG( SG_GENERAL, SG_ALERT, "Please upgrade to version: " << required_version );
! #ifdef _MSC_VER
!         SG_LOG( SG_GENERAL, SG_ALERT, "Hit a key to continue..." );
!         cin.get();
! #endif
         exit(-1);
     }

Index: options.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/Main/options.cxx,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** a/options.cxx	26 Feb 2004 12:57:38 -0000	1.52
--- b/options.cxx	30 Mar 2004 09:05:05 -0000	1.53
***************
*** 1763,1769 ****
 
     sort(aircraft.begin(), aircraft.end());
!     cout << "Available aircraft:" << endl;
     for ( unsigned int i = 0; i < aircraft.size(); i++ ) {
!         cout << aircraft[i] << endl;
     }
 }
--- 1763,1773 ----
 
     sort(aircraft.begin(), aircraft.end());
!     SG_LOG( SG_GENERAL, SG_ALERT, "Available aircraft:" );
     for ( unsigned int i = 0; i < aircraft.size(); i++ ) {
!         SG_LOG( SG_GENERAL, SG_ALERT, aircraft[i] );
     }
+ #ifdef _MSC_VER
+     SG_LOG( SG_GENERAL, SG_ALERT, "Hit a key to continue..." );
+     cin.get();
+ #endif
 }

_______________________________________________
Flightgear-cvslogs mailing list
[EMAIL PROTECTED]
http://mail.flightgear.org/mailman/listinfo/flightgear-cvslogs
 



--
Curtis Olson   Intelligent Vehicles Lab         FlightGear Project
Twin Cities    [EMAIL PROTECTED]                  [EMAIL PROTECTED]
Minnesota      http://www.menet.umn.edu/~curt   http://www.flightgear.org


_______________________________________________
Flightgear-devel mailing list
[EMAIL PROTECTED]
http://mail.flightgear.org/mailman/listinfo/flightgear-devel