Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv5901/include
Modified Files:
data.h packets.h proto.h
Log Message:
Added support for new server feature packet FULL_DIRECTION_RESOLUTION.
Added partial support for support for new server feature packet SP_GENERIC_32.
Added new netrekrc option useFullShipInfo, to determine whether user wants to
use the FULL_DIRECTION_RESOLUTION feature packet (all other feature packets
are hard coded in as to on/off).
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- data.h 29 Nov 2006 15:01:33 -0000 1.41
+++ data.h 12 Dec 2006 04:47:05 -0000 1.42
@@ -555,6 +555,8 @@
extern int F_self_19flags;
extern int F_ship_cap;
extern int F_show_all_tractors;
+extern int F_sp_generic_32;
+extern int F_full_direction_resolution;
#ifdef RECORDGAME
extern int F_many_self;
@@ -689,4 +691,6 @@
extern int newQuit; /* new quit clock */
extern int newSound; /* Use new SDL sound interface */
extern int newSoundAngles; /* Use SDL with angular 3D sound */
+
+extern int useFullShipInfo; /* Prefer SP_PLAYER packets over SP_S_PLAYER packets */
#endif /* _h_data */
Index: packets.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/packets.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- packets.h 21 Jan 2003 21:27:54 -0000 1.1.1.1
+++ packets.h 12 Dec 2006 04:47:05 -0000 1.2
@@ -83,7 +83,9 @@
* verification */
#endif
-#define SP_SHIP_CAP 39 /* Handles server ship mods */
+#define SP_GENERIC_32 32 /* 32 byte packet, currently sends ship
+ repair time, room for future info */
+#define SP_SHIP_CAP 39 /* Handles server ship mods */
#ifdef SHORT_PACKETS
#define SP_S_REPLY 40 /* reply to send-short
@@ -871,6 +873,13 @@
unsigned short s_bitmap;
};
+struct generic_32_spacket {
+ char type; /* SP_GENERIC_32 Header */
+ char version;
+ int repair_time; /* Estimated repair time, in seconds */
+ char pad1; /* TODO: Change to union */
+};
+
#ifdef SHORT_PACKETS
struct shortreq_cpacket
{ /* CP_S_REQ */
Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- proto.h 6 Jun 2006 19:50:38 -0000 1.25
+++ proto.h 12 Dec 2006 04:47:05 -0000 1.26
@@ -864,6 +864,7 @@
/*** planetlist.c
/******************************************************************************/
void planetlist (void);
+void updatePlanetw (void);
/******************************************************************************/
/*** playback.c
@@ -1107,6 +1108,8 @@
int sock);
struct ship_cap_spacket;
void handleShipCap (struct ship_cap_spacket *packet);
+struct generic_32_spacket;
+void handleGeneric32 (struct generic_32_spacket *packet);
struct rsa_key_spacket;
void handleRSAKey (struct rsa_key_spacket *packet);
#ifdef INCLUDE_SCAN