Skip to content

Commit 9107bdf

Browse files
Adjust field order to match test map bin
1 parent ebee85e commit 9107bdf

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

lib/src/maps/elements/level.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ pub struct Levels {
1919
pub struct Level {
2020
#[name = "name"]
2121
pub name: ResolvableString,
22-
#[name = "x"]
23-
pub x: Float,
24-
#[name = "y"]
25-
pub y: Float,
2622
#[name = "width"]
2723
pub width: Integer,
2824
#[name = "height"]
@@ -65,19 +61,23 @@ pub struct Level {
6561
pub delay_alt_music_fade: Option<bool>,
6662
#[name = "enforceDashNumber"]
6763
pub enforce_dash_number: Option<Integer>,
64+
#[name = "x"]
65+
pub x: Float,
66+
#[name = "y"]
67+
pub y: Float,
6868
#[name = "c"]
6969
pub c: Integer,
7070
#[child]
71-
pub entities: Entities,
72-
#[child]
73-
pub solids: Solids,
74-
#[child]
7571
pub triggers: Triggers,
7672
#[child]
7773
pub fg_tiles: FGTiles,
7874
#[child]
7975
pub fg_decals: FGDecals,
8076
#[child]
77+
pub solids: Solids,
78+
#[child]
79+
pub entities: Entities,
80+
#[child]
8181
pub bg_tiles: BGTiles,
8282
#[child]
8383
pub bg_decals: BGDecals,
@@ -198,7 +198,7 @@ pub struct Solids {
198198
pub offset_x: Float,
199199
#[name = "offsetY"]
200200
pub offset_y: Float,
201-
#[name = "innerTex"]
201+
#[name = "innerText"]
202202
pub inner_text: String,
203203
}
204204

lib/src/maps/elements/style.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ impl MapElement for Foregrounds {
6060
}
6161

6262
fn to_raw(&self, encoder: &mut MapEncoder) {
63-
encoder.children(&self.parallax_elements);
64-
6563
if self.snow_fg {
6664
encoder.child(&SnowFG);
6765
}
66+
67+
encoder.children(&self.parallax_elements);
6868
}
6969
}
7070

0 commit comments

Comments
 (0)