summaryrefslogtreecommitdiff
path: root/src/client.cpp
diff options
context:
space:
mode:
authorsapier <Sapier at GMX dot net>2015-01-05 18:34:59 +0100
committersapier <Sapier at GMX dot net>2015-01-09 15:23:49 +0100
commit63867b1a372a4d1a4a4ffdec9d0862b094211a89 (patch)
tree677bcba3907e937c408e975a64f8232aad4f14fc /src/client.cpp
parente201620ee1051545ed7856fb18f805c67adccc85 (diff)
downloadminetest-63867b1a372a4d1a4a4ffdec9d0862b094211a89.tar.gz
minetest-63867b1a372a4d1a4a4ffdec9d0862b094211a89.tar.bz2
minetest-63867b1a372a4d1a4a4ffdec9d0862b094211a89.zip
Fix memory leaks due to messed up memory handling for particles as well as their spawners
Diffstat (limited to 'src/client.cpp')
-rw-r--r--src/client.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 04c59d077..536e9afa7 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -248,6 +248,7 @@ Client::Client(
device->getSceneManager(),
tsrc, this, device
),
+ m_particle_manager(&m_env),
m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, ipv6, this),
m_device(device),
m_server_ser_ver(SER_FMT_VER_INVALID),
@@ -2854,6 +2855,11 @@ MtEventManager* Client::getEventManager()
return m_event;
}
+ParticleManager* Client::getParticleManager()
+{
+ return &m_particle_manager;
+}
+
scene::IAnimatedMesh* Client::getMesh(const std::string &filename)
{
std::map<std::string, std::string>::const_iterator i =