aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2018-01-25 12:39:19 +0100
committerTreeston <treeston.mmoc@gmail.com>2018-01-25 12:39:19 +0100
commit6c3c200cc52397b4b32ed76e676830e9f1d67d4c (patch)
treec321072ad1492d227dc4ff88ac5d4516a1ebe3d8 /src
parent6ce078d8e885f61ebdff3eb905e4cf6a2911da90 (diff)
Misc: assert -> ASSERT
Diffstat (limited to 'src')
-rw-r--r--src/common/DataStores/DBCFileLoader.cpp2
-rw-r--r--src/common/DataStores/DBCFileLoader.h11
-rw-r--r--src/server/game/Combat/ThreatManager.cpp2
-rw-r--r--src/server/scripts/Commands/cs_debug.cpp2
4 files changed, 8 insertions, 9 deletions
diff --git a/src/common/DataStores/DBCFileLoader.cpp b/src/common/DataStores/DBCFileLoader.cpp
index 5acc2761a44..b304e4764ae 100644
--- a/src/common/DataStores/DBCFileLoader.cpp
+++ b/src/common/DataStores/DBCFileLoader.cpp
@@ -119,7 +119,7 @@ DBCFileLoader::~DBCFileLoader()
DBCFileLoader::Record DBCFileLoader::getRecord(size_t id)
{
- assert(data);
+ ASSERT(data);
return Record(*this, data + id * recordSize);
}
diff --git a/src/common/DataStores/DBCFileLoader.h b/src/common/DataStores/DBCFileLoader.h
index cdcb4a5c488..38bd77e0bc6 100644
--- a/src/common/DataStores/DBCFileLoader.h
+++ b/src/common/DataStores/DBCFileLoader.h
@@ -21,7 +21,6 @@
#include "Define.h"
#include "Utilities/ByteConverter.h"
-#include <cassert>
enum DbcFieldFormat
{
@@ -51,29 +50,29 @@ class TC_COMMON_API DBCFileLoader
public:
float getFloat(size_t field) const
{
- assert(field < file.fieldCount);
+ ASSERT(field < file.fieldCount);
float val = *reinterpret_cast<float*>(offset+file.GetOffset(field));
EndianConvert(val);
return val;
}
uint32 getUInt(size_t field) const
{
- assert(field < file.fieldCount);
+ ASSERT(field < file.fieldCount);
uint32 val = *reinterpret_cast<uint32*>(offset+file.GetOffset(field));
EndianConvert(val);
return val;
}
uint8 getUInt8(size_t field) const
{
- assert(field < file.fieldCount);
+ ASSERT(field < file.fieldCount);
return *reinterpret_cast<uint8*>(offset+file.GetOffset(field));
}
const char *getString(size_t field) const
{
- assert(field < file.fieldCount);
+ ASSERT(field < file.fieldCount);
size_t stringOffset = getUInt(field);
- assert(stringOffset < file.stringSize);
+ ASSERT(stringOffset < file.stringSize);
return reinterpret_cast<char*>(file.stringTable + stringOffset);
}
diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp
index 0438ef85a66..2b32902a838 100644
--- a/src/server/game/Combat/ThreatManager.cpp
+++ b/src/server/game/Combat/ThreatManager.cpp
@@ -374,7 +374,7 @@ void ThreatManager::AddThreat(Unit* target, float amount, SpellInfo const* spell
target->GetThreatManager().PutThreatenedByMeRef(_owner->GetGUID(), ref);
Creature* cOwner = _owner->ToCreature();
- assert(cOwner); // if we got here the owner can have a threat list, and must be a creature!
+ ASSERT(cOwner); // if we got here the owner can have a threat list, and must be a creature!
if (!_ownerEngaged && (cOwner->HasReactState(REACT_PASSIVE) || !ref->IsOffline()))
{
_ownerEngaged = true;
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index 8d4326a2ea9..67c617cbb35 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -1786,7 +1786,7 @@ public:
for (auto const& pair : store)
{
SpawnGroupTemplateData const* groupData = sObjectMgr->GetSpawnGroupData(pair.first);
- assert(groupData); // checked by objectmgr on load
+ ASSERT(groupData); // checked by objectmgr on load
if (explain)
{
handler->PSendSysMessage(" |-- '%s' (%u)", groupData->name, pair.first);