libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-04 09:56:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

BLADERUNNER: Fix build

Browse Source
This commit is contained in:
Thomas Fach-Pedersen 2018-05-07 19:31:53 +02:00
parent e3363635cb
commit aabd5b2ec8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/bladerunner/obstacles.cpp
View File

@ -90,13 +90,13 @@ bool Obstacles::lineLineIntersection(LineSegment a, LineSegment b, Vector2 *inte
if (a.start.x == a.end.x && b.start.y == b.end.y && IN_RANGE(a.start.x, b.start.x, b.end.x) && IN_RANGE(b.start.y, a.start.y, a.end.y)) {
// A is vertical, B is horizontal
*intersection = Vector2 { a.start.x, b.start.y };
*intersection = Vector2(a.start.x, b.start.y);
return true;
}
if (a.start.y == a.end.y && b.start.x == b.end.x && IN_RANGE(a.start.y, b.start.y, b.end.y) && IN_RANGE(b.start.x, a.start.x, a.end.x)) {
// A is horizontal, B is vertical
*intersection = Vector2 { b.start.x, a.start.y };
*intersection = Vector2(b.start.x, a.start.y);
return true;
}
@ -117,10 +117,10 @@ bool Obstacles::linePolygonIntersection(LineSegment lineA, VertexType lineAType,
Vector2 newIntersectionPoint;
if (lineLineIntersection(lineA, lineB, &newIntersectionPoint)) {
if (lineAType == TOP_RIGHT && lineBType == TOP_LEFT
|| lineAType == BOTTOM_RIGHT && lineBType == TOP_RIGHT
|| lineAType == BOTTOM_LEFT && lineBType == BOTTOM_RIGHT
|| lineAType == TOP_LEFT && lineBType == BOTTOM_LEFT
if ((lineAType == TOP_RIGHT && lineBType == TOP_LEFT)
|| (lineAType == BOTTOM_RIGHT && lineBType == TOP_RIGHT)
|| (lineAType == BOTTOM_LEFT && lineBType == BOTTOM_RIGHT)
|| (lineAType == TOP_LEFT && lineBType == BOTTOM_LEFT)
) {
if (!WITHIN_TOLERANCE(lineB.end.x, intersectionPoint->x)
|| !WITHIN_TOLERANCE(lineB.end.y, intersectionPoint->y)) {