diff options
| author | MitchesD <majklprofik@seznam.cz> | 2015-04-02 18:34:31 +0200 |
|---|---|---|
| committer | MitchesD <majklprofik@seznam.cz> | 2015-04-02 18:34:31 +0200 |
| commit | 8d58bb93c903a6f6c781d9662688b43777d19ad1 (patch) | |
| tree | c8103e539d7082d57cbbc91102f470c158722a0c | |
| parent | 1de02764c7f66d954854f1ce7df56ffdabe9d7fe (diff) | |
Core/SAI: fix merge conflict
it's good to use CTRL + S
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScript.h | 3 |
1 files changed, 2 insertions, 1 deletions
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())); |