fix: revert input serialization change, as it broke run-ahead

Author: lukexor

tetanes-core/src/control_deck.rs

@@ -568,7 +568,10 @@ impl ControlDeck {
         if fs::exists(path) {
             fs::load::<Cpu>(path)
                 .map_err(Error::SaveState)
-                .map(|cpu| self.load_cpu(cpu))
+                .map(|mut cpu| {
+                    cpu.bus.input.clear(); // Discard inputs from save states
+                    self.load_cpu(cpu)
+                })
         } else {
             Err(Error::NoSaveStateFound)
         }

tetanes-core/src/input.rs

@@ -373,7 +373,6 @@ impl From<JoypadBtn> for JoypadBtnState {
 #[derive(Default, Debug, Copy, Clone, Serialize, Deserialize)]
 #[must_use]
 pub struct Joypad {
-    #[serde(skip)] // Don't save button states
     pub buttons: JoypadBtnState,
     pub concurrent_dpad: bool,
     pub index: u8,
@@ -383,7 +382,7 @@ pub struct Joypad {
 impl Joypad {
     pub const fn new() -> Self {
         Self {
-            buttons: JoypadBtnState::from_bits_truncate(0),
+            buttons: JoypadBtnState::empty(),
             concurrent_dpad: false,
             index: 0,
             strobe: false,

tetanes/src/nes/emulation/rewind.rs

@@ -103,6 +103,7 @@ impl Rewind {
             let frame = self.frames[self.index].take()?;
             bincode::deserialize::<Cpu>(&frame.state)
                 .map(|mut cpu| {
+                    cpu.bus.input.clear(); // Discard inputs while rewinding
                     cpu.bus.ppu.frame.buffer = frame.buffer;
                     cpu
                 })
@@ -135,7 +136,8 @@ impl State {
         }
         // ~2 seconds worth of frames @ 60 FPS
         let mut rewind_frames = 120 / self.rewind.interval;
-        while let Some(cpu) = self.rewind.pop() {
+        while let Some(mut cpu) = self.rewind.pop() {
+            cpu.bus.input.clear(); // Discard inputs while rewinding
             self.control_deck.load_cpu(cpu);
             rewind_frames -= 1;
             if rewind_frames == 0 {