Game-Decompilation/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-11-27 16:31:14 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

allow select pause in retail mode (#1665)

Browse Source
This commit is contained in:
ManDude 2022-07-17 00:28:40 +01:00 committed by GitHub
parent db6dce0347
commit 12fd8a09b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
goal_src/jak1/engine/draw/drawable.gc
View File

@ -1552,8 +1552,7 @@
(logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons start r2))
(logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons start r2))
(while (and (= *master-mode* 'pause)
(zero? (logand (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons start r2)))
)
(not (cpad-pressed? 0 start r2)))
(sync-path 0 0)
(service-cpads)
)

17
goal_src/jak1/engine/game/main.gc
View File

@ -192,11 +192,9 @@
(else
(cond
;; debug mode pause allowed with select or R2.
((and (or (cpad-hold? 0 select)
(cpad-hold? 0 r2)
)
*debug-segment*
)
;; pc port note : allow select outside debug mode
((or (cpad-hold? 0 select)
(and *debug-segment* (cpad-hold? 0 r2)))
;; pushing select or R2, and debug. allow pause.
'pause
)
@ -204,7 +202,7 @@
(cond
;; ignore anything below here, unless we are pressing start, or debug.
((and (not *debug-segment*)
(zero? (logand (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons start)))
(not (cpad-hold? 0 start))
)
*master-mode*
)
@ -290,7 +288,8 @@
'game
)
;; pause -> game
((cpad-hold? 0 start)
;; pc port note : changed to allow select pause in retail
((cpad-hold? 0 start select)
'game
)
(else
@ -473,8 +472,8 @@
;; push R3 to print global heap status. not very useful.
(if (cpad-pressed? 1 r3)
(inspect global)
)
(inspect global)
)
;; push R3 to display IOP memory stats
(when (cpad-hold? 1 r3)