assign a unique module name to ai/mp embedded nasal (again): __model%u

[flightgear.git] / src / AIModel / submodel.hxx

diff --git a/src/AIModel/submodel.hxx b/src/AIModel/submodel.hxx
index 88f5694d7f6a96dddb92211ef95662e4b6e366a4..7ca046f9dc0789f8334c3a572634772d7635ea15 100644 (file)
--- a/src/AIModel/submodel.hxx
+++ b/src/AIModel/submodel.hxx
@@ -19,9 +19,9 @@
 
 #include <Main/fg_props.hxx>
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
-SG_USING_STD(list);
+using std::vector;
+using std::string;
+using std::list;
 
 class FGAIBase;
 
@@ -68,6 +68,7 @@ public:
         double             fuse_range;
         string             submodel;
         int                sub_id;
+        bool               force_stabilised;
         bool               ext_force;
         string             force_path;
     }   submodel;
@@ -173,7 +174,7 @@ private:
     IC_struct  IC;
 
     // A list of pointers to AI objects
-    typedef list <SGSharedPtr<FGAIBase> > sm_list_type;
+    typedef list <osg::ref_ptr<FGAIBase> > sm_list_type;
     typedef sm_list_type::iterator sm_list_iterator;
     typedef sm_list_type::const_iterator sm_list_const_iterator;