From 9a7471b74085973a19c192737f3dbcfe43926b52 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 26 Sep 2011 16:10:54 +0300
Subject: [PATCH] Rotate wielded tool the right way and modify axe graphics
 accordingly

---
 data/tool_steelaxe.png | Bin 209 -> 927 bytes
 data/tool_stoneaxe.png | Bin 193 -> 931 bytes
 data/tool_woodaxe.png  | Bin 190 -> 927 bytes
 src/camera.cpp         |   4 ++--
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/tool_steelaxe.png b/data/tool_steelaxe.png
index 390dbb0870e77abfbd49e2a99eca89518cd57f4d..0ad23c93b70fb8f88a4b9b6d024566af443a17a2 100644
GIT binary patch
literal 927
zcmZvav1?R85XMJOL_z{lEX2Yz+ZZq?X#xtOT+o3K;*m-aA{N5ISKC-6ASyO~2%?aG
zK@ed;l=MfCKoB8Jb0T74CB{w|=e<C<ch3jAJNww#-#6dvla=KgQxj(=L}W^Dc6+%_
zSL4L-oM(Q=U6GEgEUhl)HtG@e61j`&b9XZ%2|!g#DK26n6oH6}l+0@Vau+ip1rSv!
z|2yR3CPpCyDq8ZUR$3b$W=<MFRg@B>1E$K10avvQR6XaE8g6bhf>3DDVqtW`pwxoG
zARKC1SP)Rp6GcNyo$o$IQ?pSZ$U|oObAU}P6*>8B^CHZhW|^o!o}fF-l*}0Jd4C4#
zo^y$o`mk`i!Kg&)WjNf_m~|jr-LgIn&$_GZCM=y9<)wj#$ZYNbHKioD#<!f4rgOO+
zEv0I5&>S=ci$aQzc`Ye)#BPE4SccL9bVc@nQqU~7dLs;jQ!P8Ef~>Ro8dRG7Ns;0d
zgXHlLbD;^C&(=cdDM1oce><~Bk7aOMyVq71w(qT-*&pt`yC1&>^Cx#7{`_*`<D-kG
zb|*Xiet)vp>pkm!kUN*=UJn1PZ)|kFZC-vb{F|+Ke(v#Gn~lvE3$gQR{>Rn5*Mp~9
ew?6HEUOF#wWai4?{pqjYE1WJaci&uJTmJ_m__J03

delta 182
zcmbQwevxs4ay<h}v6E*A2N2Y7q;xPaFmM)lL>4nJ@ErkR#;MwT(m=stPZ!4!i{9h}
z309Vao72z#v#<X4#$K<|t!5U#j0MB>70Z?#I{*X<s;aHw{A?N@F8}!d=H}-A?0hmm
z>K`0n<hgF}@Ul$y>QDbKO>O77y)CzS_k(L|qmSIw2MONy>=e$sJ;$>6pK^7l%2}1h
ei7P4(FfzP4YdcfvyN@Z*eg;ohKbLh*2~7Y$<4el`

