From 5502291f7ade4d3ec903bc8c632328391179378d Mon Sep 17 00:00:00 2001 From: James Brown Date: Fri, 10 May 2002 16:14:52 +0000 Subject: [PATCH] Check gameID for Zak TV fix svn-id: r4266 --- script_v1.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/script_v1.cpp b/script_v1.cpp index c45cb8107e1..0619698b6fc 100644 --- a/script_v1.cpp +++ b/script_v1.cpp @@ -1391,13 +1391,15 @@ void Scumm::o5_getDist() o2 = getVarOrDirectWord(0x40); r = getObjActToObjActDist(o1, o2); - /* Fix for monkey 2, dunno what's wrong in scummvm */ + /* FIXME: Fix for monkey 2, dunno what's wrong in scummvm */ if (_gameId == GID_MONKEY2 && vm.slot[_currentScript].number == 40 && r < 60) r = 60; - if (r > 0) // FIXME: Fixes several off-by-one errors (eg, - r--; // zak's tv). Find real cause of bug. + /* FIXME: Patch to allow TV cord to be picked up in Zak256 */ + if ((_gameId == GID_ZAK256) && (r > 0)) + r--; + setResult(r); }