diff options
| author | vanfanel | 2015-11-11 17:56:12 +0100 |
|---|---|---|
| committer | vanfanel | 2015-11-11 17:56:12 +0100 |
| commit | 99739a13fe844c807d3cdd87e67e207e888fd48a (patch) | |
| tree | 6afbf4763326277efbf528f0bb9e587bf7a01788 /engines/sci/engine/kevent.cpp | |
| parent | 37e157a11c3fc731dfdcf6ec6b6a5a448550219b (diff) | |
| parent | 7e44493fe8877a3c6a65f83b9ed84a5f59169005 (diff) | |
| download | scummvm-rg350-99739a13fe844c807d3cdd87e67e207e888fd48a.tar.gz scummvm-rg350-99739a13fe844c807d3cdd87e67e207e888fd48a.tar.bz2 scummvm-rg350-99739a13fe844c807d3cdd87e67e207e888fd48a.zip | |
Merge branch 'master' into dispmanx
Diffstat (limited to 'engines/sci/engine/kevent.cpp')
| -rw-r--r-- | engines/sci/engine/kevent.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp index cb81da2279..8e16e0a07a 100644 --- a/engines/sci/engine/kevent.cpp +++ b/engines/sci/engine/kevent.cpp @@ -24,9 +24,10 @@ #include "sci/sci.h" #include "sci/engine/features.h" -#include "sci/engine/state.h" -#include "sci/engine/selector.h" #include "sci/engine/kernel.h" +#include "sci/engine/savegame.h" +#include "sci/engine/selector.h" +#include "sci/engine/state.h" #include "sci/console.h" #include "sci/debug.h" // for g_debug_simulated_key #include "sci/event.h" @@ -71,9 +72,15 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) { g_debug_simulated_key = 0; return make_reg(0, 1); } - + curEvent = g_sci->getEventManager()->getSciEvent(mask); + if (s->_delayedRestoreGame) { + // delayed restore game from ScummVM menu got triggered + gamestate_delayedrestore(s); + return NULL_REG; + } + // For a real event we use its associated mouse position mousePos = curEvent.mousePos; #ifdef ENABLE_SCI32 |