Merge remote-tracking branch 'origin' into lsid

This commit is contained in:
Akkadius
2019-07-21 22:18:19 +00:00
39 changed files with 497 additions and 383 deletions
+1 -1
View File
@@ -744,7 +744,7 @@ public:
const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0);
void Shout(const char *format, ...);
void Emote(const char *format, ...);
void QuestJournalledSay(Client *QuestInitiator, const char *str);
void QuestJournalledSay(Client *QuestInitiator, const char *str, Journal::Options &opts);
int32 GetItemStat(uint32 itemid, const char *identifier);
int16 CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, bool best_focus=false);