Merge commit 'origin/master' into 330

Conflicts:
	src/game/MiscHandler.cpp
This commit is contained in:
tomrus88 2009-10-10 17:28:59 +04:00
commit f46c1aaabb
45 changed files with 2216 additions and 287 deletions

View file

@ -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