From 8c773a79f5dd20500a93261ebc3bdaa989130229 Mon Sep 17 00:00:00 2001
From: kreatordxx <>
Date: Sun, 24 Dec 2006 07:43:11 +0000
Subject: [PATCH] only autoselect a secondary weapon if the player didn't have
 any of that type before (fix bug #2671) (from D2X CVS)

---
 ChangeLog         |  5 +++++
 dxx-changelog.txt |  1 +
 main/weapon.c     | 27 +++++++++++++++------------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index afa86c7d6..ffb0caed7 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/dxx-changelog.txt b/dxx-changelog.txt
index d9b291fb1..1d302db36 100755
--- a/dxx-changelog.txt
+++ b/dxx-changelog.txt
@@ -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
 --------
diff --git a/main/weapon.c b/main/weapon.c
index 67ae3f9bb..f7f17e9cd 100755
--- a/main/weapon.c
+++ b/main/weapon.c
@@ -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);
+			}
 		}
 	}