diff --git a/common/serialization/subtitles/subtitles_v2.h b/common/serialization/subtitles/subtitles_v2.h index 2cdffc1a36..6023338f7e 100644 --- a/common/serialization/subtitles/subtitles_v2.h +++ b/common/serialization/subtitles/subtitles_v2.h @@ -124,7 +124,6 @@ class GameSubtitleBank { std::optional m_file_base_path; std::map m_base_scenes; - std::map m_lang_scenes; std::map m_scenes; bool scene_exists(const std::string& name) const { return m_scenes.find(name) != m_scenes.end(); } GameSubtitleSceneInfo new_scene_from_meta( diff --git a/goal_src/jak2/engine/scene/scene.gc b/goal_src/jak2/engine/scene/scene.gc index a709216240..3a126fcab8 100644 --- a/goal_src/jak2/engine/scene/scene.gc +++ b/goal_src/jak2/engine/scene/scene.gc @@ -728,7 +728,11 @@ ;; og:preserve-this send a movie-no-subtitle message so the pc subtitle system at least knows there's a movie playing (#when PC_PORT (if (= (-> self type) scene-player) - (send-event (ppointer->process *subtitle2*) 'movie-no-subtitle (-> (the scene-player self) anim name) #f (ja-aframe-num 0)))) + (send-event (ppointer->process *subtitle2*) 'movie-no-subtitle (-> (the scene-player self) anim name) #f (ja-aframe-num 0))) + ;; if this isn't a default language -- get out before you crash! + (when (> (the-as int (-> *setting-control* user-current subtitle-language)) + (the-as int (language-enum uk-english))) + (return #f))) (let ((gp-0 (res-lump-struct (-> v1-9 extra) 'subtitle-range (array subtitle-range)))) (when gp-0 (let ((f30-0 (ja-aframe-num 0)) diff --git a/goal_src/jak2/pc/pckernel.gc b/goal_src/jak2/pc/pckernel.gc index e81c80618c..460a320a63 100644 --- a/goal_src/jak2/pc/pckernel.gc +++ b/goal_src/jak2/pc/pckernel.gc @@ -817,7 +817,7 @@ (format file " (minimap-force-north ~A)~%" (-> obj minimap-force-north)) (format file " (hires-clouds? ~A)~%" (-> obj hires-clouds?)) (format file " (text-language ~D)~%" (-> obj text-language)) - (format file " (subtitle-language ~D)~%" (-> obj text-language)) + (format file " (subtitle-language ~D)~%" (-> obj subtitle-language)) (format file " (controller-led-status? ~A)~%" (-> obj controller-led-status?)) (format file " (controller-swap-r1-r2? ~A)~%" (-> obj controller-swap-r1-r2?)) (format file " (speedrunner-mode-custom-bind ~D)~%" (-> obj speedrunner-mode-custom-bind))