remove avatar (treat it as sprite)

This commit is contained in:
2020-06-18 17:46:30 +01:00
parent 4430ee74aa
commit bf5b3a8d20
2 changed files with 35 additions and 41 deletions

View File

@@ -78,7 +78,6 @@ pub struct Game {
pub palettes: Vec<Palette>,
pub rooms: Vec<Room>,
pub tiles: Vec<Tile>,
pub avatar: Sprite,
pub sprites: Vec<Sprite>,
pub items: Vec<Item>,
pub dialogues: Vec<Dialogue>,
@@ -167,8 +166,6 @@ impl Game {
rooms.push(Room::from(segment));
} else if segment.starts_with("TIL ") {
tiles.push(Tile::from(segment));
} else if segment.starts_with("SPR A") {
avatar = Some(Sprite::from(segment));
} else if segment.starts_with("SPR ") {
sprites.push(Sprite::from(segment));
} else if segment.starts_with("ITM ") {
@@ -187,9 +184,7 @@ impl Game {
}
}
// todo return a custom error instead
assert!(avatar.is_some());
let avatar = avatar.unwrap();
// todo check if SPR A (avatar) exists
Ok(
Game {
@@ -203,7 +198,6 @@ impl Game {
palettes,
rooms,
tiles,
avatar,
sprites,
items,
dialogues,
@@ -278,8 +272,6 @@ impl ToString for Game {
}
}
segments.push(self.avatar.to_string().replace("SPR a", "SPR A"));
for sprite in &self.sprites {
if !is_string_numeric(sprite.id.clone()) {
segments.push(sprite.to_string());