From 66533f92842024f0478152d6829505275abc9a0d Mon Sep 17 00:00:00 2001
From: Ben Boeckel <MathStuf@gmail.com>
Date: Sun, 26 Apr 2009 19:10:04 -0400
Subject: Replace old (useless) case with when the edge gets cut short

---
 sigmodr/widgets/mapeditor/WorldMapPlacement.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sigmodr/widgets/mapeditor/WorldMapPlacement.cpp b/sigmodr/widgets/mapeditor/WorldMapPlacement.cpp
index ea2095b4..edbb9e17 100644
--- a/sigmodr/widgets/mapeditor/WorldMapPlacement.cpp
+++ b/sigmodr/widgets/mapeditor/WorldMapPlacement.cpp
@@ -118,9 +118,9 @@ static CollisionInfo findCollisions(const QPolygon& polygon1, const QPolygon& po
                 data[point1] = NextTarget(Include, point2);
                 break;
             }
-            else if ((shareX && betweenY2) || (shareY && betweenX2))
+            else if ((((point1.x() == prevPoint2.x()) && between(prevPoint2.y(), prevPoint1.y(), point1.y())) || ((point1.y() == prevPoint2.y()) && between(point1.x(), prevPoint1.x(), point1.x()))))
             {
-                data[prevPoint1] = NextTarget(Include, point2);
+                data[point1] = NextTarget(Include, polygon2[(polygon2.indexOf(prevPoint2) + polygon2.size() - 2) % polygon2.size()]);
                 break;
             }
             prevPoint2 = point2;
-- 
cgit