[Scummvm-git-logs] scummvm master -> 90f52d5dfc52412c38d19d5974df0a1121a0bdd8

[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:
90f52d5dfc KYRA: (LOL) - fix menu text regression


Commit: 90f52d5dfc52412c38d19d5974df0a1121a0bdd8
    https://github.com/scummvm/scummvm/commit/90f52d5dfc52412c38d19d5974df0a1121a0bdd8
Author: athrxx (athrxx at scummvm.org)
Date: 2021-01-08T14:20:21+01:00

Commit Message:
KYRA: (LOL) - fix menu text regression

Changed paths:
    engines/kyra/gui/gui_lol.cpp
    engines/kyra/gui/gui_lol.h


diff --git a/engines/kyra/gui/gui_lol.cpp b/engines/kyra/gui/gui_lol.cpp
index 42cfaccf33..4fe58697b7 100644
--- a/engines/kyra/gui/gui_lol.cpp
+++ b/engines/kyra/gui/gui_lol.cpp
@@ -2911,8 +2911,6 @@ Common::String GUI_LoL::getMenuTitle(const Menu &menu) {
 }
 
 Common::String GUI_LoL::getMenuItemTitle(const MenuItem &menuItem) {
-    	if (menuItem.useItemString)
-		return menuItem.itemString;
 	if (menuItem.itemId & 0x8000 && !menuItem.itemString.empty())
 		return menuItem.itemString;
 	else if (menuItem.itemId & 0x8000 || !menuItem.itemId)
diff --git a/engines/kyra/gui/gui_lol.h b/engines/kyra/gui/gui_lol.h
index f550dd079c..5fc405c03a 100644
--- a/engines/kyra/gui/gui_lol.h
+++ b/engines/kyra/gui/gui_lol.h
@@ -61,6 +61,7 @@ namespace Kyra {
 		item.enabled = 1; \
 		item.itemId = a; \
 		item.itemString = ""; \
+		item.useItemString = false; \
 		item.x = b; \
 		item.y = c; \
 		item.width = d; \