From f26e8a0848d5cb09ccfda114df286ae08f628860 Mon Sep 17 00:00:00 2001 From: retro-wertz Date: Mon, 4 Sep 2017 21:03:48 +0800 Subject: [PATCH] VS. System will only use default palette --- src/drivers/libretro/libretro.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c index b219457..8301d35 100644 --- a/src/drivers/libretro/libretro.c +++ b/src/drivers/libretro/libretro.c @@ -597,9 +597,9 @@ static void retro_set_custom_palette (void) ipalette = 0; use_raw_palette = false; - if (current_palette == 0 || current_palette > MAXPAL) + if (current_palette == 0 || current_palette > MAXPAL || (GameInfo->type == GIT_VSUNI)) { - if (current_palette > MAXPAL) + if (current_palette > MAXPAL && !(GameInfo->type == GIT_VSUNI)) { if (external_palette_exist) ipalette = 1; @@ -609,6 +609,10 @@ static void retro_set_custom_palette (void) FCEU_PrintError("Using default palette instead.\n"); } } + + if (GameInfo->type == GIT_VSUNI) + FCEU_PrintError("Cannot use custom palette with VS. System.\n"); + FCEU_ResetPalette(); /* Do palette reset*/ return; }