diff options
| author | Florian Kagerer | 2008-02-22 00:33:56 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2008-02-22 00:33:56 +0000 |
| commit | 3969249b939c2c61ad36a7e7ed959c81b1847c68 (patch) | |
| tree | 1b327052ab3b36a0f4ba16a60514d8d74391afd5 /engines/kyra/scene_v2.cpp | |
| parent | 28158c80b8db145f2c5986296b28ae02df26e2d2 (diff) | |
| download | scummvm-rg350-3969249b939c2c61ad36a7e7ed959c81b1847c68.tar.gz scummvm-rg350-3969249b939c2c61ad36a7e7ed959c81b1847c68.tar.bz2 scummvm-rg350-3969249b939c2c61ad36a7e7ed959c81b1847c68.zip | |
two more opcodes (Zanthia's random chats and mushroom drug effects) and some cleanup
svn-id: r30914
Diffstat (limited to 'engines/kyra/scene_v2.cpp')
| -rw-r--r-- | engines/kyra/scene_v2.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/engines/kyra/scene_v2.cpp b/engines/kyra/scene_v2.cpp index 55252c3201..d14b2eeda3 100644 --- a/engines/kyra/scene_v2.cpp +++ b/engines/kyra/scene_v2.cpp @@ -251,7 +251,7 @@ void KyraEngine_v2::enterNewSceneUnk2(int unk1) { if (!unk1) { runSceneScript4(0); - sceneStartupChat(); + zanthSceneStartupChat(); } _unk4 = 0; @@ -507,22 +507,6 @@ void KyraEngine_v2::runSceneScript7() { _screen->_curPage = oldPage; } -void KyraEngine_v2::sceneStartupChat() { - int tableIndex = _mainCharacter.sceneId - READ_LE_UINT16(&_ingameTalkObjIndex[5 + _newChapterFile]); - if (queryGameFlag(0x159) || _newSceneDlgState[tableIndex]) - return; - - int csEntry, vocH, scIndex1, scIndex2; - updateDlgBuffer(); - loadDlgHeader(csEntry, vocH, scIndex1, scIndex2); - - uint8 bufferIndex = 8 + scIndex1 * 6 + scIndex2 * 4 + tableIndex * 2; - int offs = READ_LE_UINT16(_dlgBuffer + bufferIndex); - processDialogue(offs, vocH, csEntry); - - _newSceneDlgState[tableIndex] = 1; -} - void KyraEngine_v2::initSceneAnims(int unk1) { for (int i = 0; i < ARRAYSIZE(_animObjects); ++i) _animObjects[i].enabled = 0; |