shithub: choc

Info  •  Files  •  Log  •  Branches

Remove autoadjust_video_settings variable.

Now that we are always doing hardware-based scaling, this variable
no longer does anything. In the past this used to fix broken config
files which referred to nonexistent screen modes and scaling factors,
but none of that is relevant any more.

--- a/src/i_video.c

+++ b/src/i_video.c

@@ -112,11 +112,6 @@

 int screen_width = SCREENWIDTH;

 int screen_height = SCREENHEIGHT;

-// Automatically adjust video settings if the selected mode is 

-// not a valid video mode.

-

-static int autoadjust_video_settings = 1;

-

 // Run in full screen mode?  (int type for config code)

 int fullscreen = true;

@@ -1239,7 +1234,6 @@

 void I_BindVideoVariables(void)

 {

     M_BindIntVariable("use_mouse",                 &usemouse);

-    M_BindIntVariable("autoadjust_video_settings", &autoadjust_video_settings);

     M_BindIntVariable("fullscreen",                &fullscreen);

     M_BindIntVariable("aspect_ratio_correct",      &aspect_ratio_correct);

     M_BindIntVariable("startup_delay",             &startup_delay);

--- a/src/m_config.c

+++ b/src/m_config.c

@@ -697,14 +697,6 @@

     CONFIG_VARIABLE_INT(graphical_startup),

     //!

-    // If non-zero, video settings will be autoadjusted to a valid

-    // configuration when the screen_width and screen_height variables

-    // do not match any valid configuration.

-    //

-

-    CONFIG_VARIABLE_INT(autoadjust_video_settings),

-

-    //!

     // If non-zero, the game will run in full screen mode.  If zero,

     // the game will run in a window.

     //

--- a/src/setup/display.c

+++ b/src/setup/display.c

@@ -69,7 +69,6 @@

 static char *video_driver = "";

 static char *window_position = "";

-static int autoadjust_video_settings = 1;

 static int aspect_ratio_correct = 1;

 static int fullscreen = 1;

 static int screen_width = 320;

@@ -340,7 +339,6 @@

 void BindDisplayVariables(void)

 {

-    M_BindIntVariable("autoadjust_video_settings", &autoadjust_video_settings);

     M_BindIntVariable("aspect_ratio_correct",      &aspect_ratio_correct);

     M_BindIntVariable("fullscreen",                &fullscreen);

     M_BindIntVariable("screen_width",              &screen_width);