From 6bf09e7abbe0f7b841279f655a21a5d5e7989463 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sun, 21 Jan 2018 23:22:44 +0100 Subject: [PATCH] Add preview images for RCT1 edge styles --- resources/g2/edge/brick.png | Bin 0 -> 769 bytes resources/g2/edge/brown_sandstone.png | Bin 0 -> 783 bytes resources/g2/edge/green_stucco.png | Bin 0 -> 472 bytes resources/g2/edge/grey_sandstone.png | Bin 0 -> 566 bytes resources/g2/edge/purple_stucco.png | Bin 0 -> 472 bytes resources/g2/edge/red_stucco.png | Bin 0 -> 472 bytes resources/g2/edge/rust.png | Bin 0 -> 776 bytes resources/g2/edge/skyscraper_a.png | Bin 0 -> 1057 bytes resources/g2/edge/skyscraper_b.png | Bin 0 -> 943 bytes resources/g2/edge/white_stucco.png | Bin 0 -> 472 bytes resources/g2/edge/yellow_stucco.png | Bin 0 -> 472 bytes resources/g2/sprites.json | 55 +++++++++++++++++++++++++ src/openrct2-ui/interface/LandTool.cpp | 27 ++++++------ src/openrct2/sprites.h | 12 ++++++ 14 files changed, 80 insertions(+), 14 deletions(-) create mode 100644 resources/g2/edge/brick.png create mode 100644 resources/g2/edge/brown_sandstone.png create mode 100644 resources/g2/edge/green_stucco.png create mode 100644 resources/g2/edge/grey_sandstone.png create mode 100644 resources/g2/edge/purple_stucco.png create mode 100644 resources/g2/edge/red_stucco.png create mode 100644 resources/g2/edge/rust.png create mode 100644 resources/g2/edge/skyscraper_a.png create mode 100644 resources/g2/edge/skyscraper_b.png create mode 100644 resources/g2/edge/white_stucco.png create mode 100644 resources/g2/edge/yellow_stucco.png diff --git a/resources/g2/edge/brick.png b/resources/g2/edge/brick.png new file mode 100644 index 0000000000000000000000000000000000000000..33fafac33ca7b1ed68ce26d764e897c09b4f8bc1 GIT binary patch literal 769 zcmV+c1OEJpP)BqmzHTb5pyklfRc&%dciYqbKA#<YqizW z`G50^kT5tfBy?@468Sdq55JHCWI%jCs&R8-c4GMjU->;he#A;)VPj&UG0~ss9I+H< z3Bc1COL^A8?|tOOUG({{etG;gPIVWn1pt2lV!SQT3f$Ij00000NkvXXu0mjfSm-^o literal 0 HcmV?d00001 diff --git a/resources/g2/edge/brown_sandstone.png b/resources/g2/edge/brown_sandstone.png new file mode 100644 index 0000000000000000000000000000000000000000..202475cd7086b0c95074c00fb43ed20128fe71e6 GIT binary patch literal 783 zcmV+q1MvKbP)+R$A{yqgXi0$=i9^YznAyVtM~82|J$SgL;#2d9Y_EG0u)I^K~y-6)l|`r93c$z&V+bqE+(+s zZvX#F`!KV2duo56NKrtT5E)|tAkJY|ey#J$0^WAs!vHvd0I&cI0LSNvf1$^P)D``_ znAku#h#dxpIZ)C%PGo#H@*~ z4oO%;0PZK6xY=ej8k^I|rZswh-e)b1z9zTPWjUMj0Zx)Pn(y?bj0mltnj@o*_|&h1Y;0t^3hy=4 zV~zT)*`*16>6bJoxzp&I^S0;sNad=>nyRV(UBAZ0^Bri;diGqQQICgI`leqeoou}H z!<;qM)l<@1L;Andn}`Y6D-k`r7I5`40zUBik0m1a1HT N002ovPDHLkV1hf|W9$F` literal 0 HcmV?d00001 diff --git a/resources/g2/edge/green_stucco.png b/resources/g2/edge/green_stucco.png new file mode 100644 index 0000000000000000000000000000000000000000..08b966fd34e1930d628230bb17461ed015822dd3 GIT binary patch literal 472 zcmeAS@N?(olHy`uVBq!ia0vp^+CZ$p!VDxUx6CmBQk(@Ik;M!Q+`=Ht$S`Y;1W=H@ z#M9T6{Sl+6n4rj<@NKh!Lb9155hc#~xw)x%B|t6%gL6@8Vo7R>LV0FMhJw4NZ$OG( zDmzeIG{7gs6-fKH$0yG&uU_9h`S|knw-2BHd_UCGR1PS?SQ6wH%;50sMjD8dd2_I%oI$?*qqhoww{Ms>_szuvZYTH^ zMIH)V6L1RAJ7vO=8u-hn>uj3ASwqtmOQ-Dpk+9CDZ-3h zt8dWvH%|IW0Z)Rb)GYS0G=9P^JH6z@TBAE31Ew0?@lD;i=RT*X^HS+5)7thGMR^nQ zAExa!{no$x{JrP-Kc}TgTiHBzebFv*UeEnpdRh7I*&7yopL{~<*3=j39ek@((`A3v z&c1mq`Y5yF^t}={XMRflmnwhrmh|R~)`yuzzy>4^~m%OnJ4L%r3yNV(@hJ Kb6Mw<&;$VCP`qsb literal 0 HcmV?d00001 diff --git a/resources/g2/edge/grey_sandstone.png b/resources/g2/edge/grey_sandstone.png new file mode 100644 index 0000000000000000000000000000000000000000..df4a2bb9c990a17e79a5a373fc11d96d6905b56b GIT binary patch literal 566 zcmV-60?GY}P)L;#2d9Y_EG0c%M_K~yMHy^t|-!yphvH84Uh z6Q6()7r?t0NE6o-0i~o6i%S(2Ize*oEMR9Q7s#x>H2Sl={p>KvVQ3Pp@uBJnRG`6sa7X$=T zd@hBSEz~INBD)6R2t=@lRKHuV0k8aHd2_I%oI$?*qqhoww{Ms>_szuvZYTH^ zMIH)V6L1RAJ7vO=8u-hn>uj3ASwqtmOQ-Dpk+9CDZ-3h zt8dWvH%|IW0Z)Rb)GYS0G=9P^JH6z@TBAE31Ew0?@lD;i=RT*X^HS+5)7thGMR^nQ zAExa!{no$x{JrP-Kc}TgTiHBzebFv*UeEnpdRh7I*&7yopL{~<*3=j39ek@((`A3v z&c1mq`Y5yF^t}={XMRflmnwhrmh|R~)`yuzzy>4^~m%OnJ4L%r3yNV(@hJ Kb6Mw<&;$Uxo4qXn literal 0 HcmV?d00001 diff --git a/resources/g2/edge/red_stucco.png b/resources/g2/edge/red_stucco.png new file mode 100644 index 0000000000000000000000000000000000000000..c2f24b8f2fa3a8a1a64196d59198685702b004ad GIT binary patch literal 472 zcmeAS@N?(olHy`uVBq!ia0vp^+CZ$p!VDxUx6CmBQk(@Ik;M!Q+`=Ht$S`Y;1W=H@ z#M9T6{Sl+6n2_qTB~O!pLb9155hc#~xw)x%B|t6%gL6@8Vo7R>LV0FMhJw4NZ$OG( zDmzeIG{7gs6-f81t1q^;-t6yxJU#t-ef{hC^D_cm)qxU>B|(0{3=Yq3q=7g|-tI08 z9jvk*K(?@_i(`mJ@ZNxvjV%T|+>L(}MOplrHwQb)8RXkPdaLkv`-W+A-&{Q4c7k6~ zr+6;hjNeyu5V3 z`UZV};mzD3Hy!M8d!UG`V) z?3>r3k1{Jx-z#x*=BMO;sq!~(NnfA1Tku|5{+xcFOZUoN-q`+c>C%d}FTePI>n(5k zb}UG=_`a}CjrQ|>kCXg;K1WP$OiyrSowWLQ#o_w}`zP1`U={VvlvkU{>;eoc22WQ% Jmvv4FO#u8iy59f* literal 0 HcmV?d00001 diff --git a/resources/g2/edge/rust.png b/resources/g2/edge/rust.png new file mode 100644 index 0000000000000000000000000000000000000000..5381391c179f344d5dee4e219918cc035318864e GIT binary patch literal 776 zcmV+j1NZ!iP)k{&^BL0000TX;fHrLvL+uWo~o;00000Lvm$d zbY)~9cWHEJAV*0}P-HG;2LJ#7IZ#YgMF0Q*7b7DhGczwkLqAhfLn{YMV`Eo43tMkP zTXS=7OBZj0gKvjVe^(!amzR%YC!cdOvx7swmsh$tXn+6!00DGTPE!Ct=GbNc0004E zOGiWihy@);0006XNkl9tU`$1t88&;m&XXb7J=m_Cx-|c~nPu;t7F3v7itX1c5|j@J3>gAR3JU zfPsdi9s!FD*MhghJHa&QD0trs10>*L;3`lOE(UAD_Mmpb+D}yg1>)ga5^51*60|fj zoi^TV@bu;h@kouZ%fweLmm2GuYRfB0f3eZ`VMo;^wOqYQJ-94uvwfz$YwViSF$bQ$ zY?)Y1j7)`C8s}|qz9%g!tATyj8&H<3$JQM?+=AKs@Z%r0_iQ8qK(W9Ok65WJ3d1z$ z$!&YKzlv-l-XH)BO82T~sE4bmiKV5dH{1D~`uJhOfkk03%u1t5>Y=VCVoy(_aGO=33Z`Wh=xY%p=y_vm!gmG*)81`E?1k zRcbO-;$g|QnYX1+rPF@%`>02V#WvScZy)dcFpWCezxY)bTU=F?3>QmlzHHCbuC#Xk z-~2*7pgRz5U^YJd;KRm0{32pOSr7&^h~&nejaL!B`Nc*d;BeUa91gtx(3jz5lnjnV6P1Hd1q-5!9`SL^5i0000dGczX>04FO~FGE8wM|eLPfxeE-?ziVyK_^!tCPFG zbHA5Y$7g5DuW!rGi_e2&&%>+J)9=&U+t-(K+sB9FtApp;qvzYh@4uJt^Yj19hyUB7 zni+aC00001bW%=J06^y0W&i*H0b)x>L;#2d9Y_EG0=h{=K~y-6)s*3qqc#wP+hm0g z3kw8z$nKDpIVHEi+E@f+&X;@t=gJRj_imFXIQ{9Gs;*Jb)K>!lg!@Z_mO-EYqksu+ z0f2*(0c-(`!P&oe6aaMSTZh^J=m2~L-~e0zfZ(CQh><~~gn~eU0UcU2u+TWegTWAY zJH-NV9D&LSQW@}S@RA>J^%mB9-0%l*&sJs7F+nq)dj?Sp+jd z7!yUGL_w5gq@||O%+sG=+;FkKyX!E`FaUrfpcAWr#&I>xq03uv03qJZ+UKZyTyP7=jnl_9!0!h>fC1td?L`hX8S{7G#cFWBl zeOb42+YUeNw|&?|BGs%Elg?89=j@!HCV#TrKILzDfg@r)Y#ufuA~sgagowwJw^P?z zJ8{0t?|H+1by-InneI*9MWrYczF1o~&$abqx!XPeJq4=)h%zdLh%}dNRBjaUWV&tr z+>WE==Xt*N{X4$|(p4tXf^9A9jnKTBc3XF|oxbvPbq>=Heg$(}Wxr`#T4jVP%)s4K z`_fo@(O=HaUq13naU3O7PCKa#@oKu4{LoyzW$QhE;J4B-#hTf)avQ0Fj;1^0hi0&= z_dMK|&%ZXmkST!#fgTgA+~d11Fs=sw;}=Q_XwIM$2Jwh-GI0HZa+l*HzfgEU3PuKk zz!9%l;ILptjt+19!iIAs!x5-(59jW~papQ}mjEOHHsPpoIBX8U6zV+a{S84)&=EiW beAj;g-AiQy5U_;$00000NkvXXu0mjfOAgf> literal 0 HcmV?d00001 diff --git a/resources/g2/edge/skyscraper_b.png b/resources/g2/edge/skyscraper_b.png new file mode 100644 index 0000000000000000000000000000000000000000..1204f9f6d6a7585dbdf26c637d72a8ed263f298d GIT binary patch literal 943 zcmV;g15o^lP)dGczYES1&_DFGnLYH)lIjD?dYb zKT}gnV>e4uX|@pgO`_!i@%S5YoDLbpRcc@ zlYh6j-?ziVyQ`DSuW!%8tJBl()7#tI$A{yqgXi0$=i9^YznAax^Y_oI|J&F9pm4^ZUWQ@jo)8f^S`U?1@z?i`w&Q^C2!rSmMZT^O z1HvL^#BHHvrd6hNCbkG0$y8H=a5yz?69}eA7bFgN&;^< z_?nM4vE#f=B1jWbSPU07eTCftIBrci^k30 z)CXfKUg|DNJRyKVokNd%y0zZyZ;g6eU8z(9Yt{ljSc`WH=fs9cZ@>Mm>w{~ZS^ELr z#Z+g7K6EEc`|!LsQ|nr-8`$=*rgf8anGAVD8);L0%e`%b^lOtLI_5Ryr=PHLV0FMhJw4NZ$OG( zDmzeIG{7gs6-Za7d-vC8FP>b#d-de=hgUzpefY1M|2v=rV@Z%-FoVOh8)+a;lDE4H zLkFv@2aql7>Ealo5xh6xWMhi~4|n4qMNt-i=FP#5at8VKkKQW$-M(Sk+&32wxSilv z6nQ9cO~5Hc@01BgYTz%QuCr+dXAMnPES<9VN5VRrzFo?U-hG?)PS$u3cX(&e880v0 zuf9Rw-#F1E}+XKz^WeewyZTT@@Cckr!FO_%*u zJNxFf=%dVv)Avf;ocSsFU#k4gThiAj?iRe4mOrQ8=hD5hmp8WmTe`HO?aMFz-+IfN zz8wn^Exs?TQ=|QS-{T~IpU)AK8`Be9StqUjU2*t+!T!nhKUhV5Gv(E0GP?l7iow&> K&t;ucLK6UA-o8Qr literal 0 HcmV?d00001 diff --git a/resources/g2/edge/yellow_stucco.png b/resources/g2/edge/yellow_stucco.png new file mode 100644 index 0000000000000000000000000000000000000000..5309fc68cc1250e0132fea0ae766d99ef2fbef2a GIT binary patch literal 472 zcmeAS@N?(olHy`uVBq!ia0vp^+CZ$p!VDxUx6CmBQk(@Ik;M!Q+`=Ht$S`Y;1W=H@ z#M9T6{Sl+6m=Lqc%7pnqA=%83h!W@g+}zZ>5+Ij>!MP|ku_QG`p**uBL&4qCHy}kX zl^rN98sHP+3Z&;38*grQ-akG3^!ohU$J?LZUc5&6F~~;7k|4ie28U-i(m*1|IW0xn%I2}_i*}LodhX}a%gT4p-mu{N literal 0 HcmV?d00001 diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 26588a6d9c..9983913207 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -379,5 +379,60 @@ "path": "surface/selection_edge_se.png", "x_offset": 0, "y_offset": 15 + }, + { + "path": "edge/brick.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/rust.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/white_stucco.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/yellow_stucco.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/red_stucco.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/purple_stucco.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/green_stucco.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/brown_sandstone.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/grey_sandstone.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/skyscraper_a.png", + "x_offset": 2, + "y_offset": 2 + }, + { + "path": "edge/skyscraper_b.png", + "x_offset": 2, + "y_offset": 2 } ] diff --git a/src/openrct2-ui/interface/LandTool.cpp b/src/openrct2-ui/interface/LandTool.cpp index b072233f64..76770f749a 100644 --- a/src/openrct2-ui/interface/LandTool.cpp +++ b/src/openrct2-ui/interface/LandTool.cpp @@ -56,17 +56,17 @@ uint32 WallTexturePreviews[] = SPR_WALL_TEXTURE_WOOD_RED, SPR_WALL_TEXTURE_WOOD_BLACK, SPR_WALL_TEXTURE_ICE, - SPR_CSG_WALL_TEXTURE_BRICK, - SPR_CSG_WALL_TEXTURE_IRON, - SPR_CSG_WALL_TEXTURE_GREY, - SPR_CSG_WALL_TEXTURE_YELLOW, - SPR_CSG_WALL_TEXTURE_RED, - SPR_CSG_WALL_TEXTURE_PURPLE, - SPR_CSG_WALL_TEXTURE_GREEN, - SPR_CSG_WALL_TEXTURE_STONE_BROWN, - SPR_CSG_WALL_TEXTURE_STONE_GREY, - SPR_CSG_WALL_TEXTURE_SKYSCRAPER_A, - SPR_CSG_WALL_TEXTURE_SKYSCRAPER_B, + SPR_G2_WALL_TEXTURE_BRICK, + SPR_G2_WALL_TEXTURE_IRON, + SPR_G2_WALL_TEXTURE_GREY, + SPR_G2_WALL_TEXTURE_YELLOW, + SPR_G2_WALL_TEXTURE_RED, + SPR_G2_WALL_TEXTURE_PURPLE, + SPR_G2_WALL_TEXTURE_GREEN, + SPR_G2_WALL_TEXTURE_STONE_BROWN, + SPR_G2_WALL_TEXTURE_STONE_GREY, + SPR_G2_WALL_TEXTURE_SKYSCRAPER_A, + SPR_G2_WALL_TEXTURE_SKYSCRAPER_B, }; uint16 gLandToolSize; @@ -119,9 +119,8 @@ void land_tool_show_surface_style_dropdown(rct_window * w, rct_widget * widget, void land_tool_show_edge_style_dropdown(rct_window * w, rct_widget * widget, uint8 currentEdgeType) { uint8 defaultIndex = 0; - const uint8 edgeCount = input_test_place_object_modifier(PLACE_OBJECT_MODIFIER_COPY_Z) && is_csg_loaded() ? - TERRAIN_EDGE_COUNT : - TERRAIN_EDGE_RCT2_COUNT; + // Do not show RCT1 edge styles if the player does not have RCT1. + const uint8 edgeCount = is_csg_loaded() ? TERRAIN_EDGE_COUNT : TERRAIN_EDGE_RCT2_COUNT; for (uint8 i = 0; i < edgeCount; i++) { gDropdownItemsFormat[i] = DROPDOWN_FORMAT_LAND_PICKER; diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index f8956cb6b0..e5b64c2730 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -831,6 +831,18 @@ enum { SPR_G2_SELECTION_EDGE_SW = SPR_G2_BEGIN + 110, SPR_G2_SELECTION_EDGE_SE = SPR_G2_BEGIN + 111, + SPR_G2_WALL_TEXTURE_BRICK = SPR_G2_BEGIN + 112, + SPR_G2_WALL_TEXTURE_IRON = SPR_G2_BEGIN + 113, + SPR_G2_WALL_TEXTURE_GREY = SPR_G2_BEGIN + 114, + SPR_G2_WALL_TEXTURE_YELLOW = SPR_G2_BEGIN + 115, + SPR_G2_WALL_TEXTURE_RED = SPR_G2_BEGIN + 116, + SPR_G2_WALL_TEXTURE_PURPLE = SPR_G2_BEGIN + 117, + SPR_G2_WALL_TEXTURE_GREEN = SPR_G2_BEGIN + 118, + SPR_G2_WALL_TEXTURE_STONE_BROWN = SPR_G2_BEGIN + 119, + SPR_G2_WALL_TEXTURE_STONE_GREY = SPR_G2_BEGIN + 120, + SPR_G2_WALL_TEXTURE_SKYSCRAPER_A = SPR_G2_BEGIN + 121, + SPR_G2_WALL_TEXTURE_SKYSCRAPER_B = SPR_G2_BEGIN + 122, + // 0x60000, chosen because it's a round hex number // of the last possible range of image ID values that is large enough to fit all csg1 sprites. SPR_CSG_BEGIN = 393216,