From b2ce4bea6d7eeb5c562a7636ed714c63b189f506 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 30 Jan 2011 16:04:33 -0600 Subject: [PATCH] added empty definition of collision between circle and rectangle --- Collision.cpp | 3 +++ Collision.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Collision.cpp b/Collision.cpp index 68f9bd8..5e39baf 100644 --- a/Collision.cpp +++ b/Collision.cpp @@ -216,3 +216,6 @@ bool CollisionCircle::collision(const Collision *c, const Point2D cPos, const Po return false; } +bool CollisionCircle::collision(const CollisionRectangle* c, const Point2D cPos, const Point2D pos){ + +} \ No newline at end of file diff --git a/Collision.h b/Collision.h index c13fdd1..6235697 100644 --- a/Collision.h +++ b/Collision.h @@ -99,7 +99,7 @@ public: \param pos the current sprite's position. \return Returns true if any of the object's collision datas are colliding . */ - bool collision(const CollisionRectangle* c, const Point2D cPos, const Point2D pos);/**< This does collision between Rectangles and Circles */ + bool collision(const CollisionRectangle* c, const Point2D cPos, const Point2D pos); virtual void draw(const Point2D& pos);/**< Draws the collision data to the screen */ }; #endif -- 2.11.0