OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

SVN r27 (trunk)

Browse source
This commit is contained in:
Christoph Oelckers 2006-04-11 16:27:41 +00:00
commit 25f90d6221
74 changed files with 1133 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/s_advsound.cpp
View file

@ -520,6 +520,47 @@ int S_DupPlayerSound (const char *pclass, int gender, int refid, int aliasref)
return S_AddPlayerSoundExisting (pclass, gender, refid, aliasto);
}
//==========================================================================
//
// S_ClearSoundData
//
// clears all sound tables
// When we want to allow level specific SNDINFO lumps this has to
// be cleared for each level
//==========================================================================
static void S_ClearSoundData()
{
int i;
S_sfx.Clear();
for(i=0;i<256;i++)
{
if (Ambients[i]) delete Ambients[i];
Ambients[i]=NULL;
}
for(i=0;i<S_rnd.Size();i++)
{
delete[] S_rnd[i].Sounds;
}
while (MusicVolumes != NULL)
{
FMusicVolume * me = MusicVolumes;
MusicVolumes = me->Next;
delete me;
}
S_rnd.Clear();
DoneReserving=false;
NumPlayerReserves=0;
PlayerClassesIsSorted=false;
PlayerClasses.Clear();
PlayerSounds.Clear();
DefPlayerClass=0;
*DefPlayerClassName=0;
}
//==========================================================================
//
// S_ParseSndInfo
@ -532,6 +573,8 @@ void S_ParseSndInfo ()
{
int lump;
S_ClearSoundData(); // remove old sound data first!
CurrentPitchMask = 0;
S_AddSound ("{ no sound }", "DSEMPTY"); // Sound 0 is no sound at all
for (lump = 0; lump < Wads.GetNumLumps(); ++lump)
@ -576,6 +619,26 @@ void S_ParseSndInfo ()
sfx_empty = Wads.CheckNumForName ("dsempty");
}
//==========================================================================
//
// Adds a level specific SNDINFO lump
//
//==========================================================================
void S_AddLocalSndInfo(int lump)
{
S_AddSNDINFO(lump);
S_HashSounds ();
S_sfx.ShrinkToFit ();
if (S_rnd.Size() > 0)
{
S_rnd.ShrinkToFit ();
}
S_ShrinkPlayerSoundLists ();
}
//==========================================================================
//
// S_AddSNDINFO