[Scummvm-git-logs] scummvm master -> a1bc9612dabf64a60c68e6617a86c0779b441d10

dreammaster dreammaster at scummvm.org
Mon Jun 21 02:59:07 UTC 2021


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a1bc9612da AGS: Don't pass palettes to ScummVM in non-paletted games


Commit: a1bc9612dabf64a60c68e6617a86c0779b441d10
    https://github.com/scummvm/scummvm/commit/a1bc9612dabf64a60c68e6617a86c0779b441d10
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-06-20T19:58:56-07:00

Commit Message:
AGS: Don't pass palettes to ScummVM in non-paletted games

Changed paths:
    engines/ags/lib/allegro/color.cpp


diff --git a/engines/ags/lib/allegro/color.cpp b/engines/ags/lib/allegro/color.cpp
index 1125fd78a2..296dbdc19d 100644
--- a/engines/ags/lib/allegro/color.cpp
+++ b/engines/ags/lib/allegro/color.cpp
@@ -58,9 +58,11 @@ static void convertPalette(const PALETTE src, byte dest[PALETTE_SIZE]) {
 }
 
 static void applyPalette() {
-	byte pal[PALETTE_SIZE];
-	convertPalette(_G(current_palette), pal);
-	g_system->getPaletteManager()->setPalette(pal, 0, PALETTE_COUNT);
+	if (g_system->getScreenFormat().bytesPerPixel == 1) {
+		byte pal[PALETTE_SIZE];
+		convertPalette(_G(current_palette), pal);
+		g_system->getPaletteManager()->setPalette(pal, 0, PALETTE_COUNT);
+	}
 }
 
 void set_palette(const PALETTE p) {




More information about the Scummvm-git-logs mailing list