From 947903fefb8e171a8a14a04867565ec8c31dfa42 Mon Sep 17 00:00:00 2001
From: Aaron van Geffen <aaron@aaronweb.net>
Date: Wed, 19 Feb 2020 11:17:11 +0100
Subject: [PATCH] Mountain tool overlay in land tool window (#10739)

---
 resources/g2/sprites.json                |  10 ++++++++++
 resources/g2/tool/mountain_tool_even.png | Bin 0 -> 3051 bytes
 resources/g2/tool/mountain_tool_odd.png  | Bin 0 -> 2819 bytes
 src/openrct2-ui/windows/Land.cpp         |   5 ++++-
 src/openrct2/sprites.h                   |   5 ++++-
 5 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 resources/g2/tool/mountain_tool_even.png
 create mode 100644 resources/g2/tool/mountain_tool_odd.png

diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json
index d9e800c195..df7fda9fd4 100644
--- a/resources/g2/sprites.json
+++ b/resources/g2/sprites.json
@@ -452,6 +452,16 @@
         "x_offset": 1,
         "y_offset": 4
     },
+    {
+        "path": "tool/mountain_tool_even.png",
+        "x_offset": 1,
+        "y_offset": 4
+    },
+    {
+        "path": "tool/mountain_tool_odd.png",
+        "x_offset": 1,
+        "y_offset": 5
+    },
     {
         "path": "font/latin/ae-uc-small.png",
         "y_offset": 0,
diff --git a/resources/g2/tool/mountain_tool_even.png b/resources/g2/tool/mountain_tool_even.png
new file mode 100644
index 0000000000000000000000000000000000000000..2310820ec3ef70ee1c09080c2d5b888547381b42
GIT binary patch
literal 3051
zcmcImYitx%6kbd~Kv9H0g%}-&NR%==kDYhAC1tm?8(A#dB@__C-8*;MvAZ+F%(UHB
zB0@32SQTO-!4x&AK{PzXNHl0vG#EAUQ9&9_8lw?WV<Zw3q9pasK87NFA+pKr%-lK8
z?|kRn`&h%Wx*5~wP7j4bGZOXj6uvLO*PN+S@P8fkb`!o$v+Gy6q0mjU{cBR_+1`p!
zX!<52-Q+bTm#Wapg@I;eP&l8nv2-X@wJ2``*or(NgPIL9N}hS^U6L@gD7jKdGD$mz
zT8#QG2Q_vrOT(^KsA%M(YN9HyVgotk0V1Evny#9Uk_Edee)gAXk|>CHtx>YZcStlP
z8;F?YAVLU>6l8gskd!bh@=QcrNN^0R(2Pv85sG0|MpOlfDE&z6&Czr<6<<>Fh2NrN
zi|5%YO?Py3ggYW(%W0-rMZq>Wn&T)eLAjl#2lABZ&MRApBNsY`?HQIy_!dFNYV)Eb
zj<lFU&JN6)ZV4s~7@Y?;&4w92rGlUa13A0R$rhYzkVaXQL#F3qSvHWhTP)9VTdYw`
z2cIu<fT2w$10N&ClFJ1yT(7nrr%?iAL}@qOX(Kv?T&vB2sJ0!4Ij@|J>!r{oJSU)z
z#S6-|8gmfvEGKPQ*>aT|%J~u;hK#r;37}#62;A%YE2*G3@KBWG7>=PBj$-9B%d3K-
zM%YTf`b<$YX=#Sud8H^OM?{SXmx*G=X}|;H3Tsf+Ehh&sUPcZyBic5bNg}9%8nd#N
zgB|1OBE#1cu~>s+=|&cRa8q@Qi9~HoWED}QxG-A?H<?rurt1L{qC`AO;#|Xqq2ZJS
zK~^A3v5LS^JO?4AC;~$Xye8@_;3YvWri=CC7Hsnw<m(rkNwXlfaVb2YK_u}!q*yH@
zQ3~W`DkE|VC2@R4V<Q4kfK-m=e#gN546?(m`cY}vA}@#xFK`;AF|thYtj<vxT?Q1#
ziMr0olCJT{@0v@V%T{V|elD)LTk6Wipt<yvHL9=1d=>4tAXXxZPenuY*dDP1j8nbg
zN6=aF+lV#<5fFu5PyzINJW4{JpGYH1%f<-xnGg~s{f-udjgG<EqIcKQy$;}@nr2+f
z3G@X$YWSAfj+|i$*uVjJxFW}mlDcE%h=9X{XA!`*vjzly>U6uQl?GS<C^@Ph7qpKJ
zlFW&mfFupm4kC(Yph(G522v7(I9=g%DZ(jbkgo(uR3nTkFy(&zZy=RQ09%0BjPT|}
zUqd>aCNqpIDHLL0hT?^YM#*vpvmfHrct*ghW2ST2__^-sz;RhHPT_rS1VkAfHVrw(
zFdhu&S`Y$JVBP=YZ(P<*Y;+d!ABlC>txSc<RUA9?zb8`hJzm6eiQl7z{Z$=l_DqzA
zc*9lkP7v%3S2Je)w)FL_Yuyd}=}}00*eR;KgpX$aV{j(KFTtr2nYddWd}e%j``M+T
z(4<+3cul(L(ZQYlw{$a8YhV6c+%+_`W9^nRzt-NI$sMXa-Tw65u`k~L<HbXpx4qYR
zrgMJikpX$iz>RM#xNFvJlZIsd<JQ-Hto-!s_tQ2!fx;_~zjAc--ocq0J~~ASJJp4E
zzVqhfFZ+*0Q%`R3P8>e^&AB^zj;IeD`TFtY_jOnH)g4c=ColY>pLq4db%%fcZT-1)
z_x_$|4jkV19XGhPXMTL{gByQ1`^oO)bAyfN_X$o#Wnb^2=<crF+h<A#2U3k|KImO|
ztnT8fKl^+8_FOnPXT|TQ{%(o%T^xGp{BmLIx7DkU&#st!&&H>!H}{7JkM3R5efvX^
z)v1BRj%^oC%-K^R_1qBJI<sBa&pp5E^{R?!-wSJh`fA1LzizEs@!86Cn>L^HkK>8j
LW$^=x*Khd;^nv?f

literal 0
HcmV?d00001

diff --git a/resources/g2/tool/mountain_tool_odd.png b/resources/g2/tool/mountain_tool_odd.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f4ef8941759fe8490a5a50891be1d6ffd656f97
GIT binary patch
literal 2819
zcmcImTZr6L7@n;cdRrf?P?dr)1zX#m$;ruOlCa~to!NFroOPIParHrZa?Z(Y+?gaz
zvOBXaVi5%^iYRDn(fY6tr6Bs?gJP*Ih<y=7!3!1IhoT_j6@01K>d9Qvt=;V|)(&Kn
zoc!m%eE;|V=igr$-QK_Q&Xt)=roS{&tn&LNeyv@8Gyi{L!<mizwjvmLB+6t~tx2xF
z%%RtB=W7?-vGI7k{GdhrMix`wX4zIF;L@4Qz+fxDWRk^#&1$Zf7k@o=LKIw@7a!Kj
zupAWFggde)WIOhZj*&f+#H8ZjeZoM?;tCop#zL!6_adv67u$L*{+ujJqR<wJC-dS^
zVo(?_SA>EeGC|AgfXJ#L<jkzBt5DIm2nfoi1Pw`60F*7LTUt)&{zPsqq>fcBZtL3O
zZ+USdjsr`Qn$2dmsbu}ICdsDBbsz~Lz$HL5<HfiIyl8z-Ly<)!bc5LSJt5JEZGS4x
zi`>&r2#p|B>qT9dIABr>2a=qHNl0x$N>aICDy+ASQzEfCYcMa4xU8JY1`~elM-%=6
zs?*Px8Q{>C%c+fdeQ7jO6Hz=o&BN#dGOu(rHWM(Z$|8R%By4z^yScs>O%zwzB|Mj~
zor||O2Ua0uIQGLa->>(wT<OItAP$+Zv5bl9B?#P`*z0a#MI5udh#-OhA|M-MvTA9j
zrO2C;?8A;|*{7~EbEPOJhhjl=nJ8x*#W7w~m=eqJ!v^MfxeZ)nQsC7@A<cqS@aula
z4Ri05x$C7up%VIzTjw95>h`TdX}F-vrmh2&mD}!?%T~#YV(bxCD&|EVYu0tCWt)u2
z4wZqas0^qG$-pKW1Vo`SRIsc=+zFTOFZyIEVNkNaQ%uw+T*oE%sG`^?XE3143Iz^S
zZD43v1`f6j>?pErYG%)yheDUvGp^6ons`OIMpe_Hsv!y}Gz_514g$7gV1SVBILOF3
zRAoukw25eqxDn6tOt%hqu-)CKx+}D~XJL}mR9++r9~c$8%kDgQEXi_re{+IyrB`7|
z$9m*DaTAAZsK&8d0uQAH-S@p|7S0JEz#-<%jD=BNbV9!&q?{3AU%)|7cL`2Hm!>`1
zZ5U~?#0Bj{c>3xf8AwMO%TXXx!bt;(4vd^lKn^nGn8?W~h^M&|{goi;mI5se_Uhxm
zfz;JbCa_my{4kKNAsmfDsv^S%Bxmz*bW;T;wQXQChqr7>RD)<&3+J+OzwY6XMOm;&
z;uCJ9L|GU%%0hPz59V?$bwOye?*Fm3DC?HisupJ5bxV_!9M+w-BmKK0b>52|EVm^!
z+CI;$`FhV%dB_hqi+A2dda<sXP&G^fWQS8*A*uol8)3kd9Ho$H2ojXAI??7|YcEcE
zNgIYaGfZ!Z4@SvjI+5|0bf#k-uicPOY!|F|r}(t@R;f5NHnRV#14Fl*6qet3;qO}h
zw|ze!?Z10x<z)5c$DVuUbpH$AK3a*z@w2b&AAP#I@77c2emJsh%cn0cd;FK5j6<95
z-|W5iMdjqqoVadk#k0YNFY!BnuHJrR*}#u|1Io(p{s@j9@9R@9j_f)xd-nWG`_>)4
zVej76YY#;611AnjgR`^ejy`$(>$-N=&X4}ueg2Ko<i%G9Klo<y<4@i^tR6h0xxXJ<
l^WpPh^PW3SzxVm7Q=i@T{Y~%7!^xOh8Xhgay>-`9{{Yjhn+gB`

literal 0
HcmV?d00001

diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp
index 341f00254e..6592e2d1e6 100644
--- a/src/openrct2-ui/windows/Land.cpp
+++ b/src/openrct2-ui/windows/Land.cpp
@@ -354,7 +354,10 @@ static void window_land_paint(rct_window* w, rct_drawpixelinfo* dpi)
     {
         x = w->x + previewWidget->left;
         y = w->y + previewWidget->top;
-        gfx_draw_sprite(dpi, SPR_LAND_TOOL_SIZE_0, x, y, 0);
+        int32_t sprite = gLandToolSize % 2 == 0 ? SPR_G2_MOUNTAIN_TOOL_EVEN : SPR_G2_MOUNTAIN_TOOL_ODD;
+        gfx_draw_sprite(dpi, sprite, x, y, 0);
+        widget_draw(dpi, w, WIDX_DECREMENT);
+        widget_draw(dpi, w, WIDX_INCREMENT);
     }
 
     x = w->x + (previewWidget->left + previewWidget->right) / 2;
diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h
index e863320a51..c1f0880b6b 100644
--- a/src/openrct2/sprites.h
+++ b/src/openrct2/sprites.h
@@ -854,7 +854,10 @@ enum
 
     SPR_G2_LAND_TOOL_SIZE_6 = SPR_G2_BEGIN + 131,
 
-    SPR_G2_CHAR_BEGIN = SPR_G2_BEGIN + 132,
+    SPR_G2_MOUNTAIN_TOOL_EVEN = SPR_G2_BEGIN + 132,
+    SPR_G2_MOUNTAIN_TOOL_ODD = SPR_G2_BEGIN + 133,
+
+    SPR_G2_CHAR_BEGIN = SPR_G2_BEGIN + 134,
 
     SPR_G2_AE_UPPER = SPR_G2_CHAR_BEGIN,
     SPR_G2_AE_LOWER = SPR_G2_CHAR_BEGIN + 1,