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

Always run mini-autoselect for bombs

Browse source 
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:
Kp 2015-10-09 02:46:09 +00:00
parent 7034b68357
commit 8d2d69d663
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
similar/main/weapon.cpp
View file

@ -701,9 +701,8 @@ int pick_up_secondary(int weapon_index,int count)
)
)
select_secondary_weapon(nullptr, weapon_index, 1);
else {
#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
if (weapon_index_is_player_bomb(weapon_index) &&
@ -713,7 +712,6 @@ int pick_up_secondary(int weapon_index,int count)
last = (weapon_index == SMART_MINE_INDEX);
}
#endif
}
}
//note: flash for all but concussion was 7,14,21