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--;