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/workers/CollisionScript.cpp | |
| parent | fbd7c84e13381922bf327e20c1abc65337142445 (diff) | |
| parent | 0de6692dcb029540f4502c5a2f1a0c6634f7b61f (diff) | |
Merge remote-tracking branch 'origin/wouter/enemyAI' into niels/game
Diffstat (limited to 'game/workers/CollisionScript.cpp')
| -rw-r--r-- | game/workers/CollisionScript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/game/workers/CollisionScript.cpp b/game/workers/CollisionScript.cpp index deaf0ee..625044d 100644 --- a/game/workers/CollisionScript.cpp +++ b/game/workers/CollisionScript.cpp @@ -49,7 +49,7 @@ 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); |