diff options
| author | athrxx | 2011-05-29 00:29:03 +0200 |
|---|---|---|
| committer | unknown | 2011-05-29 01:04:14 +0200 |
| commit | 4b98d6a9e44e2868cf6f4c7d32f9ab291b542eae (patch) | |
| tree | 1e9ba5e457707fc82e53f8e5d6fb7bb1bc3f45e4 /engines/scumm | |
| parent | d7f877b3ab080b8e01bd6d55d2b52114dfe0f5fa (diff) | |
| download | scummvm-rg350-4b98d6a9e44e2868cf6f4c7d32f9ab291b542eae.tar.gz scummvm-rg350-4b98d6a9e44e2868cf6f4c7d32f9ab291b542eae.tar.bz2 scummvm-rg350-4b98d6a9e44e2868cf6f4c7d32f9ab291b542eae.zip | |
SCUMM: Fix bug #1013617
(ZAK FM-TOWNS: Wrong verb ('Teleport To') shown)
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/string.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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); } |