From 24dd5d1f531c57fd21d3fe3a37a0c9e3d9f6cdca Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 10 Oct 2014 14:07:28 +0200
Subject: PRINCE: Rename runDialog() into dialogRun() to avoid clash with
 Engine::runDialog()

---
 engines/prince/prince.cpp | 2 +-
 engines/prince/prince.h   | 2 +-
 engines/prince/script.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/prince')

diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 51748b30d9..b5a652e02e 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -2773,7 +2773,7 @@ void PrinceEngine::createDialogBox(int dialogBoxNr) {
 	_dialogImage->fillRect(dBoxRect, _graph->kShadowColor);
 }
 
-void PrinceEngine::runDialog() {
+void PrinceEngine::dialogRun() {
 
 	_dialogFlag = true;
 
diff --git a/engines/prince/prince.h b/engines/prince/prince.h
index 3d10c671f0..bc258cbe5c 100644
--- a/engines/prince/prince.h
+++ b/engines/prince/prince.h
@@ -491,7 +491,7 @@ public:
 	Graphics::Surface *_dialogImage;
 
 	void createDialogBox(int dialogBoxNr);
-	void runDialog();
+	void dialogRun();
 	void talkHero(int slot);
 	void doTalkAnim(int animNumber, int slot, AnimType animType);
 
diff --git a/engines/prince/script.cpp b/engines/prince/script.cpp
index 75d084f639..8f1aa9fede 100644
--- a/engines/prince/script.cpp
+++ b/engines/prince/script.cpp
@@ -1586,7 +1586,7 @@ void Interpreter::O_SHOWDIALOGBOX() {
 	_flags->setFlagValue(Flags::DIALINES, _vm->_dialogLines);
 	if (_vm->_dialogLines) {
 		_vm->changeCursor(1);
-		_vm->runDialog();
+		_vm->dialogRun();
 		_vm->changeCursor(0);
 	}
 	_currentInstruction = currInstr;
-- 
cgit v1.2.3