diff options
| author | Andrew Kurushin | 2004-12-17 11:18:56 +0000 |
|---|---|---|
| committer | Andrew Kurushin | 2004-12-17 11:18:56 +0000 |
| commit | 28e5422fd88e91bf8005ac290d5a36e8ba6a5b19 (patch) | |
| tree | 4d0a5c913f7d68f37147e9e5f3e432729e09e3a1 /saga/sthread.cpp | |
| parent | c61894ee6540d83b3a431da00cc67a624bbdf83c (diff) | |
| download | scummvm-rg350-28e5422fd88e91bf8005ac290d5a36e8ba6a5b19.tar.gz scummvm-rg350-28e5422fd88e91bf8005ac290d5a36e8ba6a5b19.tar.bz2 scummvm-rg350-28e5422fd88e91bf8005ac290d5a36e8ba6a5b19.zip | |
actors rearrangement bugfix
svn-id: r16094
Diffstat (limited to 'saga/sthread.cpp')
| -rw-r--r-- | saga/sthread.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/saga/sthread.cpp b/saga/sthread.cpp index f50524f80d..2df3ee9633 100644 --- a/saga/sthread.cpp +++ b/saga/sthread.cpp @@ -720,7 +720,7 @@ int Script::SThreadRun(SCRIPT_THREAD *thread, int instr_limit) { case 0x53: { int n_voices; - int a_index; + uint16 actorId; int voice_rn; n_voices = scriptS.readByte(); @@ -729,22 +729,16 @@ int Script::SThreadRun(SCRIPT_THREAD *thread, int instr_limit) { scriptS.readByte(); scriptS.readUint16LE(); - a_index = _vm->_actor->getActorIndex(param1); - if (a_index < 0) { - _vm->_console->DebugPrintf(S_WARN_PREFIX "%X: DLGP Actor id not found.\n", thread->i_offset); - debug(9, "%X: DLGP Actor id not found.\n", thread->i_offset); - } + actorId = param1; for (i = 0; i < n_voices; i++) { data = thread->pop(); - if (a_index < 0) - continue; if (!isVoiceLUTPresent()) { voice_rn = -1; } else { voice_rn = currentScript()->voice->voices[data]; } - _vm->_actor->speak(a_index, currentScript()->diag->str[data], voice_rn, &thread->sem); + _vm->_actor->speak(actorId, currentScript()->diag->str[data], voice_rn, &thread->sem); } } break; |