mirror of
https://github.com/1dot13/source.git
synced 2026-09-09 14:46:05 +02:00
bugfix: Not all Face-Items (Goggles, NVGs, ...) are dropped, when "Drop all items" is selected
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@511 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -173,8 +173,8 @@ UINT8 NumEnemiesInSector( INT16 sSectorX, INT16 sSectorY )
|
|||||||
GROUP *pGroup;
|
GROUP *pGroup;
|
||||||
UINT8 ubNumTroops;
|
UINT8 ubNumTroops;
|
||||||
|
|
||||||
Assert( sSectorX >= 1 && sSectorX <= 16 );
|
//Assert( sSectorX >= 1 && sSectorX <= 16 );
|
||||||
Assert( sSectorY >= 1 && sSectorY <= 16 );
|
//Assert( sSectorY >= 1 && sSectorY <= 16 );
|
||||||
|
|
||||||
pSector = &SectorInfo[ SECTOR( sSectorX, sSectorY ) ];
|
pSector = &SectorInfo[ SECTOR( sSectorX, sSectorY ) ];
|
||||||
ubNumTroops = (UINT8)(pSector->ubNumAdmins + pSector->ubNumTroops + pSector->ubNumElites);
|
ubNumTroops = (UINT8)(pSector->ubNumAdmins + pSector->ubNumTroops + pSector->ubNumElites);
|
||||||
|
|||||||
@@ -2139,13 +2139,17 @@ else
|
|||||||
|
|
||||||
if ( gGameSettings.fOptions[TOPTION_DROP_ALL] )
|
if ( gGameSettings.fOptions[TOPTION_DROP_ALL] )
|
||||||
{
|
{
|
||||||
|
// WANNE - "Drop all" should mean "Drop all"
|
||||||
|
/*
|
||||||
if ( Item[ pp->Inv[ i ].usItem ].usItemClass == IC_FACE )
|
if ( Item[ pp->Inv[ i ].usItem ].usItemClass == IC_FACE )
|
||||||
{
|
{
|
||||||
if( Random(100) < ubOtherDropRate ) // way too many gas masks, nvg and extended ears getting dropped!
|
if( Random(100) < ubOtherDropRate ) // way too many gas masks, nvg and extended ears getting dropped!
|
||||||
pp->Inv[ i ].fFlags &= ~OBJECT_UNDROPPABLE;
|
pp->Inv[ i ].fFlags &= ~OBJECT_UNDROPPABLE;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
pp->Inv[ i ].fFlags &= ~OBJECT_UNDROPPABLE;
|
*/
|
||||||
|
|
||||||
|
pp->Inv[ i ].fFlags &= ~OBJECT_UNDROPPABLE;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user