move callback registration functions to fg_os_common.cxx

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

diff --git a/src/ATC/tower.hxx b/src/ATC/tower.hxx
index 69fce9ef905d83159964cfe5dacf04a098a4c635..562f08ed541bab5faf2c26f773f5c1fa3b6bf229 100644 (file)
--- a/src/ATC/tower.hxx
+++ b/src/ATC/tower.hxx
@@ -16,7 +16,7 @@
 //
 // 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_TOWER_HXX
 #define _FG_TOWER_HXX
@@ -24,9 +24,7 @@
 #include <simgear/compiler.h>
 #include <simgear/math/point3d.hxx>
 #include <simgear/misc/sgstream.hxx>
-//#include <simgear/math/sg_geodesy.hxx>
 #include <plib/sg.h>
-//#include <Airports/runways.hxx>
 
 #include STL_IOSTREAM
 #include STL_STRING
@@ -35,11 +33,12 @@ SG_USING_STD(string);
 SG_USING_STD(ios);
 
 #include "ATC.hxx"
-//#include "ATCmgr.hxx"
-#include "ground.hxx"
 #include "ATCProjection.hxx"
 #include "AIPlane.hxx"
 
+class FGATCMgr;
+class FGGround;
+
 //DCL - a complete guess for now.
 #define FG_TOWER_DEFAULT_RANGE 30
 
@@ -248,8 +247,8 @@ private:
        bool departed;  // set true when the above needs incrementing with time, false when it doesn't.
        
        // environment - need to make sure we're getting the surface winds and not winds aloft.
-       SGPropertyNode* wind_from_hdg;  //degrees
-       SGPropertyNode* wind_speed_knots;               //knots
+       SGPropertyNode_ptr wind_from_hdg;       //degrees
+       SGPropertyNode_ptr wind_speed_knots;            //knots
        
        double aptElev;         // Airport elevation
        string activeRwy;       // Active runway number - For now we'll disregard multiple / alternate runway operation.
@@ -335,10 +334,10 @@ private:
        bool tower_failed;              // tower failed?
        
        // Pointers to current users position and orientation
-       SGPropertyNode* user_lon_node;
-       SGPropertyNode* user_lat_node;
-       SGPropertyNode* user_elev_node;
-       SGPropertyNode* user_hdg_node;
+       SGPropertyNode_ptr user_lon_node;
+       SGPropertyNode_ptr user_lat_node;
+       SGPropertyNode_ptr user_elev_node;
+       SGPropertyNode_ptr user_hdg_node;
        
        // Details of the general traffic flow etc in the circuit
        double crosswind_leg_pos;       // Distance from threshold crosswind leg is being turned to in meters (actual operation - *not* ideal circuit)