diff options
| author | JAROWMR <jarorutjes07@gmail.com> | 2025-01-08 18:40:11 +0100 |
|---|---|---|
| committer | JAROWMR <jarorutjes07@gmail.com> | 2025-01-08 18:40:11 +0100 |
| commit | ef3f5b0845ba127c0bfcda8c2fce37013fef3878 (patch) | |
| tree | e5690ff875a662ee7603844e858d82428d973a78 /game/player/PlayerSubScene.cpp | |
| parent | 424da5eb1500d90389d939cd0b3e6e75d729578d (diff) | |
| parent | 2ad15f3efab481659543a1c03cd70a36fd297538 (diff) | |
Merge branch 'master' of github.com:lonkaars/crepe into jaro/game
Diffstat (limited to 'game/player/PlayerSubScene.cpp')
| -rw-r--r-- | game/player/PlayerSubScene.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/game/player/PlayerSubScene.cpp b/game/player/PlayerSubScene.cpp index f136605..c4d689a 100644 --- a/game/player/PlayerSubScene.cpp +++ b/game/player/PlayerSubScene.cpp @@ -149,7 +149,8 @@ PlayerSubScene::PlayerSubScene(Scene & scn) { .body_type = Rigidbody::BodyType::DYNAMIC, .linear_velocity = vec2(PLAYER_SPEED * 0.02, 0), .collision_layers - = {COLL_LAY_BOT_TOP, COLL_LAY_ZAPPER, COLL_LAY_LASER, COLL_LAY_MISSILE}, + = {COLL_LAY_BOT_TOP, COLL_LAY_ZAPPER, COLL_LAY_LASER, COLL_LAY_MISSILE, COLL_LAY_BULLET + }, .collision_layer = COLL_LAY_PLAYER, }); player.add_component<BehaviorScript>().set_script<PlayerScript>().active = false; |