mirror of
https://github.com/mangosfour/server.git
synced 2025-12-16 22:37:02 +00:00
Merge remote branch 'origin/master' into 330
Conflicts: src/game/ObjectMgr.h
This commit is contained in:
commit
7c6cae1af7
58 changed files with 1937 additions and 990 deletions
|
|
@ -1540,17 +1540,15 @@ struct StableSlotPricesEntry
|
|||
uint32 Price;
|
||||
};
|
||||
|
||||
/* unused currently
|
||||
struct SummonPropertiesEntry
|
||||
{
|
||||
uint32 Id; // 0
|
||||
uint32 Group; // 1, enum SummonPropGroup, 0 - can't be controlled?, 1 - something guardian?, 2 - pet?, 3 - something controllable?, 4 - taxi/mount?
|
||||
uint32 Group; // 1, enum SummonPropGroup
|
||||
uint32 FactionId; // 2, 14 rows > 0
|
||||
uint32 Type; // 3, enum SummonPropType
|
||||
uint32 Slot; // 4, 0-6
|
||||
uint32 Slot; // 4, if type = SUMMON_PROP_TYPE_TOTEM, its actual slot 0-6
|
||||
uint32 Flags; // 5, enum SummonPropFlags
|
||||
};
|
||||
*/
|
||||
|
||||
#define MAX_TALENT_RANK 5
|
||||
#define MAX_PET_TALENT_RANK 3 // use in calculations, expected <= MAX_TALENT_RANK
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue