mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 10:37:02 +00:00
Merge commit 'origin/master' into 310
Conflicts: src/game/SpellAuras.cpp src/game/SpellEffects.cpp
This commit is contained in:
commit
afd82229d7
34 changed files with 357 additions and 344 deletions
|
|
@ -705,11 +705,13 @@ struct CreatureFamilyEntry
|
|||
// 27 m_iconFile
|
||||
};
|
||||
|
||||
#define MAX_CREATURE_SPELL_DATA_SLOT 4
|
||||
|
||||
struct CreatureSpellDataEntry
|
||||
{
|
||||
uint32 ID; // 0 m_ID
|
||||
//uint32 spellId[4]; // 1-4 m_spells[4]
|
||||
//uint32 availability[4]; // 4-7 m_availability[4]
|
||||
uint32 spellId[MAX_CREATURE_SPELL_DATA_SLOT]; // 1-4 m_spells[4]
|
||||
//uint32 availability[MAX_CREATURE_SPELL_DATA_SLOT]; // 4-7 m_availability[4]
|
||||
};
|
||||
|
||||
struct CreatureTypeEntry
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue