Mathias Fröhölöiööhlich:

[flightgear.git] / src / MultiPlayer / mpmessages.hxx

diff --git a/src/MultiPlayer/mpmessages.hxx b/src/MultiPlayer/mpmessages.hxx
index b29d2a91b3b75839500d831f66d6ab6e98a53aaa..8340897aef806f449b8049cc3040ebf94498af1b 100644 (file)
--- a/src/MultiPlayer/mpmessages.hxx
+++ b/src/MultiPlayer/mpmessages.hxx
@@ -1,3 +1,26 @@
+// mpmessages.hxx -- Message definitions for multiplayer communications
+// within a multiplayer Flightgear
+//
+// Written by Duncan McCreanor, started February 2003.
+// duncan.mccreanor@airservicesaustralia.com
+//
+// Copyright (C) 2003  Airservices Australia
+//
+// 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.
+//
+
 #ifndef MPMESSAGES_H
 #define MPMESSAGES_H
 
@@ -12,34 +35,40 @@
 *
 ******************************************************************/
 
+#include <simgear/compiler.h>
+
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #include <plib/sg.h>
 
 // Message identifiers
 #define CHAT_MSG_ID 1
-#define POS_DATA_ID 2
-
-#define MAX_CALLSIGN_LEN 10
+#define UNUSABLE_POS_DATA_ID 2
+#define POS_DATA_ID 3
+/* should be a multiple of 8! */
+#define MAX_CALLSIGN_LEN 8
 /** Header for use with all messages sent */
 typedef struct {
 
-    /** Message identifier */
-    char MsgId;
+    /** Message identifier, multiple of 8! */
+    uint32_t MsgId;
 
     /** Length of the message inclusive of this header */
-    unsigned int iMsgLen;
+    uint32_t iMsgLen;
 
     /** IP address for reply to message (player's receiver address) */
-    unsigned long int lReplyAddress;
+    uint32_t lReplyAddress;
 
     /** Port for replies (player's receiver port) */
-    unsigned int iReplyPort;
+    uint32_t iReplyPort;
 
     /** Callsign used by the player */
     char sCallsign[MAX_CALLSIGN_LEN];
 
 } T_MsgHdr;
 
-#define MAX_CHAT_MSG_LEN 50
+#define MAX_CHAT_MSG_LEN 48
 /** Chat message */
 typedef struct {
 
@@ -48,8 +77,8 @@ typedef struct {
 
 } T_ChatMsg;
 
-
-#define MAX_MODEL_NAME_LEN 50
+/* should be a multiple of 8! */
+#define MAX_MODEL_NAME_LEN 48
 /** Aircraft position message */
 typedef struct {
 
@@ -57,12 +86,12 @@ typedef struct {
     char sModel[MAX_MODEL_NAME_LEN];
 
     /** Position data for the aircraft */
-    sgMat4 PlayerPos;
+    sgdVec3 PlayerPosition;
+    sgQuat PlayerOrientation;
 
 } T_PositionMsg;
 
 
-
 #endif