aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Kołodziejski2004-01-18 20:22:32 +0000
committerPaweł Kołodziejski2004-01-18 20:22:32 +0000
commit856b2dd825228a9577c52d4d2750894f0f97ec77 (patch)
tree0066b4f83945083a180705b6ded598b866cf401d
parentce3e6d7fd850be428eb4ded4668920b57e61dc82 (diff)
downloadscummvm-rg350-856b2dd825228a9577c52d4d2750894f0f97ec77.tar.gz
scummvm-rg350-856b2dd825228a9577c52d4d2750894f0f97ec77.tar.bz2
scummvm-rg350-856b2dd825228a9577c52d4d2750894f0f97ec77.zip
fix warning
svn-id: r12499
-rw-r--r--queen/walk.cpp2
-rw-r--r--scumm/scummvm.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/queen/walk.cpp b/queen/walk.cpp
index 445827052d..8c6957e81e 100644
--- a/queen/walk.cpp
+++ b/queen/walk.cpp
@@ -454,7 +454,7 @@ int16 Walk::findAreaPosition(int16 *x, int16 *y, bool recalibrate) {
// original game, Joe will go to the left door...
uint16 i;
uint16 pos = 1;
- uint32 minDist = ~0;
+ uint32 minDist = (uint32)~0;
const Box *b = &_roomArea[1].box;
for (i = 1; i <= _roomAreaCount; ++i) {
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 89e44e6d93..a85b3bcab0 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -202,9 +202,9 @@ static const ScummGameSettings scumm_settings[] = {
/* Scumm Version 8 */
{"comi", "The Curse of Monkey Island", GID_CMI, 8, MDT_NONE,
- GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEFAULT_TO_1X_SCALER, 0},
+ GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | (uint32)GF_DEFAULT_TO_1X_SCALER, 0},
{"comidemo", "The Curse of Monkey Island (Demo)", GID_CMI, 8, MDT_NONE,
- GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEFAULT_TO_1X_SCALER | GF_DEMO, "comi"},
+ GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | (uint32)GF_DEFAULT_TO_1X_SCALER | GF_DEMO, "comi"},
/* Note that both full versions of Humongous games and demos were often released for
* several interpreter versions... */