MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up some magic values

Browse source
This commit is contained in:
Anders Jenbo 2021-01-02 22:34:32 +01:00
commit e2a98b75fe
3 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

54
Source/mpqapi.cpp
View file

@ -15,6 +15,10 @@ _BLOCKENTRY *sgpBlockTbl;
/** Is the savegame-file currently open. */
BOOLEAN save_archive_open;
#define INDEX_ENTRIES 2048
#define BLOCK_TABLE_SIZE (INDEX_ENTRIES * sizeof(_BLOCKENTRY))
#define HASH_TABLE_SIZE (INDEX_ENTRIES * sizeof(_HASHENTRY))
//note: 32872 = 32768 + 104 (sizeof(_FILEHEADER))
/* data */
@ -159,7 +163,7 @@ static _BLOCKENTRY *mpqapi_new_block(int *block_index)
{
_BLOCKENTRY *blockEntry = sgpBlockTbl;
for (DWORD i = 0; i < 2048; i++, blockEntry++) {
for (DWORD i = 0; i < INDEX_ENTRIES; i++, blockEntry++) {
if (blockEntry->offset != 0)
continue;
if (blockEntry->sizealloc != 0)
@ -185,7 +189,7 @@ static void mpqapi_alloc_block(int block_offset, int block_size)
int i;
block = sgpBlockTbl;
i = 2048;
i = INDEX_ENTRIES;
while (i-- != 0) {
if (block->offset && !block->flags && !block->sizefile) {
if (block->offset + block->sizealloc == block_offset) {
@ -223,7 +227,7 @@ static int mpqapi_find_free_block(int size, int *block_size)
int result;
_BLOCKENTRY *pBlockTbl = sgpBlockTbl;
for (int i = 2048; i--; pBlockTbl++) {
for (int i = INDEX_ENTRIES; i--; pBlockTbl++) {
if (pBlockTbl->offset == 0)
continue;
if (pBlockTbl->flags != 0)
@ -254,7 +258,7 @@ static int mpqapi_get_hash_index(int index, int hash_a, int hash_b, int locale)
{
DWORD idx, i;
i = 2048;
i = INDEX_ENTRIES;
for (idx = index & 0x7FF; sgpHashTbl[idx].block != -1; idx = (idx + 1) & 0x7FF) {
if (i-- == 0)
break;
@ -286,8 +290,8 @@ static BOOL WriteMPQHeader()
fhdr.sectorsizeid = 3;
fhdr.hashoffset = 32872;
fhdr.blockoffset = 104;
fhdr.hashcount = 2048;
fhdr.blockcount = 2048;
fhdr.hashcount = INDEX_ENTRIES;
fhdr.blockcount = INDEX_ENTRIES;
if (SetFilePointer(sghArchive, 0, NULL, FILE_BEGIN) == -1)
return FALSE;
@ -305,10 +309,10 @@ static BOOL mpqapi_write_block_table()
if (SetFilePointer(sghArchive, 104, NULL, FILE_BEGIN) == -1)
return FALSE;
Encrypt((DWORD *)sgpBlockTbl, 0x8000, Hash("(block table)", 3));
success = WriteFile(sghArchive, sgpBlockTbl, 0x8000, &NumberOfBytesWritten, 0);
Decrypt((DWORD *)sgpBlockTbl, 0x8000, Hash("(block table)", 3));
return success && NumberOfBytesWritten == 0x8000;
Encrypt((DWORD *)sgpBlockTbl, BLOCK_TABLE_SIZE, Hash("(block table)", 3));
success = WriteFile(sghArchive, sgpBlockTbl, BLOCK_TABLE_SIZE, &NumberOfBytesWritten, 0);
Decrypt((DWORD *)sgpBlockTbl, BLOCK_TABLE_SIZE, Hash("(block table)", 3));
return success && NumberOfBytesWritten == BLOCK_TABLE_SIZE;
}
static BOOL mpqapi_write_hash_table()
@ -319,10 +323,10 @@ static BOOL mpqapi_write_hash_table()
if (SetFilePointer(sghArchive, 32872, NULL, FILE_BEGIN) == -1)
return FALSE;
Encrypt((DWORD *)sgpHashTbl, 0x8000, Hash("(hash table)", 3));
success = WriteFile(sghArchive, sgpHashTbl, 0x8000, &NumberOfBytesWritten, 0);
Decrypt((DWORD *)sgpHashTbl, 0x8000, Hash("(hash table)", 3));
return success && NumberOfBytesWritten == 0x8000;
Encrypt((DWORD *)sgpHashTbl, HASH_TABLE_SIZE, Hash("(hash table)", 3));
success = WriteFile(sghArchive, sgpHashTbl, HASH_TABLE_SIZE, &NumberOfBytesWritten, 0);
Decrypt((DWORD *)sgpHashTbl, HASH_TABLE_SIZE, Hash("(hash table)", 3));
return success && NumberOfBytesWritten == HASH_TABLE_SIZE;
}
static BOOL mpqapi_can_seek()
@ -351,8 +355,8 @@ static BOOL ParseMPQHeader(_FILEHEADER *pHdr, DWORD *pdwNextFileStart)
|| pHdr->filesize != size
|| pHdr->hashoffset != 32872
|| pHdr->blockoffset != 104
|| pHdr->hashcount != 2048
|| pHdr->blockcount != 2048) {
|| pHdr->hashcount != INDEX_ENTRIES
|| pHdr->blockcount != INDEX_ENTRIES) {
if (SetFilePointer(sghArchive, 0, NULL, FILE_BEGIN) == -1)
return FALSE;
@ -418,7 +422,7 @@ static _BLOCKENTRY *mpqapi_add_file(const char *pszName, _BLOCKENTRY *pBlk, int
if (mpqapi_get_hash_index(h1, h2, h3, 0) != -1)
app_fatal("Hash collision between \"%s\" and existing file\n", pszName);
hIdx = h1 & 0x7FF;
i = 2048;
i = INDEX_ENTRIES;
while (i--) {
if (sgpHashTbl[hIdx].block == -1 || sgpHashTbl[hIdx].block == -2)
break;
@ -602,25 +606,25 @@ BOOL OpenMPQ(const char *pszArchive, BOOL hidden, DWORD dwChar)
if (ParseMPQHeader(&fhdr, &sgdwMpqOffset) == FALSE) {
goto on_error;
}
sgpBlockTbl = (_BLOCKENTRY *)DiabloAllocPtr(0x8000);
memset(sgpBlockTbl, 0, 0x8000);
sgpBlockTbl = (_BLOCKENTRY *)DiabloAllocPtr(BLOCK_TABLE_SIZE);
memset(sgpBlockTbl, 0, BLOCK_TABLE_SIZE);
if (fhdr.blockcount) {
if (SetFilePointer(sghArchive, 104, NULL, FILE_BEGIN) == -1)
goto on_error;
if (!ReadFile(sghArchive, sgpBlockTbl, 0x8000, &dwTemp, NULL))
if (!ReadFile(sghArchive, sgpBlockTbl, BLOCK_TABLE_SIZE, &dwTemp, NULL))
goto on_error;
key = Hash("(block table)", 3);
Decrypt((DWORD *)sgpBlockTbl, 0x8000, key);
Decrypt((DWORD *)sgpBlockTbl, BLOCK_TABLE_SIZE, key);
}
sgpHashTbl = (_HASHENTRY *)DiabloAllocPtr(0x8000);
memset(sgpHashTbl, 255, 0x8000);
sgpHashTbl = (_HASHENTRY *)DiabloAllocPtr(HASH_TABLE_SIZE);
memset(sgpHashTbl, 255, HASH_TABLE_SIZE);
if (fhdr.hashcount) {
if (SetFilePointer(sghArchive, 32872, NULL, FILE_BEGIN) == -1)
goto on_error;
if (!ReadFile(sghArchive, sgpHashTbl, 0x8000, &dwTemp, NULL))
if (!ReadFile(sghArchive, sgpHashTbl, HASH_TABLE_SIZE, &dwTemp, NULL))
goto on_error;
key = Hash("(hash table)", 3);
Decrypt((DWORD *)sgpHashTbl, 0x8000, key);
Decrypt((DWORD *)sgpHashTbl, HASH_TABLE_SIZE, key);
}
return TRUE;
}

4
Source/objects.cpp
View file

@ -737,7 +737,7 @@ void LoadMapObjects(BYTE *pMap, int startx, int starty, int x1, int y1, int w, i
InitObjFlag = TRUE;
lm = pMap;
rw = lm[0];
rw = *lm;
lm += 2;
rh = *lm;
mapoff = (rw * rh + 1) * 2;
@ -749,7 +749,7 @@ void LoadMapObjects(BYTE *pMap, int startx, int starty, int x1, int y1, int w, i
for (j = 0; j < rh; j++) {
for (i = 0; i < rw; i++) {
if (*lm) {
type = lm[0];
type = *lm;
AddObject(ObjTypeConv[type], startx + 16 + i, starty + 16 + j);
oi = ObjIndex(startx + 16 + i, starty + 16 + j);
SetObjMapRange(oi, x1, y1, x1 + w, y1 + h, leveridx);

4
Source/stores.cpp
View file

@ -98,7 +98,7 @@ void InitStores()
numpremium = 0;
premiumlevel = 1;
for (i = 0; i < 6; i++)
for (i = 0; i < SMITH_PREMIUM_ITEMS; i++)
premiumitem[i]._itype = ITYPE_NONE;
boyitem._itype = ITYPE_NONE;
@ -592,7 +592,7 @@ BOOL S_StartSPBuy()
int i;
storenumh = 0;
for (i = 0; i < 6; i++) {
for (i = 0; i < SMITH_PREMIUM_ITEMS; i++) {
if (premiumitem[i]._itype != ITYPE_NONE)
storenumh++;
}