diff --git a/common/serialization/subtitles/subtitles_v1.cpp b/common/serialization/subtitles/subtitles_v1.cpp index 5db51b07bf..489c132540 100644 --- a/common/serialization/subtitles/subtitles_v1.cpp +++ b/common/serialization/subtitles/subtitles_v1.cpp @@ -125,6 +125,7 @@ std::pair convert_v1_to_v2( new_meta.frame_end = 0; // unused by v1 new_meta.offscreen = true; new_meta.speaker = line_meta.speaker; + new_meta.merge = false; new_scene_meta.lines.push_back(new_meta); if (line_meta.clear) { scene_lines.push_back(""); diff --git a/goal_src/jak1/pc/subtitle.gc b/goal_src/jak1/pc/subtitle.gc index c5aef895a0..28794d5285 100644 --- a/goal_src/jak1/pc/subtitle.gc +++ b/goal_src/jak1/pc/subtitle.gc @@ -220,7 +220,7 @@ (defmacro reload-subtitles () "rebuild and reload subtitles." `(begin - (asm-text-file subtitle :files ("game/assets/game_subtitle.gp")) + (asm-text-file subtitle :files ("game/assets/jak1/game_subtitle.gp")) (if *subtitle-text* (+! (-> *subtitle-text* lang) 1)) (load-level-subtitle-files 0))) diff --git a/goalc/compiler/compilation/CompilerControl.cpp b/goalc/compiler/compilation/CompilerControl.cpp index 8c77c96b7a..3dbacedb13 100644 --- a/goalc/compiler/compilation/CompilerControl.cpp +++ b/goalc/compiler/compilation/CompilerControl.cpp @@ -101,6 +101,7 @@ Val* Compiler::compile_asm_text_file(const goos::Object& form, const goos::Objec }); GameSubtitleDB db; if (kind == "subtitle") { + db.m_subtitle_version = GameSubtitleDB::SubtitleFormat::V1; } else { db.m_subtitle_version = GameSubtitleDB::SubtitleFormat::V2; }