diff options
| author | D G Turner | 2011-12-28 00:40:00 +0000 |
|---|---|---|
| committer | D G Turner | 2011-12-28 00:40:00 +0000 |
| commit | 5492307982b3af117f2314cc22c680b48afe9689 (patch) | |
| tree | 36714b83e5dc87e76d81e7ff0909f2ddef2554e1 /engines/dreamweb/talk.cpp | |
| parent | 4f5a708d7dc8d4040e866430df7ab019379f3e03 (diff) | |
| download | scummvm-rg350-5492307982b3af117f2314cc22c680b48afe9689.tar.gz scummvm-rg350-5492307982b3af117f2314cc22c680b48afe9689.tar.bz2 scummvm-rg350-5492307982b3af117f2314cc22c680b48afe9689.zip | |
DREAMWEB: Move 'speechloaded' flag out of data blob.
Diffstat (limited to 'engines/dreamweb/talk.cpp')
| -rw-r--r-- | engines/dreamweb/talk.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp index 992fea29a8..ed52e76bd7 100644 --- a/engines/dreamweb/talk.cpp +++ b/engines/dreamweb/talk.cpp @@ -66,7 +66,7 @@ void DreamBase::talk() { redrawMainScrn(); workToScreenM(); - if (data.byte(kSpeechloaded) == 1) { + if (_speechLoaded) { cancelCh1(); data.byte(kVolumedirection) = (byte)-1; data.byte(kVolumeto) = 0; @@ -98,9 +98,9 @@ void DreamBase::startTalk() { y = 80; printDirect(&str, 66, &y, 241, true); - data.byte(kSpeechloaded) = 0; + _speechLoaded = false; loadSpeech('R', data.byte(kReallocation), 'C', 64*(data.byte(kCharacter) & 0x7F)); - if (data.byte(kSpeechloaded) == 1) { + if (_speechLoaded) { data.byte(kVolumedirection) = 1; data.byte(kVolumeto) = 6; playChannel1(50 + 12); @@ -155,7 +155,7 @@ void DreamBase::doSomeTalk() { printDirect(str, 164, 64, 144, false); loadSpeech('R', data.byte(kReallocation), 'C', (64 * (data.byte(kCharacter) & 0x7F)) + data.byte(kTalkpos)); - if (data.byte(kSpeechloaded) != 0) + if (_speechLoaded) playChannel1(62); data.byte(kPointermode) = 3; @@ -181,7 +181,7 @@ void DreamBase::doSomeTalk() { printDirect(str, 48, 128, 144, false); loadSpeech('R', data.byte(kReallocation), 'C', (64 * (data.byte(kCharacter) & 0x7F)) + data.byte(kTalkpos)); - if (data.byte(kSpeechloaded) != 0) + if (_speechLoaded) playChannel1(62); data.byte(kPointermode) = 3; @@ -223,7 +223,7 @@ bool DreamBase::hangOnPQ() { return true; } - if (data.byte(kSpeechloaded) == 1 && _channel1Playing == 255) { + if (_speechLoaded && _channel1Playing == 255) { speechFlag++; if (speechFlag == 40) break; |