From: Edward d'Auvergne <edward@nmr-relax.com>
Date: Mon, 23 Mar 2015 17:47:33 +0000 (+0100)
Subject: Fix to restore the UIUC FDM aircraft after the FGAddon split.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3f3bd6994a05eda1a5852bb1070efbc885b8f3a8;p=flightgear.git

Fix to restore the UIUC FDM aircraft after the FGAddon split.

The fix follows from the thread at
http://thread.gmane.org/gmane.games.flightgear.devel/77094, and specifically
implements step 3 in the message
http://thread.gmane.org/gmane.games.flightgear.devel/77094/focus=77214.
The change requires the corresponding <airplane-dir> XML tag deletion
and file system rearrangements in FGAddon as mentioned in the thread to
work.
---

diff --git a/src/FDM/UIUCModel/uiuc_wrapper.cpp b/src/FDM/UIUCModel/uiuc_wrapper.cpp
index 47897560e..55dbf4ca8 100644
--- a/src/FDM/UIUCModel/uiuc_wrapper.cpp
+++ b/src/FDM/UIUCModel/uiuc_wrapper.cpp
@@ -319,8 +319,7 @@ void uiuc_init_aeromodel ()
 {
   // Initializes the UIUC aircraft model.
   // Called once from uiuc_init_2_wrapper
-  SGPath path(globals->get_fg_root());
-  path.append(fgGetString("/sim/aircraft-dir"));
+  SGPath path(fgGetString("/sim/aircraft-dir"));
   path.append("aircraft.dat");
   std::cout << "We are using "<< path.str() << std::endl;
   uiuc_initializemaps(); // Initialize the <string,int> maps