diff options
Diffstat (limited to 'src/crepe/api/CircleCollider.h')
| -rw-r--r-- | src/crepe/api/CircleCollider.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/crepe/api/CircleCollider.h b/src/crepe/api/CircleCollider.h index e4f0452..29a9c1e 100644 --- a/src/crepe/api/CircleCollider.h +++ b/src/crepe/api/CircleCollider.h @@ -8,15 +8,8 @@ namespace crepe { class CircleCollider : public Collider { public: -<<<<<<< HEAD CircleCollider(game_object_id_t game_object_id,Vector2 offset, int radius); double radius; -======= - CircleCollider(game_object_id_t game_object_id, int radius) - : Collider(game_object_id), - radius(radius) {} - int radius; ->>>>>>> be1e97bc7a494963ab1567492fafcda99e36f683 }; } // namespace crepe |