Use api's with objects instead of scalars.

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

diff --git a/src/AIModel/AIBase.cxx b/src/AIModel/AIBase.cxx
index 391cc577b04d4ba3974cb487492ecfa5c1294108..74ce8fa895624e93dacf84534b8fdaa1d0542e6e 100644 (file)
--- a/src/AIModel/AIBase.cxx
+++ b/src/AIModel/AIBase.cxx
@@ -26,7 +26,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <osg/ref_ptr>
 #include <osg/Node>
@@ -50,6 +50,7 @@
 #include "AIModelData.hxx"
 #include "AIManager.hxx"
 
+const char *default_model = "Models/Geometry/glider.ac";
 const double FGAIBase::e = 2.71828183;
 const double FGAIBase::lbs_to_slugs = 0.031080950172;   //conversion factor
 
@@ -70,7 +71,8 @@ FGAIBase::FGAIBase(object_type ot) :
     _impact_speed(0),
 
     _refID( _newAIModelID() ),
-    _otype(ot)
+    _otype(ot),
+    _initialized(false)
 {
     tgt_heading = hdg = tgt_altitude_ft = tgt_speed = 0.0;
     tgt_roll = roll = tgt_pitch = tgt_yaw = tgt_vs = vs = pitch = 0.0;
@@ -107,7 +109,8 @@ void FGAIBase::readFromScenario(SGPropertyNode* scFileNode)
     if (!scFileNode)
         return;
 
-    setPath(scFileNode->getStringValue("model", "Models/Geometry/glider.ac"));
+    setPath(scFileNode->getStringValue("model",
+            fgGetString("/sim/multiplay/default-model", default_model)));
 
     setHeading(scFileNode->getDoubleValue("heading", 0.0));
     setSpeed(scFileNode->getDoubleValue("speed", 0.0));
@@ -170,16 +173,17 @@ bool FGAIBase::init(bool search_in_AI_path) {
     string f = osgDB::findDataFile(model_path, opt.get());
 
     if(f.empty())
-        f="Models/Geometry/glider.ac";
+        f = fgGetString("/sim/multiplay/default-model", default_model);
 
     model = load3DModel(f, props);
 
-    if (model.valid()) {
+    if (model.valid() && _initialized == false) {
         model->setNodeMask(model->getNodeMask() & ~SG_NODEMASK_TERRAIN_BIT);
         aip.init( model.get() );
         aip.setVisible(true);
         invisible = false;
         globals->get_scenery()->get_scene_graph()->addChild(aip.getSceneGraph());
+        _initialized = true;
 
     } else if (!model_path.empty()) {
         SG_LOG(SG_INPUT, SG_WARN, "AIBase: Could not load model " << model_path);