Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Ignore weird collisions in lines.

Browse Source
This commit is contained in:
Allanis 2014-03-07 19:35:09 +00:00
parent f0f3f1bfc4
commit da98ff806d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/collision.c
View File

@ -163,14 +163,14 @@ int CollideLineSprite(const Vec2* ap, double ad, double al,
/* Left border. */ /* Left border. */
if(CollideLineLine(ap->x, ap->y, ep[0], ep[1], if(CollideLineLine(ap->x, ap->y, ep[0], ep[1],
bl[0], bl[1], bl[0], tr[1], &tmp_crash) != 0) { bl[0], bl[1], bl[0], tr[1], &tmp_crash) == 0) {
border[hits].x = tmp_crash.x; border[hits].x = tmp_crash.x;
border[hits].y = tmp_crash.y; border[hits].y = tmp_crash.y;
hits++; hits++;
} }
/* Top border. */ /* Top border. */
if(CollideLineLine(ap->x, ap->y, ep[0], ep[1], if(CollideLineLine(ap->x, ap->y, ep[0], ep[1],
bl[0], tr[1], tr[0], tr[1], &tmp_crash) != 0) { bl[0], tr[1], tr[0], tr[1], &tmp_crash) == 0) {
border[hits].x = tmp_crash.x; border[hits].x = tmp_crash.x;
border[hits].y = tmp_crash.y; border[hits].y = tmp_crash.y;
hits++; hits++;
@ -178,14 +178,14 @@ int CollideLineSprite(const Vec2* ap, double ad, double al,
/* Now we are going to have to make sure hits isn't 2. */ /* Now we are going to have to make sure hits isn't 2. */
/* Right border. */ /* Right border. */
if((hits < 2) && CollideLineLine(ap->x, ap->y, ep[0], ep[1], if((hits < 2) && CollideLineLine(ap->x, ap->y, ep[0], ep[1],
tr[0], tr[1], tr[0], bl[1], &tmp_crash) != 0) { tr[0], tr[1], tr[0], bl[1], &tmp_crash) == 0) {
border[hits].x = tmp_crash.x; border[hits].x = tmp_crash.x;
border[hits].y = tmp_crash.y; border[hits].y = tmp_crash.y;
hits++; hits++;
} }
/* Bottom border. */ /* Bottom border. */
if((hits < 2) && CollideLineLine(ap->x, ap->y, ep[0], ep[1], if((hits < 2) && CollideLineLine(ap->x, ap->y, ep[0], ep[1],
tr[0], bl[1], bl[0], bl[1], &tmp_crash) != 0) { tr[0], bl[1], bl[0], bl[1], &tmp_crash) == 0) {
border[hits].x = tmp_crash.x; border[hits].x = tmp_crash.x;
border[hits].y = tmp_crash.y; border[hits].y = tmp_crash.y;
hits++; hits++;