brues/nampower
1
1
Fork 0
mirror of https://github.com/brues-code/nampower.git synced 2026-09-27 09:26:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

clear spell slot caches on pet change

Browse Source
This commit is contained in:
avitasia
2026-04-01 08:13:48 -07:00
parent 9c46553a0b
commit aea37f99e3
6 changed files with 13184 additions and 13161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nampower.map
+13157 -13144
View File
File diff suppressed because it is too large Load Diff
nampower/helper.cpp
+16 -16
View File
@@ -12,6 +12,9 @@
#include <string>
namespace Nampower {
std::unordered_map<std::string, SpellSlotCacheEntry> gSpellSlotCache;
std::unordered_map<uint64_t, uint32_t> gSpellIdToSlotCache;
// Lua function pointers
lua_errorT lua_error = reinterpret_cast<lua_errorT>(Offsets::lua_error);
lua_gettopT lua_gettop = reinterpret_cast<lua_gettopT>(Offsets::lua_gettop);
@@ -35,14 +38,6 @@ namespace Nampower {
int32_t GetSpellSlotAndTypeForName(const char *spellName, uint32_t *spellType) {
struct CachedEntry {
int32_t slot;
uint32_t type;
std::string cachedNameLower;
std::string cachedRankLower;
};
static std::unordered_map<std::string, CachedEntry> spellSlotCache;
auto const normalize = [](const char *name) -> std::string {
std::string out = name ? name : "";
std::transform(out.begin(), out.end(), out.begin(), [](unsigned char c) { return char(std::tolower(c)); });
@@ -79,8 +74,8 @@ namespace Nampower {
};
if (!key.empty()) {
auto cacheIt = spellSlotCache.find(key);
if (cacheIt != spellSlotCache.end()) {
auto cacheIt = gSpellSlotCache.find(key);
if (cacheIt != gSpellSlotCache.end()) {
auto const &entry = cacheIt->second;
if (entry.slot < 1024) {
auto const info = getSpellInfoAtSlot(entry.slot, entry.type);
@@ -99,7 +94,7 @@ namespace Nampower {
if (slot < 1024 && spellType && !key.empty()) {
auto const info = getSpellInfoAtSlot(slot, *spellType);
spellSlotCache[key] = {slot, *spellType, info.nameLower, info.rankLower};
gSpellSlotCache[key] = {slot, *spellType, info.nameLower, info.rankLower};
}
return slot;
@@ -124,7 +119,6 @@ namespace Nampower {
}
uint32_t ConvertSpellIdToSpellSlot(uint32_t spellId, uint32_t bookType) {
static std::unordered_map<uint64_t, uint32_t> spellIdToSlotCache;
auto const cacheKey = (uint64_t(spellId) << 1) | (bookType & 0x1);
auto const slotHasSpellId = [bookType](uint32_t slot, uint32_t expectedId) -> bool {
@@ -142,8 +136,8 @@ namespace Nampower {
return slotSpellId == expectedId;
};
auto cacheIt = spellIdToSlotCache.find(cacheKey);
if (cacheIt != spellIdToSlotCache.end()) {
auto cacheIt = gSpellIdToSlotCache.find(cacheKey);
if (cacheIt != gSpellIdToSlotCache.end()) {
if (slotHasSpellId(cacheIt->second, spellId)) {
return cacheIt->second;
}
@@ -155,7 +149,7 @@ namespace Nampower {
uint32_t slotSpellId = *reinterpret_cast<uint32_t *>(uint32_t(Offsets::CGSpellBook_mKnownSpells) +
spellSlot * 4);
if (slotSpellId == spellId) {
spellIdToSlotCache[cacheKey] = spellSlot;
gSpellIdToSlotCache[cacheKey] = spellSlot;
return spellSlot;
}
}
@@ -165,7 +159,7 @@ namespace Nampower {
uint32_t slotSpellId = *reinterpret_cast<uint32_t *>(uint32_t(Offsets::CGSpellBook_mKnownPetSpells) +
spellSlot * 4);
if (slotSpellId == spellId) {
spellIdToSlotCache[cacheKey] = spellSlot;
gSpellIdToSlotCache[cacheKey] = spellSlot;
return spellSlot;
}
}
@@ -174,6 +168,12 @@ namespace Nampower {
return 0;
}
void ClearSpellSlotCaches() {
DEBUG_LOG("Clearing spell slot and spellId -> spell slot caches");
gSpellSlotCache.clear();
gSpellIdToSlotCache.clear();
}
bool SpellIsOnGcd(const game::SpellRec *spell) {
if (spell->Id == 51714) {
nampower/helper.hpp
+2
View File
@@ -49,6 +49,8 @@ namespace Nampower {
uint32_t ConvertSpellIdToSpellSlot(uint32_t spellId, uint32_t bookType);
void ClearSpellSlotCaches();
bool SpellIsOnGcd(const game::SpellRec *spell);
bool SpellIsChanneling(const game::SpellRec *spell);
nampower/main.hpp
+1 -1
View File
@@ -27,7 +27,7 @@ namespace Nampower {
constexpr uint32_t MAJOR_VERSION = 4;
constexpr uint32_t MINOR_VERSION = 2;
constexpr uint32_t PATCH_VERSION = 1;
constexpr uint32_t PATCH_VERSION = 2;
constexpr int32_t LUA_REGISTRYINDEX = -10000;
constexpr int32_t LUA_GLOBALSINDEX = -10001;
nampower/pet.cpp
+1
View File
@@ -252,6 +252,7 @@ namespace Nampower {
uint64_t newPetGuid = *reinterpret_cast<uint64_t *>(Offsets::ActivePetGuid);
if (activePetGuid != newPetGuid) {
ClearSpellSlotCaches();
DEBUG_LOG("Active pet guid changed from " << activePetGuid << " to " << newPetGuid);
if (gUserSettings.preserveGreaterDemonAutocast && newPetGuid != 0) {
nampower/types.h
+7
View File
@@ -166,3 +166,10 @@ struct EVENT_DATA_KEY {
uint32_t repeat;
uint32_t time;
};
struct SpellSlotCacheEntry {
int32_t slot;
uint32_t type;
std::string cachedNameLower;
std::string cachedRankLower;
};