[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.339,1.340

Travis Howell kirben at users.sourceforge.net
Sun Nov 30 16:55:05 CET 2003


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

Modified Files:
	simon.cpp 
Log Message:

Might as well combine these two.


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -d -r1.339 -r1.340
--- simon.cpp	1 Dec 2003 00:45:16 -0000	1.339
+++ simon.cpp	1 Dec 2003 00:54:50 -0000	1.340
@@ -3993,13 +3993,7 @@
 
 	len_div_3 = (strlen(string_ptr) + 3) / 3;
 
-	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_TALKIE) {
+	if (!(_game & GF_SIMON2) && (_game & GF_TALKIE)) {
 		if (_variableArray[141] == 0)
 			_variableArray[141] = 9;
 		_variableArray[85] = _variableArray[141] * len_div_3;





More information about the Scummvm-git-logs mailing list