mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 01:37:00 +00:00
Merge commit 'origin/master' into 310
Conflicts: src/game/SpellAuras.cpp
This commit is contained in:
commit
cae3f0a532
53 changed files with 1074 additions and 954 deletions
|
|
@ -1240,7 +1240,7 @@ struct SkillLineEntry
|
|||
uint32 spellIcon; // 37 m_spellIconID
|
||||
//char* alternateVerb[16]; // 38-53 m_alternateVerb_lang
|
||||
// 54 string flags
|
||||
// 55 m_canLink
|
||||
uint32 canLink; // 55 m_canLink (prof. with recipes
|
||||
};
|
||||
|
||||
struct SkillLineAbilityEntry
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue