mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 04:23:20 +01:00
Code Issues Releases Wiki Activity

Expose colour scheme in the tile inspector (#6116)

Browse Source
This commit is contained in:
Hielke Morsink
2019-04-22 15:49:09 +02:00
parent d8f1933a5b
commit ac7bc97736
6 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/windows/Ride.cpp
View File

@@ -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,

5
src/openrct2-ui/windows/TileInspector.cpp
View File

@@ -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
@@ -1872,6 +1872,9 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi)
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
y = w->y + w->widgets[WIDX_TRACK_SPINNER_HEIGHT].top;

2
src/openrct2/localisation/StringIds.h
View File

@@ -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
};

1
src/openrct2/ride/Ride.h
View File

@@ -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;