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

[sev-]

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

Summary:
7beaa38ef6 COMMON: MACGUI: Append string with font in appendText
7dcb1f91ed PINK: Convert BGR color to RGB color
d4b450b2b7 PINK: Read individual bytes for text and background color


Commit: 7beaa38ef6468fd7526600fed356d3dd1c438aea
    https://github.com/scummvm/scummvm/commit/7beaa38ef6468fd7526600fed356d3dd1c438aea
Author: Avijeet (am388488 at gmail.com)
Date: 2022-07-02T22:41:36+02:00

Commit Message:
COMMON: MACGUI: Append string with font in appendText

Changed paths:
    graphics/macgui/mactext.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 740d043dfc4..99aa56ad5a0 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -1236,7 +1236,7 @@ void MacText::appendText(const Common::U32String &str, const Font *font, uint16
 	if (!skipAdd)
 		_str += strWithFont;
 
-	appendText_(str, oldLen);
+	appendText_(strWithFont, oldLen);
 }
 
 void MacText::appendText_(const Common::U32String &strWithFont, uint oldLen) {


Commit: 7dcb1f91edb44ed296277a1820ccf9753e7f66f7
    https://github.com/scummvm/scummvm/commit/7dcb1f91edb44ed296277a1820ccf9753e7f66f7
Author: Avijeet (am388488 at gmail.com)
Date: 2022-07-02T22:41:36+02:00

Commit Message:
PINK: Convert BGR color to RGB color

Changed paths:
    engines/pink/objects/actions/action_text.cpp


diff --git a/engines/pink/objects/actions/action_text.cpp b/engines/pink/objects/actions/action_text.cpp
index 49099e55565..1692c34e60e 100644
--- a/engines/pink/objects/actions/action_text.cpp
+++ b/engines/pink/objects/actions/action_text.cpp
@@ -66,6 +66,7 @@ void ActionText::deserialize(Archive &archive) {
 	_centered = archive.readDWORD();
 	_scrollBar = archive.readDWORD();
 	_textRGB = archive.readDWORD();
+	_textRGB = ((_textRGB >> 16) & 0xFF) | (((_textRGB >> 8) & 0xFF) << 8) | ((_textRGB & 0xFF) << 16);
 	_backgroundRGB = archive.readDWORD();
 }
 


Commit: d4b450b2b79bc1def6dc1b9af63877cd49b8232b
    https://github.com/scummvm/scummvm/commit/d4b450b2b79bc1def6dc1b9af63877cd49b8232b
Author: Avijeet (am388488 at gmail.com)
Date: 2022-07-02T22:41:36+02:00

Commit Message:
PINK: Read individual bytes for text and background color

Changed paths:
    engines/pink/objects/actions/action_text.cpp


diff --git a/engines/pink/objects/actions/action_text.cpp b/engines/pink/objects/actions/action_text.cpp
index 1692c34e60e..0519b2d5dfb 100644
--- a/engines/pink/objects/actions/action_text.cpp
+++ b/engines/pink/objects/actions/action_text.cpp
@@ -65,9 +65,18 @@ void ActionText::deserialize(Archive &archive) {
 
 	_centered = archive.readDWORD();
 	_scrollBar = archive.readDWORD();
-	_textRGB = archive.readDWORD();
-	_textRGB = ((_textRGB >> 16) & 0xFF) | (((_textRGB >> 8) & 0xFF) << 8) | ((_textRGB & 0xFF) << 16);
-	_backgroundRGB = archive.readDWORD();
+
+	byte r = archive.readByte();
+	byte g = archive.readByte();
+	byte b = archive.readByte();
+	(void)archive.readByte(); // skip Alpha
+	_textRGB = r << 16 | g << 8 | b;
+
+	r = archive.readByte();
+	g = archive.readByte();
+	b = archive.readByte();
+	(void)archive.readByte(); // skip Alpha
+	_backgroundRGB = r << 16 | g << 8 | b;
 }
 
 void ActionText::toConsole() const {