diff options
| author | Johannes Schickel | 2005-12-26 17:31:42 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2005-12-26 17:31:42 +0000 |
| commit | 3385ce861767b8e0c1c694e78a2bbe5a53568d47 (patch) | |
| tree | b8197cc62efee2a5a91da5c0b8d5c5c0a12f7492 /kyra | |
| parent | 55f737c4a2b6f8dc51241dad02d2e2692e734213 (diff) | |
| download | scummvm-rg350-3385ce861767b8e0c1c694e78a2bbe5a53568d47.tar.gz scummvm-rg350-3385ce861767b8e0c1c694e78a2bbe5a53568d47.tar.bz2 scummvm-rg350-3385ce861767b8e0c1c694e78a2bbe5a53568d47.zip | |
Fixed bug with input handling and implemented: cmd_getBirthstoneGem.
svn-id: r19834
Diffstat (limited to 'kyra')
| -rw-r--r-- | kyra/kyra.cpp | 4 | ||||
| -rw-r--r-- | kyra/script_v1.cpp | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/kyra/kyra.cpp b/kyra/kyra.cpp index 7f91f7cdc9..f37e84f329 100644 --- a/kyra/kyra.cpp +++ b/kyra/kyra.cpp @@ -5341,8 +5341,8 @@ void KyraEngine::processInput(int xpos, int ypos) { uint8 item = findItemAtPos(xpos, ypos); if (item == 0xFF) { _changedScene = false; - clickEventHandler(xpos, ypos); - if (_changedScene) + int handled = clickEventHandler(xpos, ypos); + if (_changedScene || handled) return; } diff --git a/kyra/script_v1.cpp b/kyra/script_v1.cpp index cd2109182f..87a641b0a3 100644 --- a/kyra/script_v1.cpp +++ b/kyra/script_v1.cpp @@ -1594,7 +1594,10 @@ int KyraEngine::cmd_getCharactersMovementDelay(ScriptState *script) { } 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; } |