alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-24 08:41:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

fix error in full map drawing

Browse source
This commit is contained in:
Corwin Kuiper 2021-06-13 12:26:16 +01:00
parent bfb0c10b53
commit 760796b1db
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
agb/src/display/tiled0.rs
View file

@ -207,12 +207,17 @@ impl Background {
position.y, position.y,
default, default,
); );
self.pos_x = position.x;
self.pos_y = position.y;
} }
fn set_position_mapped<T>(&self, map: &T, dim_x: u32, dim_y: u32, x: i32, y: i32, default: u16) fn set_position_mapped<T>(
where &mut self,
map: &T,
dim_x: u32,
dim_y: u32,
x: i32,
y: i32,
default: u16,
) where
T: Deref<Target = [u16]>, T: Deref<Target = [u16]>,
{ {
let x_map_space = x / 8; let x_map_space = x / 8;
@ -227,9 +232,12 @@ impl Background {
let x_block_space = x_map_space % 32; let x_block_space = x_map_space % 32;
let y_block_space = y_map_space % 32; let y_block_space = y_map_space % 32;
self.pos_x = x;
self.pos_y = y;
// don't fancily handle if we've moved more than one tile, just copy the whole new map // don't fancily handle if we've moved more than one tile, just copy the whole new map
if x_difference.abs() > 1 || y_difference.abs() > 1 { if x_difference.abs() > 1 || y_difference.abs() > 1 {
self.draw_area_mapped(map, dim_x, dim_y, -1, 32, -1, 22, default); self.draw_area_mapped(map, dim_x, dim_y, -1, -1, 32, 22, default);
} else { } else {
if x_difference != 0 { if x_difference != 0 {
let x_offset = match x_difference { let x_offset = match x_difference {