Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next

[flightgear.git] / src / Network / net_gui.hxx

diff --git a/src/Network/net_gui.hxx b/src/Network/net_gui.hxx
index 4aa4850eaba2565f58cde0e8f6527cecae93b173..1025d6acc07d603450a91fb092a625efcb129e94 100644 (file)
--- a/src/Network/net_gui.hxx
+++ b/src/Network/net_gui.hxx
@@ -1,23 +1,9 @@
 // net_gui.hxx -- defines a simple subset I/O interface to the flight
 //                     dynamics model variables
 //
-// Written by Curtis Olson, started January 2002.
+// Written by Curtis Olson - curt@flightgear.com, started January 2002.
 //
-// Copyright (C) 2002  Curtis L. Olson  - curt@flightgear.com
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// 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.
+// This file is in the Public Domain, and comes with no warranty.
 //
 // $Id$
 
@@ -25,13 +11,16 @@
 #ifndef _NET_GUI_HXX
 #define _NET_GUI_HXX
 
+#include <simgear/misc/stdint.hxx>
 
-#ifndef __cplusplus                                                          
-# error This library requires C++
-#endif                                   
+// NOTE: this file defines an external interface structure.  Due to
+// variability between platforms and architectures, we only used fixed
+// length types here.  Specifically, integer types can vary in length.
+// I am not aware of any platforms that don't use 4 bytes for float
+// and 8 bytes for double.
 
 
-const int FG_NET_GUI_VERSION = 3;
+const uint32_t FG_NET_GUI_VERSION = 7;
 
 
 // Define a structure containing the top level flight dynamics model
@@ -47,11 +36,7 @@ public:
         FG_MAX_TANKS = 4
     };
 
-    int version;               // increment when data values change
-    int pad;                    // keep doubles 64-bit aligned for some
-                                // hardware platforms, such as the Sun
-                                // SPARC, which don't like misaligned
-                                // data
+    uint32_t version;          // increment when data values change
 
     // Positions
     double longitude;          // geodetic (radians)
@@ -67,16 +52,19 @@ public:
     float climb_rate;          // feet per second
 
     // Consumables
-    int num_tanks;             // Max number of fuel tanks
+    uint32_t num_tanks;                // Max number of fuel tanks
     float fuel_quantity[FG_MAX_TANKS];
 
     // Environment
-    time_t cur_time;            // current unix time
-    long int warp;              // offset in seconds to unix time
+    uint32_t cur_time;          // current unix time
+                                // FIXME: make this uint64_t before 2038
+    uint32_t warp;              // offset in seconds to unix time
+    float ground_elev;          // ground elev (meters)
 
     // Approach
     float tuned_freq;           // currently tuned frequency
-    bool in_range;              // tuned navaid is in range?
+    float nav_radial;           // target nav radial
+    uint32_t in_range;           // tuned navaid is in range?
     float dist_nm;              // distance to tuned navaid in nautical miles
     float course_deviation_deg; // degrees off target course
     float gs_deviation_deg;     // degrees off target glide slope