projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
forgot to update Jamfile for new directory structure
[supertux.git]
/
src
/
collision.h
diff --git
a/src/collision.h
b/src/collision.h
index
2c65c48
..
d4f5882
100644
(file)
--- a/
src/collision.h
+++ b/
src/collision.h
@@
-22,7
+22,7
@@
#define __COLLISION_H__
class Vector;
#define __COLLISION_H__
class Vector;
-class Rect
angle
;
+class Rect;
class AATriangle;
class CollisionHit;
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.
*/
/** 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 Rect
angle
& r1,
- const Vector& movement, const Rect
angle
& 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.
*/
/** 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 Rect
angle
& rect,
+ static bool rectangle_aatriangle(CollisionHit& hit, const Rect& rect,
const Vector& movement, const AATriangle& triangle);
};
const Vector& movement, const AATriangle& triangle);
};