From a19c71a77075b569192eca556635dba85ac6f2ec Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Mon, 30 Aug 2021 11:20:31 +0200 Subject: Core/SAI: Change error to warning for unused parameters (#26848) Change error to warning for unused parameters and load the scripts instead of skipping them (cherry picked from commit cb764a932d640698ed7cd92dd1e02d08243a8ad3) --- src/server/game/AI/SmartScripts/SmartScriptMgr.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index 82589e5cde9..81ec523dd66 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -865,19 +865,17 @@ bool SmartAIMgr::CheckUnusedEventParams(SmartScriptHolder const& e) static size_t rawCount = sizeof(SmartEvent::raw) / sizeof(uint32); size_t paramsCount = paramsStructSize / sizeof(uint32); - bool valid = true; for (size_t index = paramsCount; index < rawCount; index++) { uint32 value = ((uint32*)&e.event.raw)[index]; if (value != 0) { - TC_LOG_ERROR("sql.sql", "SmartAIMgr: Entry " SI64FMTD " SourceType %u Event %u Action %u has unused event_param%zu with value %u, it must be 0, skipped.", + TC_LOG_WARN("sql.sql", "SmartAIMgr: Entry " SI64FMTD " SourceType %u Event %u Action %u has unused event_param%zu with value %u, it should be 0.", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType(), index + 1, value); - valid = false; } } - return valid; + return true; } bool SmartAIMgr::CheckUnusedActionParams(SmartScriptHolder const& e) @@ -1045,19 +1043,17 @@ bool SmartAIMgr::CheckUnusedActionParams(SmartScriptHolder const& e) static size_t rawCount = sizeof(SmartAction::raw) / sizeof(uint32); size_t paramsCount = paramsStructSize / sizeof(uint32); - bool valid = true; for (size_t index = paramsCount; index < rawCount; index++) { uint32 value = ((uint32*)&e.action.raw)[index]; if (value != 0) { - TC_LOG_ERROR("sql.sql", "SmartAIMgr: Entry " SI64FMTD " SourceType %u Event %u Action %u has unused action_param%zu with value %u, it must be 0, skipped.", + TC_LOG_WARN("sql.sql", "SmartAIMgr: Entry " SI64FMTD " SourceType %u Event %u Action %u has unused action_param%zu with value %u, it should be 0.", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType(), index + 1, value); - valid = false; } } - return valid; + return true; } bool SmartAIMgr::CheckUnusedTargetParams(SmartScriptHolder const& e) @@ -1108,19 +1104,17 @@ bool SmartAIMgr::CheckUnusedTargetParams(SmartScriptHolder const& e) static size_t rawCount = sizeof(SmartTarget::raw) / sizeof(uint32); size_t paramsCount = paramsStructSize / sizeof(uint32); - bool valid = true; for (size_t index = paramsCount; index < rawCount; index++) { uint32 value = ((uint32*)&e.target.raw)[index]; if (value != 0) { - TC_LOG_ERROR("sql.sql", "SmartAIMgr: Entry " SI64FMTD " SourceType %u Event %u Action %u has unused target_param%zu with value %u, it must be 0, skipped.", + TC_LOG_WARN("sql.sql", "SmartAIMgr: Entry " SI64FMTD " SourceType %u Event %u Action %u has unused target_param%zu with value %u, it should be 0.", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType(), index + 1, value); - valid = false; } } - return valid; + return true; } bool SmartAIMgr::IsEventValid(SmartScriptHolder& e) -- cgit v1.2.3