Fix for issue 102. Colour can be turned on and off freely.

This commit is contained in:
Carl.Kenner 2009-05-27 18:40:32 +00:00
parent 16e3e02d15
commit 05b8deb22a
2 changed files with 6 additions and 1 deletions

View File

@ -47,8 +47,10 @@ GuiImageData * pointer[4];
static int MenuPalette();
void gbSetPalette(u32 RRGGBB[]);
void StopColorizing();
extern char RomTitle[17];
static GuiButton * btnLogo = NULL;
static GuiImage * gameScreenImg = NULL;
static GuiImage * bgImg = NULL;
@ -2778,6 +2780,8 @@ static int MenuSettingsVideo()
case 5:
if (GCSettings.colorize) GCSettings.colorize = 0;
else GCSettings.colorize = 1;
if (GCSettings.colorize) LoadPalette(RomTitle);
else StopColorizing();
break;
case 6:

View File

@ -792,7 +792,8 @@ static void gbApplyPerImagePreferences()
// look for matching palettes if a monochrome gameboy game
// (or if a Super Gameboy game, but the palette will be ignored later in that case)
if ((Colour != 0x80) && (Colour != 0xC0)) {
LoadPalette(RomTitle);
if (GCSettings.colorize) LoadPalette(RomTitle);
else StopColorizing();
}
}