fix another crash on exit by finally converting the rest of unguarded

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

diff --git a/src/ATC/AIPlane.hxx b/src/ATC/AIPlane.hxx
index 466807ba43da724a16908f907501b3fc5845a226..3cf218dfddb4eeae17ee16bafb99f995d316f25d 100644 (file)
--- a/src/ATC/AIPlane.hxx
+++ b/src/ATC/AIPlane.hxx
@@ -16,13 +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_AI_PLANE_HXX
 #define _FG_AI_PLANE_HXX
 
-#include <plib/sg.h>
-#include <plib/ssg.h>
 #include <simgear/math/point3d.hxx>
 #include <simgear/scene/model/model.hxx>
 
@@ -85,7 +83,7 @@ public:
        virtual LandingType GetLandingOption();
        
        // Return the callsign
-       inline string GetCallsign() {return plane.callsign;}
+       inline const string& GetCallsign() {return plane.callsign;}
 
 protected:
        PlaneRec plane;
@@ -145,11 +143,11 @@ private:
        // Outputs the transmission either on screen or as audio depending on user preference
        // The refname is a string to identify this sample to the sound manager
        // The repeating flag indicates whether the message should be repeated continuously or played once.
-       void Render(string refname, bool repeating);
+       void Render(const string& refname, bool repeating);
 
        // Cease rendering a transmission.
        // Requires the sound manager refname if audio, else "".
-       void NoRender(string refname);
+       void NoRender(const string& refname);
        
        // Rendering related stuff
        bool voice;                     // Flag - true if we are using voice