Update Mac configure script for new ALUT scheme; support --with-alut-framework.

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

diff --git a/src/Network/multiplay.hxx b/src/Network/multiplay.hxx
index 10bea8ae16ebd504fdf2bb8d57c9c21a58f773a0..0d5563c0e03669236878ecb5b82076c71ede0ca7 100644 (file)
--- a/src/Network/multiplay.hxx
+++ b/src/Network/multiplay.hxx
@@ -3,6 +3,8 @@
 // Written by Diarmuid Tyson, started February 2003.
 // diarmuid.tyson@airservicesaustralia.com
 //
+// With additions by Vivian Meazza, January 2006
+//
 // Copyright (C) 2003  Airservices Australia
 //
 // This program is free software; you can redistribute it and/or
@@ -17,7 +19,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_MULTIPLAY_HXX
@@ -25,17 +27,21 @@
 
 #define FG_MULTIPLAY_HID "$Id$"
 
-#include STL_STRING
-SG_USING_STD(string);
-
-#include "protocol.hxx"
 #include <simgear/compiler.h>
+
+#include <string>
+
+#include <simgear/props/props.hxx>
+
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Model/acmodel.hxx>
-#include <Model/model.hxx>
-#include <MultiPlayer/multiplaytxmgr.hxx>
-#include <MultiPlayer/multiplayrxmgr.hxx>
+#include <MultiPlayer/multiplaymgr.hxx>
+
+#include "protocol.hxx"
+
+using std::string;
+
 
 /****************************************************************
 * @version $Id$
@@ -61,8 +67,7 @@ public:
     /** Destructor. */
     ~FGMultiplay ();
 
-    /** Enables the FGMultiplay object
-    */
+    /** Enables the FGMultiplay object. */
     bool open();
 
     /** Tells the multiplayer_mgr to send/receive data.
@@ -74,7 +79,10 @@ public:
     bool close();
 
 private:
-
+  // Map between the property id's from the multiplayers network packets
+  // and the property nodes
+  typedef std::map<unsigned, SGSharedPtr<SGPropertyNode> > PropertyMap;
+  PropertyMap mPropertyMap;
 };