From 187a0f2c37bd4c1e80c5c4351aaf80695508817f Mon Sep 17 00:00:00 2001
From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Sun, 12 Aug 2012 18:57:17 +0200
Subject: [PATCH] added big numbers + animation

---
 src/battle/Resources.h          |   9 +++++++++
 src/main.cpp                    |  31 +++++++++++++++++++++++++++++++
 test-data/big-green-numbers.png | Bin 0 -> 868 bytes
 test-data/big-numbers.png       | Bin 0 -> 964 bytes
 4 files changed, 40 insertions(+)
 create mode 100644 test-data/big-green-numbers.png
 create mode 100644 test-data/big-numbers.png

diff --git a/src/battle/Resources.h b/src/battle/Resources.h
index 73b2a8f..5e68281 100644
--- a/src/battle/Resources.h
+++ b/src/battle/Resources.h
@@ -8,6 +8,7 @@
 #ifndef BATTLE_RESOURCES_H_
 #define BATTLE_RESOURCES_H_
 
+#include "../graphics/ComplexAnimation.h"
 #include "../graphics/Menu.h"
 
 #include <SDL.h>
@@ -71,6 +72,11 @@ struct Resources {
 
 	const char *escapeText;
 
+	graphics::ComplexAnimation numberAnimationPrototype;
+
+	const graphics::Sprite *bigNumberSprite;
+	const graphics::Sprite *greenNumberSprite;
+
 	graphics::Sprite *weaponMenuIcon;
 	graphics::Sprite *armorMenuIcon;
 	graphics::Sprite *shieldMenuIcon;
@@ -131,6 +137,9 @@ struct Resources {
 
 	, escapeText("")
 
+	, bigNumberSprite(0)
+	, greenNumberSprite(0)
+
 	, weaponMenuIcon(0)
 	, armorMenuIcon(0)
 	, shieldMenuIcon(0)
diff --git a/src/main.cpp b/src/main.cpp
index e5391a1..0fd129b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -221,6 +221,37 @@ int main(int argc, char **argv) {
 		Font largeFont(&largeFontSprite, 0, -2);
 		battleRes.titleFont = &largeFont;
 
+		battleRes.numberAnimationPrototype = ComplexAnimation(0, 30);
+		battleRes.numberAnimationPrototype.AddFrame(0, 0);
+		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -26));
+		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -42));
+		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -48));
+		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -42));
+		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -26));
+		battleRes.numberAnimationPrototype.AddFrame(0, 0);
+		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
+		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -20));
+		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -24));
+		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -20));
+		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
+		battleRes.numberAnimationPrototype.AddFrame(0, 0);
+		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -6));
+		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -10));
+		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
+		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -10));
+		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -6));
+		battleRes.numberAnimationPrototype.AddFrames(0, 0, Vector<int>(), 14);
+		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -36));
+		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -32));
+		battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -18));
+
+		SDL_Surface *bigNumbersImg(IMG_Load("test-data/big-numbers.png"));
+		Sprite bigNumbersSprite(bigNumbersImg, 16, 32);
+		battleRes.bigNumberSprite = &bigNumbersSprite;
+		SDL_Surface *bigGreenNumbersImg(IMG_Load("test-data/big-green-numbers.png"));
+		Sprite bigGreenNumbersSprite(bigGreenNumbersImg, 16, 32);
+		battleRes.greenNumberSprite = &bigGreenNumbersSprite;
+
 		SDL_Surface *heroTagImg(IMG_Load("test-data/hero-tag-sprites.png"));
 		Sprite heroTagSprite(heroTagImg, 32, 16);
 		battleRes.heroTagLabels = &heroTagSprite;
