diff --git a/src/main.rs b/src/main.rs index a56d55a..fa2a822 100644 --- a/src/main.rs +++ b/src/main.rs @@ -614,7 +614,6 @@ fn handle_relative_connection( file_paths.pk, file_paths.mld, &mut stream, - start_level, choice, progress, ) diff --git a/src/vn.rs b/src/vn.rs index 8039f29..40c9623 100644 --- a/src/vn.rs +++ b/src/vn.rs @@ -6,7 +6,7 @@ use indexmap::IndexMap; use maud::{Markup, html}; use multilinear::{BorrowedMultilinearSimulation, Event}; use multilinear_parser::{NamedMultilinearInfo, parse_multilinear}; -use pukram2html::convert_subheader; +use pukram2html::convert; use vn_settings::{Change, Parameter, PlayerSettings, SettingsContext, extract_layers}; use crate::dialog::parse_map; @@ -337,7 +337,6 @@ pub fn render_novel( pk_path: &Path, mld_path: &Path, stream: &mut TcpStream, - start_level: usize, choice: usize, progress: &str, ) -> Result<(), dialogi::ParsingError> { @@ -348,7 +347,7 @@ pub fn render_novel( player_settings.extract_settings(&mut settings_context, &mut config_map); let dialogs = parse_map(pk_path, &mut settings_context)?; - let mut sections = process_dialog(&dialogs[choice], &mut player_settings, start_level); + let mut sections = process_dialog(&dialogs[choice], &mut player_settings); if let Some(named_multilinear_info) = load_multilinear(mld_path) { let multilinear_info = &named_multilinear_info.info; @@ -402,7 +401,6 @@ pub fn render_novel( fn process_dialog( dialog_sequence: &dialogi::DialogSequence, player_settings: &mut PlayerSettings, - start_level: usize, ) -> Vec { let mut sections = Vec::new(); @@ -418,7 +416,7 @@ fn process_dialog( sections.push(html! { (render_scene(player_settings, &block.name)) - (render_dialog_block(block, start_level)) + (render_dialog_block(block)) }); } @@ -454,17 +452,13 @@ fn apply_block_changes( } } -fn render_dialog_block(block: &dialogi::DialogBlock, start_level: usize) -> Markup { +fn render_dialog_block(block: &dialogi::DialogBlock) -> Markup { if block.lines.is_empty() { return html! {}; } let mut content = Vec::new(); - convert_subheader( - block.lines.iter().map(|l| l.text.as_ref()), - &mut content, - start_level, - ); + convert(block.lines.iter().map(|l| l.text.as_ref()), &mut content); html! { fieldset .visual-novel-box {