Change FGSteam into a proper subsystem rather than a collection of

[flightgear.git] / src / Model / acmodel.cxx

diff --git a/src/Model/acmodel.cxx b/src/Model/acmodel.cxx
index d1dc1bed5ad1f77fbf85975c8b9352bd81d05907..9e9dd6dc0fc745c1164c2b143bbe80073e3409f0 100644 (file)
--- a/src/Model/acmodel.cxx
+++ b/src/Model/acmodel.cxx
@@ -51,8 +51,15 @@ FGAircraftModel::~FGAircraftModel ()
 void 
 FGAircraftModel::init ()
 {
-  _aircraft = new FG3DModel;
-  _aircraft->init(fgGetString("/sim/model/path", "Models/Geometry/glider.ac"));
+  _aircraft = new FGModelPlacement;
+  string path = fgGetString("/sim/model/path", "Models/Geometry/glider.ac");
+  try {
+    _aircraft->init(path);
+  } catch (const sg_exception &ex) {
+    SG_LOG(SG_GENERAL, SG_ALERT, "Failed to load aircraft from " << path);
+    SG_LOG(SG_GENERAL, SG_ALERT, "(Falling back to glider.ac.)");
+    _aircraft->init("Models/Geometry/glider.ac");
+  }
   _scene->addKid(_aircraft->getSceneGraph());
   _selector->addKid(_aircraft->getSceneGraph());
   globals->get_scenery()->get_aircraft_branch()->addKid(_selector);