[Scummvm-cvs-logs] SF.net SVN: scummvm: [31655] scummvm/trunk/engines/made

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Tue Apr 22 10:08:08 CEST 2008


Revision: 31655
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31655&view=rev
Author:   thebluegr
Date:     2008-04-22 01:08:07 -0700 (Tue, 22 Apr 2008)

Log Message:
-----------
Implemented o1_EVENTKEY. Removed some debug delays

Modified Paths:
--------------
    scummvm/trunk/engines/made/made.h
    scummvm/trunk/engines/made/scriptfuncs.cpp

Modified: scummvm/trunk/engines/made/made.h
===================================================================
--- scummvm/trunk/engines/made/made.h	2008-04-22 07:40:28 UTC (rev 31654)
+++ scummvm/trunk/engines/made/made.h	2008-04-22 08:08:07 UTC (rev 31655)
@@ -92,6 +92,7 @@
 	ScriptInterpreter *_script;
 
 	int _eventMouseX, _eventMouseY;
+	uint16 _eventKey;
 
 	int32 _timers[50];
 	int16 getTimer(int16 timerNum);

Modified: scummvm/trunk/engines/made/scriptfuncs.cpp
===================================================================
--- scummvm/trunk/engines/made/scriptfuncs.cpp	2008-04-22 07:40:28 UTC (rev 31654)
+++ scummvm/trunk/engines/made/scriptfuncs.cpp	2008-04-22 08:08:07 UTC (rev 31655)
@@ -220,7 +220,8 @@
 			break;
 
 		case Common::EVENT_KEYDOWN:
-			switch (event.kbd.ascii) {
+			_vm->_eventKey = event.kbd.ascii;
+			switch (_vm->_eventKey) {
 			case '1':
 				eventNum = 1;
 				break;
@@ -267,7 +268,7 @@
 }
 
 int16 ScriptFunctionsRtz::o1_EVENTKEY(int16 argc, int16 *argv) {
-	return 0;
+	return _vm->_eventKey;
 }
 
 int16 ScriptFunctionsRtz::o1_VISUALFX(int16 argc, int16 *argv) {
@@ -368,7 +369,7 @@
 }
 
 int16 ScriptFunctionsRtz::o1_SETTIMER(int16 argc, int16 *argv) {
-	g_system->delayMillis(5000);
+	//g_system->delayMillis(5000);
 	return 0;
 }
 
@@ -397,7 +398,7 @@
 }
 
 int16 ScriptFunctionsRtz::o1_DRAWTEXT(int16 argc, int16 *argv) {
-	g_system->delayMillis(5000);
+	//g_system->delayMillis(5000);
 	return 0;
 }
 


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