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

Simplify palette core options

Browse Source 
Fetch names from palette struct instead.
This commit is contained in:
negativeExponent
2021-06-05 08:26:37 +08:00
parent e75d6be00b
commit 6f8be4cedd
1 changed files with 17 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,11 +273,6 @@ FILE *FCEUD_UTF8fopen(const char *n, const char *m)
} }
/*palette for FCEU*/ /*palette for FCEU*/
#define PAL_TOTAL 16 /* total no. of palettes in palettes[] */
#define PAL_DEFAULT (PAL_TOTAL + 1)
#define PAL_RAW (PAL_TOTAL + 2)
#define PAL_CUSTOM (PAL_TOTAL + 3)
static int external_palette_exist = 0; static int external_palette_exist = 0;
/* table for currently loaded palette */ /* table for currently loaded palette */
@@ -580,6 +575,11 @@ struct st_palettes palettes[] = {
} }
}; };
#define PAL_TOTAL (sizeof(palettes) / sizeof(palettes[0])) /* total palettes in table */
#define PAL_DEFAULT (PAL_TOTAL + 1)
#define PAL_RAW (PAL_TOTAL + 2)
#define PAL_CUSTOM (PAL_TOTAL + 3)
#ifdef HAVE_NTSC_FILTER #ifdef HAVE_NTSC_FILTER
/* ntsc */ /* ntsc */
#include "nes_ntsc.h" #include "nes_ntsc.h"
@@ -1159,38 +1159,18 @@ static void check_variables(bool startup)
current_palette = PAL_RAW; current_palette = PAL_RAW;
else if (!strcmp(var.value, "custom")) else if (!strcmp(var.value, "custom"))
current_palette = PAL_CUSTOM; current_palette = PAL_CUSTOM;
else if (!strcmp(var.value, "asqrealc")) else
current_palette = 0; {
else if (!strcmp(var.value, "nintendo-vc")) unsigned i;
current_palette = 1; for (i = 0; i < PAL_TOTAL; i++)
else if (!strcmp(var.value, "rgb")) {
current_palette = 2; if (!strcmp(var.value, palettes[i].name))
else if (!strcmp(var.value, "yuv-v3")) {
current_palette = 3; current_palette = i;
else if (!strcmp(var.value, "unsaturated-final")) break;
current_palette = 4; }
else if (!strcmp(var.value, "sony-cxa2025as-us")) }
current_palette = 5; }
else if (!strcmp(var.value, "pal"))
current_palette = 6;
else if (!strcmp(var.value, "bmf-final2"))
current_palette = 7;
else if (!strcmp(var.value, "bmf-final3"))
current_palette = 8;
else if (!strcmp(var.value, "smooth-fbx"))
current_palette = 9;
else if (!strcmp(var.value, "composite-direct-fbx"))
current_palette = 10;
else if (!strcmp(var.value, "pvm-style-d93-fbx"))
current_palette = 11;
else if (!strcmp(var.value, "ntsc-hardware-fbx"))
current_palette = 12;
else if (!strcmp(var.value, "nes-classic-fbx-fs"))
current_palette = 13;
else if (!strcmp(var.value, "nescap"))
current_palette = 14;
else if (!strcmp(var.value, "wavebeam"))
current_palette = 15;
if (current_palette != orig_value) if (current_palette != orig_value)
{ {