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

24
src/s_sndseq.cpp
View file

@ -369,7 +369,7 @@ static void AssignHexenTranslations (void)
//
//==========================================================================
void S_ParseSndSeq (void)
void S_ParseSndSeq (int levellump)
{
int lastlump, lump;
char name[MAX_SNDNAME+1];
@ -377,6 +377,20 @@ void S_ParseSndSeq (void)
int cursize;
int curseq = -1;
// First free the old SNDSEQ data. This allows us to reload this for each level
// and specify a level specific SNDSEQ lump!
if (Sequences)
{
for (int i=0;i<NumSequences;i++)
{
if (Sequences[i]) free(Sequences[i]);
}
free(Sequences);
}
NumSequences=MaxSequences=0;
Sequences=NULL; // must be reinitialized every level!
// be gone, compiler warnings
cursize = 0;
stopsound = 0;
@ -387,8 +401,13 @@ void S_ParseSndSeq (void)
ScriptTemp = (unsigned int *)Malloc (MAX_SEQSIZE * sizeof(*ScriptTemp));
ScriptTempSize = MAX_SEQSIZE;
while ((lump = Wads.FindLump ("SNDSEQ", &lastlump)) != -1)
while (((lump = Wads.FindLump ("SNDSEQ", &lastlump)) != -1 || levellump!=-1) && levellump!=-2)
{
if (lump==-1)
{
lump=levellump;
levellump=-2;
}
SC_OpenLumpNum (lump, "SNDSEQ");
while (SC_GetString ())
{
@ -940,3 +959,4 @@ void DSeqNode::ChangeData (int seqOffset, int delayTics, float volume, int curre
m_SequencePtr += seqOffset;
m_CurrentSoundID = currentSoundID;
}