diff options
| author | heavydemon21 <nielsstunnebrink1@gmail.com> | 2025-01-08 14:57:09 +0100 |
|---|---|---|
| committer | heavydemon21 <nielsstunnebrink1@gmail.com> | 2025-01-08 14:57:09 +0100 |
| commit | 714c8798dd0998ea15b1ba697962a97c586457fe (patch) | |
| tree | 86d36b17a71845cd4b5d16a0e9abd11df0d55c03 /game/player/PlayerSubScene.cpp | |
| parent | fbd7c84e13381922bf327e20c1abc65337142445 (diff) | |
| parent | 0de6692dcb029540f4502c5a2f1a0c6634f7b61f (diff) | |
Merge remote-tracking branch 'origin/wouter/enemyAI' into niels/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; |