m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Scroll palette to show relevant colors

Browse Source
This commit is contained in:
Thomas Bernard 2018-11-26 00:38:41 +01:00
parent 0e018d4a3c
commit 25c4ec5ceb
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/buttons_effects.c
View File

@ -401,6 +401,7 @@ void Button_Constraint_menu(void)
{ {
case IMAGE_MODE_ZX: case IMAGE_MODE_ZX:
ZX_Spectrum_set_palette(Main.palette); ZX_Spectrum_set_palette(Main.palette);
First_color_in_palette = 0;
break; break;
//case IMAGE_MODE_THOMSON: //case IMAGE_MODE_THOMSON:
/// @todo set palette for Thomson. /// @todo set palette for Thomson.
@ -411,11 +412,13 @@ void Button_Constraint_menu(void)
case IMAGE_MODE_RASTER: case IMAGE_MODE_RASTER:
CPC_set_HW_palette(Main.palette + 0x40); CPC_set_HW_palette(Main.palette + 0x40);
CPC_set_default_BASIC_palette(Main.palette); CPC_set_default_BASIC_palette(Main.palette);
First_color_in_palette = (Selected_Constraint_Mode >= IMAGE_MODE_MODE5) ? 64 : 0;
break; break;
case IMAGE_MODE_C64HIRES: case IMAGE_MODE_C64HIRES:
case IMAGE_MODE_C64MULTI: case IMAGE_MODE_C64MULTI:
case IMAGE_MODE_C64FLI: case IMAGE_MODE_C64FLI:
C64_set_palette(Main.palette); C64_set_palette(Main.palette);
First_color_in_palette = 0;
break; break;
default: default:
break; break;
@ -423,6 +426,7 @@ void Button_Constraint_menu(void)
// Refresh palette // Refresh palette
Set_palette(Main.palette); Set_palette(Main.palette);
//Compute_optimal_menu_colors(Main.palette); // I'm not sure this is needed //Compute_optimal_menu_colors(Main.palette); // I'm not sure this is needed
Display_menu_palette();
} }
} }
} }

2
src/miscfileformats.c
View File

@ -4336,6 +4336,8 @@ void Load_CM5(T_IO_Context* context)
// Setup the palette (amstrad hardware palette) // Setup the palette (amstrad hardware palette)
CPC_set_HW_palette(context->Palette + 0x40); CPC_set_HW_palette(context->Palette + 0x40);
First_color_in_palette = 64;
if (!Read_byte(file, &ink0)) if (!Read_byte(file, &ink0))
File_error = 2; File_error = 2;