From 721ae71cd74611d4b5250ca35bc023df75d9847b Mon Sep 17 00:00:00 2001 From: Mathias Froehlich Date: Wed, 16 Jun 2010 06:57:47 +0200 Subject: [PATCH] Use simgear abstraction instead of directly osg for the AIBase class. --- src/AIModel/AIBase.hxx | 2 +- src/AIModel/AIManager.cxx | 2 +- src/AIModel/AIManager.hxx | 2 +- src/AIModel/submodel.hxx | 2 +- src/MultiPlayer/multiplaymgr.hxx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/AIModel/AIBase.hxx b/src/AIModel/AIBase.hxx index 1ab3a640e..ee6a70a34 100644 --- a/src/AIModel/AIBase.hxx +++ b/src/AIModel/AIBase.hxx @@ -40,7 +40,7 @@ class SGMaterial; class FGAIManager; class FGAIFlightPlan; -class FGAIBase : public osg::Referenced { +class FGAIBase : public SGReferenced { public: enum object_type { otNull = 0, otAircraft, otShip, otCarrier, otBallistic, diff --git a/src/AIModel/AIManager.cxx b/src/AIModel/AIManager.cxx index ed4f4a534..afffdc817 100644 --- a/src/AIModel/AIManager.cxx +++ b/src/AIModel/AIManager.cxx @@ -381,7 +381,7 @@ FGAIManager::getStartPosition(const string& id, const string& pid, std::string pnumber = scEntry->getStringValue("pennant-number"); std::string name = scEntry->getStringValue("name"); if (type == "carrier" && (pnumber == id || name == id)) { - osg::ref_ptr carrier = new FGAICarrier; + SGSharedPtr carrier = new FGAICarrier; carrier->readFromScenario(scEntry); if (carrier->getParkPosition(pid, geodPos, hdng, uvw)) { diff --git a/src/AIModel/AIManager.hxx b/src/AIModel/AIManager.hxx index 3f6dd9c2f..8f582801a 100644 --- a/src/AIModel/AIManager.hxx +++ b/src/AIModel/AIManager.hxx @@ -46,7 +46,7 @@ class FGAIManager : public SGSubsystem public: // A list of pointers to AI objects - typedef list > ai_list_type; + typedef list > ai_list_type; typedef ai_list_type::iterator ai_list_iterator; typedef ai_list_type::const_iterator ai_list_const_iterator; diff --git a/src/AIModel/submodel.hxx b/src/AIModel/submodel.hxx index 7ca046f9d..9709bb375 100644 --- a/src/AIModel/submodel.hxx +++ b/src/AIModel/submodel.hxx @@ -174,7 +174,7 @@ private: IC_struct IC; // A list of pointers to AI objects - typedef list > sm_list_type; + typedef list > sm_list_type; typedef sm_list_type::iterator sm_list_iterator; typedef sm_list_type::const_iterator sm_list_const_iterator; diff --git a/src/MultiPlayer/multiplaymgr.hxx b/src/MultiPlayer/multiplaymgr.hxx index 96e56f242..eb5fc1edf 100644 --- a/src/MultiPlayer/multiplaymgr.hxx +++ b/src/MultiPlayer/multiplaymgr.hxx @@ -86,7 +86,7 @@ private: void ProcessChatMsg(const MsgBuf& Msg, const netAddress& SenderAddress); /// maps from the callsign string to the FGAIMultiplayer - typedef std::map > MultiPlayerMap; + typedef std::map > MultiPlayerMap; MultiPlayerMap mMultiPlayerMap; netSocket* mSocket;