OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- lump flags cleanup.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-11 13:16:15 +02:00
commit ef300a9ea8
11 changed files with 20 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/gamedata/resourcefiles/file_rff.cpp
View file

@ -159,7 +159,7 @@ bool FRFFFile::Open(bool quiet)
Lumps[i].Owner = this;
if (lumps[i].Flags & 0x10)
{
Lumps[i].Flags |= LUMPF_BLOODCRYPT;
Lumps[i].Flags |= LUMPF_COMPRESSED; // flags the lump as not directly usable
}
Lumps[i].IndexNum = LittleLong(lumps[i].IndexNum);
// Rearrange the name and extension to construct the fullname.
@ -207,7 +207,7 @@ FileReader *FRFFLump::GetReader()
{
// Don't return the reader if this lump is encrypted
// In that case always force caching of the lump
if (!(Flags & LUMPF_BLOODCRYPT))
if (!(Flags & LUMPF_COMPRESSED))
{
return FUncompressedLump::GetReader();
}
@ -227,7 +227,7 @@ int FRFFLump::FillCache()
{
int res = FUncompressedLump::FillCache();
if (Flags & LUMPF_BLOODCRYPT)
if (Flags & LUMPF_COMPRESSED)
{
int cryptlen = MIN<int> (LumpSize, 256);
uint8_t *data = (uint8_t *)Cache;