diff options
| author | Johannes Schickel | 2008-04-04 15:55:18 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-04-04 15:55:18 +0000 |
| commit | 214d6b5eb7a64ed52e970c44e8773faa16f62c63 (patch) | |
| tree | dd98ed38b27f3982a354cf59138a7d80278f7d63 /engines/kyra | |
| parent | f83e93e6d8e8ff58a2fb3b1df7c93e4fb7c8af2d (diff) | |
| download | scummvm-rg350-214d6b5eb7a64ed52e970c44e8773faa16f62c63.tar.gz scummvm-rg350-214d6b5eb7a64ed52e970c44e8773faa16f62c63.tar.bz2 scummvm-rg350-214d6b5eb7a64ed52e970c44e8773faa16f62c63.zip | |
Little less waste of memory.
svn-id: r31383
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/staticres.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index c4acdcc5e8..d5c893afc7 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -1486,6 +1486,7 @@ void GUI_v2::initStaticData() { Button::Callback clickLoadSlotFunctor = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::clickLoadSlot); Button::Callback clickSaveSlotFunctor = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::clickSaveSlot); Button::Callback clickLoadMenuFunctor = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::loadMenu); + Button::Callback clickQuitGameFunctor = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::quitGame); const uint16 *menuStr = _vm->gameFlags().isTalkie ? _menuStringsTalkie : _menuStringsOther; @@ -1499,7 +1500,7 @@ void GUI_v2::initStaticData() { _mainMenu.item[3].callback = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::gameOptions); GUI_V2_MENU_ITEM(_mainMenu.item[4], 1, 0x25, -1, 0x62, 0xDC, 0x0F, 0xFC, 0xFD, -1, 0xF8, 0xF9, 0xFA, -1, 0, 0, 0, 0); GUI_V2_MENU_ITEM(_mainMenu.item[5], 1, 0x05, -1, 0x73, 0xDC, 0x0F, 0xFC, 0xFD, -1, 0xF8, 0xF9, 0xFA, -1, 0, 0, 0, 0); - _mainMenu.item[5].callback = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::quitGame); + _mainMenu.item[5].callback = clickQuitGameFunctor; GUI_V2_MENU_ITEM(_mainMenu.item[6], 1, 0x06, -1, 0x90, 0xDC, 0x0F, 0xFC, 0xFD, -1, 0xF8, 0xF9, 0xFA, -1, 0, 0, 0, 0); _mainMenu.item[6].callback = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::resumeGame); for (int i = 0; i < 7; ++i) @@ -1571,7 +1572,7 @@ void GUI_v2::initStaticData() { GUI_V2_MENU_ITEM(_deathMenu.item[0], 1, 2, -1, 0x1E, 0xB4, 0x0F, 0xFC, 0xFD, 8, 0xF8, 0xF9, 0xFA, -1, 0, 0, 0, 0); _deathMenu.item[0].callback = clickLoadMenuFunctor; GUI_V2_MENU_ITEM(_deathMenu.item[1], 1, 5, -1, 0x2F, 0xB4, 0x0F, 0xFC, 0xFD, 8, 0xF8, 0xF9, 0xFA, -1, 0, 0, 0, 0); - _deathMenu.item[1].callback = BUTTON_FUNCTOR(GUI_v2, this, &GUI_v2::quitGame); + _deathMenu.item[1].callback = clickQuitGameFunctor; for (int i = 2; i <= 6; ++i) _deathMenu.item[i].enabled = false; for (int i = 0; i < 2; ++i) |