Skip to content

Commit d5e18c5

Browse files
authored
[GEN][ZH] Remove unnecessary NULL pointer test in CrateCollide::isValidToExecute() (#1110)
1 parent 75a3a4b commit d5e18c5

File tree

2 files changed

+2
-2
lines changed
  • GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide
  • Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide

2 files changed

+2
-2
lines changed

Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ Bool CrateCollide::isValidToExecute( const Object *other ) const
163163
return FALSE;
164164

165165
// must match our kindof flags (if any)
166-
if (md && !other->isKindOfMulti(md->m_kindof, md->m_kindofnot))
166+
if ( !other->isKindOfMulti(md->m_kindof, md->m_kindofnot) )
167167
return FALSE;
168168

169169
if( other->isEffectivelyDead() )

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ Bool CrateCollide::isValidToExecute( const Object *other ) const
166166
return FALSE;
167167

168168
// must match our kindof flags (if any)
169-
if (md && !other->isKindOfMulti(md->m_kindof, md->m_kindofnot))
169+
if ( !other->isKindOfMulti(md->m_kindof, md->m_kindofnot) )
170170
return FALSE;
171171

172172
if( other->isEffectivelyDead() )

0 commit comments

Comments
 (0)