[Scummvm-cvs-logs] SF.net SVN: scummvm: [22693] scummvm/trunk/engines/kyra

[vinterstum at users.sourceforge.net]

Revision: 22693
Author:   vinterstum
Date:     2006-05-27 19:51:03 -0700 (Sat, 27 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22693&view=rev

Log Message:
-----------
Fixes bug [ 1480746 ] KYRA1: menu triggers assertion, and sets the text/speech config options correctly for CD versions

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui.cpp
    scummvm/trunk/engines/kyra/script_v1.cpp
Modified: scummvm/trunk/engines/kyra/gui.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui.cpp	2006-05-27 23:50:48 UTC (rev 22692)
+++ scummvm/trunk/engines/kyra/gui.cpp	2006-05-28 02:51:03 UTC (rev 22693)
@@ -677,19 +677,19 @@
 			int textX = menu.item[i].labelX + menu_x1;
 			int offset;
 
-			if (textWidth + textX > x1) {
-				offset = (textWidth + textX) - x1;
-				menu.width += offset/2;
-				
+			if (textWidth/2 + textX >= x1) {
+				offset = ((textWidth + textX) - x1) / 2;
 				if (maxOffset < offset)
 					maxOffset = offset;
 			}
 		}
 	}
 
-	if (maxOffset > 0)
+	if (maxOffset > 0) {
 		for (int i = 0; i < menu.nrOfItems; i++)
-			menu.item[i].x += maxOffset - 10;
+			menu.item[i].x += maxOffset + 20;
+		menu.width += maxOffset + 20;	
+	}
 			
 	if (menu.width > 310)
 		menu.width = 310;

Modified: scummvm/trunk/engines/kyra/script_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v1.cpp	2006-05-27 23:50:48 UTC (rev 22692)
+++ scummvm/trunk/engines/kyra/script_v1.cpp	2006-05-28 02:51:03 UTC (rev 22693)
@@ -49,7 +49,7 @@
 			snd_voiceWaitForFinish();
 			snd_playVoiceFile(stackPos(0));
 		}
-		if (_configVoice == 0 || _configVoice == 1)
+		if (_configVoice == 0 || _configVoice == 2)
 			characterSays(stackPosString(1), stackPos(2), stackPos(3));
 	} else {
 		debugC(3, kDebugLevelScriptFuncs, "cmd_characterSays(%p) ('%s', %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2));
@@ -623,7 +623,7 @@
 			snd_playVoiceFile(stackPos(0));
 		}
 		_skipFlag = false;
-		if (_configVoice == 0 || _configVoice == 1)
+		if (_configVoice == 0 || _configVoice == 2)
 			_text->printTalkTextMessage(stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF, 0, 2);
 	} else {
 		debugC(3, kDebugLevelScriptFuncs, "cmd_customPrintTalkString(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3) & 0xFF);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.