admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #347 from negativeExponent/fix_default_palette

Browse Source 
Fix default palette option does not reset colors when selected
This commit is contained in:
hizzlekizzle
2020-03-20 21:40:46 -05:00
committed by GitHub
parent 5a3d6375a6 9d90c0ca21
commit 0af3dcee1c
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/drivers/libretro/libretro.c
View File

@@ -989,21 +989,20 @@ static void retro_set_custom_palette(void)
ipalette = 0; ipalette = 0;
use_raw_palette = false; use_raw_palette = false;
if ((current_palette == PAL_DEFAULT) || /* VS UNISystem uses internal palette presets regardless of options */
(current_palette == PAL_CUSTOM) || if (GameInfo->type == GIT_VSUNI)
(GameInfo->type == GIT_VSUNI)) FCEU_ResetPalette();
{
if (current_palette == PAL_CUSTOM)
{
if (external_palette_exist && (GameInfo->type != GIT_VSUNI))
ipalette = 1;
}
FCEU_ResetPalette(); /* if ipalette is set to 1, external palette /* Reset and choose between default internal or external custom palette */
* is loaded when FCEU_ResetPalette is called, else if (current_palette == PAL_DEFAULT || current_palette == PAL_CUSTOM)
* else it will load default NES palette. {
* VS Unisystem should always use default palette. ipalette = external_palette_exist && (current_palette == PAL_CUSTOM);
*/
/* if ipalette is set to 1, external palette
* is loaded, else it will load default NES palette.
* FCEUI_SetPaletteArray() both resets the palette array to
* internal default palette and then chooses which one to use. */
FCEUI_SetPaletteArray( NULL );
} }
/* setup raw palette */ /* setup raw palette */
@@ -1020,7 +1019,7 @@ static void retro_set_custom_palette(void)
} }
} }
/* Setup this palette*/ /* setup palette presets */
else else
{ {
unsigned *palette_data = palettes[current_palette].data; unsigned *palette_data = palettes[current_palette].data;