Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv14368/src
Modified Files:
death.c defaults.c sound.c
Log Message:
Update release time.
Fix netrekrc errors.
Fix end music selection so it uses proper range of music files in the music array.
Add debug check to frequent mix_playchannel error.
Index: death.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/death.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- death.c 31 Jan 2007 07:06:37 -0000 1.12
+++ death.c 7 Feb 2007 23:04:57 -0000 1.13
@@ -155,7 +155,7 @@
#ifdef SOUND
if (newSound)
{
- i = MUSIC_OFFSET + (RANDOM() % MUSIC_OFFSET); // Play random end theme
+ i = MUSIC_OFFSET + (RANDOM() % (NUM_MUSIC - MUSIC_OFFSET)); // Play random end theme
Play_Music(i);
}
#endif
@@ -186,7 +186,7 @@
#ifdef SOUND
if (newSound)
{
- i = MUSIC_OFFSET + (RANDOM() % MUSIC_OFFSET); // Play random end theme
+ i = MUSIC_OFFSET + (RANDOM() % (NUM_MUSIC - MUSIC_OFFSET)); // Play random end theme
Play_Music(i);
}
#endif
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- defaults.c 1 Feb 2007 00:10:28 -0000 1.39
+++ defaults.c 7 Feb 2007 23:04:57 -0000 1.40
@@ -258,8 +258,8 @@
"What servers to get from metaserver",
"0 - with players",
"1 - as above + with queue",
- "2 - as above + with nobody playing",
- "3 - as above + timed out servers (default)",
+ "2 - as above + with nobody playing (default)",
+ "3 - as above + timed out servers",
"4 - as above + servers that metaserver could not connect to",
NULL
}
@@ -770,7 +770,7 @@
{"useFullShipInfo", &useFullShipInfo, RC_BOOL,
{
"Display other ships to 256 directions instead of 16",
- "by using long ship packets instead of short ship packets",
+ "by using long ship packets instead of short ship packets,",
"slight increase in bandwidth usage",
NULL
}
Index: sound.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- sound.c 1 Feb 2007 00:10:28 -0000 1.21
+++ sound.c 7 Feb 2007 23:04:57 -0000 1.22
@@ -324,7 +324,10 @@
if ((channel = Mix_PlayChannel(-1, newsounds[type], 0)) < 0)
{
+#if DEBUG
+ /* Frequent occurence is more than 16 channels playing sound */
LineToConsole("Mix_PlayChannel: %s\n", Mix_GetError());
+#endif
return;
}
/* Make sure distance in boundary range that function accepts */