[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.197,2.198 script_v72he.cpp,2.18,2.19

[Travis Howell]

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

Modified Files:
	intern.h script_v72he.cpp 
Log Message:

Rename var/opcode
Add missing breaks


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.197
retrieving revision 2.198
diff -u -d -r2.197 -r2.198
--- intern.h	25 Aug 2004 07:18:18 -0000	2.197
+++ intern.h	25 Aug 2004 08:49:34 -0000	2.198
@@ -679,7 +679,7 @@
 	void copyScriptString(byte *dst);
 
 	/* Version 7 script opcodes */
-	void o72_pushDWordVar();
+	void o72_pushDWord();
 	void o72_addMessageToStack();
 	void o72_wordArrayRead();
 	void o72_wordArrayIndexedRead();

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.18
retrieving revision 2.19
diff -u -d -r2.18 -r2.19
--- script_v72he.cpp	25 Aug 2004 07:30:05 -0000	2.18
+++ script_v72he.cpp	25 Aug 2004 08:49:34 -0000	2.19
@@ -48,7 +48,7 @@
 		/* 00 */
 		OPCODE(o6_pushByte),
 		OPCODE(o6_pushWord),
-		OPCODE(o72_pushDWordVar),
+		OPCODE(o72_pushDWord),
 		OPCODE(o6_pushWordVar),
 		/* 04 */
 		OPCODE(o72_addMessageToStack),
@@ -485,12 +485,15 @@
 	case kByteArray:
 	case kStringArray:
 		ah->data[offset] = value;
+		break;
 
 	case kIntArray:
 		WRITE_LE_UINT16(ah->data + offset * 2, value);
+		break;
 
 	case kDwordArray:
 		WRITE_LE_UINT32(ah->data + offset * 4, value);
+		break;
 	}
 }
 
@@ -524,7 +527,7 @@
 	}
 }
 
-void ScummEngine_v72he::o72_pushDWordVar() {
+void ScummEngine_v72he::o72_pushDWord() {
 	int a;
 	if (*_lastCodePtr + sizeof(MemBlkHeader) != _scriptOrgPointer) {
 		uint32 oldoffs = _scriptPointer - _scriptOrgPointer;
@@ -720,7 +723,7 @@
 	switch (subOp) {
 	case 7:			// SO_ASSIGN_STRING
 		array = fetchScriptWord();
-		ah = defineArray(array, kStringArray, 0, 0, 0, 100);
+		ah = defineArray(array, kStringArray, 0, 0, 0, 256);
 		copyScriptString(ah->data);
 		break;
 	case 208:		// SO_ASSIGN_INT_LIST
@@ -852,11 +855,11 @@
 }
 
 void ScummEngine_v72he::o72_findAllObjects() {
-	int a = pop();
+	int room = pop();
 	int i = 1;
 
-	if (a != _currentRoom)
-		warning("o72_findAllObjects: current room is not %d", a);
+	if (room != _currentRoom)
+		warning("o72_findAllObjects: current room is not %d", room);
 	writeVar(0, 0);
 	defineArray(0, kDwordArray, 0, 0, 0, _numLocalObjects + 1);
 	writeArray(0, 0, 0, _numLocalObjects);