alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-10-17 15:41:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

remove duplicated code

Browse source
This commit is contained in:
Corwin Kuiper 2021-03-13 01:16:10 +00:00 committed by Corwin
parent 1afb3cc08b
commit a49c25b95d
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/display/object.rs
View file

@ -20,10 +20,7 @@ pub enum Mode {
impl ObjectStandard { impl ObjectStandard {
pub fn commit(&self) { pub fn commit(&self) {
unsafe { unsafe { self.attributes.commit(self.id) }
(&mut (*OBJECT_MEMORY_STANDARD)[self.id] as *mut ObjectAttributeStandard)
.write_volatile(self.attributes)
}
} }
pub fn set_x(&mut self, x: u8) { pub fn set_x(&mut self, x: u8) {
@ -48,6 +45,11 @@ pub struct ObjectAttributeStandard {
} }
impl ObjectAttributeStandard { impl ObjectAttributeStandard {
unsafe fn commit(&self, index: usize) {
(&mut (*OBJECT_MEMORY_STANDARD)[index] as *mut ObjectAttributeStandard)
.write_volatile(*self)
}
pub fn set_hflip(&mut self, hflip: bool) { pub fn set_hflip(&mut self, hflip: bool) {
let mask = (1 << 0xC) << 16; let mask = (1 << 0xC) << 16;
let attr = self.low; let attr = self.low;
@ -107,8 +109,7 @@ impl ObjectControl {
let mut o = ObjectAttributeStandard::new(); let mut o = ObjectAttributeStandard::new();
o.set_mode(Mode::Hidden); o.set_mode(Mode::Hidden);
for index in 0..(*OBJECT_MEMORY_STANDARD).len() { for index in 0..(*OBJECT_MEMORY_STANDARD).len() {
(&mut (*OBJECT_MEMORY_STANDARD)[index] as *mut ObjectAttributeStandard) o.commit(index);
.write_volatile(o);
} }
} }