try to fix yet another crash bug (don't worry, there's one for anybody!)

[flightgear.git] / src / ATC / AIEntity.hxx

diff --git a/src/ATC/AIEntity.hxx b/src/ATC/AIEntity.hxx
index d3d60ac2db2d38d286fe4ccf4ac2759d80197bfa..dc9070b8bfebc3e4bd1c52387c62231b65b96e64 100644 (file)
--- a/src/ATC/AIEntity.hxx
+++ b/src/ATC/AIEntity.hxx
@@ -16,14 +16,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef _FG_AIEntity_HXX
 #define _FG_AIEntity_HXX
 
-#include <plib/sg.h>
-#include <plib/ssg.h>
-
 #include <simgear/math/point3d.hxx>
 #include <simgear/scene/model/model.hxx>
 #include <simgear/scene/model/placement.hxx>
@@ -45,18 +42,18 @@ public:
     virtual ~FGAIEntity();
        
        // Set the 3D model to use (Must be called)
-       void SetModel(ssgBranch* model);
+  void SetModel(osg::Node* model);
 
     // Run the internal calculations
-    virtual void Update(double dt);
+    virtual void Update(double dt)=0;
        
     // Send a transmission *TO* the AIEntity.
     // FIXME int code is a hack - eventually this will receive Alexander's coded messages.
-    virtual void RegisterTransmission(int code);
+    virtual void RegisterTransmission(int code)=0;
        
-       inline Point3D GetPos() { return(_pos); }
+       inline const Point3D& GetPos() const { return(_pos); }
        
-       virtual string GetCallsign();
+       virtual const string& GetCallsign()=0;
        
 protected:
 
@@ -66,7 +63,7 @@ protected:
     double _pitch;     //degrees
 
     char* _model_path; //Path to the 3D model
-       ssgBranch* _model;      // Pointer to the model
+    osg::ref_ptr<osg::Node> _model;    // Pointer to the model
     SGModelPlacement _aip;
 
     void Transform();