projects
/
oweals
/
minetest.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c67f728
)
Dont animate changing wielditem from hand to hand
author
PilzAdam
<pilzadam@minetest.net>
Mon, 20 May 2013 18:31:38 +0000
(20:31 +0200)
committer
PilzAdam
<pilzadam@minetest.net>
Mon, 20 May 2013 18:31:38 +0000
(20:31 +0200)
src/camera.cpp
patch
|
blob
|
history
diff --git
a/src/camera.cpp
b/src/camera.cpp
index f227bd98ae1b7169c98a3da28d330634215dbbfc..acefff7e78760955a26453ccd416ecd7e39031a2 100644
(file)
--- a/
src/camera.cpp
+++ b/
src/camera.cpp
@@
-588,7
+588,8
@@
void Camera::wield(const ItemStack &item, u16 playeritem)
IItemDefManager *idef = m_gamedef->idef();
std::string itemname = item.getDefinition(idef).name;
m_wield_mesh_next = idef->getWieldMesh(itemname, m_gamedef);
- if(playeritem != m_previous_playeritem) {
+ if(playeritem != m_previous_playeritem &&
+ !(m_previous_itemname == "" && itemname == "")) {
m_previous_playeritem = playeritem;
m_previous_itemname = itemname;
if(m_wield_change_timer >= 0.125)