Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs16:/tmp/cvs-serv25686/include
Modified Files:
data.h packets.h proto.h
Log Message:
Support for server SP_FLAGS_ALL packet.
Cleaned up some mistakes in changes.txt.
Removed condition of having a planet being "touched" for the
CHECK_PLANETS crosscheck to occur.
Fixed wrong comment description on which version of short
packets is S_P2.
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- data.h 23 Apr 2007 07:19:29 -0000 1.80
+++ data.h 25 Apr 2007 06:50:41 -0000 1.81
@@ -588,6 +588,7 @@
extern int F_show_cloakers;
extern int F_turn_keys;
extern int F_show_visibility_range;
+extern int F_sp_flags_all;
#ifdef RECORDGAME
extern int F_many_self;
Index: packets.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/packets.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- packets.h 4 Apr 2007 10:34:21 -0000 1.6
+++ packets.h 25 Apr 2007 06:50:41 -0000 1.7
@@ -84,6 +84,7 @@
#endif
#define SP_GENERIC_32 32 /* 32 byte generic, see struct */
+#define SP_FLAGS_ALL 33 /* abbreviated flags for all players */
#define SP_SHIP_CAP 39 /* Handles server ship mods */
#ifdef SHORT_PACKETS
@@ -118,9 +119,8 @@
/* variable length packets */
#define VPLAYER_SIZE 4
-#define SHORTVERSION 11 /* other number blocks, like
- * UDP Version */
-#define OLDSHORTVERSION 10 /* S_P2 */
+#define SHORTVERSION 11 /* S_P2 */
+#define OLDSHORTVERSION 10 /* Short packets version 1*/
#endif
@@ -884,7 +884,8 @@
unsigned short s_bitmap;
};
-struct generic_32_spacket {
+struct generic_32_spacket
+{
char type; /* SP_GENERIC_32 */
char version; /* alphabetic */
short repair_time; /* server estimate of repair time in seconds */
@@ -900,6 +901,16 @@
fields in struct that were defined at a particular version.
*/
+struct flags_all_spacket
+{
+ char type; /* SP_FLAGS_ALL */
+ char offset; /* slot number of first flag */
+ int flags; /* two bits per slot */
+};
+#define FLAGS_ALL_DEAD 0
+#define FLAGS_ALL_CLOAK_ON 1
+#define FLAGS_ALL_CLOAK_OFF_SHIELDS_UP 2
+#define FLAGS_ALL_CLOAK_OFF_SHIELDS_DOWN 3
#ifdef SHORT_PACKETS
struct shortreq_cpacket
Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- proto.h 14 Apr 2007 07:44:34 -0000 1.51
+++ proto.h 25 Apr 2007 06:50:42 -0000 1.52
@@ -1134,6 +1134,8 @@
void handleShipCap (struct ship_cap_spacket *packet);
struct generic_32_spacket;
void handleGeneric32 (struct generic_32_spacket *packet);
+struct flags_all_spacket;
+void handleFlagsAll (struct flags_all_spacket *packet);
struct rsa_key_spacket;
void handleRSAKey (struct rsa_key_spacket *packet);
#ifdef INCLUDE_SCAN