From d30c635089cb571aa84b5258b115b21b22e7aa00 Mon Sep 17 00:00:00 2001
From: Matt Dallmeyer <2515356+dallmeyer@users.noreply.github.com>
Date: Sat, 24 Sep 2022 09:27:44 -0700
Subject: [PATCH] Fix infinite pause buffer bug (#1900)

Fixes #1886 which was introduced in #1756

Changed to only read the dpad inputs for hud toggle if L2/R2 were
considered held (they're not read during a pause buffer)
---
 goal_src/jak1/engine/ui/hud-classes.gc | 45 --------------------------
 goal_src/jak1/engine/ui/hud.gc         | 12 +++++++
 2 files changed, 12 insertions(+), 45 deletions(-)

diff --git a/goal_src/jak1/engine/ui/hud-classes.gc b/goal_src/jak1/engine/ui/hud-classes.gc
index 73c71ecfc5..961d49ca81 100644
--- a/goal_src/jak1/engine/ui/hud-classes.gc
+++ b/goal_src/jak1/engine/ui/hud-classes.gc
@@ -742,21 +742,6 @@
   (let ((t9-0 (method-of-type hud draw-hud)))
     (t9-0 obj)
     )
-  ;; modified for pc port
-  (cond
-    ((cpad-hold? 0 up)
-      (set! *hud-collectable-view* (hud-collectable-view game-totals))
-      (set! (-> obj trigger-time) (-> *display* base-frame-counter))
-      )
-    ((cpad-hold? 0 down)
-      (set! *hud-collectable-view* (hud-collectable-view level-totals))
-      (set! (-> obj trigger-time) (-> *display* base-frame-counter))
-      )
-    ((or (cpad-hold? 0 left) (cpad-hold? 0 right))
-      (set! *hud-collectable-view* (hud-collectable-view original))
-      (set! (-> obj trigger-time) (-> *display* base-frame-counter))
-      )
-    )
   (with-dma-buffer-add-bucket ((buf (-> (current-frame) global-buf))
                                (bucket-id debug))
     (let* ((string-x (+ (-> obj text-x) (* (-> obj x-sgn) (-> obj offset))))
@@ -1157,21 +1142,6 @@
   (let ((t9-0 (method-of-type hud draw-hud)))
     (t9-0 obj)
   )
-  ;; modified for pc port
-  (cond
-    ((cpad-hold? 0 up)
-      (set! *hud-collectable-view* (hud-collectable-view game-totals))
-      (set! (-> obj trigger-time) (-> *display* base-frame-counter))
-      )
-    ((cpad-hold? 0 down)
-      (set! *hud-collectable-view* (hud-collectable-view level-totals))
-      (set! (-> obj trigger-time) (-> *display* base-frame-counter))
-      )
-    ((or (cpad-hold? 0 left) (cpad-hold? 0 right))
-      (set! *hud-collectable-view* (hud-collectable-view original))
-      (set! (-> obj trigger-time) (-> *display* base-frame-counter))
-      )
-    )
   (with-dma-buffer-add-bucket ((buf (-> (current-frame) global-buf))
                                (bucket-id debug))
     (let* ((string-x (+ (-> obj text-x) (* (-> obj x-sgn) (-> obj offset))))
@@ -1463,21 +1433,6 @@
   (let ((t9-0 (method-of-type hud draw-hud)))
     (t9-0 obj)
     )
-  ;; modified for pc port
-  (cond
-    ((cpad-hold? 0 up)
-      (set! *hud-collectable-view* (hud-collectable-view game-totals))
-      (set! (-> obj trigger-time) (-> *display* base-frame-counter))
-      )
-    ((cpad-hold? 0 down)
-      (set! *hud-collectable-view* (hud-collectable-view level-totals))
-      (set! (-> obj trigger-time) (-> *display* base-frame-counter))
-      )
-    ((or (cpad-hold? 0 left) (cpad-hold? 0 right))
-      (set! *hud-collectable-view* (hud-collectable-view original))
-      (set! (-> obj trigger-time) (-> *display* base-frame-counter))
-      )
-    )
   (set! (-> obj text-y) (+ (if (nonzero? (-> obj next-y-offset))
                                (-> obj text-y-offset)
                                0
diff --git a/goal_src/jak1/engine/ui/hud.gc b/goal_src/jak1/engine/ui/hud.gc
index a7448092d5..ddb07a3c6c 100644
--- a/goal_src/jak1/engine/ui/hud.gc
+++ b/goal_src/jak1/engine/ui/hud.gc
@@ -64,6 +64,18 @@
                   (-> obj first-init)
                   )
               )
+      ;; modified for pc port
+      (cond
+        ((cpad-hold? 0 up)
+          (set! *hud-collectable-view* (hud-collectable-view game-totals))
+          )
+        ((cpad-hold? 0 down)
+          (set! *hud-collectable-view* (hud-collectable-view level-totals))
+          )
+        ((or (cpad-hold? 0 left) (cpad-hold? 0 right))
+          (set! *hud-collectable-view* (hud-collectable-view original))
+          )
+        )
       (cond
         ((and (-> obj increment-on-event)
               (< (-> obj value) arg0)