mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-07-26 22:42:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix infinite pause buffer bug (#1900)

Browse Source 
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)
This commit is contained in:
Matt Dallmeyer
2022-09-24 09:27:44 -07:00
committed by GitHub
parent e64414d9d0
commit d30c635089
2 changed files with 12 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
goal_src/jak1/engine/ui/hud-classes.gc
-45
View File
@@ -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
goal_src/jak1/engine/ui/hud.gc
+12
View File
@@ -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)