diff options
| author | James Brown | 2002-05-10 16:14:52 +0000 |
|---|---|---|
| committer | James Brown | 2002-05-10 16:14:52 +0000 |
| commit | 5502291f7ade4d3ec903bc8c632328391179378d (patch) | |
| tree | 219440e127c06223f3217df294b94062cdfada34 /script_v1.cpp | |
| parent | b2882e16615a2954b48cdae206f143392c2de3b2 (diff) | |
| download | scummvm-rg350-5502291f7ade4d3ec903bc8c632328391179378d.tar.gz scummvm-rg350-5502291f7ade4d3ec903bc8c632328391179378d.tar.bz2 scummvm-rg350-5502291f7ade4d3ec903bc8c632328391179378d.zip | |
Check gameID for Zak TV fix
svn-id: r4266
Diffstat (limited to 'script_v1.cpp')
| -rw-r--r-- | script_v1.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/script_v1.cpp b/script_v1.cpp index c45cb8107e..0619698b6f 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); } |