luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-13 16:45:20 +02:00
Code Activity

Use irr_ptr for ClientEnvironment::m_map

Browse Source
This commit is contained in:
Desour
2023-07-10 00:00:00 +02:00
committed by sfan5
parent e3efaa1733
commit ecf8c7696a
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/client/clientenvironment.cpp
View File

@@ -43,10 +43,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
ClientEnvironment
*/
ClientEnvironment::ClientEnvironment(ClientMap *map,
ClientEnvironment::ClientEnvironment(irr_ptr<ClientMap> map,
ITextureSource *texturesource, Client *client):
Environment(client),
m_map(map),
m_map(std::move(map)),
m_texturesource(texturesource),
m_client(client)
{
@@ -60,18 +60,17 @@ ClientEnvironment::~ClientEnvironment()
delete simple_object;
}
// Drop/delete map
m_map->drop();
m_map.reset();
delete m_local_player;
}
Map & ClientEnvironment::getMap()
Map &ClientEnvironment::getMap()
{
return *m_map;
}
ClientMap & ClientEnvironment::getClientMap()
ClientMap &ClientEnvironment::getClientMap()
{
return *m_map;
}