fix conflicts

This commit is contained in:
Alug committed 2024-02-22 01:43:54 +01:00
1 parent 157ebdb5fe
commit 26dd066280
2 files changed
+4 -4

No files matched your search

+2 -2
View File
@@ -612,7 +612,7 @@ UINT8 K_GetKartColorByName(const char *name)
return 0;
}
static UINT8 K_GetHudColor(void)
UINT8 K_GetHudColor(void)
{
if (cv_colorizedhud.value){
if (cv_colorizedhudcolor.value) return cv_colorizedhudcolor.value;
@@ -621,7 +621,7 @@ static UINT8 K_GetHudColor(void)
return ((stplyr && gamestate == GS_LEVEL) ? stplyr->skincolor : cv_playercolor.value);
}
static boolean K_UseColorHud(void)
boolean K_UseColorHud(void)
{
return (cv_colorizedhud.value && clr_hud);
}
+2 -2
View File
@@ -998,7 +998,7 @@ static boolean M_SetupaPNG(png_const_charp filename, png_bytep pal)
png_init_io(apng_ptr, apng_FILE);
#ifdef PNG_SET_USER_LIMITS_SUPPORTED
png_set_user_limits(apng_ptr, MAXPNGWIDTH, MAXPNGHEIGHT);
png_set_user_limits(apng_ptr, MAXVIDWIDTH, MAXVIDHEIGHT);
#endif
//png_set_filter(apng_ptr, 0, PNG_ALL_FILTERS);
@@ -1307,7 +1307,7 @@ boolean M_SavePNG(const char *filename, void *data, int width, int height, const
png_init_io(png_ptr, png_FILE);
#ifdef PNG_SET_USER_LIMITS_SUPPORTED
png_set_user_limits(png_ptr, MAXPNGWIDTH, MAXPNGHEIGHT);
png_set_user_limits(png_ptr, MAXVIDWIDTH, MAXVIDHEIGHT);
#endif
//png_set_filter(png_ptr, 0, PNG_ALL_FILTERS);