From b08e522aca3bf7613566a0948b9285ee8c4189c7 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Wed, 2 Jan 2019 19:58:21 -0500 Subject: [PATCH] Better rewrite for addons draw adjustment [Kart] --- src/m_menu.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index a37ff709..3a425a97 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -4650,16 +4650,14 @@ static void M_DrawAddons(void) if (m > (ssize_t)sizedirmenu) m = sizedirmenu; - // then top... - i = m - (2*numaddonsshown + 1); - - // then adjust! - if (i < 0) + // then compute top and adjust bottom if needed! + if (m < (2*numaddonsshown + 1)) { - if ((m -= i) > (ssize_t)sizedirmenu) - m = sizedirmenu; + m = min(sizedirmenu, 2*numaddonsshown + 1); i = 0; } + else + i = m - (2*numaddonsshown + 1); if (i != 0) V_DrawString(19, y+4 - (skullAnimCounter/5), highlightflags, "\x1A");