diff --git a/contributors.md b/contributors.md index 2562ce29e3..f9174d9bec 100644 --- a/contributors.md +++ b/contributors.md @@ -179,6 +179,7 @@ The following people are not part of the development team, but have been contrib * Sean Payne (seanmajorpayne) * Soham Roy (sohamroy19) * Gaven Rendell (Rendello) +* Christian Haase (chrhaase) ## Toolchain * (Balletie) - macOS diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index e3c577fa64..2eb19a972d 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -3162,56 +3162,56 @@ STR_5930 :Large scenery details STR_5931 :Banner details STR_5932 :Corrupt element details STR_5933 :Properties -STR_5934 :{WINDOW_COLOUR_2}Terrain texture: {BLACK}{STRINGID} -STR_5935 :{WINDOW_COLOUR_2}Terrain edge: {BLACK}{STRINGID} -STR_5936 :{WINDOW_COLOUR_2}Land ownership: {BLACK}{STRINGID} +STR_5934 :Terrain texture: {BLACK}{STRINGID} +STR_5935 :Terrain edge: {BLACK}{STRINGID} +STR_5936 :Land ownership: {BLACK}{STRINGID} STR_5937 :Not owned and not for sale -STR_5938 :{WINDOW_COLOUR_2}Water level: {BLACK}{COMMA16} +STR_5938 :Water level: {BLACK}{COMMA16} STR_5939 :Remove park fences STR_5940 :Restore park fences -STR_5941 :{WINDOW_COLOUR_2}Base height: -STR_5942 :{WINDOW_COLOUR_2}Path name: {BLACK}{STRINGID} -STR_5943 :{WINDOW_COLOUR_2}Additions: {BLACK}{STRINGID} -STR_5944 :{WINDOW_COLOUR_2}Additions: {BLACK}None -STR_5945 :{WINDOW_COLOUR_2}Connected edges: -STR_5946 :{WINDOW_COLOUR_2}Ride type: {BLACK}{STRINGID} -STR_5947 :{WINDOW_COLOUR_2}Ride ID: {BLACK}{COMMA16} -STR_5948 :{WINDOW_COLOUR_2}Ride name: {BLACK}{STRINGID} -STR_5949 :{WINDOW_COLOUR_2}Chain lift -STR_5950 :{WINDOW_COLOUR_2}Apply changes to entire track piece -STR_5951 :{WINDOW_COLOUR_2}Track piece ID: {BLACK}{COMMA16} -STR_5952 :{WINDOW_COLOUR_2}Sequence number: {BLACK}{COMMA16} +STR_5941 :Base height: +STR_5942 :Path name: {BLACK}{STRINGID} +STR_5943 :Additions: {BLACK}{STRINGID} +STR_5944 :Additions: {BLACK}None +STR_5945 :Connected edges: +STR_5946 :Ride type: {BLACK}{STRINGID} +STR_5947 :Ride ID: {BLACK}{COMMA16} +STR_5948 :Ride name: {BLACK}{STRINGID} +STR_5949 :Chain lift +STR_5950 :Apply changes to entire track piece +STR_5951 :Track piece ID: {BLACK}{COMMA16} +STR_5952 :Sequence number: {BLACK}{COMMA16} STR_5953 :Sort the map elements on the current tile based on their base height. -STR_5954 :{WINDOW_COLOUR_2}Scenery age: {BLACK}{COMMA16} -STR_5955 :{WINDOW_COLOUR_2}Quadrant placement: {BLACK}{STRINGID} +STR_5954 :Scenery age: {BLACK}{COMMA16} +STR_5955 :Quadrant placement: {BLACK}{STRINGID} STR_5956 :Southwest STR_5957 :Northwest STR_5958 :Northeast STR_5959 :Southeast -STR_5960 :{WINDOW_COLOUR_2}Quadrant placement: -STR_5961 :{WINDOW_COLOUR_2}Entry index: {BLACK}{COMMA16} -STR_5962 :{WINDOW_COLOUR_2}Collision detection: -STR_5963 :{WINDOW_COLOUR_2}Raised Corners: -STR_5964 :{WINDOW_COLOUR_2}Diagonal -STR_5965 :{WINDOW_COLOUR_2}Entrance type: {BLACK}{STRINGID} -STR_5966 :{WINDOW_COLOUR_2}Park entrance part: {BLACK}{STRINGID} +STR_5960 :Quadrant placement: +STR_5961 :Entry index: {BLACK}{COMMA16} +STR_5962 :Collision detection: +STR_5963 :Raised Corners: +STR_5964 :Diagonal +STR_5965 :Entrance type: {BLACK}{STRINGID} +STR_5966 :Park entrance part: {BLACK}{STRINGID} STR_5967 :Middle STR_5968 :Left STR_5969 :Right -STR_5970 :{WINDOW_COLOUR_2}Entrance ID: {BLACK}{COMMA16} -STR_5971 :{WINDOW_COLOUR_2}Exit ID: {BLACK}{COMMA16} -STR_5972 :{WINDOW_COLOUR_2}Ride ID: {BLACK}{COMMA16} +STR_5970 :Entrance ID: {BLACK}{COMMA16} +STR_5971 :Exit ID: {BLACK}{COMMA16} +STR_5972 :Ride ID: {BLACK}{COMMA16} STR_5973 :Clamp to next STR_5974 :Changes the base- and clearance height so that it’s at the same as the next element on the current tile. Doing this makes it easier to build on this tile. STR_5975 :Slope: STR_5976 :Flat STR_5977 :Right side up STR_5978 :Left side up -STR_5979 :{WINDOW_COLOUR_2}Wall type: {BLACK}{COMMA16} -STR_5980 :{WINDOW_COLOUR_2}Banner text: {BLACK}{STRINGID} -STR_5981 :{WINDOW_COLOUR_2}Not a banner -STR_5982 :{WINDOW_COLOUR_2}Large scenery type: {BLACK}{COMMA16} -STR_5983 :{WINDOW_COLOUR_2}Large scenery piece ID: {BLACK}{COMMA16} +STR_5979 :Wall type: {BLACK}{COMMA16} +STR_5980 :Banner text: {BLACK}{STRINGID} +STR_5981 :Not a banner +STR_5982 :Large scenery type: {BLACK}{COMMA16} +STR_5983 :Large scenery piece ID: {BLACK}{COMMA16} STR_5984 :Blocked paths: STR_5985 :New folder STR_5986 :Type the name of the new folder. @@ -3483,7 +3483,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}{STRINGID} +STR_6277 :Station index: {BLACK}{STRINGID} STR_6278 :Autosave amount STR_6279 :Number of autosaves that should be kept STR_6280 :Chat @@ -3516,9 +3516,9 @@ STR_6315 :{WINDOW_COLOUR_2}Pathfind Goal: {BLACK}{INT32}, {INT32}, {INT32} di STR_6316 :{WINDOW_COLOUR_2}Pathfind history: STR_6317 :{BLACK}{INT32}, {INT32}, {INT32} dir {INT32} STR_6318 :Network desync detected.{NEWLINE}Log file: {STRING} -STR_6319 :{WINDOW_COLOUR_2}Block Brake Closed -STR_6320 :{WINDOW_COLOUR_2}Indestructible -STR_6321 :{WINDOW_COLOUR_2}Addition is broken +STR_6319 :Block Brake Closed +STR_6320 :Indestructible +STR_6321 :Addition is broken STR_6322 :{WINDOW_COLOUR_2}Sprite Id: {BLACK}{INT32} STR_6323 :Simulating STR_6324 :Simulate @@ -3564,7 +3564,7 @@ STR_6363 :Copied text to clipboard STR_6364 :{RED}{COMMA16} person has died in an accident on {STRINGID} STR_6365 :Ride casualties STR_6366 :Stuck or stalled vehicles -STR_6367 :{WINDOW_COLOUR_2}Animation frame: +STR_6367 :Animation frame: STR_6368 :For compatibility reasons, it is not recommended to run OpenRCT2 with Wine. OpenRCT2 has native support for macOS, Linux, FreeBSD and OpenBSD. STR_6369 :Allow building track at invalid heights STR_6370 :Allows placing track pieces at any height interval diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 89bfb52eeb..56e32570c5 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -3,6 +3,7 @@ - Improved: [#12869] The Tile Inspector window’s layout has been tweaked slightly. - Fix: [#15620] Placing track designs at locations blocked by anything results in wrong error message. - Fix: [#15843] Tile Inspector can be resized too small. +- Fix: [#15844] Tile Inspector has inconsistent text colours. 0.3.5 (2021-11-06) ------------------------------------------------------------------------ diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index edea5cdea1..5319fdc497 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -1766,24 +1766,24 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) ScreenCoordsXY screenCoords(w->windowPos.x, w->windowPos.y); // Draw coordinates - gfx_draw_string(dpi, screenCoords + ScreenCoordsXY(5, 24), "X:", { COLOUR_WHITE }); - gfx_draw_string(dpi, screenCoords + ScreenCoordsXY(74, 24), "Y:", { COLOUR_WHITE }); + gfx_draw_string(dpi, screenCoords + ScreenCoordsXY(5, 24), "X:", { w->colours[1] }); + gfx_draw_string(dpi, screenCoords + ScreenCoordsXY(74, 24), "Y:", { w->colours[1] }); if (windowTileInspectorTileSelected) { auto tileCoords = TileCoordsXY{ windowTileInspectorToolMap }; auto ft = Formatter(); ft.Add(tileCoords.x); DrawTextBasic( - dpi, screenCoords + ScreenCoordsXY{ 43, 24 }, STR_FORMAT_INTEGER, ft, { COLOUR_WHITE, TextAlignment::RIGHT }); + dpi, screenCoords + ScreenCoordsXY{ 43, 24 }, STR_FORMAT_INTEGER, ft, { w->colours[1], TextAlignment::RIGHT }); ft = Formatter(); ft.Add(tileCoords.y); DrawTextBasic( - dpi, screenCoords + ScreenCoordsXY{ 113, 24 }, STR_FORMAT_INTEGER, ft, { COLOUR_WHITE, TextAlignment::RIGHT }); + dpi, screenCoords + ScreenCoordsXY{ 113, 24 }, STR_FORMAT_INTEGER, ft, { w->colours[1], TextAlignment::RIGHT }); } else { - gfx_draw_string(dpi, screenCoords + ScreenCoordsXY(43 - 7, 24), "-", { COLOUR_WHITE }); - gfx_draw_string(dpi, screenCoords + ScreenCoordsXY(113 - 7, 24), "-", { COLOUR_WHITE }); + gfx_draw_string(dpi, screenCoords + ScreenCoordsXY(43 - 7, 24), "-", { w->colours[1] }); + gfx_draw_string(dpi, screenCoords + ScreenCoordsXY(113 - 7, 24), "-", { w->colours[1] }); } if (windowTileInspectorSelectedIndex != -1) @@ -1811,7 +1811,7 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) } auto ft = Formatter(); ft.Add(terrainNameId); - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_SURFACE_TERAIN, ft, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_SURFACE_TERAIN, ft, { w->colours[1] }); // Edge texture name rct_string_id terrainEdgeNameId = STR_EMPTY; @@ -1823,7 +1823,7 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) ft = Formatter(); ft.Add(terrainEdgeNameId); DrawTextBasic( - dpi, screenCoords + ScreenCoordsXY{ 0, 11 }, STR_TILE_INSPECTOR_SURFACE_EDGE, ft, { COLOUR_WHITE }); + dpi, screenCoords + ScreenCoordsXY{ 0, 11 }, STR_TILE_INSPECTOR_SURFACE_EDGE, ft, { w->colours[1] }); // Land ownership rct_string_id landOwnership; @@ -1840,30 +1840,30 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) ft = Formatter(); ft.Add(landOwnership); DrawTextBasic( - dpi, screenCoords + ScreenCoordsXY{ 0, 22 }, STR_TILE_INSPECTOR_SURFACE_OWNERSHIP, ft, { COLOUR_WHITE }); + dpi, screenCoords + ScreenCoordsXY{ 0, 22 }, STR_TILE_INSPECTOR_SURFACE_OWNERSHIP, ft, { w->colours[1] }); // Water level ft = Formatter(); ft.Add(tileElement->AsSurface()->GetWaterHeight()); DrawTextBasic( - dpi, screenCoords + ScreenCoordsXY{ 0, 33 }, STR_TILE_INSPECTOR_SURFACE_WATER_LEVEL, ft, { COLOUR_WHITE }); + dpi, screenCoords + ScreenCoordsXY{ 0, 33 }, STR_TILE_INSPECTOR_SURFACE_WATER_LEVEL, ft, { w->colours[1] }); // Properties // Raise / lower label screenCoords = w->windowPos + ScreenCoordsXY{ w->widgets[WIDX_GROUPBOX_DETAILS].left + 7, w->widgets[WIDX_SURFACE_SPINNER_HEIGHT].top }; - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, {}, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, {}, { w->colours[1] }); // Current base height screenCoords.x = w->windowPos.x + w->widgets[WIDX_SURFACE_SPINNER_HEIGHT].left + 3; ft = Formatter(); ft.Add(tileElement->base_height); - DrawTextBasic(dpi, screenCoords, STR_FORMAT_INTEGER, ft, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_FORMAT_INTEGER, ft, { w->colours[1] }); // Raised corners screenCoords = w->windowPos + ScreenCoordsXY{ w->widgets[WIDX_GROUPBOX_DETAILS].left + 7, w->widgets[WIDX_SURFACE_CHECK_CORNER_E].top }; - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_SURFACE_CORNERS, {}, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_SURFACE_CORNERS, {}, { w->colours[1] }); break; } @@ -1873,7 +1873,7 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) // Path name auto ft = Formatter(); ft.Add(tileElement->AsPath()->GetSurfaceDescriptor()->Name); - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_PATH_NAME, ft, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_PATH_NAME, ft, { w->colours[1] }); // Path addition if (tileElement->AsPath()->HasAddition()) @@ -1886,29 +1886,29 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) ft = Formatter(); ft.Add(additionNameId); DrawTextBasic( - dpi, screenCoords + ScreenCoordsXY{ 0, 11 }, STR_TILE_INSPECTOR_PATH_ADDITIONS, ft, { COLOUR_WHITE }); + dpi, screenCoords + ScreenCoordsXY{ 0, 11 }, STR_TILE_INSPECTOR_PATH_ADDITIONS, ft, { w->colours[1] }); } else DrawTextBasic( dpi, screenCoords + ScreenCoordsXY{ 0, 11 }, STR_TILE_INSPECTOR_PATH_ADDITIONS_NONE, {}, - { COLOUR_WHITE }); + { w->colours[1] }); // Properties // Raise / lower label screenCoords = w->windowPos + ScreenCoordsXY{ w->widgets[WIDX_GROUPBOX_DETAILS].left + 7, w->widgets[WIDX_PATH_SPINNER_HEIGHT].top }; - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, {}, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, {}, { w->colours[1] }); // Current base height screenCoords.x = w->windowPos.x + w->widgets[WIDX_PATH_SPINNER_HEIGHT].left + 3; ft = Formatter(); ft.Add(tileElement->base_height); - DrawTextBasic(dpi, screenCoords, STR_FORMAT_INTEGER, ft, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_FORMAT_INTEGER, ft, { w->colours[1] }); // Path connections screenCoords = w->windowPos + ScreenCoordsXY{ w->widgets[WIDX_GROUPBOX_DETAILS].left + 7, w->widgets[WIDX_PATH_CHECK_EDGE_W].top }; - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_PATH_CONNECTED_EDGES, {}, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_PATH_CONNECTED_EDGES, {}, { w->colours[1] }); break; } @@ -1921,7 +1921,7 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) // Ride ID auto ft = Formatter(); ft.Add(rideId); - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_TRACK_RIDE_ID, ft, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_TRACK_RIDE_ID, ft, { w->colours[1] }); // Ride name if (ride != nullptr) @@ -1929,7 +1929,7 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) ft = Formatter(); ride->FormatNameTo(ft); DrawTextBasic( - dpi, screenCoords + ScreenCoordsXY{ 0, 11 }, STR_TILE_INSPECTOR_TRACK_RIDE_NAME, ft, { COLOUR_WHITE }); + dpi, screenCoords + ScreenCoordsXY{ 0, 11 }, STR_TILE_INSPECTOR_TRACK_RIDE_NAME, ft, { w->colours[1] }); } // Ride type. Individual pieces may be of a different ride type from the ride it belongs to. @@ -1937,18 +1937,18 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) ft = Formatter(); ft.Add(rtd.Naming.Name); DrawTextBasic( - dpi, screenCoords + ScreenCoordsXY{ 0, 22 }, STR_TILE_INSPECTOR_TRACK_RIDE_TYPE, ft, { COLOUR_WHITE }); + dpi, screenCoords + ScreenCoordsXY{ 0, 22 }, STR_TILE_INSPECTOR_TRACK_RIDE_TYPE, ft, { w->colours[1] }); // Track ft = Formatter(); ft.Add(trackElement->GetTrackType()); DrawTextBasic( - dpi, screenCoords + ScreenCoordsXY{ 0, 33 }, STR_TILE_INSPECTOR_TRACK_PIECE_ID, ft, { COLOUR_WHITE }); + dpi, screenCoords + ScreenCoordsXY{ 0, 33 }, STR_TILE_INSPECTOR_TRACK_PIECE_ID, ft, { w->colours[1] }); ft = Formatter(); ft.Add(trackElement->GetSequenceIndex()); DrawTextBasic( - dpi, screenCoords + ScreenCoordsXY{ 0, 44 }, STR_TILE_INSPECTOR_TRACK_SEQUENCE, ft, { COLOUR_WHITE }); + dpi, screenCoords + ScreenCoordsXY{ 0, 44 }, STR_TILE_INSPECTOR_TRACK_SEQUENCE, ft, { w->colours[1] }); if (trackElement->IsStation()) { int16_t stationIndex = trackElement->GetStationIndex(); @@ -1956,7 +1956,7 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) ft.Add(STR_COMMA16); ft.Add(stationIndex); DrawTextBasic( - dpi, screenCoords + ScreenCoordsXY{ 0, 55 }, STR_TILE_INSPECTOR_STATION_INDEX, ft, { COLOUR_WHITE }); + dpi, screenCoords + ScreenCoordsXY{ 0, 55 }, STR_TILE_INSPECTOR_STATION_INDEX, ft, { w->colours[1] }); } else { @@ -1965,24 +1965,24 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) ft.Add(STR_STRING); ft.Add(stationNone); DrawTextBasic( - dpi, screenCoords + ScreenCoordsXY{ 0, 55 }, STR_TILE_INSPECTOR_STATION_INDEX, ft, { COLOUR_WHITE }); + dpi, screenCoords + ScreenCoordsXY{ 0, 55 }, STR_TILE_INSPECTOR_STATION_INDEX, ft, { w->colours[1] }); } ft = Formatter(); ft.Add(ColourSchemeNames[trackElement->GetColourScheme()]); DrawTextBasic( - dpi, screenCoords + ScreenCoordsXY{ 0, 66 }, STR_TILE_INSPECTOR_COLOUR_SCHEME, ft, { COLOUR_WHITE }); + dpi, screenCoords + ScreenCoordsXY{ 0, 66 }, STR_TILE_INSPECTOR_COLOUR_SCHEME, ft, { w->colours[1] }); // Properties // Raise / lower label screenCoords.y = w->windowPos.y + w->widgets[WIDX_TRACK_SPINNER_HEIGHT].top; - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, {}, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, {}, { w->colours[1] }); // Current base height screenCoords.x = w->windowPos.x + w->widgets[WIDX_TRACK_SPINNER_HEIGHT].left + 3; ft = Formatter(); ft.Add(tileElement->base_height); - DrawTextBasic(dpi, screenCoords, STR_FORMAT_INTEGER, ft, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_FORMAT_INTEGER, ft, { w->colours[1] }); break; } @@ -1992,7 +1992,7 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) // Age auto ft = Formatter(); ft.Add(tileElement->AsSmallScenery()->GetAge()); - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_SCENERY_AGE, ft, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_SCENERY_AGE, ft, { w->colours[1] }); // Quadrant value const auto* sceneryEntry = tileElement->AsSmallScenery()->GetEntry(); @@ -2008,35 +2008,36 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) ft = Formatter(); ft.Add(quadrant_string_idx[quadrant]); DrawTextBasic( - dpi, screenCoords + ScreenCoordsXY{ 0, 11 }, STR_TILE_INSPECTOR_SCENERY_QUADRANT, ft, { COLOUR_WHITE }); + dpi, screenCoords + ScreenCoordsXY{ 0, 11 }, STR_TILE_INSPECTOR_SCENERY_QUADRANT, ft, + { w->colours[1] }); } // Scenery ID ft = Formatter(); ft.Add(tileElement->AsSmallScenery()->GetEntryIndex()); DrawTextBasic( - dpi, screenCoords + ScreenCoordsXY{ 0, 22 }, STR_TILE_INSPECTOR_SCENERY_ENTRY_IDX, ft, { COLOUR_WHITE }); + dpi, screenCoords + ScreenCoordsXY{ 0, 22 }, STR_TILE_INSPECTOR_SCENERY_ENTRY_IDX, ft, { w->colours[1] }); // Properties // Raise / Lower screenCoords.y = w->windowPos.y + w->widgets[WIDX_SCENERY_SPINNER_HEIGHT].top; - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, {}, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, {}, { w->colours[1] }); // Current base height screenCoords.x = w->windowPos.x + w->widgets[WIDX_SCENERY_SPINNER_HEIGHT].left + 3; ft = Formatter(); ft.Add(tileElement->base_height); - DrawTextBasic(dpi, screenCoords, STR_FORMAT_INTEGER, ft, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_FORMAT_INTEGER, ft, { w->colours[1] }); // Quarter tile screenCoords = w->windowPos + ScreenCoordsXY{ w->widgets[WIDX_GROUPBOX_DETAILS].left + 7, w->widgets[WIDX_SCENERY_CHECK_QUARTER_E].top }; - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_SCENERY_QUADRANT_LABEL, {}, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_SCENERY_QUADRANT_LABEL, {}, { w->colours[1] }); // Collision screenCoords.y = w->windowPos.y + w->widgets[WIDX_SCENERY_CHECK_COLLISION_E].top; - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_COLLISSION, {}, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_COLLISSION, {}, { w->colours[1] }); break; } @@ -2046,7 +2047,7 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) // Entrance type auto ft = Formatter(); ft.Add(EntranceTypeStringIds[tileElement->AsEntrance()->GetEntranceType()]); - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_ENTRANCE_TYPE, ft, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_ENTRANCE_TYPE, ft, { w->colours[1] }); if (tileElement->AsEntrance()->GetEntranceType() == ENTRANCE_TYPE_PARK_ENTRANCE) { @@ -2055,7 +2056,7 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) ft.Add(park_entrance_get_index({ windowTileInspectorToolMap, tileElement->GetBaseZ() })); DrawTextBasic( dpi, screenCoords + ScreenCoordsXY{ 0, 11 }, STR_TILE_INSPECTOR_ENTRANCE_ENTRANCE_ID, ft, - { COLOUR_WHITE }); + { w->colours[1] }); } else { @@ -2066,14 +2067,14 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) // Ride entrance ID DrawTextBasic( dpi, screenCoords + ScreenCoordsXY{ 0, 11 }, STR_TILE_INSPECTOR_ENTRANCE_ENTRANCE_ID, ft, - { COLOUR_WHITE }); + { w->colours[1] }); } else { // Ride exit ID DrawTextBasic( dpi, screenCoords + ScreenCoordsXY{ 0, 11 }, STR_TILE_INSPECTOR_ENTRANCE_EXIT_ID, ft, - { COLOUR_WHITE }); + { w->colours[1] }); } } @@ -2083,7 +2084,7 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) ft = Formatter(); ft.Add(ParkEntrancePartStringIds[tileElement->AsEntrance()->GetSequenceIndex()]); DrawTextBasic( - dpi, screenCoords + ScreenCoordsXY{ 0, 22 }, STR_TILE_INSPECTOR_ENTRANCE_PART, ft, { COLOUR_WHITE }); + dpi, screenCoords + ScreenCoordsXY{ 0, 22 }, STR_TILE_INSPECTOR_ENTRANCE_PART, ft, { w->colours[1] }); } else { @@ -2091,26 +2092,27 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) ft = Formatter(); ft.Add(tileElement->AsEntrance()->GetRideIndex()); DrawTextBasic( - dpi, screenCoords + ScreenCoordsXY{ 0, 22 }, STR_TILE_INSPECTOR_ENTRANCE_RIDE_ID, ft, { COLOUR_WHITE }); + dpi, screenCoords + ScreenCoordsXY{ 0, 22 }, STR_TILE_INSPECTOR_ENTRANCE_RIDE_ID, ft, + { w->colours[1] }); // Station index int16_t stationIndex = tileElement->AsEntrance()->GetStationIndex(); ft = Formatter(); ft.Add(STR_COMMA16); ft.Add(stationIndex); DrawTextBasic( - dpi, screenCoords + ScreenCoordsXY{ 0, 33 }, STR_TILE_INSPECTOR_STATION_INDEX, ft, { COLOUR_WHITE }); + dpi, screenCoords + ScreenCoordsXY{ 0, 33 }, STR_TILE_INSPECTOR_STATION_INDEX, ft, { w->colours[1] }); } // Properties // Raise / Lower screenCoords.y = w->windowPos.y + w->widgets[WIDX_ENTRANCE_SPINNER_HEIGHT].top; - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, {}, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, {}, { w->colours[1] }); // Current base height screenCoords.x = w->windowPos.x + w->widgets[WIDX_ENTRANCE_SPINNER_HEIGHT].left + 3; ft = Formatter(); ft.Add(tileElement->base_height); - DrawTextBasic(dpi, screenCoords, STR_FORMAT_INTEGER, ft, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_FORMAT_INTEGER, ft, { w->colours[1] }); break; } @@ -2120,7 +2122,7 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) // Type auto ft = Formatter(); ft.Add(tileElement->AsWall()->GetEntryIndex()); - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_WALL_TYPE, ft, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_WALL_TYPE, ft, { w->colours[1] }); // Banner info auto banner = tileElement->AsWall()->GetBanner(); @@ -2130,37 +2132,37 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) banner->FormatTextTo(ft); DrawTextBasic( dpi, screenCoords + ScreenCoordsXY{ 0, 11 }, STR_TILE_INSPECTOR_ENTRY_BANNER_TEXT, ft, - { COLOUR_WHITE }); + { w->colours[1] }); } else { DrawTextBasic( dpi, screenCoords + ScreenCoordsXY{ 0, 11 }, STR_TILE_INSPECTOR_ENTRY_BANNER_NONE, {}, - { COLOUR_WHITE }); + { w->colours[1] }); } // Properties // Raise / lower label screenCoords.y = w->windowPos.y + w->widgets[WIDX_WALL_SPINNER_HEIGHT].top; - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, {}, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, {}, { w->colours[1] }); // Current base height screenCoords.x = w->windowPos.x + w->widgets[WIDX_WALL_SPINNER_HEIGHT].left + 3; ft = Formatter(); ft.Add(tileElement->base_height); - DrawTextBasic(dpi, screenCoords, STR_FORMAT_INTEGER, ft, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_FORMAT_INTEGER, ft, { w->colours[1] }); // Slope label screenCoords = w->windowPos + ScreenCoordsXY{ w->widgets[WIDX_GROUPBOX_DETAILS].left + 7, w->widgets[WIDX_WALL_DROPDOWN_SLOPE].top }; - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_WALL_SLOPE, {}, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_WALL_SLOPE, {}, { w->colours[1] }); // Animation frame label screenCoords.y = w->windowPos.y + w->widgets[WIDX_WALL_SPINNER_ANIMATION_FRAME].top; - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_WALL_ANIMATION_FRAME, {}, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_WALL_ANIMATION_FRAME, {}, { w->colours[1] }); // Current animation frame - colour_t colour = COLOUR_WHITE; + colour_t colour = w->colours[1]; if (WidgetIsDisabled(w, WIDX_WALL_SPINNER_ANIMATION_FRAME)) { colour = w->colours[0] | COLOUR_FLAG_INSET; @@ -2180,14 +2182,14 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) ObjectEntryIndex largeSceneryType = sceneryElement->GetEntryIndex(); auto ft = Formatter(); ft.Add(largeSceneryType); - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_LARGE_SCENERY_TYPE, ft, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_LARGE_SCENERY_TYPE, ft, { w->colours[1] }); // Part ID ft = Formatter(); ft.Add(sceneryElement->GetSequenceIndex()); DrawTextBasic( dpi, screenCoords + ScreenCoordsXY{ 0, 11 }, STR_TILE_INSPECTOR_LARGE_SCENERY_PIECE_ID, ft, - { COLOUR_WHITE }); + { w->colours[1] }); // Banner info auto* largeSceneryEntry = get_large_scenery_entry(largeSceneryType); @@ -2200,26 +2202,26 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) banner->FormatTextTo(ft); DrawTextBasic( dpi, screenCoords + ScreenCoordsXY{ 0, 22 }, STR_TILE_INSPECTOR_ENTRY_BANNER_TEXT, ft, - { COLOUR_WHITE }); + { w->colours[1] }); } } else { DrawTextBasic( dpi, screenCoords + ScreenCoordsXY{ 0, 22 }, STR_TILE_INSPECTOR_ENTRY_BANNER_NONE, {}, - { COLOUR_WHITE }); + { w->colours[1] }); } // Properties // Raise / lower label screenCoords.y = w->windowPos.y + w->widgets[WIDX_LARGE_SCENERY_SPINNER_HEIGHT].top; - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, {}, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, {}, { w->colours[1] }); // Current base height screenCoords.x = w->windowPos.x + w->widgets[WIDX_LARGE_SCENERY_SPINNER_HEIGHT].left + 3; ft = Formatter(); ft.Add(tileElement->base_height); - DrawTextBasic(dpi, screenCoords, STR_FORMAT_INTEGER, ft, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_FORMAT_INTEGER, ft, { w->colours[1] }); break; } @@ -2232,24 +2234,24 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) { Formatter ft; banner->FormatTextTo(ft); - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_ENTRY_BANNER_TEXT, ft, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_ENTRY_BANNER_TEXT, ft, { w->colours[1] }); } // Properties // Raise / lower label screenCoords.y = w->windowPos.y + w->widgets[WIDX_BANNER_SPINNER_HEIGHT].top; - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, {}, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, {}, { w->colours[1] }); // Current base height screenCoords.x = w->windowPos.x + w->widgets[WIDX_BANNER_SPINNER_HEIGHT].left + 3; auto ft = Formatter(); ft.Add(tileElement->base_height); - DrawTextBasic(dpi, screenCoords, STR_FORMAT_INTEGER, ft, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_FORMAT_INTEGER, ft, { w->colours[1] }); // Blocked paths screenCoords.y += 28; screenCoords.x = w->windowPos.x + w->widgets[WIDX_GROUPBOX_DETAILS].left + 7; - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BANNER_BLOCKED_PATHS, {}, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BANNER_BLOCKED_PATHS, {}, { w->colours[1] }); break; } @@ -2258,13 +2260,13 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) // Properties // Raise / lower label screenCoords.y = w->windowPos.y + w->widgets[WIDX_CORRUPT_SPINNER_HEIGHT].top; - DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, {}, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, {}, { w->colours[1] }); // Current base height screenCoords.x = w->windowPos.x + w->widgets[WIDX_CORRUPT_SPINNER_HEIGHT].left + 3; auto ft = Formatter(); ft.Add(tileElement->base_height); - DrawTextBasic(dpi, screenCoords, STR_FORMAT_INTEGER, ft, { COLOUR_WHITE }); + DrawTextBasic(dpi, screenCoords, STR_FORMAT_INTEGER, ft, { w->colours[1] }); break; }