Skip to content

Commit b7f6f13

Browse files
committed
chore: Add assertion while keeping the compiler happy
1 parent 9443ef1 commit b7f6f13

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Generals/Code/GameEngine/Source/Common/RTS/TunnelTracker.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,10 +332,12 @@ void TunnelTracker::updateFullHealTime()
332332
continue;
333333

334334
const ContainModuleInterface* contain = tunnelObj->getContain();
335-
if (!contain->isTunnelContain())
335+
DEBUG_ASSERTCRASH(contain != NULL, ("Contain module is NULL"));
336+
337+
if (!contain || !contain->isTunnelContain())
336338
continue;
337339

338-
const TunnelContain* tunnelContain = static_cast<const TunnelContain*>(contain); // Downcast is not ideal
340+
const TunnelContain* tunnelContain = static_cast<const TunnelContain*>(contain);
339341
if (!tunnelContain)
340342
continue;
341343

GeneralsMD/Code/GameEngine/Source/Common/RTS/TunnelTracker.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,10 +333,12 @@ void TunnelTracker::updateFullHealTime()
333333
continue;
334334

335335
const ContainModuleInterface* contain = tunnelObj->getContain();
336-
if (!contain->isTunnelContain())
336+
DEBUG_ASSERTCRASH(contain != NULL, ("Contain module is NULL"));
337+
338+
if (!contain || !contain->isTunnelContain())
337339
continue;
338340

339-
const TunnelContain* tunnelContain = static_cast<const TunnelContain*>(contain); // Downcast is not ideal
341+
const TunnelContain* tunnelContain = static_cast<const TunnelContain*>(contain);
340342
if (!tunnelContain)
341343
continue;
342344

0 commit comments

Comments
 (0)