From 7e263323bc6dba89648a39a68d8f322f833fda59 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 7 Jun 2015 16:21:37 +0000 Subject: [PATCH] Simplify boss invulnerability lookup --- similar/main/collide.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/similar/main/collide.cpp b/similar/main/collide.cpp index dd356850e..39ef4375a 100644 --- a/similar/main/collide.cpp +++ b/similar/main/collide.cpp @@ -1557,7 +1557,9 @@ static int do_boss_weapon_collision(const vobjptr_t robot, const vobjptr_t weapo } } } - } else if ((Weapon_info[get_weapon_id(weapon)].matter && Boss_invulnerable_matter[d2_boss_index]) || (!Weapon_info[get_weapon_id(weapon)].matter && Boss_invulnerable_energy[d2_boss_index])) { + } + else if ((Weapon_info[get_weapon_id(weapon)].matter ? Boss_invulnerable_matter : Boss_invulnerable_energy)[d2_boss_index]) + { auto segnum = find_point_seg(collision_point, robot->segnum); digi_link_sound_to_pos( SOUND_WEAPON_HIT_DOOR, segnum, 0, collision_point, 0, F1_0); damage_flag = 0;