mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-09-12 20:56:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

[jak2] prepare scf-get-territory usage (#2890)

Browse Source
This commit is contained in:
ManDude
2023-08-08 17:21:29 +01:00
committed by GitHub
parent 988fdfb5b0
commit 39d989cfcc
21 changed files with 264 additions and 859 deletions
Download Patch File Download Diff File Expand all files Collapse all files
goal_src/jak2/engine/ui/progress/progress.gc
+5 -5
View File
@@ -785,12 +785,12 @@
(set! (-> obj current-options)
(cond
((demo?)
(if (= (scf-get-territory) 1)
(if (= (scf-get-territory) GAME_TERRITORY_SCEE)
*game-options*
*game-options-demo*
)
)
((and (= (scf-get-territory) 2) (not (and (= *progress-cheat* 'language) (cpad-hold? 0 l2) (cpad-hold? 0 r2))))
((and (= (scf-get-territory) GAME_TERRITORY_SCEI) (not (and (= *progress-cheat* 'language) (cpad-hold? 0 l2) (cpad-hold? 0 r2))))
*game-options*
)
(else
@@ -801,7 +801,7 @@
)
(('graphic-options)
(set! (-> obj current-options)
(if (or (= (scf-get-territory) 1) (and (= *progress-cheat* 'pal) (cpad-hold? 0 l2) (cpad-hold? 0 r2)))
(if (or (= (scf-get-territory) GAME_TERRITORY_SCEE) (and (= *progress-cheat* 'pal) (cpad-hold? 0 l2) (cpad-hold? 0 r2)))
*graphic-title-options-pal*
*graphic-options*
)
@@ -3475,7 +3475,7 @@
(set! (-> *progress-state* graphic-options-last-move) (current-time))
(set! (-> arg0 selected-option) #f)
(cond
((< (-> *progress-state* graphic-options-item-selected) (if (= (scf-get-territory) 1)
((< (-> *progress-state* graphic-options-item-selected) (if (= (scf-get-territory) GAME_TERRITORY_SCEE)
3
2
)
@@ -3502,7 +3502,7 @@
(set! (-> arg0 option-index) (-> *progress-state* graphic-options-item-selected))
)
(else
(set! (-> *progress-state* graphic-options-item-selected) (if (= (scf-get-territory) 1)
(set! (-> *progress-state* graphic-options-item-selected) (if (= (scf-get-territory) GAME_TERRITORY_SCEE)
3
2
)