aboutsummaryrefslogtreecommitdiff
path: root/engines/prince
diff options
context:
space:
mode:
authorEugene Sandulenko2014-10-10 14:07:28 +0200
committerEugene Sandulenko2014-10-10 14:08:15 +0200
commit24dd5d1f531c57fd21d3fe3a37a0c9e3d9f6cdca (patch)
tree96983fc2b5addc64a7b48c5569f9b276c00689cc /engines/prince
parent6419a0da5ea501581b7571e679203638757d6338 (diff)
downloadscummvm-rg350-24dd5d1f531c57fd21d3fe3a37a0c9e3d9f6cdca.tar.gz
scummvm-rg350-24dd5d1f531c57fd21d3fe3a37a0c9e3d9f6cdca.tar.bz2
scummvm-rg350-24dd5d1f531c57fd21d3fe3a37a0c9e3d9f6cdca.zip
PRINCE: Rename runDialog() into dialogRun() to avoid clash with Engine::runDialog()
Diffstat (limited to 'engines/prince')
-rw-r--r--engines/prince/prince.cpp2
-rw-r--r--engines/prince/prince.h2
-rw-r--r--engines/prince/script.cpp2
3 files changed, 3 insertions, 3 deletions
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;