diff -ur ScummVM-cvs20020911/scummvm/scumm/sound.cpp ScummVM-cvs20020911+hack/scummvm/scumm/sound.cpp
old
|
new
|
|
382 | 382 | bool b, finished; |
383 | 383 | |
384 | 384 | if (_talk_sound_mode != 0) { |
385 | | if (_talk_sound_mode == 2) |
386 | | _talkChannel = startTalkSound(_talk_sound_a, _talk_sound_b, _talk_sound_mode); |
387 | | else |
388 | | startTalkSound(_talk_sound_a, _talk_sound_b, _talk_sound_mode); |
| 385 | if (_talk_sound_mode & 1) |
| 386 | |
| 387 | startTalkSound(_talk_sound_a1, _talk_sound_b1, 1); |
| 388 | if (_talk_sound_mode & 2) |
| 389 | _talkChannel = startTalkSound(_talk_sound_a2, _talk_sound_b2, 2); |
389 | 390 | _talk_sound_mode = 0; |
390 | 391 | } |
391 | 392 | |
… |
… |
|
623 | 624 | } |
624 | 625 | |
625 | 626 | void Sound::talkSound(uint32 a, uint32 b, int mode, int frame) { |
626 | | _talk_sound_a = a; |
627 | | _talk_sound_b = b; |
628 | | _talk_sound_mode = mode; |
| 627 | if (mode == 1) { |
| 628 | _talk_sound_a1 = a; |
| 629 | _talk_sound_b1 = b; |
| 630 | } else { |
| 631 | _talk_sound_a2 = a; |
| 632 | _talk_sound_b2 = b; |
| 633 | } |
| 634 | |
629 | 635 | _talk_sound_frame = frame; |
| 636 | _talk_sound_mode |= mode; |
630 | 637 | } |
631 | 638 | |
632 | 639 | /* The sound code currently only supports General Midi. |
diff -ur ScummVM-cvs20020911/scummvm/scumm/sound.h ScummVM-cvs20020911+hack/scummvm/scumm/sound.h
old
|
new
|
|
54 | 54 | |
55 | 55 | int _talkChannel; /* Mixer channel actor is talking on */ |
56 | 56 | File *_sfxFile; |
57 | | uint32 _talk_sound_a, _talk_sound_b; |
| 57 | uint32 _talk_sound_a1, _talk_sound_a2, _talk_sound_b1, _talk_sound_b2; |
58 | 58 | byte _talk_sound_mode; |
59 | 59 | int _talk_sound_frame; |
60 | 60 | bool _mouthSyncMode; |
diff -ur ScummVM-cvs20020911/scummvm/scumm/string.cpp ScummVM-cvs20020911+hack/scummvm/scumm/string.cpp
old
|
new
|
|
294 | 294 | } |
295 | 295 | |
296 | 296 | if (a && !string[0].no_talk_anim) { |
297 | | // a->startAnimActor(a->talkFrame1); |
298 | 297 | has_anim = true; |
299 | 298 | _useTalkAnims = true; |
300 | 299 | } |