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

[jak2]do not force UK english on PAL (#3142)

Browse Source
This commit is contained in:
ManDude 2023-11-04 11:17:40 +00:00 committed by GitHub
parent d96f0524ea
commit adada4751d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
goal_src/jak1/engine/ui/text.gc
View File

@ -243,10 +243,7 @@
(#when PC_PORT
(protect ((-> *pc-settings* text-language))
(set! (-> *pc-settings* text-language) (pc-language english))
(load-game-text-info "common" '*fallback-text* *fallback-text-heap*)
)
)
)
(load-game-text-info "common" '*fallback-text* *fallback-text-heap*))))
(none)
)

34
goal_src/jak2/engine/ui/text.gc
View File

@ -195,17 +195,14 @@
(the-as string #f)
)
(else
;; og:preserve-this Added fallback to english is string is not found.
(#if PC_PORT
(if *fallback-text-lookup?*
(let ((fallback-result (lookup-text! *fallback-text* arg0 #t)))
(if (!= fallback-result #f)
fallback-result
;; og:preserve-this Added fallback to english is string is not found.
(#if PC_PORT
(if *fallback-text-lookup?*
(aif (lookup-text! *fallback-text* arg0 #t)
it
(string-format "UNKNOWN ID ~D" arg0)))
)
(string-format "UNKNOWN ID ~D" arg0)
)
)
(string-format "UNKNOWN ID ~D" arg0))
)
)
)
((= (-> this language-id) 6)
@ -242,9 +239,13 @@ the game-text-info, and heap is the heap to load to. The heap will be cleared."
(set! sv-24 (the-as int (-> *setting-control* user-current language)))
(set! sv-32 0)
(set! sv-40 (&- (-> arg2 top) (the-as uint (-> arg2 base))))
(if (and (= (scf-get-territory) 1) (= sv-24 (language-enum english)) (not (demo?)))
(set! sv-24 7)
)
;; english -> UK english in PAL
;; og:preserve-this no longer necessary.
(#unless PC_PORT
(if (and (= (scf-get-territory) GAME_TERRITORY_SCEE) (= sv-24 (language-enum english)) (not (demo?)))
(set! sv-24 (language-enum uk-english))
)
)
(when (or (= sv-16 #f) (!= (-> sv-16 language-id) sv-24) (not (string= (-> sv-16 group-name) arg0)))
(let ((v1-16 arg2))
(set! (-> v1-16 current) (-> v1-16 base))
@ -319,10 +320,9 @@ in a single text group and file."
(load-game-text-info "common" (&-> '*common-text* value) *common-text-heap*)
(#when PC_PORT
(protect ((-> *setting-control* user-current language))
(set! (-> *setting-control* user-current language) (language-enum english))
(load-game-text-info "common" (&-> '*fallback-text* value) *fallback-text-heap*))
)
)
;; todo - split text language
(set! (-> *setting-control* user-current language) (language-enum english))
(load-game-text-info "common" (&-> '*fallback-text* value) *fallback-text-heap*))))
0
(none)
)