aboutsummaryrefslogtreecommitdiff
path: root/engines/mortevielle
diff options
context:
space:
mode:
authorStrangerke2013-07-17 20:32:50 +0200
committerStrangerke2013-07-18 20:29:19 +0200
commit69f593ad1e199a8768ed2a0b5a618b0ffaa353ae (patch)
tree50318faceb34829276249cbe63b1a23c1f6eba6f /engines/mortevielle
parenta888de559944dffdffb77d339b7758eb867ea6a0 (diff)
downloadscummvm-rg350-69f593ad1e199a8768ed2a0b5a618b0ffaa353ae.tar.gz
scummvm-rg350-69f593ad1e199a8768ed2a0b5a618b0ffaa353ae.tar.bz2
scummvm-rg350-69f593ad1e199a8768ed2a0b5a618b0ffaa353ae.zip
MORTEVIELLE: Some renaming in intro functions
Diffstat (limited to 'engines/mortevielle')
-rw-r--r--engines/mortevielle/dialogs.cpp20
-rw-r--r--engines/mortevielle/dialogs.h6
-rw-r--r--engines/mortevielle/mortevielle.cpp4
3 files changed, 19 insertions, 11 deletions
diff --git a/engines/mortevielle/dialogs.cpp b/engines/mortevielle/dialogs.cpp
index 69cb81b4ef..1e82863237 100644
--- a/engines/mortevielle/dialogs.cpp
+++ b/engines/mortevielle/dialogs.cpp
@@ -423,7 +423,7 @@ void DialogManager::drawF3F8() {
* Graphical Device if modified
* @remarks Originally called 'diver'
*/
-void DialogManager::checkForF8(int SpeechNum, bool drawAni50Fl) {
+void DialogManager::checkForF8(int SpeechNum, bool drawFrame2Fl) {
_vm->testKeyboard();
do {
_vm->_speechManager.startSpeech(SpeechNum, 0, 0);
@@ -434,7 +434,7 @@ void DialogManager::checkForF8(int SpeechNum, bool drawAni50Fl) {
if (_vm->_newGraphicalDevice != _vm->_currGraphicalDevice) {
_vm->_currGraphicalDevice = _vm->_newGraphicalDevice;
_vm->hirs();
- aff50(drawAni50Fl);
+ displayIntroScreen(drawFrame2Fl);
}
} while (_vm->_key != 66); // keycode for F8
}
@@ -455,13 +455,17 @@ int DialogManager::waitForF3F8() {
return key;
}
-void DialogManager::aff50(bool drawAni50Fl) {
+/**
+ * Intro function - display intro screen
+ * @remarks Originally called 'aff50'
+ */
+void DialogManager::displayIntroScreen(bool drawFrame2Fl) {
_vm->_caff = 50;
_vm->_maff = 0;
_vm->_text.taffich();
_vm->draw(kAdrDes, 63, 12);
- if (drawAni50Fl)
- ani50();
+ if (drawFrame2Fl)
+ displayIntroFrame2();
else
_vm->handleDescriptionText(2, kDialogStringIndex + 142);
@@ -469,7 +473,11 @@ void DialogManager::aff50(bool drawAni50Fl) {
drawF3F8();
}
-void DialogManager::ani50() {
+/**
+ * Intro function - display 2nd frame of intro
+ * @remarks Originally called 'ani50'
+ */
+void DialogManager::displayIntroFrame2() {
_vm->_crep = _vm->animof(1, 1);
_vm->pictout(kAdrAni, _vm->_crep, 63, 12);
_vm->_crep = _vm->animof(2, 1);
diff --git a/engines/mortevielle/dialogs.h b/engines/mortevielle/dialogs.h
index 35c3c34cac..af667e40c5 100644
--- a/engines/mortevielle/dialogs.h
+++ b/engines/mortevielle/dialogs.h
@@ -54,10 +54,10 @@ public:
void setParent(MortevielleEngine *vm);
int show(const Common::String &msg, int n);
void drawF3F8();
- void checkForF8(int SpeechNum, bool drawAni50Fl);
+ void checkForF8(int SpeechNum, bool drawFrame2Fl);
int waitForF3F8();
- void aff50(bool drawAni50Fl);
- void ani50();
+ void displayIntroScreen(bool drawFrame2Fl);
+ void displayIntroFrame2();
bool showKnowledgeCheck();
};
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index 8ed6751b50..3505205977 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -365,13 +365,13 @@ Common::Error MortevielleEngine::run() {
* Show the game introduction
*/
void MortevielleEngine::showIntroduction() {
- _dialogManager.aff50(false);
+ _dialogManager.displayIntroScreen(false);
_speechManager._mlec = 0;
_dialogManager.checkForF8(142, false);
if (shouldQuit())
return;
- _dialogManager.ani50();
+ _dialogManager.displayIntroFrame2();
_dialogManager.checkForF8(143, true);
if (shouldQuit())
return;