From 599adb53dbdfdcc4ac4e4dfab1e0868ff0412110 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke <grumbel@gmx.de>
Date: Mon, 26 Apr 2004 13:38:48 +0000
Subject: [PATCH] - added small/firetux to worldmap

SVN-Revision: 745
---
 data/images/worldmap/firetux.png  | Bin 0 -> 1493 bytes
 data/images/worldmap/smalltux.png | Bin 0 -> 1212 bytes
 src/worldmap.cpp                  |  26 ++++++++++++++++++++++----
 src/worldmap.h                    |   4 +++-
 4 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 data/images/worldmap/firetux.png
 create mode 100644 data/images/worldmap/smalltux.png

diff --git a/data/images/worldmap/firetux.png b/data/images/worldmap/firetux.png
new file mode 100644
index 0000000000000000000000000000000000000000..2629701d767dba2790aca77fc072de2a502109eb
GIT binary patch
literal 1493
zcmV;`1uFW9P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3yA;#3yA?Y$;+((000McNliru)C3w08v$9ijr{-s1!74=
zK~#9!?Uq|?T-6nZzjZEiJRaXBHn#C4w#m&vL}-m57L6dKpzsn2ag{)TP!K|b2M`hu
zAOQs_2+=+v`qY+2t%|BvNlOI?(m>jZd$^O3SWZHmA)c`r+vD-fc;=kFcsQE|p#&zu
zNIdkHw)WASGi(3nU;kR`2&aZLa4m2N&<_NF2OI@<0Ph0(fGR%#(!i6zB(Pvt4KP3m
z6oBV}i!G_T;MVzE18^sB2avRfR)FSj#7Y4^@PQ@top9<TuoAe!9_SVOI$9rhoEpFl
z!eX(n!?Ceaz&e|rCB=on0U#>&b?8?B{&!vM>rkKsya8NPZ{T`zB|wLLdr3`9AtJ|b
z+G|w>5!c4ldI{8%f&l0P{Im_6K7l*G<^$iFbIBA~1ik>u8-&)vnIidH5Pk-=--F44
zRN#wt!5Z@w;P6r^pup$A;VxL1sRCzxEkFg_5L5+V2KX;9x71~r0M5%mUt*EQhPQFT
z-7uAfVhP5}aD9>LBpd;rCEk||N#G{nRp6Khr7j4ULv$X5>xIQ(SO}m9WPtl@IWCC;
zE-(t*40L&rZU;9Fu7EgD{Tz;c2DK>mN@ROL*_LhX`<gHftOr&F(0-#x!=;Ynt@7P!
zo9lR?l9-E3f8H4Ln=qVxL8$`Wz!uv*|6+Zirz3r$3oZ}fZyrqDB~p1Q;n(t=ZB_HY
z&5`D_Ml)lozk67t&7<Z}bK~Mhm<4h`)>gvPz?r9Wcq4G#mBMq)@a86%{fF;`*=5Z}
zpT0lR%$U)9R<%@6&1Y3JV;XH9H6JxLL@Qz55-8h&^~kp=eKHShNW)`kIBN`2n?#oV
zB1pJ{58j5Hvkvy{5n9@Xpb;99P+36ylC&Q@jAUo!Mb&xRz>+{0unU-~w-2O%t1p5T
z|BiE)91wBV40IxEhK1>zaP|d4XFrq+P$@%hLg^b+cgxjW68J9AWEH3agTOT>>p3U-
zas4p-e1H7s89>_v;|_Jh@^fHtHLSTHe)D9DEmXVr_S4%KFceE}h&|y08|*x(i@@?e
zXgLH2foXtcj^JE28h6Fv(Rlhaq+$gCI{RVyT1Yk#_^ynKIChAQTOw<Kk$TH8yAwVF
z-m<0C1GH(egaCZ{x-xLCkZghZIY@WK6SG`UKor!Ez2yQsfmXZP>s7!2f3@osU}DN>
z#k~4fe786o@8tqCx5gd-m^uRGqE>4WIn?nW@5OUr3vfU1LcIju2DSrxfscWSy+&(O
z?~j`}L2HHG+mAo}l@X_NqC5XZu2MDcDm7p?v662Bf3_3#)Ns4trD1C`9NX@DrD*eL
zXd95xPv24f`%|j#?NWVhhnl;u(qd1$xmTnbz@8xfijwa&g>;0bsV*MfBxElZihGiY
zioW!W(f4+#dEzdOHlDBH$Z9PQbn0|Ri+RR%sy~6rKlnU4*2=cARyOL$x08_XAh3>*
z=W~;!?#bch!N1${^xR~^7ZI7Mh7^n;Z<PI!(QU?5ew$+Qr#+M$L(kD^l8ee^HN!h=
zizgmTCnYf6MqA*pwRecyq7v>WN2&dB0r```?Eo1PoMr?U)P-<AI{i>U=F&k{`6&W2
zxN{-3nUId5St_TjfR1p+!Eyf6)xtoknINjcLJ>VQ&-~UR)BBVl0)HN~M>z7&Zkp0*
zRysAjXdVdBOo)cCZpAEnPiGt#J>lTY9IF=#NB~q7X>w@#^)hl36>hz9flo>xA9nMr
zxeC|KWN;EdlOPqrxE`fiNWZP9Q&vELGY*Wg!&O!wL=nt7!n2XGZMbm!!&67-Jut>|
vM(OnhSA`Hb(&Y2Y?g3twJuLEn{8;fNHia(HLb4m500000NkvXXu0mjfuNb;;

literal 0
HcmV?d00001

diff --git a/data/images/worldmap/smalltux.png b/data/images/worldmap/smalltux.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fbcb021fd44fb8b186215fce72236a51f7d4f17
GIT binary patch
literal 1212
zcmV;t1Vj6YP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv00000
z008+zyMF)x010qNS#tmY3yA;#3yA?Y$;+((000McNliru)C3w0Bn#oaPTv3k1W8Fm
zK~#9!?Uq|;Ttytle=~E=N%qpD>26F-W7^m>t+8z?Rs$8=hsH}UN`*o!DhiQ;)JH)K
zg8HZrg2X391f_z4Xya2!TGG@;q)4sTBuzARZJMOJO*WTvc5}{|@uAxa1*_RM_>vF)
zFb{ubzWF}>-wZ5a3I8+10{b0c2k<1&2rMh?@hi{`bOFBudNIf<U?<QAOafWJ6l%V3
z@EbsKvD8`#d~n^t*Vos;eGA!CE}*vp*t~V?)@8;Rj4{;L*K>7Uz;eJ^2mxyWL@R-^
z^78l<Kcqk#kV2sUCg3d8|NlzB07glI6_KCx*%Mn-_g9iIrwKFA_wkymeM7*-#jwBt
zqe9Y8ke-{LJ!`gX(%f@5+*=KHZrtqJ9?cXcVQjH1h=w7#?mqIFDWdDwp&SL4hyGzW
z7oPkPzhHq?n2KAL0|K}mcm{Y}O1Zwov167cZKVjp(9d{Ypn{MP7zExbDB<4{0!pcv
z*7^}+%%ONZ-q_UCRMy<wEE^gcgi^{%r_&4!4CK4Ix@Ja4M}1>V3it##0$jM+P>M#Q
z(T5|E$or8<<hO0xw&goII)agrkszPX>mUe>=XqvmXeexNZ_ig%RZRgCzzFbWLAifT
zw|_QX$_FgVY8OImDlacjwzRZF+S=M=Wo0Gu3Q$TBi^W83ZLJ(09+rcHgPt)a0n`Hh
zz_}Z#aHA<m*tUI8DYe;k-B?*!SxIYat4Jo3LP{y5l-EK?2w_&QUd^68d#sX@k_g}e
zRlw6gqS!HPEG;c<@;q+>n2pEdCYekkr8G(@A*DnJfe->IB~nW2>guSds89t0Gr;D;
zqg50E<GSwoAP9PZ^N!>Awrv~W+RY2MzgD(w6Ny9=kO9sVEWWeY9GLQbzXM1Cd$ZYW
zeJYiT*VNPqV+>krgb-JWh%gLII-SOK-B1Ye9q_I(CJGD`tH3#+$FVtQTMUeiUCefN
zcKZ2z-UuNKfYutVHDMTX>Cz>7dwccN)YJ&@1@JR)3P=~LKptT9B<jRz+;=|8`rSuA
z51O0rSNrxoVTEDH%*+g~>oPt*PEXHqeXQ%q+^z@xQwR1&*OZsZL`(C`MX})~f~e<k
zoHf<+)hiSJYjd7yedTRopZ+CjHQcpbtXfrTWv8dfWHMyZ6XDF{;M}1Dnc1gy8{fUG
z62oI9A70K|ug`gEa{r5y#k~dfcjV=T31=gQ9o32X*h|kDI*+II(Y_;I?}?ZWjbjN+
zuyI{3`|80t9%?of&K#xl(?-Oc(927_U2W6FKSrx=^BGIqIy0thCTvw9w0N{h=?!b8
z|NTJj)Av5}kJZ%#%U*8dg%!(7xBQXPPI*o<>&U>BazzlzIFKva0@HuxlhJcJ{#fX;
zUkYQ-OZBHvd>Mv(yZiZR&-7z`b2hefYF0h#ggT1C7q&RFGT|R?T$@XY4U6+ZUBVJ>
a8U6xB`{6pC?z(>f0000<MNUMnLSTYXsx{95

literal 0
HcmV?d00001

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index 331572726..366deb50e 100644
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -165,7 +165,10 @@ TileManager::get(int i)
 Tux::Tux(WorldMap* worldmap_)
   : worldmap(worldmap_)
 {
-  sprite = new Surface(datadir +  "/images/worldmap/tux.png", USE_ALPHA);
+  largetux_sprite = new Surface(datadir +  "/images/worldmap/tux.png", USE_ALPHA);
+  firetux_sprite = new Surface(datadir +  "/images/worldmap/firetux.png", USE_ALPHA);
+  smalltux_sprite = new Surface(datadir +  "/images/worldmap/smalltux.png", USE_ALPHA);
+
   offset = 0;
   moving = false;
   tile_pos.x = 4;
@@ -176,15 +179,30 @@ Tux::Tux(WorldMap* worldmap_)
 
 Tux::~Tux()
 {
-  delete sprite;
+  delete smalltux_sprite;
+  delete firetux_sprite;
+  delete largetux_sprite;
 }
 
 void
 Tux::draw(const Point& offset)
 {
   Point pos = get_pos();
-  sprite->draw(pos.x + offset.x, 
-               pos.y + offset.y - 10);
+  switch (player_status.bonus)
+    {
+    case PlayerStatus::GROWUP_BONUS:
+      largetux_sprite->draw(pos.x + offset.x, 
+                            pos.y + offset.y - 10);
+      break;
+    case PlayerStatus::FLOWER_BONUS:
+      firetux_sprite->draw(pos.x + offset.x, 
+                           pos.y + offset.y - 10);
+      break;
+    case PlayerStatus::NO_BONUS:
+      smalltux_sprite->draw(pos.x + offset.x, 
+                            pos.y + offset.y - 10);
+      break;
+    }
 }
 
 
diff --git a/src/worldmap.h b/src/worldmap.h
index 4c875c8bb..c2a7154a8 100644
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -95,7 +95,9 @@ public:
   Direction back_direction;
 private:
   WorldMap* worldmap;
-  Surface* sprite;
+  Surface* largetux_sprite;
+  Surface* firetux_sprite;
+  Surface* smalltux_sprite;
 
   Direction input_direction;
   Direction direction;
-- 
2.11.0