aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/console.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2012-06-21 22:24:22 +0300
committerFilippos Karapetis2012-06-21 22:24:22 +0300
commit76f3f1b13621b43781c4a2c505e646d9d52fdab7 (patch)
tree0a449a12fbc95169d3afc05ec681c539719bdf6f /engines/sci/console.cpp
parent105fb47c89e727e9dccd2798afcab7ce290d43fa (diff)
downloadscummvm-rg350-76f3f1b13621b43781c4a2c505e646d9d52fdab7.tar.gz
scummvm-rg350-76f3f1b13621b43781c4a2c505e646d9d52fdab7.tar.bz2
scummvm-rg350-76f3f1b13621b43781c4a2c505e646d9d52fdab7.zip
SCI: Fix warnings
Diffstat (limited to 'engines/sci/console.cpp')
-rw-r--r--engines/sci/console.cpp11
1 files changed, 3 insertions, 8 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));