X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcollision.h;h=d4f58825a5f3e2a0afdccc4a4f0170b35ab32c57;hb=759b37ae65aac1db92b7166c76bed679b05b6376;hp=2c65c488f49116dab66ef27c541f564256d00db9;hpb=60908c905544776c376421b8d3e12eeb936c068f;p=supertux.git diff --git a/src/collision.h b/src/collision.h index 2c65c488f..d4f58825a 100644 --- a/src/collision.h +++ b/src/collision.h @@ -22,7 +22,7 @@ #define __COLLISION_H__ class Vector; -class Rectangle; +class Rect; class AATriangle; class CollisionHit; @@ -32,13 +32,13 @@ public: /** does collision detection between 2 rectangles. Returns true in case of * collision and fills in the hit structure then. */ - static bool rectangle_rectangle(CollisionHit& hit, const Rectangle& r1, - const Vector& movement, const Rectangle& r2); + static bool rectangle_rectangle(CollisionHit& hit, const Rect& r1, + const Vector& movement, const Rect& r2); /** does collision detection between a rectangle and an axis aligned triangle * Returns true in case of a collision and fills in the hit structure then. */ - static bool rectangle_aatriangle(CollisionHit& hit, const Rectangle& rect, + static bool rectangle_aatriangle(CollisionHit& hit, const Rect& rect, const Vector& movement, const AATriangle& triangle); };