X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcollision.cpp;h=e9c25fb3866a53f966291da4ba1e1895650fd483;hb=ab9eab4c870195c2b60ce76b77044c35b31e8806;hp=8ae5e91bf13054dd9c2f3982c125ec4e1769c276;hpb=2892ebda09d24c977547159e34abf0244884b89e;p=supertux.git diff --git a/src/collision.cpp b/src/collision.cpp index 8ae5e91bf..e9c25fb38 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -52,7 +52,7 @@ namespace { { n = Vector(p2.y-p1.y, p1.x-p2.x); c = -(p2 * n); - float nval = n.norm(); + float nval = n.norm(); n /= nval; c /= nval; } @@ -93,8 +93,8 @@ bool rectangle_aatriangle(Constraints* constraints, const Rect& rect, break; default: assert(false); - } - + } + switch(triangle.dir & AATriangle::DIRECTION_MASK) { case AATriangle::SOUTHWEST: p1 = Vector(rect.p1.x, rect.p2.y); @@ -152,7 +152,7 @@ bool rectangle_aatriangle(Constraints* constraints, const Rect& rect, } constraints->hit.slope_normal = normal; } - + return true; }