aboutsummaryrefslogtreecommitdiff
path: root/engines/pink/pink.cpp
diff options
context:
space:
mode:
authorAndrei Prykhodko2018-07-18 21:48:54 +0300
committerAndrei Prykhodko2018-07-18 21:48:54 +0300
commita053a19ca258dc4d344bc2345b5faa1bf2b0183e (patch)
tree5f89c6f8f0a2c51e2c42c1021562e49128e1ae14 /engines/pink/pink.cpp
parente1460103e195d788dfa0e0cf8bbe57f0afae466f (diff)
downloadscummvm-rg350-a053a19ca258dc4d344bc2345b5faa1bf2b0183e.tar.gz
scummvm-rg350-a053a19ca258dc4d344bc2345b5faa1bf2b0183e.tar.bz2
scummvm-rg350-a053a19ca258dc4d344bc2345b5faa1bf2b0183e.zip
PINK: fixed pausing of engine when menu appears
Diffstat (limited to 'engines/pink/pink.cpp')
-rw-r--r--engines/pink/pink.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp
index f18df012ed..25c8f8818e 100644
--- a/engines/pink/pink.cpp
+++ b/engines/pink/pink.cpp
@@ -75,6 +75,9 @@ Common::Error PinkEngine::init() {
_console = new Console(this);
_director = new Director();
+ _director->getWndManager()._engine = this;
+ _director->getWndManager()._pauseEngineCallback = &pauseEngine;
+
Common::String orbName;
Common::String broName;
if (isPeril()) {
@@ -147,9 +150,7 @@ Common::Error Pink::PinkEngine::run() {
}
}
- if (!_director->isMenuActive())
- _actor->update();
-
+ _actor->update();
_director->update();
_system->delayMillis(10);
}
@@ -157,6 +158,11 @@ Common::Error Pink::PinkEngine::run() {
return Common::kNoError;
}
+void PinkEngine::pauseEngine(void *engine, bool pause) {
+ PinkEngine *vm = (PinkEngine*)engine;
+ vm->pauseEngineIntern(pause);
+}
+
void PinkEngine::load(Archive &archive) {
archive.readString();
archive.readString();