thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Fix warnings

Browse source
This commit is contained in:
Filippos Karapetis 2012-06-21 22:24:22 +03:00
parent 105fb47c89
commit 76f3f1b136
3 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
engines/sci/console.cpp
View file

@ -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));