Roy Vegard Ovesen:

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

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index c935c56ba016b898aff8e8b2293376d491a671c0..722ab57f920771685553ae6561b0850158ac4fe7 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started April 1998.
 //
-// Copyright (C) 1998  Curtis L. Olson  - curt@me.umn.edu
+// Copyright (C) 1998  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -1286,7 +1286,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",                      true,  OPTION_CHANNEL, "", false, "dummy", 0 },
+    {"atcsim",                       true,  OPTION_CHANNEL, "", false, "dummy", 0 },
     {"atlas",                        true,  OPTION_CHANNEL, "", false, "", 0 },
     {"httpd",                        true,  OPTION_CHANNEL, "", false, "", 0 },
 #ifdef FG_JPEG_SERVER
@@ -1692,7 +1692,7 @@ unsigned int getNumMaturity(const char * str)
   // $FG_ROOT/data/Translations/string-default.xml
   const char levels[][20]= {"alpha","beta","early-production","production",0}; 
 
-  for (int i=0; i<(sizeof(levels)/sizeof(levels[0])-1);i++) 
+  for (unsigned int i=0; i<(sizeof(levels)/sizeof(levels[0])-1);i++) 
     if (strcmp(str,levels[i])==0)
       return i;
 
@@ -1750,7 +1750,6 @@ static void fgSearchAircraft(const SGPath &path, string_list &aircraft,
 
           char cstr[96];
          //additionally display status information where it is available
-         char *status_level = (status) ? status->getStringValue() : "";
           
           if (strlen(dire->d_name) <= 27) {
              snprintf(cstr, 96, "   %-27s  %s", dire->d_name,