thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for bug #862263 - Maniac actors never stop talking. I know this could probably be neater :)

Browse source 
svn-id: r12430
This commit is contained in:
James Brown 2004-01-16 10:45:56 +00:00
parent bd3f51dfdf
commit ac5b7036c2
8 changed files with 36 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scumm/string.cpp
View file

@ -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) {