From 1911d459df8df6ca2a7fba3342caa702d369b85b Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Mon, 11 Nov 2019 19:45:52 +0100
Subject: GRIFFON: Fix color fill for hidden 'save', and skip it in the
 navigation

---
 engines/griffon/dialogs.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'engines/griffon')

diff --git a/engines/griffon/dialogs.cpp b/engines/griffon/dialogs.cpp
index 38da696750..c000d58590 100644
--- a/engines/griffon/dialogs.cpp
+++ b/engines/griffon/dialogs.cpp
@@ -566,7 +566,8 @@ void GriffonEngine::saveLoadNew() {
 
 	_saveLoadImg = loadImage("art/saveloadnew.bmp", true);
 	if (_gameMode == kGameModeIntro) {
-		_saveLoadImg->fillRect(Common::Rect(125, 15, 160, 33), _videoBuffer->format.ARGBToColor(0, 0, 0, 0));
+		uint32 color = *(uint32 *)_saveLoadImg->getBasePtr(120, 10);
+		_saveLoadImg->fillRect(Common::Rect(125, 15, 160, 33), color);
 	}
 	_saveLoadImg->setAlpha(192, true);
 
@@ -678,6 +679,10 @@ void GriffonEngine::saveLoadNew() {
 						--curCol;
 						if (curCol == -1)
 							curCol = 3;
+
+						if (curCol == 1 && _gameMode == kGameModeIntro)
+							curCol = 0;
+
 						tickPause = _ticks + 125;
 					}
 					break;
@@ -687,6 +692,10 @@ void GriffonEngine::saveLoadNew() {
 						++curCol;
 						if (curCol == 4)
 							curCol = 0;
+
+						if (curCol == 1 && _gameMode == kGameModeIntro)
+							curCol = 2;
+
 						tickPause = _ticks + 125;
 					}
 					break;
-- 
cgit v1.2.3