OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

SVN r258 (trunk)

Browse source
This commit is contained in:
Christoph Oelckers 2006-07-16 09:10:45 +00:00
commit ecce60e8f9
90 changed files with 326 additions and 309 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/s_advsound.cpp
View file

@ -439,8 +439,9 @@ int S_FindSoundTentative (const char *name)
int S_AddSound (const char *logicalname, const char *lumpname)
{
return S_AddSound (logicalname,
lumpname ? Wads.CheckNumForName (lumpname, ns_sounds) : -1);
int lump = Wads.CheckNumForFullName (lumpname);
if (lump == -1) lump = Wads.CheckNumForName (lumpname, ns_sounds);
return S_AddSound (logicalname, lump);
}
static int S_AddSound (const char *logicalname, int lumpnum)
@ -493,8 +494,15 @@ static int S_AddSound (const char *logicalname, int lumpnum)
int S_AddPlayerSound (const char *pclass, int gender, int refid,
const char *lumpname)
{
return S_AddPlayerSound (pclass, gender, refid,
lumpname ? Wads.CheckNumForName (lumpname, ns_sounds) : -1);
int lump;
if (lumpname)
{
lump = Wads.CheckNumForFullName (lumpname);
if (lump == -1) lump = Wads.CheckNumForName (lumpname, ns_sounds);
}
return S_AddPlayerSound (pclass, gender, refid, lump);
}
int S_AddPlayerSound (const char *pclass, int gender, int refid, int lumpnum, bool fromskin)