From 3ef98fd80d2d9fe53f5cef7c1386acc4db1c6323 Mon Sep 17 00:00:00 2001 From: toaster Date: Fri, 18 Nov 2022 20:08:52 +0000 Subject: [PATCH] Don't use a seperate count, I literally forgot id is useful for this --- src/k_menufunc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/k_menufunc.c b/src/k_menufunc.c index 73eeb4aef..ab43217ff 100644 --- a/src/k_menufunc.c +++ b/src/k_menufunc.c @@ -3430,7 +3430,7 @@ static void M_LevelListFromGametype(INT16 gt) if (levellist.newgametype == GT_RACE) { cupheader_t *cup = kartcupheaders; - UINT8 highestid = 0, count = 0; + UINT8 highestid = 0; // Make sure there's valid cups before going to this menu. if (cup == NULL) @@ -3443,11 +3443,10 @@ static void M_LevelListFromGametype(INT16 gt) highestid = cup->id; if (Playing() && mapheaderinfo[gamemap-1] && mapheaderinfo[gamemap-1]->cup == cup) { - cupgrid.x = count % CUPMENU_COLUMNS; - cupgrid.y = (count / CUPMENU_COLUMNS) % CUPMENU_ROWS; - cupgrid.pageno = count / (CUPMENU_COLUMNS * CUPMENU_ROWS); + cupgrid.x = cup->id % CUPMENU_COLUMNS; + cupgrid.y = (cup->id / CUPMENU_COLUMNS) % CUPMENU_ROWS; + cupgrid.pageno = cup->id / (CUPMENU_COLUMNS * CUPMENU_ROWS); } - count++; } cup = cup->next; }