diff options
| author | Florian Kagerer | 2009-06-25 21:17:50 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2009-06-25 21:17:50 +0000 |
| commit | c358145c728eb030586ca356a9c135494185d374 (patch) | |
| tree | 8b9fa39ab708b4e7eaf7de9751609caa886d5d45 /engines/kyra | |
| parent | f9b075c50a4e857ba1c13465bc4f6945b195c51b (diff) | |
| download | scummvm-rg350-c358145c728eb030586ca356a9c135494185d374.tar.gz scummvm-rg350-c358145c728eb030586ca356a9c135494185d374.tar.bz2 scummvm-rg350-c358145c728eb030586ca356a9c135494185d374.zip | |
KYRA/LOL: - support speech/text settings in LOL intro
- fix possible pc98 music issue
svn-id: r41887
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/script_tim.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/sound_towns.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp index 5c74eae25b..6a53b16102 100644 --- a/engines/kyra/script_tim.cpp +++ b/engines/kyra/script_tim.cpp @@ -304,7 +304,7 @@ void TIMInterpreter::displayText(uint16 textId, int16 flags) { memcpy(filename, text+1, end-1-text); } - if (filename[0]) + if (filename[0] && _vm->speechEnabled()) _vm->sound()->voicePlay(filename); if (text[0] == '$') @@ -328,7 +328,7 @@ void TIMInterpreter::displayText(uint16 textId, int16 flags) { char *str = text; int heightAdd = 0; - while (str[0]) { + while (str[0] && _vm->textEnabled()) { char *nextLine = strchr(str, '\r'); backupChar = 0; diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp index 1980f62d7c..3398610924 100644 --- a/engines/kyra/sound_towns.cpp +++ b/engines/kyra/sound_towns.cpp @@ -1504,7 +1504,7 @@ public: private: void updatesRegs(); - uint8 _updateRequestBuf[32]; + uint8 _updateRequestBuf[64]; int _updateRequest; int _rand; @@ -2657,7 +2657,7 @@ void TownsPC98_OpnSquareSineSource::writeReg(uint8 address, uint8 value, bool fo } if (!force) { - if (_updateRequest == 31) { + if (_updateRequest >= 63) { warning("TownsPC98_OpnSquareSineSource: event buffer overflow"); _updateRequest = -1; } |