From 6ad11339dfb77069936cd440f1f9c75ddae10eb1 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sun, 1 Feb 2015 22:12:43 -0800 Subject: [PATCH] use game res for movies if MenuGameres is set --- main/inferno.c | 2 +- main/movie.c | 6 +----- main/screens.h | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/main/inferno.c b/main/inferno.c index d3602957..93930e67 100644 --- a/main/inferno.c +++ b/main/inferno.c @@ -596,7 +596,7 @@ int main(int argc, char *argv[]) cvar_setint( &MovieHires, 0 ); con_printf(CON_VERBOSE, "Going into graphics mode...\n"); - vid_set_mode(MovieHires.intval?SM(640,480):SM(320,200)); + vid_set_mode(MOVIE_SCREEN_MODE); // Load the palette stuff. Returns non-zero if error. con_printf(CON_DEBUG, "Initializing palette system...\n" ); diff --git a/main/movie.c b/main/movie.c index 82e35456..98fbe2f8 100644 --- a/main/movie.c +++ b/main/movie.c @@ -290,11 +290,7 @@ int RunMovie(char *filename, int hires_flag, int must_have,int dx,int dy) MVE_sfCallbacks(MovieShowFrame); MVE_palCallbacks(MovieSetPalette); - if (hires_flag) { - vid_set_mode(SM(640,480)); - } else { - vid_set_mode(SM(320,200)); - } + vid_set_mode(MOVIE_SCREEN_MODE); #ifdef OGL set_screen_mode(SCREEN_MENU); #endif diff --git a/main/screens.h b/main/screens.h index eabed830..3680ea7e 100644 --- a/main/screens.h +++ b/main/screens.h @@ -39,6 +39,7 @@ extern int set_screen_mode(int sm); // True = editor screen extern cvar_t menu_use_game_res; #define MENU_SCREEN_MODE (menu_use_game_res.intval?Current_display_mode:(MenuHires?SM(640,480):SM(320,200))) +#define MOVIE_SCREEN_MODE (menu_use_game_res.intval?Current_display_mode:(MovieHires.intval?SM(640,480):SM(320,200))) //About the screen extern ubyte VR_screen_flags; -- 2.39.2