Merge branch 'master' into libretro_core

This commit is contained in:
Lior Halphon 2017-10-16 20:49:33 +03:00
commit 4b69331321

View File

@ -289,10 +289,12 @@ void GB_palette_changed(GB_gameboy_t *gb, bool background_palette, uint8_t index
void GB_set_color_correction_mode(GB_gameboy_t *gb, GB_color_correction_mode_t mode) void GB_set_color_correction_mode(GB_gameboy_t *gb, GB_color_correction_mode_t mode)
{ {
gb->color_correction_mode = mode; gb->color_correction_mode = mode;
if (gb->is_cgb) {
for (unsigned i = 0; i < 32; i++) { for (unsigned i = 0; i < 32; i++) {
GB_palette_changed(gb, false, i * 2); GB_palette_changed(gb, false, i * 2);
GB_palette_changed(gb, true, i * 2); GB_palette_changed(gb, true, i * 2);
} }
}
} }
/* /*