Merge pull request #9128 from Broxzier/feature/6116-tile-inspector-colour-scheme

Expose colour scheme in the tile inspector (#6116)

data/language/en-GB.txt

@@ -3724,7 +3724,7 @@ STR_6273    :Music
 STR_6274    :Can't set colour scheme...
 STR_6275    :{WINDOW_COLOUR_2}Station style:
 STR_6276    :{RED}{STRINGID} has guests getting stuck, possibly due to invalid ride type or operating mode.
-STR_6277    :{WINDOW_COLOUR_2}Station index: {BLACK}{COMMA16}
+STR_6277    :{WINDOW_COLOUR_2}Station index: {BLACK}{STRINGID}
 STR_6278    :Autosave amount
 STR_6279    :{SMALLFONT}{BLACK}Number of autosaves that should be kept
 STR_6280    :{SMALLFONT}{BLACK}Chat
@@ -3754,6 +3754,7 @@ STR_6303    :Downloading object ({COMMA16} / {COMMA16}): [{STRING}]
 STR_6304    :Open scenery picker
 STR_6305    :Multithreading
 STR_6306    :{SMALLFONT}{BLACK}Experimental option to use multiple threads to render, may cause instability.
+STR_6307    :Colour scheme: {BLACK}{STRINGID}
 
 #############
 # Scenarios #

distribution/changelog.txt

@@ -25,6 +25,7 @@
 - Fix: [#8947] Detection of AVX2 support.
 - Fix: [#8988] Character sprite lookup noticeably slows down drawing.
 - Fix: [#9000] Show correct error message if not enough money available.
+- Improved: [#6116] Expose colour scheme for track elements in the tile inspector.
 - Improved: Allow the use of numpad enter key for console and chat.
 
 0.2.2 (2019-03-13)

src/openrct2-ui/windows/Ride.cpp

@@ -978,7 +978,7 @@ static constexpr const rct_string_id RideBreakdownReasonNames[] = {
     STR_RIDE_BREAKDOWN_CONTROL_FAILURE
 };
 
-static constexpr const rct_string_id ColourSchemeNames[] = {
+const rct_string_id ColourSchemeNames[4] = {
     STR_MAIN_COLOUR_SCHEME,
     STR_ALTERNATIVE_COLOUR_SCHEME_1,
     STR_ALTERNATIVE_COLOUR_SCHEME_2,

src/openrct2-ui/windows/TileInspector.cpp

@@ -314,7 +314,7 @@ static rct_widget PathWidgets[] = {
 #define TRA_GBPB PADDING_BOTTOM                 // Track group box properties bottom
 #define TRA_GBPT (TRA_GBPB + 16 + 3 * 21)       // Track group box properties top
 #define TRA_GBDB (TRA_GBPT + GROUPBOX_PADDING)  // Track group box info bottom
-#define TRA_GBDT (TRA_GBDB + 20 + 6 * 11)       // Track group box info top
+#define TRA_GBDT (TRA_GBDB + 20 + 7 * 11)       // Track group box info top
 static rct_widget TrackWidgets[] = {
     MAIN_TILE_INSPECTOR_WIDGETS,
     { WWT_CHECKBOX,         1,  GBBF(WH - TRA_GBPT, 0, 0),  STR_TILE_INSPECTOR_TRACK_ENTIRE_TRACK_PIECE,    STR_NONE }, // WIDX_TRACK_CHECK_APPLY_TO_ALL
@@ -1858,8 +1858,22 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi)
                 if (track_element_is_station(tileElement))
                 {
                     int16_t stationIndex = trackElement->GetStationIndex();
-                    gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_STATION_INDEX, &stationIndex, COLOUR_DARK_GREEN, x, y + 55);
+                    set_format_arg(0, rct_string_id, STR_COMMA16);
+                    set_format_arg(2, int16_t, stationIndex);
+                    gfx_draw_string_left(
+                        dpi, STR_TILE_INSPECTOR_STATION_INDEX, gCommonFormatArgs, COLOUR_DARK_GREEN, x, y + 55);
                 }
+                else
+                {
+                    const char* stationNone = "-";
+                    set_format_arg(0, rct_string_id, STR_STRING);
+                    set_format_arg(2, char*, stationNone);
+                    gfx_draw_string_left(
+                        dpi, STR_TILE_INSPECTOR_STATION_INDEX, gCommonFormatArgs, COLOUR_DARK_GREEN, x, y + 55);
+                }
+
+                rct_string_id colourScheme = ColourSchemeNames[trackElement->GetColourScheme()];
+                gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_COLOUR_SCHEME, &colourScheme, COLOUR_DARK_GREEN, x, y + 66);
 
                 // Properties
                 // Raise / lower label

src/openrct2/localisation/StringIds.h

@@ -3937,6 +3937,8 @@ enum
     STR_MULTITHREADING = 6305,
     STR_MULTITHREADING_TIP = 6306,
 
+    STR_TILE_INSPECTOR_COLOUR_SCHEME = 6307,
+
     // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working
     STR_COUNT = 32768
 };

src/openrct2/ride/Ride.h

@@ -994,6 +994,7 @@ extern money16 gTotalRideValueForMoney;
 extern const uint8_t gRideClassifications[MAX_RIDES];
 
 extern Ride gRideList[MAX_RIDES];
+extern const rct_string_id ColourSchemeNames[4];
 
 extern rct_ride_measurement gRideMeasurements[MAX_RIDE_MEASUREMENTS];
 extern uint16_t gRideCount;