diff options
author | Filippos Karapetis | 2012-06-21 22:24:22 +0300 |
---|---|---|
committer | Filippos Karapetis | 2012-06-21 22:24:22 +0300 |
commit | 76f3f1b13621b43781c4a2c505e646d9d52fdab7 (patch) | |
tree | 0a449a12fbc95169d3afc05ec681c539719bdf6f /engines | |
parent | 105fb47c89e727e9dccd2798afcab7ce290d43fa (diff) | |
download | scummvm-rg350-76f3f1b13621b43781c4a2c505e646d9d52fdab7.tar.gz scummvm-rg350-76f3f1b13621b43781c4a2c505e646d9d52fdab7.tar.bz2 scummvm-rg350-76f3f1b13621b43781c4a2c505e646d9d52fdab7.zip |
SCI: Fix warnings
Diffstat (limited to 'engines')
-rw-r--r-- | engines/sci/console.cpp | 11 | ||||
-rw-r--r-- | engines/sci/engine/kstring.cpp | 10 | ||||
-rw-r--r-- | engines/sci/engine/scriptdebug.cpp | 6 |
3 files changed, 11 insertions, 16 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 91795117e3..b0ed7e6225 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -2630,11 +2630,11 @@ bool Console::cmdViewReference(int argc, const char **argv) { #endif default: { const SegmentRef block = _engine->_gamestate->_segMan->dereference(reg); - uint32 size = block.maxSize; + uint16 size = block.maxSize; DebugPrintf("raw data\n"); - if (reg_end.getSegment() != 0 && size < reg_end.getOffset() - reg.getOffset()) { + if (reg_end.getSegment() != 0 && (size < reg_end.getOffset() - reg.getOffset())) { DebugPrintf("Block end out of bounds (size %d). Resetting.\n", size); reg_end = NULL_REG; } @@ -2936,7 +2936,7 @@ bool Console::cmdDisassembleAddress(int argc, const char **argv) { uint opCount = 1; bool printBWTag = false; bool printBytes = false; - uint32 size; + uint16 size; if (parse_reg_t(_engine->_gamestate, argv[1], &vpc, false)) { DebugPrintf("Invalid address passed.\n"); @@ -2960,11 +2960,6 @@ bool Console::cmdDisassembleAddress(int argc, const char **argv) { } } - if (opCount < 0) { - DebugPrintf("Invalid op_count\n"); - return true; - } - do { vpc = disassemble(_engine->_gamestate, vpc, printBWTag, printBytes); } while ((vpc.getOffset() > 0) && (vpc.getOffset() + 6 < size) && (--opCount)); diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp index 8d627efacf..9eebf2c88a 100644 --- a/engines/sci/engine/kstring.cpp +++ b/engines/sci/engine/kstring.cpp @@ -96,7 +96,7 @@ reg_t kStrAt(EngineState *s, int argc, reg_t *argv) { byte value; byte newvalue = 0; - unsigned int offset = argv[1].toUint16(); + uint16 offset = argv[1].toUint16(); if (argc > 2) newvalue = argv[2].toSint16(); @@ -125,19 +125,19 @@ reg_t kStrAt(EngineState *s, int argc, reg_t *argv) { if (!oddOffset) { value = tmp.getOffset() & 0x00ff; if (argc > 2) { /* Request to modify this char */ - uint16 offset = tmp.toUint16(); + uint16 tmpOffset = tmp.toUint16(); offset &= 0xff00; offset |= newvalue; - tmp.setOffset(offset); + tmp.setOffset(tmpOffset); tmp.setSegment(0); } } else { value = tmp.getOffset() >> 8; if (argc > 2) { /* Request to modify this char */ - uint16 offset = tmp.toUint16(); + uint16 tmpOffset = tmp.toUint16(); offset &= 0x00ff; offset |= newvalue << 8; - tmp.setOffset(offset); + tmp.setOffset(tmpOffset); tmp.setSegment(0); } } diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index f55884b1c0..d8c05ab04b 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -344,11 +344,11 @@ void SciEngine::scriptDebug() { if (mobj) { Script *scr = (Script *)mobj; const byte *code_buf = scr->getBuf(); - uint32 code_buf_size = scr->getBufSize(); + uint16 code_buf_size = scr->getBufSize(); // TODO: change to a 32-bit integer for large SCI3 scripts int opcode = pc.getOffset() >= code_buf_size ? 0 : code_buf[pc.getOffset()]; int op = opcode >> 1; - int paramb1 = pc.getOffset() + 1 >= code_buf_size ? 0 : code_buf[pc.getOffset() + 1]; - int paramf1 = (opcode & 1) ? paramb1 : (pc.getOffset() + 2 >= code_buf_size ? 0 : (int16)READ_SCI11ENDIAN_UINT16(code_buf + pc.getOffset() + 1)); + uint16 paramb1 = pc.getOffset() + 1 >= code_buf_size ? 0 : code_buf[pc.getOffset() + 1]; + uint16 paramf1 = (opcode & 1) ? paramb1 : (pc.getOffset() + 2 >= code_buf_size ? 0 : (int16)READ_SCI11ENDIAN_UINT16(code_buf + pc.getOffset() + 1)); switch (_debugState.seeking) { case kDebugSeekSpecialCallk: |