From 77cce303eff2cfde5e1e9bae4170ff2223e66895 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Tue, 9 Sep 2014 15:11:26 -0700
Subject: [PATCH] Fix merge conflict properly

---
 src/s_sound.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/s_sound.cpp b/src/s_sound.cpp
index 6c27a76f5..531766a7a 100644
--- a/src/s_sound.cpp
+++ b/src/s_sound.cpp
@@ -1327,8 +1327,7 @@ sfxinfo_t *S_LoadSound(sfxinfo_t *sfx)
 			}
 			else if (sfx->bLoadRAW)
 			{
-				int frequency = (sfx->bForce22050 ? 22050 : 11025);
-				sfx->data = GSnd->LoadSoundRaw(sfxdata, size, frequency, 1, 8, sfx->LoopStart);
+				sfx->data = GSnd->LoadSoundRaw(sfxdata, size, sfx->RawRate, 1, 8, sfx->LoopStart);
 			}
 			else if (((BYTE *)sfxdata)[0] == 3 && ((BYTE *)sfxdata)[1] == 0 && dmxlen <= size - 8)
 			{