[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.144,2.145

[Travis Howell]

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

Modified Files:
	script_v72he.cpp 
Log Message:

Should use findWrappedBlock


Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.144
retrieving revision 2.145
diff -u -d -r2.144 -r2.145
--- script_v72he.cpp	2 Oct 2004 07:46:06 -0000	2.144
+++ script_v72he.cpp	3 Oct 2004 04:49:20 -0000	2.145
@@ -2408,12 +2408,11 @@
 }
 
 void ScummEngine_v72he::decodeParseString(int m, int n) {
-	byte b, *ptr;
 	int i, color, size;
 	int args[31];
 	byte name[1024];
 
-	b = fetchScriptByte();
+	byte b = fetchScriptByte();
 
 	switch (b) {
 	case 65:		// SO_AT
@@ -2454,10 +2453,13 @@
 		printString(m, name);
 		break;
 	case 0xE1:
-		ptr = getResourceAddress(rtTalkie, pop());
-		size = READ_BE_UINT32(ptr + 12);
-		memcpy(name, ptr + 16, size);
+		{
+		const byte *dataPtr = getResourceAddress(rtTalkie, pop());
+		const byte *text = findWrappedBlock(MKID('TEXT'), dataPtr, 0, 0);
+		size = getResourceDataSize(text);
+		memcpy(name, text, size);
 		printString(m, name);
+		}
 		break;
 	case 0xF9:
 		color = pop();