Allocate all colormaps with PU_STATIC
This commit is contained in:
1 parent
b26effa241
commit
489a58f9fd
3 files changed
+9
-3
No files matched your search
+2
-1
@@ -2586,7 +2586,8 @@ void P_FreeLevelState(void)
|
||||
}
|
||||
|
||||
// Clear pointers that would be left dangling by the purge
|
||||
R_FlushTranslationColormapCache();
|
||||
// Pointers are now PU_STATIC so they won't be freed :)
|
||||
//R_FlushTranslationColormapCache();
|
||||
|
||||
#ifdef HWRENDER
|
||||
// Free GPU textures before freeing patches.
|
||||
|
||||
+6
-1
@@ -419,7 +419,7 @@ static UINT8* RGetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 f
|
||||
// Generate the colormap if necessary
|
||||
if (!ret)
|
||||
{
|
||||
ret = static_cast<UINT8*>(Z_Malloc(NUM_PALETTE_ENTRIES, (flags & GTC_CACHE) ? PU_LEVEL : PU_STATIC, NULL));
|
||||
ret = static_cast<UINT8*>(Z_Malloc(NUM_PALETTE_ENTRIES, PU_STATIC, NULL));
|
||||
K_GenerateKartColormap(ret, skinnum, color, local); //R_GenerateTranslationColormap(ret, skinnum, color); // SRB2kart
|
||||
|
||||
// Cache the colormap if desired
|
||||
@@ -487,6 +487,10 @@ patch_t* R_GetSkinFaceMini(player_t* ply)
|
||||
|
||||
\return void
|
||||
*/
|
||||
|
||||
/* There seems to be no reason to free cached colormaps tho? Not like they can change :ChonkBunckle: */
|
||||
|
||||
/*
|
||||
void R_FlushTranslationColormapCache(void)
|
||||
{
|
||||
INT32 i;
|
||||
@@ -499,6 +503,7 @@ void R_FlushTranslationColormapCache(void)
|
||||
if (localtranslationtablecache[i])
|
||||
memset(localtranslationtablecache[i], 0, MAXTRANSLATIONS * sizeof(UINT8**));
|
||||
}
|
||||
*/
|
||||
|
||||
// ==========================================================================
|
||||
// COMMON DRAWER FOR 8 AND 16 BIT COLOR MODES
|
||||
|
||||
+1
-1
@@ -774,7 +774,7 @@ void R_AddSkins(UINT16 wadnum, boolean local)
|
||||
// So just let the function in the while loop take care of it for us.
|
||||
}
|
||||
|
||||
R_FlushTranslationColormapCache();
|
||||
//R_FlushTranslationColormapCache();
|
||||
|
||||
CONS_Printf(M_GetText("Added skin '%s'\n"), skin->name);
|
||||
#ifdef SKINVALUES
|
||||
|
||||
Reference in new issue
Block a user