Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5429/src
Modified Files:
defaults.c local.c
Log Message:
Made it so cloak sounds not played at twarp cloakflash events.
Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- local.c 27 Apr 2006 00:57:54 -0000 1.12
+++ local.c 27 Apr 2006 16:48:24 -0000 1.13
@@ -536,7 +536,9 @@
if (j->p_flags & PFCLOAK)
{
- if (j->p_cloakphase < (CLOAK_PHASES - 1))
+ // To avoid sounds at twarp "cloak" speed and the speed below it ("decloak" speed)
+ if (j->p_cloakphase < (CLOAK_PHASES - 1)
+ && (F_cloak_maxwarp ? (j->p_speed != 0xf && j->p_speed != 0xe): 1))
{
#ifdef SOUND
@@ -574,7 +576,9 @@
}
else
{
- if (j->p_cloakphase)
+ // To avoid sounds at twarp "cloak" speed and the speed below it ("decloak" speed)
+ if (j->p_cloakphase
+ && (F_cloak_maxwarp ? (j->p_speed != 0xf && j->p_speed != 0xe): 1))
{
#ifdef SOUND
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- defaults.c 24 Apr 2006 15:30:38 -0000 1.9
+++ defaults.c 27 Apr 2006 16:48:24 -0000 1.10
@@ -125,7 +125,10 @@
},
{"dynamicBitmaps", &dynamicBitmaps, RC_BOOL,
{
- "Allow switching of ship bitmaps in game",
+ "Allow switching of ship bitmaps in game. With this option disabled",
+ "not all bitmaps load into memory. This option is thus not changeable",
+ "in game. Do not attempt to edit your netrekrc to turn dynamic bitmaps",
+ "on and then reload the netrekrc with the & key - restart the client instead.",
NULL
}
},