diff --git a/JA2.suo b/JA2.suo index 633fff6c..292794c3 100644 Binary files a/JA2.suo and b/JA2.suo differ diff --git a/Strategic/Queen Command.cpp b/Strategic/Queen Command.cpp index ca64d176..b8088dd9 100644 --- a/Strategic/Queen Command.cpp +++ b/Strategic/Queen Command.cpp @@ -173,8 +173,8 @@ UINT8 NumEnemiesInSector( INT16 sSectorX, INT16 sSectorY ) GROUP *pGroup; UINT8 ubNumTroops; - Assert( sSectorX >= 1 && sSectorX <= 16 ); - Assert( sSectorY >= 1 && sSectorY <= 16 ); + //Assert( sSectorX >= 1 && sSectorX <= 16 ); + //Assert( sSectorY >= 1 && sSectorY <= 16 ); pSector = &SectorInfo[ SECTOR( sSectorX, sSectorY ) ]; ubNumTroops = (UINT8)(pSector->ubNumAdmins + pSector->ubNumTroops + pSector->ubNumElites); diff --git a/Tactical/Inventory Choosing.cpp b/Tactical/Inventory Choosing.cpp index 988b27eb..0274e21d 100644 --- a/Tactical/Inventory Choosing.cpp +++ b/Tactical/Inventory Choosing.cpp @@ -2139,13 +2139,17 @@ else if ( gGameSettings.fOptions[TOPTION_DROP_ALL] ) { + // WANNE - "Drop all" should mean "Drop all" + /* if ( Item[ pp->Inv[ i ].usItem ].usItemClass == IC_FACE ) { if( Random(100) < ubOtherDropRate ) // way too many gas masks, nvg and extended ears getting dropped! pp->Inv[ i ].fFlags &= ~OBJECT_UNDROPPABLE; } else - pp->Inv[ i ].fFlags &= ~OBJECT_UNDROPPABLE; + */ + + pp->Inv[ i ].fFlags &= ~OBJECT_UNDROPPABLE; } else {