zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Christoph Oelckers 2018-05-17 20:12:44 +02:00
parent c0837f42bd bcadd2bf04
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;
}
if (offset < 0 || offset >= Length) return -1;
if (offset < 0 || offset > Length) return -1;
FilePos = clamp<long>(offset, 0, Length);
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)
{
if (self <= 0.0 || self > 2.0)
if (self < 0.05 || self > 2.0)
self = 1.0;
}
@ -117,34 +117,22 @@ bool R_CalcsShouldBeBlocked()
CCMD (vid_scaletowidth)
{
float newscalefactor;
if (R_CalcsShouldBeBlocked())
return;
if (argv.argc() > 1)
newscalefactor = (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;
vid_scalefactor = (float)((double)vid_scalefactor * (double)atof(argv[1]) / (double)DisplayWidth);
R_ShowCurrentScaling();
}
CCMD (vid_scaletoheight)
{
float newscalefactor;
if (R_CalcsShouldBeBlocked())
return;
if (argv.argc() > 1)
newscalefactor = (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;
vid_scalefactor = (float)((double)vid_scalefactor * (double)atof(argv[1]) / (double)DisplayHeight);
R_ShowCurrentScaling();
}