From 0038d2abc107a4e8f4c6de8178dd7e65ef818530 Mon Sep 17 00:00:00 2001
From: MaddMugsy <MaddMugsy@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 29 Aug 2006 04:32:15 +0000
Subject: [PATCH] -updated pickarandomlaunchable to only pick legal items

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Items.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp
index f39ecbd2..d1f83fac 100644
--- a/Tactical/Items.cpp
+++ b/Tactical/Items.cpp
@@ -7376,7 +7376,7 @@ UINT16 PickARandomLaunchable(UINT16 itemIndex)
 			if ( Item[i].usItemClass  == 0 )
 				break;
 			//Madd: quickfix: make it not choose best grenades right away. 
-			if( ValidLaunchable( i, itemIndex ) && Item[i].ubCoolness <= max(HighestPlayerProgressPercentage()/10,lowestCoolness) )
+			if( ValidLaunchable( i, itemIndex ) && ItemIsLegal(i) && Item[i].ubCoolness <= max(HighestPlayerProgressPercentage()/10,lowestCoolness) )
 				usNumMatches++;
 		}
 	}
@@ -7388,7 +7388,7 @@ UINT16 PickARandomLaunchable(UINT16 itemIndex)
 			if ( Item[i].usItemClass  == 0 )
 				break;
 
-			if( ValidLaunchable( i, itemIndex ) && Item[i].ubCoolness <= max(HighestPlayerProgressPercentage()/10,lowestCoolness) )
+			if( ValidLaunchable( i, itemIndex ) && ItemIsLegal(i) && Item[i].ubCoolness <= max(HighestPlayerProgressPercentage()/10,lowestCoolness) )
 			{	
 				if( usRandom )
 					usRandom--;