aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorathrxx2011-07-04 19:51:39 +0200
committerathrxx2011-07-04 19:52:14 +0200
commit7e2f7dce3accc2b987fb7938f122aec7c9567882 (patch)
treee324718e8f3d743bef833e636cdf4a44118adb79
parent38d18a6e78e19d12a3d6e56fe5b92821354c3e08 (diff)
downloadscummvm-rg350-7e2f7dce3accc2b987fb7938f122aec7c9567882.tar.gz
scummvm-rg350-7e2f7dce3accc2b987fb7938f122aec7c9567882.tar.bz2
scummvm-rg350-7e2f7dce3accc2b987fb7938f122aec7c9567882.zip
KYRA: fix pauseEngineIntern regression in MR
-rw-r--r--engines/kyra/kyra_mr.cpp5
-rw-r--r--engines/kyra/kyra_mr.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index f5bcd04ea0..c6a5d60bb8 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -1195,6 +1195,11 @@ void KyraEngine_MR::updateMouse() {
}
}
+void KyraEngine_MR::pauseEngineIntern(bool pause) {
+ _mixer->pauseAll(pause);
+ _timer->pause(pause);
+}
+
#pragma mark -
void KyraEngine_MR::makeCharFacingMouse() {
diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h
index b762648d29..e03ae08559 100644
--- a/engines/kyra/kyra_mr.h
+++ b/engines/kyra/kyra_mr.h
@@ -105,6 +105,8 @@ private:
void updateWithText();
void updateMouse();
+ void pauseEngineIntern(bool pause);
+
// sound specific
private:
void playMenuAudioFile();