Merge commit 'origin/master' into 310

This commit is contained in:
tomrus88 2009-05-10 21:46:26 +04:00
commit 5ab735d374
14 changed files with 172 additions and 140 deletions

View file

@ -1769,6 +1769,7 @@ enum CreatureType
};
uint32 const CREATURE_TYPEMASK_HUMANOID_OR_UNDEAD = (1 << (CREATURE_TYPE_HUMANOID-1)) | (1 << (CREATURE_TYPE_UNDEAD-1));
uint32 const CREATURE_TYPEMASK_MECHANICAL_OR_ELEMENTAL = (1 << (CREATURE_TYPE_MECHANICAL-1)) | (1 << (CREATURE_TYPE_ELEMENTAL-1));
// CreatureFamily.dbc
enum CreatureFamily