Merge branch 'maint2' into next

[flightgear.git] / src / AIModel / AIManager.cxx

diff --git a/src/AIModel/AIManager.cxx b/src/AIModel/AIManager.cxx
index bc56af32f9a1467c15d04e0fd8c871771b68c096..82036872706b613ef91a2aba3ea465ffb42c8072 100644 (file)
--- a/src/AIModel/AIManager.cxx
+++ b/src/AIModel/AIManager.cxx
@@ -18,6 +18,10 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+#include <simgear/math/sg_geodesy.hxx>
+#include <simgear/props/props_io.hxx>
+#include <simgear/structure/exception.hxx>
+
 #include <Main/globals.hxx>
 
 #include <Airports/simple.hxx>
@@ -35,9 +39,6 @@
 #include "AITanker.hxx"
 #include "AIWingman.hxx"
 
-#include <simgear/math/sg_geodesy.hxx>
-
-
 FGAIManager::FGAIManager() {
     _dt = 0.0;
     mNumAiModels = 0;
@@ -335,7 +336,7 @@ FGAIManager::loadScenarioFile(const std::string& filename)
         SGPropertyNode_ptr root = new SGPropertyNode;
         readProperties(path.str(), root);
         return root;
-    } catch (const sg_exception &e) {
+    } catch (const sg_exception &) {
         SG_LOG(SG_GENERAL, SG_DEBUG, "Incorrect path specified for AI "
             "scenario: \"" << path.str() << "\"");
         return 0;