aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfunjoker <funjoker109@gmail.com>2025-06-30 04:11:32 +0200
committerfunjoker <funjoker109@gmail.com>2025-06-30 04:11:32 +0200
commit175086b27b792efdffa69b0f7c0165e5bb0373f9 (patch)
tree8dbe14d29409e22cc68d48f07bcbd4ecf568b097 /src
parent3bb40348cfec21d494743ea2a6c749e53cecbc7a (diff)
Core/Spell: Change auraSlot to uint16
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Server/Packets/SpellPackets.cpp2
-rw-r--r--src/server/game/Server/Packets/SpellPackets.h2
-rw-r--r--src/server/game/Spells/Auras/SpellAuras.cpp2
-rw-r--r--src/server/game/Spells/Auras/SpellAuras.h4
4 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Server/Packets/SpellPackets.cpp b/src/server/game/Server/Packets/SpellPackets.cpp
index e7d27bde9f3..384cea58506 100644
--- a/src/server/game/Server/Packets/SpellPackets.cpp
+++ b/src/server/game/Server/Packets/SpellPackets.cpp
@@ -123,7 +123,7 @@ ByteBuffer& operator<<(ByteBuffer& data, AuraDataInfo const& auraData)
ByteBuffer& operator<<(ByteBuffer& data, AuraInfo const& aura)
{
- data << aura.Slot;
+ data << uint16(aura.Slot);
data << OptionalInit(aura.AuraData);
data.FlushBits();
diff --git a/src/server/game/Server/Packets/SpellPackets.h b/src/server/game/Server/Packets/SpellPackets.h
index b45fce9d706..e97b51ce855 100644
--- a/src/server/game/Server/Packets/SpellPackets.h
+++ b/src/server/game/Server/Packets/SpellPackets.h
@@ -166,7 +166,7 @@ namespace WorldPackets
struct AuraInfo
{
- uint8 Slot = 0;
+ uint16 Slot = 0;
Optional<AuraDataInfo> AuraData;
};
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index ce981ac68ec..bb22da84d96 100644
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -75,7 +75,7 @@ _flags(AFLAG_NONE), _effectsToApply(effMask), _needClientUpdate(false), _effectM
ASSERT(GetTarget() && GetBase());
// Try find slot for aura
- uint8 slot = 0;
+ uint16 slot = 0;
// lookup for free slots in units visibleAuras
for (AuraApplication* visibleAura : GetTarget()->GetVisibleAuras())
{
diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h
index f75afb2d4f4..d9df16ac201 100644
--- a/src/server/game/Spells/Auras/SpellAuras.h
+++ b/src/server/game/Spells/Auras/SpellAuras.h
@@ -63,7 +63,7 @@ class TC_GAME_API AuraApplication
Unit* const _target;
Aura* const _base;
AuraRemoveMode _removeMode:8; // Store info for know remove aura reason
- uint8 _slot; // Aura slot on unit
+ uint16 _slot; // Aura slot on unit
uint16 _flags; // Aura info flag
uint32 _effectsToApply; // Used only at spell hit to determine which effect should be applied
bool _needClientUpdate:1;
@@ -79,7 +79,7 @@ class TC_GAME_API AuraApplication
Unit* GetTarget() const { return _target; }
Aura* GetBase() const { return _base; }
- uint8 GetSlot() const { return _slot; }
+ uint16 GetSlot() const { return _slot; }
uint16 GetFlags() const { return _flags; }
uint32 GetEffectMask() const { return _effectMask; }
bool HasEffect(uint8 effect) const { ASSERT(effect < MAX_SPELL_EFFECTS); return (_effectMask & (1 << effect)) != 0; }