[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.81,1.82 script_v6.cpp,1.3,1.4

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv7264

Modified Files:
	scumm.h script_v6.cpp 
Log Message:
added comparision methods for ScummPoint

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- scumm.h	15 Dec 2002 00:39:33 -0000	1.81
+++ scumm.h	15 Dec 2002 20:53:10 -0000	1.82
@@ -65,6 +65,14 @@
 
 struct ScummPoint {
 	int x, y;
+	bool operator ==(const ScummPoint &p) const
+	{
+		return p.x == x && p.y == y;
+	}
+	bool operator !=(const ScummPoint &p) const
+	{
+		return p.x != x || p.y != y;
+	}
 };
 
 #include "gfx.h"

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- script_v6.cpp	15 Dec 2002 17:34:38 -0000	1.3
+++ script_v6.cpp	15 Dec 2002 20:53:11 -0000	1.4
@@ -2061,7 +2061,7 @@
 			if (camera._cur.x >> 3 != camera._dest.x >> 3)
 				break;
 		} else {
-			if (camera._dest.x != camera._cur.x || camera._dest.y != camera._cur.y)
+			if (camera._dest != camera._cur)
 				break;
 		}