// filename = file system file name
static bool
-parse_channel( const string& type, const string& channel_str ) {
+add_channel( const string& type, const string& channel_str ) {
// cout << "Channel string = " << channel_str << endl;
globals->get_channel_options_list()->push_back( type + "," + channel_str );
} else if ( arg == "--hud-culled" ) {
fgSetString("/sim/hud/frame-stat-type", "culled");
} else if ( arg.find( "--atlas=" ) == 0 ) {
- parse_channel( "atlas", arg.substr(8) );
+ add_channel( "atlas", arg.substr(8) );
+ } else if ( arg.find( "--httpd=" ) == 0 ) {
+ add_channel( "httpd", arg.substr(8) );
} else if ( arg.find( "--native=" ) == 0 ) {
- parse_channel( "native", arg.substr(9) );
+ add_channel( "native", arg.substr(9) );
+ } else if ( arg.find( "--native-ctrls=" ) == 0 ) {
+ add_channel( "native_ctrls", arg.substr(15) );
+ } else if ( arg.find( "--native-fdm=" ) == 0 ) {
+ add_channel( "native_fdm", arg.substr(13) );
} else if ( arg.find( "--garmin=" ) == 0 ) {
- parse_channel( "garmin", arg.substr(9) );
+ add_channel( "garmin", arg.substr(9) );
} else if ( arg.find( "--nmea=" ) == 0 ) {
- parse_channel( "nmea", arg.substr(7) );
+ add_channel( "nmea", arg.substr(7) );
} else if ( arg.find( "--props=" ) == 0 ) {
- parse_channel( "props", arg.substr(8) );
+ add_channel( "props", arg.substr(8) );
} else if ( arg.find( "--pve=" ) == 0 ) {
- parse_channel( "pve", arg.substr(6) );
+ add_channel( "pve", arg.substr(6) );
} else if ( arg.find( "--ray=" ) == 0 ) {
- parse_channel( "ray", arg.substr(6) );
+ add_channel( "ray", arg.substr(6) );
} else if ( arg.find( "--rul=" ) == 0 ) {
- parse_channel( "rul", arg.substr(6) );
+ add_channel( "rul", arg.substr(6) );
} else if ( arg.find( "--joyclient=" ) == 0 ) {
- parse_channel( "joyclient", arg.substr(12) );
+ add_channel( "joyclient", arg.substr(12) );
#ifdef FG_NETWORK_OLK
} else if ( arg == "--disable-network-olk" ) {
fgSetBool("/sim/networking/olk", false);
double speed = atof(val.substr(pos+1).c_str());
SG_LOG(SG_GENERAL, SG_INFO, "WIND: " << dir << '@' <<
speed << " knots" << endl);
- // convert to fps
+ fgSetDouble("/environment/wind-from-heading-deg", dir);
+ fgSetDouble("/environment/wind-speed-knots", speed);
+
+ // convert to fps
speed *= SG_NM_TO_METER * SG_METER_TO_FEET * (1.0/3600);
- dir += 180;
+ // dir += 180;
if (dir >= 360)
dir -= 360;
dir *= SGD_DEGREES_TO_RADIANS;
string file = arg.substr(9);
try {
readProperties(file, globals->get_props());
- } catch (const sg_io_exception &e) {
+ } catch (const sg_exception &e) {
string message = "Error loading config file: ";
- message += e.getMessage();
- message += "\n at ";
- message += e.getLocation().asString();
+ message += e.getFormattedMessage();
SG_LOG(SG_INPUT, SG_ALERT, message);
exit(2);
}
cout << "\t--enable-mouse-pointer: enable extra mouse pointer (i.e. for"
<< endl;
cout << "\t\tfull screen voodoo/voodoo-II based cards.)" << endl;
- cout << "\t--disable-freeze: start out in an running state" << endl;
+ cout << "\t--disable-freeze: start out in a running state" << endl;
cout << "\t--enable-freeze: start out in a frozen state" << endl;
cout << "\t--control=mode: primary control mode "
<< "(joystick, keyboard, mouse)" << endl;
cout << "\t--disable-hud: disable heads up display" << endl;
cout << "\t--enable-hud: enable heads up display" << endl;
cout << "\t--disable-panel: disable instrument panel" << endl;
- cout << "\t--enable-panel: enable instrumetn panel" << endl;
+ cout << "\t--enable-panel: enable instrument panel" << endl;
cout << "\t--disable-sound: disable sound effects" << endl;
cout << "\t--enable-sound: enable sound effects" << endl;
cout << "\t--disable-anti-alias-hud: disable anti aliased hud" << endl;
cout << "Flight Model:" << endl;
cout << "\t--fdm=abcd: selects the core flight model code." << endl;
- cout << "\t\tcan be one of jsb, larcsim, magic, external, balloon, or ada"
+ cout << "\t\tcan be one of jsb, larcsim, magic, null, external, balloon, or ada"
<< endl;
cout << "\t--aircraft=abcd: aircraft model to load" << endl;
cout << "\t--model-hz=n: run the FDM this rate (iterations per second)"
cout << "Initial Position and Orientation:" << endl;
cout << "\t--airport-id=ABCD: specify starting postion by airport id"
<< endl;
- cout << "\t--offset-distance: specify distance to threshhold"
+ cout << "\t--offset-distance: specify distance to threshold"
<< " (NM)" << endl;
- cout << "\t--offset-azimuth: specify heading to threshhold (deg) "
+ cout << "\t--offset-azimuth: specify heading to threshold (deg) "
<< endl;
cout << "\t--lon=degrees: starting longitude in degrees (west = -)"
<< endl;
cout << "\t--lat=degrees: starting latitude in degrees (south = -)"
<< endl;
cout << "\t--altitude=feet: starting altitude in feet" << endl;
- cout << "\t\t(unless --units-meters specified" << endl;
- cout << "\t--heading=degrees: heading (yaw) angle in degress (Psi)"
+ cout << "\t\t(unless --units-meters specified)" << endl;
+ cout << "\t--heading=degrees: heading (yaw) angle in degrees (Psi)"
<< endl;
cout << "\t--roll=degrees: roll angle in degrees (Phi)" << endl;
cout << "\t--pitch=degrees: pitch angle in degrees (Theta)" << endl;
<< endl;
cout << "\t--wBody=feet per second: velocity along the body Z axis"
<< endl;
- cout << "\t\t(unless --units-meters specified" << endl;
- cout << "\t--vc= initial airspeed in knots (--fdm=jsb only)" << endl;
- cout << "\t--mach= initial mach number (--fdm=jsb only)" << endl;
+ cout << "\t\t(unless --units-meters specified)" << endl;
+ cout << "\t--vc= initial airspeed in knots" << endl;
+ cout << "\t--mach= initial mach number" << endl;
cout << endl;
cout << "Rendering Options:" << endl;
cout << endl;
cout << "Network Options:" << endl;
+ cout << "\t--httpd=port: enable http server on the specified port" << endl;
cout << "\t--enable-network-olk: enable Multipilot mode" << endl;
cout << "\t--disable-network-olk: disable Multipilot mode (default)" << endl;
cout << "\t--net-hud: Hud displays network info" << endl;