Always run mini-autoselect for bombs
Autoselect events are gated on the player having none of the item prior to this pickup, so making the mini-autoselect more aggressive should not cause unwanted switches. Since the main autoselect is complicated, requiring the mini-autoselect to happen only when the main autoselect is skipped makes it complicated for players to reason about whether the mini-autoselect will happen.
This commit is contained in:
parent
7034b68357
commit
8d2d69d663
|
@ -701,9 +701,8 @@ int pick_up_secondary(int weapon_index,int count)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
select_secondary_weapon(nullptr, weapon_index, 1);
|
select_secondary_weapon(nullptr, weapon_index, 1);
|
||||||
else {
|
|
||||||
#if defined(DXX_BUILD_DESCENT_II)
|
#if defined(DXX_BUILD_DESCENT_II)
|
||||||
//if we don't auto-select this weapon, but it's a proxbomb or smart mine,
|
//if it's a proxbomb or smart mine,
|
||||||
//we want to do a mini-auto-selection that applies to the drop bomb key
|
//we want to do a mini-auto-selection that applies to the drop bomb key
|
||||||
|
|
||||||
if (weapon_index_is_player_bomb(weapon_index) &&
|
if (weapon_index_is_player_bomb(weapon_index) &&
|
||||||
|
@ -714,7 +713,6 @@ int pick_up_secondary(int weapon_index,int count)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
//note: flash for all but concussion was 7,14,21
|
//note: flash for all but concussion was 7,14,21
|
||||||
if (num_picked_up>1) {
|
if (num_picked_up>1) {
|
||||||
|
|
Loading…
Reference in a new issue