[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.45,1.46 akos.cpp,1.31,1.32 object.cpp,1.36,1.37 script_v8.cpp,2.71,2.72

[Max Horn]

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

Modified Files:
	actor.cpp akos.cpp object.cpp script_v8.cpp 
Log Message:
cleanup

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- actor.cpp	26 Dec 2002 00:21:19 -0000	1.45
+++ actor.cpp	28 Dec 2002 00:45:44 -0000	1.46
@@ -1223,7 +1223,7 @@
 	 */
 #if 0
 	if (walk_script != 0) {
-		int16 args[16];
+		int args[16];
 		args[0] = number;
 		args[1] = cmd;
 		args[2] = angle;

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- akos.cpp	27 Dec 2002 14:04:25 -0000	1.31
+++ akos.cpp	28 Dec 2002 00:45:44 -0000	1.32
@@ -792,8 +792,8 @@
 	masking = false;
 	if (clipping) {
 		masking = _vm->isMaskActiveAt(x_left, y_top, x_right, y_bottom,
-																	_vm->getResourceAddress(rtBuffer, 9) +
-																	_vm->gdi._imgBufOffs[clipping] + _vm->_screenStartStrip) != 0;
+		                _vm->getResourceAddress(rtBuffer, 9) +
+		                _vm->gdi._imgBufOffs[clipping] + _vm->_screenStartStrip) != 0;
 	}
 
 	v1.mask_ptr = NULL;

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- object.cpp	27 Dec 2002 19:48:30 -0000	1.36
+++ object.cpp	28 Dec 2002 00:45:44 -0000	1.37
@@ -266,9 +266,8 @@
 			a = _objs[b].parentstate;
 			b = _objs[b].parent;
 			if (b == 0) {
-				if (_objs[i].x_pos <= x &&
-						_objs[i].width + _objs[i].x_pos > x &&
-						_objs[i].y_pos <= y && _objs[i].height + _objs[i].y_pos > y)
+				if (_objs[i].x_pos <= x && _objs[i].width + _objs[i].x_pos > x &&
+				    _objs[i].y_pos <= y && _objs[i].height + _objs[i].y_pos > y)
 					return _objs[i].obj_nr;
 				break;
 			}

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.71
retrieving revision 2.72
diff -u -d -r2.71 -r2.72
--- script_v8.cpp	27 Dec 2002 20:15:24 -0000	2.71
+++ script_v8.cpp	28 Dec 2002 00:45:44 -0000	2.72
@@ -1456,12 +1456,21 @@
 	case 0xCE:		// getRGBSlot
 	case 0xD3:		// getKeyState
 	case 0xD7:		// getBox
+		push(0);
+		warning("o6_kernelGetFunctions: default case %d (len = %d)", args[0], len);
+		break;
 	case 0xD8:		// findBlastObject
+		// FIXME - this is WRONG and just a temporary hack
+		push(findObject(args[1], args[2]));
+		break;
 	case 0xD9:		// actorHit
+		push(0);
+		warning("o6_kernelGetFunctions: default case %d (len = %d)", args[0], len);
+		break;
 	case 0xDA:		// lipSyncWidth
 	case 0xDB:		// lipSyncHeight
 	case 0xDC:		// actorTalkAnimation
-		// FIXME - hack!
+		// TODO - these methods are for lip syncing. Not so important right now, though
 		push(0);
 		break;
 	case 0xDD:		// getMasterSFXVol