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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Fri May 22 02:21:14 CEST 2009


Revision: 40779
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40779&view=rev
Author:   lordhoto
Date:     2009-05-22 00:21:14 +0000 (Fri, 22 May 2009)

Log Message:
-----------
Cleanup.

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

Modified: scummvm/trunk/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.cpp	2009-05-22 00:19:25 UTC (rev 40778)
+++ scummvm/trunk/engines/kyra/gui_lol.cpp	2009-05-22 00:21:14 UTC (rev 40779)
@@ -954,7 +954,7 @@
 		b->height = _buttonData[index].h - 1;
 	}
 
-	assignButtonCallback(b, index);
+	b->buttonCallback = _buttonCallbacks[index];
 }
 
 int LoLEngine::clickedUpArrow(Button *button) {

Modified: scummvm/trunk/engines/kyra/lol.h
===================================================================
--- scummvm/trunk/engines/kyra/lol.h	2009-05-22 00:19:25 UTC (rev 40778)
+++ scummvm/trunk/engines/kyra/lol.h	2009-05-22 00:21:14 UTC (rev 40779)
@@ -498,8 +498,6 @@
 	void gui_notifyButtonListChanged() { if (_gui) _gui->_buttonListChanged = true; }
 
 	Common::Array<Button::Callback> _buttonCallbacks;
-	void assignButtonCallback(Button *button, int index);
-
 	Button *_activeButtons;
 	ButtonDef _sceneWindowButton;
 	bool _preserveEvents;

Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2009-05-22 00:19:25 UTC (rev 40778)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2009-05-22 00:21:14 UTC (rev 40779)
@@ -1997,9 +1997,6 @@
 #undef cb
 }
 
-void LoLEngine::assignButtonCallback(Button *button, int index) {
-	button->buttonCallback = _buttonCallbacks[index];
-}
 #endif // ENABLE_LOL
 
 const ScreenDim Screen_LoK::_screenDimTable[] = {


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




More information about the Scummvm-git-logs mailing list