From 3a194f0aa3a8fb7ad3924fdcaaa6e3c724c00a08 Mon Sep 17 00:00:00 2001
From: William Kendrick <wkendrick@users.sourceforge.net>
Date: Wed, 27 May 2009 17:49:07 +0000
Subject: [PATCH] Created icons for Rosette & Real Rainbow.

---
 magic/icons/realrainbow.png | Bin 0 -> 691 bytes
 magic/icons/rosette.png     | Bin 0 -> 1166 bytes
 magic/src/realrainbow.c     |  11 +++++++----
 3 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 magic/icons/realrainbow.png
 create mode 100644 magic/icons/rosette.png

diff --git a/magic/icons/realrainbow.png b/magic/icons/realrainbow.png
new file mode 100644
index 0000000000000000000000000000000000000000..6701583450f342f1af4e543171c94aeba3bb50f1
GIT binary patch
literal 691
zcmV;k0!;mhP)<h;3K|Lk000e1NJLTq001Ze0015c1^@s6Ufo>X00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXN1
z5iS|TmCynJ00J{fL_t(o!|m5iZ%knr#_`{rp;}d?G!~6oPzgcUh-z5d_yiV~V(ruT
z0CqluB@1b!B@xmJD(a=xQg5AhIyP66lWLS|J0f!>lXGUyInVju*K^<Z^9(Kh=c=sp
zxhi&|2S?F|z1UV7_ba9`fiZl<JeD>Sa2Ez}DqvN7$L9dmOZT>+Gl8^Y4v+8<&#}0X
zfK?1)D3Gr)i*IqIl6%VIH3CryU?=vYH?H2nlZ^oE!BzC*K0cwywOYQ<=2&*H9bMRy
zW3>d{pP9Ie+rOIjwE&OcI%Y78?Q!K(TzC@)*HTyVv=1Et>cDxt!_5Tw+kgcw;BxY1
zEO1kJ5wN9o6jvJ##=$Nu;7p3^7RFc0t<`i9my*=463A0LPNa=>R)0OSF_nP#U^4kR
zn0L&r1$Y=&0yh(<M(}b)j{S{lc$>g`@gCiQyjOnDO2BU1$TUs_Za9N&v>I`82?t`p
z08Rw*C%_7><$N@GIJ!x2Wz8f9m)p<rusl<07jPDb@F2-No_@F4YNQCKb3U2^?JWa#
z<j0ZFPp5jfO7kg@rL0Qda2l1OR2V%0t0y07Tf8rrPW!5-bDTqakvu$^>8#>QO1~Kz
z%W*Dicz=;4=@>rb;=~5FlRwp5T23wfcBn{e*^ymIEjBk(uTs^M%MK0%?t3Em+GN1l
ztoI+WyU5!3rPPy}ty)Z)N29>L09IG7gH2LBZDtXRMVj*R#&Y2w`76>WeOhX%rIt2R
ZKLAhep2qR#8Xo`v002ovPDHLkV1n4iGR6P^

literal 0
HcmV?d00001

diff --git a/magic/icons/rosette.png b/magic/icons/rosette.png
new file mode 100644
index 0000000000000000000000000000000000000000..d16bdab1fb7a04002af287077f292e9cd8ad8803
GIT binary patch
literal 1166
zcmV;91abR`P)<h;3K|Lk000e1NJLTq001Ze0015c1^@s6Ufo>X00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXN1
z5iJWG0rH6e00a(6L_t(o!?oC3h*f122k_r_oEbG!Y)m3G#WKq-nk5!VsX^9TPX$>}
zM1^J;niPaZ)RPpJWu`qz=A|fu5g)RMN{cW^sOZiFDU~)UrQN*D*F$UTW_QLpN1G2m
z_StK#Z>|4Xd)@YybJp9&Dr9uyQ=HSlnbe5xUiCC!XdHH88y*UvYZ?WIyD%S@oe20w
z08S22*C1gd*46=%svxl}&Svb#6KHJ)Xm9_%1(%0`VQ9me0$|9j$J-TP2{%PZe2mf9
z8hU=gjc92EXpfHwlfrlrd#9BEt}DrI#7C9$XW}pXfPN+VJnRUa9hg?;H|oK&0>tm3
z=qX$p-fYKDc%>x&8n%}`fmh@F%sNk{9rxf59Khmc0d@tjH*f}OCEm@!n^6y7+>Z~L
zb;nDh*xlH6Jb*R-UF~=@=X_nxc{g%ODFtsCKEdZDT6N8g>*j)xQks}jTAETCQqc0h
zNOJ(~an%EO1baep%CS;PlQA4G=bZP1fqH9ST!)ru3vn9;6yQ=ygL?zl6TqYNP}G`I
zx&>Qs2-|znIjwL~iPjl9y9>|focC*B)f$kQj+ZbHvvbaG)p@+F;qft;jjwagD@y!b
z;nCX*&!?0I6%lY;>vaP75ayNchhPTA_fU{m9}6kV!*kOs$uI=32k*Y%ogNAKD;`5z
zqgi|uU_+Ij2g7iCTwmy+=(k5VIZ*lo=SCgPc(ECP^W%59#ME#RKEwyHx8eIRFuc^(
zRu?s}qI+uacj1mG{HI1q%k==JYBHvjy5dj=zQPw#bg#f7{2Aa5$C1O~nP)KpH{jwJ
zGB)Drob%R_{=0E+$n3xd%*BzM^SDN0aB6gqjwm->v40NQl@<BHSP`DthcOsg>K2Ew
z7Gq0ihQ=THvNT9s(o8R|MQdxT?3N<%LvA|03nN>@(8`jYVMP)J&;^xl(i*j~t*3Zz
zd~iGlsuo__5QcYSQSg=qZA#_rRd_FW-}W{jG&>KLJvJgh91LTRU_?oFbWAXvxW1xi
zKy;JkIOTr>STe9U9$}8cJ-nRdCAs@U<_J3Kl$+LOrs_t)T^j|p6SJzGtrG@Quql8p
z>C<<TFgOTTqkj+lNw}~=>tED2Oz6v(rc{TvAWF;oQOmkwklkE~$q6y@y?LT<dd*~S
zKU{!s!YhaHcf{Hj><#*|%DK;?o=)t`M?5fI1By1a0Hdl69uMHo3c%u}YffJRoEt_~
zVpMNoP|4akarWW91o&JSnN<ROFh;1BipPrU*cfiRqnMx9mjEZ>w}`i5V(E<Q&X`OJ
zpd;~k@b+TW$$SoJCP^0J9XyF!qpK{$j{#;qmXz+F$N4Awt)`hy(l5raTAc)XrsUao
gad!F3!O84@00L$wNIz2#@Bjb+07*qoM6N<$f{ObYH2?qr

literal 0
HcmV?d00001

diff --git a/magic/src/realrainbow.c b/magic/src/realrainbow.c
index a5a26f43f..f2990cff4 100644
--- a/magic/src/realrainbow.c
+++ b/magic/src/realrainbow.c
@@ -6,10 +6,9 @@
   by Bill Kendrick <bill@newbreedsoftware.com>
   Math assistence by Jeff Newmiller <jdnewmil@dcn.davis.ca.us>
 
-  2009.04.02 - 2009.04.28
+  2009.04.02 - 2009.05.27
 
 FIXME:
-* Needs icon.
 * Needs sound effect.
 * Color/alpha art needs improvement.
 * Pixel gaps appear in lines sometimes (esp. larger rainbows).
@@ -60,8 +59,12 @@ int realrainbow_get_tool_count(magic_api * api)
 
 SDL_Surface * realrainbow_get_icon(magic_api * api, int which)
 {
-  /* FIXME */
-  return(NULL);
+  char fname[1024];
+
+  snprintf(fname, sizeof(fname), "%s/images/magic/realrainbow.png",
+           api->data_directory);
+
+  return(IMG_Load(fname));
 }
 
 char * realrainbow_get_name(magic_api * api, int which)