From 8fa344a084aeece8573f2bf9987b37f435576923 Mon Sep 17 00:00:00 2001 From: Brues <5278969+brues-code@users.noreply.github.com> Date: Sat, 8 Aug 2026 15:08:34 -0500 Subject: [PATCH] refactor(item): name CGItem deref idioms via Item::InstanceBlock / ObjectFields Add item/CGItem.{h,cpp} with two null-safe accessors for a CGItem's two descriptor-like pointers: InstanceBlock(cgItem) -> CGItem + 0x08 (item GUID @ +0, itemID @ +0x0C) ObjectFields(cgItem) -> CGItem + 0x114 (stack/flags/charges/durability/...) Replace the 30 hand-written `*reinterpret_cast(x + OFF_ITEM_INSTANCE_BLOCK/OFF_ITEM_DESCRIPTOR)` derefs across 24 files with these calls. Behavior-preserving: same deref, all reads were already const, and each site keeps its own null-check and field reads. Helpers add a cgItem null guard (strictly safer). --- src/auctionhouse/PostItem.cpp | 7 +++---- src/container/ItemInfo.cpp | 7 +++---- src/equipmentset/Api.cpp | 4 ++-- src/item/Bound.cpp | 4 ++-- src/item/CGItem.cpp | 34 +++++++++++++++++++++++++++++++ src/item/CGItem.h | 38 +++++++++++++++++++++++++++++++++++ src/item/Charges.cpp | 4 ++-- src/item/Count.cpp | 7 +++---- src/item/Cursor.cpp | 4 ++-- src/item/Data.cpp | 4 ++-- src/item/Durability.cpp | 4 ++-- src/item/GUID.cpp | 4 ++-- src/item/ID.cpp | 4 ++-- src/item/InventoryID.cpp | 4 ++-- src/item/Location.cpp | 4 ++-- src/item/Lock.cpp | 4 ++-- src/item/NewItems.cpp | 4 ++-- src/item/Openable.cpp | 4 ++-- src/item/StackCount.cpp | 4 ++-- src/item/Swap.cpp | 7 +++---- src/item/WeaponEnchant.cpp | 4 ++-- src/merchant/Frame.cpp | 7 +++---- src/player/Equipment.cpp | 4 ++-- src/spell/BonusDamage.cpp | 4 ++-- src/spell/Usable.cpp | 4 ++-- src/tooltip/CompareItem.cpp | 7 +++---- 26 files changed, 126 insertions(+), 60 deletions(-) create mode 100644 src/item/CGItem.cpp create mode 100644 src/item/CGItem.h diff --git a/src/auctionhouse/PostItem.cpp b/src/auctionhouse/PostItem.cpp index a828c512..cead3267 100644 --- a/src/auctionhouse/PostItem.cpp +++ b/src/auctionhouse/PostItem.cpp @@ -55,6 +55,7 @@ #include "Game.h" #include "Offsets.h" #include "event/Custom.h" +#include "item/CGItem.h" #include "item/ID.h" #include "item/Location.h" #include "item/Swap.h" @@ -108,16 +109,14 @@ const uint8_t *PeekItemRecord(uint32_t itemID) { } int CGItemCount(const uint8_t *item) { - auto *desc = *reinterpret_cast( - item + Offsets::OFF_ITEM_DESCRIPTOR); + auto *desc = Item::ObjectFields(item); if (desc == nullptr) return 0; return *reinterpret_cast(desc + Offsets::OFF_DESCRIPTOR_STACK_COUNT); } uint64_t CGItemGuid(const uint8_t *item) { - auto *inst = *reinterpret_cast( - item + Offsets::OFF_ITEM_INSTANCE_BLOCK); + auto *inst = Item::InstanceBlock(item); if (inst == nullptr) return 0; return *reinterpret_cast(inst + Offsets::OFF_INSTANCE_BLOCK_GUID); diff --git a/src/container/ItemInfo.cpp b/src/container/ItemInfo.cpp index 5b5389eb..d041541b 100644 --- a/src/container/ItemInfo.cpp +++ b/src/container/ItemInfo.cpp @@ -50,6 +50,7 @@ #include "Game.h" #include "Offsets.h" #include "dbc/Lookup.h" +#include "item/CGItem.h" #include "item/ID.h" #include "item/Link.h" #include "item/Location.h" @@ -80,8 +81,7 @@ bool ItemReadable(const uint8_t *item, const uint8_t *record) { if (record != nullptr && *reinterpret_cast(record + Offsets::OFF_ITEMSTATS_PAGE_TEXT) != 0) return true; - const uint8_t *descriptor = *reinterpret_cast( - item + Offsets::OFF_ITEM_DESCRIPTOR); + const uint8_t *descriptor = Item::ObjectFields(item); return descriptor != nullptr && *reinterpret_cast( descriptor + Offsets::OFF_DESCRIPTOR_READABLE_TEXT_ID) != 0; @@ -111,8 +111,7 @@ int __fastcall Script_C_Container_GetContainerItemInfo(void *L) { : nullptr; // Live per-instance descriptor fields. - const uint8_t *descriptor = *reinterpret_cast( - item + Offsets::OFF_ITEM_DESCRIPTOR); + const uint8_t *descriptor = Item::ObjectFields(item); int stackCount = 0; bool isBound = false; if (descriptor != nullptr) { diff --git a/src/equipmentset/Api.cpp b/src/equipmentset/Api.cpp index 9496126b..ac2a4427 100644 --- a/src/equipmentset/Api.cpp +++ b/src/equipmentset/Api.cpp @@ -35,6 +35,7 @@ #include "Offsets.h" #include "Set.h" #include "event/Custom.h" +#include "item/CGItem.h" #include "item/Location.h" #include "item/Swap.h" @@ -72,8 +73,7 @@ const char *ArgString(void *L, int idx) { int ResolveItemID(const uint8_t *cgItem) { if (cgItem == nullptr) return 0; - auto *instance = *reinterpret_cast( - cgItem + Offsets::OFF_ITEM_INSTANCE_BLOCK); + auto *instance = Item::InstanceBlock(cgItem); if (instance == nullptr) return 0; return static_cast(*reinterpret_cast( diff --git a/src/item/Bound.cpp b/src/item/Bound.cpp index 971ce57b..a70e2aef 100644 --- a/src/item/Bound.cpp +++ b/src/item/Bound.cpp @@ -13,6 +13,7 @@ #include "Game.h" #include "Offsets.h" +#include "item/CGItem.h" #include "item/Location.h" #include @@ -20,8 +21,7 @@ namespace Item::Bound { static bool ItemIsSoulbound(const uint8_t *item) { - auto *descriptor = *reinterpret_cast( - item + Offsets::OFF_ITEM_DESCRIPTOR); + auto *descriptor = Item::ObjectFields(item); if (descriptor == nullptr) return false; const uint32_t flags = *reinterpret_cast( diff --git a/src/item/CGItem.cpp b/src/item/CGItem.cpp new file mode 100644 index 00000000..634d9abf --- /dev/null +++ b/src/item/CGItem.cpp @@ -0,0 +1,34 @@ +// This file is part of ClassicAPI. +// +// ClassicAPI is free software: you can redistribute it and/or modify it under the terms +// of the GNU General Public License as published by the Free Software Foundation, either +// version 3 of the License, or (at your option) any later version. +// +// ClassicAPI is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. See the GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along with +// ClassicAPI. If not, see . + +#include "CGItem.h" + +#include "Offsets.h" + +namespace Item { + +const uint8_t *InstanceBlock(const uint8_t *cgItem) { + if (cgItem == nullptr) + return nullptr; + return *reinterpret_cast( + cgItem + Offsets::OFF_ITEM_INSTANCE_BLOCK); +} + +const uint8_t *ObjectFields(const uint8_t *cgItem) { + if (cgItem == nullptr) + return nullptr; + return *reinterpret_cast( + cgItem + Offsets::OFF_ITEM_DESCRIPTOR); +} + +} // namespace Item diff --git a/src/item/CGItem.h b/src/item/CGItem.h new file mode 100644 index 00000000..aa609776 --- /dev/null +++ b/src/item/CGItem.h @@ -0,0 +1,38 @@ +// This file is part of ClassicAPI. +// +// ClassicAPI is free software: you can redistribute it and/or modify it under the terms +// of the GNU General Public License as published by the Free Software Foundation, either +// version 3 of the License, or (at your option) any later version. +// +// ClassicAPI is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +// PURPOSE. See the GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along with +// ClassicAPI. If not, see . + +#pragma once + +#include + +// Accessors for a `CGItem`'s two descriptor-like pointers (see the "Item +// lookups" notes in CLAUDE.md). Every item module used to spell out the same +// `*reinterpret_cast(cgItem + OFF_...)` deref; these +// name it once. + +namespace Item { + +// The item's **instance block** (`CGItem + 0x08` dereferenced): a `uint64` +// item GUID at `+0x00` and the `uint32` itemID at `+0x0C`. This is the block +// the canonical inventory→cache path reads the itemID from. Returns nullptr +// for a null `cgItem`; the stored pointer itself may still be null (callers +// null-check the result before reading fields). +const uint8_t *InstanceBlock(const uint8_t *cgItem); + +// The item's **m_objectFields descriptor** (`CGItem + 0x114` dereferenced): +// the UpdateField block holding stack count (`+0x20`), flags (`+0x3C`), +// spell charges (`+0x28`), durability (`+0xA0`), enchantments, etc. Distinct +// from the instance block. Returns nullptr for a null `cgItem`. +const uint8_t *ObjectFields(const uint8_t *cgItem); + +} // namespace Item diff --git a/src/item/Charges.cpp b/src/item/Charges.cpp index e002d095..79778582 100644 --- a/src/item/Charges.cpp +++ b/src/item/Charges.cpp @@ -15,6 +15,7 @@ #include "../Game.h" #include "../Offsets.h" +#include "CGItem.h" #include @@ -23,8 +24,7 @@ namespace Item::Charges { int PushChargesForItem(void *L, const uint8_t *item) { if (item == nullptr) return 0; - auto *descriptor = *reinterpret_cast( - item + Offsets::OFF_ITEM_DESCRIPTOR); + auto *descriptor = Item::ObjectFields(item); if (descriptor == nullptr) return 0; const int32_t stack = static_cast(*reinterpret_cast( diff --git a/src/item/Count.cpp b/src/item/Count.cpp index c03a93a1..b1faef03 100644 --- a/src/item/Count.cpp +++ b/src/item/Count.cpp @@ -16,6 +16,7 @@ #include "Game.h" #include "Offsets.h" #include "item/Arg.h" +#include "item/CGItem.h" #include "item/ID.h" #include "item/Location.h" #include "object/Resolve.h" @@ -33,8 +34,7 @@ namespace { int GetStackCount(const uint8_t *cgItem) { if (cgItem == nullptr) return 0; - auto *descriptor = *reinterpret_cast( - cgItem + Offsets::OFF_ITEM_DESCRIPTOR); + auto *descriptor = Item::ObjectFields(cgItem); if (descriptor == nullptr) return 0; return static_cast(*reinterpret_cast( @@ -52,8 +52,7 @@ int GetStackCount(const uint8_t *cgItem) { int GetUsesPerItem(const uint8_t *cgItem) { if (cgItem == nullptr) return 1; - auto *descriptor = *reinterpret_cast( - cgItem + Offsets::OFF_ITEM_DESCRIPTOR); + auto *descriptor = Item::ObjectFields(cgItem); if (descriptor == nullptr) return 1; const int32_t raw = *reinterpret_cast( diff --git a/src/item/Cursor.cpp b/src/item/Cursor.cpp index 37c2f42a..716047c6 100644 --- a/src/item/Cursor.cpp +++ b/src/item/Cursor.cpp @@ -16,6 +16,7 @@ #include "Game.h" #include "Offsets.h" #include "cursor/Info.h" +#include "item/CGItem.h" #include "item/Location.h" #include @@ -44,8 +45,7 @@ bool ItemLocked(const uint8_t *item) { // Reads a CGItem's 64-bit instance GUID into lo/hi. False if the instance // block pointer is absent. bool ReadItemGuid(const uint8_t *item, uint32_t *lo, uint32_t *hi) { - auto *instance = *reinterpret_cast( - item + Offsets::OFF_ITEM_INSTANCE_BLOCK); + auto *instance = Item::InstanceBlock(item); if (instance == nullptr) return false; *lo = *reinterpret_cast(instance + Offsets::OFF_INSTANCE_BLOCK_GUID); diff --git a/src/item/Data.cpp b/src/item/Data.cpp index 15181be9..d4ab2209 100644 --- a/src/item/Data.cpp +++ b/src/item/Data.cpp @@ -15,6 +15,7 @@ #include "Offsets.h" #include "event/Custom.h" #include "item/Arg.h" +#include "item/CGItem.h" #include "item/Data.h" #include "item/Location.h" #include "tick/WorldTick.h" @@ -119,8 +120,7 @@ static int ResolveLocationToItemID(void *L, int idx) { const uint8_t *item = Item::Location::Resolve(L, idx); if (item == nullptr) return 0; - auto *instance = *reinterpret_cast( - item + Offsets::OFF_ITEM_INSTANCE_BLOCK); + auto *instance = Item::InstanceBlock(item); if (instance == nullptr) return 0; return static_cast(*reinterpret_cast( diff --git a/src/item/Durability.cpp b/src/item/Durability.cpp index 69a38c63..e234077c 100644 --- a/src/item/Durability.cpp +++ b/src/item/Durability.cpp @@ -15,6 +15,7 @@ #include "Game.h" #include "Offsets.h" +#include "item/CGItem.h" #include "item/Location.h" #include @@ -34,8 +35,7 @@ namespace Item::Durability { int PushDurabilityForItem(void *L, const uint8_t *item) { if (item == nullptr) return 0; - auto *descriptor = *reinterpret_cast( - item + Offsets::OFF_ITEM_DESCRIPTOR); + auto *descriptor = Item::ObjectFields(item); if (descriptor == nullptr) return 0; const uint32_t cur = *reinterpret_cast( diff --git a/src/item/GUID.cpp b/src/item/GUID.cpp index dd4cd8cf..41bd7a29 100644 --- a/src/item/GUID.cpp +++ b/src/item/GUID.cpp @@ -14,6 +14,7 @@ #include "Game.h" #include "Offsets.h" #include "guid/Guid.h" +#include "item/CGItem.h" #include "item/Location.h" #include @@ -27,8 +28,7 @@ namespace { uint64_t ReadItemGuid(const uint8_t *cgItem) { if (cgItem == nullptr) return 0; - auto *instance = *reinterpret_cast( - cgItem + Offsets::OFF_ITEM_INSTANCE_BLOCK); + auto *instance = Item::InstanceBlock(cgItem); if (instance == nullptr) return 0; return *reinterpret_cast( diff --git a/src/item/ID.cpp b/src/item/ID.cpp index 46f79065..899539e9 100644 --- a/src/item/ID.cpp +++ b/src/item/ID.cpp @@ -13,6 +13,7 @@ #include "Game.h" #include "Offsets.h" +#include "item/CGItem.h" #include "item/ID.h" #include "item/Location.h" @@ -23,8 +24,7 @@ namespace Item::ID { int FromCGItem(const uint8_t *item) { if (item == nullptr) return 0; - auto *instance = *reinterpret_cast( - item + Offsets::OFF_ITEM_INSTANCE_BLOCK); + auto *instance = Item::InstanceBlock(item); if (instance == nullptr) return 0; return static_cast(*reinterpret_cast( diff --git a/src/item/InventoryID.cpp b/src/item/InventoryID.cpp index 21b35fcf..55647065 100644 --- a/src/item/InventoryID.cpp +++ b/src/item/InventoryID.cpp @@ -13,6 +13,7 @@ #include "Game.h" #include "Offsets.h" +#include "item/CGItem.h" #include "unit/Flags.h" #include @@ -41,8 +42,7 @@ int ItemIDForLocalPlayer(void *playerPtr, int slot1Based) { auto *item = static_cast(getBySlot(invMgr, slot1Based - 1)); if (item == nullptr) return 0; - auto *instance = *reinterpret_cast( - item + Offsets::OFF_ITEM_INSTANCE_BLOCK); + auto *instance = Item::InstanceBlock(item); if (instance == nullptr) return 0; return static_cast(*reinterpret_cast( diff --git a/src/item/Location.cpp b/src/item/Location.cpp index 8d61c8b8..c629dc3e 100644 --- a/src/item/Location.cpp +++ b/src/item/Location.cpp @@ -19,6 +19,7 @@ #include "../object/Resolve.h" #include "../unit/Identity.h" #include "Arg.h" +#include "CGItem.h" #include "ID.h" #include "Link.h" @@ -65,8 +66,7 @@ const uint8_t *PeekItemRecord(uint32_t itemID) { } uint64_t ReadCGItemGUID(const uint8_t *item) { - auto *instance = *reinterpret_cast( - item + Offsets::OFF_ITEM_INSTANCE_BLOCK); + auto *instance = Item::InstanceBlock(item); if (instance == nullptr) return 0; return *reinterpret_cast( diff --git a/src/item/Lock.cpp b/src/item/Lock.cpp index f973e611..e8a5c603 100644 --- a/src/item/Lock.cpp +++ b/src/item/Lock.cpp @@ -32,6 +32,7 @@ #include "Game.h" #include "Offsets.h" #include "guid/Guid.h" +#include "item/CGItem.h" #include "item/Location.h" #include @@ -54,8 +55,7 @@ using UnlockAll_t = void(__cdecl *)(); bool ReadItemGuid(const uint8_t *item, uint32_t *lo, uint32_t *hi) { if (item == nullptr) return false; - auto *inst = *reinterpret_cast( - item + Offsets::OFF_ITEM_INSTANCE_BLOCK); + auto *inst = Item::InstanceBlock(item); if (inst == nullptr) return false; *lo = *reinterpret_cast(inst + Offsets::OFF_INSTANCE_BLOCK_GUID); diff --git a/src/item/NewItems.cpp b/src/item/NewItems.cpp index fc28b4a0..740c9f27 100644 --- a/src/item/NewItems.cpp +++ b/src/item/NewItems.cpp @@ -75,6 +75,7 @@ #include "Offsets.h" #include "bag/UpdateDelayed.h" #include "event/Custom.h" +#include "item/CGItem.h" #include "item/Location.h" #include "object/Resolve.h" #include "tick/WorldTick.h" @@ -197,8 +198,7 @@ bool RemoveFrom(uint64_t *arr, int *count, uint64_t guid) { uint64_t ItemGUID(const uint8_t *item) { if (item == nullptr) return 0; - auto *instance = *reinterpret_cast( - item + Offsets::OFF_ITEM_INSTANCE_BLOCK); + auto *instance = Item::InstanceBlock(item); if (instance == nullptr) return 0; return *reinterpret_cast( diff --git a/src/item/Openable.cpp b/src/item/Openable.cpp index 41db28e7..f0e0259e 100644 --- a/src/item/Openable.cpp +++ b/src/item/Openable.cpp @@ -27,6 +27,7 @@ #include "Game.h" #include "Offsets.h" +#include "item/CGItem.h" #include "item/Data.h" #include "item/ID.h" #include "item/Location.h" @@ -59,8 +60,7 @@ namespace { uint32_t InstanceFlags(const uint8_t *cgItem) { if (cgItem == nullptr) return 0; - auto *descriptor = *reinterpret_cast( - cgItem + Offsets::OFF_ITEM_DESCRIPTOR); + auto *descriptor = Item::ObjectFields(cgItem); if (descriptor == nullptr) return 0; return *reinterpret_cast( diff --git a/src/item/StackCount.cpp b/src/item/StackCount.cpp index 78d40511..df1161ca 100644 --- a/src/item/StackCount.cpp +++ b/src/item/StackCount.cpp @@ -20,6 +20,7 @@ #include "Game.h" #include "Offsets.h" +#include "item/CGItem.h" #include "item/Location.h" #include @@ -36,8 +37,7 @@ static int __fastcall Script_GetStackCount(void *L) { Game::Lua::PushNumber(L, 0.0); return 1; } - auto *descriptor = *reinterpret_cast( - item + Offsets::OFF_ITEM_DESCRIPTOR); + auto *descriptor = Item::ObjectFields(item); if (descriptor == nullptr) { Game::Lua::PushNumber(L, 0.0); return 1; diff --git a/src/item/Swap.cpp b/src/item/Swap.cpp index dc21703e..e337511f 100644 --- a/src/item/Swap.cpp +++ b/src/item/Swap.cpp @@ -15,6 +15,7 @@ #include "Game.h" #include "Offsets.h" +#include "item/CGItem.h" #include "item/Location.h" #include "unit/Identity.h" @@ -40,8 +41,7 @@ bool ReadGuid(const void *cgObject, uint32_t *lo, uint32_t *hi) { if (cgObject == nullptr) return false; auto *base = static_cast(cgObject); - auto *inst = *reinterpret_cast( - base + Offsets::OFF_ITEM_INSTANCE_BLOCK); + auto *inst = Item::InstanceBlock(base); if (inst == nullptr) return false; *lo = *reinterpret_cast(inst + Offsets::OFF_INSTANCE_BLOCK_GUID); @@ -257,8 +257,7 @@ bool MoveCount(void *L, int srcBag, int srcSlot, int dstBag, int dstSlot, int co // server treats as a merge for same-item destinations (up to // maxStack). Route there for count == srcStack so callers don't // have to special-case "move everything". - auto *srcDescriptor = *reinterpret_cast( - srcItem + Offsets::OFF_ITEM_DESCRIPTOR); + auto *srcDescriptor = Item::ObjectFields(srcItem); const int srcStack = srcDescriptor == nullptr ? 0 : static_cast(*reinterpret_cast( srcDescriptor + Offsets::OFF_DESCRIPTOR_STACK_COUNT)); diff --git a/src/item/WeaponEnchant.cpp b/src/item/WeaponEnchant.cpp index 4aecd272..60bc7cf2 100644 --- a/src/item/WeaponEnchant.cpp +++ b/src/item/WeaponEnchant.cpp @@ -13,6 +13,7 @@ #include "Game.h" #include "Offsets.h" +#include "item/CGItem.h" #include "item/Location.h" #include @@ -52,8 +53,7 @@ EnchantInfo ReadTempEnchant(int paperdollSlot) { const uint8_t *item = Item::Location::ResolveEquipmentSlot(paperdollSlot); if (item == nullptr) return r; - auto *desc = *reinterpret_cast( - item + Offsets::OFF_ITEM_DESCRIPTOR); + auto *desc = Item::ObjectFields(item); if (desc == nullptr) return r; auto *slot = reinterpret_cast(desc + OFF_TEMP_ENCHANT_SLOT); diff --git a/src/merchant/Frame.cpp b/src/merchant/Frame.cpp index d5ee49c2..3898df98 100644 --- a/src/merchant/Frame.cpp +++ b/src/merchant/Frame.cpp @@ -32,6 +32,7 @@ #include "Game.h" #include "Offsets.h" +#include "item/CGItem.h" #include "item/Location.h" #include "unit/Identity.h" #include "tick/WorldTick.h" @@ -63,8 +64,7 @@ bool MerchantOpen(uint32_t &outGuidLo, uint32_t &outGuidHi) { int ItemIDFromCGItem(const uint8_t *cgItem) { if (cgItem == nullptr) return 0; - auto *instance = *reinterpret_cast( - cgItem + Offsets::OFF_ITEM_INSTANCE_BLOCK); + auto *instance = Item::InstanceBlock(cgItem); if (instance == nullptr) return 0; return static_cast(*reinterpret_cast( @@ -75,8 +75,7 @@ int ItemIDFromCGItem(const uint8_t *cgItem) { uint64_t ItemGUIDFromCGItem(const uint8_t *cgItem) { if (cgItem == nullptr) return 0; - auto *instance = *reinterpret_cast( - cgItem + Offsets::OFF_ITEM_INSTANCE_BLOCK); + auto *instance = Item::InstanceBlock(cgItem); if (instance == nullptr) return 0; return *reinterpret_cast( diff --git a/src/player/Equipment.cpp b/src/player/Equipment.cpp index a8041829..9dce0613 100644 --- a/src/player/Equipment.cpp +++ b/src/player/Equipment.cpp @@ -54,6 +54,7 @@ #include "Offsets.h" #include "equipmentset/Locations.h" #include "event/Custom.h" +#include "item/CGItem.h" #include "object/Resolve.h" #include "player/StatSignal.h" #include "unit/Identity.h" @@ -193,8 +194,7 @@ uint32_t ItemDurability(uint64_t guid) { const uint8_t *item = EquipmentSet::Locations::ResolveItemByGUID(guid); if (item == nullptr) return 0; - const uint8_t *descriptor = *reinterpret_cast( - item + Offsets::OFF_ITEM_DESCRIPTOR); + const uint8_t *descriptor = Item::ObjectFields(item); if (descriptor == nullptr) return 0; return *reinterpret_cast( diff --git a/src/spell/BonusDamage.cpp b/src/spell/BonusDamage.cpp index 3848fcd3..22db6230 100644 --- a/src/spell/BonusDamage.cpp +++ b/src/spell/BonusDamage.cpp @@ -59,6 +59,7 @@ #include "Game.h" #include "Offsets.h" #include "dbc/Lookup.h" +#include "item/CGItem.h" #include "item/ID.h" #include "item/Location.h" #include "item/StatAccum.h" @@ -121,8 +122,7 @@ long ItemFlatHealing(const uint8_t *cgItem) { Item::StatAccum::AccumulateRecord( acc, Item::StatAccum::FetchRecord(static_cast(itemID)), +1); - auto *desc = *reinterpret_cast( - cgItem + Offsets::OFF_ITEM_DESCRIPTOR); + auto *desc = Item::ObjectFields(cgItem); if (desc != nullptr) { // Random suffix ("… of Restoration") + applied permanent (slot 0) and // temporary (slot 1) enchants (Healing Power, Mana Oil, …). diff --git a/src/spell/Usable.cpp b/src/spell/Usable.cpp index 6df66e11..21f4d052 100644 --- a/src/spell/Usable.cpp +++ b/src/spell/Usable.cpp @@ -13,6 +13,7 @@ #include "Game.h" #include "Offsets.h" +#include "item/CGItem.h" #include "item/ID.h" #include "item/Location.h" #include "spell/Arg.h" @@ -97,8 +98,7 @@ int CountItemInBags(void *L, int targetItemID) { continue; if (Item::ID::FromCGItem(item) != targetItemID) continue; - auto *itemDesc = *reinterpret_cast( - item + Offsets::OFF_ITEM_DESCRIPTOR); + auto *itemDesc = Item::ObjectFields(item); if (itemDesc == nullptr) continue; total += static_cast(*reinterpret_cast( diff --git a/src/tooltip/CompareItem.cpp b/src/tooltip/CompareItem.cpp index cdc83b2a..94fb4a47 100644 --- a/src/tooltip/CompareItem.cpp +++ b/src/tooltip/CompareItem.cpp @@ -58,6 +58,7 @@ #include "Game.h" #include "Offsets.h" #include "item/Arg.h" +#include "item/CGItem.h" #include "item/ID.h" #include "item/Location.h" #include "item/StatAccum.h" @@ -490,8 +491,7 @@ void PrependCurrentlyEquipped(void *self, void *L) { // descriptor — the same index ItemRandomProperties.dbc / ApplyRandomSuffix // use. 0 for a plain item or a null descriptor. int EquippedSuffix(const uint8_t *item) { - auto *desc = *reinterpret_cast( - item + Offsets::OFF_ITEM_DESCRIPTOR); + auto *desc = Item::ObjectFields(item); if (desc == nullptr) return 0; return static_cast(*reinterpret_cast( @@ -499,8 +499,7 @@ int EquippedSuffix(const uint8_t *item) { } uint64_t EquippedGUID(const uint8_t *item) { - auto *instance = *reinterpret_cast( - item + Offsets::OFF_ITEM_INSTANCE_BLOCK); + auto *instance = Item::InstanceBlock(item); if (instance == nullptr) return 0; return *reinterpret_cast(