shithub: choc

Info  •  Files  •  Log  •  Branches

Merge branch 'master' of github.com:chocolate-doom/chocolate-doom

--- a/src/i_sdlsound.c

+++ b/src/i_sdlsound.c

@@ -86,7 +86,7 @@

 // of the time: with all the Doom IWAD sound effects, at least. If a PWAD

 // is used, clipping might occur.

-float libsamplerate_scale = 0.65;

+float libsamplerate_scale = 0.65f;

 // Hook a sound into the linked list at the head.

--- a/src/strife/d_main.c

+++ b/src/strife/d_main.c

@@ -839,19 +839,24 @@

             if((p = M_CheckParm("-iwad")) && p < myargc - 1)

             {

                 char   *iwad     = myargv[p + 1];

-                size_t  len      = strlen(iwad) + 24;

-                char   *filename = malloc(len);

-                char    sepchar;

-

-                // how the heck is Choco surviving without this routine?

-                sepchar = M_GetFilePath(iwad, filename, len);

-                filename[strlen(filename)] = sepchar;

-                M_StringConcat(filename, "voices.wad", sizeof(filename));

-

-                if(!M_FileExists(filename))

+                size_t  len      = strlen(iwad) + 1;

+                char   *iwadpath = Z_Malloc(len, PU_STATIC, NULL);

+                char   *voiceswad;

+                

+                // extract base path of IWAD parameter

+                M_GetFilePath(iwad, iwadpath, len);

+                

+                // concatenate with /voices.wad

+                voiceswad = M_SafeFilePath(iwadpath, "voices.wad");

+                Z_Free(iwadpath);

+

+                if(!M_FileExists(voiceswad))

+                {

                     disable_voices = 1;

+                    Z_Free(voiceswad);

+                }

                 else

-                    name = filename; // STRIFE-FIXME: memory leak!!

+                    name = voiceswad; // STRIFE-FIXME: memory leak!!

             }

             else

                 disable_voices = 1;

--- a/textscreen/txt_fileselect.c

+++ b/textscreen/txt_fileselect.c

@@ -666,7 +666,7 @@

         }

     }

-    return TXT_WidgetMousePress(fileselect->inputbox, x, y, b);

+    TXT_WidgetMousePress(fileselect->inputbox, x, y, b);

 }

 static void TXT_FileSelectFocused(TXT_UNCAST_ARG(fileselect), int focused)