[Scummvm-cvs-logs] CVS: scummvm debug.cpp,1.18,1.19 scummvm.cpp,1.65,1.66

[James Brown]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv10480

Modified Files:
	debug.cpp scummvm.cpp 
Log Message:
Zak/Indy box matrix fix. Still doesn't quite work :/



Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/debug.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** debug.cpp	7 Mar 2002 05:18:55 -0000	1.18
--- debug.cpp	8 Mar 2002 08:27:45 -0000	1.19
***************
*** 109,121 ****
  	case CMD_DUMPBOX:
  		{
! 			int num, i; BoxCoords box;		
! 			num = _s->getNumBoxes();
! 			for (i=0; i<num; i++) {
! 				printf("bt %d\n", i);
  				BoxTest(i);
  				_s->getBoxCoordinates(i, &box);
  				printf("%d: [%d x %d] [%d x %d] [%d x %d] [%d x %d]\n", i, 
! 				box.ul.x, box.ul.y, 	box.ll.x, box.ll.y, 
! 				box.ur.x, box.ur.y, 	box.lr.x, box.lr.y);
  			}
  		}
--- 109,134 ----
  	case CMD_DUMPBOX:
  		{
! 			int num, i = 0, rows = 0; 
! 			BoxCoords box;		
! 			byte *boxm = _s->getBoxMatrixBaseAddr();
! 			num = _s->getNumBoxes();			
! 
! 			printf("Walk matrix:\n");
! 			while (*boxm != 0xFF) {
! 				printf("%d ", *boxm);
! 				i++; *boxm++;
! 				if (i >= num) {i = 0; rows++; printf("\n");}				
! 			}
! 
! 			if (rows < num)
! 				printf("\nERROR: Box Matrix invalid, missing or incomplete: %d row(s)", num - rows);
! 
! 			printf("\nWalk boxes:\n");			
! 			for (i=0; i<num; i++) {				
  				BoxTest(i);
  				_s->getBoxCoordinates(i, &box);
  				printf("%d: [%d x %d] [%d x %d] [%d x %d] [%d x %d]\n", i, 
! 						box.ul.x, box.ul.y, box.ll.x, box.ll.y, 
! 						box.ur.x, box.ur.y, box.lr.x, box.lr.y);
  			}
  		}

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** scummvm.cpp	7 Mar 2002 08:11:48 -0000	1.65
--- scummvm.cpp	8 Mar 2002 08:27:45 -0000	1.66
***************
*** 781,785 ****
  		if (ptr) {
  			byte numOfBoxes=*(ptr);
! 			int size = numOfBoxes * SIZEOF_BOX+1;
  			createResource(rtMatrix, 2, size);
  			memcpy(getResourceAddress(rtMatrix, 2), ptr, size);
--- 781,791 ----
  		if (ptr) {
  			byte numOfBoxes=*(ptr);
!                         int size;
! 			if (_features & GF_OLD256)
! 				size = numOfBoxes * (SIZEOF_BOX-2) + 1;
! 			else
! 				size = numOfBoxes * SIZEOF_BOX + 1;
! 
! 
  			createResource(rtMatrix, 2, size);
  			memcpy(getResourceAddress(rtMatrix, 2), ptr, size);