From 8d58bb93c903a6f6c781d9662688b43777d19ad1 Mon Sep 17 00:00:00 2001 From: MitchesD Date: Thu, 2 Apr 2015 18:34:31 +0200 Subject: Core/SAI: fix merge conflict it's good to use CTRL + S --- src/server/game/AI/SmartScripts/SmartScript.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/AI/SmartScripts/SmartScript.h b/src/server/game/AI/SmartScripts/SmartScript.h index 4b77b22da69..a3d75f1889b 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.h +++ b/src/server/game/AI/SmartScripts/SmartScript.h @@ -175,7 +175,8 @@ class SmartScript return 0; } - GameObject* FindGameObjectNear(WorldObject* searchObject, ObjectGuid::LowType guid) const { + GameObject* FindGameObjectNear(WorldObject* searchObject, uint32 guid) const + { GameObject* gameObject = NULL; CellCoord p(Trinity::ComputeCellCoord(searchObject->GetPositionX(), searchObject->GetPositionY())); -- cgit v1.2.3