Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv11631/resources/docs Modified Files: changes.txt netrekrc netrekrc_options.txt Log Message: Completely gutted the old windows sound system. Resulting in removal of nt_intro.wav (yay!), audio.h and winsndlib.c (bigger yay!). All the clunky old windows code for loading sound, checking if sound is enabled, and changing volume is now handled by 20x less code using SDL. And it's done better, too. All references to "newSound" have been renamed to "sound". No longer support the old sound menu/loading of sounds, so that got gutted too. Still todo: menu option for removing other ship's sounds, ability to toggle certain sound categories on/off, and to control starting volume. All to be netrekrc entries. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- netrekrc 25 Feb 2007 14:12:10 -0000 1.25 +++ netrekrc 28 Feb 2007 09:35:20 -0000 1.26 @@ -173,21 +173,6 @@ # Use new quit window newQuit: on -# Use new layered, stereo sound -newSound: on - -# Play sound effects (newSound only) -newSoundEffects: on - -# Play music (newSound only) -newSoundMusic: on - -# Play theme music in background (requires newSound and newSoundMusic) -newSoundMusicBkgd: off - -# Use 3D sound effects (only works if newSound is on) -newSoundAngles: off - # Omit team letter on galaxy omitTeamLetter: off @@ -356,9 +341,21 @@ # Sort players by team sortPlayers: on -# Enable sound +# Enable layered, stereo sound sound: on +# Play sound effects +soundEffects: on + +# Play music +soundMusic: on + +# Play theme music in background (requires soundMusic) +soundMusicBkgd: off + +# Use 3D sound effects +soundAngles: off + # Shrink enemy phaser by x/16 of its length # 1-16 range theirPhaserShrink: 0 Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- netrekrc_options.txt 25 Feb 2007 14:12:10 -0000 1.27 +++ netrekrc_options.txt 28 Feb 2007 09:35:20 -0000 1.28 @@ -122,12 +122,6 @@ # off - old style newQuit: (on/off) use new quit window -newSound: (on/off) use layered, stereo sound -newSoundEffects: (on/off) play sound effects (newSound only) -newSoundMusic: (on/off) play music (newSound only) -newSoundMusicBkgd: (on/off) play theme music in background - (this option requires newSound and newSoundMusic to be on) -newSoundAngles: (on/off) use 3D sound effects (only works if newSound is on) omitTeamLetter: (on/off) omit team letter on galaxy orishipbmpfile: (path) - old color bitmaps oriship1bmpfile: (path) - new color bitmaps @@ -254,7 +248,12 @@ singleMacro: (string) macro keys that will trigger macro without macro mode sortMyTeamFirst: (on/off) show my team first in the player list sortPlayers: (on/off) sort players by teams -sound: (on/off) enable sound +sound: (on/off) enable layered, stereo sound +soundEffects: (on/off) play sound effects +soundMusic: (on/off) play music +soundMusicBkgd: (on/off) play theme music in background + (this option requires soundMusic to be on) +soundAngles: (on/off) use 3D sound effects soundDir: (path) path to directory containing sound files theirPhaserShrink: (0-16) shrink enemy phaser by x/16 of its length timerType: (0-4) type of timer on dashboard window Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.114 retrieving revision 1.115 diff -u -d -r1.114 -r1.115 --- changes.txt 27 Feb 2007 10:16:33 -0000 1.114 +++ changes.txt 28 Feb 2007 09:35:20 -0000 1.115 @@ -1,4 +1,6 @@ Netrek XP 2006, Version 1.2: (Released Feb-2007) +- all "newSound" options have just been renamed "sound". The old sound playback (newSound + off) is no longer supported. Thus the newSound netrekrc option is no longer. - border refresh now works slightly differently for those using the new color bitmaps (colorClient = 4), ships can now be seen along the border edges that were normally not drawn, allowing players to get a slightly increased viewable tactical range. @@ -26,18 +28,16 @@ in the player list. - fixed cloak/decloak cycling so that it animates properly at 10 updates/second. - sound and music volume are now independent of Windows sound volume, i.e. changing - game volume with the in game raise/lower volume keys does not change system WAV volume - (newSound only). -- three new netrekrc options, which are newSoundEffects, newSoundMusic, and newSoundMusicBkgd. + game volume with the in game raise/lower volume keys does not change system WAV volume. +- three new netrekrc options, which are soundEffects, soundMusic, and soundMusicBkgd. The first toggles sound effects on/off, the second toggles music on/off, the third plays a mix of star trek theme music continually in the background. Thus, if you wish to play with only music, you can. If you want to play with only sound effects, you can. Or both. - Or neither. Defaults are on for sound effects and music, and off for background music - (newSound only). + Or neither. Defaults are on for sound effects and music, and off for background music. - the client can now play music files, 10 star trek themed music files from the various star trek series and movies have been added. Random intro themes will play on client connect, and random end credits themes will play on genocide. These new music files are in the .ogg - format (newSound only). + format. - servers that don't respond to metaping are not saved in the UDPcache, as they are likely defunct - fixed some bugs relating to message windows, most noticeably, messages that are @@ -49,7 +49,7 @@ not used in normal gameplay though - changed default beeplite settings to include highlighting and sound effects for carrying, take and escorting RCDs. -- sound now fades out over 1 second upon quitting (newSound only) +- sound now fades out over 1 second upon quitting - support for new server feature packet SP_GENERIC_32. This is a great upgrade to the server as it allows for future data to be sent in this packet (lots of empty room). Currently it sends your ship's repair time..removing the need for the client side repair time