aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2010-09-02 18:58:25 +0000
committerFilippos Karapetis2010-09-02 18:58:25 +0000
commit2f88eec7139fa07a277f21586ecf078e67a7b179 (patch)
treeb86b6fe78b9ce653e90e5b5aac7556255464d185
parenta816a27928d2686a27c9600bb93e39a557131a17 (diff)
downloadscummvm-rg350-2f88eec7139fa07a277f21586ecf078e67a7b179.tar.gz
scummvm-rg350-2f88eec7139fa07a277f21586ecf078e67a7b179.tar.bz2
scummvm-rg350-2f88eec7139fa07a277f21586ecf078e67a7b179.zip
SCI: Fixed compilation when VM_DEBUG_SEND is enabled
svn-id: r52498
-rw-r--r--engines/sci/engine/vm.cpp23
1 files changed, 11 insertions, 12 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index e611349471..b03b1a8f20 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -482,17 +482,6 @@ ExecStack *send_selector(EngineState *s, reg_t send_obj, reg_t work_obj, StackPt
case kSelectorMethod:
-#ifdef VM_DEBUG_SEND
- if (_debugState._activeBreakpointTypes & BREAK_SELECTOREXEC)
- g_sci->checkSelectorBreakpoint(BREAK_SELECTOREXEC, send_obj, selector);
- printf("Funcselector(");
- for (int i = 0; i < argc; i++) {
- printf("%04x:%04x", PRINT_REG(argp[i+1]));
- if (i + 1 < argc)
- printf(", ");
- }
- printf(") at %04x:%04x\n", PRINT_REG(funcp));
-#endif // VM_DEBUG_SEND
#ifndef VM_DEBUG_SEND
if (activeBreakpointTypes & BREAK_SELECTOREXEC) {
if (g_sci->checkSelectorBreakpoint(BREAK_SELECTOREXEC, send_obj, selector)) {
@@ -518,8 +507,18 @@ ExecStack *send_selector(EngineState *s, reg_t send_obj, reg_t work_obj, StackPt
}
printf("\n");
}
-#endif
}
+#else // VM_DEBUG_SEND
+ if (activeBreakpointTypes & BREAK_SELECTOREXEC)
+ g_sci->checkSelectorBreakpoint(BREAK_SELECTOREXEC, send_obj, selector);
+ printf("Funcselector(");
+ for (int i = 0; i < argc; i++) {
+ printf("%04x:%04x", PRINT_REG(argp[i+1]));
+ if (i + 1 < argc)
+ printf(", ");
+ }
+ printf(") at %04x:%04x\n", PRINT_REG(funcp));
+#endif // VM_DEBUG_SEND
{
CallsStruct call;