josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/SAI: Rename IsEmoteValid to a more fitting name of IsTextEmoteValid

Browse Source
This commit is contained in:
runningnak3d
2011-02-13 20:33:48 -07:00
parent bff4ca446b
commit 27f5d396a2
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
+8 -8
View File
@@ -400,7 +400,7 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder &e)
break; break;
case SMART_EVENT_RECEIVE_EMOTE: 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; if (!IsMinMaxValid(e, e.event.emote.cooldownMin, e.event.emote.cooldownMax)) return false;
break; break;
} }
@@ -533,7 +533,7 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder &e)
break; break;
case SMART_ACTION_SET_EMOTE_STATE: case SMART_ACTION_SET_EMOTE_STATE:
case SMART_ACTION_PLAY_EMOTE: case SMART_ACTION_PLAY_EMOTE:
if (!IsEmoteValid(e, e.action.emote.emote)) return false; if (!IsTextEmoteValid(e, e.action.emote.emote)) return false;
break; break;
case SMART_ACTION_FAIL_QUEST: case SMART_ACTION_FAIL_QUEST:
case SMART_ACTION_ADD_QUEST: case SMART_ACTION_ADD_QUEST:
@@ -549,12 +549,12 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder &e)
break; break;
} }
case SMART_ACTION_RANDOM_EMOTE: case SMART_ACTION_RANDOM_EMOTE:
if (e.action.randomEmote.emote1 && !IsEmoteValid(e, e.action.randomEmote.emote1)) return false; if (e.action.randomEmote.emote1 && !IsTextEmoteValid(e, e.action.randomEmote.emote1)) return false;
if (e.action.randomEmote.emote2 && !IsEmoteValid(e, e.action.randomEmote.emote2)) return false; if (e.action.randomEmote.emote2 && !IsTextEmoteValid(e, e.action.randomEmote.emote2)) return false;
if (e.action.randomEmote.emote3 && !IsEmoteValid(e, e.action.randomEmote.emote3)) return false; if (e.action.randomEmote.emote3 && !IsTextEmoteValid(e, e.action.randomEmote.emote3)) return false;
if (e.action.randomEmote.emote4 && !IsEmoteValid(e, e.action.randomEmote.emote4)) return false; if (e.action.randomEmote.emote4 && !IsTextEmoteValid(e, e.action.randomEmote.emote4)) return false;
if (e.action.randomEmote.emote5 && !IsEmoteValid(e, e.action.randomEmote.emote5)) return false; if (e.action.randomEmote.emote5 && !IsTextEmoteValid(e, e.action.randomEmote.emote5)) return false;
if (e.action.randomEmote.emote6 && !IsEmoteValid(e, e.action.randomEmote.emote6)) return false; if (e.action.randomEmote.emote6 && !IsTextEmoteValid(e, e.action.randomEmote.emote6)) return false;
break; break;
case SMART_ACTION_ADD_AURA: case SMART_ACTION_ADD_AURA:
case SMART_ACTION_CAST: case SMART_ACTION_CAST:
src/server/game/AI/SmartScripts/SmartScriptMgr.h
+2 -2
View File
@@ -1307,11 +1307,11 @@ class SmartAIMgr
} }
return true; return true;
}*/ }*/
inline bool IsEmoteValid(SmartScriptHolder e, uint32 entry) inline bool IsTextEmoteValid(SmartScriptHolder e, uint32 entry)
{ {
if (!sEmotesTextStore.LookupEntry(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 false;
} }
return true; return true;