diff options
| author | Aetias <aetias@outlook.com> | 2024-02-18 13:24:49 +0100 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2024-02-18 13:24:49 +0100 |
| commit | f3d0b29b42954abe62eaf0a13259f3ebc6d8aa9c (patch) | |
| tree | 6b1ac43180753699355c3e88418734098f0383fe /include | |
| parent | 8f674d7f875e69e47d19623334881da80d399b46 (diff) | |
Decomp `ItemManager::RemoveItem`
Diffstat (limited to 'include')
| -rw-r--r-- | include/ItemManager.hpp | 2 | ||||
| -rw-r--r-- | include/global.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/ItemManager.hpp b/include/ItemManager.hpp index 07f726a4..4d213684 100644 --- a/include/ItemManager.hpp +++ b/include/ItemManager.hpp @@ -305,7 +305,7 @@ public: // Item
bool HasItem(ItemFlag item) const;
void AddItem(ItemFlag item);
- void RemoveItem(ItemFlag item);
+ void RemoveItem(s32 item);
void GiveItem(ItemId id, unk32 param2, unk32 param3);
void GiveEquipItem(ItemFlag item, u16 ammo);
diff --git a/include/global.h b/include/global.h index 28d2c481..53232a65 100644 --- a/include/global.h +++ b/include/global.h @@ -4,7 +4,8 @@ #define NULL 0 #define GET_FLAG(arr, pos) (((1 << ((pos) & 0x1f)) & (arr)[(pos) >> 5]) != 0) -#define SET_FLAG(arr, pos) ((arr)[(pos) >> 5] |= 1 << ((pos) & 0x1f)) +#define SET_FLAG(arr, pos) ((arr)[((u32(pos))) >> 5] |= 1 << ((pos) & 0x1f)) +#define RESET_FLAG(arr, pos) ((arr)[((u32)(pos)) >> 5] &= ~(1 << ((pos) & 0x1f))) #ifdef NONMATCHING #define NONMATCH |