From d24f30452e651ef43ca65d70a412f3b9a830d065 Mon Sep 17 00:00:00 2001 From: Lwmte Date: Mon, 2 Aug 2021 11:25:53 +0300 Subject: [PATCH] Remove gnFrameCounter which is seemingly the same as GlobalCounter --- TR5Main/Game/draw.cpp | 1 - TR5Main/Game/draw.h | 1 - TR5Main/Renderer/Renderer11.cpp | 1 - TR5Main/Renderer/Renderer11Draw.cpp | 3 +-- 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/TR5Main/Game/draw.cpp b/TR5Main/Game/draw.cpp index 2810a2309..570a4d5bf 100644 --- a/TR5Main/Game/draw.cpp +++ b/TR5Main/Game/draw.cpp @@ -28,7 +28,6 @@ BOUNDING_BOX InterpolatedBounds; LARGE_INTEGER PerformanceCount; double LdFreq; double LdSync; -int GnFrameCounter; int DrawPhaseGame() { diff --git a/TR5Main/Game/draw.h b/TR5Main/Game/draw.h index 561a22f46..24e32c429 100644 --- a/TR5Main/Game/draw.h +++ b/TR5Main/Game/draw.h @@ -8,7 +8,6 @@ extern int StormTimer; extern int dLightningRand; extern byte SkyStormColor[3]; extern byte SkyStormColor2[3]; -extern int GnFrameCounter; int DrawPhaseGame(); int GetFrame_D2(ITEM_INFO* item, ANIM_FRAME* framePtr[], int* rate); diff --git a/TR5Main/Renderer/Renderer11.cpp b/TR5Main/Renderer/Renderer11.cpp index 284b34f8d..4d5c8799a 100644 --- a/TR5Main/Renderer/Renderer11.cpp +++ b/TR5Main/Renderer/Renderer11.cpp @@ -71,7 +71,6 @@ namespace T5M::Renderer { } while (i); } - GnFrameCounter++; return nf; } diff --git a/TR5Main/Renderer/Renderer11Draw.cpp b/TR5Main/Renderer/Renderer11Draw.cpp index 92e37372c..5dfeeb6a1 100644 --- a/TR5Main/Renderer/Renderer11Draw.cpp +++ b/TR5Main/Renderer/Renderer11Draw.cpp @@ -2581,7 +2581,7 @@ namespace T5M::Renderer m_context->OMSetBlendState(m_states->NonPremultiplied(), NULL, 0xFFFFFFFF); CCameraMatrixBuffer cameraConstantBuffer; view.fillConstantBuffer(cameraConstantBuffer); - cameraConstantBuffer.Frame = GnFrameCounter; + cameraConstantBuffer.Frame = GlobalCounter; cameraConstantBuffer.CameraUnderwater = g_Level.Rooms[cameraConstantBuffer.RoomNumber].flags & ENV_FLAG_WATER; m_cbCameraMatrices.updateData(cameraConstantBuffer, m_context.Get()); m_context->VSSetConstantBuffers(0, 1, m_cbCameraMatrices.get()); @@ -2722,7 +2722,6 @@ namespace T5M::Renderer m_context->OMSetBlendState(m_states->Opaque(), NULL, 0xFFFFFFFF); CCameraMatrixBuffer cameraConstantBuffer; view.fillConstantBuffer(cameraConstantBuffer); - cameraConstantBuffer.Frame = GnFrameCounter; cameraConstantBuffer.CameraUnderwater = g_Level.Rooms[cameraConstantBuffer.RoomNumber].flags & ENV_FLAG_WATER; m_cbCameraMatrices.updateData(cameraConstantBuffer, m_context.Get()); m_context->VSSetConstantBuffers(0, 1, m_cbCameraMatrices.get());