- the fourth.
This commit is contained in:
Christoph Oelckers
parent
6dee9ff566
commit
8ab562ef13
107 changed files with 1041 additions and 1041 deletions
|
|
@ -187,10 +187,10 @@ void FWadCollection::InitMultipleFiles (TArray<FString> &filenames)
|
|||
FixMacHexen();
|
||||
|
||||
// [RH] Set up hash table
|
||||
FirstLumpIndex = new DWORD[NumLumps];
|
||||
NextLumpIndex = new DWORD[NumLumps];
|
||||
FirstLumpIndex_FullName = new DWORD[NumLumps];
|
||||
NextLumpIndex_FullName = new DWORD[NumLumps];
|
||||
FirstLumpIndex = new uint32_t[NumLumps];
|
||||
NextLumpIndex = new uint32_t[NumLumps];
|
||||
FirstLumpIndex_FullName = new uint32_t[NumLumps];
|
||||
NextLumpIndex_FullName = new uint32_t[NumLumps];
|
||||
InitHashChains ();
|
||||
LumpInfo.ShrinkToFit();
|
||||
Files.ShrinkToFit();
|
||||
|
|
@ -268,10 +268,10 @@ void FWadCollection::AddFile (const char *filename, FileReader *wadinfo)
|
|||
|
||||
if (resfile != NULL)
|
||||
{
|
||||
DWORD lumpstart = LumpInfo.Size();
|
||||
uint32_t lumpstart = LumpInfo.Size();
|
||||
|
||||
resfile->SetFirstLump(lumpstart);
|
||||
for (DWORD i=0; i < resfile->LumpCount(); i++)
|
||||
for (uint32_t i=0; i < resfile->LumpCount(); i++)
|
||||
{
|
||||
FResourceLump *lump = resfile->GetLump(i);
|
||||
FWadCollection::LumpRecord *lump_p = &LumpInfo[LumpInfo.Reserve(1)];
|
||||
|
|
@ -286,7 +286,7 @@ void FWadCollection::AddFile (const char *filename, FileReader *wadinfo)
|
|||
}
|
||||
Files.Push(resfile);
|
||||
|
||||
for (DWORD i=0; i < resfile->LumpCount(); i++)
|
||||
for (uint32_t i=0; i < resfile->LumpCount(); i++)
|
||||
{
|
||||
FResourceLump *lump = resfile->GetLump(i);
|
||||
if (lump->Flags & LUMPF_EMBEDDED)
|
||||
|
|
@ -300,7 +300,7 @@ void FWadCollection::AddFile (const char *filename, FileReader *wadinfo)
|
|||
|
||||
if (hashfile)
|
||||
{
|
||||
BYTE cksum[16];
|
||||
uint8_t cksum[16];
|
||||
char cksumout[33];
|
||||
memset(cksumout, 0, sizeof(cksumout));
|
||||
|
||||
|
|
@ -324,7 +324,7 @@ void FWadCollection::AddFile (const char *filename, FileReader *wadinfo)
|
|||
else
|
||||
fprintf(hashfile, "file: %s, Directory structure\n", filename);
|
||||
|
||||
for (DWORD i = 0; i < resfile->LumpCount(); i++)
|
||||
for (uint32_t i = 0; i < resfile->LumpCount(); i++)
|
||||
{
|
||||
FResourceLump *lump = resfile->GetLump(i);
|
||||
|
||||
|
|
@ -431,7 +431,7 @@ int FWadCollection::CheckNumForName (const char *name, int space)
|
|||
char uname[8];
|
||||
QWORD qname;
|
||||
};
|
||||
DWORD i;
|
||||
uint32_t i;
|
||||
|
||||
if (name == NULL)
|
||||
{
|
||||
|
|
@ -477,7 +477,7 @@ int FWadCollection::CheckNumForName (const char *name, int space, int wadnum, bo
|
|||
char uname[8];
|
||||
QWORD qname;
|
||||
};
|
||||
DWORD i;
|
||||
uint32_t i;
|
||||
|
||||
if (wadnum < 0)
|
||||
{
|
||||
|
|
@ -543,7 +543,7 @@ int FWadCollection::GetNumForName (const char *name, int space)
|
|||
|
||||
int FWadCollection::CheckNumForFullName (const char *name, bool trynormal, int namespc)
|
||||
{
|
||||
DWORD i;
|
||||
uint32_t i;
|
||||
|
||||
if (name == NULL)
|
||||
{
|
||||
|
|
@ -568,7 +568,7 @@ int FWadCollection::CheckNumForFullName (const char *name, bool trynormal, int n
|
|||
|
||||
int FWadCollection::CheckNumForFullName (const char *name, int wadnum)
|
||||
{
|
||||
DWORD i;
|
||||
uint32_t i;
|
||||
|
||||
if (wadnum < 0)
|
||||
{
|
||||
|
|
@ -702,10 +702,10 @@ int FWadCollection::GetLumpFlags (int lump)
|
|||
//
|
||||
//==========================================================================
|
||||
|
||||
DWORD FWadCollection::LumpNameHash (const char *s)
|
||||
uint32_t FWadCollection::LumpNameHash (const char *s)
|
||||
{
|
||||
const DWORD *table = GetCRCTable ();;
|
||||
DWORD hash = 0xffffffff;
|
||||
const uint32_t *table = GetCRCTable ();;
|
||||
uint32_t hash = 0xffffffff;
|
||||
int i;
|
||||
|
||||
for (i = 8; i > 0 && *s; --i, ++s)
|
||||
|
|
@ -769,11 +769,11 @@ void FWadCollection::RenameSprites ()
|
|||
bool renameAll;
|
||||
bool MNTRZfound = false;
|
||||
|
||||
static const DWORD HereticRenames[] =
|
||||
static const uint32_t HereticRenames[] =
|
||||
{ MAKE_ID('H','E','A','D'), MAKE_ID('L','I','C','H'), // Ironlich
|
||||
};
|
||||
|
||||
static const DWORD HexenRenames[] =
|
||||
static const uint32_t HexenRenames[] =
|
||||
{ MAKE_ID('B','A','R','L'), MAKE_ID('Z','B','A','R'), // ZBarrel
|
||||
MAKE_ID('A','R','M','1'), MAKE_ID('A','R','_','1'), // MeshArmor
|
||||
MAKE_ID('A','R','M','2'), MAKE_ID('A','R','_','2'), // FalconShield
|
||||
|
|
@ -790,7 +790,7 @@ void FWadCollection::RenameSprites ()
|
|||
MAKE_ID('I','N','V','U'), MAKE_ID('D','E','F','N'), // Icon of the Defender
|
||||
};
|
||||
|
||||
static const DWORD StrifeRenames[] =
|
||||
static const uint32_t StrifeRenames[] =
|
||||
{ MAKE_ID('M','I','S','L'), MAKE_ID('S','M','I','S'), // lots of places
|
||||
MAKE_ID('A','R','M','1'), MAKE_ID('A','R','M','3'), // MetalArmor
|
||||
MAKE_ID('A','R','M','2'), MAKE_ID('A','R','M','4'), // LeatherArmor
|
||||
|
|
@ -810,7 +810,7 @@ void FWadCollection::RenameSprites ()
|
|||
MAKE_ID('S','P','I','D'), MAKE_ID('S','T','L','K'), // Stalker
|
||||
};
|
||||
|
||||
const DWORD *renames;
|
||||
const uint32_t *renames;
|
||||
int numrenames;
|
||||
|
||||
switch (gameinfo.gametype)
|
||||
|
|
@ -837,7 +837,7 @@ void FWadCollection::RenameSprites ()
|
|||
}
|
||||
|
||||
|
||||
for (DWORD i=0; i< LumpInfo.Size(); i++)
|
||||
for (uint32_t i=0; i< LumpInfo.Size(); i++)
|
||||
{
|
||||
// check for full Minotaur animations. If this is not found
|
||||
// some frames need to be renamed.
|
||||
|
|
@ -853,7 +853,7 @@ void FWadCollection::RenameSprites ()
|
|||
|
||||
renameAll = !!Args->CheckParm ("-oldsprites") || nospriterename;
|
||||
|
||||
for (DWORD i = 0; i < LumpInfo.Size(); i++)
|
||||
for (uint32_t i = 0; i < LumpInfo.Size(); i++)
|
||||
{
|
||||
if (LumpInfo[i].lump->Namespace == ns_sprites)
|
||||
{
|
||||
|
|
@ -916,8 +916,8 @@ void FWadCollection::RenameNerve ()
|
|||
return;
|
||||
|
||||
bool found = false;
|
||||
BYTE cksum[16];
|
||||
static const BYTE nerve[16] = { 0x96, 0x7d, 0x5a, 0xe2, 0x3d, 0xaf, 0x45, 0x19,
|
||||
uint8_t cksum[16];
|
||||
static const uint8_t nerve[16] = { 0x96, 0x7d, 0x5a, 0xe2, 0x3d, 0xaf, 0x45, 0x19,
|
||||
0x62, 0x12, 0xae, 0x1b, 0x60, 0x5d, 0xa3, 0xb0 };
|
||||
size_t nervesize = 3819855; // NERVE.WAD's file size
|
||||
int w = IWAD_FILENUM;
|
||||
|
|
@ -1000,24 +1000,24 @@ void FWadCollection::FixMacHexen()
|
|||
|
||||
reader->Seek(0, SEEK_SET);
|
||||
|
||||
BYTE checksum[16];
|
||||
uint8_t checksum[16];
|
||||
MD5Context md5;
|
||||
md5.Update(reader, iwadSize);
|
||||
md5.Final(checksum);
|
||||
|
||||
static const BYTE HEXEN_DEMO_MD5[16] =
|
||||
static const uint8_t HEXEN_DEMO_MD5[16] =
|
||||
{
|
||||
0x92, 0x5f, 0x9f, 0x50, 0x00, 0xe1, 0x7d, 0xc8,
|
||||
0x4b, 0x0a, 0x6a, 0x3b, 0xed, 0x3a, 0x6f, 0x31
|
||||
};
|
||||
|
||||
static const BYTE HEXEN_BETA_MD5[16] =
|
||||
static const uint8_t HEXEN_BETA_MD5[16] =
|
||||
{
|
||||
0x2a, 0xf1, 0xb2, 0x7c, 0xd1, 0x1f, 0xb1, 0x59,
|
||||
0xe6, 0x08, 0x47, 0x2a, 0x1b, 0x53, 0xe4, 0x0e
|
||||
};
|
||||
|
||||
static const BYTE HEXEN_FULL_MD5[16] =
|
||||
static const uint8_t HEXEN_FULL_MD5[16] =
|
||||
{
|
||||
0xb6, 0x81, 0x40, 0xa7, 0x96, 0xf6, 0xfd, 0x7f,
|
||||
0x3a, 0x5d, 0x32, 0x26, 0xa3, 0x2b, 0x93, 0xbe
|
||||
|
|
@ -1340,7 +1340,7 @@ FWadLump *FWadCollection::ReopenLumpNumNewFile (int lump)
|
|||
|
||||
FileReader *FWadCollection::GetFileReader(int wadnum)
|
||||
{
|
||||
if ((DWORD)wadnum >= Files.Size())
|
||||
if ((uint32_t)wadnum >= Files.Size())
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1359,7 +1359,7 @@ const char *FWadCollection::GetWadName (int wadnum) const
|
|||
{
|
||||
const char *name, *slash;
|
||||
|
||||
if ((DWORD)wadnum >= Files.Size())
|
||||
if ((uint32_t)wadnum >= Files.Size())
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1376,7 +1376,7 @@ const char *FWadCollection::GetWadName (int wadnum) const
|
|||
|
||||
int FWadCollection::GetFirstLump (int wadnum) const
|
||||
{
|
||||
if ((DWORD)wadnum >= Files.Size())
|
||||
if ((uint32_t)wadnum >= Files.Size())
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1391,7 +1391,7 @@ int FWadCollection::GetFirstLump (int wadnum) const
|
|||
|
||||
int FWadCollection::GetLastLump (int wadnum) const
|
||||
{
|
||||
if ((DWORD)wadnum >= Files.Size())
|
||||
if ((uint32_t)wadnum >= Files.Size())
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue