aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorD G Turner2018-11-14 02:00:31 +0000
committerD G Turner2018-11-14 02:00:31 +0000
commitdcfc00dba465f2415c85ec525f398a5189b1483f (patch)
tree32734aac7b4558eb6f9674954f0e1760c7baac9a
parent0b7ec3af00f91e490fac9985a301d0682d0d91c7 (diff)
downloadscummvm-rg350-dcfc00dba465f2415c85ec525f398a5189b1483f.tar.gz
scummvm-rg350-dcfc00dba465f2415c85ec525f398a5189b1483f.tar.bz2
scummvm-rg350-dcfc00dba465f2415c85ec525f398a5189b1483f.zip
CRYO: Fix Comparison Always True Compiler Warnings.
These occurred while compiling in Raspberry Pi Raspbian latest and appear to be due to char being interpreted as unsigned by default, rather than signed in two data structures. Have replaced with explicit types to avoid this issue.
-rw-r--r--engines/cryo/defs.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/cryo/defs.h b/engines/cryo/defs.h
index 617172d6e6..370dfc46a5 100644
--- a/engines/cryo/defs.h
+++ b/engines/cryo/defs.h
@@ -367,10 +367,10 @@ enum DialogType {
}
struct Dialog {
- char _flags; // 0-3 - action index, 4 - highest bit of contidion index, rest is DialogFlags
- char _condNumLow; // condition index low bits
- char _textCondHiMask; // 0-1 text index hi bits, 2-5 - perso mask num, 6-7 condition index hi bits
- char _textNumLow; // text line index low bits
+ int8 _flags; // 0-3 - action index, 4 - highest bit of contidion index, rest is DialogFlags
+ int8 _condNumLow; // condition index low bits
+ int8 _textCondHiMask; // 0-1 text index hi bits, 2-5 - perso mask num, 6-7 condition index hi bits
+ int8 _textNumLow; // text line index low bits
};
struct tape_t {
@@ -383,8 +383,8 @@ struct tape_t {
};
struct Follower { // Characters on Mirror screen
- char _id; // character
- char _spriteNum; // sprite number
+ int8 _id; // character
+ int8 _spriteNum; // sprite number
int16 sx;
int16 sy;
int16 ex;