From e4174c7d4bfb5ff93259fdc91a722282a5fa3c3d Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Thu, 16 Jan 2025 19:49:20 +0100
Subject: [PATCH] cleanup some pak switching code

---
 src/device/controller.rs        | 8 ++++----
 src/device/controller/mempak.rs | 4 ----
 src/device/controller/rumble.rs | 4 ----
 src/device/pif.rs               | 2 +-
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/device/controller.rs b/src/device/controller.rs
index 075ca91..e315af8 100644
--- a/src/device/controller.rs
+++ b/src/device/controller.rs
@@ -31,7 +31,7 @@ pub enum PakType {
 pub struct PakHandler {
     pub read: fn(&mut device::Device, usize, u16, usize, usize),
     pub write: fn(&mut device::Device, usize, u16, usize, usize),
-    pub get_type: fn() -> PakType,
+    pub pak_type: PakType,
 }
 
 pub fn process(device: &mut device::Device, channel: usize) {
@@ -59,7 +59,7 @@ pub fn process(device: &mut device::Device, channel: usize) {
                 if device::events::get_event(device, device::events::EventType::PakSwitch).is_none()
                 {
                     device.pif.channels[channel].change_pak =
-                        (device.pif.channels[channel].pak_handler.unwrap().get_type)();
+                        device.pif.channels[channel].pak_handler.unwrap().pak_type;
                     device.pif.channels[channel].pak_handler = None;
                     device::events::create_event(
                         device,
@@ -154,7 +154,7 @@ pub fn pak_switch_event(device: &mut device::Device) {
                 let handler = device::controller::PakHandler {
                     read: device::controller::mempak::read,
                     write: device::controller::mempak::write,
-                    get_type: device::controller::mempak::get_type,
+                    pak_type: device::controller::PakType::MemPak,
                 };
                 channel.pak_handler = Some(handler);
                 ui::audio::play_pak_switch(&mut device.ui, PakType::MemPak);
@@ -162,7 +162,7 @@ pub fn pak_switch_event(device: &mut device::Device) {
                 let handler = device::controller::PakHandler {
                     read: device::controller::rumble::read,
                     write: device::controller::rumble::write,
-                    get_type: device::controller::rumble::get_type,
+                    pak_type: device::controller::PakType::RumblePak,
                 };
                 channel.pak_handler = Some(handler);
                 ui::audio::play_pak_switch(&mut device.ui, PakType::RumblePak);
diff --git a/src/device/controller/mempak.rs b/src/device/controller/mempak.rs
index f124c5c..c8bd7ef 100644
--- a/src/device/controller/mempak.rs
+++ b/src/device/controller/mempak.rs
@@ -90,7 +90,3 @@ pub fn write(device: &mut device::Device, channel: usize, address: u16, data: us
         device.ui.saves.mempak.1 = true
     }
 }
-
-pub fn get_type() -> device::controller::PakType {
-    device::controller::PakType::MemPak
-}
diff --git a/src/device/controller/rumble.rs b/src/device/controller/rumble.rs
index 3140b35..6356507 100644
--- a/src/device/controller/rumble.rs
+++ b/src/device/controller/rumble.rs
@@ -18,7 +18,3 @@ pub fn write(device: &mut device::Device, channel: usize, address: u16, data: us
         device::ui::input::set_rumble(&mut device.ui, channel, rumble);
     }
 }
-
-pub fn get_type() -> device::controller::PakType {
-    device::controller::PakType::RumblePak
-}
diff --git a/src/device/pif.rs b/src/device/pif.rs
index 0898a21..f3f1ad7 100644
--- a/src/device/pif.rs
+++ b/src/device/pif.rs
@@ -228,7 +228,7 @@ pub fn init(device: &mut device::Device) {
     let mempak_handler = device::controller::PakHandler {
         read: device::controller::mempak::read,
         write: device::controller::mempak::write,
-        get_type: device::controller::mempak::get_type,
+        pak_type: device::controller::PakType::MemPak,
     };
 
     for i in 0..4 {