Skip to content

Commit d33578e

Browse files
authored
Merge pull request #2563 from SuperFromND/develop
fix: Use rounding in X/Y Truncate, fix inconsistent display name
2 parents c776583 + 7dd3eb7 commit d33578e

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

data/system.base.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1652,7 +1652,7 @@
16521652
menu.itemname.menuvideo.resolution.back = "Back"
16531653
menu.itemname.menuvideo.fullscreen = "Fullscreen"
16541654
menu.itemname.menuvideo.keepaspect = "Keep Aspect Ratio"
1655-
menu.itemname.menuvideo.xytruncate = "X/Y Rounding"
1655+
menu.itemname.menuvideo.xytruncate = "X/Y Truncate"
16561656
menu.itemname.menuvideo.windowscalemode = "Bilinear Filtering"
16571657
menu.itemname.menuvideo.vsync = "VSync"
16581658
menu.itemname.menuvideo.msaa = "MSAA"

external/script/motif.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2041,7 +2041,7 @@ function motif.setBaseOptionInfo()
20412041
motif.option_info.menu_itemname_menuvideo_fullscreen = "Fullscreen"
20422042
motif.option_info.menu_itemname_menuvideo_vsync = "VSync"
20432043
motif.option_info.menu_itemname_menuvideo_keepaspect = "Keep Aspect Ratio"
2044-
motif.option_info.menu_itemname_menuvideo_xytruncate = "X/Y Rounding"
2044+
motif.option_info.menu_itemname_menuvideo_xytruncate = "X/Y Truncate"
20452045
motif.option_info.menu_itemname_menuvideo_windowscalemode = "Bilinear Filtering"
20462046
motif.option_info.menu_itemname_menuvideo_msaa = "MSAA"
20472047
motif.option_info.menu_itemname_menuvideo_shaders = "Shaders" --reserved submenu

src/render.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,8 +409,9 @@ func rmInitSub(rp *RenderParams) {
409409
rp.y += rp.rcy
410410

411411
if sys.cfg.Video.XyTruncate {
412-
rp.x = float32(int(rp.x))
413-
rp.y = float32(int(rp.y))
412+
// math.Round only accepts float64s, hence the need for conversion
413+
rp.x = float32(int(math.Round(float64(rp.x))))
414+
rp.y = float32(int(math.Round(float64(rp.y))))
414415
}
415416
}
416417

0 commit comments

Comments
 (0)