diff options
author | Filippos Karapetis | 2008-04-22 08:08:07 +0000 |
---|---|---|
committer | Filippos Karapetis | 2008-04-22 08:08:07 +0000 |
commit | b302ca9a7e79032df86b5eb69e1e3f0e3a6fbc5c (patch) | |
tree | 73d00243bd18a8013eda5821b35de021048f9e69 /engines | |
parent | f1a27858d54c55dc916c6aa6a3e85f0651596e75 (diff) | |
download | scummvm-rg350-b302ca9a7e79032df86b5eb69e1e3f0e3a6fbc5c.tar.gz scummvm-rg350-b302ca9a7e79032df86b5eb69e1e3f0e3a6fbc5c.tar.bz2 scummvm-rg350-b302ca9a7e79032df86b5eb69e1e3f0e3a6fbc5c.zip |
Implemented o1_EVENTKEY. Removed some debug delays
svn-id: r31655
Diffstat (limited to 'engines')
-rw-r--r-- | engines/made/made.h | 1 | ||||
-rw-r--r-- | engines/made/scriptfuncs.cpp | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/engines/made/made.h b/engines/made/made.h index fcfb50005e..a89bdedf2e 100644 --- a/engines/made/made.h +++ b/engines/made/made.h @@ -92,6 +92,7 @@ public: ScriptInterpreter *_script; int _eventMouseX, _eventMouseY; + uint16 _eventKey; int32 _timers[50]; int16 getTimer(int16 timerNum); diff --git a/engines/made/scriptfuncs.cpp b/engines/made/scriptfuncs.cpp index 4519803101..852320a4ad 100644 --- a/engines/made/scriptfuncs.cpp +++ b/engines/made/scriptfuncs.cpp @@ -220,7 +220,8 @@ int16 ScriptFunctionsRtz::o1_EVENT(int16 argc, int16 *argv) { 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_EVENTY(int16 argc, int16 *argv) { } 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_GETTIMER(int16 argc, int16 *argv) { } 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_FONT(int16 argc, int16 *argv) { } int16 ScriptFunctionsRtz::o1_DRAWTEXT(int16 argc, int16 *argv) { - g_system->delayMillis(5000); + //g_system->delayMillis(5000); return 0; } |