Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv5499/src
Modified Files:
cowmain.c defaults.c sound.c
Log Message:
Bug fixes for new netrekrc options and for background music on client connect.
New music file (star trek 2 theme).
Index: cowmain.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- cowmain.c 31 Jan 2007 07:06:37 -0000 1.20
+++ cowmain.c 1 Feb 2007 00:10:28 -0000 1.21
@@ -1087,7 +1087,11 @@
Mix_HaltChannel(-1);
/* Fade out any music playing over 5 seconds */
if (Mix_PlayingMusic())
+ {
Mix_FadeOutMusic(5000);
+ /* Attempt to start background music once fadeout done */
+ Mix_HookMusicFinished(Play_Music_Bkgd);
+ }
Play_Sound(ENTER_SHIP_WAV);
}
else
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- defaults.c 31 Jan 2007 07:06:37 -0000 1.38
+++ defaults.c 1 Feb 2007 00:10:28 -0000 1.39
@@ -1516,8 +1516,8 @@
allowWheelActions = booleanDefault ("allowWheelActions",
allowWheelActions);
newQuit = booleanDefault ("newQuit", newQuit);
newSound = booleanDefault ("newSound", newSound);
- newSoundEffects= booleanDefault ("newMusic", newSoundEffects);
- newSoundMusic = booleanDefault ("newMusicPlayRandom", newSoundMusic);
+ newSoundEffects= booleanDefault ("newSoundEffects", newSoundEffects);
+ newSoundMusic = booleanDefault ("newSoundMusic", newSoundMusic);
newSoundMusicBkgd = booleanDefault ("newSoundMusicBkgd",
newSoundMusicBkgd);
newSoundAngles = booleanDefault ("newSoundAngles", newSoundAngles);
useFullShipInfo = booleanDefault ("useFullShipInfo", useFullShipInfo);
Index: sound.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- sound.c 31 Jan 2007 07:06:37 -0000 1.20
+++ sound.c 1 Feb 2007 00:10:28 -0000 1.21
@@ -156,6 +156,7 @@
newmusic[INTRO3_MUSIC] = Mix_LoadMUS(DATAFILE("intro_theme_VOY.ogg"));
newmusic[INTRO4_MUSIC] = Mix_LoadMUS(DATAFILE("intro_theme_DS9.ogg"));
newmusic[INTRO5_MUSIC] = Mix_LoadMUS(DATAFILE("intro_theme_ENT.ogg"));
+ newmusic[INTRO6_MUSIC] = Mix_LoadMUS(DATAFILE("intro_theme_ST2.ogg"));
newmusic[END1_MUSIC] = Mix_LoadMUS(DATAFILE("end_theme_TOS.ogg"));
newmusic[END2_MUSIC] = Mix_LoadMUS(DATAFILE("end_theme_TNG.ogg"));
newmusic[END3_MUSIC] = Mix_LoadMUS(DATAFILE("end_theme_VOY.ogg"));
_______________________________________________
netrek-cvs mailing list
[email protected]
http://mailman.us.netrek.org/mailman/listinfo/netrek-cvs
