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

only autoselect a secondary weapon if the player didn't have any of that type before (fix bug #2671) (from D2X CVS)

Browse source
This commit is contained in:
kreatordxx 2006-12-24 07:43:11 +00:00
parent a59b4363ad
commit 8c773a79f5
3 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2006-12-01 Chris Taylor <chris@icculus.org>
* main/weapon.c: only autoselect a secondary weapon if the player
didn't have any of that type before (fix bug #2671)
2006-11-30 Chris Taylor <chris@icculus.org>
* arch/ogl/ogl.c: avoid loading OpenGL textures before they have

1
dxx-changelog.txt
View file

@ -4,6 +4,7 @@ D2X-Rebirth Changelog
--------
arch/ogl/gr.c: use PhysicsFS to check for existing screenshots, previous method may have caused writing over of open screenshots (from D2X CVS)
arch/ogl/gr.c: avoid loading OpenGL textures before they have been paged in, bug found by loading Abalyon 5 (from D2X CVS)
main/weapon.c: only autoselect a secondary weapon if the player didn't have any of that type before (fix bug #2671) (from D2X CVS)
20061219
--------

27
main/weapon.c
View file

@ -598,21 +598,24 @@ int pick_up_secondary(int weapon_index,int count)
Players[Player_num].secondary_ammo[weapon_index] = max;
}
cutpoint=SOrderList (255);
if (SOrderList (weapon_index)<cutpoint && ((SOrderList (weapon_index) < SOrderList(Secondary_weapon)) || (Players[Player_num].secondary_ammo[Secondary_weapon] == 0)) )
select_weapon(weapon_index,1, 0, 1);
else {
//if we don't auto-select this weapon, but it's a proxbomb or smart mine,
//we want to do a mini-auto-selection that applies to the drop bomb key
if (Players[Player_num].secondary_ammo[weapon_index] == count) // only autoselect if player didn't have any
{
cutpoint=SOrderList (255);
if (SOrderList (weapon_index)<cutpoint && ((SOrderList (weapon_index) < SOrderList(Secondary_weapon)) || (Players[Player_num].secondary_ammo[Secondary_weapon] == 0)) )
select_weapon(weapon_index,1, 0, 1);
else {
//if we don't auto-select this weapon, but 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 == PROXIMITY_INDEX || weapon_index == SMART_MINE_INDEX) &&
!(Secondary_weapon == PROXIMITY_INDEX || Secondary_weapon == SMART_MINE_INDEX)) {
int cur;
if ((weapon_index == PROXIMITY_INDEX || weapon_index == SMART_MINE_INDEX) &&
!(Secondary_weapon == PROXIMITY_INDEX || Secondary_weapon == SMART_MINE_INDEX)) {
int cur;
cur = Secondary_last_was_super[PROXIMITY_INDEX]?SMART_MINE_INDEX:PROXIMITY_INDEX;
cur = Secondary_last_was_super[PROXIMITY_INDEX]?SMART_MINE_INDEX:PROXIMITY_INDEX;
if (SOrderList (weapon_index) < SOrderList(cur))
Secondary_last_was_super[PROXIMITY_INDEX] = (weapon_index == SMART_MINE_INDEX);
if (SOrderList (weapon_index) < SOrderList(cur))
Secondary_last_was_super[PROXIMITY_INDEX] = (weapon_index == SMART_MINE_INDEX);
}
}
}