[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.96,1.97 resource.cpp,1.79,1.80 script.cpp,1.89,1.90 script_v6.cpp,1.116,1.117 script_v8.cpp,2.158,2.159

[Max Horn]

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

Modified Files:
	object.cpp resource.cpp script.cpp script_v6.cpp script_v8.cpp 
Log Message:
cleanup

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- object.cpp	17 May 2003 00:59:47 -0000	1.96
+++ object.cpp	18 May 2003 21:03:56 -0000	1.97
@@ -827,7 +827,7 @@
 
 void Scumm::addObjectToDrawQue(int object) {
 	_drawObjectQue[_drawObjectQueNr++] = object;
-	if ((unsigned int)_drawObjectQueNr > sizeof(_drawObjectQue) / sizeof(_drawObjectQue[0]))
+	if ((unsigned int)_drawObjectQueNr > ARRAYSIZE(_drawObjectQue))
 		error("Draw Object Que overflow");
 }
 

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- resource.cpp	16 May 2003 22:00:33 -0000	1.79
+++ resource.cpp	18 May 2003 21:03:56 -0000	1.80
@@ -522,7 +522,7 @@
 
 void Scumm::allocResTypeData(int id, uint32 tag, int num, const char *name, int mode) {
 	debug(9, "allocResTypeData(%s/%s,%x,%d,%d)", resTypeFromId(id), name, FROM_LE_32(tag), num, mode);
-	assert(id >= 0 && id < (int)(sizeof(res.mode) / sizeof(res.mode[0])));
+	assert(id >= 0 && id < (int)(ARRAYSIZE(res.mode)));
 
 	if (num >= 2000) {
 		error("Too many %ss (%d) in directory", name, num);

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- script.cpp	18 May 2003 20:57:32 -0000	1.89
+++ script.cpp	18 May 2003 21:03:56 -0000	1.90
@@ -103,7 +103,7 @@
 	if (_numNestedScripts == 0)
 		return;
 
-	nest = &vm.nest[0];
+	nest = vm.nest;
 	num = _numNestedScripts;
 
 	do {
@@ -141,7 +141,7 @@
 	if (_numNestedScripts == 0)
 		return;
 
-	nest = &vm.nest[0];
+	nest = vm.nest;
 	num = _numNestedScripts;
 
 	do {
@@ -187,7 +187,7 @@
 		nest->slot = _currentScript;
 	}
 
-	if (++_numNestedScripts > sizeof(vm.nest) / sizeof(vm.nest[0]))
+	if (++_numNestedScripts > ARRAYSIZE(vm.nest))
 		error("Too many nested scripts");
 
 	_currentScript = script;
@@ -1049,7 +1049,7 @@
 	int scr = _currentScript;
 	vm.slot[scr].cutsceneOverride++;
 
-	if (++vm.cutSceneStackPointer > sizeof(vm.cutSceneData) / sizeof(vm.cutSceneData[0]))
+	if (++vm.cutSceneStackPointer > ARRAYSIZE(vm.cutSceneData))
 		error("Cutscene stack overflow");
 
 	vm.cutSceneData[vm.cutSceneStackPointer] = args[0];

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- script_v6.cpp	17 May 2003 01:57:54 -0000	1.116
+++ script_v6.cpp	18 May 2003 21:03:57 -0000	1.117
@@ -683,7 +683,7 @@
 	int args[16];
 	int script, flags;
 
-	getStackList(args, sizeof(args) / sizeof(args[0]));
+	getStackList(args, ARRAYSIZE(args));
 	script = pop();
 	flags = pop();
 	runScript(script, flags & 1, flags & 2, args);
@@ -693,7 +693,7 @@
 	int args[16];
 	int script, flags;
 
-	getStackList(args, sizeof(args) / sizeof(args[0]));
+	getStackList(args, ARRAYSIZE(args));
 	script = pop();
 	flags = pop();
 	stopObjectCode();
@@ -703,7 +703,7 @@
 void Scumm_v6::o6_startScript() {
 	int args[16];
 	int script;
-	getStackList(args, sizeof(args) / sizeof(args[0]));
+	getStackList(args, ARRAYSIZE(args));
 	script = pop();
 	runScript(script, 0, 0, args);
 }
@@ -711,7 +711,7 @@
 void Scumm_v6::o6_startScriptQuick() {
 	int args[16];
 	int script;
-	getStackList(args, sizeof(args) / sizeof(args[0]));
+	getStackList(args, ARRAYSIZE(args));
 	script = pop();
 	runScript(script, 0, 1, args);
 }
@@ -720,7 +720,7 @@
 	int args[16];
 	int script, entryp;
 	int flags;
-	getStackList(args, sizeof(args) / sizeof(args[0]));
+	getStackList(args, ARRAYSIZE(args));
 	entryp = pop();
 	script = pop();
 	flags = pop();
@@ -730,7 +730,7 @@
 void Scumm_v6::o6_startObjectQuick() {
 	int args[16];
 	int script, entryp;
-	getStackList(args, sizeof(args) / sizeof(args[0]));
+	getStackList(args, ARRAYSIZE(args));
 	entryp = pop();
 	script = pop();
 	runVerbCode(script, entryp, 0, 1, args);
@@ -764,7 +764,7 @@
 
 void Scumm_v6::o6_cutscene() {
 	int args[16];
-	getStackList(args, sizeof(args) / sizeof(args[0]));
+	getStackList(args, ARRAYSIZE(args));
 	cutscene(args);
 }
 
@@ -828,7 +828,7 @@
 		initCharset(pop());
 		break;
 	case 0x9D:										/* set charset colors */
-		getStackList(args, sizeof(args) / sizeof(args[0]));
+		getStackList(args, ARRAYSIZE(args));
 		for (i = 0; i < 16; i++)
 			_charsetColorMap[i] = _charsetData[_string[1].t_charset][i] = (unsigned char)args[i];
 		break;
@@ -854,7 +854,7 @@
 	bool b;
 	int cond = 1;
 
-	num = getStackList(args, sizeof(args) / sizeof(args[0]));
+	num = getStackList(args, ARRAYSIZE(args));
 	obj = pop();
 
 	while (--num >= 0) {
@@ -870,7 +870,7 @@
 	int args[16];
 	int num, obj, cls;
 
-	num = getStackList(args, sizeof(args) / sizeof(args[0]));
+	num = getStackList(args, ARRAYSIZE(args));
 	obj = pop();
 
 	while (--num >= 0) {
@@ -1341,7 +1341,7 @@
 	int num, value;
 
 	value = pop();
-	num = getStackList(table, sizeof(table) / sizeof(table[0]));
+	num = getStackList(table, ARRAYSIZE(table));
 
 	while (--num >= 0) {
 		setBoxFlags(table[num], value);
@@ -1612,7 +1612,7 @@
 		a->setActorWalkSpeed(i, j);
 		break;
 	case 78:											/* actor-sound */
-		k = getStackList(args, sizeof(args) / sizeof(args[0]));
+		k = getStackList(args, ARRAYSIZE(args));
 		for (i = 0; i < k; i++)
 			a->sound[i] = args[i];
 		break;
@@ -1892,7 +1892,7 @@
 	int list[100];
 	int num, a, value;
 
-	num = getStackList(list, sizeof(list) / sizeof(list[0]));
+	num = getStackList(list, ARRAYSIZE(list));
 	value = pop();
 
 	while (--num >= 0) {
@@ -1936,7 +1936,7 @@
 		break;
 	case 212:
 		b = pop();
-		len = getStackList(list, sizeof(list) / sizeof(list[0]));
+		len = getStackList(list, ARRAYSIZE(list));
 		d = readVar(array);
 		if (d == 0)
 			error("Must DIM a two dimensional array before assigning");
@@ -2088,7 +2088,7 @@
 
 void Scumm_v6::o6_soundKludge() {
 	int list[16];
-	int num = getStackList(list, sizeof(list) / sizeof(list[0]));
+	int num = getStackList(list, ARRAYSIZE(list));
 
 	_sound->soundKludge(list, num);
 }
@@ -2098,7 +2098,7 @@
 	int num;
 	int16 val;
 
-	num = getStackList(list, sizeof(list) / sizeof(list[0]));
+	num = getStackList(list, ARRAYSIZE(list));
 	val = pop();
 
 	while (--num >= 0) {
@@ -2321,7 +2321,7 @@
 	int args[16];
 	int a, b, c, d, e;
 
-	getStackList(args, sizeof(args) / sizeof(args[0]));
+	getStackList(args, ARRAYSIZE(args));
 	e = pop();
 	d = pop();
 	c = pop();
@@ -2348,7 +2348,7 @@
 	int args[30];
 	Actor *a;
 
-	getStackList(args, sizeof(args) / sizeof(args[0]));
+	getStackList(args, ARRAYSIZE(args));
 
 	if (_features & GF_AFTER_V7) {
 		switch (args[0]) {
@@ -2656,7 +2656,7 @@
 	int i;
 	Actor *a;
 
-	getStackList(args, sizeof(args) / sizeof(args[0]));
+	getStackList(args, ARRAYSIZE(args));
 
 	switch (args[0]) {
 	case 113:
@@ -2767,7 +2767,7 @@
 	int args[100];
 	int i, num;
 
-	num = getStackList(args, sizeof(args) / sizeof(args[0]));
+	num = getStackList(args, ARRAYSIZE(args));
 	i = pop();
 	if (i < 0 || i >= num)
 		error("o6_pickOneOf: out of range");
@@ -2779,7 +2779,7 @@
 	int i, num, def;
 
 	def = pop();
-	num = getStackList(args, sizeof(args) / sizeof(args[0]));
+	num = getStackList(args, ARRAYSIZE(args));
 	i = pop();
 	if (i < 0 || i >= num)
 		i = def;
@@ -2896,7 +2896,7 @@
 	int args[100];
 	int var_C, var_A;
 
-	num = getStackList(args, sizeof(args) / sizeof(args[0]));
+	num = getStackList(args, ARRAYSIZE(args));
 	int value = fetchScriptWord();
 
 	if (readVar(value) == 0) {

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.158
retrieving revision 2.159
diff -u -d -r2.158 -r2.159
--- script_v8.cpp	15 May 2003 22:57:53 -0000	2.158
+++ script_v8.cpp	18 May 2003 21:03:57 -0000	2.159
@@ -750,7 +750,7 @@
 		break;
 	case 0x15:		// SO_ASSIGN_SCUMMVAR_LIST
 		b = pop();
-		len = getStackList(list, sizeof(list) / sizeof(list[0]));
+		len = getStackList(list, ARRAYSIZE(list));
 		d = readVar(array);
 		if (d == 0) {
 			defineArray(array, 5, 0, b + len);
@@ -761,7 +761,7 @@
 		break;
 	case 0x16:		// SO_ASSIGN_2DIM_LIST
 		b = pop();
-		len = getStackList(list, sizeof(list) / sizeof(list[0]));
+		len = getStackList(list, ARRAYSIZE(list));
 		d = readVar(array);
 		if (d == 0)
 			error("Must DIM a two dimensional array before assigning");
@@ -838,7 +838,7 @@
 		break;
 	}
 	case 0xE8:		// SO_CHARSET_COLOR
-		getStackList(args, sizeof(args) / sizeof(args[0]));
+		getStackList(args, ARRAYSIZE(args));
 		for (i = 0; i < 16; i++)
 			_charsetColorMap[i] = _charsetData[_string[1].t_charset][i] = (unsigned char)args[i];
 		break;
@@ -1318,7 +1318,7 @@
 
 void Scumm_v8::o8_soundKludge() {
 	int args[16];
-	int num = getStackList(args, sizeof(args) / sizeof(args[0]));
+	int num = getStackList(args, ARRAYSIZE(args));
 
 	_sound->soundKludge(args, num);
 }
@@ -1355,7 +1355,7 @@
 	// TODO
 	Actor *a;
 	int args[30];
-	int len = getStackList(args, sizeof(args) / sizeof(args[0]));
+	int len = getStackList(args, ARRAYSIZE(args));
 
 	switch (args[0]) {
 	case 11: {	// lockObject
@@ -1499,7 +1499,7 @@
 void Scumm_v8::o8_kernelGetFunctions() {
 	// TODO
 	int args[30];
-	int len = getStackList(args, sizeof(args) / sizeof(args[0]));
+	int len = getStackList(args, ARRAYSIZE(args));
 
 	switch (args[0]) {
 	case 0x73:	// getWalkBoxAt