aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorGregory Montoir2007-04-15 20:45:55 +0000
committerGregory Montoir2007-04-15 20:45:55 +0000
commit2c9116de3b1510807bebc39c10332b3bd19d2184 (patch)
treeab11d64943308807f178093f549e683c6dd1f11e /engines
parent642fa67da9c271244de373431166f23449ec8543 (diff)
downloadscummvm-rg350-2c9116de3b1510807bebc39c10332b3bd19d2184.tar.gz
scummvm-rg350-2c9116de3b1510807bebc39c10332b3bd19d2184.tar.bz2
scummvm-rg350-2c9116de3b1510807bebc39c10332b3bd19d2184.zip
simplification (_useTalkAnims is not used in >= V7)
svn-id: r26517
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/actor.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index f104f7bb8b..5c3261a3e5 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1862,21 +1862,16 @@ void ScummEngine_v7::actorTalk(const byte *msg) {
}
if (_actorToPrintStrFor == 0xFF) {
setTalkingActor(0xFF);
+ _charsetColor = (byte)_string[0].color;
} else {
a = derefActor(_actorToPrintStrFor, "actorTalk");
setTalkingActor(a->_number);
if (!_string[0].no_talk_anim) {
a->runActorTalkScript(a->_talkStartFrame);
- _useTalkAnims = true;
}
- }
-
- if (getTalkingActor() > 0x7F) {
- _charsetColor = (byte)_string[0].color;
- } else {
- a = derefActor(getTalkingActor(), "actorTalk(2)");
_charsetColor = a->_talkColor;
}
+
_charsetBufPos = 0;
_talkDelay = 0;
_haveMsg = 1;