okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Partially applied patch from Joerg Dietrich. Fixes:

Browse source 
- incorrect handling of file names when opening sound files by name without extension
 - byte endian issues in ogg decoder.
This commit is contained in:
Thilo Schulz 2006-06-01 00:14:56 +00:00
parent 997dffc649
commit 503c0a22c6
2 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
code/client/snd_codec.c
View file

@ -33,13 +33,16 @@ S_FileExtension
*/
static char *S_FileExtension(const char *fni)
{
char *fn = (char *)fni;
// we should search from the ending to the last '/'
char *fn = (char *) fni + strlen(fni) - 1;
char *eptr = NULL;
while(*fn)
while(*fn != '/' && fn != fni)
{
if(*fn == '.')
eptr = fn;
fn++;
fn--;
}
return eptr;
@ -63,8 +66,10 @@ static snd_codec_t *S_FindCodecForFile(const char *filename)
while(codec)
{
char fn[MAX_QPATH];
Q_strncpyz(fn, filename, sizeof(fn) - 4);
COM_DefaultExtension(fn, sizeof(fn), codec->ext);
// there is no extension so we do not need to subtract 4 chars
Q_strncpyz(fn, filename, MAX_QPATH);
COM_DefaultExtension(fn, MAX_QPATH, codec->ext);
// Check it exists
if(FS_ReadFile(fn, NULL) != -1)