diff options
| author | JAROWMR <jarorutjes07@gmail.com> | 2024-11-15 12:56:45 +0100 |
|---|---|---|
| committer | JAROWMR <jarorutjes07@gmail.com> | 2024-11-15 12:56:45 +0100 |
| commit | de1c6053033483c7e824f8018d75be6af424d14d (patch) | |
| tree | 8904c58c52501da6e647661c20384f68951df58d /src/crepe/api/CircleCollider.h | |
| parent | 355b0178eaaf3602b00975adb8f56e2141dcd982 (diff) | |
| parent | be1e97bc7a494963ab1567492fafcda99e36f683 (diff) | |
merge with master
Diffstat (limited to 'src/crepe/api/CircleCollider.h')
| -rw-r--r-- | src/crepe/api/CircleCollider.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/crepe/api/CircleCollider.h b/src/crepe/api/CircleCollider.h index 29a9c1e..e4f0452 100644 --- a/src/crepe/api/CircleCollider.h +++ b/src/crepe/api/CircleCollider.h @@ -8,8 +8,15 @@ 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 |