1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: 1dot13/source:latest
Branches Tags
1dot13/source:master 1dot13/source:starting-gear-tags-fix 1dot13/source:decideaction 1dot13/source:majcosta-patch-1 1dot13/source:prevActiveMerc 1dot13/source:pr_emergency_v5 1dot13/source:cleanup 1dot13/source:cache-test 1dot13/source:RenderTiles-Refactor
1dot13/source:latest 1dot13/source:v5 1dot13/source:v4 1dot13/source:v3 1dot13/source:v2 1dot13/source:v1
...
compare: 1dot13/source:starting-gear-tags-fix
Branches Tags
1dot13/source:master 1dot13/source:starting-gear-tags-fix 1dot13/source:decideaction 1dot13/source:majcosta-patch-1 1dot13/source:prevActiveMerc 1dot13/source:pr_emergency_v5 1dot13/source:cleanup 1dot13/source:cache-test 1dot13/source:RenderTiles-Refactor
1dot13/source:latest 1dot13/source:v5 1dot13/source:v4 1dot13/source:v3 1dot13/source:v2 1dot13/source:v1
3 Commits
latest ... starting-gear-tags-fix
Author SHA1 Message Date
Asdow 9353bf27a1 Revert "Make new kit selection respect TonsOfGuns & Scifi tags" 
This reverts commit 69904ee003.
 2026-06-19 21:58:41 +03:00
Asdow ef51b578c3 Discard items based on gamestyle 2026-06-19 21:58:27 +03:00
Asdow 69904ee003 Make new kit selection respect TonsOfGuns & Scifi tags 2026-06-19 10:10:48 +03:00
1 changed files with 26 additions and 0 deletions
Expand all files Collapse all files
Laptop/AimMembers.cpp
+26
View File
@@ -1560,6 +1560,8 @@ BOOLEAN DisplayMercsInventory(UINT8 ubMercID)
CHAR16 gzItemName[ 5000 ];
UINT8 ubItemCount=0;
UINT8 ubColumnCount=0;
const bool realisticGameStyle = gGameOptions.ubGameStyle != STYLE_SCIFI;
const bool reducedGuns = gGameOptions.fGunNut == false;
//if the mercs inventory has already been purchased, dont display the inventory
if ( (gMercProfiles[ ubMercID ].ubMiscFlags & PROFILE_MISC_FLAG_ALREADY_USED_ITEMS) && !gGameExternalOptions.fGearKitsAlwaysAvailable )
@@ -1583,6 +1585,18 @@ BOOLEAN DisplayMercsInventory(UINT8 ubMercID)
{
usItem = gMercProfiles[ubMercID].inv[ i ];
if (realisticGameStyle && ItemIsOnlyInScifi(usItem))
{
gMercProfiles[ubMercID].inv[i] = 0;
continue;
}
if (reducedGuns && ItemIsOnlyInTonsOfGuns(usItem))
{
gMercProfiles[ubMercID].inv[i] = 0;
continue;
}
//if its a valid item AND we are only displaying less then 8 items
if( usItem && ubItemCount < WEAPONBOX_TOTAL_ITEMS )
{
@@ -1662,6 +1676,18 @@ BOOLEAN DisplayMercsInventory(UINT8 ubMercID)
{
usItem = gMercProfiles[ubMercID].inv[ i ];
if (realisticGameStyle && ItemIsOnlyInScifi(usItem))
{
gMercProfiles[ubMercID].inv[i] = 0;
continue;
}
if (reducedGuns && ItemIsOnlyInTonsOfGuns(usItem))
{
gMercProfiles[ubMercID].inv[i] = 0;
continue;
}
//if its a valid item AND we are only displaying less then 8 items
if( usItem && ubItemCount < WEAPONBOX_NUMBER )
{