Merge commit 'origin/master' into 310

This commit is contained in:
tomrus88 2009-05-25 21:57:59 +04:00
commit 2f15546120
15 changed files with 80 additions and 154 deletions

View file

@ -1817,8 +1817,6 @@ enum CreatureFamily
CREATURE_FAMILY_SPIRIT_BEAST = 46
};
#define MAX_CREATURE_FAMILY 47
enum CreatureTypeFlags
{
CREATURE_TYPEFLAGS_TAMEABLE = 0x0001,