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

[lordhoto at users.sourceforge.net]

Revision: 40770
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40770&view=rev
Author:   lordhoto
Date:     2009-05-21 17:49:51 +0000 (Thu, 21 May 2009)

Log Message:
-----------
Changed code to closer match original input handling.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui_lol.cpp
    scummvm/trunk/engines/kyra/kyra_v1.cpp

Modified: scummvm/trunk/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.cpp	2009-05-21 17:28:43 UTC (rev 40769)
+++ scummvm/trunk/engines/kyra/gui_lol.cpp	2009-05-21 17:49:51 UTC (rev 40770)
@@ -905,7 +905,7 @@
 
 void LoLEngine::gui_initButton(int index, int x, int y, int val) {
 	Button *b = new Button;
-	memset (b, 0, sizeof(Button));
+	memset(b, 0, sizeof(Button));
 
 	int cnt = 1;
 
@@ -919,7 +919,6 @@
 		}
 
 		n->nextButton = b;
-
 	} else {
 		_activeButtons = b;
 	}

Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp	2009-05-21 17:28:43 UTC (rev 40769)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp	2009-05-21 17:49:51 UTC (rev 40770)
@@ -370,10 +370,14 @@
 	}
 
 	GUI *guiInstance = gui();
-	if (guiInstance && keys)
-		return guiInstance->processButtonList(buttonList, keys | 0x8000, mouseWheel);
-	else
+	if (guiInstance) {
+		if (keys)
+			return guiInstance->processButtonList(buttonList, keys | 0x8000, mouseWheel);
+		else
+			return guiInstance->processButtonList(buttonList, 0, mouseWheel);
+	} else {
 		return keys;
+	}
 }
 
 void KyraEngine_v1::updateInput() {


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