TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Simplify boss invulnerability lookup

Browse source
This commit is contained in:
Kp 2015-06-07 16:21:37 +00:00
parent 7c436f1fbb
commit 7e263323bc
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
similar/main/collide.cpp
View file

@ -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;