diff options
| author | JAROWMR <jarorutjes07@gmail.com> | 2024-11-15 14:32:09 +0100 |
|---|---|---|
| committer | JAROWMR <jarorutjes07@gmail.com> | 2024-11-15 14:32:09 +0100 |
| commit | 37c016f1d5902cf7bbfed08d13ee2bc6ef725add (patch) | |
| tree | ce9de85b6d5ffd43d2e798b5310df883705f5ca8 /src/crepe/api/CircleCollider.h | |
| parent | de1c6053033483c7e824f8018d75be6af424d14d (diff) | |
| parent | 337a957a9e605f16287506b6afda56950e562db3 (diff) | |
merge with wouter/events
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 |