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/Unit.cpp
This commit is contained in:
commit
e73c5d3b79
177 changed files with 24212 additions and 2127 deletions
|
|
@ -1021,7 +1021,7 @@ struct ItemLimitCategoryEntry
|
|||
//char* name[16] // 1-16 m_name_lang
|
||||
// 17 name flags
|
||||
uint32 maxCount; // 18, max allowed equipped as item or in gem slot
|
||||
//uint32 unk; // 19, 1 for gems only...
|
||||
uint32 mode; // 19, 0 = have, 1 = equip (enum ItemLimitCategoryMode)
|
||||
};
|
||||
|
||||
struct ItemRandomPropertiesEntry
|
||||
|
|
@ -1146,8 +1146,8 @@ struct MovieEntry
|
|||
struct PvPDifficultyEntry
|
||||
{
|
||||
//uint32 id; // 0 m_ID
|
||||
uint32 mapId; // 1
|
||||
uint32 bracketId; // 2
|
||||
uint32 mapId; // 1
|
||||
uint32 bracketId; // 2
|
||||
uint32 minLevel; // 3
|
||||
uint32 maxLevel; // 4
|
||||
uint32 difficulty; // 5
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue