Merge branch 'master' of github.com:TrinityCore/TrinityCore
This commit is contained in:
@@ -1410,10 +1410,11 @@ class Player : public Unit, public GridObject<Player>
|
||||
void IncompleteQuest(uint32 quest_id);
|
||||
void RewardQuest(Quest const* quest, uint32 reward, Object* questGiver, bool announce = true);
|
||||
void FailQuest(uint32 quest_id);
|
||||
bool SatisfyQuestSkillOrClass(Quest const* qInfo, bool msg);
|
||||
bool SatisfyQuestSkill(Quest const* qInfo, bool msg) const;
|
||||
bool SatisfyQuestLevel(Quest const* qInfo, bool msg);
|
||||
bool SatisfyQuestLog(bool msg);
|
||||
bool SatisfyQuestPreviousQuest(Quest const* qInfo, bool msg);
|
||||
bool SatisfyQuestClass(Quest const* qInfo, bool msg) const;
|
||||
bool SatisfyQuestRace(Quest const* qInfo, bool msg);
|
||||
bool SatisfyQuestReputation(Quest const* qInfo, bool msg);
|
||||
bool SatisfyQuestStatus(Quest const* qInfo, bool msg);
|
||||
@@ -1493,7 +1494,7 @@ class Player : public Unit, public GridObject<Player>
|
||||
void SendQuestReward(Quest const* quest, uint32 XP, Object* questGiver);
|
||||
void SendQuestFailed(uint32 questId, InventoryResult reason = EQUIP_ERR_OK);
|
||||
void SendQuestTimerFailed(uint32 quest_id);
|
||||
void SendCanTakeQuestResponse(uint32 msg);
|
||||
void SendCanTakeQuestResponse(uint32 msg) const;
|
||||
void SendQuestConfirmAccept(Quest const* quest, Player* pReceiver);
|
||||
void SendPushToPartyResponse(Player* player, uint32 msg);
|
||||
void SendQuestUpdateAddItem(Quest const* quest, uint32 item_idx, uint16 count);
|
||||
@@ -1530,7 +1531,7 @@ class Player : public Unit, public GridObject<Player>
|
||||
/*** SAVE SYSTEM ***/
|
||||
/*********************************************************/
|
||||
|
||||
void SaveToDB();
|
||||
void SaveToDB(bool create = false);
|
||||
void SaveInventoryAndGoldToDB(SQLTransaction& trans); // fast save function for item/money cheating preventing
|
||||
void SaveGoldToDB(SQLTransaction& trans);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user