diff options
| author | Travis Howell | 2006-04-19 07:14:03 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-04-19 07:14:03 +0000 |
| commit | 0a71cc83772ce5b0dd897b1ed8b11c498be343b5 (patch) | |
| tree | 11b3d9908354ea395a51ccdb917937ab14b44abb | |
| parent | 0351e979c1cdc7e6b23ab1036d3cbbbd39e81c89 (diff) | |
| download | scummvm-rg350-0a71cc83772ce5b0dd897b1ed8b11c498be343b5.tar.gz scummvm-rg350-0a71cc83772ce5b0dd897b1ed8b11c498be343b5.tar.bz2 scummvm-rg350-0a71cc83772ce5b0dd897b1ed8b11c498be343b5.zip | |
Add FF difference in mouseOn script opcode
svn-id: r22030
| -rw-r--r-- | engines/simon/icons.cpp | 2 | ||||
| -rw-r--r-- | engines/simon/items.cpp | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/engines/simon/icons.cpp b/engines/simon/icons.cpp index 2693e6b7ad..a6a133ba39 100644 --- a/engines/simon/icons.cpp +++ b/engines/simon/icons.cpp @@ -68,7 +68,7 @@ void SimonEngine::loadIconData() { error("Out of icon memory"); memcpy(_iconFilePtr, src, 43 * 336); - unfreezeBottom(); + o_unfreezeZones(); } // Thanks to Stuart Caie for providing the original diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp index bcb834f976..16306857e2 100644 --- a/engines/simon/items.cpp +++ b/engines/simon/items.cpp @@ -2214,8 +2214,13 @@ bool SimonEngine::checkIfToRunSubroutineLine(SubroutineLine *sl, Subroutine *sub } void SimonEngine::scriptMouseOn() { - if (getGameType() == GType_SIMON2 && getBitFlag(79)) + if (getGameType() == GType_FF && _mouseCursor != 5) { + resetVerbs(); + _noRightClick = 0; + } + if (getGameType() == GType_SIMON2 && getBitFlag(79)) { _mouseCursor = 0; + } _mouseHideCount = 0; } |