From c3d1dcb606696d19f35230458dac66616104f2a2 Mon Sep 17 00:00:00 2001 From: Aleksey Komarov Date: Sun, 5 Jun 2022 17:54:32 +0300 Subject: [PATCH] [linux] use unique_ptr for CTechnique in s_device.* --- src/libs/renderer/src/s_device.cpp | 8 +++----- src/libs/renderer/src/s_device.h | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/libs/renderer/src/s_device.cpp b/src/libs/renderer/src/s_device.cpp index 2f2e9de35..b8d153456 100644 --- a/src/libs/renderer/src/s_device.cpp +++ b/src/libs/renderer/src/s_device.cpp @@ -563,7 +563,7 @@ bool DX9RENDER::Init() #ifdef _WIN32 // Effects RecompileEffects(); #else - pTechnique = new CTechnique(this); + pTechnique = std::make_unique(this); pTechnique->DecodeFiles(); #endif @@ -2647,8 +2647,7 @@ void DX9RENDER::RestoreRender() #ifdef _WIN32 // Effects RecompileEffects(); #else - STORM_DELETE(pTechnique); - pTechnique = new CTechnique(this); + pTechnique = std::make_unique(this); pTechnique->DecodeFiles(); #endif @@ -2764,8 +2763,7 @@ void DX9RENDER::RunStart() #ifdef _WIN32 // Effects RecompileEffects(); #else - STORM_DELETE(pTechnique); - pTechnique = new CTechnique(this); + pTechnique = std::make_unique(this); pTechnique->DecodeFiles(); #endif InvokeEntitiesRestoreRender(); diff --git a/src/libs/renderer/src/s_device.h b/src/libs/renderer/src/s_device.h index 8c743c408..aa87b2431 100644 --- a/src/libs/renderer/src/s_device.h +++ b/src/libs/renderer/src/s_device.h @@ -469,7 +469,7 @@ class DX9RENDER : public VDX9RENDER #ifdef _WIN32 // Effects Effects effects_; #else - CTechnique *pTechnique; + std::unique_ptr pTechnique; #endif char *fontIniFileName;