diff options
Diffstat (limited to 'server/data/src/registry.rs')
| -rw-r--r-- | server/data/src/registry.rs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/server/data/src/registry.rs b/server/data/src/registry.rs index 14a06b93..4de672d0 100644 --- a/server/data/src/registry.rs +++ b/server/data/src/registry.rs @@ -74,8 +74,8 @@ pub(crate) fn filter_unused_tiles_and_items(data: &mut Gamedata, serverdata: &mu for rg in serverdata.recipe_groups.values() { used_items.extend(rg); } - for &(tile, item) in serverdata.initial_map.values() { - used_tiles.insert(tile); + for (tile, item) in serverdata.initial_map.values() { + used_tiles.extend(tile); used_items.extend(item); } for e in &serverdata.entity_decls { @@ -185,8 +185,10 @@ pub(crate) fn filter_unused_tiles_and_items(data: &mut Gamedata, serverdata: &mu for rg in serverdata.recipe_groups.values_mut() { *rg = rg.clone().into_iter().map(|e| item_map[&e]).collect(); } - for (tile, item) in serverdata.initial_map.values_mut() { - *tile = tile_map[tile]; + for (tiles, item) in serverdata.initial_map.values_mut() { + for tile in tiles { + *tile = tile_map[tile]; + } if let Some(item) = item { *item = item_map[item] } @@ -218,8 +220,8 @@ pub(crate) fn filter_unused_tiles_and_items(data: &mut Gamedata, serverdata: &mu _ => (), }; } - data.tile_walkable = data - .tile_walkable + data.tile_collide = data + .tile_collide .clone() .into_iter() .map(|e| tile_map[&e]) |