From 42668c6a5ad559c8fe7e487555a9a16af35a6b52 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Thu, 17 May 2018 10:19:29 +0300 Subject: [PATCH 1/3] - fixed seeking end of file in memory reader https://forum.zdoom.org/viewtopic.php?t=60611 --- src/files.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/files.cpp b/src/files.cpp index fee5123ff8..3e288a0fd0 100644 --- a/src/files.cpp +++ b/src/files.cpp @@ -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(offset, 0, Length); return 0; } From 0f36b9d63fdbaeff3fa281de678aead2fdd0e3ac Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Thu, 17 May 2018 06:24:21 -0400 Subject: [PATCH 2/3] - cleaned up vid_scaleto____ code a bit, also set a sane lower limit for vid_scalefactor, removed some code redundancy --- src/r_videoscale.cpp | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/r_videoscale.cpp b/src/r_videoscale.cpp index 752e34518a..3795387832 100644 --- a/src/r_videoscale.cpp +++ b/src/r_videoscale.cpp @@ -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; } @@ -123,12 +123,8 @@ CCMD (vid_scaletowidth) 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(); } @@ -140,11 +136,7 @@ CCMD (vid_scaletoheight) 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(); } From bcadd2bf045fba0c449a89e622b43063420a418c Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Thu, 17 May 2018 06:30:36 -0400 Subject: [PATCH 3/3] - also remove unused forward declarations --- src/r_videoscale.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/r_videoscale.cpp b/src/r_videoscale.cpp index 3795387832..a245990c6d 100644 --- a/src/r_videoscale.cpp +++ b/src/r_videoscale.cpp @@ -117,8 +117,6 @@ bool R_CalcsShouldBeBlocked() CCMD (vid_scaletowidth) { - float newscalefactor; - if (R_CalcsShouldBeBlocked()) return; @@ -130,8 +128,6 @@ CCMD (vid_scaletowidth) CCMD (vid_scaletoheight) { - float newscalefactor; - if (R_CalcsShouldBeBlocked()) return;