fly/flightgear
1
0
Fork 0
Code Activity

Fixes by Charlie Hotchkiss.

Browse source
This commit is contained in:
curt 1998-09-08 21:40:08 +00:00
parent 8496a5242b
commit dbcfeaf766
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Main/fg_init.cxx
View file

@ -37,7 +37,6 @@
# define _G_NO_EXTERN_TEMPLATES # define _G_NO_EXTERN_TEMPLATES
#endif #endif
#include <string.h>
#include <string> #include <string>
#include <Include/fg_constants.h> #include <Include/fg_constants.h>
@ -113,7 +112,7 @@ int fgInitPosition( void ) {
FG_Altitude = current_options.get_altitude() * METER_TO_FEET; FG_Altitude = current_options.get_altitude() * METER_TO_FEET;
FG_Runway_altitude = FG_Altitude - 3.758099; FG_Runway_altitude = FG_Altitude - 3.758099;
fgPrintf( FG_GENERAL, FG_INFO, fgPrintf( FG_GENERAL, FG_INFO,
"Initial position is: (%.4f, %.4f, %.2f)\n", "Initial position is: (%.4f, %.4f, %.2f)\n",
FG_Longitude * RAD_TO_DEG, FG_Latitude * RAD_TO_DEG, FG_Longitude * RAD_TO_DEG, FG_Latitude * RAD_TO_DEG,
FG_Altitude * FEET_TO_METER); FG_Altitude * FEET_TO_METER);
@ -138,7 +137,7 @@ int fgInitGeneral( void ) {
g->glVersion = (char *)glGetString ( GL_VERSION ); g->glVersion = (char *)glGetString ( GL_VERSION );
root = current_options.get_fg_root(); root = current_options.get_fg_root();
if ( ! root.length() ) { if ( ! root.length() ) {
// No root path set? Then bail ... // No root path set? Then bail ...
fgPrintf( FG_GENERAL, FG_EXIT, "%s %s\n", fgPrintf( FG_GENERAL, FG_EXIT, "%s %s\n",
"Cannot continue without environment variable FG_ROOT", "Cannot continue without environment variable FG_ROOT",
@ -186,7 +185,8 @@ fgPoint3d geod_to_cart(double geod[3]) {
// initialization routines. If you are adding a subsystem to flight // initialization routines. If you are adding a subsystem to flight
// gear, its initialization call should located in this routine. // gear, its initialization call should located in this routine.
// Returns non-zero if a problem encountered. // Returns non-zero if a problem encountered.
int fgInitSubsystems( void ) { int fgInitSubsystems( void )
{
fgFLIGHT *f; fgFLIGHT *f;
fgLIGHT *l; fgLIGHT *l;
fgTIME *t; fgTIME *t;
@ -392,6 +392,9 @@ int fgInitSubsystems( void ) {
// $Log$ // $Log$
// Revision 1.36 1998/09/08 21:40:08 curt
// Fixes by Charlie Hotchkiss.
//
// Revision 1.35 1998/08/29 13:09:26 curt // Revision 1.35 1998/08/29 13:09:26 curt
// Changes to event manager from Bernie Bright. // Changes to event manager from Bernie Bright.
// //

18
Main/options.hxx
View file

@ -27,12 +27,19 @@
#define _OPTIONS_HXX #define _OPTIONS_HXX
#ifndef __cplusplus #ifndef __cplusplus
# error This library requires C++ # error This library requires C++
#endif #endif
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <string> #include <string>
#include <string.h>
#ifdef NEEDNAMESPACESTD
using namespace std;
#endif
class fgOPTIONS { class fgOPTIONS {
public: public:
@ -50,8 +57,8 @@ public:
FG_FOG_NICEST = 2 FG_FOG_NICEST = 2
}; };
const int FG_RADIUS_MIN = 1; static const int FG_RADIUS_MIN = 1;
const int FG_RADIUS_MAX = 4; static const int FG_RADIUS_MAX = 4;
private: private:
@ -175,6 +182,9 @@ extern fgOPTIONS current_options;
// $Log$ // $Log$
// Revision 1.17 1998/09/08 21:40:10 curt
// Fixes by Charlie Hotchkiss.
//
// Revision 1.16 1998/08/27 17:02:08 curt // Revision 1.16 1998/08/27 17:02:08 curt
// Contributions from Bernie Bright <bbright@c031.aone.net.au> // Contributions from Bernie Bright <bbright@c031.aone.net.au>
// - use strings for fg_root and airport_id and added methods to return // - use strings for fg_root and airport_id and added methods to return