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/workers | |
parent | 424da5eb1500d90389d939cd0b3e6e75d729578d (diff) | |
parent | 2ad15f3efab481659543a1c03cd70a36fd297538 (diff) |
Merge branch 'master' of github.com:lonkaars/crepe into jaro/game
Diffstat (limited to 'game/workers')
-rw-r--r-- | game/workers/CollisionScript.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/game/workers/CollisionScript.cpp b/game/workers/CollisionScript.cpp index deaf0ee..372bfec 100644 --- a/game/workers/CollisionScript.cpp +++ b/game/workers/CollisionScript.cpp @@ -49,7 +49,8 @@ bool CollisionScript::on_collision(const CollisionEvent & ev) { bs_panic.active = false; return false; - } else if (ev.info.other.metadata.tag == "missile") { + } else if (ev.info.other.metadata.tag == "missile" + || ev.info.other.metadata.tag == "enemy_bullet") { for (Animator & anim : animators) { anim.active = false; anim.set_anim(3); |