diff options
| -rw-r--r-- | src/i_sdlsound.c | 2 | ||||
| -rw-r--r-- | src/strife/d_main.c | 27 | ||||
| -rw-r--r-- | textscreen/txt_fileselect.c | 2 |
3 files changed, 18 insertions, 13 deletions
diff --git a/src/i_sdlsound.c b/src/i_sdlsound.c index 4c2ec5fa..7089378e 100644 --- a/src/i_sdlsound.c +++ b/src/i_sdlsound.c @@ -86,7 +86,7 @@ int use_libsamplerate = 0; // 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. diff --git a/src/strife/d_main.c b/src/strife/d_main.c index fdb6bbdc..b2eadd96 100644 --- a/src/strife/d_main.c +++ b/src/strife/d_main.c @@ -839,19 +839,24 @@ void D_IdentifyVersion(void) 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; diff --git a/textscreen/txt_fileselect.c b/textscreen/txt_fileselect.c index 9e535668..5d83c15c 100644 --- a/textscreen/txt_fileselect.c +++ b/textscreen/txt_fileselect.c @@ -666,7 +666,7 @@ static void TXT_FileSelectMousePress(TXT_UNCAST_ARG(fileselect), } } - 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) |