mirror of
https://github.com/1dot13/source.git
synced 2026-09-02 14:36:06 +02:00
-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
This commit is contained in:
+2
-2
@@ -7376,7 +7376,7 @@ UINT16 PickARandomLaunchable(UINT16 itemIndex)
|
|||||||
if ( Item[i].usItemClass == 0 )
|
if ( Item[i].usItemClass == 0 )
|
||||||
break;
|
break;
|
||||||
//Madd: quickfix: make it not choose best grenades right away.
|
//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++;
|
usNumMatches++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -7388,7 +7388,7 @@ UINT16 PickARandomLaunchable(UINT16 itemIndex)
|
|||||||
if ( Item[i].usItemClass == 0 )
|
if ( Item[i].usItemClass == 0 )
|
||||||
break;
|
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 )
|
if( usRandom )
|
||||||
usRandom--;
|
usRandom--;
|
||||||
|
|||||||
Reference in New Issue
Block a user