From 0ee488633bf6d7ecc7f8c5fc62587d0af4d32d37 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Fri, 25 May 2018 10:59:48 +0300 Subject: [PATCH] - fixed compilation warning reported by MSVC src\r_videoscale.cpp(105): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data # Conflicts: # src/r_videoscale.cpp --- src/r_videoscale.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/r_videoscale.cpp b/src/r_videoscale.cpp index 2841b0364..f59f22b09 100644 --- a/src/r_videoscale.cpp +++ b/src/r_videoscale.cpp @@ -188,7 +188,7 @@ bool ViewportIsScaled43() void R_ShowCurrentScaling() { - int x1 = screen->GetWidth(), y1 = screen->GetHeight(), x2 = x1 * vid_scalefactor, y2 = y1 * vid_scalefactor; + 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)); Printf("Real resolution: %i x %i\nEmulated resolution: %i x %i\n", x1, y1, x2, y2); }