Catch sound exceptions at the earliest, report problem has an alert, and continue...

[flightgear.git] / src / ATC / ATCdisplay.cxx

diff --git a/src/ATC/ATCdisplay.cxx b/src/ATC/ATCdisplay.cxx
index 5de85e4d144bb1a187cf9d4f2abafc1187fdd132..cd05ca4d08f5de330a8f09a09168f2fb3c142bc8 100644 (file)
--- a/src/ATC/ATCdisplay.cxx
+++ b/src/ATC/ATCdisplay.cxx
@@ -26,7 +26,9 @@
 #   include <windows.h>
 #endif
 
-#include <GL/glu.h>
+#include <simgear/compiler.h>
+
+#include SG_GLU_H
 
 #include <simgear/props/props.hxx>
 
@@ -200,7 +202,7 @@ void FGATCDisplay::update(double dt) {
        }
 }
 
-void FGATCDisplay::RegisterSingleMessage(string msg, double delay) {
+void FGATCDisplay::RegisterSingleMessage(const string& msg, double delay) {
        //cout << msg << '\n';
        atcMessage m;
        m.msg = msg;
@@ -216,13 +218,13 @@ void FGATCDisplay::RegisterSingleMessage(string msg, double delay) {
        //cout << "Single message registered\n";
 }
 
-void FGATCDisplay::RegisterRepeatingMessage(string msg) {
+void FGATCDisplay::RegisterRepeatingMessage(const string& msg) {
        rep_msg = true;
        rep_msg_str = msg;
        return;
 }
 
-void FGATCDisplay::ChangeRepeatingMessage(string newmsg) {
+void FGATCDisplay::ChangeRepeatingMessage(const string& newmsg) {
        rep_msg_str = newmsg;
        change_msg_flag = true;
        return;