Merge commit 'origin/master' into 320

This commit is contained in:
tomrus88 2009-08-07 23:48:00 +04:00
commit d24461e300
18 changed files with 121 additions and 74 deletions

View file

@ -1781,6 +1781,7 @@ enum CreatureType
CREATURE_TYPE_GAS_CLOUD = 13
};
uint32 const CREATURE_TYPEMASK_DEMON_OR_UNDEAD = (1 << (CREATURE_TYPE_DEMON-1)) | (1 << (CREATURE_TYPE_UNDEAD-1));
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));