libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 09:18:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- disabled some old warnings

Browse Source 
- removed waiting for voice to finish in o1_restoreCustomPrintBackground

svn-id: r31211
This commit is contained in:
Johannes Schickel 2008-03-21 16:54:08 +00:00
parent b615eb177b
commit dea50612cb
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/kyra/script_v1.cpp
View File

@ -646,6 +646,7 @@ int KyraEngine_v1::o1_customPrintTalkString(ScriptState *script) {
snd_voiceWaitForFinish();
snd_playVoiceFile(stackPos(0));
}
_skipFlag = false;
if (textEnabled())
_text->printTalkTextMessage(stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF, 0, 2);
@ -660,8 +661,6 @@ int KyraEngine_v1::o1_customPrintTalkString(ScriptState *script) {
int KyraEngine_v1::o1_restoreCustomPrintBackground(ScriptState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_restoreCustomPrintBackground(%p) ()", (const void *)script);
snd_voiceWaitForFinish();
snd_stopVoice();
_text->restoreTalkTextMessageBkgd(2, 0);
return 0;
}

4
engines/kyra/text_v1.cpp
View File

@ -159,7 +159,7 @@ void KyraEngine_v1::endCharacterChat(int8 charNum, int16 convoInitialized) {
if (charNum > 4 && charNum < 11) {
//TODO: weird _game_inventory stuff here
warning("STUB: endCharacterChat() for high charnums");
//warning("STUB: endCharacterChat() for high charnums");
}
if (convoInitialized != 0) {
@ -247,7 +247,7 @@ int KyraEngine_v1::initCharacterChat(int8 charNum) {
if (charNum > 4 && charNum < 11) {
// TODO: Fill in weird _game_inventory stuff here
warning("STUB: initCharacterChat() for high charnums");
//warning("STUB: initCharacterChat() for high charnums");
}
_animator->flagAllObjectsForRefresh();