[Scummvm-cvs-logs] SF.net SVN: scummvm: [20901] scummvm/trunk/engines/scumm/he

kirben at users.sourceforge.net kirben at users.sourceforge.net
Sat Feb 25 16:33:01 CET 2006


Revision: 20901
Author:   kirben
Date:     2006-02-25 16:32:10 -0800 (Sat, 25 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20901&view=rev

Log Message:
-----------
Change debugInput opcode result to zerod array for now, since it expects input string

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/script_v72he.cpp
    scummvm/trunk/engines/scumm/he/wiz_he.cpp
Modified: scummvm/trunk/engines/scumm/he/script_v72he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v72he.cpp	2006-02-25 23:00:09 UTC (rev 20900)
+++ scummvm/trunk/engines/scumm/he/script_v72he.cpp	2006-02-26 00:32:10 UTC (rev 20901)
@@ -1718,13 +1718,12 @@
 	byte string[255];
 
 	copyScriptString(string, sizeof(string));
-	int len = resStrLen(string) + 1;
+	debug(0,"o72_debugInput: String %s", string);
 
+	// TODO: Request input and store string result in array
 	writeVar(0, 0);
-	ArrayHeader *ah = defineArray(0, kStringArray, 0, 0, 0, len);
-	memcpy(ah->data, string, len);
+	defineArray(0, kStringArray, 0, 0, 0, 0);
 	push(readVar(0));
-	debug(1,"o72_debugInput: String %s", string);
 }
 
 void ScummEngine_v72he::o72_jumpToScript() {

Modified: scummvm/trunk/engines/scumm/he/wiz_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/wiz_he.cpp	2006-02-25 23:00:09 UTC (rev 20900)
+++ scummvm/trunk/engines/scumm/he/wiz_he.cpp	2006-02-26 00:32:10 UTC (rev 20901)
@@ -548,8 +548,8 @@
 			}
 			palPtr = imagePal;
 		}
-		int h = r1.height();
-		int w = r1.width();
+		int h = r1.height() + 1;
+		int w = r1.width() + 1;
 		src += r1.left + r1.top * srcw;
 		dst += r2.left + r2.top * dstw;
 		while (h--) {







More information about the Scummvm-git-logs mailing list