diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2009-04-26 19:10:04 -0400 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2009-04-26 19:10:04 -0400 |
| commit | 66533f92842024f0478152d6829505275abc9a0d (patch) | |
| tree | 22959f8587ba99ddf0382c1080a7abb0fd22148d | |
| parent | 1221c7e07b1d06a4834c47045284ba06700342da (diff) | |
| download | sigen-66533f92842024f0478152d6829505275abc9a0d.tar.gz sigen-66533f92842024f0478152d6829505275abc9a0d.tar.xz sigen-66533f92842024f0478152d6829505275abc9a0d.zip | |
Replace old (useless) case with when the edge gets cut short
| -rw-r--r-- | sigmodr/widgets/mapeditor/WorldMapPlacement.cpp | 4 |
1 files 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; |