aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/GameObject
diff options
context:
space:
mode:
authorQAston <none@none>2010-07-30 20:04:28 +0200
committerQAston <none@none>2010-07-30 20:04:28 +0200
commit48b360097c2bd6a6ce9ffd1e96746c7b04ae420d (patch)
treea3978389097963393417d93e85d3bca50eb3aff5 /src/server/game/Entities/GameObject
parent3dc29732b7dabab22c0b30581a141cb56074f099 (diff)
*use ASSERT macro instead of regular assert for better output.
--HG-- branch : trunk
Diffstat (limited to 'src/server/game/Entities/GameObject')
-rw-r--r--src/server/game/Entities/GameObject/GameObject.cpp2
-rw-r--r--src/server/game/Entities/GameObject/GameObject.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 3361f4c40f7..1dac4ba5e2e 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -551,7 +551,7 @@ void GameObject::Delete()
if (Unit * owner = GetOwner())
owner->RemoveGameObject(this, false);
- assert (!GetOwnerGUID());
+ ASSERT (!GetOwnerGUID());
SendObjectDeSpawnAnim(GetGUID());
SetGoState(GO_STATE_READY);
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index ccb2a42399d..e466320df71 100644
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -634,7 +634,7 @@ class GameObject : public WorldObject, public GridObject<GameObject>
// Owner already found and different than expected owner - remove object from old owner
if (owner && GetOwnerGUID() && GetOwnerGUID() != owner)
{
- assert(false);
+ ASSERT(false);
}
m_spawnedByDefault = false; // all object with owner is despawned after delay
SetUInt64Value(OBJECT_FIELD_CREATED_BY, owner);