From ec1859b095e1a4319afbc9de9b5806bf0546afb0 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Fri, 2 Dec 2011 15:20:42 +0200
Subject: [PATCH] Show bare hand when no item is selected
---
data/mods/default/textures/wieldhand.png | Bin 0 -> 384 bytes
src/camera.cpp | 6 ++++--
2 files changed, 4 insertions(+), 2 deletions(-)
create mode 100644 data/mods/default/textures/wieldhand.png
diff --git a/data/mods/default/textures/wieldhand.png b/data/mods/default/textures/wieldhand.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4549e5ede15586602c9223d5b5e3d9ca92b88f4
GIT binary patch
literal 384
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^J5B
z%x1`EtPMN^6yYrJh%9Dc;5!1sj8nDwq=AC$C7!;n?6-NCc)1n0r*TdLn!@1e;uvCa
zIyqs1fWf3y2M-@+K6h_pGCQ;I%2}sRpAO_nR0{okv|HTsJJYUbvesn=Z*FX4-p*L8
z{WtK3R~~DGX|m}8m0R!Z&74i2vPg!{|KGW2W+M==`WiC>LG#*9wq^!?^_V}0r@!ZE
zKY!=P{^a9|Jlq$VKki@OtO$}i+^&EBVUxk(4LkYr4t$%ZA;Os=ZU6*7tR#|n6Vzrr
z+xvX}gI=KELWvD~)w>*>yu@4;cRk{d-<Q0DBd?)liq7Gkr_BxK^y%_!kScihiI+_|
zmUqX2XUxwxW;JytOC&5=eQ-m`>q548c4rXYqq#X<GtFdE!e++#lP@wdynGUG$UoC>
RH86M>JYD@<);T3K0RXO_i`)PJ
literal 0
HcmV?d00001
diff --git a/src/camera.cpp b/src/camera.cpp
index 6c81c46e2..8f421e691 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -277,7 +277,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize)
// Position the wielded item
v3f wield_position = v3f(45, -35, 65);
- v3f wield_rotation = v3f(-100, 110, -100);
+ v3f wield_rotation = v3f(-100, 120, -100);
if (m_digging_button != -1)
{
f32 digfrac = m_digging_anim;
@@ -500,7 +500,9 @@ void Camera::wield(const InventoryItem* item, IGameDef *gamedef)
else
{
// Bare hands
- m_wieldnode->setVisible(false);
+ m_wieldnode->setSprite(gamedef->tsrc()->getTextureRaw("wieldhand.png"));
+ m_wieldnode->setScale(v3f(40));
+ m_wieldnode->setVisible(true);
}
}
--
GitLab