Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23500/include
Modified Files:
data.h struct.h
Log Message:
Added new entries to torp and plasma struct, t_clear and pt_clear, to mark an
exploding plasma or torp as needing to be freed once its explosion cycle is
over. Covers the case where a torp explodes, but the free packet is lost.
Previously, the torp would never clear until it was no longer in the local
map range.
If weaponsOnMap option is on, internal timer to determine when it's safe to
expire weapons is moved to map draw routine. Fixes problem where
observers who are not locked onto anyone but still getting weapons drawn
on map would have problems with weapons (like phasers) not expiring
correctly due to packet loss enemy torps which are off local screen are no
longer automatically freed (since this data is now sent for observers). Also
changed exploding torps to use the time of explosion cycle rather than an
arbitrary timer of 100 for expiry.
Added support for SHOW_CLOAKERS feature packet.
New netrekrc option "showCloakers: (on)/off" to show other cloakers on
tactical, only works if server has the new feature packet SHOW_CLOAKERS
on.
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- data.h 3 Apr 2007 00:36:32 -0000 1.68
+++ data.h 4 Apr 2007 04:06:36 -0000 1.69
@@ -189,6 +189,7 @@
extern int showdetCircle;
extern int puckCircle;
extern int showArmy;
+extern int showCloakers;
extern int niftyNewMessages;
extern int fastQuit;
extern char *shipnos;
@@ -577,6 +578,7 @@
extern int F_full_weapon_resolution;
extern int F_show_army_count;
extern int F_show_other_speed;
+extern int F_show_cloakers;
#ifdef RECORDGAME
extern int F_many_self;
Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/struct.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- struct.h 27 Feb 2007 08:37:06 -0000 1.15
+++ struct.h 4 Apr 2007 04:06:36 -0000 1.16
@@ -317,6 +317,7 @@
short t_fuse; /* Life left in current state */
unsigned char t_updateFuse; /* Updates before torp will expire */
unsigned char t_dir; /* direction */
+ int t_clear; /* Flag to clear exploding torps */
};
@@ -337,6 +338,7 @@
short pt_updateFuse; /* Time till expiry */
int pt_x;
int pt_y;
+ int pt_clear; /* Flag to clear exploding plasmas */
};
#define PHFREE 0x00