Skip to content

Commit

Permalink
Adjust field order to match test map bin
Browse files Browse the repository at this point in the history
  • Loading branch information
maddymakesgames committed Jun 25, 2024
1 parent ebee85e commit 9107bdf
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
18 changes: 9 additions & 9 deletions lib/src/maps/elements/level.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ pub struct Levels {
pub struct Level {
#[name = "name"]
pub name: ResolvableString,
#[name = "x"]
pub x: Float,
#[name = "y"]
pub y: Float,
#[name = "width"]
pub width: Integer,
#[name = "height"]
Expand Down Expand Up @@ -65,19 +61,23 @@ pub struct Level {
pub delay_alt_music_fade: Option<bool>,
#[name = "enforceDashNumber"]
pub enforce_dash_number: Option<Integer>,
#[name = "x"]
pub x: Float,
#[name = "y"]
pub y: Float,
#[name = "c"]
pub c: Integer,
#[child]
pub entities: Entities,
#[child]
pub solids: Solids,
#[child]
pub triggers: Triggers,
#[child]
pub fg_tiles: FGTiles,
#[child]
pub fg_decals: FGDecals,
#[child]
pub solids: Solids,
#[child]
pub entities: Entities,
#[child]
pub bg_tiles: BGTiles,
#[child]
pub bg_decals: BGDecals,
Expand Down Expand Up @@ -198,7 +198,7 @@ pub struct Solids {
pub offset_x: Float,
#[name = "offsetY"]
pub offset_y: Float,
#[name = "innerTex"]
#[name = "innerText"]
pub inner_text: String,
}

Expand Down
4 changes: 2 additions & 2 deletions lib/src/maps/elements/style.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ impl MapElement for Foregrounds {
}

fn to_raw(&self, encoder: &mut MapEncoder) {
encoder.children(&self.parallax_elements);

if self.snow_fg {
encoder.child(&SnowFG);
}

encoder.children(&self.parallax_elements);
}
}

Expand Down

0 comments on commit 9107bdf

Please sign in to comment.