summaryrefslogtreecommitdiff
path: root/src/client.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2012-03-23 15:29:30 +0200
committerPerttu Ahola <celeron55@gmail.com>2012-03-24 04:24:25 +0200
commit8c2f3bb378640c921a0ad40c4577687b0c7c37f3 (patch)
tree35d97d6c21b4b2207ec9fc8f21dc38b2435c9542 /src/client.cpp
parent0ac2ce7dea133fd0b71a12ca3c2f3ce463d48440 (diff)
downloadminetest-8c2f3bb378640c921a0ad40c4577687b0c7c37f3.tar.gz
minetest-8c2f3bb378640c921a0ad40c4577687b0c7c37f3.tar.bz2
minetest-8c2f3bb378640c921a0ad40c4577687b0c7c37f3.zip
c55sound continued
Diffstat (limited to 'src/client.cpp')
-rw-r--r--src/client.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 220fd04dd..cb6d2075e 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -225,11 +225,13 @@ Client::Client(
MapDrawControl &control,
IWritableTextureSource *tsrc,
IWritableItemDefManager *itemdef,
- IWritableNodeDefManager *nodedef
+ IWritableNodeDefManager *nodedef,
+ ISoundManager *sound
):
m_tsrc(tsrc),
m_itemdef(itemdef),
m_nodedef(nodedef),
+ m_sound(sound),
m_mesh_update_thread(this),
m_env(
new ClientMap(this, this, control,
@@ -2326,6 +2328,6 @@ u16 Client::allocateUnknownNodeId(const std::string &name)
}
ISoundManager* Client::getSoundManager()
{
- return &dummySoundManager;
+ return m_sound;
}