OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added Gez's A_CheckCeiling submission.

Browse source 
- Fixed: AM_NewResolution crashed when called from outside a level.
- Added support for Quake PAK files.
- Improved warning messages for WAD files with incorrect marker usage.


SVN r1556 (trunk)
This commit is contained in:
Christoph Oelckers 2009-04-23 23:20:21 +00:00
commit 19c4e3caed
7 changed files with 226 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/resourcefiles/file_wad.cpp
View file

@ -169,7 +169,14 @@ void FWadFile::SetNamespace(const char *startmarker, const char *endmarker, name
break;
}
}
if (end == -1) return;
if (end == -1)
{
if (start != -1)
{
Printf(TEXTCOLOR_YELLOW"WARNING: %s marker without corresponding %s found.\n", startmarker, endmarker);
}
return;
}
if (start != -1)
{
@ -197,16 +204,19 @@ void FWadFile::SetNamespace(const char *startmarker, const char *endmarker, name
}
}
}
else if (flathack)
else
{
Printf(TEXTCOLOR_YELLOW"WARNING: %s marker without corresponding %s found.\n", endmarker, startmarker);
for(int i = 0; i < end; i++)
if (flathack)
{
if (Lumps[i].LumpSize == 4096)
for(int i = 0; i < end; i++)
{
// We can't add this to the flats namespace but
// it needs to be flagged for the texture manager.
Lumps[i].Flags |= LUMPF_MAYBEFLAT;
if (Lumps[i].LumpSize == 4096)
{
// We can't add this to the flats namespace but
// it needs to be flagged for the texture manager.
Lumps[i].Flags |= LUMPF_MAYBEFLAT;
}
}
}
}