phantop/doukutsu-rs
1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2024-11-16 10:52:44 +00:00
Code Issues Releases Wiki Activity

TSC Fixes:

Browse source 
- <CLR should not reset <FAC
- Last character \n bugfix
This commit is contained in:
dawnDus 2022-02-04 19:31:16 -05:00
parent bd0762f812
commit 32526f92f8
No known key found for this signature in database
GPG key ID: 972AABDE81848F21
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/scripting/tsc/text_script.rs
View file

@ -238,11 +238,11 @@ impl TextScriptVM {
self.flags.0 = 0; self.flags.0 = 0;
self.current_illustration = None; self.current_illustration = None;
self.illustration_state = IllustrationState::Hidden; self.illustration_state = IllustrationState::Hidden;
self.face = 0;
self.clear_text_box(); self.clear_text_box();
} }
pub fn clear_text_box(&mut self) { pub fn clear_text_box(&mut self) {
self.face = 0;
self.item = 0; self.item = 0;
self.current_line = TextScriptLine::Line1; self.current_line = TextScriptLine::Line1;
self.line_1.clear(); self.line_1.clear();
@ -375,7 +375,7 @@ impl TextScriptVM {
_ => {} _ => {}
} }
if remaining > 1 { if remaining > 1 || new_line {
let ticks = if state.textscript_vm.flags.fast() || state.textscript_vm.flags.cutscene_skip() let ticks = if state.textscript_vm.flags.fast() || state.textscript_vm.flags.cutscene_skip()
{ {
0 0
@ -424,7 +424,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);
if remaining == 0 {
state.textscript_vm.state = TextScriptExecutionState::Running(event, ip);
} else {
state.textscript_vm.state = TextScriptExecutionState::Msg(event, ip, remaining, ticks); state.textscript_vm.state = 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);