zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-30 17:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Config work almost done.

Browse source 
The only thing still referencing the old config file is Shadow Warrior's config read function.
This commit is contained in:
Christoph Oelckers 2019-10-27 13:40:24 +01:00
parent 038c1ba4ba
commit c0d5ca8ab8
74 changed files with 362 additions and 1212 deletions
Download patch file Download diff file Expand all files Collapse all files

4
source/sw/src/sounds.cpp
View file

@ -446,7 +446,7 @@ PlaySong(char *song_file_name, int cdaudio_track, SWBOOL loop, SWBOOL restart)
if (!SW_SHAREWARE)
{
if (cdaudio_track >= 0)
if (cdaudio_track >= 0 && mus_redbook)
{
char waveformtrack[MAXWAVEFORMTRACKLENGTH];
Bstrncpy(waveformtrack, gs.WaveformTrackName, MAXWAVEFORMTRACKLENGTH - 1);
@ -805,7 +805,7 @@ PlaySound(int num, int *x, int *y, int *z, Voc3D_Flags flags)
//if (UsingMenus && (*x!=0 || *y!=0 || *z!=0)) return(-1);
// Weed out parental lock sounds if PLock is active
if (gs.ParentalLock || Global_PLock)
if (adult_lockout || Global_PLock)
{
unsigned i;