diff --git a/src/game.rs b/src/game.rs index 1df6a8a..c052e1f 100644 --- a/src/game.rs +++ b/src/game.rs @@ -1,4 +1,4 @@ -use crate::{Dialogue, Ending, Font, Item, Palette, Room, Sprite, TextDirection, Tile, ToBase36, Variable, transform_line_endings, segments_from_string, is_string_numeric, to_base36, from_base36}; +use crate::{Dialogue, Ending, Font, Item, Palette, Room, Sprite, TextDirection, Tile, ToBase36, Variable, transform_line_endings, segments_from_string, to_base36, from_base36}; use std::error::Error; use loe::TransformMode; use std::str::FromStr; @@ -267,15 +267,7 @@ impl ToString for Game { } for sprite in &self.sprites { - if is_string_numeric(sprite.id.clone()) { - segments.push(sprite.to_string()); - } - } - - for sprite in &self.sprites { - if !is_string_numeric(sprite.id.clone()) { - segments.push(sprite.to_string()); - } + segments.push(sprite.to_string()); } for item in &self.items { diff --git a/src/lib.rs b/src/lib.rs index 7e8a311..495ddb0 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -143,19 +143,6 @@ fn segments_from_string(string: String) -> Vec { output } -/// for some reason the sprites with numeric IDs go first, -/// then SPR A (avatar), then all the non-numeric IDs -#[inline] -fn is_string_numeric(str: String) -> bool { - for c in str.chars() { - if !c.is_numeric() { - return false; - } - } - - return true; -} - /// e.g. pass all tile IDs into this to get a new non-conflicting tile ID #[inline] fn new_unique_id(ids: Vec) -> String {