mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 13:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 310

Browse source 
Conflicts:
	src/game/GameObject.cpp
This commit is contained in:
tomrus88 2009-03-18 07:45:29 +03:00
commit 9d2acc22b4
47 changed files with 1772 additions and 1246 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/shared/Database/DBCStructure.h
View file

@ -374,6 +374,7 @@ struct AchievementCriteriaEntry
struct
{
uint32 itemID; // 3
uint32 count; // 4
} equip_item;
// ACHIEVEMENT_CRITERIA_TYPE_MONEY_FROM_QUEST_REWARD= 62
@ -975,13 +976,15 @@ struct ItemSetEntry
uint32 required_skill_value; // 52 m_requiredSkillRank
};
#define MAX_LOCK_CASE 8
struct LockEntry
{
uint32 ID; // 0 m_ID
uint32 Type[8]; // 1-8 m_Type
uint32 Index[8]; // 9-16 m_Index
uint32 Skill[8]; // 17-24 m_Skill
//uint32 Action[8]; // 25-32 m_Action
uint32 Type[MAX_LOCK_CASE]; // 1-8 m_Type
uint32 Index[MAX_LOCK_CASE]; // 9-16 m_Index
uint32 Skill[MAX_LOCK_CASE]; // 17-24 m_Skill
//uint32 Action[MAX_LOCK_CASE]; // 25-32 m_Action
};
struct MailTemplateEntry