From 8db5b655bd4e9cc265cc3e36440d511ead22e182 Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Sat, 23 Dec 2023 14:40:59 +0100
Subject: [PATCH] Add icons for medium curves

---
 resources/g2/icons/medium-curve-left.png     | Bin 0 -> 1049 bytes
 resources/g2/icons/medium-curve-right.png    | Bin 0 -> 1052 bytes
 resources/g2/sprites.json                    |  10 ++++++++++
 src/openrct2-ui/windows/RideConstruction.cpp |  10 ++--------
 src/openrct2/sprites.h                       |   5 ++++-
 5 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 resources/g2/icons/medium-curve-left.png
 create mode 100644 resources/g2/icons/medium-curve-right.png

diff --git a/resources/g2/icons/medium-curve-left.png b/resources/g2/icons/medium-curve-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..c59ca8a65eda110245a3c90340bd201fe025704f
GIT binary patch
literal 1049
zcmeAS@N?(olHy`uVBq!ia0y~yU=U_tU=ZM7W?*1AEVU(ofq|JJz$e6&fq{XMk&%gs
ziJ6(1g@uKcm6eT+jh&sHgM)*UlT%z-S=rcF-`UwdIM_QmIl8zwzqz@2`t<qh*Ka?3
z`10-B?>~Pw)@QJ{X7Kmsj*b@2&XzB))^G2&o<7@u`TF?X`-@MX@4o+dv9mUNxHWga
zw|ITHe1Ed~{9@zH&CdI$ho4@bfBSg*^V^HRzd!6Q%@D86P;SrAAI!cypM8Hf|Mlg<
zpHEBwf3E-kbNv6`{r~?TR%T%EXJCkDXV2&7ua}nYS65$bZN1sw|9E=(_4@kP^XLEH
zzhBx|SlM1&-(TK3Ufn%kJG|aFx!<~YwsZ4p@5#G^7oU#bemh;>Tw32<**aL;JJ~!s
z-#NeCzkPoE{O$SM&(|NmJ^B3e<@dku=eK7N4rUNfXOOREQ153qpD*sdUOjrheg66I
z?)$}y-}fK>zu8|~IN4mf++Djn+<JMk^X}r{^UcZErx!n7-TZ$4^zY|a|9^a#U)Wq-
zJKWej-QKx8IJi4Gd3JgE`tI)i^XH%6zWx5?%kSU6|IZ+u&!9e?-FP{_^KR+j)7t6x
zo!cKrFMeLW`+fiA&+DK6zW)6`w>Ce&xwyEyymGL%ezLW7vA2JFeDdt_>h;}|k1t<;
z`|$bC_w5<tz1fR{`Rn85`?IxYSKF^{58gdH{rKwo>-%Rvzkc}h=hy%385qJD7>XGf
z`WYBjGcX)yV0g^V@SmOGzrXYU>f-;a7yrL~-Cvy{-<V;tJ;Qc)hTHxO|AQI+=ZpXE
zHvYfZ|Nr*v|EJsk-(JiBig<GdZ)b*ZfA;KT@%nP@$^Guj7boxD-F*K1>gUhT|Nn2#
zAf3)&T+MCYFYdosK7PA;{%!02_tC3Am+$^Q{q*nc_y1piuP)4BF3;|+&mV0spB-#m
zo$lRVpS^f;{qEJ1&mUg>{PyAhpYNM{d;j0g@c%Z$|Nji?{q54t)$Hl<4DsRo<@v||
z|DXN%aq#-}#<QnapFZsz9UYvVom^d=Z>-;Ju0P%0c(t?fesBHD{@TyOmH)@f|F2j7
zKil~KcKiS5z5oCJf8u5%11Jxa1o;IsI6S+N#=yYfSrrmd5}cn_Ql40p%D})e^RvFk
zS?(e}!%Kl0#utn)8ecXwG77t3;BRQ=Wn${TbwkLB^T8i{b#%RSy-uI;K65d!ps<vy
z^g0W}(p3JIAGLEt7#J9eJY5_^B&Nomzb)vZ$iW<-b&AL7z(4Kig7@AZ-%FTwtzmp3
zvt(|^lT6pV8-3!ed;eVZGfX-+v#;04_yqUEl)0%-?raD%3H#!<c=xJ}&G8`zUN2PF
zkdT>hY}YY4o!4BUaqp+C*1L2!?sxu$wpTam`%FJEcO)uteU$lT2J)b%tDnm{r-UW|
DarMOy

literal 0
HcmV?d00001

diff --git a/resources/g2/icons/medium-curve-right.png b/resources/g2/icons/medium-curve-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..41466c32f81c57439d48da95efeb3ae0b89bb437
GIT binary patch
literal 1052
zcmeAS@N?(olHy`uVBq!ia0y~yU=U_tU=ZM7W?*1AEVU(ofq|JJz$e6&fq{XMk&%gs
ziJ6(1g@uKcm6eT+jh&sHgM)*UlT%z-S=rcF-`UwdIM_QmIl8zwzqz@2`t<qh*Ka?3
z`10-B?>~Pw)@QJ{X7Kmsj*b@2&XzB))^G2&o<7@u`TF?X`-@MX@4o+dv9mUNxHWga
zw|ITHe1Ed~{9@zH&CdI$ho4@bfBSg*^V^HRzd!6Q%@D86P;SrAAI!cypM8Hf|Mlg<
zpHEBwf3E-kbNv6`{r~?TR%T%EXJCkDXV2&7ua}nYS65$bZN1sw|9E=(_4@kP^XLEH
zzhBx|SlM1&-(TK3Ufn%kJG|aFx!<~YwsZ4p@5#G^7oU#bemh;>Tw32<**aL;JJ~!s
z-#NeCzkPoE{O$SM&(|NmJ^B3e<@dku=eK7N4rUNfXOOREQ153qpD*sdUOjrheg66I
z?)$}y-}fK>zu8|~IN4mf++Djn+<JMk^X}r{^UcZErx!n7-TZ$4^zY|a|9^a#U)Wq-
zJKWej-QKx8IJi4Gd3JgE`tI)i^XH%6zWx5?%kSU6|IZ+u&!9e?-FP{_^KR+j)7t6x
zo!cKrFMeLW`+fiA&+DK6zW)6`w>Ce&xwyEyymGL%ezLW7vA2JFeDdt_>h;}|k1t<;
z`|$bC_w5<tz1fR{`Rn85`?IxYSKF^{58gdH{rKwo>-%Rvzkc}h=hy%385qJD7>XGf
z`WYBjGcX)yV0g^V@SmOGzrXYU>f-;a7yrL~-Cvy{-<V;tJ;Qc)hTHxO|AQI+=ZpXE
zHvYfZ|Nr*v|EJsk-(JiBig<GdZ)b*ZfA;KT@%nP@$^Guj7boxD-F*K1>gUhT|Nn2#
zAf3)&T+MCYFYdosK7PA;{%!02_tC3Am+$^Q{q*nc_y1piuP)4BF3;|+&mV0spB-#m
zo$lRVpS^f;{qEJ1&mUg>{PyAhpYNM{d;j0g@c%Z$|Nji?{q54t)$Hl<4DsRo<@v||
z|DXN%aq#-}#<QnapFZsz9UYvVom^d=Z>-;Ju0P%0c(t?fesBHD{@TyOmH)@f|F2j7
zKil~KcKiS5z5oCJf8u5%11Jxa1o;IsI6S+N#=yYfSrrmd5}cn_Ql40p%D})e^RvFk
zS?(e}!%Kl0#utn)8ecXwG77t3;BRQ=Wn${TbwkLB^T8i{b#%RSy-uI;K65d!ps<vy
z^g0W}(p3JIAGLEt7#J8zJzX3_B&Mcb@a8+9z`+vWZ^C(k;k$k0#kwtP*Ht9)T)JiD
z@LR6sufRcmCXZ^xgfmO>J34&6FJc#rGf#3(32fWE$>ivgtWzsC&AO2<wNNihy!W_`
zJ4@1)$rig;H3Sv-+ZTm8JehfTjeoQ?!|tvZ?-y6(zhqd_pd@j4jgURakDji6F6*2U
FngCab!4Uue

literal 0
HcmV?d00001

diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json
index 3960d54df4..e56820f989 100644
--- a/resources/g2/sprites.json
+++ b/resources/g2/sprites.json
@@ -24898,5 +24898,15 @@
         "x_offset": -5,
         "y_offset": -20,
         "palette": "keep"
+    },
+    {
+    	"path": "icons/medium-curve-left.png",
+        "x_offset": 2,
+        "y_offset": 6
+    },
+    {
+    	"path": "icons/medium-curve-right.png",
+        "x_offset": 1,
+        "y_offset": 6
     }
 ]
diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp
index acc5d5b6f5..edafa90f56 100644
--- a/src/openrct2-ui/windows/RideConstruction.cpp
+++ b/src/openrct2-ui/windows/RideConstruction.cpp
@@ -118,13 +118,13 @@ static Widget _rideConstructionWidgets[] = {
     MakeWidget        ({  3,  76}, {     GW,  41}, WindowWidgetType::Groupbox, WindowColour::Primary  , STR_RIDE_CONSTRUCTION_SLOPE                                                                           ),
     MakeWidget        ({  3, 120}, {     GW,  41}, WindowWidgetType::Groupbox, WindowColour::Primary  , STR_RIDE_CONSTRUCTION_ROLL_BANKING                                                                    ),
     MakeWidget        ({  6,  29}, {     22,  24}, WindowWidgetType::FlatBtn,  WindowColour::Secondary, ImageId(SPR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL),  STR_RIDE_CONSTRUCTION_LEFT_CURVE_VERY_SMALL_TIP     ),
-    MakeWidget        ({ 28,  29}, {     22,  24}, WindowWidgetType::FlatBtn,  WindowColour::Secondary, ImageId(SPR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL),  STR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL_TIP          ),
+    MakeWidget        ({ 28,  29}, {     22,  24}, WindowWidgetType::FlatBtn,  WindowColour::Secondary, ImageId(SPR_G2_ICON_MEDIUM_CURVE_LEFT),           STR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL_TIP          ),
     MakeWidget        ({ 50,  29}, {     22,  24}, WindowWidgetType::FlatBtn,  WindowColour::Secondary, ImageId(SPR_RIDE_CONSTRUCTION_LEFT_CURVE),        STR_RIDE_CONSTRUCTION_LEFT_CURVE_TIP                ),
     MakeWidget        ({ 72,  29}, {     22,  24}, WindowWidgetType::FlatBtn,  WindowColour::Secondary, ImageId(SPR_RIDE_CONSTRUCTION_LEFT_CURVE_LARGE),  STR_RIDE_CONSTRUCTION_LEFT_CURVE_LARGE_TIP          ),
     MakeWidget        ({ 94,  29}, {     22,  24}, WindowWidgetType::FlatBtn,  WindowColour::Secondary, ImageId(SPR_RIDE_CONSTRUCTION_STRAIGHT),          STR_RIDE_CONSTRUCTION_STRAIGHT_TIP                  ),
     MakeWidget        ({116,  29}, {     22,  24}, WindowWidgetType::FlatBtn,  WindowColour::Secondary, ImageId(SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_LARGE), STR_RIDE_CONSTRUCTION_RIGHT_CURVE_LARGE_TIP         ),
     MakeWidget        ({138,  29}, {     22,  24}, WindowWidgetType::FlatBtn,  WindowColour::Secondary, ImageId(SPR_RIDE_CONSTRUCTION_RIGHT_CURVE),       STR_RIDE_CONSTRUCTION_RIGHT_CURVE_TIP               ),
-    MakeWidget        ({160,  29}, {     22,  24}, WindowWidgetType::FlatBtn,  WindowColour::Secondary, ImageId(SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL), STR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL_TIP         ),
+    MakeWidget        ({160,  29}, {     22,  24}, WindowWidgetType::FlatBtn,  WindowColour::Secondary, ImageId(SPR_G2_ICON_MEDIUM_CURVE_RIGHT),          STR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL_TIP         ),
     MakeWidget        ({182,  29}, {     22,  24}, WindowWidgetType::FlatBtn,  WindowColour::Secondary, ImageId(SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL), STR_RIDE_CONSTRUCTION_RIGHT_CURVE_VERY_SMALL_TIP    ),
     MakeWidget        ({  6,  55}, { GW - 6,  14}, WindowWidgetType::Button,   WindowColour::Secondary, STR_YELLOW_STRING,                                STR_RIDE_CONSTRUCTION_OTHER_TRACK_CONFIGURATIONS_TIP),
     MakeWidget        ({ 45,  88}, {     24,  24}, WindowWidgetType::FlatBtn,  WindowColour::Secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_DOWN_STEEP),  STR_RIDE_CONSTRUCTION_STEEP_SLOPE_DOWN_TIP          ),
@@ -1611,21 +1611,15 @@ public:
         widgets[WIDX_RIGHT_CURVE_SMALL].type = WindowWidgetType::Empty;
         widgets[WIDX_LEFT_CURVE_VERY_SMALL].type = WindowWidgetType::Empty;
         widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type = WindowWidgetType::Empty;
-        widgets[WIDX_LEFT_CURVE_SMALL].image = ImageId(SPR_RIDE_CONSTRUCTION_LEFT_CURVE);
-        widgets[WIDX_RIGHT_CURVE_SMALL].image = ImageId(SPR_RIDE_CONSTRUCTION_RIGHT_CURVE);
         if (IsTrackEnabled(TRACK_CURVE_VERTICAL))
         {
             widgets[WIDX_LEFT_CURVE_SMALL].type = WindowWidgetType::FlatBtn;
-            widgets[WIDX_LEFT_CURVE_SMALL].image = ImageId(SPR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL);
             widgets[WIDX_RIGHT_CURVE_SMALL].type = WindowWidgetType::FlatBtn;
-            widgets[WIDX_RIGHT_CURVE_SMALL].image = ImageId(SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL);
         }
         if (IsTrackEnabled(TRACK_CURVE))
         {
             widgets[WIDX_LEFT_CURVE].type = WindowWidgetType::FlatBtn;
             widgets[WIDX_RIGHT_CURVE].type = WindowWidgetType::FlatBtn;
-            widgets[WIDX_LEFT_CURVE_SMALL].image = ImageId(SPR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL);
-            widgets[WIDX_RIGHT_CURVE_SMALL].image = ImageId(SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL);
         }
         if (IsTrackEnabled(TRACK_CURVE_SMALL))
         {
diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h
index 702db75546..e4a8b937d5 100644
--- a/src/openrct2/sprites.h
+++ b/src/openrct2/sprites.h
@@ -1497,7 +1497,10 @@ enum
     SPR_G2_ALPINE_LIFT_TRACK_GENTLE_DIAGONAL = SPR_G2_ALPINE_LIFT_TRACK_FLAT_DIAGONAL + 4,
     SPR_G2_ALPINE_END = SPR_G2_ALPINE_LIFT_TRACK_GENTLE_DIAGONAL + 12,
 
-    SPR_G2_END = SPR_G2_ALPINE_END,
+    SPR_G2_ICON_MEDIUM_CURVE_LEFT = SPR_G2_ALPINE_END,
+    SPR_G2_ICON_MEDIUM_CURVE_RIGHT,
+
+    SPR_G2_END,
 
     SPR_CSG_BEGIN = SPR_G2_END,
     SPR_CSG_END = SPR_CSG_BEGIN + RCT1::Limits::Num_LL_CSG_Entries,