From: curt Date: Thu, 6 Jul 2000 22:13:24 +0000 (+0000) Subject: Updates to JSBsim from Jon's CVS. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0ffa19cd32c02405d0e740393b37f4009ed5a312;p=flightgear.git Updates to JSBsim from Jon's CVS. Massaging some names inside of SimGear. --- diff --git a/src/Cockpit/cockpit.cxx b/src/Cockpit/cockpit.cxx index 802c9c2e1..9b14ab5ad 100644 --- a/src/Cockpit/cockpit.cxx +++ b/src/Cockpit/cockpit.cxx @@ -101,7 +101,7 @@ char* get_formated_gmt_time( void ) { static char buf[32]; - FGTime *t = FGTime::cur_time_params; + SGTime *t = SGTime::cur_time_params; const struct tm *p = t->getGmt(); sprintf( buf, "%d/%d/%4d %d:%02d:%02d", p->tm_mon+1, p->tm_mday, 1900 + p->tm_year, diff --git a/src/Cockpit/sp_panel.cxx b/src/Cockpit/sp_panel.cxx index 40af43aa1..933099ec6 100644 --- a/src/Cockpit/sp_panel.cxx +++ b/src/Cockpit/sp_panel.cxx @@ -29,7 +29,7 @@ #include #include -#include +#include #include
@@ -63,7 +63,7 @@ FG_USING_STD(map); static char * panelGetTime () { static char buf[1024]; // FIXME: not thread-safe - struct tm * t = FGTime::cur_time_params->getGmt(); + struct tm * t = SGTime::cur_time_params->getGmt(); sprintf(buf, " %.2d:%.2d:%.2d", t->tm_hour, t->tm_min, t->tm_sec); return buf; diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx index b96598e5f..c6e227ad6 100644 --- a/src/GUI/gui.cxx +++ b/src/GUI/gui.cxx @@ -55,7 +55,6 @@ #include #include #include -#include #include #include diff --git a/src/Main/bfi.cxx b/src/Main/bfi.cxx index 8ab40e4e5..441004135 100644 --- a/src/Main/bfi.cxx +++ b/src/Main/bfi.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include @@ -377,7 +377,7 @@ FGBFI::setAircraftDir (const string &dir) time_t FGBFI::getTimeGMT () { - return FGTime::cur_time_params->get_cur_time(); + return SGTime::cur_time_params->get_cur_time(); } @@ -391,12 +391,12 @@ FGBFI::setTimeGMT (time_t time) // and solar system current_options.set_time_offset(time); current_options.set_time_offset_type(SG_TIME_GMT_ABSOLUTE); - FGTime::cur_time_params->init( cur_fdm_state->get_Longitude(), + SGTime::cur_time_params->init( cur_fdm_state->get_Longitude(), cur_fdm_state->get_Latitude(), current_options.get_fg_root(), current_options.get_time_offset(), current_options.get_time_offset_type() ); - FGTime::cur_time_params->update( cur_fdm_state->get_Longitude(), + SGTime::cur_time_params->update( cur_fdm_state->get_Longitude(), cur_fdm_state->get_Latitude(), cur_fdm_state->get_Altitude() * FEET_TO_METER ); diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx index a1c2d82ca..cbd19bf91 100644 --- a/src/Main/fg_init.cxx +++ b/src/Main/fg_init.cxx @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include @@ -245,7 +245,7 @@ bool fgInitGeneral( void ) { // Returns non-zero if a problem encountered. bool fgInitSubsystems( void ) { fgLIGHT *l = &cur_light_params; - FGTime *t = FGTime::cur_time_params; + SGTime *t = SGTime::cur_time_params; FG_LOG( FG_GENERAL, FG_INFO, "Initialize Subsystems"); FG_LOG( FG_GENERAL, FG_INFO, "========== =========="); @@ -454,7 +454,7 @@ bool fgInitSubsystems( void ) { current_aircraft.fdm_state->get_Longitude(), current_aircraft.fdm_state->get_Altitude() * FEET_TO_METER ); FGLocalWeatherDatabase::theFGLocalWeatherDatabase = - new FGLocalWeatherDatabase( position ); + new FGLocalWeatherDatabase( position, current_options.get_fg_root() ); // cout << theFGLocalWeatherDatabase << endl; // cout << "visibility = " // << theFGLocalWeatherDatabase->getWeatherVisibility() << endl; diff --git a/src/Main/keyboard.cxx b/src/Main/keyboard.cxx index cf9b5a867..328e15146 100644 --- a/src/Main/keyboard.cxx +++ b/src/Main/keyboard.cxx @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include @@ -76,14 +76,14 @@ // Handle keyboard events void GLUTkey(unsigned char k, int x, int y) { FGInterface *f; - FGTime *t; + SGTime *t; FGView *v; float fov, tmp; static bool winding_ccw = true; int speed; f = current_aircraft.fdm_state; - t = FGTime::cur_time_params; + t = SGTime::cur_time_params; v = ¤t_view; FG_LOG( FG_INPUT, FG_DEBUG, "Key hit = " << k ); diff --git a/src/Main/main.cxx b/src/Main/main.cxx index bd760dda4..db9644435 100644 --- a/src/Main/main.cxx +++ b/src/Main/main.cxx @@ -72,7 +72,7 @@ #include #include #include -#include +#include #include @@ -276,7 +276,7 @@ void fgRenderFrame( void ) { FGBFI::update(); fgLIGHT *l = &cur_light_params; - FGTime *t = FGTime::cur_time_params; + SGTime *t = SGTime::cur_time_params; // FGView *v = ¤t_view; static double last_visibility = -9999; @@ -428,7 +428,7 @@ void fgRenderFrame( void ) { << " lon = " << cur_fdm_state->get_Longitude() << " lat = " << cur_fdm_state->get_Latitude() << endl; cout << " sun_rot = " << cur_light_params.sun_rotation - << " gst = " << FGTime::cur_time_params->getGst() << endl; + << " gst = " << SGTime::cur_time_params->getGst() << endl; cout << " sun ra = " << ephem->getSunRightAscension() << " sun dec = " << ephem->getSunDeclination() << " moon ra = " << ephem->getMoonRightAscension() @@ -440,7 +440,7 @@ void fgRenderFrame( void ) { cur_fdm_state->get_Latitude(), cur_fdm_state->get_Altitude() * FEET_TO_METER, cur_light_params.sun_rotation, - FGTime::cur_time_params->getGst(), + SGTime::cur_time_params->getGst(), ephem->getSunRightAscension(), ephem->getSunDeclination(), 50000.0, ephem->getMoonRightAscension(), @@ -607,7 +607,7 @@ void fgUpdateTimeDepCalcs(int multi_loop, int remainder) { static fdm_state_list fdm_list; // FGInterface fdm_state; fgLIGHT *l = &cur_light_params; - FGTime *t = FGTime::cur_time_params; + SGTime *t = SGTime::cur_time_params; // FGView *v = ¤t_view; int i; @@ -722,7 +722,7 @@ static const double alt_adjust_m = alt_adjust_ft * FEET_TO_METER; // What should we do when we have nothing else to do? Let's get ready // for the next move and update the display? static void fgMainLoop( void ) { - FGTime *t; + SGTime *t; static long remainder = 0; long elapsed; #ifdef FANCY_FRAME_COUNTER @@ -733,7 +733,7 @@ static void fgMainLoop( void ) { static int frames = 0; #endif // FANCY_FRAME_COUNTER - t = FGTime::cur_time_params; + t = SGTime::cur_time_params; FG_LOG( FG_ALL, FG_DEBUG, "Running Main Loop"); FG_LOG( FG_ALL, FG_DEBUG, "======= ==== ===="); @@ -808,7 +808,7 @@ static void fgMainLoop( void ) { cur_magvar.update( cur_fdm_state->get_Longitude(), cur_fdm_state->get_Latitude(), cur_fdm_state->get_Altitude()* FEET_TO_METER, - FGTime::cur_time_params->getJD() ); + SGTime::cur_time_params->getJD() ); // Get elapsed time (in usec) for this past frame elapsed = fgGetTimeInterval(); @@ -1306,15 +1306,15 @@ int main( int argc, char **argv ) { guiInit(); // Initialize time - FGTime::cur_time_params = new FGTime( current_options.get_fg_root() ); - // FGTime::cur_time_params->init( cur_fdm_state->get_Longitude(), + SGTime::cur_time_params = new SGTime( current_options.get_fg_root() ); + // SGTime::cur_time_params->init( cur_fdm_state->get_Longitude(), // cur_fdm_state->get_Latitude() ); - // FGTime::cur_time_params->update( cur_fdm_state->get_Longitude() ); - FGTime::cur_time_params->init( 0.0, 0.0, + // SGTime::cur_time_params->update( cur_fdm_state->get_Longitude() ); + SGTime::cur_time_params->init( 0.0, 0.0, current_options.get_fg_root(), current_options.get_time_offset(), current_options.get_time_offset_type() ); - FGTime::cur_time_params->update( 0.0, 0.0, 0.0 ); + SGTime::cur_time_params->update( 0.0, 0.0, 0.0 ); // Do some quick general initializations if( !fgInitGeneral()) { @@ -1347,7 +1347,7 @@ int main( int argc, char **argv ) { FGPath ephem_data_path( current_options.get_fg_root() ); ephem_data_path.append( "Astro" ); ephem = new FGEphemeris( ephem_data_path.c_str() ); - ephem->update( FGTime::cur_time_params, 0.0 ); + ephem->update( SGTime::cur_time_params, 0.0 ); FGPath sky_tex_path( current_options.get_fg_root() ); sky_tex_path.append( "Textures" ); diff --git a/src/Main/options.cxx b/src/Main/options.cxx index cef597878..455482178 100644 --- a/src/Main/options.cxx +++ b/src/Main/options.cxx @@ -42,7 +42,7 @@ bool global_fullscreen = true; #include #include #include -#include +#include #include #include @@ -432,7 +432,7 @@ long int fgOPTIONS::parse_date( const string& date) num[i] = '\0'; gmt.tm_sec = atoi(num); } - time_t theTime = FGTime::cur_time_params->get_gmt(gmt.tm_year, + time_t theTime = SGTime::cur_time_params->get_gmt(gmt.tm_year, gmt.tm_mon, gmt.tm_mday, gmt.tm_hour, diff --git a/src/Main/options.hxx b/src/Main/options.hxx index f6830d236..90d02ad84 100644 --- a/src/Main/options.hxx +++ b/src/Main/options.hxx @@ -47,7 +47,7 @@ extern bool global_fullscreen; #endif #include -#include +#include #include STL_STRING #include diff --git a/src/Main/views.cxx b/src/Main/views.cxx index 09a0836f1..f9d6f682a 100644 --- a/src/Main/views.cxx +++ b/src/Main/views.cxx @@ -33,7 +33,6 @@ #include #include #include -#include #include #include diff --git a/src/Main/views.hxx b/src/Main/views.hxx index d4c660a73..ec5bc00d0 100644 --- a/src/Main/views.hxx +++ b/src/Main/views.hxx @@ -31,7 +31,7 @@ #include #include -#include +#include #include diff --git a/src/Network/garmin.cxx b/src/Network/garmin.cxx index 1e3a0464a..2505c39db 100644 --- a/src/Network/garmin.cxx +++ b/src/Network/garmin.cxx @@ -23,7 +23,7 @@ #include #include -#include +#include #include @@ -67,7 +67,7 @@ bool FGGarmin::gen_message() { int deg; double min; - FGTime *t = FGTime::cur_time_params; + SGTime *t = SGTime::cur_time_params; char utc[10]; sprintf( utc, "%02d%02d%02d", diff --git a/src/Network/native.cxx b/src/Network/native.cxx index 3586a64f2..f60f0cc90 100644 --- a/src/Network/native.cxx +++ b/src/Network/native.cxx @@ -23,7 +23,6 @@ #include #include -#include #include "iochannel.hxx" #include "native.hxx" diff --git a/src/Network/nmea.cxx b/src/Network/nmea.cxx index 8966a11b1..c5f33701f 100644 --- a/src/Network/nmea.cxx +++ b/src/Network/nmea.cxx @@ -23,7 +23,7 @@ #include #include -#include +#include #include @@ -68,7 +68,7 @@ bool FGNMEA::gen_message() { int deg; double min; - FGTime *t = FGTime::cur_time_params; + SGTime *t = SGTime::cur_time_params; char utc[10]; sprintf( utc, "%02d%02d%02d", diff --git a/src/Network/pve.cxx b/src/Network/pve.cxx index e3d83808a..d54c3b11b 100644 --- a/src/Network/pve.cxx +++ b/src/Network/pve.cxx @@ -21,9 +21,9 @@ // $Id$ +#include // sprintf() #include #include -#include #include diff --git a/src/Network/ray.cxx b/src/Network/ray.cxx index ea6b7e82d..df9911974 100644 --- a/src/Network/ray.cxx +++ b/src/Network/ray.cxx @@ -23,7 +23,6 @@ #include #include -#include #include diff --git a/src/Network/ray.hxx b/src/Network/ray.hxx index 8343b604d..2de08544c 100644 --- a/src/Network/ray.hxx +++ b/src/Network/ray.hxx @@ -25,6 +25,8 @@ #define _FG_RAY_HXX +#include // FILE + #include #include STL_STRING diff --git a/src/Network/rul.cxx b/src/Network/rul.cxx index fcb2ef703..343e6b154 100644 --- a/src/Network/rul.cxx +++ b/src/Network/rul.cxx @@ -22,9 +22,10 @@ // $Id$ +#include // sprintf() + #include #include -#include #include diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx index 2f71d6bff..56290a48f 100644 --- a/src/Scenery/tilemgr.cxx +++ b/src/Scenery/tilemgr.cxx @@ -86,13 +86,30 @@ FGTileMgr::~FGTileMgr ( void ) { int FGTileMgr::init( void ) { FG_LOG( FG_TERRAIN, FG_INFO, "Initializing Tile Manager subsystem." ); + if ( state != Start ) { + FG_LOG( FG_TERRAIN, FG_INFO, + "ReInitializing the Tile Manager subsystem." ); + + // This is necessay to keep bookeeping straight for the + // tile_cache -- which actually handles all the + // (de)allocations + while( load_queue.size() ) { + FG_LOG( FG_TERRAIN, FG_INFO, + "Load queue not empty, popping a tile" ); + FGLoadRec pending = load_queue.front(); + load_queue.pop_front(); + load_tile( pending.b, pending.cache_index ); + } + } else { + FG_LOG( FG_TERRAIN, FG_INFO, + "Initializing Tile Manager subsystem." ); + } + global_tile_cache.init(); hit_list.clear(); state = Inited; - // last_hit = 0; - tile_diameter = current_options.get_tile_diameter(); FG_LOG( FG_TERRAIN, FG_INFO, "Tile Diameter = " << tile_diameter); @@ -108,15 +125,6 @@ int FGTileMgr::init( void ) { return 1; } -#if 0 -// schedule a tile for loading -static void disable_tile( int cache_index ) { - // see if tile already exists in the cache - // cout << "DISABLING CACHE ENTRY = " << cache_index << endl; - FGTileEntry *t = global_tile_cache.get_tile( cache_index ); - t->ssg_disable(); -} -#endif // schedule a tile for loading int FGTileMgr::sched_tile( const FGBucket& b ) { diff --git a/src/Time/event.hxx b/src/Time/event.hxx index e1e9ff6fd..c99fc357f 100644 --- a/src/Time/event.hxx +++ b/src/Time/event.hxx @@ -31,7 +31,6 @@ #include -#include #include diff --git a/src/Time/fg_timer.cxx b/src/Time/fg_timer.cxx index 8f507a069..192a95180 100644 --- a/src/Time/fg_timer.cxx +++ b/src/Time/fg_timer.cxx @@ -36,8 +36,6 @@ # include // for get/setitimer, gettimeofday, struct timeval #endif -#include - #include "fg_timer.hxx" #include "timestamp.hxx" diff --git a/src/Time/light.cxx b/src/Time/light.cxx index 6850c6475..56099286c 100644 --- a/src/Time/light.cxx +++ b/src/Time/light.cxx @@ -54,7 +54,7 @@ FG_USING_STD(string); #include #include #include -#include +#include #include #include
@@ -100,7 +100,7 @@ void fgLIGHT::Init( void ) { // update lighting parameters based on current sun position void fgLIGHT::Update( void ) { FGInterface *f; - FGTime *t; + SGTime *t; // if the 4th field is 0.0, this specifies a direction ... GLfloat white[4] = { 1.0, 1.0, 1.0, 1.0 }; // base sky color @@ -110,7 +110,7 @@ void fgLIGHT::Update( void ) { double deg, ambient, diffuse, sky_brightness; f = current_aircraft.fdm_state; - t = FGTime::cur_time_params; + t = SGTime::cur_time_params; FG_LOG( FG_EVENT, FG_INFO, "Updating light parameters." ); diff --git a/src/Time/moonpos.cxx b/src/Time/moonpos.cxx index e9c437769..ca6c7abfd 100644 --- a/src/Time/moonpos.cxx +++ b/src/Time/moonpos.cxx @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include
#include @@ -337,7 +337,7 @@ static void fgMoonPositionGST(double gst, double *lon, double *lat) { // update the cur_time_params structure with the current moon position void fgUpdateMoonPos( void ) { fgLIGHT *l; - FGTime *t; + SGTime *t; FGView *v; sgVec3 nup, nmoon, v0, surface_to_moon; Point3D p, rel_moonpos; @@ -345,7 +345,7 @@ void fgUpdateMoonPos( void ) { double moon_gd_lat, sl_radius; l = &cur_light_params; - t = FGTime::cur_time_params; + t = SGTime::cur_time_params; v = ¤t_view; FG_LOG( FG_EVENT, FG_INFO, " Updating Moon position" ); diff --git a/src/Time/sunpos.cxx b/src/Time/sunpos.cxx index 918314eec..a79d7d260 100644 --- a/src/Time/sunpos.cxx +++ b/src/Time/sunpos.cxx @@ -60,7 +60,7 @@ #include #include #include -#include +#include #include
#include @@ -246,7 +246,7 @@ static void fgSunPositionGST(double gst, double *lon, double *lat) { // update the cur_time_params structure with the current sun position void fgUpdateSunPos( void ) { fgLIGHT *l; - FGTime *t; + SGTime *t; FGView *v; sgVec3 nup, nsun, v0, surface_to_sun; Point3D p, rel_sunpos; @@ -254,7 +254,7 @@ void fgUpdateSunPos( void ) { double sun_gd_lat, sl_radius; l = &cur_light_params; - t = FGTime::cur_time_params; + t = SGTime::cur_time_params; v = ¤t_view; FG_LOG( FG_EVENT, FG_INFO, " Updating Sun position" ); diff --git a/src/Time/tmp.cxx b/src/Time/tmp.cxx index 0d5b0cba8..d2fec7dcc 100644 --- a/src/Time/tmp.cxx +++ b/src/Time/tmp.cxx @@ -26,7 +26,7 @@ #endif #include -#include +#include #include #include
@@ -58,7 +58,7 @@ FGMagVar cur_magvar; // periodic time updater wrapper void fgUpdateLocalTime() { - FGTime::cur_time_params->updateLocal( cur_fdm_state->get_Longitude(), + SGTime::cur_time_params->updateLocal( cur_fdm_state->get_Longitude(), cur_fdm_state->get_Latitude(), current_options.get_fg_root() ); } diff --git a/src/WeatherCM/FGLocalWeatherDatabase.cpp b/src/WeatherCM/FGLocalWeatherDatabase.cpp index 8afe06ef7..da85deea1 100644 --- a/src/WeatherCM/FGLocalWeatherDatabase.cpp +++ b/src/WeatherCM/FGLocalWeatherDatabase.cpp @@ -49,6 +49,7 @@ HISTORY /****************************************************************************/ #include #include +#include #include @@ -63,7 +64,9 @@ HISTORY FGLocalWeatherDatabase* FGLocalWeatherDatabase::theFGLocalWeatherDatabase = 0; FGLocalWeatherDatabase *WeatherDatabase; -void FGLocalWeatherDatabase::init(const WeatherPrecision visibility, const DatabaseWorkingType type) +void FGLocalWeatherDatabase::init( const WeatherPrecision visibility, + const DatabaseWorkingType type, + const string& root ) { cerr << "Initializing FGLocalWeatherDatabase\n"; cerr << "-----------------------------------\n"; @@ -95,7 +98,10 @@ void FGLocalWeatherDatabase::init(const WeatherPrecision visibility, const Datab { FGWeatherParse *parsed_data = new FGWeatherParse(); - parsed_data->input( "weather/current.gz" ); + FGPath file( root ); + file.append( "Weather" ); + file.append( "current.txt.gz" ); + parsed_data->input( file.c_str() ); unsigned int n = parsed_data->stored_stations(); sgVec2 *p = new sgVec2 [n]; @@ -263,15 +269,15 @@ void fgUpdateWeatherDatabase(void) FGPhysicalProperty my_value = WeatherDatabase->get(position); current_aircraft.fdm_state->set_Static_temperature(my_value.Temperature*KTOR); - current_aircraft.fdm_state->set_Static_pressure(my_value.AirPressure*PATOPSF); - float density=rho0 * 273.15 * my_value.AirPressure / (101300 *my_value.Temperature )*KGMTOSGF; - current_aircraft.fdm_state->set_Density(density*KGMTOSGF); + current_aircraft.fdm_state->set_Static_pressure(my_value.AirPressure*PATOPSF); + float density=rho0 * 273.15 * my_value.AirPressure / (101300 *my_value.Temperature )*KGMTOSGF; + current_aircraft.fdm_state->set_Density(density*KGMTOSGF); - #define KPHTOFPS 0.9113 //km/hr to ft/s - #define MSTOFPS 3.2808 //m/s to ft/s - current_aircraft.fdm_state->set_Velocities_Local_Airmass(my_value.Wind[1]*KPHTOFPS, - my_value.Wind[0]*KPHTOFPS, - my_value.Wind[2]*KPHTOFPS); +#define KPHTOFPS 0.9113 //km/hr to ft/s +#define MSTOFPS 3.2808 //m/s to ft/s + current_aircraft.fdm_state->set_Velocities_Local_Airmass(my_value.Wind[1]*KPHTOFPS, + my_value.Wind[0]*KPHTOFPS, + my_value.Wind[2]*KPHTOFPS); } diff --git a/src/WeatherCM/FGLocalWeatherDatabase.h b/src/WeatherCM/FGLocalWeatherDatabase.h index 7155854ae..8dd8aeeb6 100644 --- a/src/WeatherCM/FGLocalWeatherDatabase.h +++ b/src/WeatherCM/FGLocalWeatherDatabase.h @@ -54,6 +54,7 @@ HISTORY /* INCLUDES */ /****************************************************************************/ #include +#include STL_STRING #include @@ -71,6 +72,7 @@ HISTORY /* DEFINES */ /****************************************************************************/ FG_USING_STD(vector); +FG_USING_STD(string); FG_USING_NAMESPACE(std); /****************************************************************************/ @@ -110,19 +112,22 @@ public: DatabaseWorkingType DatabaseStatus; - void init( const WeatherPrecision visibility, const DatabaseWorkingType type ); + void init( const WeatherPrecision visibility, + const DatabaseWorkingType type, + const string& root ); /************************************************************************/ /* Constructor and Destructor */ /************************************************************************/ FGLocalWeatherDatabase( const sgVec3& position, + const string& root, const WeatherPrecision visibility = DEFAULT_WEATHER_VISIBILITY, const DatabaseWorkingType type = PREFERED_WORKING_TYPE) { sgCopyVec3( last_known_position, position ); - init( visibility, type ); + init( visibility, type, root ); theFGLocalWeatherDatabase = this; } @@ -131,12 +136,13 @@ public: const WeatherPrecision position_lat, const WeatherPrecision position_lon, const WeatherPrecision position_alt, + const string& root, const WeatherPrecision visibility = DEFAULT_WEATHER_VISIBILITY, const DatabaseWorkingType type = PREFERED_WORKING_TYPE) { sgSetVec3( last_known_position, position_lat, position_lon, position_alt ); - init( visibility, type ); + init( visibility, type, root ); theFGLocalWeatherDatabase = this; } diff --git a/src/WeatherCM/FGWeatherDefs.h b/src/WeatherCM/FGWeatherDefs.h index f1476b0c8..f0af6fcfb 100644 --- a/src/WeatherCM/FGWeatherDefs.h +++ b/src/WeatherCM/FGWeatherDefs.h @@ -57,7 +57,8 @@ typedef float WeatherPrecision; #define MINIMUM_WEATHER_VISIBILITY 10.0 /* metres */ #define DEFAULT_WEATHER_VISIBILITY 32000.0 /* metres */ //prefered way the database is working -#define PREFERED_WORKING_TYPE default_mode +// #define PREFERED_WORKING_TYPE default_mode +#define PREFERED_WORKING_TYPE use_internet #define FG_WEATHER_DEFAULT_TEMPERATURE (15.0+273.16) /*15°C or 288.16°K*/ #define FG_WEATHER_DEFAULT_VAPORPRESSURE (0.0) /*in Pascal 1 Pa = N/m^2*/