[Scummvm-cvs-logs] CVS: scummvm/kyra gui.cpp,1.8,1.9 staticres.cpp,1.41,1.42

Oystein Eftevaag vinterstum at users.sourceforge.net
Wed Jan 25 15:10:00 CET 2006


Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8677

Modified Files:
	gui.cpp staticres.cpp 
Log Message:
Fixes bug #1413951 (crashes when highlighting buttons on menu screens
where the first button wasn't there), and the missing text on exit buttons.


Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/gui.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gui.cpp	22 Jan 2006 22:06:33 -0000	1.8
+++ gui.cpp	25 Jan 2006 23:08:55 -0000	1.9
@@ -742,7 +742,9 @@
 			_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();

Index: staticres.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/staticres.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- staticres.cpp	22 Jan 2006 09:34:12 -0000	1.41
+++ staticres.cpp	25 Jan 2006 23:08:55 -0000	1.42
@@ -773,16 +773,16 @@
 				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 @@
 			{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},
 		}
 	}





More information about the Scummvm-git-logs mailing list