max
/
bitsy-parser
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

fix ending from string (allow "END " in dialogue, and multi-line dialogues)

This commit is contained in:
Max Bradbury 2020-04-23 06:50:38 +01:00
parent 7a8ec4e5d2
commit d955f4ee71
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ending.rs
View File

@ -7,17 +7,9 @@ pub struct Ending {
impl From<String> for Ending { impl From<String> for Ending {
fn from(string: String) -> Ending { fn from(string: String) -> Ending {
let string = string.replace("END ", ""); let lines: Vec<&str> = string.lines().collect();
// todo this is wrong - we shouldn't be splitting on lines let id = lines[0].replace("END ", "").to_string();
let id_dialogue: Vec<&str> = string.lines().collect(); let dialogue = lines[1..].join("");
let id = id_dialogue[0].to_string();
let dialogue = if id_dialogue.len() > 1 {
id_dialogue[1]
} else {
""
}
.to_string();
Ending { id, dialogue } Ending { id, dialogue }
} }