Read the desired menu font from the property system (or default to

[flightgear.git] / src / GUI / gui.cxx

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index 7e3ffa875381b7cb48bf61607ca12528fdac5049..8dd66e826e327976d5c987012f499f6ad2180649 100644 (file)
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -116,21 +116,22 @@ void initMenu()
              SGPropertyNode *call = option[i]->getNode("call");
              SGPropertyNode *sep = option[i]->getNode("seperator");
 
+             int pos = option.size()-i-1;
              if (sep)
-                Menu[h].submenu[i] = strdup("----------");
+                Menu[h].submenu[pos] = strdup("----------");
 
              else if (call && strcmp(call->getStringValue(), ""))
-                 Menu[h].submenu[i] = strdup(name->getStringValue());
+                 Menu[h].submenu[pos] = strdup(name->getStringValue());
 
              else
-                 Menu[h].submenu[i] = strdup("not specified");
+                 Menu[h].submenu[pos] = strdup("not specified");
 
-             Menu[h].cb[i] = NULL;
+             Menu[h].cb[pos] = NULL;
              for (unsigned int j=0; __fg_gui_fn[j].fn; j++)
                  if (call &&
                      !strcmp(call->getStringValue(), __fg_gui_fn[j].name) )
                  {
-                     Menu[h].cb[i] = __fg_gui_fn[j].fn;
+                     Menu[h].cb[pos] = __fg_gui_fn[j].fn;
                      break;
                  }
          }
@@ -189,7 +190,7 @@ void guiInit()
     }
 
     // Install our fast fonts
-    fntpath.append( "typewriter.txf" );
+    fntpath.append(fgGetString("/sim/font", "typewriter.txf"));
     guiFntHandle = new fntTexFont ;
     guiFntHandle -> load ( (char *)fntpath.c_str() ) ;
     puFont GuiFont ( guiFntHandle, 15 ) ;