*Fix build in *nix. Note: *nix does not allow you declare an "enum" in one file while define it in another.
--HG-- branch : trunk
This commit is contained in:
@@ -2605,5 +2605,27 @@ enum MailResponseResult
|
|||||||
MAIL_ERR_ITEM_HAS_EXPIRED = 21,
|
MAIL_ERR_ITEM_HAS_EXPIRED = 21,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum SpellFamilyNames
|
||||||
|
{
|
||||||
|
SPELLFAMILY_GENERIC = 0,
|
||||||
|
SPELLFAMILY_UNK1 = 1, // events, holidays
|
||||||
|
// 2 - unused
|
||||||
|
SPELLFAMILY_MAGE = 3,
|
||||||
|
SPELLFAMILY_WARRIOR = 4,
|
||||||
|
SPELLFAMILY_WARLOCK = 5,
|
||||||
|
SPELLFAMILY_PRIEST = 6,
|
||||||
|
SPELLFAMILY_DRUID = 7,
|
||||||
|
SPELLFAMILY_ROGUE = 8,
|
||||||
|
SPELLFAMILY_HUNTER = 9,
|
||||||
|
SPELLFAMILY_PALADIN = 10,
|
||||||
|
SPELLFAMILY_SHAMAN = 11,
|
||||||
|
SPELLFAMILY_UNK2 = 12, // 2 spells (silence resistance)
|
||||||
|
SPELLFAMILY_POTION = 13,
|
||||||
|
// 14 - unused
|
||||||
|
SPELLFAMILY_DEATHKNIGHT = 15,
|
||||||
|
// 16 - unused
|
||||||
|
SPELLFAMILY_PET = 17
|
||||||
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -46,28 +46,6 @@ enum SpellCategories
|
|||||||
SPELLCATEGORY_DEVOUR_MAGIC = 12
|
SPELLCATEGORY_DEVOUR_MAGIC = 12
|
||||||
};
|
};
|
||||||
|
|
||||||
enum SpellFamilyNames
|
|
||||||
{
|
|
||||||
SPELLFAMILY_GENERIC = 0,
|
|
||||||
SPELLFAMILY_UNK1 = 1, // events, holidays
|
|
||||||
// 2 - unused
|
|
||||||
SPELLFAMILY_MAGE = 3,
|
|
||||||
SPELLFAMILY_WARRIOR = 4,
|
|
||||||
SPELLFAMILY_WARLOCK = 5,
|
|
||||||
SPELLFAMILY_PRIEST = 6,
|
|
||||||
SPELLFAMILY_DRUID = 7,
|
|
||||||
SPELLFAMILY_ROGUE = 8,
|
|
||||||
SPELLFAMILY_HUNTER = 9,
|
|
||||||
SPELLFAMILY_PALADIN = 10,
|
|
||||||
SPELLFAMILY_SHAMAN = 11,
|
|
||||||
SPELLFAMILY_UNK2 = 12, // 2 spells (silence resistance)
|
|
||||||
SPELLFAMILY_POTION = 13,
|
|
||||||
// 14 - unused
|
|
||||||
SPELLFAMILY_DEATHKNIGHT = 15,
|
|
||||||
// 16 - unused
|
|
||||||
SPELLFAMILY_PET = 17
|
|
||||||
};
|
|
||||||
|
|
||||||
enum SpellDisableTypes
|
enum SpellDisableTypes
|
||||||
{
|
{
|
||||||
SPELL_DISABLE_PLAYER = 1,
|
SPELL_DISABLE_PLAYER = 1,
|
||||||
|
|||||||
@@ -36,8 +36,6 @@
|
|||||||
#include "DBCStructure.h"
|
#include "DBCStructure.h"
|
||||||
#include <list>
|
#include <list>
|
||||||
|
|
||||||
enum SpellFamilyNames;
|
|
||||||
|
|
||||||
#define WORLD_TRIGGER 12999
|
#define WORLD_TRIGGER 12999
|
||||||
|
|
||||||
enum SpellInterruptFlags
|
enum SpellInterruptFlags
|
||||||
|
|||||||
Reference in New Issue
Block a user