Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/SAI: Change SMART_ACTION_PLAY_EMOTE and SMART_ACTION_RANDOM_EMOTE

Browse Source 
to use the new IsEmoteValid which checks Emote.dbc.
Thanks Nay for noticing the problem
This commit is contained in:
runningnak3d
2011-02-13 20:42:57 -07:00
parent 2d9ecceae3
commit 30e45b9356
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
View File

@@ -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: