diff options
| author | runningnak3d <runningnak3d@gmail.com> | 2011-02-13 20:42:57 -0700 |
|---|---|---|
| committer | runningnak3d <runningnak3d@gmail.com> | 2011-02-13 20:42:57 -0700 |
| commit | 30e45b9356832d0872cbf177dfd9211094e37ae3 (patch) | |
| tree | 2e2f090a040c3557ff36844c5a43758f309cba1c /src | |
| parent | 2d9ecceae396f5da4e562a2bb1636205c281fbc7 (diff) | |
Core/SAI: Change SMART_ACTION_PLAY_EMOTE and SMART_ACTION_RANDOM_EMOTE
to use the new IsEmoteValid which checks Emote.dbc.
Thanks Nay for noticing the problem
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScriptMgr.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index 3c9ceb39a36..7662071fd04 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -533,7 +533,7 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder &e) break; case SMART_ACTION_SET_EMOTE_STATE: case SMART_ACTION_PLAY_EMOTE: - if (!IsTextEmoteValid(e, e.action.emote.emote)) return false; + if (!IsEmoteValid(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 && !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; + 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; break; case SMART_ACTION_ADD_AURA: case SMART_ACTION_CAST: |