[Scummvm-git-logs] scummvm master -> 6df48524c1eb273f2f6bceb9cdaa832b008fa817

dreammaster dreammaster at scummvm.org
Wed Sep 29 03:59:59 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:
6df48524c1 AGS: More properly fix paletted fading


Commit: 6df48524c1eb273f2f6bceb9cdaa832b008fa817
    https://github.com/scummvm/scummvm/commit/6df48524c1eb273f2f6bceb9cdaa832b008fa817
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-09-28T20:59:46-07:00

Commit Message:
AGS: More properly fix paletted fading

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 67ec489aab..aeca721745 100644
--- a/engines/ags/lib/allegro/color.cpp
+++ b/engines/ags/lib/allegro/color.cpp
@@ -187,14 +187,14 @@ void get_color(int idx, RGB *p) {
 	*p = _G(current_palette)[idx];
 }
 
-void get_palette(PALETTE p) {
-	*p = *_G(current_palette);
-}
-
 void get_palette_range(PALETTE p, int from, int to) {
 	Common::copy(&_G(current_palette)[from], &_G(current_palette)[to + 1], &p[from]);
 }
 
+void get_palette(PALETTE p) {
+	get_palette_range(p, 0, PAL_SIZE - 1);
+}
+
 void fade_interpolate(AL_CONST PALETTE source, AL_CONST PALETTE dest, PALETTE output, int pos, int from, int to) {
 	assert(pos >= 0 && pos <= 64);
 	assert(from >= 0 && from < PAL_SIZE);




More information about the Scummvm-git-logs mailing list