diff options
author | Nicolas Bacca | 2002-12-01 23:46:19 +0000 |
---|---|---|
committer | Nicolas Bacca | 2002-12-01 23:46:19 +0000 |
commit | c2ba2cc586c3373a5a2563b58fe3aec58993c4f1 (patch) | |
tree | da0c9fa2609ec56952efba75b726d1a648f09bbc | |
parent | 85cf7efe9dc32128979fbfbaa754af5a8da84f4c (diff) | |
download | scummvm-rg350-c2ba2cc586c3373a5a2563b58fe3aec58993c4f1.tar.gz scummvm-rg350-c2ba2cc586c3373a5a2563b58fe3aec58993c4f1.tar.bz2 scummvm-rg350-c2ba2cc586c3373a5a2563b58fe3aec58993c4f1.zip |
Fix Simon countermeasures :)
svn-id: r5804
-rw-r--r-- | backends/wince/pocketpc.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/backends/wince/pocketpc.cpp b/backends/wince/pocketpc.cpp index 56c3c74cc6..a01f7f0f72 100644 --- a/backends/wince/pocketpc.cpp +++ b/backends/wince/pocketpc.cpp @@ -912,17 +912,17 @@ void runGame(char *game_name) { /* Start the engine */ - engine = Engine::createFromDetector(&detector, system); - - keypad_init(); - load_key_mapping(); + is_simon = (detector._gameId >= GID_SIMON_FIRST); if (detector._gameId == GID_SAMNMAX || detector._gameId == GID_FT || detector._gameId == GID_DIG) hide_cursor = FALSE; else - hide_cursor = TRUE; + hide_cursor = TRUE; - is_simon = (detector._gameId >= GID_SIMON_FIRST); + engine = Engine::createFromDetector(&detector, system); + + keypad_init(); + load_key_mapping(); engine->go(); @@ -1461,6 +1461,11 @@ void action_skip() { OSystem_WINCE3* system; system = (OSystem_WINCE3*)g_scumm->_system; + if (is_simon) { + ((SimonState*)engine)->_exit_cutscene = true; + return; + } + if (g_scumm->vm.cutScenePtr[g_scumm->vm.cutSceneStackPointer] || g_scumm->_insaneState) system->addEventKeyPressed(g_scumm->_vars[g_scumm->VAR_CUTSCENEEXIT_KEY]); else |