alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2025-01-26 00:56:38 +11:00
Code Issues Projects Releases Packages Wiki Activity

Correctly use the map width and not the display width

Browse source
This commit is contained in:
Gwilym Kuiper 2022-02-07 21:16:11 +00:00
parent ebf21f4add
commit a998ae31a4
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
agb/src/display/background.rs
View file

@ -393,8 +393,8 @@ impl RegularMap {
let screenblock_memory = self.screenblock_memory(); let screenblock_memory = self.screenblock_memory();
let scroll_pos = self.get_scroll_pos(); let scroll_pos = self.get_scroll_pos();
let x_scroll = scroll_pos.x % display::WIDTH as u16; let x_scroll = scroll_pos.x % (32 * 8) as u16;
let y_scroll = scroll_pos.y % display::HEIGHT as u16; let y_scroll = scroll_pos.y % (32 * 8) as u16;
let start_x = x_scroll / 8; let start_x = x_scroll / 8;
let end_x = (x_scroll + display::WIDTH as u16 + 8 - 1) / 8 + 1; // divide by 8 rounding up let end_x = (x_scroll + display::WIDTH as u16 + 8 - 1) / 8 + 1; // divide by 8 rounding up
@ -483,16 +483,8 @@ impl<'a> InfiniteScrolledMap<'a> {
let offset = self.current_pos - (x_start * 8, y_start * 8).into(); let offset = self.current_pos - (x_start * 8, y_start * 8).into();
let offset_scroll = ( let offset_scroll = (
if offset.x < 0 { offset.x.rem_euclid(32 * 8) as u16,
(offset.x + 32 * 8) as u16 offset.y.rem_euclid(32 * 8) as u16,
} else {
offset.x as u16
},
if offset.y < 0 {
(offset.y + 32 * 8) as u16
} else {
offset.y as u16
},
) )
.into(); .into();