aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/scriptdebug.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2019-05-27 14:41:54 +0300
committerFilippos Karapetis2019-05-27 14:53:41 +0300
commit9da3d22703a0dc230d505e9839c3e33cc313b403 (patch)
treeace8fe6b3c9a5f6c0170745902e7048f0d67aec4 /engines/sci/engine/scriptdebug.cpp
parent87e13a50488fea398885eae8c46e01898a9fe41f (diff)
downloadscummvm-rg350-9da3d22703a0dc230d505e9839c3e33cc313b403.tar.gz
scummvm-rg350-9da3d22703a0dc230d505e9839c3e33cc313b403.tar.bz2
scummvm-rg350-9da3d22703a0dc230d505e9839c3e33cc313b403.zip
SCI: Fix MSVC warnings
- Remove unused parameters - Initialize potentially uninitialized variables - Use Common::String instead of a fixed buffer - Remove redundant parentheses - Change float suffix to be uppercase - Fix spacing - Fix integer left shifts with boolean variables - Fix potential division by zero - Fix missing breaks
Diffstat (limited to 'engines/sci/engine/scriptdebug.cpp')
-rw-r--r--engines/sci/engine/scriptdebug.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index 2bb58d4ff2..bf6372bf8e 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -370,6 +370,8 @@ reg_t disassemble(EngineState *s, reg_t pos, const Object *obj, bool printBWTag,
case kSelectorNone:
debugN("INVALID");
break;
+ default:
+ break;
}
}
@@ -938,6 +940,8 @@ void debugSelectorCall(reg_t send_obj, Selector selector, int argc, StackPtr arg
}
}
break;
+ default:
+ break;
} // switch
}
@@ -1039,7 +1043,7 @@ void logKernelCall(const KernelFunction *kernelCall, const KernelSubFunction *ke
// TODO: Any other segment types which could
// use special handling?
- if (kernelCall->function == kSaid) {
+ if (kernelCall->function == &kSaid) {
SegmentRef saidSpec = s->_segMan->dereference(argv[parmNr]);
if (saidSpec.isRaw) {
debugN(" ('");
@@ -1085,7 +1089,8 @@ void logBacktrace() {
switch (call.type) {
case EXEC_STACK_TYPE_CALL: // Normal function
if (call.type == EXEC_STACK_TYPE_CALL)
- con->debugPrintf(" %x: script %d - ", i, s->_segMan->getScript(call.addr.pc.getSegment())->getScriptNumber());
+ con->debugPrintf(" %x: script %d - ", i, s->_segMan->getScript(call.addr.pc.getSegment())->getScriptNumber());
+
if (call.debugSelector != -1) {
con->debugPrintf("%s::%s(", objname, g_sci->getKernel()->getSelectorName(call.debugSelector).c_str());
} else if (call.debugExportId != -1) {