From 81e7df1920261843a68b272529c299da31a77868 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Thu, 9 May 2019 21:06:06 +0200 Subject: [PATCH] Adds skill icons for the two mage skills --- CMakeLists.txt | 4 +--- assets/Extras/Skills.png | Bin 3178 -> 4176 bytes src/skill.c | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b49e388..ec67254 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,10 +176,8 @@ if (MINGW) set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DMINGW") endif (MINGW) -if (NOT MSVC AND NOT NINJA) +if (NOT MSVC) set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D__FNAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'") -elseif (NINJA) - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D__FNAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath $$<))\"'") else () set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D__FNAME__=__FILE__") endif () diff --git a/assets/Extras/Skills.png b/assets/Extras/Skills.png index 14020963adcec53926eb4f68744c0379ca874ed0..379b066d5c69a2017158e0312d0df3d39e10de26 100644 GIT binary patch literal 4176 zcmZu#XE+;P7mrY@HDXt4)E>2~)QnNYs!^*(thV-6A;fB_Rg_X<)vQsfRu!q*TU&yl zYD80NmJ%y@^Z$Q&KfLdGo_o*p+zftE4FG_d9;&N#4_>fc80EwE2sxmJc@ z=j7i+jkaP_3bGJBLZ)F>sfN;DoOT$iGxzw+*EN~{K#B1+-r^RX7>5<<=2uR4OGkoA z`-H(5uUyLy3Lx{>a#W&^_kiARYr-8z6FZ0L*sGJ$XPb_w76rcHKk%aPqP%eA5B#>$ z0M+dmgX7&epIFD*Ld@mfUe*xnW&h6=(xN*njb18)F?h{mY0TDouO+o zuURLP5`rk}jN0_j6U^Z*;;f(+)1tLbaRkybUHRk3Us808WO4F%@t~rs-GuuCvU>U0 zDCa!NchZ*_JUSpXnetXOyfGrDB~#|v_=LQ`Qq}%`gTXXL>E0*w@ySph?ePvZUfPjr z*&Uq^VTXvRi5!M)WvWaT4tw;Gy`$|-aLtdu`FV?EuDV01uI$KI+Pl{MGA_#^Lr8q> z;*u8gw_Yl(p|j^jjOopdXR;SOh~%hjiRG9FYdQGh`9{iHKC2tc`g494IR*rdwY8Qy z{{lD6Jcc&sZ>s&c!&AK5Yze0 zzck_Txh+Qs$|9d3bpvI~#`s?T8FRy-abh?`O@FaE;4Ki=hE!PQ9iQ_!4GHp|k|V$SWRO;?MhVqp7YsdDb( zZGWIy(`;<-!%?t}TtMpq)+@$G;0yPs1^W-QT07gC=Z|sv zu<^@TO5J||vC5&^Tuly4{MThO;c=eBy1ua+_-4J2ph6K#yWZgU-KHgEynK9q^bOmd z;-;>jgxuwKT)06{)QGJpXIrD>5^S1IM?zn&Oq>rhOlo5&Szza)Zb^!2FBej8hreMe z>Gx_hGR=+8T;eULG)F4#^ekMx<2h)=FgXlVi8cIqoNxixq+`8U(yHGkiTiKOCwBZE z@7Y1c9^TS`Wqny%6bV-?Bj>71$z)T8{lpLZ7qVmh%({U@+_cyeeUQOBJvan|lQl*r z$MkXcUa7q#hlumUy)<q{QC#%YqZ~x$6GLPUI*x2icF5gMg>GaCvKAHk zR-lMSz;US!^PA%yySHw}Bw@!I6!s(g{wDj6KH!I^Py8c-R_$L~S?F}0qNc$Eas!{@ z;A|9hWz71|^sh_DIQRU)acBo-ZVV?ug^1t}FAuts!@0Lp+(*c;GWtxm-O*37h$rZ$ zBpFlL6L>S(XH)C^vdYaKelF`gqc71I*ERqi79O>GV4puDcuu@wI$P|lc!xIqoTe%f ze6ofwdf?p!3Ov+7+K}jDf49MRIje{?1XD4!oGD7{duy4y6^0CV#V-t@GNpR7&rAZs z*%HU~#%Ds6P0HXGI$}gf)o7+db}Ipa*Q3r zoZ4^|e>8G;Eng1Ftu%5H%d0sCCMJ&TG38Q*dDpDCED=)dPC1iqFB7^tKDUGST(|RY z&!~I4R6Z1K{8&hPSLY3N94M(9-)8VJPLqn5r{)BCQ$G3m>EUT`dvcZwHa{=OX51(Z z<4U^xf-nAG;M9U=ZhG`qiHeFuUoZ_e2$R%!>C@Q{j4$OkK@yj0v5-g#jlWHvJ z>V>R3(Tp>f-dz#LKVjziKT^n^PLy)K>e4coj?14fav;IWU)_}S)_`2K9jYm8P>_@e zrq63?yViJrOCM4+{jJuRG0HE57?)xK2tgTdUK`W)j$_X|7om9Av7+f2WC<4v^-^eP~A|%XVdzk=nd+<&-HF@5(xz%EFBL6%;?K zDYOzq`zLTiV92WHvfWsAY#{)Jet_83fNHYZc z<#PJ++rZ}6p1v3*NJ6>D)esaGBM3l>Zgnga{GHGGJBu;be%;%h3fv2U7XhvnF;0?z zQ(S3uEOd13%Xu-JF(%}rPbU*6JH4F(Ew%oUiffP&!acL+MxH?H7qNVbR~3T7&We$g zTFPFnSiLJ4jFKGJ!*Y0}bv}w+*xZ4gNs|!hDsrC0#!6D*C@8v0Pkje5dcLG&s8}9q zOh%U0TDk4k@qIau3qb7W>n*v(!yp`^0~AKlBCFZG#rayo<$HeU--XugrOshqPGQ%5 zxLVP(ej)QzqbW;;yQU84_ou^PorWcZaXwHPyJEvPV549P@ezrmzIH8lv+Uc4kY#}YayJRs0$D;j^Vr=5lZu$?T zfA92mmHmugTb>sf0w^;Vxc+&_I2A>`rbOyK+?e!>)DXXy$L-gCCNk^Ir{}r0UZ`T| zz3YN}v%yHc&iOqoV~15kZ`Tj!o>;uC2}XEaeN3+1H;#o}QcUzH&S!_#1J+ngJ}sXo z*18^h!5ZE!IQYt=7%*1aFTc9qysNvK{=HpM-aPuz>hanXOdUy_!g8J`ZUXikZ-K~Z zQAU@P@_IQorgS2USM)vFw((bx7JbH;Ih6Q?Dd zs@VY_Wqb`2m?*G3ck+f*=s&0{sDMbC8@nRA3=VazwzUjD=OwgQiVdDMEw}{-Yd$lM zK9LC&shQJHzSGX77mMsS@?|@%?Tr2}h>u(4c$ZO8?W2rTK+!3R^ zk-0QR=vhONAG}&&bpga$RY9&AFKAyWwNN$aiI{=bRFF3o|NdbYSv_sm4u(c~~$038}HCg@smsGm3(IOnrip{6sT58Xwk zZ*EWqcA9UkU zSydT(Y~0L#4wOx}Juc;exV$PGFKZ`KXt5;lhG)Mp6?G=i=ul1a>4RKzn9|^LjH~90 z9k5Sw32R9c+`Wc)xq_JjwPl?48#%Op^wi?b z>(J|LgYVC|rulwPdf-fht4=k37NaWWU;{bpXHvrK#aj1uBoZ{oH&SQOBejqkW{!WF z8kH)O4rXCCUeyA*p5A?{*vkHf59jqCXh!s+>tGgFqE`+sUu_8AsLlo0(I(R-zonZ; zEkt;=*7ts!iU0fHWFg{L6zhsn;!CL5?K}Up8S6kS@R?cTz>D@Fz1>`rr%XkQpbNUr^8{w{V)a~p-y3{;PFoO2e^P~13 zX%@UpD{fut-P56L;+y#Ao~9ofC;^~YrwF+j@ubmXxvbqaF!{5{OmXuO}BpIpFP zdWciFTC8<%O;p1ugK(qW=X$u4WZYDN^%+C|43&SeO8!2)dR2yoR#Se|pZ1NQJ zMTzg|>o0)+PE<-azdAM{ZiHF(?)jyQv(x_4RjPNdmO30(zda{W%rl+vejFf&C979A z(N~>v)-t8}@i`0<>A8Gbk<6?`HY+zX`vp(5$aAtaE4vApcLas~Y;XC@yAEBxN*kLb z(DzOqe;bAs&ELT8Kaw)vm&7Qec*C0pK97M-v$;v;W`Tv>#(IY5@)Y&B!1rZUTn>o3 z$3VwnWltQK&SQ2l3{fUNXb7(Fs$AUXyToqJP*FAwoX>=u%F1??R}}jOUN*(c%*(rZ!1SMCg>R(@^Ix*LxVE6s=2+Ij@)y5cYlXESrd={8_0m5>|+=x4D z{4~Q?!UYSYlVp@OkJaSvGE6@trSB=o$A|z9O^_1 z%S_-GZpkd#_fc0YdcLK>#=-zJ6i3ZE-h;8(Oe!{$Jdd{T#W<*5``00IzUCtGQJ^QQ z8Z^Ig5A7aUG_q=4) literal 3178 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 Qy#N3J07*qoM6N<$f_OhVk^lez diff --git a/src/skill.c b/src/skill.c index d8b4000..f14d5f7 100644 --- a/src/skill.c +++ b/src/skill.c @@ -850,7 +850,7 @@ create_blink(void) Sprite *s = sprite_create(); sprite_set_texture(s, t, 0); s->dim = GAME_DIMENSION; - s->clip = CLIP32(32, 0); + s->clip = CLIP32(64, 64); s->fixed = true; Skill *skill = create_default("Blink", s); skill->levelcap = 3; @@ -900,7 +900,7 @@ create_erupt(void) Sprite *s = sprite_create(); sprite_set_texture(s, t, 0); s->dim = GAME_DIMENSION; - s->clip = CLIP32(32, 0); + s->clip = CLIP32(32, 64); s->fixed = true; Skill *skill = create_default("Erupt", s); skill->levelcap = 3;