[Scummvm-cvs-logs] CVS: tools descumm-common.cpp,1.11,1.12

Max Horn fingolfin at users.sourceforge.net
Fri Oct 1 13:16:50 CEST 2004


Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20920

Modified Files:
	descumm-common.cpp 
Log Message:
Fix regression caused by latest changes wrt 'else' generation

Index: descumm-common.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm-common.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- descumm-common.cpp	1 Oct 2004 18:16:41 -0000	1.11
+++ descumm-common.cpp	1 Oct 2004 20:09:31 -0000	1.12
@@ -220,7 +220,7 @@
 	/* Don't jump out of previous blocks. This test is stronger than the one in
 	   maybeAddIf. ( >= vs > ) */
 	for (i = 0, p = block_stack; i < num_block_stack - 1; i++, p++) {
-		if (to >= p->to)
+		if (to > p->to || (to == p->to && p->isWhile))
 			return false;
 	}
 





More information about the Scummvm-git-logs mailing list