diff options
| author | Johannes Schickel | 2008-05-04 13:07:13 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-05-04 13:07:13 +0000 |
| commit | c43cbeae967b779d5869b382b79ce5380d1a81d8 (patch) | |
| tree | efc2d808b0e31ce76bb92e6da5384d2e8ae869fe /engines/kyra/text_mr.cpp | |
| parent | ecde0b88c7d286369aa49d49dccdf828ce2090d9 (diff) | |
| download | scummvm-rg350-c43cbeae967b779d5869b382b79ce5380d1a81d8.tar.gz scummvm-rg350-c43cbeae967b779d5869b382b79ce5380d1a81d8.tar.bz2 scummvm-rg350-c43cbeae967b779d5869b382b79ce5380d1a81d8.zip | |
Moved more opcodes to KyraEngine_v2.
svn-id: r31859
Diffstat (limited to 'engines/kyra/text_mr.cpp')
| -rw-r--r-- | engines/kyra/text_mr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/text_mr.cpp b/engines/kyra/text_mr.cpp index b1c2bc9eec..309637303a 100644 --- a/engines/kyra/text_mr.cpp +++ b/engines/kyra/text_mr.cpp @@ -556,10 +556,10 @@ void KyraEngine_MR::loadDlgHeader(int &vocHighBase, int &vocHighIndex, int &inde index2 = _cnvFile->readSint16LE(); } -void KyraEngine_MR::setDlgIndex(uint16 index) { +void KyraEngine_MR::setDlgIndex(int index) { debugC(9, kDebugLevelMain, "KyraEngine_MR::setDlgIndex(%d)", index); if (_mainCharacter.dlgIndex != index) { - Common::set_to(_newSceneDlgState, _newSceneDlgState+ARRAYSIZE(_newSceneDlgState), 0); + memset(_newSceneDlgState, 0, sizeof(_newSceneDlgState)); memset(_conversationState, -1, sizeof(_conversationState)); _chatAltFlag = false; _mainCharacter.dlgIndex = index; @@ -746,8 +746,8 @@ void KyraEngine_MR::npcChatSequence(const char *str, int object, int vocHigh, in _chatObject= - 1; } -void KyraEngine_MR::malcolmRandomChat() { - debugC(9, kDebugLevelMain, "KyraEngine_MR::malcolmRandomChat()"); +void KyraEngine_MR::randomSceneChat() { + debugC(9, kDebugLevelMain, "KyraEngine_MR::randomSceneChat()"); updateDlgBuffer(); int index = (_mainCharacter.sceneId - _chapterLowestScene[_currentChapter]) * 2; |