- 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:
Randy Heit 2008-04-03 03:19:21 +00:00
commit d2c275bbb3
24 changed files with 65 additions and 32 deletions

View file

@ -91,10 +91,10 @@ FScanner::FScanner(const FScanner &other)
//
//==========================================================================
FScanner::FScanner(int lumpnum, const char *name)
FScanner::FScanner(int lumpnum)
{
ScriptOpen = false;
OpenLumpNum(lumpnum, name);
OpenLumpNum(lumpnum);
}
//==========================================================================
@ -169,7 +169,7 @@ void FScanner::Open (const char *name)
{
I_Error("Could not find script lump '%s'\n", name);
}
OpenLumpNum(lump, name);
OpenLumpNum(lump);
}
//==========================================================================
@ -219,14 +219,14 @@ void FScanner::OpenMem (const char *name, char *buffer, int size)
//
//==========================================================================
void FScanner :: OpenLumpNum (int lump, const char *name)
void FScanner :: OpenLumpNum (int lump)
{
Close ();
{
FMemLump mem = Wads.ReadLump(lump);
ScriptBuffer = mem.GetString();
}
ScriptName = name;
ScriptName = Wads.GetLumpFullPath(lump);
PrepareScript ();
}