From 28fa3039c147d7b479b8d4ddfca50918c620aa2f Mon Sep 17 00:00:00 2001 From: James R Date: Wed, 6 Nov 2019 20:45:30 -0800 Subject: [PATCH] More stufffff --- src/k_kart.c | 4 ++-- src/k_kart.h | 2 +- src/r_draw.c | 2 +- src/r_things.c | 2 +- src/st_stuff.h | 3 +++ 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index ca4762de9..06a02cd69 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -466,7 +466,7 @@ void K_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor) \return void */ -void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color) +void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color, boolean local) { INT32 i; INT32 starttranscolor; @@ -502,7 +502,7 @@ void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color) return; } - starttranscolor = (skinnum != TC_DEFAULT) ? skins[skinnum].starttranscolor : DEFAULT_STARTTRANSCOLOR; + starttranscolor = (skinnum != TC_DEFAULT) ? ( (local) ? localskins : skins )[skinnum].starttranscolor : DEFAULT_STARTTRANSCOLOR; // Fill in the entries of the palette that are fixed for (i = 0; i < starttranscolor; i++) diff --git a/src/k_kart.h b/src/k_kart.h index b664f9c33..a7dc591f8 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -15,7 +15,7 @@ extern UINT8 colortranslations[MAXTRANSLATIONS][16]; extern const char *KartColor_Names[MAXSKINCOLORS]; extern const UINT8 KartColor_Opposite[MAXSKINCOLORS*2]; void K_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor); -void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color); +void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color, boolean local); UINT8 K_GetKartColorByName(const char *name); void K_RegisterKartStuff(void); diff --git a/src/r_draw.c b/src/r_draw.c index e6241b6c1..7b0351d44 100644 --- a/src/r_draw.c +++ b/src/r_draw.c @@ -561,7 +561,7 @@ static UINT8* RGetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 f if (!ret) { ret = Z_MallocAlign(NUM_PALETTE_ENTRIES, (flags & GTC_CACHE) ? PU_LEVEL : PU_STATIC, NULL, 8); - K_GenerateKartColormap(ret, skinnum, color); //R_GenerateTranslationColormap(ret, skinnum, color); // SRB2kart + K_GenerateKartColormap(ret, skinnum, color, local); //R_GenerateTranslationColormap(ret, skinnum, color); // SRB2kart // Cache the colormap if desired if (flags & GTC_CACHE) diff --git a/src/r_things.c b/src/r_things.c index 1f95005d6..8d1ced501 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -3313,7 +3313,7 @@ next_token: } // add face graphics - ST_LoadLocalFaceGraphics(skin->facerank, skin->facewant, skin->facemmap, numskins, local); + ST_LoadLocalFaceGraphics(skin->facerank, skin->facewant, skin->facemmap, ( (local) ? numlocalskins : numskins ), local); #ifdef HWRENDER if (rendermode == render_opengl) diff --git a/src/st_stuff.h b/src/st_stuff.h index 1478655ca..5b3f611d9 100644 --- a/src/st_stuff.h +++ b/src/st_stuff.h @@ -79,6 +79,9 @@ extern patch_t *sboperiod; extern patch_t *facerankprefix[MAXSKINS]; // ranking extern patch_t *facewantprefix[MAXSKINS]; // wanted extern patch_t *facemmapprefix[MAXSKINS]; // minimap +extern patch_t *localfacerankprefix[MAXSKINS]; // ranking +extern patch_t *localfacewantprefix[MAXSKINS]; // wanted +extern patch_t *localfacemmapprefix[MAXSKINS]; // minimap extern patch_t *livesback; extern patch_t *ngradeletters[7];