OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- replaced another large batch of homegrown type use.

Browse source
This commit is contained in:
Christoph Oelckers 2017-03-08 18:44:37 +01:00
commit 6dee9ff566
57 changed files with 656 additions and 656 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/resourcefiles/file_rff.cpp
View file

@ -48,23 +48,23 @@
struct RFFInfo
{
// Should be "RFF\x18"
DWORD Magic;
DWORD Version;
DWORD DirOfs;
DWORD NumLumps;
uint32_t Magic;
uint32_t Version;
uint32_t DirOfs;
uint32_t NumLumps;
};
struct RFFLump
{
DWORD DontKnow1[4];
DWORD FilePos;
DWORD Size;
DWORD DontKnow2;
DWORD Time;
BYTE Flags;
uint32_t DontKnow1[4];
uint32_t FilePos;
uint32_t Size;
uint32_t DontKnow2;
uint32_t Time;
uint8_t Flags;
char Extension[3];
char Name[8];
DWORD IndexNum; // Used by .sfx, possibly others
uint32_t IndexNum; // Used by .sfx, possibly others
};
//==========================================================================
@ -78,7 +78,7 @@ struct FRFFLump : public FUncompressedLump
virtual FileReader *GetReader();
virtual int FillCache();
DWORD IndexNum;
uint32_t IndexNum;
int GetIndexNum() const { return IndexNum; }
};
@ -91,11 +91,11 @@ struct FRFFLump : public FUncompressedLump
void BloodCrypt (void *data, int key, int len)
{
int p = (BYTE)key, i;
int p = (uint8_t)key, i;
for (i = 0; i < len; ++i)
{
((BYTE *)data)[i] ^= (unsigned char)(p+(i>>1));
((uint8_t *)data)[i] ^= (unsigned char)(p+(i>>1));
}
}
@ -153,7 +153,7 @@ bool FRFFFile::Open(bool quiet)
Lumps = new FRFFLump[NumLumps];
if (!quiet && !batchrun) Printf(", %d lumps\n", NumLumps);
for (DWORD i = 0; i < NumLumps; ++i)
for (uint32_t i = 0; i < NumLumps; ++i)
{
Lumps[i].Position = LittleLong(lumps[i].FilePos);
Lumps[i].LumpSize = LittleLong(lumps[i].Size);
@ -230,7 +230,7 @@ int FRFFLump::FillCache()
if (Flags & LUMPF_BLOODCRYPT)
{
int cryptlen = MIN<int> (LumpSize, 256);
BYTE *data = (BYTE *)Cache;
uint8_t *data = (uint8_t *)Cache;
for (int i = 0; i < cryptlen; ++i)
{