merge mzuenni changes

1 files changed, 3 insertions, 3 deletions

diff --git a/content/geometry/segmentIntersection.cpp b/content/geometry/segmentIntersection.cpp
index 4262ddc..afc01b2 100644
--- a/content/geometry/segmentIntersection.cpp
+++ b/content/geometry/segmentIntersection.cpp
@@ -18,8 +18,8 @@ struct event {
 	int id, type;
 	bool operator<(const event& o) const {
 		if (real(p) != real(o.p)) return real(p) < real(o.p);
-		if (type != o.type) return type > o.type;
-		return imag(p) < imag(o.p);
+		if (imag(p) != imag(o.p)) return imag(p) < imag(o.p);
+		return type > o.type;
 	}
 };
 
@@ -29,7 +29,7 @@ bool lessPT(const pt& a, const pt& b) {
 }
 
 bool intersect(const seg& a, const seg& b) {
-	return lineSegmentIntersection(a.a, a.b, b.a, b.b);
+	return segmentIntersection(a.a, a.b, b.a, b.b); //@\sourceref{geometry/linesAndSegments.cpp}@
 }
 
 pair<int, int> intersect(vector<seg>& segs) {