diff --git a/source/frontend/fmvintro.cpp b/source/frontend/fmvintro.cpp index 42ccd005f..4c0b94458 100644 --- a/source/frontend/fmvintro.cpp +++ b/source/frontend/fmvintro.cpp @@ -22,6 +22,9 @@ #include "fmv\fmv.h" #endif +#ifndef __VID_HEADER_ +#include "system\vid.h" +#endif #ifndef __GFX_FADER_H__ #include "gfx\fader.h" @@ -79,6 +82,7 @@ static bool fmvPerFrameFunc() ---------------------------------------------------------------------- */ void CFrontEndFMVIntro::select() { + StopLoad(); FMV_play(FMV_INTRO,&fmvPerFrameFunc); } diff --git a/source/frontend/fmvthq.cpp b/source/frontend/fmvthq.cpp index d9cc3d68f..eb55e991c 100644 --- a/source/frontend/fmvthq.cpp +++ b/source/frontend/fmvthq.cpp @@ -22,6 +22,9 @@ #include "fmv\fmv.h" #endif +#ifndef __VID_HEADER_ +#include "system\vid.h" +#endif #ifndef __GFX_FADER_H__ #include "gfx\fader.h" @@ -79,6 +82,7 @@ static bool fmvPerFrameFunc() ---------------------------------------------------------------------- */ void CFrontEndFMVTHQ::select() { + StopLoad(); FMV_play(FMV_THQ,&fmvPerFrameFunc); FMV_play(FMV_CLIMAX,&fmvPerFrameFunc); } diff --git a/source/system/vid.cpp b/source/system/vid.cpp index e8c4b2bc5..e07788e4c 100644 --- a/source/system/vid.cpp +++ b/source/system/vid.cpp @@ -114,18 +114,19 @@ void StartLoad(int _loadX,int _loadY) /*****************************************************************************/ void StopLoad() { - + if(DrawLoadIcon) + { #if defined(__USER_CDBUILD__) - while(LoadTime) - { - VSync(0); - } + while(LoadTime) + { + VSync(0); + } #endif - Screen[0].Draw.isbg=Screen[1].Draw.isbg=1; - - DrawLoadIcon=0; - SYSTEM_DBGMSG("Stop Load"); + Screen[0].Draw.isbg=Screen[1].Draw.isbg=1; + DrawLoadIcon=0; + SYSTEM_DBGMSG("Stop Load"); + } } /*****************************************************************************/