diff options
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/items.cpp | 21 | ||||
| -rw-r--r-- | simon/simon.cpp | 8 |
2 files changed, 9 insertions, 20 deletions
diff --git a/simon/items.cpp b/simon/items.cpp index 828f5ab89d..32ec73de41 100644 --- a/simon/items.cpp +++ b/simon/items.cpp @@ -731,22 +731,16 @@ int SimonEngine::runScript() { break; case 132:{ /* save game */ - OSystem::Property prop; - prop.show_keyboard = true; - _system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop); + _system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true); o_save_game(); - prop.show_keyboard = false; - _system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop); + _system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false); } break; case 133:{ /* load game */ - OSystem::Property prop; - prop.show_keyboard = true; - _system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop); + _system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true); o_load_game(); - prop.show_keyboard = false; - _system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop); + _system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false); } break; @@ -757,12 +751,9 @@ int SimonEngine::runScript() { break; case 135:{ /* quit if user presses y */ - OSystem::Property prop; - prop.show_keyboard = true; - _system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop); + _system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true); o_quit_if_user_presses_y(); - prop.show_keyboard = false; - _system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop); + _system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false); } break; diff --git a/simon/simon.cpp b/simon/simon.cpp index dac8e1bc8f..dca760e181 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -585,10 +585,10 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst) if (ConfMan.hasKey("slow_down") && ConfMan.getInt("slow_down") >= 1) _speed = ConfMan.getInt("slow_down"); - _system->init_size(320, 200); + _system->initSize(320, 200); // FIXME Use auto dirty rects cleanup code to reduce CPU usage - _system->property(OSystem::PROP_WANT_RECT_OPTIM,0); + g_system->setFeatureState(OSystem::kFeatureAutoComputeDirtyRects, true); } SimonEngine::~SimonEngine() { @@ -2888,9 +2888,7 @@ get_out:; delay(10); } while (i == _timer_4); - OSystem::Property prop; - prop.show_keyboard = false; - g_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop); + g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false); } void SimonEngine::o_file_error(FillOrCopyStruct *fcs, bool save_error) { |