aboutsummaryrefslogtreecommitdiff
path: root/src/player.h
diff options
context:
space:
mode:
authorKahrl <kahrl@gmx.net>2011-09-08 14:21:56 +0200
committerKahrl <kahrl@gmx.net>2011-09-08 14:21:56 +0200
commit71418639d3e81a0c4f03633042f9c3472572a87e (patch)
tree95f4150ce9a45cb40c2a31807c6478da641968bf /src/player.h
parentf2ec2265216f4621558003dcbd8974f76063576b (diff)
parentf31b0a3361c0c39b9f6f6ee440b93293690bbe02 (diff)
downloadhax-minetest-server-71418639d3e81a0c4f03633042f9c3472572a87e.tar.gz
hax-minetest-server-71418639d3e81a0c4f03633042f9c3472572a87e.zip
attempting to merge Queatz/the-wielded-tool and kahrl/viewbobbing, something doesn't work right yet
Diffstat (limited to 'src/player.h')
-rw-r--r--src/player.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/player.h b/src/player.h
index 13cffa205..0f2c40011 100644
--- a/src/player.h
+++ b/src/player.h
@@ -356,6 +356,8 @@ public:
{
return true;
}
+
+ void wieldItem(u16 item);
void move(f32 dtime, Map &map, f32 pos_max_d,
core::list<CollisionInfo> *collision_info);
@@ -365,6 +367,8 @@ public:
PlayerControl control;
+ scene::ISceneNode *wield;
+
private:
// This is used for determining the sneaking range
v3s16 m_sneak_node;