diff options
| author | Florian Kagerer | 2009-04-25 13:15:05 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2009-04-25 13:15:05 +0000 |
| commit | ccb64ad81e6c56eaa2350197f964d470d8610ed9 (patch) | |
| tree | 308379b40196a5a934c2161bdaa28673a007940f /engines/kyra/script_tim.cpp | |
| parent | f1893d8f25b8f4fc5f6ed48e61dec0c2050bd567 (diff) | |
| download | scummvm-rg350-ccb64ad81e6c56eaa2350197f964d470d8610ed9.tar.gz scummvm-rg350-ccb64ad81e6c56eaa2350197f964d470d8610ed9.tar.bz2 scummvm-rg350-ccb64ad81e6c56eaa2350197f964d470d8610ed9.zip | |
LOL: - Started implementing the fighting system. The damage inflicted is wrong, however (at least the damage inflicted by the monsters). I'm sowewhat clueless about that bug atm.
- added support for monsters with distance attacks (like those orcs in front of roland's house)
- lots of small bug fixes
- Some startup support for the pc-98 16 color version. The intro will run, but the font drawing/coloring is still wrong.
svn-id: r40144
Diffstat (limited to 'engines/kyra/script_tim.cpp')
| -rw-r--r-- | engines/kyra/script_tim.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp index 461cd17083..a3f3268db3 100644 --- a/engines/kyra/script_tim.cpp +++ b/engines/kyra/script_tim.cpp @@ -618,6 +618,8 @@ int TIMInterpreter::cmd_playVocFile(const uint16 *param) { if (index < ARRAYSIZE(_vocFiles) && !_vocFiles[index].empty()) vm()->sound()->voicePlay(_vocFiles[index].c_str(), volume, true); + else if (index == 7 && !_vm->gameFlags().isTalkie) + vm()->sound()->playTrack(index); else vm()->sound()->playSoundEffect(index); @@ -1144,7 +1146,7 @@ uint16 TIMInterpreter_LoL::processDialogue() { return res; } -void TIMInterpreter_LoL::forceDialogue(TIM *tim) { +void TIMInterpreter_LoL::resetDialogueState(TIM *tim) { if (!tim) return; |