diff options
| author | Weblate <42@minetest.ru> | 2013-06-01 13:18:52 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-06-01 13:18:52 +0200 |
| commit | 1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124 (patch) | |
| tree | 54660f353f3342f89b6259ea6a5dfedfa20dc16f /src/camera.h | |
| parent | ec039a3d123120f9918812b13f5971e94546b9af (diff) | |
| parent | 64627817fcca52f20948c24b60ce192b218f6ce2 (diff) | |
| download | minetest-1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124.tar.gz minetest-1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124.tar.bz2 minetest-1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/camera.h')
| -rw-r--r-- | src/camera.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/camera.h b/src/camera.h index 0ed5c20d2..c8a6e0bb8 100644 --- a/src/camera.h +++ b/src/camera.h @@ -117,7 +117,7 @@ public: void setDigging(s32 button); // Replace the wielded item mesh - void wield(const ItemStack &item); + void wield(const ItemStack &item, u16 playeritem); // Draw the wielded tool. // This has to happen *after* the main scene is drawn. @@ -178,6 +178,12 @@ private: //dummymesh for camera irr::scene::IAnimatedMesh* m_dummymesh; + + // Animation when changing wielded item + f32 m_wield_change_timer; + scene::IMesh *m_wield_mesh_next; + u16 m_previous_playeritem; + std::string m_previous_itemname; }; #endif |