diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScriptMgr.cpp | 16 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScriptMgr.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index b6bda73d7c2..3c9ceb39a36 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -400,7 +400,7 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder &e) break; case SMART_EVENT_RECEIVE_EMOTE: { - if (e.event.emote.emote && !IsEmoteValid(e, e.event.emote.emote)) return false; + if (e.event.emote.emote && !IsTextEmoteValid(e, e.event.emote.emote)) return false; if (!IsMinMaxValid(e, e.event.emote.cooldownMin, e.event.emote.cooldownMax)) return false; break; } @@ -533,7 +533,7 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder &e) break; case SMART_ACTION_SET_EMOTE_STATE: case SMART_ACTION_PLAY_EMOTE: - if (!IsEmoteValid(e, e.action.emote.emote)) return false; + if (!IsTextEmoteValid(e, e.action.emote.emote)) return false; break; case SMART_ACTION_FAIL_QUEST: case SMART_ACTION_ADD_QUEST: @@ -549,12 +549,12 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder &e) break; } case SMART_ACTION_RANDOM_EMOTE: - if (e.action.randomEmote.emote1 && !IsEmoteValid(e, e.action.randomEmote.emote1)) return false; - if (e.action.randomEmote.emote2 && !IsEmoteValid(e, e.action.randomEmote.emote2)) return false; - if (e.action.randomEmote.emote3 && !IsEmoteValid(e, e.action.randomEmote.emote3)) return false; - if (e.action.randomEmote.emote4 && !IsEmoteValid(e, e.action.randomEmote.emote4)) return false; - if (e.action.randomEmote.emote5 && !IsEmoteValid(e, e.action.randomEmote.emote5)) return false; - if (e.action.randomEmote.emote6 && !IsEmoteValid(e, e.action.randomEmote.emote6)) return false; + if (e.action.randomEmote.emote1 && !IsTextEmoteValid(e, e.action.randomEmote.emote1)) return false; + if (e.action.randomEmote.emote2 && !IsTextEmoteValid(e, e.action.randomEmote.emote2)) return false; + if (e.action.randomEmote.emote3 && !IsTextEmoteValid(e, e.action.randomEmote.emote3)) return false; + if (e.action.randomEmote.emote4 && !IsTextEmoteValid(e, e.action.randomEmote.emote4)) return false; + if (e.action.randomEmote.emote5 && !IsTextEmoteValid(e, e.action.randomEmote.emote5)) return false; + if (e.action.randomEmote.emote6 && !IsTextEmoteValid(e, e.action.randomEmote.emote6)) return false; break; case SMART_ACTION_ADD_AURA: case SMART_ACTION_CAST: diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index 0cb91af2e04..784a9e1cc93 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -1307,11 +1307,11 @@ class SmartAIMgr } return true; }*/ - inline bool IsEmoteValid(SmartScriptHolder e, uint32 entry) + inline bool IsTextEmoteValid(SmartScriptHolder e, uint32 entry) { if (!sEmotesTextStore.LookupEntry(entry)) { - sLog->outErrorDb("SmartAIMgr: Entry %d SourceType %u Event %u Action %u uses non-existent Emote entry %u, skipped.", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType(), entry); + sLog->outErrorDb("SmartAIMgr: Entry %d SourceType %u Event %u Action %u uses non-existent Text Emote entry %u, skipped.", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType(), entry); return false; } return true; |