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

dreammaster paulfgilbert at gmail.com
Thu Feb 14 06:02:18 CET 2019


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:
d6ddb601ca GLK: FROTZ: Have zRGB properly convert to screen format


Commit: d6ddb601ca9ae9c5e6316e1e0f05f4854d066df7
    https://github.com/scummvm/scummvm/commit/d6ddb601ca9ae9c5e6316e1e0f05f4854d066df7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-02-13T20:58:34-08:00

Commit Message:
GLK: FROTZ: Have zRGB properly convert to screen format

Changed paths:
    engines/glk/frotz/processor_screen.cpp


diff --git a/engines/glk/frotz/processor_screen.cpp b/engines/glk/frotz/processor_screen.cpp
index 95e1218..a440cfa 100644
--- a/engines/glk/frotz/processor_screen.cpp
+++ b/engines/glk/frotz/processor_screen.cpp
@@ -274,7 +274,7 @@ void Processor::z_print_table() {
 #define zG(i) ((((i >>  5) & 0x1F) << 3) | (((i >>  5) & 0x1F) >> 2))
 #define zR(i) ((((i      ) & 0x1F) << 3) | (((i      ) & 0x1F) >> 2))
 
-#define zRGB(i) (zR(i) << 16 | zG(i) << 8 | zB(i))
+#define zRGB(i) _screen->format.RGBToColor(zR(i), zG(i), zB(i))
 
 void Processor::z_set_true_colour() {
 	int zfore = zargs[0];





More information about the Scummvm-git-logs mailing list