[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.24,1.25 boxes.cpp,1.13,1.14 scumm.h,1.50,1.51 scummvm.cpp,1.43,1.44 sdl.cpp,1.33,1.34

[Vincent Hamm]

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

Modified Files:
	actor.cpp boxes.cpp scumm.h scummvm.cpp sdl.cpp 
Log Message:
Fixed some boxes issues. Matrix is still buggy

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** actor.cpp	15 Feb 2002 13:11:50 -0000	1.24
--- actor.cpp	22 Feb 2002 16:06:09 -0000	1.25
***************
*** 629,634 ****
  	int i;
  	Actor *a;
  	for (i=1; i<NUM_ACTORS; i++) {
! 		a = derefActor(i);	
  		if (a->room==_currentRoom)
  			walkActor(a);
--- 629,635 ----
  	int i;
  	Actor *a;
+ 
  	for (i=1; i<NUM_ACTORS; i++) {
! 		a = derefActor(i);
  		if (a->room==_currentRoom)
  			walkActor(a);

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/boxes.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** boxes.cpp	15 Feb 2002 13:49:55 -0000	1.13
--- boxes.cpp	22 Feb 2002 16:06:09 -0000	1.14
***************
*** 117,128 ****
  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);
  }
  
--- 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);
! 	}
  }
  

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** scumm.h	19 Feb 2002 18:04:21 -0000	1.50
--- scumm.h	22 Feb 2002 16:06:09 -0000	1.51
***************
*** 64,74 ****
  	int16 ulx,uly;
  	int16 urx,ury;
- #if 1				// Ender - set to 0 for indy3/zak256
  	int16 llx,lly;
  	int16 lrx,lry;
- #else
- 	int16 lrx,lry;
- 	int16 llx,lly;
- #endif	
  	byte mask;
  	byte flags;
--- 64,69 ----
***************
*** 2270,2272 ****
  void setShakePos(Scumm *s, int shake_pos);
  uint16 newTag2Old(uint32 oldTag);
! void cd_playtrack(int track, int offset, int delay);
\ No newline at end of file
--- 2265,2267 ----
  void setShakePos(Scumm *s, int shake_pos);
  uint16 newTag2Old(uint32 oldTag);
! void cd_playtrack(int track, int offset, int delay);

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** scummvm.cpp	20 Feb 2002 01:58:23 -0000	1.43
--- scummvm.cpp	22 Feb 2002 16:06:09 -0000	1.44
***************
*** 900,908 ****
  
  	_virtual_mouse_x = mouse.x + virtscr[0].xstart;
! 	_virtual_mouse_y = mouse.y + virtscr[0].topline;
  	if (_virtual_mouse_y < 0)
  		_virtual_mouse_y = -1;
! 	if (_virtual_mouse_y >= virtscr[0].height)
! 		_virtual_mouse_y = -1;
  
  	if (!_lastKeyHit)
--- 900,919 ----
  
  	_virtual_mouse_x = mouse.x + virtscr[0].xstart;
! 	_virtual_mouse_y = mouse.y;
! 	
! 	if(!(_features & GF_OLD256))
! 		_virtual_mouse_y+=virtscr[0].topline;
! 	else
! 		_virtual_mouse_y-=16;
! 	
  	if (_virtual_mouse_y < 0)
  		_virtual_mouse_y = -1;
! 	if (_features & GF_OLD256) {
! 		if (_virtual_mouse_y >= virtscr[0].height + virtscr[0].topline)
! 			_virtual_mouse_y = -1;
! 	} else {
! 		if (_virtual_mouse_y >= virtscr[0].height)
! 			_virtual_mouse_y = -1;
! 	}
  
  	if (!_lastKeyHit)

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** sdl.cpp	19 Feb 2002 18:04:21 -0000	1.33
--- sdl.cpp	22 Feb 2002 16:06:09 -0000	1.34
***************
*** 777,784 ****
  	
  	scumm.getBoxCoordinates(num,  &box);
! 	rx1[0] = box.ul.x*2; ry1[0] = box.ul.y*2;
! 	rx1[1] = box.ur.x*2; ry1[1] = box.ur.y*2;
! 	rx1[2] = box.lr.x*2; ry1[2] = box.lr.y*2;
! 	rx1[3] = box.ll.x*2; ry1[3] = box.ll.y*2;
  
  	filledPolygonColor(screen, &rx1[0], &ry1[0], 4, 255);
--- 777,784 ----
  	
  	scumm.getBoxCoordinates(num,  &box);
! 	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);