zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 23:02:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- replace the lost 320x200 resolution with 960x600

Browse source
This commit is contained in:
Rachael Alexanderson 2019-03-31 03:38:15 -04:00
parent ab16d3cd72
commit 3fd449378c
4 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gameconfigfile.cpp
View file

@ -487,6 +487,17 @@ void FGameConfigFile::DoGlobalSetup ()
}
}
}
if (last < 217)
{
auto var = FindCVar("vid_scalemode", NULL);
UCVarValue newvalue;
newvalue.Int = 2;
if (var != NULL)
{
UCVarValue v = var->GetGenericRep(CVAR_Int);
if (v.Int == 3) var->SetGenericRep(newvalue, CVAR_Int);
}
}
}
}
}

7
src/r_videoscale.cpp
View file

@ -66,8 +66,8 @@ namespace
// isValid, isLinear, GetScaledWidth(), GetScaledHeight(), isScaled43, isCustom
{ true, false, [](uint32_t Width)->uint32_t { return Width; }, [](uint32_t Height)->uint32_t { return Height; }, false, false }, // 0 - Native
{ true, true, [](uint32_t Width)->uint32_t { return Width; }, [](uint32_t Height)->uint32_t { return Height; }, false, false }, // 1 - Native (Linear)
{ true, false, [](uint32_t Width)->uint32_t { return 640; }, [](uint32_t Height)->uint32_t { return 400; }, true, false }, // 2 - formerly 320x200
{ true, false, [](uint32_t Width)->uint32_t { return 640; }, [](uint32_t Height)->uint32_t { return 400; }, true, false }, // 3 - 640x400
{ true, false, [](uint32_t Width)->uint32_t { return 640; }, [](uint32_t Height)->uint32_t { return 400; }, true, false }, // 2 - 640x400 (formerly 320x200)
{ true, true, [](uint32_t Width)->uint32_t { return 960; }, [](uint32_t Height)->uint32_t { return 600; }, true, false }, // 3 - 960x600 (formerly 640x400)
{ true, true, [](uint32_t Width)->uint32_t { return 1280; }, [](uint32_t Height)->uint32_t { return 800; }, true, false }, // 4 - 1280x800
{ true, true, [](uint32_t Width)->uint32_t { return vid_scale_customwidth; }, [](uint32_t Height)->uint32_t { return vid_scale_customheight; }, true, true }, // 5 - Custom
};
@ -90,8 +90,7 @@ CUSTOM_CVAR(Float, vid_scalefactor, 1.0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR
CUSTOM_CVAR(Int, vid_scalemode, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
{
setsizeneeded = true;
if (self == 2) self = 3; // block 320x200 setting.
else if (isOutOfBounds(self))
if (isOutOfBounds(self))
self = 0;
}

2
src/version.h
View file

@ -60,7 +60,7 @@ const char *GetVersionString();
// Version stored in the ini's [LastRun] section.
// Bump it if you made some configuration change that you want to
// be able to migrate in FGameConfigFile::DoGlobalSetup().
#define LASTRUNVERSION "216"
#define LASTRUNVERSION "217"
// Protocol version used in demos.
// Bump it if you change existing DEM_ commands or add new ones.

3
wadsrc/static/menudef.txt
View file

@ -2132,7 +2132,8 @@ OptionValue ScaleModes
{
0, "$OPTVAL_SCALENEAREST"
1, "$OPTVAL_SCALELINEAR"
3, "640x400"
2, "640x400"
3, "960x600"
4, "1280x800"
5, "$OPTVAL_CUSTOM"
}