From 4eae2b28d746b8b0353e26401cf653ee3426a972 Mon Sep 17 00:00:00 2001 From: Sven Eberhardt Date: Mon, 10 Oct 2016 21:26:10 -0400 Subject: [PATCH] Editor: Fix drop cursor drawing --- planet/Graphics.ocg/Cursor.png | Bin 8009 -> 9235 bytes src/editor/C4EditCursor.cpp | 8 +++++--- src/graphics/C4GraphicsResource.cpp | 6 ------ src/graphics/C4GraphicsResource.h | 2 -- src/gui/C4MouseControl.cpp | 13 ------------- src/gui/C4MouseControl.h | 14 ++++++++++++++ 6 files changed, 19 insertions(+), 24 deletions(-) diff --git a/planet/Graphics.ocg/Cursor.png b/planet/Graphics.ocg/Cursor.png index 75c979472089ba4118436e1fbbeb6dd33f31cf92..feb102917a26939c1c2bd707d5d74f24365a19e3 100644 GIT binary patch literal 9235 zcmV+uB<$OXP)D+r9>D>_X;f1H000McNliru;0g-?1Om)~;GF;fAOJ~3 zK~#9!?VWj;TveIyf3eFV1)6{)@Lu2(z-_=FFd#=p{$B(fd)cfs zq9owX7;PvzAI9v)W0QLc90L=oJVGD~^8WetN zCK2F%h%AGJZSYlKy1-S_IENm+HQyA4^V{HpKSI-@+I~i>kKVC5!-^FPidM!UB>qT4 zqJEOVVss8Hjl+cki*qb2TA6IR_buQBU;x&lJnAuAuljf$|N7jcQ8-{KFs=5V5w~{H z$~c=3=9~_Ee%lFQW!yrd2Nol9U`ZS}y2 zGVqOdcyt*IcGmX&ZLGePMi(8U+afm6JX+;(eKZ?KQeGDu4e!|rVr5)Iq8ApI!OzM98NB})h|aDdh+47I zpb`ZRZG-(BXevOc0J#tp@+v#O7;=-=ipHD)D1=~e5K_Q4)X%&HMJv@P#YQtABZ5Q= zi*+3{jXHM5>N2$ z?eFV&-m14U@f;^J4}^=Cs$|Vb5uAcLiUlY-P|*J`s^1IpdocvL0^~bj^9J|{@Di#* zNWp^QG7|2);8RI7G8T;ny)tN-sBJ86Fiav9x-jMhw zU<0rT*y;hriQrKjl<(68GzlzTxD1Z25iDA<(ufiR4*DQ0|0*mh2;mhyKaJlVQOu71 zTMmkk!LIMa)*k2-`w>jW!{`@0<7}+HQ%xYz!eUMD zN7xuIIw>M-=%zu`7Dk?lU2`sE%$=C$S~&9E^TzckR5-4hMx%T^koXKLmt{S$8MVdK z3uNV-isSqqIPyKx#@GyJ;g$}#z`~-HVH`Ulk0Znx!Fwhu?1~Gad?Ai0+!AoEE+~K-@w43Au%QcE(sitDlnUtbI%Gi4UWLr z)e;ipwSdH7V9~L#Sn-(G9dL9|v@Ww!5G6AptI`Z(;7zMDBQA~18m+C$D@z^2Wu+9_TY;kzusWjv-jp8!-$rc% zI>y3cqUwM|0`APfN4-yo!>_Y&qpZ?YaZAhA;nz(j&XFD&M~f3UDu+$3nc&IhI^qy?DK43{s1MFSAN8fGWqR^arh zaDSUJ{KpAfO|8>+GS9IUSdxSv*9sE7us8>fmeM)%jqjPHbSvH}S80=m^6dWXYG~br z3VhoHT&$iu9oQFD(k?N9uVF~OTQUJHHyGDp6RKF@95^WsUsH>A_9eiQOp_QA{a|rG z;Jh7pTVU~pWl-p}bJ^-KSC5?)Rg2nvfxSg%wczdwgod%5)1q)*6wVgAv6o@@M^$pB zLjA)wc&JHfdh1~CV zm0Ew0$Fq38^oI6swNHkmj7pSi8_Kim3+>a~AG1(foI9Dg?ao5Rb&2gIs|-_~f!H$m zK!-}OxW&i#)WoxBA<-8WOT>B>EhKs%@o$rG?QC$iDJRJlvbg9H-IY?qX7~K`bFf@B z13s34&`y|@hleTMJ?}rmQa8hFDonR!BUy0?%%-yoveO zp}h$23Ml5P)e{yJhxd5Jeg2kU&t9sb20HJk81aL?3bD7KDFm@WV}Q-_yl9#lIP+2M z@1`4*AShVWfRfBW+a-0lezSqkt9!K%?iNCP0(-kdz zK=XZIaYVZ}77{HiTB*uGk^ojrf$u#6vE^cJUGvS^Az-D zR5gT7lqWPzm0m>)io>r^{02c3H_oBa;uB5dAJ?;I78KtwKyjXbY{pzMaI?k8wFL-^ z8ffEVaE)|^wYMLxg~ZCX|0Bkjm<-n~G+fKQGO@5;ShSGXn6T*h{NGkW7@v-vy<%|J zJ&;)LQTX>m((M_dwknAc==K2dAS0wqIeT|Sa}mW9i=n6+0&y~QE_<-ij~1)IU^fsFk@+E zIw#_45@;|i=`VYL=bZObU+5!oxGD)}p*)K-P@cu0wiiQVGzQK47h&>sVyH#k$`Jky z>L=3Nuj)Gu1B)#d5*r#8txSyhIuL`^H>qkQd#rAM1d;QgH3=($51>Lt=7|aX`)0W7 zE@=6hk6kJNmqH-{uL*F)17HBtL8T95uCIR$-g+GJUBkRd9+gk=D5Nsb;RA_P>1~_L z;(wvSRor}Uy(MRu)oPH&e>Wro%?X&H)9DX}&^k9@mxFx1$A^Gb5IF<>rX2ZYt)aNtkUXPFLI(m;$$;GRl%Z9NhTeWyH)<kW-Q)sp%(aG4GZDwJpjiH< z_>r{^iY>RTtP5^Cl-64^>k>JX79tLEJHsrJ+=7a`n1*C(0vrnASB=m27W z2vwe9D{3-rxDNI?9^#QbA+gv4>ntSJ4HgR)94Ey6*L4z8eQ?dqaO?YF$|*iiz63)1 zLDSiAVG%aZfq73rY<`(H|2}Xx45r{w6nyOx`;nt|ovFN8*R66)6`LN*!}dSG_Wy#t z-v>^pjNbkgaIZSS9>aET16AnMhB5(xJ~^z-tEx6}{ajX}eE z3vMB9Q)ziyodp3TX13S#R=BAd-n$KM!-)S|pq3RO^Z%wyp>%6nUON-zwhp4MqAn{i zfZ7I_D>inzT=!bX4Qfd26NBA}+vaQ{x1h6-*ch;QD{ioTI0ZMafmx@+qF+iZlmUq^ zOYi3O77~Ml#ZKTZ_558vi%JWN;}aCKqT@IB!i}GTl`lb)9{`@IoFma&VZmw$mx~Q~ zRDoq71y2EQqe2^Yi2caazOUxJt)2%e&jvT^dS180Df zf){{SWnOMkei!;`=x7L0>QQV4xEs}XFDr&}JF3|K4}qTpexUdUa38P)m2tB`?ET)T z{+|D=p4Ke-#Ej7&ldWgJUWxi-^5V{}sebe|(3uKU)pt!{N{{mpG z@f{o&K248nttWO~2CE~AeHW!!$e|j3mNozy;4`?b)+U2t(2#hHg~Ty~#q+XoyMSK? z=t{xOPr`YN;TQ*gQ-D9Cy!cz>*k&QIX0YgF;X560{$hB46RgX@gQ)s)UQo0${zN+; z(#oMmyZ}G%fCE1Z$NYDdyt4~98HxjHBk?c7Xq#oR*DdT;%QxYqqFvwq~Tb|7d_jG~HDrbIDnuTGF#vBRBH z43+3{%s;}xhYa!L2XWXyEqZY@WEDJQ`EGs?VHI=FP_RMw*&z&V2H;G(}**A^&7 zfPaCei;XAD1#a+A!*j#GXEjMZBT?oBV}j=>Ex8iZXBG`$EKDNrK@vDB$PPGGDuTs- zl5OZt(fzqTxLy|j?HV8j5O;{~v5;6BSaeW3MAri!%E3ChwmW=YYw95DT@2PHms{A6 z)TU%*Zgm0iez^Tn_~wl;=h6xt9tGf3a5`Z}5nhr-+dHTj<1X9`;#%4dZ$b;mf4XPS zW?g6JZdYlGD2n@mBSpCb{2F)y)lak_&rJYxr%fZibElcvQr_Q?Jh)T(Pvg z{|cWcesPF5Ss=@$VLWm{!J=M31YK&yFVSeS7=j~`u-Zc6*uvt0ur#YW1KlAyp;sIP z9WsY?9Br@s%veaQ87!J{(La;LwZ7i-MaO3iT~uVxghVT~w_AQYj>S>jb2C=43uxI1 zw_FKV90Q3HD|nNufj>hw2d@ZkZIh$h7$-qF8A{5=g@6s6o%ki?{15Ok;QewU-wu;xlGbtIqIEtYQ_OndXaRY+#GI-d8oqk z)g4lF2a9kWz8lCYqpgY;pNeu}BeS5er^hWwSagP2VFm?^lSabug;|jJf`!B}ldpqQ zR66fP;34Br^9}Ajp%`uwU_Fu%Co3fCEmmD!B#gWB zren!RbI-L?DkZG3B?lY74~tH$zz%;JxJlXVkZ?*rZmvNt;IR-I;(-g~bCbXUo8h#d z!vRZV)uQUAG%KoJ zO46yrQLhC_&_~5mgjL(&#TBZ=gOxhV`QY3M*|ds5@Amw;S03v|#a3xgqJ_lT!lI5} z)7QHTw@g++0P!eM?XyrV-lj6~dzz00BSgn5F?Q)&U_r2s?mA>SJ}e& z9dJgk%8s8R=bfU?9%jRk^vMxMc}$<%2!~t=2W^0iqcXF%;&x-n!|1a^qjeY*O+aX- zy6CY(;q)A23-Al}jQkBmDg^S*PG>a z3dYK{3%3z>KEQ!h1d3+IhZQnfs*wV)QGE}cnVG|GyHq;XO^tpUwNl{S2pczp+e zo-}-O9bB;j4qO8f3yXDw#K(X)1r)v0($253mm`yK&njs7G=!GHDIL%ziAM=aJA7DJ z933RK0&|<;zdi&9+zZh&VZra+9)6NeifIz5iwxyz&I>6H;ErjbgjIgg+c`U7;hDpzA1x%?UOe_#;G*gHP^M z7yBWPflCK`;Wdov7?nX;F(xSW&YD}zk-Z_aO`LN-1TKQMvJH(&DLppx6y; zNyD}4;NMrkLJNy^fyBpA{bARm>acbAEb{E!8bfJ=Z+#hBbfVWY5L*VzJ0LEw=-s)q zusCvf+fN{I!7rrP{4XGS1}ywNT(wK(lKg&@y0`^+Pcz*49}rz$<^{h2ZUtvGg#7fN zKDWbRSw_L@fauymYTLrE8edKpcXzWJRh)l@xZeZ;(EO}N?TB@XskzpL;~(gxFHO>K4&O^4=e)3ovKsQFJ=5W zK6A*s64e3xku+Sl4!*Ji4zREoI3&I*9+HiyRezVy{IxQM(ge*X7;{y!)T7H_X$M>= zu;>*Fi#32m4P^I2pum~1*ZV1!=U*I2>W>* zXDXnKodAE|t9B4Go`rdl`qkdlP688Hi^4BGsPofYgD_0Pf+F~LWdUHhx=GQ$gL6~L zBj?>V%LGX2MGwg7K8W64&vD#%Melbo+xF?2P5qQ^Ej!ewz<5cZb_TxpLpbU^&^nSb zC@+H3t70ot78ENI9ShTvfscNrP9M5P9ovCtjr%`1#9~A%mykh@*IHPt8zgQJNYsl< zD~&ggOT?&uxx~}6+rnZEArS)>Pk_i{ip@s)SxrD&8+_+@*#Dbl80ThSB@{BMip;hx zu>Vo;o?ol`y@wnL+zL%!gfI3f&)rzrM;&8pR*hMU%9jWkPOfHQ+h#xI7On zU#@cN^H=J~|xeT1!)Exbj%*~!6{G|sD{UDrr zCq(|v=XL)8q2EF4YWSxVd>yqzqeHavj9o zsq%Ztz-l6x0@YrC^E-;eOnmPR@betjGj_o&{m>0OpN6Zifc|r!SgB9^8K6rI__t-n zk}^QiD#76uV!fpW1&g|T$54vFF<>zz<76waL11y?3f1`DO7M_q=hHY64U2Q&=(wt5 zH(xw8GYGCX{bYs2kvgz+rt{1^oO=z#TYOf^pK&4aaa5$$t0<4$THwI}xa0GXyQ<9m zyaXayI21V8xc8Ad-g~pMhPPn3_xEuFio?R$L+Ls#FZ3FAc@VPxF`;SQMoFkIFT*H9WHTBNiu za6P41MzQO}kwJ#u!mjtZY5>rKDLeqTT?hX@OWg3Ad|s#@yAPZkJTIWBTNMRa|8XM0 zL?HpGo9oabuM@aS-EUpb%S@DVDmhn1w+%g3h0Gfc5G^E5K3KHd(1AkYXyscI8x=s`aSEvbRx=kzF!3n`EwL`r+z_;iBVUzlR~R16ZyS2%j#% z3%Ffc>K(ry$E~j67&^u5Pp%Vs64Yp?E7~X{Y&AqqgMFTYO9m7y>dYb&#_BowG$dxX zL&CKDNd<{LVyGKMF_=9rF$T@EY1sHBm>z=gAY>h5#a2{a#9rJ?spoMUpQkJ+R&?F- zKsEzkS_$6<5<$UYC$J2P?W!K%)0D<0R(hXC3yTFNSAvrhD)T)(brN3{BV-|Qd_qpe zuy_I-^|pn@VIlEUSa479km%KE{lJrH_`%6=?kr#%bmZXI0*0FnNbD9nSCsSDrDt;e zs^;uDN5aur2QPU`@4#MS(=89oloMtdwri)N3fLktkL_Sp2sYuy8d* zOeL{X{m?Z+C&MB_>z(2bu`XJ^r64gU9ar8kJQWraC$P*0UQo697Qa>si_Rp4MPEof z8}`3l>i7i#?PV6Q8JTz6fCti0co&Y$tL#jYs967( zLLtelx;6H(vzjo*3A$i+Jvy$8#IRw&q6XeRnH)*aeJ>ioFd)#e6aPZuR{Y0`&N%M|UQEOF zD^-G4&0x_3iH`}hY#HUswj3-v(!u2`2dTJWucTy*Xiw%uHHf?QKn60Gp#rJ3Bq5!K z2XPB&zfEZg91DpPR9b+iAm#&$Ofpy;3KHXEFjoh~W@|^tJpzegv1dKFG59)J(=3^1 zcD)(|QU$nE>}FBkyW4=wYykIosQ3Coz1Xatpg8P_B!I7~E3E_T-&6}WUK!&FW|o|B zWRP{qfYTYq0}TpOW{pV4m^=wwZ=!dC`Pc*N^xO-`Ca#eSO|*)exZQdlL7_T|CQ}Y)3-zMdhJ*Q;rTw3rdc~MAJqB z0|d-o&>F0Q?6^{kNn^Gx^z+VoO9Gj_gDoUh2U>b18wQ@P1uXhN;(Eh_rMEvu+xpTA zi+aoqh?1OwTYx?*pV@_)vl%9ColVDMEOc-9c9~1s5cSBh6I)VhGQ;A9lL!_Y4HEre z(X@NIdB&h|_}vr7uzO~LXvEM5+V0m{?|C8B1;zF2nKznu?%SirzZqjb?6?dH6dk|c z?^A$SoB^RvLP(FMk3)DZv=q-WUAtrDu``Q)>j4(>49FlmuGDJMIG*zl4e?zk zdM0bou$Ywvj#i|jg2f>qaT9Kgjk%br74Vvii(R;N8ZjOpFrcU~!SAcS4myM*jvLRE z^>`@;EhJi4oZzt7sF3J|MeXzm84jLG?6$d$t#x9^$L<#c(l@)kqHost1B~~}RO95T z$JTQZa0C(yS$HW03vYwzm&lVo3|tS>2bH4j7h_bkn$iFO1C&WbK~&pk7{RgfY?*_p zI1CUsva!?mp^`d#Rz|0sptMEXh+uITPhy8Gs0M0mfXvmjS#Qw{S17lto~SX31^j!% zn>!16Lr+;RyoE(CENUG*H~|(_jSh*XJ`Q>8o>PULGo2-cI@n3aqi+TPJ{R2e(YB+a zvT8wZJr{xedWfF|gIRb0=<9{8SHo%NKy)f_j5^yGDwaUE!^;`Qs8Pz#Oa#McC3slO zcpk3`7Keev_JAPK3rA)^cO{*OCaRd%BahpD&$|e-UU&kD>JyG=(-P=A1 z?Ar`KZ9qt51YkIpHdALTn>!d0-0m+4+_14)*royecWa%o0>wP49#NqHH=!~#O|0sab#55Zjg+vr*4Yh_Zv;uu3>IY651i;khZ3w8lEaqe*~VezQf;QTDy zfZ8d`F#bJ?x;0!AFk3u{^BWWr$Md38$BGwZ?3lR)p%K2X8T*){%JODG#whAN{_cWm zd9+y|F$%;}@Z;NH)!7i)q^?4=4How8=?b+<*vh1U#Rh^z3qkf;SQ#ZO9t=yj!e>z1 z(7R;rh8e%18hYD#dJEihHq5^*7)YFq^UU$s4((`*P`ft98br;bB4=EX9z`9~^E4`! zA&J|2unFkN!TpQjlWoxNKzkqjg~sZ3V#P{bV6j0V(TWu-Baqvm*rVqDi-v<_BJ_d| z0|f`VH^IUJfi$_F%(~4CWhvl#acgOps!mu9+M}qmg>)GSy((z}QaQK-xW7kL4-cV| zSj>(fMXPeGOmtZMG=!ur-O* zYn1ImmHp5?Y;CCtE8|_lvM5UcZNMy4Jnpec_}3)F`r!>}%h!(bB5t;jXvIo>WE#A+ zFD#hqV;7xa?4${qd0?%A#0OBlzu%Na-&V0}K=Xd%&xm0;ykU=gb8&J^5C(@JfmnJn-sZi~%#1QPX5nV!qz6D+r9>D>_X;f1H000McNliru+zSs9F(DHTH$eaZ9@a@j zK~#9!?VWj;RMnNhf3NoHg;fCs1ks2~GJ=R0akOWm(PUymGMX4oV$?6mL~+3-8=rB- z9WhaH{4!B9F&V@db)trhQ88+SxS@fV;D(BHgLF6DbagG=Rd4>d_wsH%UUgS@*Q>6s zy65|fZmMf}?=I*3?z!ilV`0R|$dCXK0wO>h_&D$-U^&nObjwFd{yzuUrrC^CqQv0t zFnkfPNqU@ipZ{Eq_-Avn7Mj+M^^0m~j>`&mLq zJB4DhHSiy z7^&p(sXSMWz!7oy)e@*%1lB}gErch*{3u)uOb7M?#sPH_%mN0oj8rHzluUxa!w{SY zGaBJXz*q?-kr56HY6~?If`yH6-U|?!S=#St@X$L(XBaVnWu&Iy>X!eQL2X+EU#EIIG3|A^pKMSPOaBB;!nFqZk zge;>Ij2OT&QZi*ysapnvf-3`AWgRnC4Y!}w$749*%5I1CId~D+j7Zhc1|%e4jr0?7 zImD^pZlFC4x3|E{^B}vmbp7hp&qjPQ|a*yx^d8<3c0dXkK8ccQ%T^;4O#QxuogHk4Yzr`%;d@HyFYZeQVI0ayJ%mTe%b=rOM{=GWnP{(^FBq!8OR z3HiHSrR`|B+M-^zMN~d-%Q=(8sU(o5h)M!M7(b=-aP@(Ns}7v_t6UZIgYL!Z*80XW zkY%I~J!X-AiZaYmwGiLQ>mp{)b)quwU23l z2fN`Db+D~VoSc=$^YnPs*q+jsf4_s{pc2pT$xgjg#{)2%mBL(!B z3T;q{cC(rzp)dQUhezmMYvoDpaXDA|ybvRW+a?T5YlJ7q!xQ6S)p&S3A`Tpe6C4`y~l;3}9HhueXZM#IC6!eAaLnPhaC?n%GK24GGc?kg2sxgpCH zlcnx6PX3muQA)BL3Br?j|5ebi2@%+{3Aj+ab}X3usuC^ZY&dYKtb6qw@Bp-DM2FerZ>?3*wJXonEMRT` z4mbs3QQ#b~E`qTkxL_#+x4^{9;lFKIAP1Lh2vCBIE%+fQom->rbo~(tkcAacUCA^2Eb6wU#cpeZ>g+fegl9S)o#S2K-$tYm5xu8t_elUOImeq39{Rb%_< z3$0)u<4RQ$xPZb*ZVg-+PnMDLI2Ia!PsicpmsLU69g@ax{~tm4 zEr?hU?$K7!6I^c^BNWy&M46ef+TigEvXo(ur=W3B8QO0maHi<1y>MK;QEIoa>tIiB zM&x@cZS4EiM!~-3fJY?(uhbxe+AT0}WgyGQfE)`kplKA`@dSkDOC$XpgpY?Ab#M*v zaS2(<2E=g=^o#}$Y=B2jfPY#8k@3Jx`59y3?4a1`QDG*^MjF5xBoTWxo~rKNXX93Y z(Tu85Hvw`RHNcwcz4ts>8it9|I5heQSqcQB!_Y?R#G<=in}Mt1wrPXZSRSnYO4}5f zf6c&EWkQzi@qcr&cw{<6_6Wm0D*XjaSB$LkvX^yASxD`hl!^16RhAWyJUS+8u@!w}{jI zyR8a;3BhxqAr6ayqYzvAQ>6*~Y8~8j57htI!!Bikiy<3>zXM%3yB`H@qX}~NZkWIT zfWnn;bHH@H67B%r2*PorVZq}Nomb$4F97=`*x3#LhjR$5&&1rd z3RpT6d9A=zuw0?-Kb2_ICO=<>MShMYJprSiZf89?WIbYEc?|O86Tm?bctiVscap;i zV2uKM4sZ>G&xbjk@CQWE*e=A1pp=GHSSa_8mt|1#aoFv z%qkhKj0_I4EMU6=tQ5R+1MGD)M1#A-RjwU27`Q4MWMvI-RYm`+JXeXGaLqEf{gW{2 z1dkUl0&5CHz5(aw;QdK3^-mCb2HXoh33w9WCGC**BSRmRENT(3^wJl4hIZX! zrB<79AkYb+Gvy!N5r%&E{W^-T7jWG!2WbcX6=YU@l9C>|9rF89H3C@bM67|U;eo7$ zX|d>OR{9_bH~tAOJ_!!K3BpZ~-2pG<;AN@E-!X7ia>!aZ59T}q!7o6zS+w!99*Z#p zSR=FF)7m2XrJeA=aq#7J5cUG76U3un9PmGY1z;!O72pjyFE!4xLMAD^E5DJ(N#(rA0&~Z~@hX-=_x{M|?49s*Myy<0 zwLwto>h^kawAeww60jbIz2DUCNqVsI0Ber+|LMSb?H+6g+H?J^gWyC2W)$tkp$@s4Bt93Kvg1~nna-sHu$-vDnYx`3FpE;0V z|G_B1tTr(+pOEAXk}|?wHgOz`IM9Amh#Q*CrQQ5D(U-q~+Xd1)^PW=aX>VQkZmc zk&c2aa3a`SVS5hN$;HkGh#1ONHFx{7A0ZzbO~rg16oT`5;T+9-kYsp@BbZdkVuz`T0#AFFd!851B6UydMvc zUy!B1+wUX)UI!3rMS*@I4l4{?4KHNv2XoV+lE7V3Cv-{=Rg0X%Do(Id{!AITDj8(y zai90gMX74cr_k&7CN^iHkcDQmw=yN?5s}-o<0k>TNmmdzXV~hBZtAN)a zoq@ke0N*AbZQ3~LcX95g2TR2;#e3oSM!0h)TqXy1r+k$A6qltzRa#xKyS8419*CqV4m2Cjxp zt_C|Nbl$7LaQ4P2E5vXt>n;ndJnhhLN(3ga9OD#szET7@fh&`h1y z58&+ds94#d^tp28BqVEW&cM4rgPF$`VTVrxZV`6dlAO|o6H8rmebIo=4HyC92SWEu zIHpciou7iJ)G`JU&>W_`$tGw&y9|$VfxO?3q9q4QK7v=9#8G1-WtN3t-wo*` z{8p}lb?KDPsUot@)DV5Pwf6dL|fGd?!Xm7zX zOq1=cxS$j^ahFFd2q#R2{q8D~HD&_$LSPgefs?I$z#%i`h{1}~fxQYMbKtmb;`Gd~ za1wy&hA&r!iIxS@U1E1{Dk3~-PubZj|B_nesI9?qIPPRc$14#D$Hr@eBBDXr&ZLMd zFM7YW1PY}218o2uCr8FWWv%$E?b^!DDEfgxRiF&sxPiiBx*IOr05>hd%irgCFPIqR~{?3OhUvcu8c!00n^j43@83p?YI=}y)aS`uA9%A?XZNCkOPQp*+ zd$-8<>uDac+DfTau1b?Q$w~dXx163Kx(N~3F%ZcD?~40SC!PHEz*Upt&^?@fmEh4A zBg$YD<7Mmy+LLhI2DrQl_FD}>16gH*tEYfBC1AOyrI}yDFNelq*LDcZO9|-fmb$iwVJwwn75e{7;86&D z7QWUg48tGEKRKX7iXVWL(!B7YZ=bE(y1{u&uZi9p>k+FX^VK11_hZVQ|* zAE3+>Oce#luK5N!xa-{zwg9JNa-b>!Mz5u z$_iI{c?}C=lq*K;0(!DQ;cnx}DluHSBsP@qtAk4>!_f~ohtBfk60nzxIr$yIWOEPM zAu5JtI8I{a`k63pkC&IHs+=c*^drb^z{^Rv>T>8h3v$KQeOL>$ih=ST!n2sr0Lv(k z{uN2Nr5*uU>KJ)nLG`uf)xfPU6J!+wVP4Pm2Vv#DMm@E}R$zS+uD%~y zZz$eLsztK@LS5Ok>p zbYN#)JeqWu0Yj1{*Qy{B5C;kB(3prb)XWB-7 zSvRXxq*!vf4FWANb`@OG1=o-tJeDKBZe2MgS3n`Efbt&t-fArOwJO7@PHzUfVfhX4 z!wJ$|y2;~>>bVEO&cMqO&{Ro)S}BG+WWbF|(B!p=}oq zR|40H11kepwFg;dyU;QeTId zat>MrSLu%+rd!OoQ>{BuK@&=^!GuQDFDBvLi(sq;fgVWP+6o~jyjGn!Cn{gYDQKB6 zfK^nx_X6n@T(lT&1!8_d)>dF1#%Qh6J= z8kulVG-MqEv)?n2)h}F~2-8>k4_9uT)&)G5gr6S|XHO9Brj`u+UINwo8eFwWJC~E! zpO&AI=@K~u&pH$iOM|rop3RCwMO$2RJ6rL9CG$-Ln_#~U@ZBU_%kJ58%jv~ZhVyL! zz)V5JhlP`(1Gh@@O;wQcbQij`5Dj=?x7d1B@olQ?gMOM)B}V;74m<@|J;pE;1>#A> zw(M1lMX8NQsUb_kmE8=@8Ij(k1#v2^Q=906QAl2p_5CK8u>yj+lGq`Bs2p##0N+aQ zRM%j{wvsH^76&&<23an+dP>^*&Bd;y1_)WU%=rF;{Y6}) zTM}}ND9>578j@XlAO)#Q5P_mf;*d%2@b`SY`LfXB6=0xb0HqPyVcV`k% zI}`1Q_$*t_>jXunFbessoOY83<=vmI4bnp)_o`SCzbPLrINO86wL(_P70rO^wF(uG z_?e--6oXAK59H+ybf>1!Yug#P8W^Ccl~Vv%QwqrPfUCDPkBM?q54FUU8?w}x>6Xf6 z6i(vZwEWIi>BUM>y?N4Xmy%VrOPl3fQVP6XK6YSIo76I7onJ$cRcUbL1zEb?vox<% zPaj-iYj#gRI2P3OfwKGk>b;PUifOms9~5Af8wb|OV5wgCA_Ue$eUE^uHk<;1T%aQVllSb^TT!_gd{I!~BMI1Ge;lvQ=i;z-*q7LO9 zIC-|vp6}LRB3tGCs@g$qwMTK{HPWtCagTv316frLS(OS`Zpc#30!wp@6l1sb?M9^& zEf2fjug)#U7GVysC0u3Gur2{Jmc!UZ@e8H(K{hmte36= zjfColV)7&z8QP?V{8A``f~p&@vdE}d$M~q zJ!QPU2D03crF3vl6)Z+79j%ESojR$}B6Qo%?~SW}o27 z4HZ3_ccxQ%a5``@{MX7ULLIX71)$y*15J}*q>3TyK$sQ5@=0XVuoQR!8N}WL8?KdP7zF-BG{9uaS0vep zk&1(?VTLO&u;_IydMa(Ll#qut{VEdl#n$$3JVe0-reP_MyjZCG!bB; z^juA=P`IiX8ue2l^#E;ILG#Z@L$MLqn1K71Lv{o3n7EKoBg|m;jMPSH8L0`#svx-P zZv|JYbJDbhk)k1MJj?~YhVWpi^f)8AoQ~Qa99s`7&+refs%B348H1%_7S0jwe#NCB3GbDUXGa0EzX;4a|dc0u?SBBnvlAf7W*)kw8N)@fkL z@;93^qMqHmh+J2j@GqdQ7YM-x(V#dA)SN=CU{w~EGRW;zhZ&sB{zbL82`NSAVx&AW2Hx5mrjPcpi*`SDQiro%V7-8=M-a6s-;|4` zEz+)y!SQsdOyVk0 zSk_E`BUK1ldmyr;%VO{R5#hO2wIH|RoTs4y*hoG5_Zv8+ ztUi!%rFLf2Tpp>s5Rx`~tkhrAfp1IT8p>Aau0wIa%Q(5nN3{GuSnEVIA%>JJ00000 LNkvXXu0mjfTXO|& diff --git a/src/editor/C4EditCursor.cpp b/src/editor/C4EditCursor.cpp index 8a1978cd4..6a8510383 100644 --- a/src/editor/C4EditCursor.cpp +++ b/src/editor/C4EditCursor.cpp @@ -873,9 +873,11 @@ void C4EditCursor::Draw(C4TargetFacet &cgo) X2 + cgo.X - cgo.TargetX, Y2 + cgo.Y - cgo.TargetY, 0xffffffff, line_width); // Draw drop target if (DropTarget) - ::GraphicsResource.fctDropTarget.Draw(cgo.Surface, - DropTarget->GetX() + cgo.X - cgo.TargetX - ::GraphicsResource.fctDropTarget.Wdt / 2, - DropTarget->GetY() + DropTarget->Shape.y + cgo.Y - cgo.TargetY - ::GraphicsResource.fctDropTarget.Hgt); + ::GraphicsResource.fctMouseCursor.DrawX(cgo.Surface, + DropTarget->GetX() + cgo.X - cgo.TargetX - ::GraphicsResource.fctMouseCursor.Wdt / 2 / cgo.Zoom, + DropTarget->GetY() + DropTarget->Shape.y + cgo.Y - cgo.TargetY - ::GraphicsResource.fctMouseCursor.Hgt / cgo.Zoom, + float(::GraphicsResource.fctMouseCursor.Wdt) / cgo.Zoom, + float(::GraphicsResource.fctMouseCursor.Hgt) / cgo.Zoom, C4MC_Cursor_DropInto); // Draw paint circle if (Mode == C4CNS_ModeDraw && has_mouse_hover && ::Console.ToolsDlg.Grade>0 && ::Console.ToolsDlg.IsGradedTool()) { diff --git a/src/graphics/C4GraphicsResource.cpp b/src/graphics/C4GraphicsResource.cpp index e315936bd..419b157c9 100644 --- a/src/graphics/C4GraphicsResource.cpp +++ b/src/graphics/C4GraphicsResource.cpp @@ -76,8 +76,6 @@ void C4GraphicsResource::Default() fctFlagClr.Default(); fctPlayerClr.Default(); - fctCursor.Default(); - fctDropTarget.Default(); fctKeyboard.Default(); fctGamepad.Default(); fctCommand.Default(); @@ -320,10 +318,6 @@ bool C4GraphicsResource::LoadCursorGfx() szCursorFilename = "Cursor"; if (!LoadFile(fctMouseCursor, szCursorFilename, Files, C4FCT_Height, C4FCT_Full, false, 0)) return false; - // adjust dependant faces - int32_t iCursorSize = fctMouseCursor.Hgt; - fctCursor.Set(fctMouseCursor.Surface, 11*iCursorSize, 0, iCursorSize, iCursorSize); - fctDropTarget.Set(fctMouseCursor.Surface, 11*iCursorSize, 0, iCursorSize, iCursorSize); return true; } diff --git a/src/graphics/C4GraphicsResource.h b/src/graphics/C4GraphicsResource.h index 244a998e9..c00159e46 100644 --- a/src/graphics/C4GraphicsResource.h +++ b/src/graphics/C4GraphicsResource.h @@ -68,8 +68,6 @@ public: C4FacetID fctGamepad; C4FacetID fctBuild; C4Facet fctClonkSkin; - C4Facet fctCursor; - C4Facet fctDropTarget; C4Facet fctKeyboard; C4Facet fctMouse; C4Facet fctCommand; diff --git a/src/gui/C4MouseControl.cpp b/src/gui/C4MouseControl.cpp index 9c8f64fc7..35cebd922 100644 --- a/src/gui/C4MouseControl.cpp +++ b/src/gui/C4MouseControl.cpp @@ -39,19 +39,6 @@ const int32_t C4MC_Drag_None = 0, C4MC_Drag_Script = 6, C4MC_Drag_Unhandled = 7; -const int32_t C4MC_Cursor_Select = 0, // click cursor to select/click stuff in the GUI - C4MC_Cursor_Crosshair = 1, // standard ingame cursor - C4MC_Cursor_DragDrop = 2, // cursor when drag&dropping - C4MC_Cursor_Up = 3, // cursors for scrolling the viewport ... - C4MC_Cursor_Down = 4, // ... - C4MC_Cursor_Left = 5, - C4MC_Cursor_Right = 6, - C4MC_Cursor_UpLeft = 7, - C4MC_Cursor_UpRight = 8, - C4MC_Cursor_DownLeft = 9, - C4MC_Cursor_DownRight = 10, - C4MC_Cursor_Passive = 11; // passive cursor in records and and fog of war and outside viewport - const int32_t C4MC_Tooltip_Delay = 20; C4MouseControl::C4MouseControl() diff --git a/src/gui/C4MouseControl.h b/src/gui/C4MouseControl.h index 52577f98e..625cfb689 100644 --- a/src/gui/C4MouseControl.h +++ b/src/gui/C4MouseControl.h @@ -47,6 +47,20 @@ const int32_t C4MC_MD_DragSource = 1, C4MC_MD_DropTarget = 2, C4MC_MD_NoClick = 4; +const int32_t C4MC_Cursor_Select = 0, // click cursor to select/click stuff in the GUI + C4MC_Cursor_Crosshair = 1, // standard ingame cursor + C4MC_Cursor_DragDrop = 2, // cursor when drag&dropping + C4MC_Cursor_Up = 3, // cursors for scrolling the viewport ... + C4MC_Cursor_Down = 4, // ... + C4MC_Cursor_Left = 5, + C4MC_Cursor_Right = 6, + C4MC_Cursor_UpLeft = 7, + C4MC_Cursor_UpRight = 8, + C4MC_Cursor_DownLeft = 9, + C4MC_Cursor_DownRight = 10, + C4MC_Cursor_Passive = 11, // passive cursor in records and and fog of war and outside viewport + C4MC_Cursor_DropInto = 12; // drop into contents + class C4MouseControl { friend class C4Viewport;