From fdf57e59db265e96e7c02a5bfe1d73e3b8825895 Mon Sep 17 00:00:00 2001 From: SinnamonLat Date: Fri, 22 Jul 2022 14:13:31 +0200 Subject: [PATCH] futureproof and use int16 for skins in menu instead of sint8 --- src/k_menu.h | 4 ++-- src/k_menudraw.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/k_menu.h b/src/k_menu.h index 772f159ab..e3d678c0d 100644 --- a/src/k_menu.h +++ b/src/k_menu.h @@ -511,7 +511,7 @@ void M_FreePlayerSetupColors(void); #define MAXCLONES MAXSKINS/8 extern struct setup_chargrid_s { - SINT8 skinlist[MAXCLONES]; + INT16 skinlist[MAXCLONES]; UINT8 numskins; } setup_chargrid[9][9]; @@ -532,7 +532,7 @@ typedef struct setup_player_s { SINT8 gridx, gridy; UINT8 profilen; - SINT8 skin; + INT16 skin; SINT8 clonenum; SINT8 rotate; UINT8 delay; diff --git a/src/k_menudraw.c b/src/k_menudraw.c index 98e5140fc..674c4e150 100644 --- a/src/k_menudraw.c +++ b/src/k_menudraw.c @@ -843,7 +843,7 @@ static void M_DrawCharSelectCircle(setup_player_t *p, INT16 x, INT16 y) if (p->mdepth == CSSTEP_ALTS) { - SINT8 skin; + INT16 skin; n = (p->clonenum) + numoptions/2; if (subtract) @@ -946,7 +946,7 @@ static void M_DrawCharSelectCircle(setup_player_t *p, INT16 x, INT16 y) } // returns false if the character couldn't be rendered -static boolean M_DrawCharacterSprite(INT16 x, INT16 y, SINT8 skin, INT32 addflags, UINT8 *colormap) +static boolean M_DrawCharacterSprite(INT16 x, INT16 y, INT16 skin, INT32 addflags, UINT8 *colormap) { UINT8 spr; spritedef_t *sprdef; @@ -1451,7 +1451,7 @@ void M_DrawCharacterSelect(void) UINT8 i, j, k; UINT8 priority = 0; INT16 quadx, quady; - SINT8 skin; + INT16 skin; INT32 basex = optionsmenu.profile != NULL ? 64 : 0; // Draw page num.