From 24eab0ac73f293f5f05344c3278ca5dcfd76dacd Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 10 Feb 2011 01:19:48 +0000
Subject: KYRA: Rename KyraEngine_MR::runDialog to doDialog to avoid name
 clashes with Engine::runDialog.

svn-id: r55864
---
 engines/kyra/kyra_mr.h     | 4 ++--
 engines/kyra/script_mr.cpp | 8 ++++----
 engines/kyra/text_mr.cpp   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h
index 5916dae4b1..fd31089953 100644
--- a/engines/kyra/kyra_mr.h
+++ b/engines/kyra/kyra_mr.h
@@ -473,7 +473,7 @@ private:
 	int o3d_delay(EMCState *script);
 
 	void randomSceneChat();
-	void runDialog(int dlgIndex, int funcNum);
+	void doDialog(int dlgIndex, int funcNum);
 
 	// conscience
 	bool _badConscienceShown;
@@ -644,7 +644,7 @@ private:
 	int o3_defineSceneAnim(EMCState *script);
 	int o3_updateSceneAnim(EMCState *script);
 	int o3_runActorScript(EMCState *script);
-	int o3_runDialog(EMCState *script);
+	int o3_doDialog(EMCState *script);
 	int o3_setConversationState(EMCState *script);
 	int o3_getConversationState(EMCState *script);
 	int o3_changeChapter(EMCState *script);
diff --git a/engines/kyra/script_mr.cpp b/engines/kyra/script_mr.cpp
index a9637a6378..5cd100b69c 100644
--- a/engines/kyra/script_mr.cpp
+++ b/engines/kyra/script_mr.cpp
@@ -946,9 +946,9 @@ int KyraEngine_MR::o3_runActorScript(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_MR::o3_runDialog(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_runDialog(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
-	runDialog(stackPos(0), stackPos(1));
+int KyraEngine_MR::o3_doDialog(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_doDialog(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+	doDialog(stackPos(0), stackPos(1));
 	return 0;
 }
 
@@ -1293,7 +1293,7 @@ void KyraEngine_MR::setupOpcodeTable() {
 	Opcode(o3_dummy);
 	// 0x74
 	Opcode(o3_runActorScript);
-	Opcode(o3_runDialog);
+	Opcode(o3_doDialog);
 	Opcode(o2_randomSceneChat);
 	Opcode(o2_setDlgIndex);
 	// 0x78
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;
-- 
cgit v1.2.3