mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 19:37:02 +00:00
Merge 'master' into 310
Please enter the commit message for your changes. Lines starting
This commit is contained in:
parent
3423b5dbb2
commit
66f554f74d
26 changed files with 513 additions and 395 deletions
|
|
@ -41,7 +41,7 @@ struct Script
|
|||
pGossipHello(NULL), pQuestAccept(NULL), pGossipSelect(NULL), pGossipSelectWithCode(NULL),
|
||||
pQuestSelect(NULL), pQuestComplete(NULL), pNPCDialogStatus(NULL), pGODialogStatus(NULL), pChooseReward(NULL),
|
||||
pItemHello(NULL), pGOHello(NULL), pAreaTrigger(NULL), pItemQuestAccept(NULL), pGOQuestAccept(NULL),
|
||||
pGOChooseReward(NULL), pReceiveEmote(NULL), pItemUse(NULL), pEffectDummyGameObj(NULL), pEffectDummyCreature(NULL),
|
||||
pGOChooseReward(NULL), pItemUse(NULL), pEffectDummyGameObj(NULL), pEffectDummyCreature(NULL),
|
||||
pEffectDummyItem(NULL), GetAI(NULL)
|
||||
{}
|
||||
|
||||
|
|
@ -63,7 +63,6 @@ struct Script
|
|||
bool (*pItemQuestAccept )(Player *player, Item *_Item, Quest const*_Quest );
|
||||
bool (*pGOQuestAccept )(Player *player, GameObject *_GO, Quest const*_Quest );
|
||||
bool (*pGOChooseReward )(Player *player, GameObject *_GO, Quest const*_Quest, uint32 opt );
|
||||
bool (*pReceiveEmote )(Player *player, Creature *_Creature, uint32 emote );
|
||||
bool (*pItemUse )(Player *player, Item* _Item, SpellCastTargets const& targets);
|
||||
bool (*pEffectDummyGameObj )(Unit*, uint32, uint32, GameObject* );
|
||||
bool (*pEffectDummyCreature )(Unit*, uint32, uint32, Creature* );
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue