mirror of
https://github.com/nzp-team/fteqw.git
synced 2024-11-13 07:47:45 +00:00
Don't force sound/ infront of sound file names.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2001 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
a28b3f657b
commit
b54b52f8cc
1 changed files with 5 additions and 2 deletions
|
@ -265,6 +265,7 @@ sfxcache_t *S_LoadSound (sfx_t *s)
|
||||||
//Con_Printf ("S_LoadSound: %x\n", (int)stackbuf);
|
//Con_Printf ("S_LoadSound: %x\n", (int)stackbuf);
|
||||||
// load it in
|
// load it in
|
||||||
|
|
||||||
|
data = NULL;
|
||||||
if (*name == '*')
|
if (*name == '*')
|
||||||
{
|
{
|
||||||
Q_strcpy(namebuffer, "players/male/"); //q2
|
Q_strcpy(namebuffer, "players/male/"); //q2
|
||||||
|
@ -276,17 +277,19 @@ sfxcache_t *S_LoadSound (sfx_t *s)
|
||||||
{
|
{
|
||||||
Q_strcpy(namebuffer, "sound/");
|
Q_strcpy(namebuffer, "sound/");
|
||||||
Q_strcat(namebuffer, name);
|
Q_strcat(namebuffer, name);
|
||||||
|
data = COM_LoadStackFile(name, stackbuf, sizeof(stackbuf));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Con_Printf ("loading %s\n",namebuffer);
|
// Con_Printf ("loading %s\n",namebuffer);
|
||||||
|
|
||||||
data = COM_LoadStackFile(namebuffer, stackbuf, sizeof(stackbuf));
|
if (!data)
|
||||||
|
data = COM_LoadStackFile(namebuffer, stackbuf, sizeof(stackbuf));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!data)
|
if (!data)
|
||||||
{
|
{
|
||||||
//FIXME: check to see if qued for download.
|
//FIXME: check to see if qued for download.
|
||||||
Con_Printf ("Couldn't load %s\n", namebuffer);
|
Con_DPrintf ("Couldn't load %s\n", namebuffer);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue