[Scummvm-cvs-logs] CVS: scummvm boxes.cpp,1.15,1.16

[Mutwin Kraus]

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

Modified Files:
	boxes.cpp 
Log Message:
Some changes, need to be done to get the Mac Port running. For example Point is now called ScummPoint, as the name Point is already in use by Apple.

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/boxes.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** boxes.cpp	7 Mar 2002 05:18:55 -0000	1.15
--- boxes.cpp	8 Mar 2002 17:04:16 -0000	1.16
***************
*** 90,94 ****
  		box.ur.y== box.ll.y) {
  
! 		Point pt;
  		pt = closestPtOnLine(box.ul.x, box.ul.y, box.ll.x, box.ll.y, x, y);
  		if (distanceFromPt(x, y, pt.x,pt.y) <= 4)
--- 90,94 ----
  		box.ur.y== box.ll.y) {
  
! 		ScummPoint pt;
  		pt = closestPtOnLine(box.ul.x, box.ul.y, box.ll.x, box.ll.y, x, y);
  		if (distanceFromPt(x, y, pt.x,pt.y) <= 4)
***************
*** 149,157 ****
  }
  
! Point Scumm::closestPtOnLine(int ulx, int uly, int llx, int lly, int x, int y) {
  	int lydiff,lxdiff;
  	int32 dist,a,b,c;
  	int x2,y2;
! 	Point pt;
  
  	if (llx==ulx) {
--- 149,157 ----
  }
  
! ScummPoint Scumm::closestPtOnLine(int ulx, int uly, int llx, int lly, int x, int y) {
  	int lydiff,lxdiff;
  	int32 dist,a,b,c;
  	int x2,y2;
! 	ScummPoint pt;
  
  	if (llx==ulx) {
***************
*** 255,259 ****
  
  AdjustBoxResult Scumm::getClosestPtOnBox(int b, int x, int y) {
! 	Point pt;
  	AdjustBoxResult best;
  	uint dist;
--- 255,259 ----
  
  AdjustBoxResult Scumm::getClosestPtOnBox(int b, int x, int y) {
! 	ScummPoint pt;
  	AdjustBoxResult best;
  	uint dist;
***************
*** 333,337 ****
  	BoxCoords box1;
  	BoxCoords box2;
! 	Point tmp;
  	int i,j;
  	int flag;
--- 333,337 ----
  	BoxCoords box1;
  	BoxCoords box2;
! 	ScummPoint tmp;
  	int i,j;
  	int flag;