[Scummvm-cvs-logs] CVS: scummvm boxes.cpp,1.14,1.15 debug.cpp,1.17,1.18 sdl.cpp,1.36,1.37

[James Brown]

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

Modified Files:
	boxes.cpp debug.cpp sdl.cpp 
Log Message:
Fix a very silly -incorrect- fix for walkboxen. Matrix is still wrong, tho :(



Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/boxes.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** boxes.cpp	22 Feb 2002 16:06:09 -0000	1.14
--- boxes.cpp	7 Mar 2002 05:18:55 -0000	1.15
***************
*** 117,139 ****
  void Scumm::getBoxCoordinates(int boxnum, BoxCoords *box) {
  	Box *bp = getBoxBaseAddr(boxnum);
! 	if(_features & GF_NO_SCALLING){
! 		box->ul.x = (int16)FROM_LE_16(bp->ulx);
! 		box->ul.y = (int16)FROM_LE_16(bp->uly);
! 		box->ur.x = (int16)FROM_LE_16(bp->urx);
! 		box->ur.y = (int16)FROM_LE_16(bp->ury);
! 		box->lr.x = (int16)FROM_LE_16(bp->llx);
! 		box->lr.y = (int16)FROM_LE_16(bp->lly);
! 		box->ll.x = (int16)FROM_LE_16(bp->lrx);
! 		box->ll.y = (int16)FROM_LE_16(bp->lry);
! 	} else {
! 		box->ul.x = (int16)FROM_LE_16(bp->ulx);
! 		box->ul.y = (int16)FROM_LE_16(bp->uly);
! 		box->ur.x = (int16)FROM_LE_16(bp->urx);
! 		box->ur.y = (int16)FROM_LE_16(bp->ury);
! 		box->ll.x = (int16)FROM_LE_16(bp->llx);
! 		box->ll.y = (int16)FROM_LE_16(bp->lly);
! 		box->lr.x = (int16)FROM_LE_16(bp->lrx);
! 		box->lr.y = (int16)FROM_LE_16(bp->lry);
! 	}
  }
  
--- 117,129 ----
  void Scumm::getBoxCoordinates(int boxnum, BoxCoords *box) {
  	Box *bp = getBoxBaseAddr(boxnum);
! 
! 	box->ul.x = (int16)FROM_LE_16(bp->ulx);
! 	box->ul.y = (int16)FROM_LE_16(bp->uly);
! 	box->ur.x = (int16)FROM_LE_16(bp->urx);
! 	box->ur.y = (int16)FROM_LE_16(bp->ury);
! 	box->ll.x = (int16)FROM_LE_16(bp->llx);
! 	box->ll.y = (int16)FROM_LE_16(bp->lly);
! 	box->lr.x = (int16)FROM_LE_16(bp->lrx);
! 	box->lr.y = (int16)FROM_LE_16(bp->lry);
  }
  

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/debug.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** debug.cpp	6 Mar 2002 12:24:56 -0000	1.17
--- debug.cpp	7 Mar 2002 05:18:55 -0000	1.18
***************
*** 112,115 ****
--- 112,116 ----
  			num = _s->getNumBoxes();
  			for (i=0; i<num; i++) {
+ 				printf("bt %d\n", i);
  				BoxTest(i);
  				_s->getBoxCoordinates(i, &box);

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** sdl.cpp	6 Mar 2002 12:24:56 -0000	1.36
--- sdl.cpp	7 Mar 2002 05:18:55 -0000	1.37
***************
*** 919,925 ****
  	rx1[0] = box.ul.x*2; ry1[0] = box.ul.y*2+32;
  	rx1[1] = box.ur.x*2; ry1[1] = box.ur.y*2+32;
! 	rx1[2] = box.lr.x*2; ry1[2] = box.lr.y*2+32;
! 	rx1[3] = box.ll.x*2; ry1[3] = box.ll.y*2+32;
! 
  	filledPolygonColor(screen, &rx1[0], &ry1[0], 4, 255);
  	SDL_UpdateRect(screen, 0,0,0,0);
--- 919,925 ----
  	rx1[0] = box.ul.x*2; ry1[0] = box.ul.y*2+32;
  	rx1[1] = box.ur.x*2; ry1[1] = box.ur.y*2+32;
! 	rx1[2] = box.ll.x*2; ry1[2] = box.ll.y*2+32;
! 	rx1[3] = box.lr.x*2; ry1[3] = box.lr.y*2+32;
! 	
  	filledPolygonColor(screen, &rx1[0], &ry1[0], 4, 255);
  	SDL_UpdateRect(screen, 0,0,0,0);