OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Removed the unused sfx_ variables for the chainsaw sounds.

Browse source 
- Fixed map name checks in idclev, hxvisit, for +map and the titlemap.
- Changed handling of Zips so that the patches/, graphics/, sounds/ and
  music/ subdirectories no longer are placed in the global namespace. Instead
  new namespaces are defined. These namespaces aren't merged, however and 
  searching in them either returns a lump inside it or one from the global
  namespace when it doesn't come from a Zip file. Proper order of files is
  still observed though. As a result proper use of the directories inside Zips 
  is strictly enforced now so that for example anything used as a patch must be 
  in the patches/ directory and won't be found anywhere else.


SVN r199 (trunk)
This commit is contained in:
Christoph Oelckers 2006-06-19 15:31:10 +00:00
commit cf7d8ab43b
19 changed files with 95 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/s_advsound.cpp
View file

@ -440,7 +440,7 @@ int S_FindSoundTentative (const char *name)
int S_AddSound (const char *logicalname, const char *lumpname)
{
return S_AddSound (logicalname,
lumpname ? Wads.CheckNumForName (lumpname) : -1);
lumpname ? Wads.CheckNumForName (lumpname, ns_sounds) : -1);
}
static int S_AddSound (const char *logicalname, int lumpnum)
@ -494,7 +494,7 @@ int S_AddPlayerSound (const char *pclass, int gender, int refid,
const char *lumpname)
{
return S_AddPlayerSound (pclass, gender, refid,
lumpname ? Wads.CheckNumForName (lumpname) : -1);
lumpname ? Wads.CheckNumForName (lumpname, ns_sounds) : -1);
}
int S_AddPlayerSound (const char *pclass, int gender, int refid, int lumpnum, bool fromskin)
@ -648,15 +648,7 @@ void S_ParseSndInfo ()
S_ShrinkPlayerSoundLists ();
// [RH] Hack for pitch varying
sfx_sawup = S_FindSound ("weapons/sawup");
sfx_sawidl = S_FindSound ("weapons/sawidle");
sfx_sawful = S_FindSound ("weapons/sawfull");
sfx_sawhit = S_FindSound ("weapons/sawhit");
sfx_itemup = S_FindSound ("misc/i_pkup");
sfx_tink = S_FindSound ("misc/chat2");
sfx_empty = Wads.CheckNumForName ("dsempty");
sfx_empty = Wads.CheckNumForName ("dsempty", ns_sounds);
}
//==========================================================================