fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-03-18 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correct some Sys_FileOpenRead's to be COM_OpenFile

Browse source
This commit is contained in:
Eric Wasylishen 2011-01-16 22:25:39 -07:00
parent 2983bf5c49
commit 990f42683f
2 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Quake/snd_codec.c
View file

@ -60,16 +60,7 @@ Select an appropriate codec for a file based on its extension
*/
static snd_codec_t *S_FindCodecForFile(const char *filename)
{
int i;
char filenameLowercase[MAX_QPATH];
strncpy(filenameLowercase, filename, MAX_QPATH);
filenameLowercase[MAX_QPATH-1] = '\0';
for (i=0; i<MAX_QPATH; i++)
{
filenameLowercase[i] = tolower(filenameLowercase[i]);
}
char *ext = S_FileExtension(filenameLowercase);
char *ext = S_FileExtension(filename);
snd_codec_t *codec = codecs;
if(!ext)
@ -80,13 +71,13 @@ static snd_codec_t *S_FindCodecForFile(const char *filename)
char fn[MAX_QPATH];
// there is no extension so we do not need to subtract 4 chars
strncpy(fn, filenameLowercase, MAX_QPATH);
strncpy(fn, filename, MAX_QPATH);
fn[MAX_QPATH-1] = '\0';
COM_DefaultExtension(fn, codec->ext);
// Check it exists
int handle;
if (Sys_FileOpenRead(fn, &handle) > 0)
if (COM_OpenFile(fn, &handle) > 0)
{
COM_CloseFile(handle);
return codec;
@ -102,7 +93,7 @@ static snd_codec_t *S_FindCodecForFile(const char *filename)
while(codec)
{
if(0 == strcmp(ext, codec->ext))
if(0 == Q_strcasecmp(ext, codec->ext))
return codec;
codec = codec->next;
}

2
Quake/snd_codec_wav.c
View file

@ -204,7 +204,7 @@ void *S_WAV_CodecLoad(const char *filename, snd_info_t *info)
void *buffer;
// Try to open the file
Sys_FileOpenRead(filename, &file);
COM_OpenFile(filename, &file);
if(file == -1)
{
Con_Printf( "ERROR: Could not open \"%s\"\n",