aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/kmisc.cpp
diff options
context:
space:
mode:
authorWalter van Niftrik2010-02-06 19:41:55 +0000
committerWalter van Niftrik2010-02-06 19:41:55 +0000
commit1e67b56eee611a52f6c7fa9d3b5d17bda741c995 (patch)
tree5338dc4a23fee13053613024ee20bec870bd8603 /engines/sci/engine/kmisc.cpp
parent4cae2b13e2acbd81e4b726f1e409c5615eda7967 (diff)
downloadscummvm-rg350-1e67b56eee611a52f6c7fa9d3b5d17bda741c995.tar.gz
scummvm-rg350-1e67b56eee611a52f6c7fa9d3b5d17bda741c995.tar.bz2
scummvm-rg350-1e67b56eee611a52f6c7fa9d3b5d17bda741c995.zip
SCI: Revert r47925 and put fix inside GC instead.
svn-id: r47940
Diffstat (limited to 'engines/sci/engine/kmisc.cpp')
-rw-r--r--engines/sci/engine/kmisc.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp
index 0c190d0e94..bd1cf587ea 100644
--- a/engines/sci/engine/kmisc.cpp
+++ b/engines/sci/engine/kmisc.cpp
@@ -159,11 +159,7 @@ reg_t kMemorySegment(EngineState *s, int argc, reg_t *argv) {
}
reg_t kFlushResources(EngineState *s, int argc, reg_t *argv) {
- // We used to call run_gc() directly from here. This is no longer safe
- // as we now always add our fake "kernel" stack frame for debugging
- // purposes. Instead of calling run_gc(), we set gc_countdown to 1
- // to make the garbage collector run before the next kernel function.
- s->gc_countdown = 1;
+ run_gc(s);
debugC(2, kDebugLevelRoom, "Entering room number %d", argv[0].toUint16());
return s->r_acc;
}