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

Merge remote-tracking branch 'upstream/master' into font-renderer

Browse source
This commit is contained in:
Corwin 2023-07-04 22:27:06 +01:00
parent 0cd469866c a8544a9b41
commit 3687f9b1a5
No known key found for this signature in database
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
agb/src/agb_alloc/mod.rs
View file

@ -13,7 +13,7 @@ unsafe impl<T> Send for SendNonNull<T> {}
impl<T> Clone for SendNonNull<T> { impl<T> Clone for SendNonNull<T> {
fn clone(&self) -> Self { fn clone(&self) -> Self {
SendNonNull(self.0) *self
} }
} }
impl<T> Copy for SendNonNull<T> {} impl<T> Copy for SendNonNull<T> {}

2
agb/src/agbabi/mod.rs
View file

@ -154,7 +154,7 @@ mod test {
#[test_case] #[test_case]
fn test_all_of_memcpy(_gba: &mut Gba) { fn test_all_of_memcpy(_gba: &mut Gba) {
let mut input = vec![0u8; 100]; let mut input = [0u8; 100];
let mut output = vec![0u8; 100]; let mut output = vec![0u8; 100];
for size in 0..80 { for size in 0..80 {

4
agb/src/display/object/unmanaged/object.rs
View file

@ -109,7 +109,7 @@ impl OamSlot<'_> {
if let Some(affine_matrix) = &object.affine_matrix { if let Some(affine_matrix) = &object.affine_matrix {
Self::handle_affine(&mut attributes, frame_data, affine_matrix); Self::handle_affine(&mut attributes, frame_data, affine_matrix);
} }
attributes.write(unsafe { (OBJECT_ATTRIBUTE_MEMORY as *mut u16).add(self.slot * 4) }); attributes.write(unsafe { OBJECT_ATTRIBUTE_MEMORY.add(self.slot * 4) });
frame_data.this_frame_sprites.push(object.sprite.clone()); frame_data.this_frame_sprites.push(object.sprite.clone());
} }
@ -159,7 +159,7 @@ impl Drop for OamIterator<'_> {
for idx in number_writen..*last_frame_written { for idx in number_writen..*last_frame_written {
unsafe { unsafe {
let ptr = (OBJECT_ATTRIBUTE_MEMORY as *mut u16).add(idx * 4); let ptr = OBJECT_ATTRIBUTE_MEMORY.add(idx * 4);
ptr.write_volatile(0b10 << 8); ptr.write_volatile(0b10 << 8);
} }
} }

2
agb/src/display/tiled/mod.rs
View file

@ -189,7 +189,7 @@ impl TileSetting {
} }
} }
pub(self) fn find_screenblock_gap(screenblocks: &Bitarray<1>, gap: usize) -> usize { fn find_screenblock_gap(screenblocks: &Bitarray<1>, gap: usize) -> usize {
let mut candidate = 0; let mut candidate = 0;
'outer: while candidate < 16 - gap { 'outer: while candidate < 16 - gap {

2
examples/the-purple-night/src/lib.rs
View file

@ -1002,7 +1002,7 @@ impl SlimeData {
entity.sprite.set_sprite(sprite); entity.sprite.set_sprite(sprite);
entity.velocity.x = match frame { entity.velocity.x = match frame {
2 | 3 | 4 => (Number::new(1) / 5) * Number::new(*direction as i32), 2..=4 => (Number::new(1) / 5) * Number::new(*direction as i32),
_ => 0.into(), _ => 0.into(),
}; };