aboutsummaryrefslogtreecommitdiff
path: root/scumm/string.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scumm/string.cpp')
-rw-r--r--scumm/string.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp
index d6836576c6..be925f89f8 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -77,7 +77,7 @@ void ScummEngine::CHARSET_1() {
uint32 talk_sound_a = 0;
uint32 talk_sound_b = 0;
int s, i, t, c;
- int frme = -1;
+ int frme;
Actor *a;
byte *buffer;
@@ -231,7 +231,7 @@ void ScummEngine::CHARSET_1() {
case 9:
frme = *buffer++;
frme |= *buffer++ << 8;
- a->startAnimActor(frme != -1 ? frme : a->talkStartFrame);
+ a->startAnimActor(frme);
break;
case 10:
talk_sound_a = buffer[0] | (buffer[1] << 8) | (buffer[4] << 16) | (buffer[5] << 24);