[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.42,1.43

Max Horn fingolfin at users.sourceforge.net
Thu Jul 25 13:59:01 CEST 2002


Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv29116/simon

Modified Files:
	simon.cpp 
Log Message:
patch #585725 - fix for overlapping text in simon

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- simon.cpp	21 Jul 2002 14:36:51 -0000	1.42
+++ simon.cpp	25 Jul 2002 20:57:55 -0000	1.43
@@ -3587,9 +3587,6 @@
 
 			height += 10;
 			threeval_b -= 10;
-
-			if (threeval_b < 2)
-				threeval_b = 2;
 			j = -1;
 		} else {
 			/* else_1 */
@@ -3645,9 +3642,6 @@
 				*char_buf++ = 10;
 				height += 20;
 				threeval_b -= 20;
-
-				if (threeval_b < 2)
-					threeval_b = 2;
 				j = -1;
 			} else {
 				/* else_6 */
@@ -3685,7 +3679,7 @@
 			}
 			strncpy(char_buf, string_ptr, m);
 			char_buf += m;
-			*char_buf++ = ' ';
+			*char_buf++ = '\n';
 			string_ptr = string_ptr_2;
 			string_ptr_2 += m;
 			while (*string_ptr_2-- != ' ' && m > 0)
@@ -3718,11 +3712,9 @@
 					}
 					strncpy(char_buf, string_ptr, m);
 					char_buf += m;
-					*char_buf++ = ' ';
+					*char_buf++ = '\n';
 					height += 30;
 					threeval_b -= 30;
-					if (threeval_b < 2)
-						threeval_b = 2;
 					j = -1;
 				} else {
 					/* else_15 */
@@ -3765,8 +3757,6 @@
 			*char_buf++ = 10;
 			height += 10;
 			threeval_b -= 10;
-			if (threeval_b < 2)
-				threeval_b = 2;
 			string_ptr = string_ptr_2;
 		}
 	}





More information about the Scummvm-git-logs mailing list