From 8646af75367086365c363a05b392515c5ae2d4e9 Mon Sep 17 00:00:00 2001 From: Corwin Date: Sun, 14 Apr 2024 21:51:02 +0100 Subject: [PATCH] whoops, it's oammanaged --- book/games/pong/src/main.rs | 4 ++-- book/src/pong/05_meta_sprites.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/book/games/pong/src/main.rs b/book/games/pong/src/main.rs index 915bb799..40742ff3 100644 --- a/book/games/pong/src/main.rs +++ b/book/games/pong/src/main.rs @@ -11,7 +11,7 @@ #![no_main] use agb::{ - display::object::{Graphics, Object, ObjectManaged, Tag}, + display::object::{Graphics, OamManaged, Object, Tag}, include_aseprite, }; @@ -31,7 +31,7 @@ struct Paddle<'obj> { } impl<'obj> Paddle<'obj> { - fn new(object: &'obj ObjectManaged<'_>, start_x: i32, start_y: i32) -> Self { + fn new(object: &'obj OamManaged<'_>, start_x: i32, start_y: i32) -> Self { let mut paddle_start = object.object_sprite(PADDLE_END.sprite(0)); let mut paddle_mid = object.object_sprite(PADDLE_MID.sprite(0)); let mut paddle_end = object.object_sprite(PADDLE_END.sprite(0)); diff --git a/book/src/pong/05_meta_sprites.md b/book/src/pong/05_meta_sprites.md index fdca5591..8dd434cd 100644 --- a/book/src/pong/05_meta_sprites.md +++ b/book/src/pong/05_meta_sprites.md @@ -42,7 +42,7 @@ Now the paddle will display correctly. It's rather awkward to use, however, havi ```rust // change our imports to include what we will use use agb::{ - display::object::{Graphics, Object, ObjectManaged, Tag}, + display::object::{Graphics, Object, OamManaged, Tag}, include_aseprite, }; @@ -53,7 +53,7 @@ struct Paddle<'obj> { } impl<'obj> Paddle<'obj> { - fn new(object: &'obj ObjectManaged<'_>, start_x: i32, start_y: i32) -> Self { + fn new(object: &'obj OamManaged<'_>, start_x: i32, start_y: i32) -> Self { let mut paddle_start = object.object_sprite(PADDLE_END.sprite(0)); let mut paddle_mid = object.object_sprite(PADDLE_MID.sprite(0)); let mut paddle_end = object.object_sprite(PADDLE_END.sprite(0));