From b93ae33f8559258b042acec35fcb90bbfeb0b5de Mon Sep 17 00:00:00 2001 From: Desour Date: Tue, 11 Jul 2023 00:00:00 +0200 Subject: [PATCH] Use irr_ptr for Game::sky --- src/client/game.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client/game.cpp b/src/client/game.cpp index 1dcaa225b..9022f4acc 100644 --- a/src/client/game.cpp +++ b/src/client/game.cpp @@ -595,7 +595,8 @@ public: m_client(client) {} - void setSky(Sky *sky) { + void setSky(Sky *sky) + { m_sky = sky; for (GameGlobalShaderConstantSetter *ggscs : created_nosky) { ggscs->setSky(m_sky); @@ -894,7 +895,7 @@ private: MapDrawControl *draw_control = nullptr; Camera *camera = nullptr; irr_ptr clouds; - Sky *sky = nullptr; // Free using ->Drop() + irr_ptr sky; Hud *hud = nullptr; Minimap *mapper = nullptr; @@ -1267,8 +1268,7 @@ void Game::shutdown() gui_chat_console.reset(); - if (sky) - sky->drop(); + sky.reset(); /* cleanup menus */ while (g_menumgr.menuCount() > 0) { @@ -1526,8 +1526,8 @@ bool Game::createClient(const GameStartData &start_data) /* Skybox */ - sky = new Sky(-1, m_rendering_engine, texture_src, shader_src); - scsf->setSky(sky); + sky = make_irr(-1, m_rendering_engine, texture_src, shader_src); + scsf->setSky(sky.get()); /* Pre-calculated values */