- fix vid_showcurrentscaling so that it works even when vid_scalemode is 2 or greater.

# Conflicts:
#	src/r_videoscale.cpp
This commit is contained in:
Rachael Alexanderson 2018-07-21 22:27:43 -04:00 committed by drfrag
parent 0ee488633b
commit 278c7db215

View file

@ -188,8 +188,8 @@ bool ViewportIsScaled43()
void R_ShowCurrentScaling()
{
int x1 = screen->GetWidth(), y1 = screen->GetHeight(), x2 = int(x1 * vid_scalefactor), y2 = int(y1 * vid_scalefactor);
Printf("Current Scale: %f\n", (float)(vid_scalefactor));
int x1 = screen->GetWidth(), y1 = screen->GetHeight(), x2 = ViewportScaledWidth(x1, y1), y2 = ViewportScaledHeight(x1, y1);
Printf("Current vid_scalefactor: %f\n", (float)(vid_scalefactor));
Printf("Real resolution: %i x %i\nEmulated resolution: %i x %i\n", x1, y1, x2, y2);
}