[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.149,1.150

Max Horn fingolfin at users.sourceforge.net
Mon Jun 2 15:44:07 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv32127

Modified Files:
	script_v6.cpp 
Log Message:
experimental change: replaced drawDescString with enqueueText. fixes text-leftovers when scrolling the Dig (not tested in FT, though)

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- script_v6.cpp	2 Jun 2003 02:25:23 -0000	1.149
+++ script_v6.cpp	2 Jun 2003 22:43:08 -0000	1.150
@@ -2484,7 +2484,6 @@
 				char *t_ptr = (char *)ptr;
 				_msgPtrToAdd = buf_input;
 				buf_output[0] = 0;
-				setStringVars(0);
 				addMessageToStack(getStringAddressVar(VAR_STRING2DRAW));
 				while (true) {
 					if (*t_ptr == '/') {
@@ -2503,19 +2502,27 @@
 					if (t_ptr == NULL)
 						break;
 				}
+#if 0
+				setStringVars(0);
 				_string[0].charset = (byte)args[1];
 				_string[0].color = (byte)args[2];
 				_string[0].xpos = args[3];
 				_string[0].ypos = args[4];
 				drawDescString(buf_output);
+#else
+				enqueueText(buf_output, args[3], args[4] + camera._cur.y - (_screenHeight / 2), args[2], args[1], true);
+#endif
 			} else { 
+#if 0
 				setStringVars(0);
-
 				_string[0].charset = (byte)args[1];
 				_string[0].color = (byte)args[2];
 				_string[0].xpos = args[3];
 				_string[0].ypos = args[4];
 				drawDescString(getStringAddressVar(VAR_STRING2DRAW));
+#else
+				enqueueText(getStringAddressVar(VAR_STRING2DRAW) + camera._cur.y - (_screenHeight / 2), args[3], args[4], args[2], args[1], true);
+#endif
 			}
 			break;
 		case 20:





More information about the Scummvm-git-logs mailing list