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

Simplify boss weapon matter test

Browse source
This commit is contained in:
Kp 2016-04-23 17:59:47 +00:00
parent a6ad28c255
commit 5682d9f7d7
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
similar/main/collide.cpp
View file

@ -1477,7 +1477,10 @@ static int do_boss_weapon_collision(const object_base &robot, const object &weap
// See if should spew a bot.
if (weapon.ctype.laser_info.parent_type == OBJ_PLAYER)
if ((Weapon_info[get_weapon_id(weapon)].matter && Boss_spews_bots_matter[d2_boss_index]) || (!Weapon_info[get_weapon_id(weapon)].matter && Boss_spews_bots_energy[d2_boss_index])) {
if ((Weapon_info[get_weapon_id(weapon)].matter
? Boss_spews_bots_matter
: Boss_spews_bots_energy)[d2_boss_index])
{
if (Boss_spew_more[d2_boss_index])
if (d_rand() > 16384) {
if (boss_spew_robot(robot, collision_point) != object_none)