[netrek-cvs] client/netrekxp/include data.h, 1.101, 1.102 packets.h, 1.14, 1.15

[Bill Balcerski]

Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6576/include

Modified Files:
	data.h packets.h 
Log Message:
Next pass at generic_32 version b support.
Known issues: can't find win32 equivalent for attribute packing,
feature packet arg1 of /002 is causing pointer error to arg2

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- data.h	12 Jul 2008 03:49:45 -0000	1.101
+++ data.h	12 Jul 2008 12:09:36 -0000	1.102
@@ -834,5 +834,6 @@
 extern int fullBitmapRotation;  /* draw old bitmap sets to all angles */
 extern int hideConsole;         /* show console window or not */
 
+extern int generic_32_version;
 extern struct context *context;
 #endif /* _h_data */

Index: packets.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/packets.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- packets.h	12 Jul 2008 03:49:45 -0000	1.14
+++ packets.h	12 Jul 2008 12:09:36 -0000	1.15
@@ -903,10 +903,26 @@
     unsigned short s_bitmap;
 };
 
-#define GENERIC_32_LENGTH 32
 struct generic_32_spacket
 {
     char        type;
+    char        pad[31];
+};
+#define GENERIC_32_LENGTH 32
+#define COST_GENERIC_32 (F_sp_generic_32 ? GENERIC_32_LENGTH : 0)
+struct generic_32_spacket_a
+{
+    char        type;
+    char        version;        /* alphabetic, 0x60 + version */
+    u_short     repair_time;    /* server estimate of repair time in seconds */
+    u_short     pl_orbit;       /* what planet player orbiting, -1 if none */
+    char        pad1[26];
+    /* NOTE: this version didn't use network byte order for the shorts */
+};
+#define GENERIC_32_VERSION_A 1
+struct generic_32_spacket_b
+{
+    char        type;
     char        version;        /* alphabetic, 0x60 + version */
     u_short     repair_time;    /* server estimate of repair time, seconds  */
     char        pl_orbit;       /* what planet player orbiting, -1 if none  */
@@ -919,7 +935,7 @@
     u_char      starbase_remain;         /* starbase reconstruction, mins   */
     u_char      team_remain;             /* team surrender time, seconds    */
     char        pad1[18];
-};
+}; //__attribute__ ((packed));
 #define GENERIC_32_VERSION_B 2
 #define GENERIC_32_VERSION GENERIC_32_VERSION_B /* default */