diff options
Diffstat (limited to 'engines/mortevielle/mortevielle.cpp')
| -rw-r--r-- | engines/mortevielle/mortevielle.cpp | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp index 6a7f84c18c..b35e98611c 100644 --- a/engines/mortevielle/mortevielle.cpp +++ b/engines/mortevielle/mortevielle.cpp @@ -30,7 +30,7 @@ #include "graphics/pixelformat.h" #include "mortevielle/mortevielle.h" #include "mortevielle/actions.h" -#include "mortevielle/alert.h" +#include "mortevielle/dialogs.h" #include "mortevielle/asm.h" #include "mortevielle/keyboard.h" #include "mortevielle/level15.h" @@ -467,13 +467,13 @@ Common::Error MortevielleEngine::run() { * Show the game introduction */ void MortevielleEngine::showIntroduction() { - aff50(false); + f3f8::aff50(false); mlec = 0; - divers(142, false); + f3f8::divers(142, false); CHECK_QUIT; - ani50(); - divers(143, true); + f3f8::ani50(); + f3f8::divers(143, true); CHECK_QUIT; // TODO: Once music is implemented, only use the below delay if music is turned off @@ -482,21 +482,6 @@ void MortevielleEngine::showIntroduction() { music(); } -void MortevielleEngine::divers(int np, bool b) { - teskbd(); - do { - parole(np, 0, 0); - atf3f8(key); - CHECK_QUIT; - - if (newgd != gd) { - gd = newgd; - hirs(); - aff50(b); - } - } while (!(key == 66)); -} - /** * Main game loop. Handles potentially playing the game multiple times, such as if the player * loses, and chooses to start playing the game again. @@ -583,7 +568,7 @@ void MortevielleEngine::handleAction() { if (choisi && (msg[3] == charge)) g_vm->_savegameManager.loadGame((msg[4] & 7) - 1); if (inkey == '\103') { /* F9 */ - temps = do_alert(stpou, 1); + temps = Alert::show(stpou, 1); return; } else if (inkey == '\77') { if ((mnumo != no_choice) && ((msg[3] == action) || (msg[3] == saction))) { |