From 4b98d6a9e44e2868cf6f4c7d32f9ab291b542eae Mon Sep 17 00:00:00 2001 From: athrxx Date: Sun, 29 May 2011 00:29:03 +0200 Subject: SCUMM: Fix bug #1013617 (ZAK FM-TOWNS: Wrong verb ('Teleport To') shown) --- engines/scumm/string.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp index c27b6d5e1c..4b3207c6bf 100644 --- a/engines/scumm/string.cpp +++ b/engines/scumm/string.cpp @@ -1210,7 +1210,8 @@ int ScummEngine::convertVerbMessage(byte *dst, int dstSize, int var) { num = readVar(var); if (num) { for (k = 1; k < _numVerbs; k++) { - if (num == _verbs[k].verbid && !_verbs[k].type && !_verbs[k].saveid) { + // Fix ZAK FM-TOWNS bug #1013617 by emulating exact (inconsistant?) behavior of the original code + if (num == _verbs[k].verbid && !_verbs[k].type && (!_verbs[k].saveid || (_game.version == 3 && _game.platform == Common::kPlatformFMTowns))) { const byte *ptr = getResourceAddress(rtVerb, k); return convertMessageToString(ptr, dst, dstSize); } -- cgit v1.2.3