PRINCE: Rename runDialog() into dialogRun() to avoid clash with Engin…

…e::runDialog()
scummvm · Oct 10, 2014 · 24dd5d1 · 24dd5d1
1 parent 6419a0d
commit 24dd5d1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -491,7 +491,7 @@ class PrinceEngine : public Engine {
 	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
@@ -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;