diff options
| author | James Brown | 2004-01-16 10:45:56 +0000 |
|---|---|---|
| committer | James Brown | 2004-01-16 10:45:56 +0000 |
| commit | ac5b7036c28a4137d4b7af7385d97e6e485f0767 (patch) | |
| tree | b9453259912d5f2c462d8107280ef83303e5fd14 /scumm/string.cpp | |
| parent | bd3f51dfdfd563532a7cc228139dd60d8f6451a4 (diff) | |
| download | scummvm-rg350-ac5b7036c28a4137d4b7af7385d97e6e485f0767.tar.gz scummvm-rg350-ac5b7036c28a4137d4b7af7385d97e6e485f0767.tar.bz2 scummvm-rg350-ac5b7036c28a4137d4b7af7385d97e6e485f0767.zip | |
Fix for bug #862263 - Maniac actors never stop talking. I know this could probably be neater :)
svn-id: r12430
Diffstat (limited to 'scumm/string.cpp')
| -rw-r--r-- | scumm/string.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index 56a67d787b..64aca168fb 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -103,14 +103,14 @@ void ScummEngine::CHARSET_1() { if (!_haveMsg) return; - if (!(_features & GF_NEW_CAMERA) && !(_gameId == GID_ZAK256 && VAR(VAR_TALK_ACTOR) == 0xff)) { + if (!(_features & GF_NEW_CAMERA) && !(_gameId == GID_ZAK256 && talkingActor() == 0xFF)) { if ((camera._dest.x / 8) != (camera._cur.x / 8) || camera._cur.x != camera._last.x) return; } a = NULL; - if (VAR(VAR_TALK_ACTOR) != 0xFF) - a = derefActorSafe(VAR(VAR_TALK_ACTOR), "CHARSET_1"); + if (talkingActor() != 0xFF) + a = derefActorSafe(talkingActor(), "CHARSET_1"); if (a && _string[0].overhead != 0) { if (_version <= 5) { |