mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-26 05:51:20 +00:00
- Fixed: Some dmadds wads used zero-length sprites as placeholders. When you
ran dmadds to combine it with the IWAD's sprites, they would be replaced by the IWAD's sprites, so when loading such wads, we should ignore those as valid sprites. (Thanks to entryway for finding this.) See 22ventry's 22sprite.wad for an example. SVN r1782 (trunk)
This commit is contained in:
parent
9aa35cc1b7
commit
78902b2009
2 changed files with 17 additions and 2 deletions
|
@ -1,4 +1,11 @@
|
||||||
August 31, 2009
|
September 1, 2009
|
||||||
|
- Fixed: Some dmadds wads used zero-length sprites as placeholders. When you
|
||||||
|
ran dmadds to combine it with the IWAD's sprites, they would be replaced by
|
||||||
|
the IWAD's sprites, so when loading such wads, we should ignore those as
|
||||||
|
valid sprites. (Thanks to entryway for finding this.) See 22ventry's
|
||||||
|
22sprite.wad for an example.
|
||||||
|
|
||||||
|
August 31, 2009
|
||||||
- Basic Mac support: Everything compiles but does not yet link.
|
- Basic Mac support: Everything compiles but does not yet link.
|
||||||
- Replaced the use of autoconf's WORDS_BIGENDIAN with __BIG_ENDIAN__, since
|
- Replaced the use of autoconf's WORDS_BIGENDIAN with __BIG_ENDIAN__, since
|
||||||
latter comes predefined by GCC.
|
latter comes predefined by GCC.
|
||||||
|
|
|
@ -250,10 +250,18 @@ void FWadFile::SetNamespace(const char *startmarker, const char *endmarker, name
|
||||||
{
|
{
|
||||||
if (!warned)
|
if (!warned)
|
||||||
{
|
{
|
||||||
Printf(TEXTCOLOR_YELLOW"WARNING: Overlapping namespaces found (lump %d.)\n", j);
|
Printf(TEXTCOLOR_YELLOW"WARNING: Overlapping namespaces found (lump %d)\n", j);
|
||||||
}
|
}
|
||||||
warned = true;
|
warned = true;
|
||||||
}
|
}
|
||||||
|
else if (space == ns_sprites && Lumps[j].LumpSize < 8)
|
||||||
|
{
|
||||||
|
// sf 26/10/99:
|
||||||
|
// ignore sprite lumps smaller than 8 bytes (the smallest possible)
|
||||||
|
// in size -- this was used by some dmadds wads
|
||||||
|
// as an 'empty' graphics resource
|
||||||
|
DPrintf(" Skipped empty sprite %s (lump %d)\n", Lumps[j].Name, j);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Lumps[j].Namespace = space;
|
Lumps[j].Namespace = space;
|
||||||
|
|
Loading…
Reference in a new issue