Ticket #8561: kyra2.diff

engines/kyra/module.mk

@@ -17 +17 @@
         script.o \
         seqplayer.o \
         sequences_v1.o \
+        sequences_v2.o \
         sound_adlib.o \
         sound_digital.o \
         sound.o \

engines/kyra/kyra2.cpp

@@ -22 +22 @@
 
 #include "kyra/kyra.h"
 #include "kyra/kyra2.h"
-#include "kyra/screen.h"
-#include "kyra/wsamovie.h"
 
 #include "common/system.h"
 
@@ -37 +35 @@
 }
 
 int KyraEngine_v2::go() {
-        uint8 pal[768];
-
-        WSAMovieV2 *title = new WSAMovieV2(this);
-        title->open("title.WSA", 0, pal);
-        assert(title->opened());
-
-        _screen->setScreenPalette(pal);
-        title->setX(0); title->setY(0);
-        title->setDrawPage(0);
-        for (int i = 0; i < 26 && !_quitFlag; ++i) {
-                uint32 nextRun = _system->getMillis() + 6 * _tickLength;
-                title->displayFrame(i);
-                _screen->updateScreen();
-                delayUntil(nextRun);
-        }
-
-        delete title;
-
+        seq_menu();
         waitForEvent();
         return 0;
 }

engines/kyra/kyra2.h

@@ -33 +33 @@
         int setupGameFlags() { _game = GI_KYRA2; return 0; }
         
         int go();
+
+protected:
+        void seq_menu();
 };
 
 } // end of namespace Kyra