From a0f9e4082d36b85c114f66b5ba87365ad818c69f Mon Sep 17 00:00:00 2001 From: James Brown Date: Thu, 4 Apr 2002 02:58:04 +0000 Subject: [PATCH] Fix Zak/Indy3 verbage issues. svn-id: r3854 --- script_v1.cpp | 3 +++ verbs.cpp | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/script_v1.cpp b/script_v1.cpp index cb21eeb384f..9fd439c5132 100644 --- a/script_v1.cpp +++ b/script_v1.cpp @@ -1914,6 +1914,9 @@ void Scumm::o5_saveRestoreVerbs() { switch(_opcode) { case 1: /* hide verbs */ + if (_gameId & GID_ZAK256) // FIXME? + return; + while (a<=b) { slot = getVerbSlot(a,0); if (slot && _verbs[slot].saveid==0) { diff --git a/verbs.cpp b/verbs.cpp index a7d67723270..8482be34430 100644 --- a/verbs.cpp +++ b/verbs.cpp @@ -86,9 +86,6 @@ int Scumm::checkMouseOver(int x, int y) { vs = &_verbs[i]; do { - if (_features & GF_OLD256) - vs->saveid = 0; - if (vs->curmode!=1 || !vs->verbid || vs->saveid || y < vs->y || y >= vs->bottom) continue; @@ -255,7 +252,7 @@ void Scumm::killVerb(int slot) { nukeResource(rtVerb, slot); - if (vs->saveid==0) { + if (vs->saveid==0){ drawVerb(slot, 0); verbMouseOver(0); }