mirror of
https://github.com/mangosfour/server.git
synced 2025-12-16 22:37:02 +00:00
Merge commit 'origin/master' into 330
Conflicts: src/game/MiscHandler.cpp
This commit is contained in:
commit
f46c1aaabb
45 changed files with 2216 additions and 287 deletions
|
|
@ -1027,14 +1027,14 @@ struct ItemRandomPropertiesEntry
|
|||
uint32 ID; // 0 m_ID
|
||||
//char* internalName // 1 m_Name
|
||||
uint32 enchant_id[5]; // 2-6 m_Enchantment
|
||||
//char* nameSuffix[16] // 7-22 m_name_lang
|
||||
char* nameSuffix[16]; // 7-22 m_name_lang
|
||||
// 23 name flags
|
||||
};
|
||||
|
||||
struct ItemRandomSuffixEntry
|
||||
{
|
||||
uint32 ID; // 0 m_ID
|
||||
//char* name[16] // 1-16 m_name_lang
|
||||
char* nameSuffix[16]; // 1-16 m_name_lang
|
||||
// 17, name flags
|
||||
// 18 m_internalName
|
||||
uint32 enchant_id[5]; // 19-21 m_enchantment
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue