zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-12 07:34:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge conflict properly

Browse source
This commit is contained in:
Chris Robinson 2014-09-09 15:11:26 -07:00
parent ff6eb6df5c
commit 77cce303ef
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/s_sound.cpp
View file

@ -1327,8 +1327,7 @@ sfxinfo_t *S_LoadSound(sfxinfo_t *sfx)
} }
else if (sfx->bLoadRAW) else if (sfx->bLoadRAW)
{ {
int frequency = (sfx->bForce22050 ? 22050 : 11025); sfx->data = GSnd->LoadSoundRaw(sfxdata, size, sfx->RawRate, 1, 8, sfx->LoopStart);
sfx->data = GSnd->LoadSoundRaw(sfxdata, size, frequency, 1, 8, sfx->LoopStart);
} }
else if (((BYTE *)sfxdata)[0] == 3 && ((BYTE *)sfxdata)[1] == 0 && dmxlen <= size - 8) else if (((BYTE *)sfxdata)[0] == 3 && ((BYTE *)sfxdata)[1] == 0 && dmxlen <= size - 8)
{ {