diff --git a/data/tool_stoneaxe.png b/data/tool_stoneaxe.png
index 0c5414af570340c9d9454ff53f8afc6f2c4c5cce..698ac918fdbeb8dd86515fe65360b9d53077aaa7 100644
GIT binary patch
literal 931
zcmZvay=zrL5XA?hAp`;`gN@B#FpY(UuS)chr~@IyM;Z}Af*=+iu(c9WDT0!NjUj#|
zorR#q{0XM85F0H9Y|@IL&r%rYzCd^%F5KPO%g+AJoY_aKD_5r`Pfv=-lwDiw)H>aK
z6XP|X>E@=$n5-_ZE!8%AU-p))T{a^k+?^x<GgH+NaS@6@#6+~RMt((zyO08indtux
zg@lV!2!V-d-87Omicj|-9iSOhlMKMkSTPW0UV&NETv9VUoK6r1Q&Uf85Dud$lt~24
zO{qv&)CsjT?d3-d(agOc2=bU&{v2UTOG7UHsCk(lLH9~DpiVFX?nYLOh`PT5i>O(1
zM16V&!{Icd^fCkC=Bzr9Vc}JuWmMfw_8_dB>F1S!$H;2#5w)ZgxQ8EcP6nN;ZGS0E
zlan5x8>j}+81h<5XrJ8zkD&~sCm4q60Yx!bZu3T%j-YvU&IDEG;A=1$>`#f5pg5$C
zr+5fmz<Rcx!YBz+px*dAcj9CP>$Z4#t@Y{F#>}7B`}>Cr^Y_oTcU~<#c=B!fN_%JX
zQm4Z=dwW~kcgALF{O)$I-~D)dV*UK`ZfpD3;la~;^B*2R9Dna~`QlkCXI1~s-n?+*
f%f+|PU+$bcB?sSI`gP*xj|OQ=D~s>i8(aSX%Pp|1

delta 166
zcmZ3?evom3ay<h}v6E*A2N2Y7q;xPaFmM)lL>4nJ@ErkR#;MwT(m=svPZ!4!i{9h}
z304+IclYD}`}+F+?|35lG4tH{^X=JFrc6mm0D=`ORybU2zRpnMoWQ0ieW=C1c+J{V
z|4+|OH>~;dLs0MApP$7}WlAR2nuUjQ{XIN>^uLprT4Xwz#ck0uMs|kEi@HDAey!vN
P+Q;DO>gTe~DWM4f8eKpG

diff --git a/data/tool_woodaxe.png b/data/tool_woodaxe.png
index 34f54eff966ad5dc9398a1b45fbec8d403022eed..3daa4af72bb200b80ad57b1ee801d21ee1115c71 100644
GIT binary patch
literal 927
zcmZvav1?R85XOgSL=OT-3OTe8VG*=35EL7g92a#^&Y*{dAS4KOpEg3Y(n~-{>1P)k
z@ei=Dm`X%Z3$aieEv5*>!pcTd*^Kip5bo~zV0UL9JNx_Qn_XMzo}X$QXo$#^Ug%uO
zwONh5dvZSXCzeEZ$-<@Hd~RbfVz5N+qWaw3%t!)I)l!O!m<UB6q9P@;YQNmYOh^Gl
zRm%Skxwwf@2!V>0ys4H}$A_7d22d5H1nGdOGGoA1Edy20Ii-f18;u|oTC`XgoiHf1
zpfCuBniduW)bm8q&@#w(AET++Fc9PpGyU1drk0AF{JMD&=1#LrR3J~#9cD^q4EMZ0
z19i{2L`{8IINe}WBK0yHZfeXr5Uy@npN41MRrV+>of+n(fjh`-?lv{0BzS<YIVYpe
z<#xD~s>wlf&=f2RDL&@4q|hO|1?FQJN(;~x*#k<!Xt~uJVHlih**O(toujWoWwbvj
zQk-ItJRV{$Gy(J3S_nNQNP-66=VKGQGq|pux!$QyHy2x5&)!`AarVspBklE#*RlG&
zd9J<w`0eJq<<{EChy8y4@V9G|A8swp?SHiI>Ft^6Uz2wae!bE8BCUIWw~ls?&oqCp
kJemIa;N|l>z1h<zt~O-(<Ls->#rG2xPUpLw7wyHBfAUJKAOHXW

delta 163
zcmbQwzK?N&ay<h}v6E*A2N2Y7q;xPaFmM)lL>4nJ@ErkR#;MwT(m=rkPZ!4!i{9h}
z304-z#`(woGuik4-|<B9V`ksh(8g>Lv6RFFAegb?C0m!=9<~M2OvW5H1=O5o&9|#P
z_2J9Q;2k$^f3N4b*?Hm3k|Uhk?|OEAw%?WAam`0YNTPEVy9@(^!7}ZKZ?kUb0xe_k
MboFyt=akR{0EAOL8~^|S

diff --git a/src/camera.cpp b/src/camera.cpp
index 1a5330497..34226b90b 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -208,7 +208,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize)
 		#if 1
 		f32 bobknob = 1.2;
 		f32 bobtmp = sin(pow(bobfrac, bobknob) * PI);
-		f32 bobtmp2 = cos(pow(bobfrac, bobknob) * PI);
+		//f32 bobtmp2 = cos(pow(bobfrac, bobknob) * PI);
 
 		v3f bobvec = v3f(
 			0.3 * bobdir * sin(bobfrac * PI),
@@ -265,7 +265,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(90, -90, -90);
+	v3f wield_rotation = v3f(-100, 110, -100);
 	if (m_digging_button != -1)
 	{
 		f32 digfrac = m_digging_anim;