Skip to content

Commit 935559c

Browse files
committed
fixup! [GEN][ZH] Remove or repurpose RTS_INTERNAL specific code (#1231)
1 parent c1c7b90 commit 935559c

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5362,10 +5362,8 @@ Bool PartitionFilterPossibleToAttack::allow(Object *objOther)
53625362
// return false;
53635363

53645364
// we should have already filtered out isAbleToAttack!
5365-
#ifdef RTS_DEBUG
5366-
// disable this assert for INTERNAL builds (srj)
5367-
DEBUG_ASSERTCRASH(m_obj && m_obj->isAbleToAttack(), ("if the object is unable to attack at all, you should filter that out ahead of time!"));
5368-
#endif
5365+
DEBUG_ASSERTCRASH(m_obj->isAbleToAttack(), ("if the object is unable to attack at all, you should filter that out ahead of time!"));
5366+
53695367
CanAttackResult result = m_obj->getAbleToAttackSpecificObject( m_attackType, objOther, m_commandSource );
53705368
if( result == ATTACKRESULT_POSSIBLE || result == ATTACKRESULT_POSSIBLE_AFTER_MOVING )
53715369
{

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5387,10 +5387,8 @@ Bool PartitionFilterPossibleToAttack::allow(Object *objOther)
53875387
// objOther is guaranteed to be non-null, so we don't need to check (srj)
53885388

53895389
// we should have already filtered out isAbleToAttack!
5390-
#ifdef RTS_DEBUG
5391-
// disable this assert for INTERNAL builds (srj)
5392-
DEBUG_ASSERTCRASH(m_obj && m_obj->isAbleToAttack(), ("if the object is unable to attack at all, you should filter that out ahead of time!"));
5393-
#endif
5390+
DEBUG_ASSERTCRASH(m_obj->isAbleToAttack(), ("if the object is unable to attack at all, you should filter that out ahead of time!"));
5391+
53945392
CanAttackResult result = m_obj->getAbleToAttackSpecificObject( m_attackType, objOther, m_commandSource );
53955393
if( result == ATTACKRESULT_POSSIBLE || result == ATTACKRESULT_POSSIBLE_AFTER_MOVING )
53965394
{

0 commit comments

Comments
 (0)