From ec2ecd2e6274dd9a15f9d635cb8e227a41686621 Mon Sep 17 00:00:00 2001 From: James R Date: Wed, 27 Dec 2023 11:32:59 -0800 Subject: [PATCH] Menus: interpolate Gamemode menu transitions --- src/k_menudraw.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/k_menudraw.c b/src/k_menudraw.c index 4fc8f24fc..6a38b8b92 100644 --- a/src/k_menudraw.c +++ b/src/k_menudraw.c @@ -1212,6 +1212,7 @@ void M_DrawKartGamemodeMenu(void) { UINT8 n = 0; INT32 i, x, y; + INT32 tx = M_EaseWithTransition(Easing_Linear, 5 * 48); for (i = 0; i < currentMenu->numitems; i++) { @@ -1224,16 +1225,11 @@ void M_DrawKartGamemodeMenu(void) } n--; - x = GM_STARTX - ((GM_XOFFSET / 2) * (n-1)); + x = GM_STARTX - ((GM_XOFFSET / 2) * (n-1)) + tx; y = GM_STARTY - ((GM_YOFFSET / 2) * (n-1)); M_DrawMenuTooltips(); - if (menutransition.tics) - { - x += 48 * menutransition.tics; - } - for (i = 0; i < currentMenu->numitems; i++) { INT32 type; @@ -1245,13 +1241,9 @@ void M_DrawKartGamemodeMenu(void) if (i >= currentMenu->numitems-1) { - x = GM_STARTX + (GM_XOFFSET * 5 / 2); + x = GM_STARTX + (GM_XOFFSET * 5 / 2) + tx; y = GM_STARTY + (GM_YOFFSET * 5 / 2); - if (menutransition.tics) - { - x += 48 * menutransition.tics; - } } INT32 cx = x;