[Scummvm-cvs-logs] CVS: scummvm scumm.h,1.70,1.71

[Mutwin Kraus]

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

Modified Files:
	scumm.h 
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: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** scumm.h	7 Mar 2002 05:41:53 -0000	1.70
--- scumm.h	8 Mar 2002 17:04:51 -0000	1.71
***************
*** 86,90 ****
  	315 };
  
! struct Point {
  	int x,y;
  };
--- 86,90 ----
  	315 };
  
! struct ScummPoint {
  	int x,y;
  };
***************
*** 622,629 ****
  
  struct CameraData {
! 	Point _cur;
! 	Point _dest;
! 	Point _accel;
! 	Point _last;
  	int _leftTrigger, _rightTrigger;
  	byte _follows, _mode;
--- 622,629 ----
  
  struct CameraData {
! 	ScummPoint _cur;
! 	ScummPoint _dest;
! 	ScummPoint _accel;
! 	ScummPoint _last;
  	int _leftTrigger, _rightTrigger;
  	byte _follows, _mode;
***************
*** 831,838 ****
  
  struct BoxCoords {
! 	Point ul;
! 	Point ur;
! 	Point ll;
! 	Point lr;
  };
  
--- 831,838 ----
  
  struct BoxCoords {
! 	ScummPoint ul;
! 	ScummPoint ur;
! 	ScummPoint ll;
! 	ScummPoint lr;
  };
  
***************
*** 1268,1272 ****
  
  	uint distanceFromPt(int x, int y, int ptx, int pty);
! 	Point closestPtOnLine(int ulx, int uly, int llx, int lly, int x, int y);
  	bool getSideOfLine(int x1,int y1, int x2, int y2, int x, int y, int box);
  	void getBoxCoordinates(int boxnum, BoxCoords *bc);
--- 1268,1272 ----
  
  	uint distanceFromPt(int x, int y, int ptx, int pty);
! 	ScummPoint closestPtOnLine(int ulx, int uly, int llx, int lly, int x, int y);
  	bool getSideOfLine(int x1,int y1, int x2, int y2, int x, int y, int box);
  	void getBoxCoordinates(int boxnum, BoxCoords *bc);
***************
*** 1800,1804 ****
  	void setCameraAtEx(int at);
  
! 	void clampCameraPos(Point *pt);
  
  	void setCursorHotspot2(int x,int y);
--- 1800,1804 ----
  	void setCameraAtEx(int at);
  
! 	void clampCameraPos(ScummPoint *pt);
  
  	void setCursorHotspot2(int x,int y);