From 2515fae195833c394c130fd33c94611b063b34fb Mon Sep 17 00:00:00 2001
From: Oystein Eftevaag
Date: Wed, 25 Jan 2006 23:08:55 +0000
Subject: Fixes bug #1413951 (crashes when highlighting buttons on menu screens
 where the first button wasn't there), and the missing text on exit buttons.

svn-id: r20166
---
 kyra/gui.cpp       | 4 +++-
 kyra/staticres.cpp | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/kyra/gui.cpp b/kyra/gui.cpp
index 5bc7046d47..2f48556a83 100644
--- a/kyra/gui.cpp
+++ b/kyra/gui.cpp
@@ -742,7 +742,9 @@ void KyraEngine::gui_processHighlights(Menu &menu) {
 			_mouseY > y1 && _mouseY < y2) {
 			
 			if (menu.highlightedItem != i) {
-				gui_redrawText(menu);
+				if (menu.item[menu.highlightedItem].enabled )
+					gui_redrawText(menu);
+
 				menu.highlightedItem = i;
 				gui_redrawHighlight(menu);
 				_screen->updateScreen();
diff --git a/kyra/staticres.cpp b/kyra/staticres.cpp
index 91a78aa633..6a44a0b83a 100644
--- a/kyra/staticres.cpp
+++ b/kyra/staticres.cpp
@@ -773,16 +773,16 @@ Menu KyraEngine::_menu[] = {
 				248, 249, 250, /*&menu_gameControls*/ 0, -1, 0, 0, 0, 0, 0},
 			{1, 0, 0, "Quit playing", -1, -1, 81, 148, 15, 252, 253, 24, 0,
 				248, 249, 250, &KyraEngine::gui_quitPlaying, -1, 0, 0, 0, 0, 0},
-			{1, 0, 0, "Resume game", 86, 0, 110, 92, 15, 252, 253, 255, 255,
+			{1, 0, 0, "Resume game", 86, 0, 110, 92, 15, 252, 253, -1, 255,
 				248, 249, 250, &KyraEngine::gui_resumeGame, -1, 0, 0, 0, 0, 0},
 			{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 		}
 	},
 	{ -1, -1, 288, 56, 248, 249, 250, 0, 254,-1, 8, 0, 2, -1, -1, -1, -1,
 		{
-			{1, 0, 0, "Yes", 24, 0, 30, 72, 15, 252, 253, 255, 255,
+			{1, 0, 0, "Yes", 24, 0, 30, 72, 15, 252, 253, -1, 255,
 				248, 249, 250, &KyraEngine::gui_quitConfirmYes, -1, 0, 0, 0, 0, 0},
-			{1, 0, 0, "No", 192, 0, 30, 72, 15, 252, 253, 255, 255,
+			{1, 0, 0, "No", 192, 0, 30, 72, 15, 252, 253, -1, 255,
 				248, 249, 250, &KyraEngine::gui_quitConfirmNo, -1, 0, 0, 0, 0, 0},
 			{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
 			{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -803,7 +803,7 @@ Menu KyraEngine::_menu[] = {
 			{1, 0, 0, "", -1, 255, 107, 256, 15, 252, 253, 5, 0,
 				248, 249, 250, &KyraEngine::gui_loadGame, -1, 0, 0, 0, 0, 0},
 			//{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-			{1, 0, 0, "Cancel", 184, 0, 134, 88, 15, 252, 253, 255, 255,
+			{1, 0, 0, "Cancel", 184, 0, 134, 88, 15, 252, 253, -1, 255,
 				248, 249, 250, &KyraEngine::gui_cancelLoadGameMenu, -1, 0, 0, 0, 0, 0},
 		}
 	}
-- 
cgit v1.2.3