diff options
| author | Johannes Schickel | 2011-02-10 01:19:48 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2011-02-10 01:19:48 +0000 |
| commit | 24eab0ac73f293f5f05344c3278ca5dcfd76dacd (patch) | |
| tree | 280cda410c93e9bcba0ef88beaae129b6399f810 /engines/kyra/text_mr.cpp | |
| parent | a9361da157da8ad1672fdb930758952017dbf7b8 (diff) | |
| download | scummvm-rg350-24eab0ac73f293f5f05344c3278ca5dcfd76dacd.tar.gz scummvm-rg350-24eab0ac73f293f5f05344c3278ca5dcfd76dacd.tar.bz2 scummvm-rg350-24eab0ac73f293f5f05344c3278ca5dcfd76dacd.zip | |
KYRA: Rename KyraEngine_MR::runDialog to doDialog to avoid name clashes with Engine::runDialog.
svn-id: r55864
Diffstat (limited to 'engines/kyra/text_mr.cpp')
| -rw-r--r-- | engines/kyra/text_mr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/kyra/text_mr.cpp b/engines/kyra/text_mr.cpp index 726d9e339f..98c6ef3130 100644 --- a/engines/kyra/text_mr.cpp +++ b/engines/kyra/text_mr.cpp @@ -860,7 +860,7 @@ void KyraEngine_MR::randomSceneChat() { processDialog(vocHighIndex, vocHighBase, 0); } -void KyraEngine_MR::runDialog(int dlgIndex, int funcNum) { +void KyraEngine_MR::doDialog(int dlgIndex, int funcNum) { switch (_currentChapter-2) { case 0: dlgIndex -= 34; |