[Scummvm-cvs-logs] SF.net SVN: scummvm: [31383] scummvm/trunk/engines/kyra/staticres.cpp

[lordhoto at users.sourceforge.net]

Revision: 31383
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31383&view=rev
Author:   lordhoto
Date:     2008-04-04 08:55:18 -0700 (Fri, 04 Apr 2008)

Log Message:
-----------
Little less waste of memory.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/staticres.cpp

Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2008-04-04 13:28:53 UTC (rev 31382)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2008-04-04 15:55:18 UTC (rev 31383)
@@ -1486,6 +1486,7 @@
 	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 @@
 	_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 @@
 	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)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.