zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-25 13:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

- cleaned up vid_scaleto____ code a bit, also set a sane lower limit for vid_scalefactor, removed some code redundancy

Browse source
This commit is contained in:
Rachael Alexanderson 2018-05-17 06:24:21 -04:00
parent 42668c6a5a
commit 0f36b9d63f
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/r_videoscale.cpp
View file

@ -55,7 +55,7 @@ namespace
CUSTOM_CVAR(Float, vid_scalefactor, 1.0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) CUSTOM_CVAR(Float, vid_scalefactor, 1.0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
{ {
if (self <= 0.0 || self > 2.0) if (self < 0.05 || self > 2.0)
self = 1.0; self = 1.0;
} }
@ -123,12 +123,8 @@ CCMD (vid_scaletowidth)
return; return;
if (argv.argc() > 1) if (argv.argc() > 1)
newscalefactor = (float)((double)vid_scalefactor * (double)atof(argv[1]) / (double)DisplayWidth); vid_scalefactor = (float)((double)vid_scalefactor * (double)atof(argv[1]) / (double)DisplayWidth);
else
newscalefactor = vid_scalefactor;
if ( newscalefactor > 2.0 || newscalefactor <= 0.0 )
newscalefactor = 1.0;
vid_scalefactor = newscalefactor;
R_ShowCurrentScaling(); R_ShowCurrentScaling();
} }
@ -140,11 +136,7 @@ CCMD (vid_scaletoheight)
return; return;
if (argv.argc() > 1) if (argv.argc() > 1)
newscalefactor = (float)((double)vid_scalefactor * (double)atof(argv[1]) / (double)DisplayHeight); vid_scalefactor = (float)((double)vid_scalefactor * (double)atof(argv[1]) / (double)DisplayHeight);
else
newscalefactor = vid_scalefactor;
if ( newscalefactor > 2.0 || newscalefactor <= 0.0 )
newscalefactor = 1.0;
vid_scalefactor = newscalefactor;
R_ShowCurrentScaling(); R_ShowCurrentScaling();
} }