From: beeanyew <beeanyew@gmail.com>
Date: Tue, 11 May 2021 10:14:50 +0000 (+0200)
Subject: Fix PiStorm dev manual memset, change RTG FPS display/palette debug stuff
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6fbaf6d88410511734254a9fb4e45465852ca8c0;p=pistorm

Fix PiStorm dev manual memset, change RTG FPS display/palette debug stuff
---

diff --git a/platforms/amiga/pistorm-dev/pistorm-dev.c b/platforms/amiga/pistorm-dev/pistorm-dev.c
index 4aafd19..5f49d6c 100644
--- a/platforms/amiga/pistorm-dev/pistorm-dev.c
+++ b/platforms/amiga/pistorm-dev/pistorm-dev.c
@@ -225,7 +225,7 @@ void handle_pistorm_dev_write(uint32_t addr_, uint32_t val, uint8_t type) {
                     memset(dst_ptr, pi_byte[0], val);
                 } else {
                     for (uint32_t i = 0; i < val; i++) {
-                        m68k_write_memory_8(pi_ptr[0] + i, val);
+                        m68k_write_memory_8(pi_ptr[0] + i, pi_byte[0]);
                     }
                 }
             }
diff --git a/platforms/amiga/rtg/rtg-output-raylib.c b/platforms/amiga/rtg/rtg-output-raylib.c
index 849db67..d475ffa 100644
--- a/platforms/amiga/rtg/rtg-output-raylib.c
+++ b/platforms/amiga/rtg/rtg-output-raylib.c
@@ -13,8 +13,6 @@
 #include <string.h>
 #include <unistd.h>
 
-//#define DEBUG_RAYLIB_RTG
-
 #define RTG_INIT_ERR(a) { printf(a); *data->running = 0; }
 
 uint8_t busy = 0, rtg_on = 0, rtg_initialized = 0;
@@ -28,7 +26,7 @@ extern uint16_t rtg_pitch, rtg_total_rows;
 extern uint16_t rtg_offset_x, rtg_offset_y;
 
 static pthread_t thread_id;
-static uint8_t mouse_cursor_enabled = 0, cursor_image_updated = 0, updating_screen = 0;
+static uint8_t mouse_cursor_enabled = 0, cursor_image_updated = 0, updating_screen = 0, debug_palette = 0, show_fps = 0;
 static uint8_t mouse_cursor_w = 16, mouse_cursor_h = 16;
 static int16_t mouse_cursor_x = 0, mouse_cursor_y = 0;
 
@@ -221,18 +219,18 @@ reinit_raylib:;
                 DrawTexturePro(raylib_cursor_texture, cursor_srcrect, dstrect, origin, 0.0f, RAYWHITE);
             }
 
-#ifdef DEBUG_RAYLIB_RTG
-            if (format == RTGFMT_8BIT) {
-                Rectangle srcrect = { 0, 0, 256, 1 };
-                Rectangle dstrect = { 0, 0, 1024, 8 };
-                //DrawTexture(raylib_clut_texture, 0, 0, RAYWHITE);
-                DrawTexturePro(raylib_clut_texture, srcrect, dstrect, origin, 0.0f, RAYWHITE);
-                dstrect.y += 8;
-                DrawTexturePro(raylib_cursor_clut_texture, srcrect, dstrect, origin, 0.0f, RAYWHITE);
+            if (debug_palette) {
+                if (format == RTGFMT_8BIT) {
+                    Rectangle srcrect = { 0, 0, 256, 1 };
+                    Rectangle dstrect = { 0, 0, 1024, 8 };
+                    DrawTexturePro(raylib_clut_texture, srcrect, dstrect, origin, 0.0f, RAYWHITE);
+                }
+            }
+
+            if (show_fps) {
+                DrawFPS(GetScreenWidth() - 128, 0);
             }
-#endif
 
-            DrawFPS(width - 200, 0);
             EndDrawing();
             if (format == RTGFMT_RBG565) {
                 for (int y = 0; y < height; y++) {