- Changed FScanner so that opening a lump gives the complete wad+lump name
rather than a generic one, so identifying errors among files that all have the same lump name no longer involves any degree of guesswork in determining exactly which file the error occurred in. - Added a check to S_ParseSndSeq() for SNDSEQ lumps with unterminated final sequences. - Fixed: Parts of s_sndseq.cpp that scan the Sequences array need NULL pointer checks, in case an improper sequence was encountered during parsing but not early enough to avoid creating a slot for it in the array. SVN r874 (trunk)
This commit is contained in:
parent
b430977adf
commit
d2c275bbb3
24 changed files with 65 additions and 32 deletions
|
|
@ -465,7 +465,7 @@ FArchive &operator<< (FArchive &arc, ReverbContainer *&env)
|
|||
return arc;
|
||||
}
|
||||
|
||||
static void ReadEAX (int lump, const char *lumpname)
|
||||
static void ReadEAX (int lump)
|
||||
{
|
||||
FScanner sc;
|
||||
const ReverbContainer *def;
|
||||
|
|
@ -476,7 +476,7 @@ static void ReadEAX (int lump, const char *lumpname)
|
|||
bool inited[NUM_EAX_FIELDS];
|
||||
BYTE bools[32];
|
||||
|
||||
sc.OpenLumpNum(lump, lumpname);
|
||||
sc.OpenLumpNum(lump);
|
||||
while (sc.GetString ())
|
||||
{
|
||||
name = copystring (sc.String);
|
||||
|
|
@ -576,7 +576,7 @@ void S_ParseSndEax ()
|
|||
|
||||
while ((lump = Wads.FindLump ("SNDEAX", &lastlump)) != -1)
|
||||
{
|
||||
ReadEAX (lump, "SNDEAX");
|
||||
ReadEAX (lump);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue