mirror of
https://git.do.srb2.org/STJr/UltimateZoneBuilder.git
synced 2025-01-18 22:41:46 +00:00
When strict patches loading is off, colormaps can now also be found outside C_START and C_END when a base resource defines them correctly in between C_START and C_END (or in the Colormaps subdirectory)
This commit is contained in:
parent
18dccfd87f
commit
041a4b8a57
1 changed files with 13 additions and 3 deletions
|
@ -276,12 +276,22 @@ namespace CodeImp.DoomBuilder.Data
|
||||||
// Error when suspended
|
// Error when suspended
|
||||||
if(issuspended) throw new Exception("Data reader is suspended");
|
if(issuspended) throw new Exception("Data reader is suspended");
|
||||||
|
|
||||||
|
// Strictly read patches only between C_START and C_END?
|
||||||
|
if(strictpatches)
|
||||||
|
{
|
||||||
// Find the lump in ranges
|
// Find the lump in ranges
|
||||||
foreach(LumpRange range in colormapranges)
|
foreach(LumpRange range in colormapranges)
|
||||||
{
|
{
|
||||||
lump = file.FindLump(pname, range.start, range.end);
|
lump = file.FindLump(pname, range.start, range.end);
|
||||||
if(lump != null) return lump.Stream;
|
if(lump != null) return lump.Stream;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Find the lump anywhere
|
||||||
|
lump = file.FindLump(pname);
|
||||||
|
if(lump != null) return lump.Stream;
|
||||||
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue