[Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.97,1.98 script_v1.cpp,1.49,1.50

[Johannes Schickel]

Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1197

Modified Files:
	kyra.cpp script_v1.cpp 
Log Message:
Fixed bug with input handling and implemented: cmd_getBirthstoneGem.


Index: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- kyra.cpp	26 Dec 2005 14:53:51 -0000	1.97
+++ kyra.cpp	26 Dec 2005 17:31:41 -0000	1.98
@@ -5341,8 +5341,8 @@
 	uint8 item = findItemAtPos(xpos, ypos);
 	if (item == 0xFF) {
 		_changedScene = false;
-		clickEventHandler(xpos, ypos);
-		if (_changedScene)
+		int handled = clickEventHandler(xpos, ypos);
+		if (_changedScene || handled)
 			return;
 	} 
 	

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/script_v1.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- script_v1.cpp	24 Dec 2005 18:00:35 -0000	1.49
+++ script_v1.cpp	26 Dec 2005 17:31:42 -0000	1.50
@@ -1594,7 +1594,10 @@
 }
 
 int KyraEngine::cmd_getBirthstoneGem(ScriptState *script) {
-	warning("STUB: cmd_getBirthstoneGem");
+	debug(3, "cmd_getBirthstoneGem(0x%X) (%d)", script, stackPos(0));
+	if (stackPos(0) < 4) {
+		return _birthstoneGemTable[stackPos(0)];
+	}
 	return 0;
 }