From 423350ec4dfba02dad9b91d5560b192cc51b8ad0 Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Sun, 30 Jun 2024 18:17:34 -0400
Subject: xrick:  Fix various errors/warnings

  * Piles of warnings in miniz when built with modern toolchain
  * Pointer arithematic error in PRNG
  * Casting between int and void * for file descriptors
  * Warning on non-color targets

Remaining:

  * Failure on XRGB888 LCDs due to issue with core LCD macros
  * Failure on interleaved greyscale LCDs (?)
  * HTML manual build failure

Change-Id: Ibf6d2c001ec8daf583731d5da15b86b5352773e7
---
 apps/plugins/xrick/3rd_party/miniz/miniz.c  | 5 +++++
 apps/plugins/xrick/e_them.c                 | 2 +-
 apps/plugins/xrick/system/sysfile_rockbox.c | 8 ++++----
 apps/plugins/xrick/system/sysvid_rockbox.c  | 2 ++
 manual/plugins/xrick.tex                    | 7 ++++---
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/apps/plugins/xrick/3rd_party/miniz/miniz.c b/apps/plugins/xrick/3rd_party/miniz/miniz.c
index 7c26f3b4ba..380c9a9502 100644
--- a/apps/plugins/xrick/3rd_party/miniz/miniz.c
+++ b/apps/plugins/xrick/3rd_party/miniz/miniz.c
@@ -219,6 +219,11 @@
 #define MINIZ_HAS_64BIT_REGISTERS 1
 #endif
 
+#if (__GNUC__ >= 7)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/apps/plugins/xrick/e_them.c b/apps/plugins/xrick/e_them.c
index 465325b652..3871798a57 100644
--- a/apps/plugins/xrick/e_them.c
+++ b/apps/plugins/xrick/e_them.c
@@ -342,7 +342,7 @@ e_them_t2_action2(U8 e)
   static U8 *cl = (U8 *)&cx;
   static U8 *ch = (U8 *)&cx + 1;
   static U16 *sl = (U16 *)&e_them_rndseed;
-  static U16 *sh = (U16 *)&e_them_rndseed + 2;
+  static U16 *sh = ((U16 *)&e_them_rndseed) + 1;
 
   /*sys_printf("e_them_t2 ------------------------------\n");*/
 
diff --git a/apps/plugins/xrick/system/sysfile_rockbox.c b/apps/plugins/xrick/system/sysfile_rockbox.c
index 72227d5301..06227caec1 100644
--- a/apps/plugins/xrick/system/sysfile_rockbox.c
+++ b/apps/plugins/xrick/system/sysfile_rockbox.c
@@ -64,7 +64,7 @@ void sysfile_clearRootPath()
  */
 file_t sysfile_open(const char *name)
 {
-    int fd;
+    long fd;
 
     size_t fullPathLength = rb->strlen(rootPath) + rb->strlen(name) + 2;
     char *fullPath = sysmem_push(fullPathLength);
@@ -97,7 +97,7 @@ file_t sysfile_open(const char *name)
  */
 int sysfile_read(file_t file, void *buf, size_t size, size_t count)
 {
-    int fd = (int)file;
+    long fd = (long)file;
     return (rb->read(fd, buf, size * count) / size);
 }
 
@@ -106,7 +106,7 @@ int sysfile_read(file_t file, void *buf, size_t size, size_t count)
  */
 int sysfile_seek(file_t file, long offset, int origin)
 {
-    int fd = (int)file;
+    long fd = (long)file;
     return rb->lseek(fd, offset, origin);
 }
 
@@ -115,7 +115,7 @@ int sysfile_seek(file_t file, long offset, int origin)
  */
 void sysfile_close(file_t file)
 {
-    int fd = (int)file;
+    long fd = (long)file;
     rb->close(fd);
 }
 
diff --git a/apps/plugins/xrick/system/sysvid_rockbox.c b/apps/plugins/xrick/system/sysvid_rockbox.c
index 236bc87616..fccf515575 100644
--- a/apps/plugins/xrick/system/sysvid_rockbox.c
+++ b/apps/plugins/xrick/system/sysvid_rockbox.c
@@ -55,7 +55,9 @@ enum { GREYBUFSIZE = (LCD_WIDTH*((LCD_HEIGHT+7)/8)*16+200) };
 #  endif
 #endif /* ndef HAVE_LCD_COLOR */
 
+#ifdef HAVE_LCD_COLOR
 static fb_data *lcd_fb = NULL;
+#endif
 
 #if (LCD_HEIGHT < SYSVID_HEIGHT)
 enum { ROW_RESIZE_STEP = (LCD_HEIGHT << 16) / SYSVID_HEIGHT };
diff --git a/manual/plugins/xrick.tex b/manual/plugins/xrick.tex
index 3aac6e08c8..435651df3b 100755
--- a/manual/plugins/xrick.tex
+++ b/manual/plugins/xrick.tex
@@ -1,4 +1,3 @@
-% $Id$ %
 \subsection{xrick}
 \screenshot{plugins/images/ss-xrick}{xrick}{img:xrick}
 xrick is a clone of the platform game
@@ -21,9 +20,11 @@ Go figure.
 \subsubsection{Getting started}
 For the game to run you need \fname{.dat} game files located in
 \fname{/.rockbox/xrick} on your \dap.
-Create the directory and extract xrick \fname{data.zip} archive into it.
+
 The needed files can be found at
-\url{https://github.com/pierluigi-vicinanza/xrick/blob/master/game/data.zip}.
+\url{https://download.rockbox.org/useful/xrick-data.zip}.
+
+Extract the \fname{xrick-data.zip} archive into the top-level directory of your \dap.
 
 \subsubsection{Controls}
 By holding down \emph{Fire} and pressing \emph{Left} or \emph{Right},
-- 
cgit v1.2.3