diff --git a/source/games/exhumed/src/aistuff.h b/source/games/exhumed/src/aistuff.h index 9bf25a247..f8f521c6a 100644 --- a/source/games/exhumed/src/aistuff.h +++ b/source/games/exhumed/src/aistuff.h @@ -730,7 +730,7 @@ struct Snake short sC; short nRun; - char c[8]; + uint8_t c[8]; short sE; short nSnakePlayer; }; diff --git a/source/games/exhumed/src/engine.h b/source/games/exhumed/src/engine.h index 4b865cfa3..0e6e76450 100644 --- a/source/games/exhumed/src/engine.h +++ b/source/games/exhumed/src/engine.h @@ -110,7 +110,6 @@ void FixPalette(); int HavePLURemap(); uint8_t RemapPLU(uint8_t pal); -//extern unsigned char kenpal[]; extern short overscanindex; extern char *origpalookup[]; @@ -129,7 +128,7 @@ void DrawMap(double const smoothratio); void InitRandom(); int RandomBit(); -char RandomByte(); +uint8_t RandomByte(); uint16_t RandomWord(); int RandomLong(); int RandomSize(int nSize); diff --git a/source/games/exhumed/src/light.cpp b/source/games/exhumed/src/light.cpp index 84db404ec..2456e0f1c 100644 --- a/source/games/exhumed/src/light.cpp +++ b/source/games/exhumed/src/light.cpp @@ -46,9 +46,7 @@ const char *GradList[kMaxGrads] = { int rtint = 0; int gtint = 0; int btint = 0; -//char *origpalookup[kMaxPalookups]; -//unsigned char curpal[768]; -//unsigned char kenpal[768]; + palette_t *fadedestpal; palette_t *fadecurpal; short nPalDelay; diff --git a/source/games/exhumed/src/object.cpp b/source/games/exhumed/src/object.cpp index 0a1653f2e..e4d29a135 100644 --- a/source/games/exhumed/src/object.cpp +++ b/source/games/exhumed/src/object.cpp @@ -50,7 +50,7 @@ struct TrailPoint { int x; int y; - char nTrailPointVal; + uint8_t nTrailPointVal; short nTrailPointPrev; short nTrailPointNext; @@ -59,8 +59,8 @@ struct TrailPoint struct Bob { int nSector; - char field_2; - char field_3; + uint8_t field_2; + uint8_t field_3; int z; short sBobID; diff --git a/source/games/exhumed/src/random.cpp b/source/games/exhumed/src/random.cpp index f709aeef7..d0fbb3991 100644 --- a/source/games/exhumed/src/random.cpp +++ b/source/games/exhumed/src/random.cpp @@ -52,9 +52,9 @@ int RandomBit() return (((randA == 0) & randC) | (randB & randA)) & 1; } -char RandomByte() +uint8_t RandomByte() { - char randByte = RandomBit() << 7; + uint8_t randByte = RandomBit() << 7; randByte |= RandomBit() << 6; randByte |= RandomBit() << 5; randByte |= RandomBit() << 4; @@ -67,7 +67,7 @@ char RandomByte() uint16_t RandomWord() { - short randWord = RandomByte() << 8; + uint16_t randWord = RandomByte() << 8; randWord |= RandomByte(); return randWord; }