shithub: choc

Download patch

ref: 496a9e8b3489a0a85fd47b91d1f587255845c31e
parent: 226cf56d65e7f8a57bf78a7503d420eef09e8568
author: Simon Howard <fraggle@gmail.com>
date: Sat Apr 19 11:30:42 EDT 2008 

Fix some more warnings.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1121


--- a/src/i_main.c
+++ b/src/i_main.c
@@ -54,7 +54,7 @@
     if (!SetProcessAffinityMask(GetCurrentProcess(), 1))
     {
         fprintf(stderr, "Failed to set process affinity mask (%d)\n",
-                GetLastError());
+                (int) GetLastError());
     }
 #endif
 
--- a/src/i_sdlsound.c
+++ b/src/i_sdlsound.c
@@ -216,6 +216,41 @@
     return clipped;
 }
 
+// Preload all the sound effects - stops nasty ingame freezes
+
+static void I_PrecacheSounds(void)
+{
+    char namebuf[9];
+    int i;
+
+    printf("I_PrecacheSounds: Precaching all sound effects..");
+
+    for (i=sfx_pistol; i<NUMSFX; ++i)
+    {
+        if ((i % 6) == 0)
+        {
+            printf(".");
+            fflush(stdout);
+        }
+
+        sprintf(namebuf, "ds%s", DEH_String(S_sfx[i].name));
+
+        S_sfx[i].lumpnum = W_CheckNumForName(namebuf);
+
+        if (S_sfx[i].lumpnum != -1)
+        {
+            CacheSFX(i);
+
+            if (sound_chunks[i].abuf != NULL)
+            {
+                Z_ChangeTag(sound_chunks[i].abuf, PU_CACHE);
+            }
+        }
+    }
+
+    printf("\n");
+}
+
 #endif
 
 static boolean ConvertibleRatio(int freq1, int freq2)
@@ -573,41 +608,6 @@
     sound_initialised = false;
 }
 
-
-// Preload all the sound effects - stops nasty ingame freezes
-
-static void I_PrecacheSounds(void)
-{
-    char namebuf[9];
-    int i;
-
-    printf("I_PrecacheSounds: Precaching all sound effects..");
-
-    for (i=sfx_pistol; i<NUMSFX; ++i)
-    {
-        if ((i % 6) == 0)
-        {
-            printf(".");
-            fflush(stdout);
-        }
-
-        sprintf(namebuf, "ds%s", DEH_String(S_sfx[i].name));
-
-        S_sfx[i].lumpnum = W_CheckNumForName(namebuf);
-
-        if (S_sfx[i].lumpnum != -1)
-        {
-            CacheSFX(i);
-
-            if (sound_chunks[i].abuf != NULL)
-            {
-                Z_ChangeTag(sound_chunks[i].abuf, PU_CACHE);
-            }
-        }
-    }
-
-    printf("\n");
-}
 
 static boolean I_SDL_InitSound(void)
 {