diff --git a/Source/monster.cpp b/Source/monster.cpp index ea39f9996..63111cb58 100644 --- a/Source/monster.cpp +++ b/Source/monster.cpp @@ -4921,8 +4921,6 @@ BOOL LineClearF1(BOOL(*Clear)(int, int, int), int monst, int x1, int y1, int x2, void SyncMonsterAnim(int i) { MonsterData *MData; - CMonster *cmonst; - unsigned char _uniqtype; int _mdir; MonsterStruct *Monst; diff --git a/Source/mpqapi.cpp b/Source/mpqapi.cpp index 09475ced6..5e50dfdf0 100644 --- a/Source/mpqapi.cpp +++ b/Source/mpqapi.cpp @@ -521,8 +521,8 @@ BOOL ParseMPQHeader(_FILEHEADER *pHdr, int *pdwNextFileStart) *pdwNextFileStart = size; if (size == -1 - || size < sizeof(pHdr) - || !ReadFile(sghArchive, pHdr, sizeof(pHdr), &NumberOfBytesRead, NULL) + || size < sizeof(*pHdr) + || !ReadFile(sghArchive, pHdr, sizeof(*pHdr), &NumberOfBytesRead, NULL) || NumberOfBytesRead != 104 || pHdr->signature != '\x1AQPM' || pHdr->headersize != 32 @@ -539,7 +539,7 @@ BOOL ParseMPQHeader(_FILEHEADER *pHdr, int *pdwNextFileStart) if (!SetEndOfFile(sghArchive)) return FALSE; - memset(pHdr, 0, sizeof(pHdr)); + memset(pHdr, 0, sizeof(*pHdr)); pHdr->signature = '\x1AQPM'; pHdr->headersize = 32; pHdr->sectorsizeid = 3;