Skip to content

Commit b1e6792

Browse files
authored
[GEN][ZH] Remove unnecessary NULL pointer test in RTS3DScene::Visibility_Check() (#1146)
1 parent 99003dc commit b1e6792

File tree

2 files changed

+2
-4
lines changed
  • GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient
  • Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient

2 files changed

+2
-4
lines changed

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,7 @@ void RTS3DScene::Visibility_Check(CameraClass * camera)
399399
m_translucentObjectsCount=0;
400400
m_numNonOccluderOrOccludee=0;
401401

402-
Int currentFrame=0;
403-
if (TheGameLogic) currentFrame = TheGameLogic->getFrame();
402+
Int currentFrame=TheGameLogic->getFrame();
404403
if (currentFrame <= TheGlobalData->m_defaultOcclusionDelay)
405404
currentFrame = TheGlobalData->m_defaultOcclusionDelay+1; //make sure occlusion is enabled when game starts (frame 0).
406405

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,7 @@ void RTS3DScene::Visibility_Check(CameraClass * camera)
415415
m_translucentObjectsCount=0;
416416
m_numNonOccluderOrOccludee=0;
417417

418-
Int currentFrame=0;
419-
if (TheGameLogic) currentFrame = TheGameLogic->getFrame();
418+
Int currentFrame=TheGameLogic->getFrame();
420419
if (currentFrame <= TheGlobalData->m_defaultOcclusionDelay)
421420
currentFrame = TheGlobalData->m_defaultOcclusionDelay+1; //make sure occlusion is enabled when game starts (frame 0).
422421

0 commit comments

Comments
 (0)