[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.465,2.466 script_v100he.cpp,2.137,2.138 script_v72he.cpp,2.274,2.275 script_v80he.cpp,2.102,2.103 script_v90he.cpp,2.239,2.240

[kirben]

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

Modified Files:
	intern.h script_v100he.cpp script_v72he.cpp script_v80he.cpp 
	script_v90he.cpp 
Log Message:

Minor clean up, HE games should always copy strings directly.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.465
retrieving revision 2.466
diff -u -d -r2.465 -r2.466
--- intern.h	26 Apr 2005 15:42:34 -0000	2.465
+++ intern.h	27 Apr 2005 14:26:52 -0000	2.466
@@ -836,7 +836,7 @@
 
 	/* HE version 72 script opcodes */
 	void o72_pushDWord();
-	void o72_addMessageToStack();
+	void o72_getScriptString();
 	void o72_isAnyOf();
 	void o72_resetCutscene();
 	void o72_findObjectWithClassOf();

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.137
retrieving revision 2.138
diff -u -d -r2.137 -r2.138
--- script_v100he.cpp	21 Apr 2005 19:27:16 -0000	2.137
+++ script_v100he.cpp	27 Apr 2005 14:26:52 -0000	2.138
@@ -159,7 +159,7 @@
 		/* 5C */
 		OPCODE(o6_pushByte),
 		OPCODE(o72_pushDWord),
-		OPCODE(o72_addMessageToStack),
+		OPCODE(o72_getScriptString),
 		OPCODE(o6_pushWord),
 		/* 60 */
 		OPCODE(o6_pushWordVar),
@@ -487,7 +487,7 @@
 		int slot = pop();
 
 		int len = resStrLen(string) + 1;
-		addMessageToStack(string, a->_heTalkQueue[slot].sentence, len);
+		memcpy(a->_heTalkQueue[slot].sentence, string, len);
 
 		a->_heTalkQueue[slot].posX = a->_talkPosX;
 		a->_heTalkQueue[slot].posY = a->_talkPosY;

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.274
retrieving revision 2.275
diff -u -d -r2.274 -r2.275
--- script_v72he.cpp	25 Apr 2005 04:35:42 -0000	2.274
+++ script_v72he.cpp	27 Apr 2005 14:26:52 -0000	2.275
@@ -49,7 +49,7 @@
 		OPCODE(o72_pushDWord),
 		OPCODE(o6_pushWordVar),
 		/* 04 */
-		OPCODE(o72_addMessageToStack),
+		OPCODE(o72_getScriptString),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
 		OPCODE(o6_wordArrayRead),
@@ -610,9 +610,9 @@
 
 	// Get string
 	if (scriptString) {
-		addMessageToStack(_scriptPointer, string, sizeof(string));
-		len = resStrLen(_scriptPointer);
-		_scriptPointer += len + 1;
+		len = resStrLen(_scriptPointer) + 1;
+		memcpy(string, _scriptPointer, len);
+		_scriptPointer += len;
 	} else {
 		copyScriptString(string, sizeof(string));
 		len = resStrLen(string) + 1;
@@ -776,7 +776,7 @@
 	push(a);
 }
 
-void ScummEngine_v72he::o72_addMessageToStack() {
+void ScummEngine_v72he::o72_getScriptString() {
 	byte chr;
 
 	while ((chr = fetchScriptByte()) != 0) {
@@ -1305,7 +1305,7 @@
 		int slot = pop();
 
 		int len = resStrLen(string) + 1;
-		addMessageToStack(string, a->_heTalkQueue[slot].sentence, len);
+		memcpy(a->_heTalkQueue[slot].sentence, string, len);
 
 		a->_heTalkQueue[slot].posX = a->_talkPosX;
 		a->_heTalkQueue[slot].posY = a->_talkPosY;

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.102
retrieving revision 2.103
diff -u -d -r2.102 -r2.103
--- script_v80he.cpp	24 Apr 2005 03:52:56 -0000	2.102
+++ script_v80he.cpp	27 Apr 2005 14:26:52 -0000	2.103
@@ -49,7 +49,7 @@
 		OPCODE(o72_pushDWord),
 		OPCODE(o6_pushWordVar),
 		/* 04 */
-		OPCODE(o72_addMessageToStack),
+		OPCODE(o72_getScriptString),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
 		OPCODE(o6_wordArrayRead),

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.239
retrieving revision 2.240
diff -u -d -r2.239 -r2.240
--- script_v90he.cpp	26 Apr 2005 07:44:14 -0000	2.239
+++ script_v90he.cpp	27 Apr 2005 14:26:52 -0000	2.240
@@ -47,7 +47,7 @@
 		OPCODE(o72_pushDWord),
 		OPCODE(o6_pushWordVar),
 		/* 04 */
-		OPCODE(o72_addMessageToStack),
+		OPCODE(o72_getScriptString),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
 		OPCODE(o6_wordArrayRead),