phantop
/
doukutsu-rs
mirror of https://github.com/doukutsu-rs/doukutsu-rs
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix of #192

This commit is contained in:
biroder 2023-05-16 17:00:17 +03:00
parent 277f5d957b
commit 63f903104a
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/game/scripting/tsc/text_script.rs
View File

@ -432,8 +432,24 @@ impl TextScriptVM {
) )
}; };
} else { } else {
state.textscript_vm.state = let ticks = if state.textscript_vm.flags.fast() || state.textscript_vm.flags.cutscene_skip()
TextScriptExecutionState::Running(event, cursor.position() as u32); {
0
} else {
state.constants.textscript.text_speed_fast
};
state.textscript_vm.state = if new_line {
TextScriptExecutionState::MsgNewLine(
event,
cursor.position() as u32,
remaining,
ticks,
4,
)
} else {
TextScriptExecutionState::Running(event, cursor.position() as u32)
};
} }
} else { } else {
state.textscript_vm.reset(); state.textscript_vm.reset();
@ -450,7 +466,11 @@ impl TextScriptVM {
state.textscript_vm.line_1.clear(); state.textscript_vm.line_1.clear();
state.textscript_vm.line_1.append(&mut state.textscript_vm.line_2); state.textscript_vm.line_1.append(&mut state.textscript_vm.line_2);
state.textscript_vm.line_2.append(&mut state.textscript_vm.line_3); state.textscript_vm.line_2.append(&mut state.textscript_vm.line_3);
state.textscript_vm.state = TextScriptExecutionState::Msg(event, ip, remaining, ticks); state.textscript_vm.state = if remaining < 2 {
TextScriptExecutionState::Running(event, ip)
} else {
TextScriptExecutionState::Msg(event, ip, remaining, ticks)
};
} else { } else {
state.textscript_vm.state = state.textscript_vm.state =
TextScriptExecutionState::MsgNewLine(event, ip, remaining, ticks, counter); TextScriptExecutionState::MsgNewLine(event, ip, remaining, ticks, counter);