diff --git a/src/auctionhouse/PostItem.cpp b/src/auctionhouse/PostItem.cpp index cead3267..ef4b360e 100644 --- a/src/auctionhouse/PostItem.cpp +++ b/src/auctionhouse/PostItem.cpp @@ -58,6 +58,7 @@ #include "item/CGItem.h" #include "item/ID.h" #include "item/Location.h" +#include "item/Record.h" #include "item/Swap.h" #include "tick/WorldTick.h" @@ -98,16 +99,6 @@ Job g_job{}; // --- small CGItem / cache readers --------------------------------------- -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - int CGItemCount(const uint8_t *item) { auto *desc = Item::ObjectFields(item); if (desc == nullptr) @@ -187,7 +178,7 @@ bool BagIsGeneral(int bag) { const int id = Item::ID::FromCGItem(bagItem); if (id == 0) return false; - const uint8_t *rec = PeekItemRecord(static_cast(id)); + const uint8_t *rec = Item::PeekRecord(static_cast(id)); if (rec == nullptr) return false; return *reinterpret_cast( diff --git a/src/container/FreeSlots.cpp b/src/container/FreeSlots.cpp index 3507d952..3752b2dd 100644 --- a/src/container/FreeSlots.cpp +++ b/src/container/FreeSlots.cpp @@ -16,6 +16,7 @@ #include "item/BagFamily.h" #include "item/ID.h" #include "item/Location.h" +#include "item/Record.h" #include @@ -23,21 +24,6 @@ namespace Container::FreeSlots { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); - -// Same `Peek the item cache without firing a query` shape as -// `Item::Info::FetchItemRecord`. We don't share that helper because it's -// file-static there; copying the four-line lookup is simpler than -// promoting it to a header for one extra caller. -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - // Resolves the bag's metadata: total slot count + BagFamily bitfield. // // - bagID 0 (backpack) → (16, 0). Vanilla 1.12 backpack is fixed at 16 @@ -68,7 +54,7 @@ BagInfo ResolveBagInfo(int bagID) { if (itemID == 0) return {0, 0}; - auto *record = PeekItemRecord(static_cast(itemID)); + auto *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) return {0, 0}; diff --git a/src/container/ItemInfo.cpp b/src/container/ItemInfo.cpp index d041541b..4e028565 100644 --- a/src/container/ItemInfo.cpp +++ b/src/container/ItemInfo.cpp @@ -54,6 +54,7 @@ #include "item/ID.h" #include "item/Link.h" #include "item/Location.h" +#include "item/Record.h" #include "item/StatAccum.h" #include @@ -107,7 +108,7 @@ int __fastcall Script_C_Container_GetContainerItemInfo(void *L) { // them off the half-built table avoids any stack interleaving. --- const int itemID = Item::ID::FromCGItem(item); const uint8_t *record = (itemID > 0) - ? Item::StatAccum::FetchRecord(static_cast(itemID)) + ? Item::PeekRecord(static_cast(itemID)) : nullptr; // Live per-instance descriptor fields. diff --git a/src/cursor/Info.cpp b/src/cursor/Info.cpp index a8d5e047..0bc4fb5e 100644 --- a/src/cursor/Info.cpp +++ b/src/cursor/Info.cpp @@ -53,6 +53,7 @@ #include "item/Link.h" #include "item/Location.h" #include "item/QualityColor.h" +#include "item/Record.h" #include "spell/Lookup.h" #include @@ -140,17 +141,6 @@ int PushBagItemCursor(void *L) { return PushItem(L, cgItem); } -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); - -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - // Builds a basic `"|cffRRGGBB|Hitem:N:0:0:0|h[Name]|h|r"` link from // the cached ItemStats record for `itemID`. No enchant / random- // suffix decoration — the cursor only stores the bare itemID for @@ -158,7 +148,7 @@ const uint8_t *PeekItemRecord(uint32_t itemID) { // instance state from. Returns true and writes into `out` (size // `outSize`) on success; returns false if the item isn't cached. bool BuildBasicItemLink(uint32_t itemID, char *out, size_t outSize) { - const uint8_t *record = PeekItemRecord(itemID); + const uint8_t *record = Item::PeekRecord(itemID); if (record == nullptr) return false; const char *name = *reinterpret_cast( record + Offsets::OFF_ITEMSTATS_NAME); diff --git a/src/equipmentset/Tooltip.cpp b/src/equipmentset/Tooltip.cpp index 1709dcde..b0071021 100644 --- a/src/equipmentset/Tooltip.cpp +++ b/src/equipmentset/Tooltip.cpp @@ -52,6 +52,7 @@ #include "equipmentset/Data.h" #include "equipmentset/Locations.h" #include "equipmentset/Set.h" +#include "item/Record.h" #include @@ -108,17 +109,6 @@ struct Tally { uint32_t missingItemIDs[SLOT_COUNT]; }; -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); - -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - // Walks a set's slots, classifying each non-empty entry into the // equipped / in-inventory / ignored / missing buckets via // `Locations::FindGUID`. For missing slots, also records the saved @@ -215,7 +205,7 @@ int __fastcall Script_GameTooltipSetEquipmentSet(void *L) { unnamedMissing++; continue; } - auto *record = PeekItemRecord(id); + auto *record = Item::PeekRecord(id); if (record == nullptr) { unnamedMissing++; continue; diff --git a/src/item/AverageLevel.cpp b/src/item/AverageLevel.cpp index cb25519c..2b3bbb45 100644 --- a/src/item/AverageLevel.cpp +++ b/src/item/AverageLevel.cpp @@ -55,6 +55,7 @@ #include "item/Data.h" #include "item/ID.h" #include "item/Location.h" +#include "item/Record.h" #include "object/Resolve.h" #include "unit/Identity.h" @@ -66,10 +67,6 @@ namespace Item::AverageLevel { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); - // 1-based slot range used by both walks. constexpr int kFirstSlot = 1; constexpr int kLastSlot = 19; @@ -120,13 +117,6 @@ constexpr uint32_t kSlotMaskByInvType[29] = { constexpr int kInvTypeMax = static_cast(sizeof(kSlotMaskByInvType) / sizeof(kSlotMaskByInvType[0])) - 1; -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - // Returns (itemLevel, inventoryType) for the CGItem, or (0, 0) if // the itemID is unresolvable or the cache record hasn't loaded. struct ItemInfo { @@ -140,7 +130,7 @@ ItemInfo ReadItemInfo(const uint8_t *cgItem) { const int itemID = Item::ID::FromCGItem(cgItem); if (itemID <= 0) return {0, 0}; - const uint8_t *record = PeekItemRecord(static_cast(itemID)); + const uint8_t *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) { // Equipped or bagged item with no cache record yet — queue a // warmup so the next call gets populated data. Cheap on cache diff --git a/src/item/Consumable.cpp b/src/item/Consumable.cpp index faf9cf6f..40a4e651 100644 --- a/src/item/Consumable.cpp +++ b/src/item/Consumable.cpp @@ -34,6 +34,7 @@ #include "Game.h" #include "Offsets.h" #include "item/Arg.h" +#include "item/Record.h" #include @@ -41,17 +42,6 @@ namespace Item::Consumable { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); - -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - constexpr uint32_t kItemClassConsumable = 0; constexpr uint32_t kInvTypeAmmo = 24; // INVTYPE_AMMO constexpr uint32_t kInvTypeThrown = 25; // INVTYPE_THROWN @@ -62,7 +52,7 @@ int __fastcall Script_C_Item_IsConsumableItem(void *L) { Game::Lua::PushBoolean(L, 0); return 1; } - const uint8_t *record = PeekItemRecord(static_cast(itemID)); + const uint8_t *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) { Game::Lua::PushBoolean(L, 0); return 1; diff --git a/src/item/Equipment.cpp b/src/item/Equipment.cpp index 75378215..4163c789 100644 --- a/src/item/Equipment.cpp +++ b/src/item/Equipment.cpp @@ -17,6 +17,7 @@ #include "item/Cursor.h" #include "item/ID.h" #include "item/Location.h" +#include "item/Record.h" #include "item/Swap.h" #include @@ -25,20 +26,6 @@ namespace Item::Equipment { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); - -// Same item-cache peek pattern as `Item::Bag::PeekItemRecord` — we -// don't share because each caller is one-line-different and the -// helper isn't worth a header. -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - // `OffhandHasWeapon()` — true iff the player has a one-handed // weapon (or off-hand-only weapon) equipped in the off-hand slot. // Returns false for empty off-hand, shields, and held items @@ -64,7 +51,7 @@ int __fastcall Script_OffhandHasWeapon(void *L) { return 1; } - auto *record = PeekItemRecord(static_cast(itemID)); + auto *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) { Game::Lua::PushBoolean(L, 0); return 1; @@ -102,7 +89,7 @@ int __fastcall Script_C_Item_IsEquippableItem(void *L) { Game::Lua::PushBoolean(L, 0); return 1; } - auto *record = PeekItemRecord(static_cast(itemID)); + auto *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) { Game::Lua::PushBoolean(L, 0); return 1; diff --git a/src/item/GetData.cpp b/src/item/GetData.cpp index 250ca835..5cf01344 100644 --- a/src/item/GetData.cpp +++ b/src/item/GetData.cpp @@ -27,6 +27,7 @@ #include "item/Arg.h" #include "item/ID.h" #include "item/Location.h" +#include "item/Record.h" #include "item/Spell.h" #include @@ -36,17 +37,6 @@ namespace Item::GetData { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, bool requestIfMissing); - -const uint8_t *FetchItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, false); -} - int CurrentLocaleIndex() { return *reinterpret_cast(Offsets::VAR_LOCALE_INDEX); } @@ -377,7 +367,7 @@ int PushDataForItemID(void *L, int itemID) { Game::Lua::PushNil(L); return 1; } - const uint8_t *record = FetchItemRecord(static_cast(itemID)); + const uint8_t *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) { Game::Lua::PushNil(L); return 1; diff --git a/src/item/Info.cpp b/src/item/Info.cpp index 37567413..2273c93f 100644 --- a/src/item/Info.cpp +++ b/src/item/Info.cpp @@ -20,6 +20,7 @@ #include "item/ID.h" #include "item/Link.h" #include "item/Location.h" +#include "item/Record.h" #include #include @@ -27,21 +28,10 @@ namespace Item::Info { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, bool requestIfMissing); - static const char *PushedOrEmpty(const char *s) { return (s != nullptr && s[0] != 0) ? s : ""; } static int CurrentLocaleIndex() { return *reinterpret_cast(Offsets::VAR_LOCALE_INDEX); } -static const uint8_t *FetchItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, false); -} - static const char *LookupItemClassName(uint32_t classID) { return PushedOrEmpty(DBC::LocalizedField( Offsets::VAR_ITEMCLASS_RECORDS, Offsets::VAR_ITEMCLASS_COUNT, @@ -114,7 +104,7 @@ static int __fastcall Script_GetItemInfoInstant(void *L) { Game::Lua::PushNumber(L, static_cast(itemID)); - const uint8_t *record = FetchItemRecord(static_cast(itemID)); + const uint8_t *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) { for (int i = 0; i < 6; ++i) Game::Lua::PushNil(L); @@ -150,7 +140,7 @@ static int __fastcall Script_GetItemInfoInstant(void *L) { static int PushIconForItemID(void *L, int itemID) { if (itemID <= 0) return 0; - const uint8_t *record = FetchItemRecord(static_cast(itemID)); + const uint8_t *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) return 0; const uint32_t displayInfoID = *reinterpret_cast( @@ -229,7 +219,7 @@ static int __fastcall Script_C_Item_GetItemFamily(void *L) { const int itemID = Item::Arg::ResolveItemID(L, 1); if (itemID <= 0) return 0; - const uint8_t *record = FetchItemRecord(static_cast(itemID)); + const uint8_t *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) { Item::Data::WarmCache(static_cast(itemID)); return 0; @@ -264,7 +254,7 @@ static int __fastcall Script_C_Item_GetItemInfo(void *L) { if (itemID <= 0) return 0; - const uint8_t *record = FetchItemRecord(static_cast(itemID)); + const uint8_t *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) { Item::Data::WarmCache(static_cast(itemID)); return 0; // nil this call; GET_ITEM_INFO_RECEIVED fires when ready diff --git a/src/item/InventoryItemsForSlot.cpp b/src/item/InventoryItemsForSlot.cpp index 480d0926..cca950da 100644 --- a/src/item/InventoryItemsForSlot.cpp +++ b/src/item/InventoryItemsForSlot.cpp @@ -46,6 +46,7 @@ #include "item/ID.h" #include "item/Link.h" #include "item/Location.h" +#include "item/Record.h" #include #include @@ -54,10 +55,6 @@ namespace Item::InventoryItemsForSlot { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); - // invType → slot bitmask. Bit N (0-based) means "this item type fits // 1-based slot N+1". Values 0..28 cover every InventoryType // vanilla's Item.dbc emits. Indices outside this range read as 0 @@ -146,18 +143,11 @@ bool PlayerCanEquip(const uint8_t *record) { return PlayerHasProficiency(classCode, subclass); } -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - const uint8_t *ItemRecordForCGItem(const uint8_t *cgItem) { const int itemID = Item::ID::FromCGItem(cgItem); if (itemID <= 0) return nullptr; - return PeekItemRecord(static_cast(itemID)); + return Item::PeekRecord(static_cast(itemID)); } uint32_t ReadInventoryType(const uint8_t *record) { diff --git a/src/item/InventoryType.cpp b/src/item/InventoryType.cpp index a71e4dff..beba9a9c 100644 --- a/src/item/InventoryType.cpp +++ b/src/item/InventoryType.cpp @@ -17,6 +17,7 @@ #include "item/Data.h" #include "item/ID.h" #include "item/Location.h" +#include "item/Record.h" #include @@ -24,21 +25,10 @@ namespace Item::InventoryType { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); - -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - int PushInventoryTypeForItemID(void *L, int itemID) { if (itemID <= 0) return 0; - const uint8_t *record = PeekItemRecord(static_cast(itemID)); + const uint8_t *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) { Item::Data::WarmCache(static_cast(itemID)); return 0; diff --git a/src/item/Level.cpp b/src/item/Level.cpp index f9b4e632..ae139b05 100644 --- a/src/item/Level.cpp +++ b/src/item/Level.cpp @@ -17,6 +17,7 @@ #include "item/Data.h" #include "item/ID.h" #include "item/Location.h" +#include "item/Record.h" #include @@ -24,21 +25,10 @@ namespace Item::Level { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); - -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - int PushItemLevelForItemID(void *L, int itemID) { if (itemID <= 0) return 0; - const uint8_t *record = PeekItemRecord(static_cast(itemID)); + const uint8_t *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) { Item::Data::WarmCache(static_cast(itemID)); return 0; diff --git a/src/item/Link.cpp b/src/item/Link.cpp index 27db31ea..256ecf3d 100644 --- a/src/item/Link.cpp +++ b/src/item/Link.cpp @@ -17,6 +17,7 @@ #include "Offsets.h" #include "item/Location.h" #include "item/QualityColor.h" +#include "item/Record.h" #include #include @@ -34,20 +35,6 @@ using BuildInstanceName_t = void(__thiscall *)(const void *cgItem, char *out, using BuildNameFromID_t = void(__fastcall *)(char *out, unsigned outSize, uint32_t itemID, int suffixID); -// Cached ItemStats record lookup. Same `_GetRecord` pattern the rest of -// the codebase uses; passes a noop NULL callback so no SMSG fires for -// uncached items — caller treats "not cached" as a clean failure. -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int dedupFlag); - -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - } // namespace const char *FromCGItem(const uint8_t *cgItem) { @@ -80,7 +67,7 @@ bool NameFromIDSuffix(uint32_t itemID, int suffixID, char *out, size_t outSize) bool BasicFromIDSuffix(uint32_t itemID, int suffixID, char *out, size_t outSize) { if (out == nullptr || outSize == 0) return false; - const uint8_t *record = PeekItemRecord(itemID); + const uint8_t *record = Item::PeekRecord(itemID); if (record == nullptr) return false; char name[128]; diff --git a/src/item/Location.cpp b/src/item/Location.cpp index d2e19a25..6e98a13f 100644 --- a/src/item/Location.cpp +++ b/src/item/Location.cpp @@ -22,6 +22,7 @@ #include "CGItem.h" #include "ID.h" #include "Link.h" +#include "Record.h" #include @@ -32,9 +33,6 @@ namespace { using GetItemBySlot_t = void *(__thiscall *)(void *thisInvMgr, int slot); using PackBagSlot_t = int(__fastcall *)(void *L, void **outInvMgr, int *outLinearSlot, int *outUnused); -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); // Reads `loc.fieldName` and returns it as an int. Returns false via the // boolean result if the field is missing or non-numeric. Always leaves the @@ -58,13 +56,6 @@ const uint8_t *ResolveBagSlot(void *L, int bagID, int slotIndex) { // --- GUID-walk helpers --------------------------------------------------- -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - uint64_t ReadCGItemGUID(const uint8_t *item) { auto *instance = Item::InstanceBlock(item); if (instance == nullptr) @@ -125,7 +116,7 @@ int GetBagSlotCount(int bagID) { const int bagItemID = Item::ID::FromCGItem(bagItem); if (bagItemID == 0) return 0; - auto *record = PeekItemRecord(static_cast(bagItemID)); + auto *record = Item::PeekRecord(static_cast(bagItemID)); if (record == nullptr) return 0; return static_cast(*reinterpret_cast( diff --git a/src/item/MaxStackSize.cpp b/src/item/MaxStackSize.cpp index 89154397..370a5fc8 100644 --- a/src/item/MaxStackSize.cpp +++ b/src/item/MaxStackSize.cpp @@ -17,6 +17,7 @@ #include "item/Data.h" #include "item/ID.h" #include "item/Location.h" +#include "item/Record.h" #include @@ -24,21 +25,10 @@ namespace Item::MaxStackSize { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); - -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - int PushMaxStackSizeForItemID(void *L, int itemID) { if (itemID <= 0) return 0; - const uint8_t *record = PeekItemRecord(static_cast(itemID)); + const uint8_t *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) { Item::Data::WarmCache(static_cast(itemID)); return 0; diff --git a/src/item/Name.cpp b/src/item/Name.cpp index c537731a..c743ab23 100644 --- a/src/item/Name.cpp +++ b/src/item/Name.cpp @@ -18,6 +18,7 @@ #include "item/ID.h" #include "item/Link.h" #include "item/Location.h" +#include "item/Record.h" #include @@ -25,17 +26,6 @@ namespace Item::Name { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); - -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - // Reads `m_name[0]` directly off a cached record. Items only ever // populate the first name slot — the array shape (`char *m_name[4]` // per VanillaHelpers's `ItemStats_C`) is a client-internal layout, not @@ -44,7 +34,7 @@ const uint8_t *PeekItemRecord(uint32_t itemID) { int PushNameForItemID(void *L, int itemID) { if (itemID <= 0) return 0; - const uint8_t *record = PeekItemRecord(static_cast(itemID)); + const uint8_t *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) { Item::Data::WarmCache(static_cast(itemID)); return 0; diff --git a/src/item/Openable.cpp b/src/item/Openable.cpp index f0e0259e..5f665c94 100644 --- a/src/item/Openable.cpp +++ b/src/item/Openable.cpp @@ -32,6 +32,7 @@ #include "item/ID.h" #include "item/Location.h" #include "item/Openable.h" +#include "item/Record.h" #include @@ -39,21 +40,6 @@ namespace Item::Openable { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); - -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - -} // namespace - -namespace { - // Reads `ITEM_FIELD_FLAGS` from the instance descriptor at +0x114. // Defaults to 0 if `cgItem` is null or the descriptor pointer hasn't // been populated yet. @@ -73,7 +59,7 @@ int PushIsItemOpenable(void *L, const uint8_t *cgItem) { const int itemID = Item::ID::FromCGItem(cgItem); if (itemID <= 0) return 0; - const uint8_t *record = PeekItemRecord(static_cast(itemID)); + const uint8_t *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) { Item::Data::WarmCache(static_cast(itemID)); return 0; diff --git a/src/item/Quality.cpp b/src/item/Quality.cpp index b1df93d6..3f43a1ea 100644 --- a/src/item/Quality.cpp +++ b/src/item/Quality.cpp @@ -17,6 +17,7 @@ #include "item/Data.h" #include "item/ID.h" #include "item/Location.h" +#include "item/Record.h" #include @@ -24,21 +25,10 @@ namespace Item::Quality { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); - -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - int PushQualityForItemID(void *L, int itemID) { if (itemID <= 0) return 0; - const uint8_t *record = PeekItemRecord(static_cast(itemID)); + const uint8_t *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) { Item::Data::WarmCache(static_cast(itemID)); return 0; diff --git a/src/item/Record.cpp b/src/item/Record.cpp new file mode 100644 index 00000000..a2bd34a2 --- /dev/null +++ b/src/item/Record.cpp @@ -0,0 +1,33 @@ +// 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 "Record.h" + +#include "Offsets.h" + +namespace Item { + +const uint8_t *PeekRecord(uint32_t itemID) { + using GetRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, + const uint64_t *guid, + void *callback, void *userData, + int dedup); + auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); + auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); + const uint64_t zeroGuid = 0; + // Null callback = passive peek (no network query). dedup is irrelevant + // with a null callback (nothing is appended to the pending list). + return fn(cache, itemID, &zeroGuid, nullptr, nullptr, false); +} + +} // namespace Item diff --git a/src/item/Record.h b/src/item/Record.h new file mode 100644 index 00000000..fd4b9be1 --- /dev/null +++ b/src/item/Record.h @@ -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 . + +#pragma once + +#include + +// Passive read of the client-side item cache (the ItemSparse `ItemStats_C` +// records). Every read-only item accessor used to re-declare the same +// `DBCache_ItemStats_C_GetRecord` typedef and call it with a null callback; +// this names that one passive peek. + +namespace Item { + +// The cached `ItemStats_C` record for `itemID`, or nullptr if it isn't cached. +// PASSIVE — a null callback means "look up only": it never warms the cache or +// fires SMSG_ITEM_QUERY_SINGLE, so it is safe to call many times per frame +// from tooltips / bag scans. (Eagerly triggering a query from a passive getter +// is the cache-race trap documented in CLAUDE.md — the request/response path +// lives in item/Data.cpp, not here.) Fields are read via the `OFF_ITEMSTATS_*` +// offsets. +const uint8_t *PeekRecord(uint32_t itemID); + +} // namespace Item diff --git a/src/item/SellPrice.cpp b/src/item/SellPrice.cpp index e1955c71..9fd6fce3 100644 --- a/src/item/SellPrice.cpp +++ b/src/item/SellPrice.cpp @@ -17,6 +17,7 @@ #include "item/Data.h" #include "item/ID.h" #include "item/Location.h" +#include "item/Record.h" #include @@ -24,21 +25,10 @@ namespace Item::SellPrice { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); - -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - int PushSellPriceForItemID(void *L, int itemID) { if (itemID <= 0) return 0; - const uint8_t *record = PeekItemRecord(static_cast(itemID)); + const uint8_t *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) { Item::Data::WarmCache(static_cast(itemID)); return 0; diff --git a/src/item/Set.cpp b/src/item/Set.cpp index 25278d4e..f4eb2b6a 100644 --- a/src/item/Set.cpp +++ b/src/item/Set.cpp @@ -27,6 +27,7 @@ #include "item/Data.h" #include "item/ID.h" #include "item/Location.h" +#include "item/Record.h" #include @@ -34,21 +35,10 @@ namespace Item::Set { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); - -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - int PushSetIDForItemID(void *L, int itemID) { if (itemID <= 0) return 0; - const uint8_t *record = PeekItemRecord(static_cast(itemID)); + const uint8_t *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) { Item::Data::WarmCache(static_cast(itemID)); return 0; diff --git a/src/item/Spell.cpp b/src/item/Spell.cpp index 41bd6c91..b2b69718 100644 --- a/src/item/Spell.cpp +++ b/src/item/Spell.cpp @@ -29,6 +29,7 @@ #include "Offsets.h" #include "item/Arg.h" #include "item/Data.h" +#include "item/Record.h" #include "spell/Lookup.h" #include @@ -37,17 +38,6 @@ namespace Item::Spell { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, bool requestIfMissing); - -const uint8_t *FetchItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, false); -} - const char *SpellNameForID(int spellID) { const uint8_t *record = ::Spell::Lookup::RecordForID(spellID); if (record == nullptr) @@ -69,7 +59,7 @@ int __fastcall Script_GetItemSpell(void *L) { const int itemID = Item::Arg::ResolveItemID(L, 1); if (itemID <= 0) return 0; - const uint8_t *record = FetchItemRecord(static_cast(itemID)); + const uint8_t *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) { Item::Data::WarmCache(static_cast(itemID)); return 0; @@ -113,7 +103,7 @@ int FindOnUseSpellIDInRecord(const uint8_t *record) { int OnUseSpellIDForItemID(uint32_t itemID) { if (itemID == 0) return 0; - const uint8_t *record = FetchItemRecord(itemID); + const uint8_t *record = Item::PeekRecord(itemID); if (record == nullptr) return 0; return FindOnUseSpellIDInRecord(record); diff --git a/src/item/StatAccum.cpp b/src/item/StatAccum.cpp index 900a4967..c5391b90 100644 --- a/src/item/StatAccum.cpp +++ b/src/item/StatAccum.cpp @@ -47,6 +47,7 @@ #include "Game.h" #include "Offsets.h" #include "dbc/Lookup.h" +#include "item/Record.h" #include #include @@ -55,10 +56,6 @@ namespace Item::StatAccum { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, bool requestIfMissing); - // Base-record m_statType uses the ItemModType enum: 0=mana, 1=health, // 3=agility, 4=strength, 5=intellect, 6=spirit, 7=stamina (2 is // deprecated). Returns nullptr for types with no vanilla key. @@ -288,13 +285,6 @@ long Value(const Accum *acc, const char *key) { return 0; } -const uint8_t *FetchRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, false); -} - double ComputeDPS(const uint8_t *record) { if (record == nullptr) return 0.0; diff --git a/src/item/StatAccum.h b/src/item/StatAccum.h index afa781e6..a7cd8916 100644 --- a/src/item/StatAccum.h +++ b/src/item/StatAccum.h @@ -54,11 +54,6 @@ void AddByKey(Accum *acc, const char *key, long delta); // Read the accumulated value for `key` (0 for an unknown key). Linear scan. long Value(const Accum *acc, const char *key); -// Passive cache peek for an item's `ItemStats_C` record. Does NOT warm -// the cache (returns nullptr for an uncached item) — see the item-cache -// race note in CLAUDE.md. -const uint8_t *FetchRecord(uint32_t itemID); - // Fold an item record's base stats + on-equip-spell stats into `acc`, // scaled by `sign` (+1 to add, -1 to subtract for a delta). No-op for a // null record. diff --git a/src/item/Stats.cpp b/src/item/Stats.cpp index d3804dd5..43a58f72 100644 --- a/src/item/Stats.cpp +++ b/src/item/Stats.cpp @@ -24,6 +24,7 @@ #include "Game.h" #include "item/Arg.h" +#include "item/Record.h" #include "item/StatAccum.h" #include @@ -70,7 +71,7 @@ int __fastcall Script_GetItemStats(void *L) { return 0; } const int suffixID = StatAccum::ParseRandomSuffixFromLink(L, 1); - const uint8_t *record = StatAccum::FetchRecord(static_cast(itemID)); + const uint8_t *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) { Game::Lua::PushNil(L); return 1; @@ -99,8 +100,8 @@ int __fastcall Script_GetItemStatDelta(void *L) { } const int suffix1 = StatAccum::ParseRandomSuffixFromLink(L, 1); const int suffix2 = StatAccum::ParseRandomSuffixFromLink(L, 2); - const uint8_t *r1 = StatAccum::FetchRecord(static_cast(id1)); - const uint8_t *r2 = StatAccum::FetchRecord(static_cast(id2)); + const uint8_t *r1 = Item::PeekRecord(static_cast(id1)); + const uint8_t *r2 = Item::PeekRecord(static_cast(id2)); if (r1 == nullptr || r2 == nullptr) { Game::Lua::PushNil(L); return 1; diff --git a/src/item/Tooltip.cpp b/src/item/Tooltip.cpp index b16903c7..a1e064b3 100644 --- a/src/item/Tooltip.cpp +++ b/src/item/Tooltip.cpp @@ -18,6 +18,7 @@ #include "item/Link.h" #include "item/Location.h" #include "item/QualityColor.h" +#include "item/Record.h" #include "item/TooltipItem.h" #include "object/Resolve.h" @@ -139,17 +140,6 @@ static int __fastcall Script_GameTooltipSetInventoryItemByID(void *L) { } -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); - -static const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - // Resolves a stored item GUID into a CGItem via the engine's own // resolver. Same path Item::Count uses for direct bank reads — no // gating, no inventory walk, works for any object the engine has @@ -246,7 +236,7 @@ static int __fastcall Script_GameTooltipGetItem(void *L) { // OFF_TOOLTIP_COMPARE_SUFFIX — include it (in the link's suffix field) // when the compare-descriptor flag is set, so the link round-trips the // suffix for stat comparison. Matches 3.3.5's auction GetItem. - const uint8_t *record = PeekItemRecord(static_cast(itemID)); + const uint8_t *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) { Item::Data::WarmCache(static_cast(itemID)); return 0; diff --git a/src/item/Uniqueness.cpp b/src/item/Uniqueness.cpp index 07661070..54f9db24 100644 --- a/src/item/Uniqueness.cpp +++ b/src/item/Uniqueness.cpp @@ -42,6 +42,7 @@ #include "item/Data.h" #include "item/ID.h" #include "item/Location.h" +#include "item/Record.h" #include @@ -49,25 +50,11 @@ namespace Item::Uniqueness { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, - void *callback, void *userData, - int unused); - -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast( - static_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD)); - auto *cache = reinterpret_cast( - static_cast(Offsets::VAR_ITEMDB_CACHE)); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - // Returns the item's `m_maxCount` or -1 if the record isn't cached. // `-1` is a "warm-and-bail" sentinel; caller pushes nothing on -1 // so the Lua side sees the modern "MayReturnNothing" behaviour. int ReadMaxCount(uint32_t itemID) { - const uint8_t *record = PeekItemRecord(itemID); + const uint8_t *record = Item::PeekRecord(itemID); if (record == nullptr) { Item::Data::WarmCache(itemID); return -1; diff --git a/src/item/Usable.cpp b/src/item/Usable.cpp index 7ffab0bc..3f0428dc 100644 --- a/src/item/Usable.cpp +++ b/src/item/Usable.cpp @@ -40,6 +40,7 @@ #include "Game.h" #include "Offsets.h" #include "item/Arg.h" +#include "item/Record.h" #include "item/Spell.h" #include "spell/Lookup.h" @@ -49,21 +50,9 @@ namespace Item::Usable { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); using ResolveUnitToken_t = void *(__fastcall *)(const char *token); using SpellIsUsable_t = int(__fastcall *)(const uint8_t *spellRecord, int *outNoMana); -// Same item-cache peek pattern as the other item modules (no shared -// helper — each call site is one line different). Sync, no load fired. -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - const uint8_t *PlayerDescriptor() { auto resolve = reinterpret_cast(Offsets::FUN_RESOLVE_UNIT_TOKEN); auto *player = static_cast(resolve("player")); @@ -91,7 +80,7 @@ Usability ComputeUsability(int itemID) { if (itemID <= 0) return r; - auto *record = PeekItemRecord(static_cast(itemID)); + auto *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) return r; // not cached → sync "false", no load fired diff --git a/src/merchant/Frame.cpp b/src/merchant/Frame.cpp index 3898df98..d4739c62 100644 --- a/src/merchant/Frame.cpp +++ b/src/merchant/Frame.cpp @@ -34,6 +34,7 @@ #include "Offsets.h" #include "item/CGItem.h" #include "item/Location.h" +#include "item/Record.h" #include "unit/Identity.h" #include "tick/WorldTick.h" @@ -44,10 +45,6 @@ namespace Merchant::Frame { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)( - void *cache, uint32_t itemID, const uint64_t *guid, - void *callback, void *userData, bool requestIfMissing); - // Read the 64-bit merchant NPC GUID. Both halves zero means no // merchant window is open and the rest of the merchant globals are // stale. @@ -82,23 +79,11 @@ uint64_t ItemGUIDFromCGItem(const uint8_t *cgItem) { instance + Offsets::OFF_INSTANCE_BLOCK_GUID); } -// Same `PeekItemRecord` pattern Item::Bag / Item::Equipment use — -// inline cache peek with a null callback (no network round-trip on -// miss). Same call shape `Item::Info::FetchItemRecord` uses; not -// shared because each module has its own slightly different needs. -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast( - Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, false); -} - // Looks up `itemID` in the ItemStats cache and reads quality from // `+0x1C`. Quality 0 = Poor (grey junk). Returns -1 on cache miss // so callers can distinguish "not loaded" from "loaded poor-quality". int ItemQuality(uint32_t itemID) { - auto *record = PeekItemRecord(itemID); + auto *record = Item::PeekRecord(itemID); if (record == nullptr) return -1; return static_cast(*reinterpret_cast( diff --git a/src/player/CanUseItem.cpp b/src/player/CanUseItem.cpp index 8c6a9871..7b0df76a 100644 --- a/src/player/CanUseItem.cpp +++ b/src/player/CanUseItem.cpp @@ -54,6 +54,7 @@ #include "Game.h" #include "Offsets.h" #include "item/Arg.h" +#include "item/Record.h" #include "spell/Lookup.h" #include "unit/Identity.h" @@ -63,9 +64,6 @@ namespace Player::CanUseItem { namespace { -using GetItemRecord_t = const uint8_t *(__thiscall *)(void *cache, uint32_t itemID, - const uint64_t *guid, void *callback, - void *userData, int unused); // `__thiscall(player /*ecx*/, skillLineID) -> slot` (-1 if the player // doesn't have the skill line). See VAR docs on FUN_SKILL_LINE_TO_SLOT. using SkillLineToSlot_t = int(__thiscall *)(void *player, uint32_t skillLineID); @@ -76,13 +74,6 @@ using RepStanding_t = int(__fastcall *)(int factionID); // higher rank in spellID's chain. See FUN_SPELL_RANK_CHAIN_KNOWN. using SpellRankChainKnown_t = int(__thiscall *)(void *player, uint32_t spellID); -const uint8_t *PeekItemRecord(uint32_t itemID) { - auto fn = reinterpret_cast(Offsets::FUN_DBCACHE_ITEMSTATS_GET_RECORD); - auto *cache = reinterpret_cast(Offsets::VAR_ITEMDB_CACHE); - const uint64_t zeroGuid = 0; - return fn(cache, itemID, &zeroGuid, nullptr, nullptr, 0); -} - // True iff `mask` restricts a 1-based `index` (class/race) the player // isn't part of. Mask 0 and 0xFFFFFFFF both mean "no restriction". bool RestrictedOut(uint32_t mask, uint32_t index1Based) { @@ -236,7 +227,7 @@ bool RequiredReputationMet(const uint8_t *record) { bool ComputeCanUse(int itemID) { if (itemID <= 0) return false; - auto *record = PeekItemRecord(static_cast(itemID)); + auto *record = Item::PeekRecord(static_cast(itemID)); if (record == nullptr) return false; // not cached → sync false, no load fired auto *player = Unit::Identity::PlayerObject(); diff --git a/src/spell/BonusDamage.cpp b/src/spell/BonusDamage.cpp index 22db6230..fee0f039 100644 --- a/src/spell/BonusDamage.cpp +++ b/src/spell/BonusDamage.cpp @@ -62,6 +62,7 @@ #include "item/CGItem.h" #include "item/ID.h" #include "item/Location.h" +#include "item/Record.h" #include "item/StatAccum.h" #include "player/StatSignal.h" #include "spell/HealingAura.h" @@ -120,7 +121,7 @@ long ItemFlatHealing(const uint8_t *cgItem) { const int itemID = Item::ID::FromCGItem(cgItem); if (itemID > 0) Item::StatAccum::AccumulateRecord( - acc, Item::StatAccum::FetchRecord(static_cast(itemID)), +1); + acc, Item::PeekRecord(static_cast(itemID)), +1); auto *desc = Item::ObjectFields(cgItem); if (desc != nullptr) { diff --git a/src/tooltip/CompareItem.cpp b/src/tooltip/CompareItem.cpp index 94fb4a47..a2e1008c 100644 --- a/src/tooltip/CompareItem.cpp +++ b/src/tooltip/CompareItem.cpp @@ -61,6 +61,7 @@ #include "item/CGItem.h" #include "item/ID.h" #include "item/Location.h" +#include "item/Record.h" #include "item/StatAccum.h" #include "item/TooltipItem.h" #include "tooltip/SetEvents.h" @@ -540,7 +541,7 @@ int __fastcall Script_SetHyperlinkCompareItem(void *L) { } } const uint8_t *hoveredRec = - hoveredID > 0 ? Item::StatAccum::FetchRecord(static_cast(hoveredID)) : nullptr; + hoveredID > 0 ? Item::PeekRecord(static_cast(hoveredID)) : nullptr; if (hoveredRec == nullptr) return bail(0); // no link and no comparisonTooltip item, or not cached yet @@ -610,7 +611,7 @@ int __fastcall Script_SetHyperlinkCompareItem(void *L) { Item::StatAccum::AccumulateRecord(acc, hoveredRec, +1); Item::StatAccum::ApplyRandomSuffix(acc, hoveredSuffix, +1); const uint8_t *equippedRec = - Item::StatAccum::FetchRecord(static_cast(equippedID)); + Item::PeekRecord(static_cast(equippedID)); if (equippedRec != nullptr) { Item::StatAccum::AccumulateRecord(acc, equippedRec, -1); Item::StatAccum::ApplyRandomSuffix(acc, equippedSuffix, -1);