[Scummvm-cvs-logs] scummvm master -> 24dd5d1f531c57fd21d3fe3a37a0c9e3d9f6cdca
sev-
sev at scummvm.org
Fri Oct 10 14:09:13 CEST 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
24dd5d1f53 PRINCE: Rename runDialog() into dialogRun() to avoid clash with Engine::runDialog()
Commit: 24dd5d1f531c57fd21d3fe3a37a0c9e3d9f6cdca
https://github.com/scummvm/scummvm/commit/24dd5d1f531c57fd21d3fe3a37a0c9e3d9f6cdca
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-10-10T14:08:15+02:00
Commit Message:
PRINCE: Rename runDialog() into dialogRun() to avoid clash with Engine::runDialog()
Changed paths:
engines/prince/prince.cpp
engines/prince/prince.h
engines/prince/script.cpp
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 51748b3..b5a652e 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 3d10c67..bc258cb 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 75d084f..8f1aa9f 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;
More information about the Scummvm-git-logs
mailing list