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

Merge branch 'master' into 303

Browse source 
Conflicts:
	src/game/ObjectMgr.h
This commit is contained in:
tomrus88 2008-10-27 01:27:48 +03:00
commit 233e5eac6f
32 changed files with 160 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/game/ObjectMgr.h
View file

@ -203,9 +203,11 @@ enum ConditionType
CONDITION_QUESTREWARDED = 8, // quest_id 0
CONDITION_QUESTTAKEN = 9, // quest_id 0, for condition true while quest active.
CONDITION_AD_COMMISSION_AURA = 10, // 0 0, for condition true while one from AD ñommission aura active
CONDITION_NO_AURA = 11, // spell_id effindex
CONDITION_ACTIVE_EVENT = 12, // event_id
};
#define MAX_CONDITION 11 // maximum value in ConditionType enum
#define MAX_CONDITION 13 // maximum value in ConditionType enum
struct PlayerCondition
{
@ -742,6 +744,7 @@ class ObjectMgr
bool RemoveVendorItem(uint32 entry,uint32 item);
bool IsVendorItemValid( uint32 vendor_entry, uint32 item, uint32 maxcount, uint32 ptime, uint32 ExtendedCost, Player* pl = NULL, std::set<uint32>* skip_vendors = NULL ) const;
void LoadAchievementCriteriaList();
protected:
uint32 m_auctionid;
uint32 m_mailid;