diff options
| author | Matthew Hoops | 2012-09-12 20:18:13 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-09-12 20:18:13 -0400 |
| commit | d5ed8b1901b88e361a2a420a9daf586f6089a36b (patch) | |
| tree | d19e4dd7baf33b7447d69d8ad8d3c25732a69698 /engines/toltecs/script.cpp | |
| parent | ff51a7661d7a2cb296b987edfc3d81727160e627 (diff) | |
| parent | 8808393b3a3428df2946d7967e52aba084c8ffe5 (diff) | |
| download | scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.tar.gz scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.tar.bz2 scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
AUTHORS
Diffstat (limited to 'engines/toltecs/script.cpp')
| -rw-r--r-- | engines/toltecs/script.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/engines/toltecs/script.cpp b/engines/toltecs/script.cpp index 9683831980..40b13526cf 100644 --- a/engines/toltecs/script.cpp +++ b/engines/toltecs/script.cpp @@ -1060,15 +1060,7 @@ void ScriptInterpreter::sfHandleInput() { } void ScriptInterpreter::sfRunOptionsScreen() { - _vm->_screen->loadMouseCursor(12); - _vm->_palette->loadAddPalette(9, 224); - _vm->_palette->setDeltaPalette(_vm->_palette->getMainPalette(), 7, 0, 31, 224); - _vm->_screen->finishTalkTextItems(); - _vm->_screen->clearSprites(); - CursorMan.showMouse(true); - _vm->_menuSystem->run(); - _vm->_keyState.reset(); - _switchLocalDataNear = true; + _vm->showMenu(kMenuIdMain); } /* NOTE: The opcodes sfPrecacheSprites, sfPrecacheSounds1, sfPrecacheSounds2 and |