Merge branch 'work4' into next

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

diff --git a/src/Network/native_fdm.hxx b/src/Network/native_fdm.hxx
index 23326e1d6d2172274ce2bfed4b38fcefdf8dd30b..4a21864c7c8a355ef11edf5ec86af51f1b4d9e17 100644 (file)
--- a/src/Network/native_fdm.hxx
+++ b/src/Network/native_fdm.hxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started September 2001.
 //
-// Copyright (C) 2001  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2001  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -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.
 //
 // $Id$
 
@@ -27,17 +27,17 @@
 
 #include <simgear/compiler.h>
 
-#include <FDM/flight.hxx>
+#include <simgear/timing/timestamp.hxx>
 
 #include "protocol.hxx"
 #include "net_fdm.hxx"
 
 
-class FGNativeFDM : public FGProtocol, public FGInterface {
+class FGNativeFDM : public FGProtocol {
 
     FGNetFDM buf;
     int length;
-
+    
 public:
 
     FGNativeFDM();
@@ -62,14 +62,6 @@ void FGProps2NetFDM( FGNetFDM *net, bool net_byte_order = true );
 // Update the property tree from the FGNetFDM structure.
 void FGNetFDM2Props( FGNetFDM *net, bool net_byte_order = true );
 
-// Do some ultra simplistic extrapolation for times when a network
-// packet get's dropped or delayed.
-//
-// If a valid net structure is passed in, just record the last
-// position/orientation.  If NULL is passed in, use the most recent
-// deltas to predict the new position.
-void FGNativeFDMSmooth( FGNetFDM *net );
-
 
 #endif // _FG_NATIVE_FDM_HXX