diff options
| author | Florian Kagerer | 2008-03-15 14:40:00 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2008-03-15 14:40:00 +0000 |
| commit | dc319c719fdc1526b546cb5d3b0ecc519c1d0369 (patch) | |
| tree | 37a963793efc1f81e153e112bdb4cc75fea203a2 /engines/kyra/kyra_v2.cpp | |
| parent | 9ff187ad63221e91681353438ce702fe59860b5c (diff) | |
| download | scummvm-rg350-dc319c719fdc1526b546cb5d3b0ecc519c1d0369.tar.gz scummvm-rg350-dc319c719fdc1526b546cb5d3b0ecc519c1d0369.tar.bz2 scummvm-rg350-dc319c719fdc1526b546cb5d3b0ecc519c1d0369.zip | |
- implement opcode 127 (entering the color code for the skull in the rat cave now works)
- minor bug fix for mouse cursor (which sometimes would show when it shouldn't)
svn-id: r31129
Diffstat (limited to 'engines/kyra/kyra_v2.cpp')
| -rw-r--r-- | engines/kyra/kyra_v2.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index 90192c3518..b0082e8db1 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -102,6 +102,7 @@ KyraEngine_v2::KyraEngine_v2(OSystem *system, const GameFlags &flags) : KyraEngi _colorCodeFlag1 = 0; _colorCodeFlag2 = -1; _scriptCountDown = 0; + memset(_inputColorCode, 0, 7); _gamePlayBuffer = 0; _unkBuf500Bytes = 0; @@ -699,14 +700,14 @@ void KyraEngine_v2::updateMouse() { yOffset = 9; } - if (type != 0 && _handItemSet != type) { + if (type != 0 && _handItemSet != type && _screen->isMouseVisible()) { _mouseState = _handItemSet = type; _screen->hideMouse(); _screen->setMouseCursor(xOffset, yOffset, getShapePtr(shapeIndex)); _screen->showMouse(); } - if (type == 0 && _handItemSet != _itemInHand) { + if (type == 0 && _handItemSet != _itemInHand && _screen->isMouseVisible()) { if ((mouse.y > 145) || (mouse.x > 6 && mouse.x < 312 && mouse.y > 6 && mouse.y < 135)) { _mouseState = 0; _handItemSet = _itemInHand; @@ -2224,7 +2225,7 @@ void KyraEngine_v2::setupOpcodeTable() { Opcode(o2_getCountDown), Opcode(o2_dummy), Opcode(o2_dummy), - OpcodeUnImpl(), + Opcode(o2_pressColorKey), // 0x80 Opcode(o2_objectChat), OpcodeUnImpl(), |