ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

TOON: Remove some dead code

Browse Source
This commit is contained in:
Strangerke
2014-08-06 20:57:30 +02:00
parent 09d1dee599
commit 37b77168ec
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/toon/toon.cpp
+8 -14
View File
@@ -2037,23 +2037,19 @@ int32 ToonEngine::characterTalk(int32 dialogid, bool blocking) {
}
}
int32 myId = 0;
char *myLine;
if (dialogid < 1000) {
if (dialogid < 1000)
myLine = _roomTexts->getText(dialogid);
myId = dialogid;
} else {
else
myLine = _genericTexts->getText(dialogid - 1000);
myId = dialogid - 1000;
}
if (!myLine)
return 0;
bool oldMouseHidden = _gameState->_mouseHidden;
if (blocking) {
if (blocking)
_gameState->_mouseHidden = true;
}
// get what is before the string
int a = READ_LE_UINT16(myLine - 2);
@@ -2090,10 +2086,8 @@ int32 ToonEngine::characterTalk(int32 dialogid, bool blocking) {
while ((waitChar->getAnimFlag() & 0x10) == 0x10 && !_shouldQuit)
doFrame();
}
} else {
if (_audioManager->voiceStillPlaying())
_audioManager->stopCurrentVoice();
}
} else if (_audioManager->voiceStillPlaying())
_audioManager->stopCurrentVoice();
for (int32 i = 0; i < numParticipants - 1; i++) {
// listener
@@ -2133,10 +2127,10 @@ int32 ToonEngine::characterTalk(int32 dialogid, bool blocking) {
getTextPosition(talkerId, &_currentTextLineX, &_currentTextLineY);
if (dialogid < 1000) {
myId = _roomTexts->getId(dialogid);
int myId = _roomTexts->getId(dialogid);
_audioManager->playVoice(myId, false);
} else {
myId = _genericTexts->getId(dialogid - 1000);
int myId = _genericTexts->getId(dialogid - 1000);
_audioManager->playVoice(myId, true);
}