Skip to content

Commit

Permalink
[jak2] add game territory menu option (#3242)
Browse files Browse the repository at this point in the history
  • Loading branch information
ManDude authored Dec 3, 2023
1 parent 2795d3a commit 94b9843
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
6 changes: 2 additions & 4 deletions goal_src/jak2/engine/ps2/pad.gc
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,10 @@ The cpad-set-buzz! function can be used for vibration.
(#when PC_PORT

;; redefined from C kernel
(define *debug-territory* GAME_TERRITORY_SCEA)
(define *debug-territory* *default-territory*)
(defun scf-get-territory ()
"redefined from C kernel for convenience"
(if *debug-segment*
*debug-territory*
*default-territory*)
*debug-territory*
)
)

Expand Down
9 changes: 9 additions & 0 deletions goal_src/jak2/pc/progress/progress-static-pc.gc
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,15 @@ This gives us more freedom to write code how we want.
;; NOTE - this doesn't actually work (naughty dog tried it too in their progress code)
;; fix it eventually
(load-level-text-files (the-as int (-> *setting-control* user-default language)))))
(new 'static 'menu-generic-carousel-option
:name (text-id progress-territory)
:items (new 'static 'boxed-array :type text-id
(text-id progress-territory-scea)
(text-id progress-territory-scee)
(text-id progress-territory-scei)
(text-id progress-territory-scek))
:get-item-index-fn (lambda () *debug-territory*)
:on-confirm (lambda ((index int) (the-progress progress)) (set! *debug-territory* index)))
(progress-new-generic-link-to-scrolling-page (text-id progress-misc-game-options)
(new 'static 'menu-generic-boolean-option
:name (text-id progress-discord-rpc)
Expand Down

0 comments on commit 94b9843

Please sign in to comment.