mirror of
https://github.com/mangosfour/server.git
synced 2025-12-20 16:37:04 +00:00
Merge commit 'origin/master' into 320
Conflicts: src/game/DBCStructure.h src/game/DBCfmt.h src/game/MiscHandler.cpp src/game/ObjectMgr.cpp
This commit is contained in:
commit
4a8431f581
51 changed files with 739 additions and 612 deletions
|
|
@ -1320,7 +1320,7 @@ struct SpellEntry
|
|||
uint32 AttributesEx3; // 7 m_attributesExC
|
||||
uint32 AttributesEx4; // 8 m_attributesExD
|
||||
uint32 AttributesEx5; // 9 m_attributesExE
|
||||
//uint32 AttributesEx6; // 10 m_attributesExF not used
|
||||
uint32 AttributesEx6; // 10 m_attributesExF
|
||||
// uint32 unk_320_1; // 11 3.2.0 (0x20 - totems, 0x4 - paladin auras, etc...)
|
||||
uint32 Stances; // 12 m_shapeshiftMask
|
||||
// uint32 unk_320_2; // 13 3.2.0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue