try to handle old "SET" rooms

This commit is contained in:
Max Bradbury 2020-04-18 15:33:04 +01:00
parent fe3fac5e2b
commit 596be936d9
2 changed files with 4 additions and 3 deletions

View File

@ -118,7 +118,7 @@ impl From<String> for Game {
text_direction = TextDirection::RightToLeft; text_direction = TextDirection::RightToLeft;
} else if segment.starts_with("PAL") { } else if segment.starts_with("PAL") {
palettes.push(Palette::from(segment)); palettes.push(Palette::from(segment));
} else if segment.starts_with("ROOM") { } else if segment.starts_with("ROOM") || segment.starts_with("SET") {
rooms.push(Room::from(segment)); rooms.push(Room::from(segment));
} else if segment.starts_with("TIL") { } else if segment.starts_with("TIL") {
tiles.push(Tile::from(segment)); tiles.push(Tile::from(segment));

View File

@ -29,9 +29,10 @@ impl Room {
impl From<String> for Room { impl From<String> for Room {
fn from(string: String) -> Room { fn from(string: String) -> Room {
// todo handle room_format? let string = string.replace("ROOM ", "");
let string = string.replace("SET ", "");
let mut lines: Vec<&str> = string.lines().collect(); let mut lines: Vec<&str> = string.lines().collect();
let id = from_base36(&lines[0].replace("ROOM ", "")); let id = from_base36(&lines[0]);
let mut name = None; let mut name = None;
let mut palette_id = 0; let mut palette_id = 0;
let mut items: Vec<Instance> = Vec::new(); let mut items: Vec<Instance> = Vec::new();