mirror of
https://github.com/italicsjenga/agb.git
synced 2024-12-25 01:01:34 +11:00
Try copying the correct amount
This commit is contained in:
parent
7f0d7757c5
commit
bf10d9a5ff
|
@ -341,10 +341,10 @@ impl RegularMap {
|
||||||
let x_scroll = scroll_pos.x % display::WIDTH as u16;
|
let x_scroll = scroll_pos.x % display::WIDTH as u16;
|
||||||
let y_scroll = scroll_pos.y % display::HEIGHT as u16;
|
let y_scroll = scroll_pos.y % display::HEIGHT 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; // divide by 8 rounding up
|
let end_x = (x_scroll + display::WIDTH as u16 + 8 - 1) / 8 + 1; // divide by 8 rounding up
|
||||||
|
|
||||||
let start_y = y_scroll / 8;
|
let start_y = y_scroll / 8;
|
||||||
let end_y = (y_scroll + display::HEIGHT as u16 + 8 - 1) / 8;
|
let end_y = (y_scroll + display::HEIGHT as u16 + 8 - 1) / 8 + 1;
|
||||||
|
|
||||||
for y in start_y..end_y {
|
for y in start_y..end_y {
|
||||||
for x in start_x..end_x {
|
for x in start_x..end_x {
|
||||||
|
@ -409,8 +409,8 @@ impl InfiniteScrolledMap {
|
||||||
let x_start = div_floor(self.current_pos.x, 8);
|
let x_start = div_floor(self.current_pos.x, 8);
|
||||||
let y_start = div_floor(self.current_pos.y, 8);
|
let y_start = div_floor(self.current_pos.y, 8);
|
||||||
|
|
||||||
let x_end = div_ceil(self.current_pos.x + display::WIDTH, 8);
|
let x_end = div_ceil(self.current_pos.x + display::WIDTH, 8) + 1;
|
||||||
let y_end = div_ceil(self.current_pos.y + display::HEIGHT, 8);
|
let y_end = div_ceil(self.current_pos.y + display::HEIGHT, 8) + 1;
|
||||||
|
|
||||||
for (y_idx, y) in (y_start..y_end).enumerate() {
|
for (y_idx, y) in (y_start..y_end).enumerate() {
|
||||||
for (x_idx, x) in (x_start..x_end).enumerate() {
|
for (x_idx, x) in (x_start..x_end).enumerate() {
|
||||||
|
|
Loading…
Reference in a new issue