From e4e8c1c59c8b37216814526b4d2551f23934f465 Mon Sep 17 00:00:00 2001 From: Treeston Date: Thu, 23 Aug 2018 14:33:28 +0200 Subject: Core/AI: Clean up charm AI handling, we now have two unique_ptr instead of a crapton of booleans (cherry picked from commit 042f5515e4f3e52b0d2e23d9b9e147041849ce12) --- src/server/scripts/Commands/cs_debug.cpp | 4 +--- src/server/scripts/Commands/cs_npc.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/server/scripts/Commands') diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 752fcc19386..f78442af163 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -1354,10 +1354,8 @@ public: if (!player) return false; Creature* target = handler->getSelectedCreature(); - if (!target || !target->IsAIEnabled || !target->AI()) - { + if (!target || !target->IsAIEnabled()) return false; - } char* fill_str = args ? strtok((char*)args, " ") : nullptr; char* duration_str = args ? strtok(nullptr, " ") : nullptr; diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 8d6ba06b49a..229f1ea9b64 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -1584,7 +1584,7 @@ public: return false; } - if (!creatureTarget->IsAIEnabled) + if (!creatureTarget->IsAIEnabled()) { handler->PSendSysMessage(LANG_CREATURE_NOT_AI_ENABLED); handler->SetSentErrorMessage(true); -- cgit v1.2.3