From 925264c000b82f60f742d64dd8fc25106d45af2b Mon Sep 17 00:00:00 2001 From: ariel- Date: Wed, 28 Mar 2018 05:54:57 -0300 Subject: [PATCH] Misc: build fixes (linux) --- src/server/bnetserver/Server/SessionManager.h | 1 + src/server/game/AI/SmartScripts/SmartScript.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/server/bnetserver/Server/SessionManager.h b/src/server/bnetserver/Server/SessionManager.h index 325db4773f7..98378896ec8 100644 --- a/src/server/bnetserver/Server/SessionManager.h +++ b/src/server/bnetserver/Server/SessionManager.h @@ -21,6 +21,7 @@ #include "SocketMgr.h" #include "Session.h" #include +#include namespace Battlenet { diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 0eb43f94f97..069414b095c 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -1744,10 +1744,10 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u for (WorldObject* target : targets) { - if (Creature* target = target->ToCreature()) + if (Creature* creature = target->ToCreature()) { - if (IsSmart(target)) - ENSURE_AI(SmartAI, target->AI())->SetScript9(e, id, GetLastInvoker()); + if (IsSmart(creature)) + ENSURE_AI(SmartAI, creature->AI())->SetScript9(e, id, GetLastInvoker()); } else if (GameObject* goTarget = target->ToGameObject()) { @@ -2067,9 +2067,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u for (WorldObject* target : targets) { - if (Creature* target = target->ToCreature()) + if (Creature* creature = target->ToCreature()) { - if (IsSmart(target)) + if (IsSmart(creature)) { for (uint32 wp : waypoints) { @@ -2082,7 +2082,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u { if (WayPoint* wp = itrWp->second) { - float distToThisPath = target->GetDistance(wp->x, wp->y, wp->z); + float distToThisPath = creature->GetDistance(wp->x, wp->y, wp->z); if (distToThisPath < distanceToClosest) { distanceToClosest = distToThisPath; @@ -2093,7 +2093,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u } if (closestWp) - CAST_AI(SmartAI, target->AI())->StartPath(false, closestWp->id, true); + CAST_AI(SmartAI, creature->AI())->StartPath(false, closestWp->id, true); } } }