1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use FLAGS64 for flagmasks

Browse Source
This commit is contained in:
Asdow
2025-08-08 17:42:25 +03:00
parent c78f8faefc
commit b7bfd8a2eb
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Item Types.h
+2 -2
View File
@@ -1052,8 +1052,8 @@ typedef struct
UINT64 nasLayoutClass; UINT64 nasLayoutClass;
UINT64 ulAvailableAttachmentPoint; UINT64 ulAvailableAttachmentPoint;
UINT64 ulAttachmentPoint; UINT64 ulAttachmentPoint;
UINT64 usItemFlag; // bitflags to store various item properties (better than introducing 64 BOOLEAN values). If I only had thought of this earlier.... FLAGS64 usItemFlag; // bitflags to store various item properties (better than introducing 64 BOOLEAN values). If I only had thought of this earlier....
UINT64 usItemFlag2; // bitflags to store various item properties FLAGS64 usItemFlag2; // bitflags to store various item properties
UINT32 uiIndex; UINT32 uiIndex;
UINT32 usItemClass; UINT32 usItemClass;
Tactical/Items.cpp
+3 -3
View File
@@ -15249,18 +15249,18 @@ void CheckBombSpecifics( OBJECTTYPE * pObj, INT8* detonatortype, INT8* setting,
} }
// Flugente: check for specific flags // Flugente: check for specific flags
BOOLEAN HasItemFlag( UINT16 usItem, UINT64 aFlag ) BOOLEAN HasItemFlag( UINT16 usItem, FLAGS64 aFlag )
{ {
return( (Item[usItem].usItemFlag & aFlag) != 0 ); return( (Item[usItem].usItemFlag & aFlag) != 0 );
} }
BOOLEAN HasItemFlag2(UINT16 usItem, UINT64 aFlag) BOOLEAN HasItemFlag2(UINT16 usItem, FLAGS64 aFlag)
{ {
return((Item[usItem].usItemFlag2 & aFlag) != 0); return((Item[usItem].usItemFlag2 & aFlag) != 0);
} }
// Flugente: get first item number that has this flag. Use with caution, as we search in all items // Flugente: get first item number that has this flag. Use with caution, as we search in all items
BOOLEAN GetFirstItemWithFlag( UINT16* pusItem, UINT64 aFlag ) BOOLEAN GetFirstItemWithFlag( UINT16* pusItem, FLAGS64 aFlag )
{ {
UINT16 i; UINT16 i;
for ( i = 1; i < gMAXITEMS_READ; ++i ) for ( i = 1; i < gMAXITEMS_READ; ++i )
Tactical/Items.h
+3 -3
View File
@@ -566,11 +566,11 @@ UINT64 GetAvailableAttachmentPoint ( OBJECTTYPE * pObject, UINT8 subObject );
void CheckBombSpecifics( OBJECTTYPE * pObj, INT8* detonatortype, INT8* setting, INT8* defusefrequency ); void CheckBombSpecifics( OBJECTTYPE * pObj, INT8* detonatortype, INT8* setting, INT8* defusefrequency );
// Flugente: check for specific flags // Flugente: check for specific flags
BOOLEAN HasItemFlag(UINT16 usItem, UINT64 aFlag); BOOLEAN HasItemFlag(UINT16 usItem, FLAGS64 aFlag);
BOOLEAN HasItemFlag2(UINT16 usItem, UINT64 aFlag); BOOLEAN HasItemFlag2(UINT16 usItem, FLAGS64 aFlag);
// Flugente: get first item number that has this flag. Use with caution, as we search in all items // Flugente: get first item number that has this flag. Use with caution, as we search in all items
BOOLEAN GetFirstItemWithFlag( UINT16* pusItem, UINT64 aFlag ); BOOLEAN GetFirstItemWithFlag( UINT16* pusItem, FLAGS64 aFlag );
// Flugente: check if this object is currently fed from an external source (belts in inventory, other mercs) // Flugente: check if this object is currently fed from an external source (belts in inventory, other mercs)
BOOLEAN ObjectIsBeingFedExternal(SOLDIERTYPE* pSoldier, OBJECTTYPE * pObject); BOOLEAN ObjectIsBeingFedExternal(SOLDIERTYPE* pSoldier, OBJECTTYPE * pObject);