commit 5a10d99d7b22dcb995a2bc477bff7f88d80c1a3b
Author: Simon Howard <fraggle@soulsphere.org>
AuthorDate: Tue May 31 22:49:49 2016 +0100
Commit: Simon Howard <fraggle@soulsphere.org>
CommitDate: Tue May 31 22:49:49 2016 +0100
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.
---
src/i_video.c | 6 ------
src/m_config.c | 8 --------
src/setup/display.c | 2 --
3 files changed, 16 deletions(-)
diff --git a/src/i_video.c b/src/i_video.c
index 03336d6d..bb48dc4b 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -112,11 +112,6 @@ int diskicon_readbytes = 0;
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_InitGraphics(void)
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);
diff --git a/src/m_config.c b/src/m_config.c
index 690aceb1..8f988691 100644
--- a/src/m_config.c
+++ b/src/m_config.c
@@ -696,14 +696,6 @@ static default_t extra_defaults_list[] =
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.
diff --git a/src/setup/display.c b/src/setup/display.c
index 7c06be3e..fbd49865 100644
--- a/src/setup/display.c
+++ b/src/setup/display.c
@@ -69,7 +69,6 @@ static int vidmode = 0;
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 ConfigDisplay(void)
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);