Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit 020d2ee

Browse files
committed
Disable some asserts in Final
1 parent 8c1c5c9 commit 020d2ee

File tree

3 files changed

+18
-0
lines changed

3 files changed

+18
-0
lines changed

Entities/AtomGroup.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,10 @@ namespace RTE {
10081008
if (hitMOID != g_NoMOID) {
10091009
hitData.Body[HITOR] = m_OwnerMOSR;
10101010
hitData.Body[HITEE] = g_MovableMan.GetMOFromID(hitMOID);
1011+
1012+
#ifndef RELEASE_BUILD
10111013
RTEAssert(hitData.Body[HITEE], "Hitee MO is 0 in AtomGroup::PushTravel!");
1014+
#endif
10121015

10131016
hitData.Body[HITEE]->CollideAtPoint(hitData);
10141017

Entities/MovableObject.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,8 +1093,12 @@ friend class Atom;
10931093
// Return value: None.
10941094

10951095
void AddImpulseForce(const Vector &impulse, const Vector &offset = Vector()) {
1096+
1097+
#ifndef RELEASE_BUILD
10961098
RTEAssert(impulse.GetLargest() < 500000, "HUEG IMPULSE FORCE");
10971099
RTEAssert(offset.GetLargest() < 5000, "HUEG IMPULSE FORCE OFFSET");
1100+
#endif
1101+
10981102
m_ImpulseForces.push_back(std::make_pair(impulse, offset));
10991103
}
11001104

@@ -1111,7 +1115,11 @@ friend class Atom;
11111115
// Return value: None.
11121116

11131117
void AddAbsImpulseForce(const Vector &impulse, const Vector &absPos) {
1118+
1119+
#ifndef RELEASE_BUILD
11141120
RTEAssert(impulse.GetLargest() < 500000, "HUEG IMPULSE FORCE");
1121+
#endif
1122+
11151123
m_ImpulseForces.push_back(std::make_pair(impulse, g_SceneMan.ShortestDistance(m_Pos, absPos) * c_MPP));
11161124
}
11171125

System/Atom.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,12 @@ namespace RTE {
300300

301301
m_LastHit.Body[HITOR] = m_OwnerMO;
302302
m_LastHit.Body[HITEE] = g_MovableMan.GetMOFromID(m_MOIDHit);
303+
304+
#ifndef RELEASE_BUILD
303305
RTEAssert(m_LastHit.Body[HITEE], "Hitee MO is 0 in Atom::MOHitResponse!");
304306
RTEAssert(m_MOIDHit == m_LastHit.Body[HITEE]->GetID(), "g_MovableMan.GetMOFromID messed up in Atom::MOHitResponse!");
307+
#endif
308+
305309
// Get the roots for both bodies
306310
if (m_LastHit.Body[HITOR]) { m_LastHit.RootBody[HITOR] = m_LastHit.Body[HITOR]->GetRootParent(); }
307311
if (m_LastHit.Body[HITEE]) { m_LastHit.RootBody[HITEE] = m_LastHit.Body[HITEE]->GetRootParent(); }
@@ -771,8 +775,11 @@ namespace RTE {
771775

772776
m_LastHit.Body[HITOR] = m_OwnerMO;
773777
m_LastHit.Body[HITEE] = MO;
778+
779+
#ifndef RELEASE_BUILD
774780
RTEAssert(m_LastHit.Body[HITEE], "Hitee MO is 0 in Atom::Travel!");
775781
RTEAssert(m_MOIDHit == m_LastHit.Body[HITEE]->GetID(), "g_MovableMan.GetMOFromID messed up in Atom::MOHitResponse!");
782+
#endif
776783

777784
// Don't do this normal approximation based on object centers, it causes particles to 'slide into' sprite objects when they should be resting on them.
778785
// Orthogonal normals only, as the pixel boundaries themselves! See further down for the setting of this.

0 commit comments

Comments
 (0)