From e122941ede9ed0d671a3cb58484c43863926bf79 Mon Sep 17 00:00:00 2001 From: Matt Dallmeyer Date: Mon, 31 Mar 2025 12:40:40 -0700 Subject: [PATCH] Fix pagination for non-dynamic popup menus (speedrun menu) (#3883) Was testing out adding ILs to the speedrun menu and noticed this wasn't working properly (video before the changes) https://github.com/user-attachments/assets/e1e7f443-60d2-4b15-bc27-a20cbe4442d6 Co-authored-by: Tyler Wilding --- goal_src/jak2/pc/util/popup-menu.gc | 2 +- goal_src/jak3/pc/util/popup-menu.gc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/goal_src/jak2/pc/util/popup-menu.gc b/goal_src/jak2/pc/util/popup-menu.gc index 99c1f26441..838afb1393 100644 --- a/goal_src/jak2/pc/util/popup-menu.gc +++ b/goal_src/jak2/pc/util/popup-menu.gc @@ -136,7 +136,7 @@ font-ctx buf (= (+ i start-index) current-index)) - (draw-entry (-> (-> this menu-states (-> this curr-state-index) entries) i) font-ctx buf (= (+ i start-index) current-index))) + (draw-entry (-> (-> this menu-states (-> this curr-state-index) entries) (+ i start-index)) font-ctx buf (= (+ i start-index) current-index))) (set! (-> font-ctx origin y) (+ 15.0 (-> font-ctx origin y)))) (when (< end-index entry-count) (clear *pc-encoded-temp-string*) diff --git a/goal_src/jak3/pc/util/popup-menu.gc b/goal_src/jak3/pc/util/popup-menu.gc index 19b23223fa..e7888f2f40 100644 --- a/goal_src/jak3/pc/util/popup-menu.gc +++ b/goal_src/jak3/pc/util/popup-menu.gc @@ -135,7 +135,7 @@ font-ctx buf (= (+ i start-index) current-index)) - (draw-entry (-> (-> this menu-states (-> this curr-state-index) entries) i) font-ctx buf (= (+ i start-index) current-index))) + (draw-entry (-> (-> this menu-states (-> this curr-state-index) entries) (+ i start-index)) font-ctx buf (= (+ i start-index) current-index))) (set! (-> font-ctx origin y) (+ 15.0 (-> font-ctx origin y)))) (when (< end-index entry-count) (clear *pc-encoded-temp-string*)