libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 06:08:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

KYRA/LOL: - support speech/text settings in LOL intro

Browse Source 
- fix possible pc98 music issue

svn-id: r41887
This commit is contained in:
Florian Kagerer 2009-06-25 21:17:50 +00:00
parent f9b075c50a
commit c358145c72
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/kyra/script_tim.cpp
View File

@ -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;

4
engines/kyra/sound_towns.cpp
View File

@ -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;
}