Move the texture loader to SimGear

[flightgear.git] / src / Main / options.cxx

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index dec152a78affcbc4c0a27f842dba41d582410037..2db0c79a16b72bb1867c07b4eef407261bac2401 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -1153,7 +1153,7 @@ struct OptionDesc {
     {"start-date-gmt",               true,  OPTION_FUNC,   "", false, "", fgOptStartDateGmt },
     {"hud-tris",                     false, OPTION_STRING, "/sim/hud/frame-stat-type", false, "tris", 0 },
     {"hud-culled",                   false, OPTION_STRING, "/sim/hud/frame-stat-type", false, "culled", 0 },
-    {"atc610x",                      false, OPTION_CHANNEL, "", false, "dummy", 0 },
+    {"atc610x",                      true,  OPTION_CHANNEL, "", false, "dummy", 0 },
     {"atlas",                        true,  OPTION_CHANNEL, "", false, "", 0 },
     {"httpd",                        true,  OPTION_CHANNEL, "", false, "", 0 },
 #ifdef FG_JPEG_SERVER
@@ -1166,6 +1166,7 @@ struct OptionDesc {
     {"opengc",                       true,  OPTION_CHANNEL, "", false, "", 0 },
     {"garmin",                       true,  OPTION_CHANNEL, "", false, "", 0 },
     {"nmea",                         true,  OPTION_CHANNEL, "", false, "", 0 },
+    {"generic",                      true,  OPTION_CHANNEL, "", false, "", 0 },
     {"props",                        true,  OPTION_CHANNEL, "", false, "", 0 },
     {"telnet",                       true,  OPTION_CHANNEL, "", false, "", 0 },
     {"pve",                          true,  OPTION_CHANNEL, "", false, "", 0 },
@@ -1179,12 +1180,12 @@ struct OptionDesc {
     {"net-id",                       true,  OPTION_STRING, "sim/networking/call-sign", false, "", 0 },
 #endif
 #ifdef FG_MPLAYER_AS
-    {"callsign",                     false, OPTION_STRING, "sim/multiplay/callsign", false, "", 0 },
+    {"callsign",                     true, OPTION_STRING,  "sim/multiplay/callsign", false, "", 0 },
     {"multiplay",                    true,  OPTION_CHANNEL, "", false, "", 0 },
 #endif
     {"trace-read",                   true,  OPTION_FUNC,   "", false, "", fgOptTraceRead },
     {"trace-write",                  true,  OPTION_FUNC,   "", false, "", fgOptTraceWrite },
-    {"log-level",                  true,  OPTION_INT,   "/sim/log-level", false, "", 0 },
+    {"log-level",                    true,  OPTION_INT,    "/sim/log-level", false, "", 0 },
     {"view-offset",                  true,  OPTION_FUNC,   "", false, "", fgOptViewOffset },
     {"visibility",                   true,  OPTION_DOUBLE, "/environment/visibility-m", false, "", 0 },
     {"visibility-miles",             true,  OPTION_FUNC,   "", false, "", fgOptVisibilityMiles },
@@ -1293,9 +1294,9 @@ parse_option (const string& arg)
                     break;
                 case OPTION_FUNC:
                     if ( pt->has_param && pos != string::npos ) {
-                        pt->func( arg.substr( pos + 1 ).c_str() );
+                        return pt->func( arg.substr( pos + 1 ).c_str() );
                     } else if ( !pt->has_param && pos == string::npos ) {
-                        pt->func( 0 );
+                        return pt->func( 0 );
                     } else if ( pt->has_param ) {
                         SG_LOG( SG_GENERAL, SG_ALERT, "Option '" << arg << "' needs a parameter" );
                         return FG_OPTIONS_ERROR;