diff -r e337e9920440 -r 1749961647b9 rust/mapgen/src/lib.rs --- a/rust/mapgen/src/lib.rs Wed Nov 07 14:56:34 2018 -0500 +++ b/rust/mapgen/src/lib.rs Wed Nov 07 22:58:54 2018 +0300 @@ -106,7 +106,7 @@ self.templates.get(template_type).and_then(|t| thread_rng().choose(t)) } - pub fn make_texture(&self, land: &Land2D, theme: &Theme) -> Vec2D { + pub fn make_texture(&self, land: &Land2D, theme: &Theme) -> Vec2D { let mut texture = Vec2D::new(land.size(), 0); if let Some(land_sprite) = theme.land_texture() { for (row_index, (land_row, tex_row)) in land.rows() @@ -127,7 +127,7 @@ } if x_offset < land.width() { - let final_range = x_offset..land.width() - 1; + let final_range = x_offset..land.width(); tex_row_copy( &land_row[final_range.clone()], &mut tex_row[final_range], @@ -140,16 +140,16 @@ } } -fn tex_row_copy(land_row: &[u32], tex_row: &mut [u32], sprite_row: &[u32]) { +fn tex_row_copy(land_row: &[u8], tex_row: &mut [u32], sprite_row: &[u32]) { for ((land_v, tex_v), sprite_v) in land_row.iter().zip(tex_row.iter_mut()).zip(sprite_row) - { - *tex_v = if *land_v == 0 { - *sprite_v - } else { - 0 - } + { + *tex_v = if *land_v == 0 { + *sprite_v + } else { + 0 } + } } #[cfg(test)]