diff options
| author | Kahrl <kahrl@gmx.net> | 2011-09-08 14:21:56 +0200 |
|---|---|---|
| committer | Kahrl <kahrl@gmx.net> | 2011-09-08 14:21:56 +0200 |
| commit | 71418639d3e81a0c4f03633042f9c3472572a87e (patch) | |
| tree | 95f4150ce9a45cb40c2a31807c6478da641968bf /src/client.cpp | |
| parent | f2ec2265216f4621558003dcbd8974f76063576b (diff) | |
| parent | f31b0a3361c0c39b9f6f6ee440b93293690bbe02 (diff) | |
| download | minetest-71418639d3e81a0c4f03633042f9c3472572a87e.tar.gz minetest-71418639d3e81a0c4f03633042f9c3472572a87e.tar.bz2 minetest-71418639d3e81a0c4f03633042f9c3472572a87e.zip | |
attempting to merge Queatz/the-wielded-tool and kahrl/viewbobbing, something doesn't work right yet
Diffstat (limited to 'src/client.cpp')
| -rw-r--r-- | src/client.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/client.cpp b/src/client.cpp index 81dedd144..71a826a1f 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -2004,6 +2004,14 @@ LocalPlayer* Client::getLocalPlayer() return m_env.getLocalPlayer(); } +void Client::setPlayerWield(scene::ISceneNode *wield) +{ + //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out + LocalPlayer *player = m_env.getLocalPlayer(); + assert(player != NULL); + player->wield = wield; +} + void Client::setPlayerControl(PlayerControl &control) { //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out |