aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray2004-08-25 07:30:05 +0000
committerJonathan Gray2004-08-25 07:30:05 +0000
commita8a53b1e54e837287d5b27eb44a3cba7354a7063 (patch)
tree708055f7320f353ee52f9ad97241bf2c4db3f880
parent057ea5cba8fe5fbec3a36a98b0eef67e7b3296d3 (diff)
downloadscummvm-rg350-a8a53b1e54e837287d5b27eb44a3cba7354a7063.tar.gz
scummvm-rg350-a8a53b1e54e837287d5b27eb44a3cba7354a7063.tar.bz2
scummvm-rg350-a8a53b1e54e837287d5b27eb44a3cba7354a7063.zip
casts to avoid gcc warnings
svn-id: r14746
-rw-r--r--scumm/script_v72he.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index a63f21420c..b995890f21 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -435,8 +435,8 @@ int ScummEngine_v72he::readArray(int array, int idx2, int idx1) {
if (ah == NULL || ah->data == NULL)
error("readArray: invalid array %d (%d)", array, readVar(array));
- if (idx2 < 0 || idx2 > FROM_LE_32(ah->dim2end) ||
- idx1 < 0 || idx1 > FROM_LE_32(ah->dim1end)) {
+ if (idx2 < 0 || idx2 > (int)FROM_LE_32(ah->dim2end) ||
+ idx1 < 0 || idx1 > (int)FROM_LE_32(ah->dim1end)) {
error("readArray: array %d out of bounds: [%d, %d] exceeds [%d..%d, %d..%d]",
array, idx1, idx2, FROM_LE_32(ah->dim1start), FROM_LE_32(ah->dim1end),
FROM_LE_32(ah->dim2start), FROM_LE_32(ah->dim2end));
@@ -471,8 +471,8 @@ void ScummEngine_v72he::writeArray(int array, int idx2, int idx1, int value) {
if (!ah)
error("writeArray: Invalid array (%d) reference", readVar(array));
- if (idx2 < 0 || idx2 > FROM_LE_32(ah->dim2end) ||
- idx1 < 0 || idx1 > FROM_LE_32(ah->dim1end)) {
+ if (idx2 < 0 || idx2 > (int)FROM_LE_32(ah->dim2end) ||
+ idx1 < 0 || idx1 > (int)FROM_LE_32(ah->dim1end)) {
error("writeArray: array %d out of bounds: [%d, %d] exceeds [%d..%d, %d..%d]",
array, idx1, idx2, FROM_LE_32(ah->dim1start), FROM_LE_32(ah->dim1end),
FROM_LE_32(ah->dim2start), FROM_LE_32(ah->dim2end));