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

Merge branch 'master' of https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Christoph Oelckers 2018-05-17 20:12:44 +02:00
commit da1cdf65c3
2 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/files.cpp
View file

@ -258,7 +258,7 @@ long MemoryReader::Seek(long offset, int origin)
break; break;
} }
if (offset < 0 || offset >= Length) return -1; if (offset < 0 || offset > Length) return -1;
FilePos = clamp<long>(offset, 0, Length); FilePos = clamp<long>(offset, 0, Length);
return 0; return 0;
} }

22
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;
} }
@ -117,34 +117,22 @@ bool R_CalcsShouldBeBlocked()
CCMD (vid_scaletowidth) CCMD (vid_scaletowidth)
{ {
float newscalefactor;
if (R_CalcsShouldBeBlocked()) if (R_CalcsShouldBeBlocked())
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();
} }
CCMD (vid_scaletoheight) CCMD (vid_scaletoheight)
{ {
float newscalefactor;
if (R_CalcsShouldBeBlocked()) if (R_CalcsShouldBeBlocked())
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();
} }