[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.325,1.326

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv14355/simon

Modified Files:
	simon.cpp 
Log Message:

Fix simon1dos freezes


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -d -r1.325 -r1.326
--- simon.cpp	24 Oct 2003 02:26:41 -0000	1.325
+++ simon.cpp	26 Oct 2003 03:20:13 -0000	1.326
@@ -4029,14 +4029,20 @@
 
 	len_div_3 = (strlen(string_ptr) + 3) / 3;
 
-	if (!(_game & GF_SIMON2)) {
+	if (_game & GF_SIMON2) {
+		if (_variableArray[86] == 0)
+			len_div_3 >>= 1;
+		if (_variableArray[86] == 2)
+			len_div_3 <<= 1;
+		_variableArray[85] = len_div_3 * 5;
+	} else if (_game & GF_WIN) {
 		if (_variableArray[141] == 0)
 			_variableArray[141] = 9;
 		_variableArray[85] = _variableArray[141] * len_div_3;
 	} else {
-		if (_variableArray[86] == 0)
-			len_div_3 >>= 1;
-		if (_variableArray[86] == 2)
+		if (_variableArray[141] == 0)
+			_variableArray[141] = len_div_3 / 2;
+		if (_variableArray[141] == 2)
 			len_div_3 <<= 1;
 		_variableArray[85] = len_div_3 * 5;
 	}