Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

g/j1: fix menu labelling issue in jak1 #3613

Merged
merged 1 commit into from
Jul 30, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions goal_src/jak1/pc/progress-pc.gc
Original file line number Diff line number Diff line change
Expand Up @@ -1279,7 +1279,7 @@
(set! (-> option bind-info input-idx) i)
(set! (-> option bind-info analog-min-range?) #t)
(set! (-> option option-type) (game-option-type binding-assignment))
(set! (-> option name-override) (-> *analog-bind-names* (* i 2)))
(set! (-> option name-override) (copy-string<-string (-> option name-override) (-> *analog-bind-names* (* i 2))))
(set! (-> option scale) #t)
(1+! (-> *temp-options* length)))
(let ((option (-> *temp-options* (length *temp-options*))))
Expand All @@ -1290,7 +1290,7 @@
(set! (-> option bind-info input-idx) i)
(set! (-> option bind-info analog-min-range?) #f)
(set! (-> option option-type) (game-option-type binding-assignment))
(set! (-> option name-override) (-> *analog-bind-names* (+ 1 (* i 2))))
(set! (-> option name-override) (copy-string<-string (-> option name-override) (-> *analog-bind-names* (+ 1 (* i 2)))))
(set! (-> option scale) #t)
(1+! (-> *temp-options* length)))))
;; Add Button bindings
Expand All @@ -1305,7 +1305,7 @@
(set! (-> option bind-info input-idx) i)
(set! (-> option bind-info analog-min-range?) #f)
(set! (-> option option-type) (game-option-type binding-assignment))
(set! (-> option name-override) (-> *button-bind-names* i))
(set! (-> option name-override) (copy-string<-string (-> option name-override) (-> *button-bind-names* i)))
(set! (-> option scale) #t)
(1+! (-> *temp-options* length))))
;; We add a restore defaults button at the bottom of each binding menu
Expand Down
Loading