TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Open movie file before changing GUI

Browse source
This commit is contained in:
Kp 2015-04-26 20:15:56 +00:00
parent 6792c1bc4b
commit 144477f92a
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
d2x-rebirth/main/movie.cpp
View file

@ -368,11 +368,9 @@ static window_event_result MovieHandler(window *, const d_event &event, movie *m
//returns status. see movie.h
int RunMovie(char *filename, int hires_flag, int must_have,int dx,int dy)
{
window *wind;
movie m;
int track = 0;
int aborted = 0;
int reshow = 0;
#ifdef OGL
palette_array_t pal_save;
#endif
@ -382,16 +380,6 @@ int RunMovie(char *filename, int hires_flag, int must_have,int dx,int dy)
m.frame_num = 0;
m.paused = 0;
reshow = hide_menus();
wind = window_create(&grd_curscreen->sc_canvas, 0, 0, SWIDTH, SHEIGHT, MovieHandler, &m);
if (!wind)
{
if (reshow)
show_menus();
return MOVIE_NOT_PLAYED;
}
// Open Movie file. If it doesn't exist, no movie, just return.
auto filehndl = PHYSFSRWOPS_openRead(filename);
@ -399,7 +387,12 @@ int RunMovie(char *filename, int hires_flag, int must_have,int dx,int dy)
{
if (must_have)
con_printf(CON_URGENT, "Can't open movie <%s>: %s", filename, PHYSFS_getLastError());
window_close(wind);
return MOVIE_NOT_PLAYED;
}
const auto reshow = hide_menus();
const auto wind = window_create(&grd_curscreen->sc_canvas, 0, 0, SWIDTH, SHEIGHT, MovieHandler, &m);
if (!wind)
{
if (reshow)
show_menus();
return MOVIE_NOT_PLAYED;