mirror of
https://github.com/mangosfour/server.git
synced 2025-12-17 16:37:00 +00:00
Merge commit 'origin/master' into 310
Conflicts: src/game/UpdateData.cpp
This commit is contained in:
commit
1f87157edf
20 changed files with 195 additions and 139 deletions
|
|
@ -1821,10 +1821,11 @@ enum CreatureFamily
|
|||
|
||||
enum CreatureTypeFlags
|
||||
{
|
||||
CREATURE_TYPEFLAGS_TAMEABLE = 0x0001,
|
||||
CREATURE_TYPEFLAGS_HERBLOOT = 0x0100,
|
||||
CREATURE_TYPEFLAGS_MININGLOOT = 0x0200,
|
||||
CREATURE_TYPEFLAGS_ENGINEERLOOT = 0x8000
|
||||
CREATURE_TYPEFLAGS_TAMEABLE = 0x00001,
|
||||
CREATURE_TYPEFLAGS_HERBLOOT = 0x00100,
|
||||
CREATURE_TYPEFLAGS_MININGLOOT = 0x00200,
|
||||
CREATURE_TYPEFLAGS_ENGINEERLOOT = 0x08000,
|
||||
CREATURE_TYPEFLAGS_EXOTIC = 0x10000
|
||||
};
|
||||
|
||||
enum CreatureEliteType
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue