Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs16:/tmp/cvs-serv25686/src
Modified Files:
data.c feature.c map.c socket.c
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: feature.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/feature.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- feature.c 23 Apr 2007 07:19:30 -0000 1.15
+++ feature.c 25 Apr 2007 06:50:42 -0000 1.16
@@ -99,6 +99,7 @@
{"SHOW_CLOAKERS", &F_show_cloakers, 'S', 1, 0, 0},
{"TURN_KEYS", &F_turn_keys, 'S', 1, 0, 0},
{"SHOW_VISIBILITY_RANGE", &F_show_visibility_range, 'S', 1, 0, 0},
+ {"SP_FLAGS_ALL", &F_sp_flags_all, 'S', 1, 0, 0},
{0, 0, 0, 0, 0, 0}
};
Index: map.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- map.c 23 Apr 2007 07:19:30 -0000 1.53
+++ map.c 25 Apr 2007 06:50:43 -0000 1.54
@@ -507,7 +507,7 @@
/* Synchronize planet info (up to 10 times/second) for current orbitted
planet. For all other planets, send info on planet 0 through planet
MAXPLANETS every MAXPLANETS/10 seconds, one planet at a time,
- 10 times/second. Only send info is planet is "touched" */
+ 10 times/second. */
if (F_check_planets)
{
if ((me->p_flags & PFORBIT)
@@ -520,8 +520,7 @@
orbit_planet_refresh = 0;
}
}
- else if ((planet_refresh == l->pl_no * server_ups / 10)
- && (l->pl_info & me->p_team))
+ else if (planet_refresh == l->pl_no * server_ups / 10)
sendPlanetsPacket(l->pl_no);
}
Index: socket.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- socket.c 23 Apr 2007 07:19:30 -0000 1.29
+++ socket.c 25 Apr 2007 06:50:43 -0000 1.30
@@ -147,7 +147,7 @@
#endif
{sizeof (struct generic_32_spacket), handleGeneric32}, /* SP_GENERIC_32 */
- {0, dummy}, /* 33 */
+ {sizeof (struct flags_all_spacket), handleFlagsAll}, /* SP_FLAGS_ALL */
{0, dummy}, /* 34 */
{0, dummy}, /* 35 */
{0, dummy}, /* 36 */
@@ -2531,6 +2531,12 @@
if (packet->version < 'b') return;
}
+void
+handleFlagsAll (struct flags_all_spacket *packet)
+{
+ new_flags(ntohl(packet->flags), packet->offset);
+}
+
#ifdef RSA
void
handleRSAKey (struct rsa_key_spacket *packet)
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- data.c 23 Apr 2007 07:19:30 -0000 1.86
+++ data.c 25 Apr 2007 06:50:42 -0000 1.87
@@ -688,6 +688,7 @@
int F_show_cloakers = 0;
int F_turn_keys = 0;
int F_show_visibility_range = 0;
+int F_sp_flags_all = 0;
#ifdef RECORDGAME
int F_many_self = 0;