diff --git a/sc2/src/sc2code/fmv.c b/sc2/src/sc2code/fmv.c index 169a2c9b2..f08130e88 100644 --- a/sc2/src/sc2code/fmv.c +++ b/sc2/src/sc2code/fmv.c @@ -92,6 +92,7 @@ Introduction (void) LoadMasterShipList (); FlushInput (); InitGameKernel (); + while ((GetTimeCounter () <= TimeOut) && !(GLOBAL (CurrentActivity) & CHECK_ABORT)) { @@ -132,10 +133,7 @@ Introduction (void) if (InputState == 0) { - static BOOLEAN play_intro = TRUE; - - DoFMV (play_intro ? "intro" : "drumall", NULL, TRUE); - play_intro = !play_intro; + DoFMV ("slides/intro/intro.duk", NULL, TRUE); } } @@ -147,7 +145,7 @@ Victory (void) xform_buf[0] = FadeAllToBlack; SleepThreadUntil (XFormColorMap ((COLORMAPPTR)xform_buf, ONE_SECOND / 2)); - DoFMV ("victory", NULL, TRUE); + DoFMV ("slides/ending/victory.duk", NULL, TRUE); xform_buf[0] = FadeAllToBlack; XFormColorMap ((COLORMAPPTR)xform_buf, 0); diff --git a/sc2/src/sc2code/intro.c b/sc2/src/sc2code/intro.c index 4b8740741..6a258ab1d 100644 --- a/sc2/src/sc2code/intro.c +++ b/sc2/src/sc2code/intro.c @@ -30,12 +30,13 @@ void LoadMasterShipList (void); void DoFMV (char *name, char *loopname, BOOLEAN uninit) { - MEM_HANDLE vidref = 0; - VidPlay (vidref, loopname, uninit); - while(VidPlaying ()) - ; - VidStop(); - (void) name; + VIDEO_REF VidRef; + + VidRef = LoadVideoFile (name); + VidPlay (VidRef, loopname, uninit); + VidDoInput (); + VidStop (); + DestroyVideo (VidRef); } /* //Already defined in fmv.c diff --git a/sc2/src/sc2code/starcon.c b/sc2/src/sc2code/starcon.c index 161b7f73e..e299e0020 100644 --- a/sc2/src/sc2code/starcon.c +++ b/sc2/src/sc2code/starcon.c @@ -883,13 +883,13 @@ while (--ac > 0) } #endif //DEBUG_PSYTRON || CREATE_JOURNAL - Logo (); - if (LoadKernel (0,0)) { extern BOOLEAN StartGame (void); fprintf (stderr, "We've loaded the Kernel\n"); + + Logo (); // OpenJournal (); while (StartGame ()) diff --git a/sc2/src/sc2code/starcon.h b/sc2/src/sc2code/starcon.h index a652acd0e..836fabd3e 100644 --- a/sc2/src/sc2code/starcon.h +++ b/sc2/src/sc2code/starcon.h @@ -207,7 +207,7 @@ extern void StopVid (void); extern void PlayVid (MEM_HANDLE VidRef, BOOLEAN Continuous); extern MEM_HANDLE LoadVidFile (PSTR pStr); extern MEM_HANDLE LoadVidInstance (DWORD res); -extern MEM_HANDLE VidPlaying (void); +//extern MEM_HANDLE VidPlaying (void); // superseeded by VIDEO_REF version extern BOOLEAN DestroyVid (MEM_HANDLE VidRef); extern DRAWABLE CreatePixmapRegion (FRAME Frame, PPOINT pOrg, SIZE width,