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

- fixed: I misnamed the function in my last commit, it should've been called 'min' not 'max'

Browse source
This commit is contained in:
Rachael Alexanderson 2018-07-22 12:07:46 -04:00
parent 682b0ebf48
commit 8cb281bf42
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/r_videoscale.cpp
View file

@ -101,7 +101,7 @@ bool ViewportLinearScale()
return (vid_scalefactor > 1.0) ? true : vScaleTable[vid_scalemode].isLinear; return (vid_scalefactor > 1.0) ? true : vScaleTable[vid_scalemode].isLinear;
} }
inline int max(int a, int b) inline int min(int a, int b)
{ {
return (a < b) ? a : b; return (a < b) ? a : b;
} }
@ -112,7 +112,7 @@ int ViewportScaledWidth(int width, int height)
vid_scalemode = 0; vid_scalemode = 0;
if (vid_cropaspect && height > 0) if (vid_cropaspect && height > 0)
width = ((float)width/height > ActiveRatio(width, height)) ? (int)(height * ActiveRatio(width, height)) : width; width = ((float)width/height > ActiveRatio(width, height)) ? (int)(height * ActiveRatio(width, height)) : width;
return max(320, vScaleTable[vid_scalemode].GetScaledWidth((int)((float)width * vid_scalefactor))); return min(320, vScaleTable[vid_scalemode].GetScaledWidth((int)((float)width * vid_scalefactor)));
} }
int ViewportScaledHeight(int width, int height) int ViewportScaledHeight(int width, int height)
@ -121,7 +121,7 @@ int ViewportScaledHeight(int width, int height)
vid_scalemode = 0; vid_scalemode = 0;
if (vid_cropaspect && height > 0) if (vid_cropaspect && height > 0)
height = ((float)width/height < ActiveRatio(width, height)) ? (int)(width / ActiveRatio(width, height)) : height; height = ((float)width/height < ActiveRatio(width, height)) ? (int)(width / ActiveRatio(width, height)) : height;
return max(200, vScaleTable[vid_scalemode].GetScaledHeight((int)((float)height * vid_scalefactor))); return min(200, vScaleTable[vid_scalemode].GetScaledHeight((int)((float)height * vid_scalefactor)));
} }
bool ViewportIsScaled43() bool ViewportIsScaled43()