X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollision.hpp;h=a31878c88e8553dd808796598401d49b7005c093;hb=3dbcbb8b2c8618f5f2f29548eba316dafc6d623c;hp=ba6b6f8d9852f86278f59dc5d7e5868c22984df7;hpb=77d00a6f464cc87c6b50cf1f3b38064a7ae9aead;p=supertux.git diff --git a/src/collision.hpp b/src/collision.hpp index ba6b6f8d9..a31878c88 100644 --- a/src/collision.hpp +++ b/src/collision.hpp @@ -63,10 +63,10 @@ bool intersects(const Rect& r1, const Rect& r2); * Returns true in case of a collision and fills in the hit structure then. */ bool rectangle_aatriangle(Constraints* constraints, const Rect& rect, - const AATriangle& triangle); + const AATriangle& triangle, const Vector& addl_ground_movement = Vector(0,0)); void set_rectangle_rectangle_constraints(Constraints* constraints, - const Rect& r1, const Rect& r2); + const Rect& r1, const Rect& r2, const Vector& addl_ground_movement = Vector(0,0)); }