From a07d1585deb41bc40777045ac36b1643d2574980 Mon Sep 17 00:00:00 2001
From: Ben Bridle <bridle.benjamin@gmail.com>
Date: Tue, 16 Apr 2024 15:27:45 +1200
Subject: Fix memory, input, screen, and file devices

The memory device was never being allocated any memory, the input device
wasn't scrolling correctly, the screen device was rendering sprites
incorrectly, and the device ID of the file device had not been changed
over from 0xA to 0x9.
---
 src/devices/input.rs              | 8 ++++----
 src/devices/screen/draw_sprite.rs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/devices')

diff --git a/src/devices/input.rs b/src/devices/input.rs
index f23d902..a065531 100644
--- a/src/devices/input.rs
+++ b/src/devices/input.rs
@@ -99,12 +99,12 @@ impl InputDevice {
 
     pub fn on_scroll_horizontal(&mut self, delta: f64) {
         self.horizontal_scroll_delta += delta;
-        while self.horizontal_scroll_delta > 1.0 {
+        while self.horizontal_scroll_delta >= 1.0 {
             self.horizontal_scroll = self.horizontal_scroll.saturating_add(1);
             self.horizontal_scroll_delta -= 1.0;
             self.wake_flag = true;
         }
-        while self.horizontal_scroll_delta < -1.0 {
+        while self.horizontal_scroll_delta <= -1.0 {
             self.horizontal_scroll = self.horizontal_scroll.saturating_sub(1);
             self.horizontal_scroll_delta += 1.0;
             self.wake_flag = true;
@@ -113,12 +113,12 @@ impl InputDevice {
 
     pub fn on_scroll_vertical(&mut self, delta: f64) {
         self.vertical_scroll_delta += delta;
-        while self.vertical_scroll_delta > 1.0 {
+        while self.vertical_scroll_delta >= 1.0 {
             self.vertical_scroll = self.vertical_scroll.saturating_add(1);
             self.vertical_scroll_delta -= 1.0;
             self.wake_flag = true;
         }
-        while self.vertical_scroll_delta < -1.0 {
+        while self.vertical_scroll_delta <= -1.0 {
             self.vertical_scroll = self.vertical_scroll.saturating_sub(1);
             self.vertical_scroll_delta += 1.0;
             self.wake_flag = true;
diff --git a/src/devices/screen/draw_sprite.rs b/src/devices/screen/draw_sprite.rs
index 9b0658c..5676335 100644
--- a/src/devices/screen/draw_sprite.rs
+++ b/src/devices/screen/draw_sprite.rs
@@ -19,7 +19,7 @@ impl ScreenDevice {
                 pos.x = pos.x.wrapping_add(1);
             }
             pos.x = pos.x.wrapping_sub(8);
-            pos.y = pos.x.wrapping_add(1);
+            pos.y = pos.y.wrapping_add(1);
         }
     }
 }
-- 
cgit v1.2.3-70-g09d2