diff --git a/test-data/big-green-numbers.png b/test-data/big-green-numbers.png
new file mode 100644
index 0000000000000000000000000000000000000000..52cb2da56c15c8f88db194c25b0c012919d9cadf
GIT binary patch
literal 868
zcmV-q1DpJbP)<h;3K|Lk000e1NJLTq005u>001Be1^@s6m49>f0009kNkl<Zc-rk;
zt9INl5S{cCY+1{?U_n@aBp*;57?#r$&;%MfY+JCWC(JO|AJC5p2xwWtx@-fy<HTc+
zN3X5a=3W*{qq&-Ru1B)GL;wH)uN6n~!s6rm-JHSp_v4X|18qEQoLK*Vo4@7HmxnL^
zQ2(LhrH=m_<RFj}Z{?kP_POfr)Z^RXoqcyoL_|$n?|d>rj(7Y0&a1zx|J?jfzaBdU
zJaqmq>?irV`qy~mia!((D5D1KpWQ#VL_~CUQx7^e=iQx6Ckww?U_V|DVJ|a>{b>IA
zdehd^wOA(pT0igFOYrA;n&Sty$Hp)A{|5yG@+zQq2WuImDUhigu?liv1vnIc-&#|R
zzlBWki*1Jj0%fd%mz(Ymt*Fbun%0Ak)u(-C?)y<YKQJpLkIRtbj>cE|9lG7(6Utxi
zi)o5z#ow$Q4aH=Bzb?9d4b?@&9|{PRp@6Bt8Or-T)#l2{u3k-NJl94<+gX40YQ1x@
zXFr;fRQFc{rH~5l3La--o=*Fa(!N(Nv5#iGQIYf4YIo+vexL1VHh!^hVxWLP8LQww
z_YZ@HcdHMBzqNKN14HdN1AlBT2kl=jzB#SJrC(n==4tV_{4wM_toUm7);z2@YVi+^
zd+hxK1qA-D8ZZ>G$|s>INdIO*Q9fzs3YqZ|ay}L$Pqx?QVfoeOrN!M+aIQsVyt&`F
zhC~erl&pZ)bUoYAYENayt4_9ivHEkWd8C4HCh~aw8wZiW&pa1i{9RXrvGI+M|H3Qo
zO}n0KUvBmn+UZ>n+27(11q5Dq4XEu``6{2>H{<;(w&(rGrQ@3%SKbWGe<|^Ft(`+L
zQbG}5ZC?}$2xLX_(=a22h&)dhdu~ticW$>($Y~Pi(>#Iwo%vb7X&9i$8gTUNKBvij
zoQA5P)o7}k#$1J-h!edE|6akxX%ID|jm%HwzrW5Whkf}+BG$k51nsXY_SqI8sc%%^
zAFTnk)zi#ZO->4EeWfM8$_o9eOZzq<l)p6(={HsU4jq4ucW(Zu0f90U(6{C)<<Xk@
u%l_DLa{sb}?=Mm0<_`q~0001hEO-LBph)cT_vIA;0000<MNUMnLSTZ2$gv&(

literal 0
HcmV?d00001

diff --git a/test-data/big-numbers.png b/test-data/big-numbers.png
new file mode 100644
index 0000000000000000000000000000000000000000..4900a85b818179ec456dd3a3f85ea55ba601ea73
GIT binary patch
literal 964
zcmV;#13UbQP)<h;3K|Lk000e1NJLTq005u>001Be1^@s6m49>f000AvNkl<Zc-rk;
zp>o?m5Z!bFY8Eq-0K-zV!1fP3nUHwKB(zh|1_~M`1szk9&N!r#@gKA>tTfOd#4KSh
zQ-QUzwbE+$bZ4I?*+-n*-QMo4w9mVzlK~6{gW;{>h&H_MouqXF|5h(YE(*B$xOsf_
zAKHFNpQ|0N_BYkvbiUC3e`hghh>2r*=UxpH000>E=Y@gu<p=-(W{XMc5(#v^Pv4hL
z<F)!@+yDD(U*+(o>)(;Dv|p>Avm=)OjR6hqU_eB2`3L|2le<x6`)uK+0ObG%*=K#^
zN%{ej+DJUK{fPeAp!omAeWMFP?Vl|s8?C?2v(Ev}pStKr`JEP(e#w8n*UuQx5Vs2E
z?qDv0CU+kSk;&x(<%larCaogrcqxKI_3zt$*IbkHzl2!+^X)eVG_)fJoDNSmf2_~4
zmf{`U%i5<yP~}p{l=-|lsw2CX>xEkV`|6kNX=Xp&7vmUF@;@h!^Gl40_I+Nww95a+
zfQEKe!M?x<#VThyyiv(@#@ChYm>Ws@I^*k9BaeDGCRzWyDKJHu!F9lSD%Ppmhotgo
z53T;CCn|LPT<(r`p<d4K)PKHDVvGR|En&cqSEP$DlGM*Zkdt=Qr$4?Gnc&N9EfeNU
z_Vlch<LsS{yP5uH-MYy-sXkoC`e`$+bJ|Ut$nP+jib>1!*I&1s`IUb6y?=}W4X-N)
zYzi&&aXCyWk{Jd;`BLteF{YX+X>N4dt?j4lkwEQ4d2St&UT$5S-?a=({f*<K+}(0O
zL(3TO&#Zo=)E`JLuR1fio$3!XRUc)LJQB0{@P8V?tet}W>T1x}zkBvS^?Qkdvwr-<
zePFulQJPP%!x+%;wsSykzsi;Q=)M{5SD`%aN74xPwHv|dZ;L;*xpPxcCZzu5_C<{W
z4eek+WSs4}ts+*P2LRYU<JAJ?B%t0^9<ldM5i9A@_9vHU&v|A~Q4UXa&}Xlq^!xge
z^XI<&r+pH_$r}S2;xZup?#9S3@8di+szyWQG*a$?CxnrqIQuyU=T4JI=iEZ+$97~c
zS9xFf>gUcgZs)0%k5+_)zEKUYqzcA6l)lwO&-hEgx3rcIe=FPRTUp#V4&2*ilKt9h
zFhA)`?4ryUO8<5rEeT>jXSY<nHq}q%x7Tl8D{ncVAu59ZGQy$1T0_6t?>kTIUv_Z)
mC5qVg8v_~)27|#61^)pz#{NAPV&rrH0000<MNUMnLSTY~wD4>I

literal 0
HcmV?d00001

-- 
2.39.2