[Scummvm-git-logs] scummvm branch-2-6 -> c34cd883a4477bbaf4f8177d6c07b33b2016927f

[athrxx]

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:
c34cd883a4 KYRA: (LoK/MR) - fix options menu text colors


Commit: c34cd883a4477bbaf4f8177d6c07b33b2016927f
    https://github.com/scummvm/scummvm/commit/c34cd883a4477bbaf4f8177d6c07b33b2016927f
Author: athrxx (athrxx at scummvm.org)
Date: 2022-06-16T11:13:08+02:00

Commit Message:
KYRA: (LoK/MR) - fix options menu text colors

Changed paths:
    engines/kyra/gui/gui_hof.h
    engines/kyra/gui/gui_lok.h
    engines/kyra/gui/gui_lol.cpp
    engines/kyra/gui/gui_lol.h
    engines/kyra/gui/gui_mr.h
    engines/kyra/gui/gui_v1.cpp
    engines/kyra/gui/gui_v1.h


diff --git a/engines/kyra/gui/gui_hof.h b/engines/kyra/gui/gui_hof.h
index e750929b70f..ec2d1071309 100644
--- a/engines/kyra/gui/gui_hof.h
+++ b/engines/kyra/gui/gui_hof.h
@@ -46,6 +46,7 @@ private:
 
 	uint8 defaultColor1() const override { return 0xCF; }
 	uint8 defaultColor2() const override { return 0xF8; }
+	uint8 menuItemLabelColor() const override { return 0xCF; }
 
 	uint8 textFieldColor1() const override { return 0xFD; }
 	uint8 textFieldColor2() const override { return 0xFA; }
diff --git a/engines/kyra/gui/gui_lok.h b/engines/kyra/gui/gui_lok.h
index 8ce9e859952..1acfd5de8fa 100644
--- a/engines/kyra/gui/gui_lok.h
+++ b/engines/kyra/gui/gui_lok.h
@@ -151,6 +151,7 @@ private:
 
 	uint8 defaultColor1() const override { return 12; }
 	uint8 defaultColor2() const override { return 248; }
+	uint8 menuItemLabelColor() const override { return 253; }
 
 	Common::String getMenuTitle(const Menu &menu) override { return menu.menuNameString; }
 	Common::String getMenuItemTitle(const MenuItem &menuItem) override { return menuItem.itemString; }
diff --git a/engines/kyra/gui/gui_lol.cpp b/engines/kyra/gui/gui_lol.cpp
index 1288ecab19d..87b65dee2ae 100644
--- a/engines/kyra/gui/gui_lol.cpp
+++ b/engines/kyra/gui/gui_lol.cpp
@@ -2221,10 +2221,9 @@ int GUI_LoL::runMenu(Menu &menu) {
 	int fW = (d->w << 3) - wW;
 	int fC = 0;
 
-	// LoL doesn't have default higlighted items. No item should be
-	// highlighted when entering a new menu.
-	// Instead, the respevtive struct entry is used to determine whether
-	// a menu has scroll buttons or slider bars.
+	// LoL doesn't have default highlighted items. No item should be highlighted when
+	// entering a new menu. Instead, the respective struct entry is used to determine
+	// whether a menu has scroll buttons or slider bars.
 	uint8 hasSpecialButtons = 0;
 	_saveSlotsListUpdateNeeded = true;
 
diff --git a/engines/kyra/gui/gui_lol.h b/engines/kyra/gui/gui_lol.h
index fe3e2e63595..ba0930061df 100644
--- a/engines/kyra/gui/gui_lol.h
+++ b/engines/kyra/gui/gui_lol.h
@@ -141,6 +141,7 @@ private:
 
 	uint8 defaultColor1() const override { return 0xFE; }
 	uint8 defaultColor2() const override { return 0x00; }
+	uint8 menuItemLabelColor() const override { return 0xCC; }
 
 	Common::String getMenuTitle(const Menu &menu) override;
 	Common::String getMenuItemTitle(const MenuItem &menuItem) override;
diff --git a/engines/kyra/gui/gui_mr.h b/engines/kyra/gui/gui_mr.h
index af6b4c062d6..2f919b24016 100644
--- a/engines/kyra/gui/gui_mr.h
+++ b/engines/kyra/gui/gui_mr.h
@@ -57,6 +57,7 @@ private:
 
 	uint8 defaultColor1() const override { return 0xF0; }
 	uint8 defaultColor2() const override { return 0xD0; }
+	uint8 menuItemLabelColor() const override { return 0xFF; }
 
 	void resetState(int item);
 
diff --git a/engines/kyra/gui/gui_v1.cpp b/engines/kyra/gui/gui_v1.cpp
index e7dc93c0be0..9d84fb06d09 100644
--- a/engines/kyra/gui/gui_v1.cpp
+++ b/engines/kyra/gui/gui_v1.cpp
@@ -162,7 +162,7 @@ void GUI_v1::initMenu(Menu &menu) {
 			} else {
 				if (_vm->gameFlags().platform != Common::kPlatformAmiga)
 					printMenuText(getMenuItemLabel(menu.item[i]), menu.x + menu.item[i].labelX - 1, menu.y + menu.item[i].labelY + 1, defaultColor1(), 0, 0);
-				printMenuText(getMenuItemLabel(menu.item[i]), menu.x + menu.item[i].labelX, menu.y + menu.item[i].labelY, menu.item[i].textColor, 0, 0);
+				printMenuText(getMenuItemLabel(menu.item[i]), menu.x + menu.item[i].labelX, menu.y + menu.item[i].labelY, menuItemLabelColor(), 0, 0);
 			}
 		}
 	}
diff --git a/engines/kyra/gui/gui_v1.h b/engines/kyra/gui/gui_v1.h
index f9b7da8e681..7c63fbc10e3 100644
--- a/engines/kyra/gui/gui_v1.h
+++ b/engines/kyra/gui/gui_v1.h
@@ -125,6 +125,7 @@ protected:
 
 	virtual uint8 defaultColor1() const = 0;
 	virtual uint8 defaultColor2() const = 0;
+	virtual uint8 menuItemLabelColor() const = 0;
 
 	virtual Common::String getMenuTitle(const Menu &menu) = 0;
 	virtual Common::String getMenuItemTitle(const MenuItem &menuItem) = 0;