len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-23 12:02:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

xrick: Fix various errors/warnings

Browse source 
* 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
This commit is contained in:
Solomon Peachy 2024-06-30 18:17:34 -04:00
parent 102c374248
commit 423350ec4d
5 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
apps/plugins/xrick/3rd_party/miniz/miniz.c vendored
View file

@ -219,6 +219,11 @@
#define MINIZ_HAS_64BIT_REGISTERS 1 #define MINIZ_HAS_64BIT_REGISTERS 1
#endif #endif
#if (__GNUC__ >= 7)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmisleading-indentation"
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

2
apps/plugins/xrick/e_them.c
View file

@ -342,7 +342,7 @@ e_them_t2_action2(U8 e)
static U8 *cl = (U8 *)&cx; static U8 *cl = (U8 *)&cx;
static U8 *ch = (U8 *)&cx + 1; static U8 *ch = (U8 *)&cx + 1;
static U16 *sl = (U16 *)&e_them_rndseed; 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");*/ /*sys_printf("e_them_t2 ------------------------------\n");*/

8
apps/plugins/xrick/system/sysfile_rockbox.c
View file

@ -64,7 +64,7 @@ void sysfile_clearRootPath()
*/ */
file_t sysfile_open(const char *name) file_t sysfile_open(const char *name)
{ {
int fd; long fd;
size_t fullPathLength = rb->strlen(rootPath) + rb->strlen(name) + 2; size_t fullPathLength = rb->strlen(rootPath) + rb->strlen(name) + 2;
char *fullPath = sysmem_push(fullPathLength); 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 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); 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 sysfile_seek(file_t file, long offset, int origin)
{ {
int fd = (int)file; long fd = (long)file;
return rb->lseek(fd, offset, origin); 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) void sysfile_close(file_t file)
{ {
int fd = (int)file; long fd = (long)file;
rb->close(fd); rb->close(fd);
} }

2
apps/plugins/xrick/system/sysvid_rockbox.c
View file

@ -55,7 +55,9 @@ enum { GREYBUFSIZE = (LCD_WIDTH*((LCD_HEIGHT+7)/8)*16+200) };
# endif # endif
#endif /* ndef HAVE_LCD_COLOR */ #endif /* ndef HAVE_LCD_COLOR */
#ifdef HAVE_LCD_COLOR
static fb_data *lcd_fb = NULL; static fb_data *lcd_fb = NULL;
#endif
#if (LCD_HEIGHT < SYSVID_HEIGHT) #if (LCD_HEIGHT < SYSVID_HEIGHT)
enum { ROW_RESIZE_STEP = (LCD_HEIGHT << 16) / SYSVID_HEIGHT }; enum { ROW_RESIZE_STEP = (LCD_HEIGHT << 16) / SYSVID_HEIGHT };

7
manual/plugins/xrick.tex
View file

@ -1,4 +1,3 @@
% $Id$ %
\subsection{xrick} \subsection{xrick}
\screenshot{plugins/images/ss-xrick}{xrick}{img:xrick} \screenshot{plugins/images/ss-xrick}{xrick}{img:xrick}
xrick is a clone of the platform game xrick is a clone of the platform game
@ -21,9 +20,11 @@ Go figure.
\subsubsection{Getting started} \subsubsection{Getting started}
For the game to run you need \fname{.dat} game files located in For the game to run you need \fname{.dat} game files located in
\fname{/.rockbox/xrick} on your \dap. \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 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} \subsubsection{Controls}
By holding down \emph{Fire} and pressing \emph{Left} or \emph{Right}, By holding down \emph{Fire} and pressing \emph{Left} or \emph{Right},