simplify FMV skip

This commit is contained in:
rr- 2021-03-17 00:24:00 +01:00
parent fd869be83a
commit a092dec799
2 changed files with 14 additions and 16 deletions

View file

@ -38,6 +38,10 @@ void S_Wait(int32_t nframes)
int32_t WinPlayFMV(int32_t sequence, int32_t mode)
{
if (T1MConfig.disable_fmv) {
return -1;
}
int32_t result = 0;
void *movie_context = NULL;
void *fmv_context = NULL;
@ -138,10 +142,6 @@ cleanup:
int32_t S_PlayFMV(int32_t sequence, int32_t mode)
{
if (T1MConfig.disable_fmv) {
return -1;
}
if (GameMemoryPointer) {
free(GameMemoryPointer);
}

View file

@ -99,20 +99,18 @@ void GameMain()
sub_408E41();
S_Wait(60);
if (!T1MConfig.disable_fmv) {
if (IsHardwareRenderer) {
HardwarePrepareFMV();
}
WinPlayFMV(FMV_CORE, 1);
WinPlayFMV(FMV_ESCAPE, 1);
WinPlayFMV(FMV_INTRO, 1);
if (IsHardwareRenderer) {
HardwarePrepareFMV();
}
WinPlayFMV(FMV_CORE, 1);
WinPlayFMV(FMV_ESCAPE, 1);
WinPlayFMV(FMV_INTRO, 1);
if (!IsHardwareRenderer) {
HiRes = -1;
} else {
HardwareFMVDone();
if (!IsHardwareRenderer) {
HiRes = -1;
} else {
HardwareFMVDone();
if (!IsHardwareRenderer) {
HiRes = -1;
}
}
}