diff options
| author | Johannes Schickel | 2008-03-15 21:11:22 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-03-15 21:11:22 +0000 |
| commit | 3da00ccc798ea18b523c2d79a7c58ee00783b365 (patch) | |
| tree | 6e31dc8111dac4b51477f832c9ce77bb4808c0a7 | |
| parent | db3e317ab3eebe6d8edeca5a87e8e0426ca08a62 (diff) | |
| download | scummvm-rg350-3da00ccc798ea18b523c2d79a7c58ee00783b365.tar.gz scummvm-rg350-3da00ccc798ea18b523c2d79a7c58ee00783b365.tar.bz2 scummvm-rg350-3da00ccc798ea18b523c2d79a7c58ee00783b365.zip | |
- cleanup
- enabled some chat related code in KyraEngine_v2::runLoop and KyraEngine_v2::handleInputUnkSub
svn-id: r31134
| -rw-r--r-- | engines/kyra/kyra_v2.cpp | 35 | ||||
| -rw-r--r-- | engines/kyra/kyra_v2.h | 1 |
2 files changed, 17 insertions, 19 deletions
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index 57a144107c..6180645368 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -318,7 +318,6 @@ void KyraEngine_v2::startup() { for (int i = 0; i < ARRAYSIZE(_wsaSlots); ++i) _wsaSlots[i] = new WSAMovieV2(this); - _maskPage = 0;//_screen->getPagePtr(5); _screen->_curPage = 0; _talkObjectList = new TalkObject[72]; @@ -406,22 +405,22 @@ void KyraEngine_v2::runLoop() { enterNewScene(39, -1, 0, 0, 0); } - //if (queryGameFlag(0xD8)) { - // resetGameFlag(0xD8); - // if (_mainCharacter.sceneId == 34) { - // if (queryGameFlag(0xD1) { - // initObject(28); - // sub_2741F(getTableString(0xFA, _cCodeBuffer, 1), 28, 0x83, 0xFA); - // deinitObject(28); - // enterNewScene(35, 4, 0, 0, 0); - // } else if (queryGameFlag(0xD0) { - // initObject(29); - // sub_2741F(getTableString(0xFB, _ccodeBuffer, 1), 29, 0x83, 0xFB); - // deinitObject(29); - // enterNewScene(33, 6, 0, 0, 0); - // } - // } - //} + if (queryGameFlag(0xD8)) { + resetGameFlag(0xD8); + if (_mainCharacter.sceneId == 34) { + if (queryGameFlag(0xD1)) { + initTalkObject(28); + npcChatSequence(getTableString(0xFA, _cCodeBuffer, 1), 28, 0x83, 0xFA); + deinitTalkObject(28); + enterNewScene(35, 4, 0, 0, 0); + } else if (queryGameFlag(0xD0)) { + initTalkObject(29); + npcChatSequence(getTableString(0xFB, _cCodeBuffer, 1), 29, 0x83, 0xFB); + deinitTalkObject(29); + enterNewScene(33, 6, 0, 0, 0); + } + } + } int inputFlag = checkInput(_buttonList); removeInputTop(); @@ -548,7 +547,7 @@ bool KyraEngine_v2::handleInputUnkSub(int x, int y) { if (_handItemSet <= -3 && findItem(_mainCharacter.sceneId, 13) >= 0) { updateCharFacing(); - //objectChat(getTableString(0xFC, _cCodeBuffer, 1), 0, 0x83, 0xFC); + objectChat(getTableString(0xFC, _cCodeBuffer, 1), 0, 0x83, 0xFC); return true; } else { _scriptInterpreter->initScript(&_sceneScriptState, &_sceneScriptData); diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h index e2ccac50b0..b6b98ad8c2 100644 --- a/engines/kyra/kyra_v2.h +++ b/engines/kyra/kyra_v2.h @@ -330,7 +330,6 @@ protected: void backUpPage0(); void restorePage0(); - uint8 *_maskPage; uint8 *_gfxBackUpRect; void backUpGfxRect24x24(int x, int y); |