From 10b0bba53efcb52eec0d2b90168e708719ed899c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 8 Oct 2021 19:22:21 +0200 Subject: [PATCH] - fixed warnings in Exhumed. --- source/games/exhumed/src/2d.cpp | 2 +- source/games/exhumed/src/movie.cpp | 2 +- source/games/exhumed/src/mummy.cpp | 2 +- source/games/exhumed/src/ramses.cpp | 2 +- source/games/exhumed/src/sequence.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/games/exhumed/src/2d.cpp b/source/games/exhumed/src/2d.cpp index 5803637a3..49e71090b 100644 --- a/source/games/exhumed/src/2d.cpp +++ b/source/games/exhumed/src/2d.cpp @@ -418,7 +418,7 @@ static const char * const cinpalfname[] = { void uploadCinemaPalettes() { - for (int i = 0; i < countof(cinpalfname); i++) + for (unsigned i = 0; i < countof(cinpalfname); i++) { uint8_t palette[768] = {}; auto hFile = fileSystem.OpenFileReader(cinpalfname[i]); diff --git a/source/games/exhumed/src/movie.cpp b/source/games/exhumed/src/movie.cpp index a184e03e8..78871efde 100644 --- a/source/games/exhumed/src/movie.cpp +++ b/source/games/exhumed/src/movie.cpp @@ -193,7 +193,7 @@ public: LMFPlayer* pId = (LMFPlayer*)userdata; memcpy(buff, &pId->audio.samples[pId->audio.nRead], len); pId->audio.nRead += len / 2; - if (pId->audio.nRead >= countof(pId->audio.samples)) pId->audio.nRead = 0; + if (pId->audio.nRead >= (int)countof(pId->audio.samples)) pId->audio.nRead = 0; return true; } diff --git a/source/games/exhumed/src/mummy.cpp b/source/games/exhumed/src/mummy.cpp index 18115b924..df919f13f 100644 --- a/source/games/exhumed/src/mummy.cpp +++ b/source/games/exhumed/src/mummy.cpp @@ -144,7 +144,7 @@ void CheckMummyRevive(short nMummy) for (unsigned i = 0; i < MummyList.Size(); i++) { - if (i != nMummy) + if ((int)i != nMummy) { short nSprite2 = MummyList[i].nSprite; if (sprite[nSprite2].statnum != 102) { diff --git a/source/games/exhumed/src/ramses.cpp b/source/games/exhumed/src/ramses.cpp index 270006fad..baf16cd26 100644 --- a/source/games/exhumed/src/ramses.cpp +++ b/source/games/exhumed/src/ramses.cpp @@ -183,7 +183,7 @@ void CopyHeadToWorkTile(short nTile) const uint8_t* pSrc = tilePtr(nTile); uint8_t *pDest = &Worktile[212 * 49 + 53]; - for (int i = 0; i < kSpiritY; i++) + for (unsigned i = 0; i < kSpiritY; i++) { memcpy(pDest, pSrc, kSpiritX); diff --git a/source/games/exhumed/src/sequence.cpp b/source/games/exhumed/src/sequence.cpp index 39414e89e..a4fcfb373 100644 --- a/source/games/exhumed/src/sequence.cpp +++ b/source/games/exhumed/src/sequence.cpp @@ -167,7 +167,7 @@ int seq_ReadSequence(const char *seqName) return 0; } - short tag; + unsigned short tag; hFile.Read(&tag, sizeof(tag)); if (tag < MAKE_ID('I', 'H', 0, 0) || (tag > MAKE_ID('I', 'H', 0, 0) && tag != MAKE_ID('D', 'S', 0, 0))) {