From f53bae99b17f67f638cbe4edbd1f7b4525a651e3 Mon Sep 17 00:00:00 2001 From: xezon <4720891+xezon@users.noreply.github.com> Date: Mon, 26 May 2025 23:34:38 +0200 Subject: [PATCH] [GEN][ZH] Remove unnecessary NULL pointer test in RTS3DScene::Visibility_Check() --- .../GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp | 3 +-- .../GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp index 2f8633aa94e..6f4fd4bb3fa 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp @@ -391,8 +391,7 @@ void RTS3DScene::Visibility_Check(CameraClass * camera) m_translucentObjectsCount=0; m_numNonOccluderOrOccludee=0; - Int currentFrame=0; - if (TheGameLogic) currentFrame = TheGameLogic->getFrame(); + Int currentFrame=TheGameLogic->getFrame(); if (currentFrame <= TheGlobalData->m_defaultOcclusionDelay) currentFrame = TheGlobalData->m_defaultOcclusionDelay+1; //make sure occlusion is enabled when game starts (frame 0). diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp index 95153b513e0..bda1ddb1e0e 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp @@ -408,8 +408,7 @@ void RTS3DScene::Visibility_Check(CameraClass * camera) m_translucentObjectsCount=0; m_numNonOccluderOrOccludee=0; - Int currentFrame=0; - if (TheGameLogic) currentFrame = TheGameLogic->getFrame(); + Int currentFrame=TheGameLogic->getFrame(); if (currentFrame <= TheGlobalData->m_defaultOcclusionDelay) currentFrame = TheGlobalData->m_defaultOcclusionDelay+1; //make sure occlusion is enabled when game starts (frame 0).