Add check for vest position attachments

This commit is contained in:
Asdow
2025-03-06 17:39:35 +02:00
parent 586a46bb78
commit 4823ef4929
3 changed files with 22 additions and 2 deletions
+12
View File
@@ -258,6 +258,18 @@ bool Filter::Match(SOLDIERTYPE* pSoldier) {
case REQ_LEGPOSATTACHMENT3: case REQ_LEGPOSATTACHMENT3:
cmp_val = CompareAttachment(pSoldier, LEGPOS, 3); cmp_val = CompareAttachment(pSoldier, LEGPOS, 3);
break; break;
case REQ_VESTPOSATTACHMENT0:
cmp_val = CompareAttachment( pSoldier, VESTPOS, 0 );
break;
case REQ_VESTPOSATTACHMENT1:
cmp_val = CompareAttachment( pSoldier, VESTPOS, 1 );
break;
case REQ_VESTPOSATTACHMENT2:
cmp_val = CompareAttachment( pSoldier, VESTPOS, 2 );
break;
case REQ_VESTPOSATTACHMENT3:
cmp_val = CompareAttachment( pSoldier, VESTPOS, 3 );
break;
default: default:
if (q < NUM_REQTYPESINV) { if (q < NUM_REQTYPESINV) {
cmp_val = pSoldier->inv[q].usItem; cmp_val = pSoldier->inv[q].usItem;
+4
View File
@@ -75,6 +75,10 @@ public:
REQ_LEGPOSATTACHMENT1, REQ_LEGPOSATTACHMENT1,
REQ_LEGPOSATTACHMENT2, REQ_LEGPOSATTACHMENT2,
REQ_LEGPOSATTACHMENT3, REQ_LEGPOSATTACHMENT3,
REQ_VESTPOSATTACHMENT0,
REQ_VESTPOSATTACHMENT1,
REQ_VESTPOSATTACHMENT2,
REQ_VESTPOSATTACHMENT3,
NUM_REQTYPES, NUM_REQTYPES,
// 3rd byte is for operator flags // 3rd byte is for operator flags
_REQ_BTWN = 0x20000, _REQ_BTWN = 0x20000,
+6 -2
View File
@@ -270,7 +270,7 @@ namespace LogicalBodyTypes {
/***************************************** /*****************************************
Filter enum criterion types Filter enum criterion types
******************************************/ ******************************************/
LOGBT_ENUMDB_ADD("IntegerFilterCriterionTypes", 43, LOGBT_ENUMDB_ADD("IntegerFilterCriterionTypes", 47,
Filter::REQ_HELMETPOS, Filter::REQ_HELMETPOS,
Filter::REQ_VESTPOS, Filter::REQ_VESTPOS,
Filter::REQ_LEGPOS, Filter::REQ_LEGPOS,
@@ -313,7 +313,11 @@ namespace LogicalBodyTypes {
Filter::REQ_LEGPOSATTACHMENT0, Filter::REQ_LEGPOSATTACHMENT0,
Filter::REQ_LEGPOSATTACHMENT1, Filter::REQ_LEGPOSATTACHMENT1,
Filter::REQ_LEGPOSATTACHMENT2, Filter::REQ_LEGPOSATTACHMENT2,
Filter::REQ_LEGPOSATTACHMENT3 Filter::REQ_LEGPOSATTACHMENT3,
Filter::REQ_VESTPOSATTACHMENT0,
Filter::REQ_VESTPOSATTACHMENT1,
Filter::REQ_VESTPOSATTACHMENT2,
Filter::REQ_VESTPOSATTACHMENT3
); );
/***************************************** /*****************************************