Skip to content

Commit 35c9929

Browse files
author
Marek Kulik
committed
Split assertions into separate lines (CIdArray)
1 parent ecdf63a commit 35c9929

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Shared/mods/deathmatch/logic/CIdArray.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ SArrayId CIdArray::PopUniqueId ( void* pObject, EIdClassType idClass )
7777
assert ( bSuccess );
7878

7979
// Checks
80-
assert ( ( ulPhysicalIndex != INVALID_ARRAY_ID ) &&
81-
( ulPhysicalIndex <= m_uiCapacity ) &&
82-
( m_Elements.size () > ulPhysicalIndex ) &&
83-
( m_Elements [ ulPhysicalIndex ].pObject == NULL ) &&
84-
( m_Elements [ ulPhysicalIndex ].idClass == EIdClass::NONE ) );
80+
assert( ulPhysicalIndex != INVALID_ARRAY_ID );
81+
assert( ulPhysicalIndex <= m_uiCapacity );
82+
assert( m_Elements.size () > ulPhysicalIndex );
83+
assert( m_Elements [ ulPhysicalIndex ].pObject == nullptr );
84+
assert( m_Elements [ ulPhysicalIndex ].idClass == EIdClass::NONE );
8585

8686
m_Elements [ ulPhysicalIndex ].pObject = pObject;
8787
m_Elements [ ulPhysicalIndex ].idClass = idClass;
@@ -100,10 +100,10 @@ void CIdArray::PushUniqueId ( void* pObject, EIdClassType idClass, SArrayId id )
100100
SArrayId ulPhysicalIndex = id - SHARED_ARRAY_BASE_ID;
101101

102102
// Checks
103-
assert ( ( id != INVALID_ARRAY_ID ) &&
104-
( ulPhysicalIndex <= m_uiCapacity ) &&
105-
( m_Elements [ ulPhysicalIndex ].pObject == pObject ) &&
106-
( m_Elements [ ulPhysicalIndex ].idClass == idClass ) );
103+
assert( id != INVALID_ARRAY_ID );
104+
assert( ulPhysicalIndex <= m_uiCapacity );
105+
assert( m_Elements [ ulPhysicalIndex ].pObject == pObject );
106+
assert( m_Elements [ ulPhysicalIndex ].idClass == idClass );
107107

108108
m_IDStack.Push ( ulPhysicalIndex );
109109
m_Elements [ ulPhysicalIndex ].pObject = NULL;

0 commit comments

Comments
 (0)