foxygit / doom Log in
commit 80ef754afea340ed4f06c780b3a025f23538db04
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Thu Sep 25 18:55:24 2008 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Thu Sep 25 18:55:24 2008 +0000

    Move GetSfxLumpName to shut up warnings

    Subversion-branch: /branches/raven-branch
    Subversion-revision: 1283
---
 src/i_sdlsound.c | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/i_sdlsound.c b/src/i_sdlsound.c
index 1586ef18..b26fb1b2 100644
--- a/src/i_sdlsound.c
+++ b/src/i_sdlsound.c
@@ -437,6 +437,28 @@ static boolean CacheSFX(sfxinfo_t *sfxinfo)
     return true;
 }

+static void GetSfxLumpName(sfxinfo_t *sfx, char *buf)
+{
+    // Linked sfx lumps? Get the lump number for the sound linked to.
+
+    if (sfx->link != NULL)
+    {
+        sfx = sfx->link;
+    }
+
+    // Doom adds a DS* prefix to sound lumps; Heretic and Hexen don't
+    // do this.
+
+    if (use_sfx_prefix)
+    {
+        sprintf(buf, "ds%s", DEH_String(sfx->name));
+    }
+    else
+    {
+        strcpy(buf, DEH_String(sfx->name));
+    }
+}
+
 #ifdef HAVE_LIBSAMPLERATE

 // Preload all the sound effects - stops nasty ingame freezes
@@ -513,28 +535,6 @@ static boolean LockSound(sfxinfo_t *sfxinfo)
     return true;
 }

-static void GetSfxLumpName(sfxinfo_t *sfx, char *buf)
-{
-    // Linked sfx lumps? Get the lump number for the sound linked to.
-
-    if (sfx->link != NULL)
-    {
-        sfx = sfx->link;
-    }
-
-    // Doom adds a DS* prefix to sound lumps; Heretic and Hexen don't
-    // do this.
-
-    if (use_sfx_prefix)
-    {
-        sprintf(buf, "ds%s", DEH_String(sfx->name));
-    }
-    else
-    {
-        strcpy(buf, DEH_String(sfx->name));
-    }
-}
-
 //
 // Retrieve the raw data lump index
 //  for a given SFX name.