Fixes some coordinate initialization in the menus, and makes sure the initial savegame is created when kyrandia is started for the first time

svn-id: r22153

2 files changed, 12 insertions, 15 deletions

diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp
index 51fc7b3e1c..c287fbea64 100644
--- a/engines/kyra/gui.cpp
+++ b/engines/kyra/gui.cpp
@@ -660,7 +660,7 @@ void KyraEngine::calcCoords(Menu &menu) {
 	assert(menu.nrOfItems < 7);
 
 	int maxOffset = 0;
-	int x1, x2, y1, y2, textX;
+	int x1, x2, y1, y2;	
 	for (int i = 0; i < menu.nrOfItems; i++) {
 		if (menu.item[i].x == -1)
 			menu.item[i].x = (menu.width - menu.item[i].width)/2;
@@ -673,16 +673,13 @@ void KyraEngine::calcCoords(Menu &menu) {
 			y2 = y1 + menu.item[i].height - 1;
 
 			int textWidth = _screen->getTextWidth(menu.item[i].labelString);
-
-			if (menu.item[i].field_12 != -1)
-				textX = x1 + menu.item[i].field_12 + 3;
-			else
-				textX = _text->getCenterStringX(menu.item[i].labelString, x1, x2);
-
+			int menu_x1 = (320 - menu.width) / 2;
+			int textX = menu.item[i].labelX + menu_x1;
 			int offset;
+
 			if (textWidth + textX > x1) {
-				offset = x1 - (textWidth + textX) / 2 + 10;
-				menu.width += offset;
+				offset = (textWidth + textX) - x1;
+				menu.width += offset/2;
 				
 				if (maxOffset < offset)
 					maxOffset = offset;
@@ -692,7 +689,7 @@ void KyraEngine::calcCoords(Menu &menu) {
 
 	if (maxOffset > 0)
 		for (int i = 0; i < menu.nrOfItems; i++)
-			menu.item[i].x += maxOffset * 2;
+			menu.item[i].x += maxOffset - 10;
 			
 	if (menu.width > 310)
 		menu.width = 310;
@@ -1072,11 +1069,11 @@ int KyraEngine::gui_gameControlsMenu(Button *button) {
 	_screen->savePageToDisk("SEENPAGE.TMP", 0);
 
 	if (_features & GF_TALKIE) {
-		_menu[5].width = 230;
+		//_menu[5].width = 230;
 
 		for (int i = 0; i < 5; i++) {
-			_menu[5].item[i].labelX = 24;
-			_menu[5].item[i].x = 115;
+			//_menu[5].item[i].labelX = 24;
+			//_menu[5].item[i].x = 115;
 			_menu[5].item[i].width = 94;
 		}
 
diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp
index c3376b5cac..46f228ee80 100644
--- a/engines/kyra/kyra.cpp
+++ b/engines/kyra/kyra.cpp
@@ -589,7 +589,7 @@ int KyraEngine::go() {
 		setGameFlag(0xFD);
 		setGameFlag(0xEF);
 		seq_intro();
-		if (_skipIntroFlag &&_abortIntroFlag)
+		if (_skipIntroFlag && _abortIntroFlag)
 			resetGameFlag(0xEF);
 		startup();
 		resetGameFlag(0xEF);
@@ -669,7 +669,7 @@ void KyraEngine::startup() {
 	snd_playTheme(1);
 	enterNewScene(_currentCharacter->sceneId, _currentCharacter->facing, 0, 0, 1);
 	
-	if (_abortIntroFlag && _skipFlag) {
+	if (_abortIntroFlag && _skipIntroFlag) {
 		_menuDirectlyToLoad = true;
 		_screen->setMouseCursor(1, 1, _shapes[4]);
 		buttonMenuCallback(0);