diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 1b2e158d1e..86afa5dbed 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -4240,19 +4240,21 @@ STR_5928 :Currupt element details STR_5929 :Properties STR_5930 :Terrain texture: {BLACK}{STRINGID} STR_5931 :Terrain edge: {BLACK}{STRINGID} -STR_5932 :Water level: {BLACK}{COMMA16} -STR_5933 :Remove park fences -STR_5934 :Restore park fences -STR_5935 :Raise / lower: -STR_5936 :Path name: {BLACK}{STRINGID} -STR_5937 :Additions: {BLACK}{STRINGID} -STR_5938 :Additions: {BLACK}None -STR_5939 :Connected edges: +STR_5932 :Land ownership: {BLACK}{STRINGID} +STR_5933 :Not owned and not for sale +STR_5934 :Water level: {BLACK}{COMMA16} +STR_5935 :Remove park fences +STR_5936 :Restore park fences +STR_5937 :Raise / lower: +STR_5938 :Path name: {BLACK}{STRINGID} +STR_5939 :Additions: {BLACK}{STRINGID} +STR_5940 :Additions: {BLACK}None +STR_5941 :Connected edges: #TODO: Add and use those in strings_ids and tile_inspector.c -STR_5940 :{WINDOW_COLOUR_2}Ride ID: {BLACK}{COMMA16} -STR_5941 :{WINDOW_COLOUR_2}Ride name: {BLACK}{STRINGID} -STR_5942 :{WINDOW_COLOUR_2}Track piece sequence: {BLACK}{COMMA16}/{COMMA16} +STR_5942 :{WINDOW_COLOUR_2}Ride ID: {BLACK}{COMMA16} +STR_5943 :{WINDOW_COLOUR_2}Ride name: {BLACK}{STRINGID} +STR_5944 :{WINDOW_COLOUR_2}Track piece sequence: {BLACK}{COMMA16}/{COMMA16} #TODO: Fix rebase STR_5920 :Render weather effects diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h index c469138dce..1c32fe7612 100644 --- a/src/localisation/string_ids.h +++ b/src/localisation/string_ids.h @@ -1165,6 +1165,8 @@ enum { STR_CONSTRUCTION_RIGHTS_NOT_FOR_SALE = 1727, STR_CANT_BUY_CONSTRUCTION_RIGHTS_HERE = 1728, STR_LAND_NOT_OWNED_BY_PARK = 1729, + STR_LAND_NOT_OWNED_AND_NOT_AVAILABLE = 5933, + STR_BANNER_TEXT_CLOSED = 1730, STR_BANNER_TEXT_FORMAT = 1731, STR_RIDE_CONSTRUCTION_BUILD = 1732, @@ -3248,6 +3250,8 @@ enum { STR_THIS_FEATURE_IS_CURRENTLY_UNSTABLE = 5563, STR_INSERT_CORRUPT = 5564, // Unused STR_INSERT_CORRUPT_TIP = 5565, + STR_MOVE_SELECTED_ELEMENT_UP_TIP = 5617, + STR_MOVE_SELECTED_ELEMENT_DOWN_TIP = 5618, STR_PASSWORD = 5566, STR_ADVERTISE = 5567, STR_PASSWORD_REQUIRED = 5568, @@ -3311,16 +3315,15 @@ enum { STR_TILE_INSPECTOR_GROUPBOX_PROPERTIES = 5929, STR_TILE_INSPECTOR_SURFACE_TERAIN = 5930, STR_TILE_INSPECTOR_SURFACE_EDGE = 5931, - STR_TILE_INSPECTOR_SURFACE_WATER_LEVEL = 5932, - STR_TILE_INSPECTOR_SURFACE_REMOVE_FENCES = 5933, - STR_TILE_INSPECTOR_SURFACE_RESTORE_FENCES = 5934, - STR_MOVE_SELECTED_ELEMENT_UP_TIP = 5617, - STR_MOVE_SELECTED_ELEMENT_DOWN_TIP = 5618, - STR_TILE_INSPECTOR_RAISE_LOWER = 5935, - STR_TILE_INSPECTOR_PATH_NAME = 5936, - STR_TILE_INSPECTOR_PATH_ADDITIONS = 5937, - STR_TILE_INSPECTOR_PATH_ADDITIONS_NONE = 5938, - STR_TILE_INSPECTOR_PATH_CONECTED_EDGES = 5939, + STR_TILE_INSPECTOR_SURFACE_OWNERSHIP = 5932, + STR_TILE_INSPECTOR_SURFACE_WATER_LEVEL = 5934, + STR_TILE_INSPECTOR_SURFACE_REMOVE_FENCES = 5935, + STR_TILE_INSPECTOR_SURFACE_RESTORE_FENCES = 5936, + STR_TILE_INSPECTOR_RAISE_LOWER = 5937, + STR_TILE_INSPECTOR_PATH_NAME = 5938, + STR_TILE_INSPECTOR_PATH_ADDITIONS = 5939, + STR_TILE_INSPECTOR_PATH_ADDITIONS_NONE = 5940, + STR_TILE_INSPECTOR_PATH_CONECTED_EDGES = 5941, STR_SCENARIO_CATEGORY_RCT1 = 5619, STR_SCENARIO_CATEGORY_RCT1_AA = 5620, STR_SCENARIO_CATEGORY_RCT1_LL = 5621, diff --git a/src/windows/tile_inspector.c b/src/windows/tile_inspector.c index 404fb69175..7277413453 100644 --- a/src/windows/tile_inspector.c +++ b/src/windows/tile_inspector.c @@ -117,6 +117,7 @@ enum WINDOW_TILE_INSPECTOR_WIDGET_IDX { WIDX_PATH_CHECK_EDGE_N, // Track + WIDX_TRACK_CHECK_APPLY_TO_ALL = PAGE_WIDGETS, // Scenery @@ -207,7 +208,7 @@ static rct_widget window_tile_inspector_widgets[] = { #define SUR_GBPB PADDING_BOTTOM // Surface group box properties bottom #define SUR_GBPT (SUR_GBPB + 16 + 1 * 21) // Surface group box properties top #define SUR_GBDB (SUR_GBPT + GROUPBOX_PADDING) // Surface group box details bottom -#define SUR_GBDT (SUR_GBDB + 20 + 3 * 11) // Surface group box details top +#define SUR_GBDT (SUR_GBDB + 20 + 4 * 11) // Surface group box details top static rct_widget window_tile_inspector_widgets_surface[] = { MAIN_TILE_INSPECTOR_WIDGETS, { WWT_CLOSEBOX, 1, GBB(WH - SUR_GBPT, 0, 0), STR_TILE_INSPECTOR_SURFACE_REMOVE_FENCES, STR_NONE }, // WIDX_SURFACE_BUTTON_REMOVE_FENCES @@ -241,6 +242,7 @@ static rct_widget window_tile_inspector_widgets_path[] = { #define TRA_GBDT (TRA_GBDB + 20 + 0 * 11) // Path group box info top static rct_widget window_tile_inspector_widgets_track[] = { MAIN_TILE_INSPECTOR_WIDGETS, + { WWT_CHECKBOX, 1, CHK(GBBL(1) + 14 * 3, GBBT(WH - PAT_GBPT, 1) + 7 * 1), STR_NONE, STR_NONE }, // WIDX_TRACK_CHECK_APPLY_TO_ALL { WIDGETS_END }, }; @@ -741,7 +743,6 @@ static void window_tile_inspector_tool_update(rct_window* w, int widgetIndex, in gMapSelectType = MAP_SELECT_TYPE_FULL; map_invalidate_selection_rect(); - } static void window_tile_inspector_tool_down(rct_window* w, int widgetIndex, int x, int y) @@ -971,10 +972,17 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) y = w->y + w->widgets[WIDX_GROUPBOX_DETAILS].top + 14; rct_string_id terrain_name_id = TerrainTypes[map_element_get_terrain(mapElement)]; rct_string_id terrain_edge_name_id = TerrainEdgeTypes[map_element_get_terrain_edge(mapElement)]; + rct_string_id land_ownership; + if (mapElement->properties.surface.ownership & OWNERSHIP_OWNED) land_ownership = STR_LAND_OWNED; + else if (mapElement->properties.surface.ownership & OWNERSHIP_AVAILABLE) land_ownership = STR_LAND_SALE; + else if (mapElement->properties.surface.ownership & OWNERSHIP_CONSTRUCTION_RIGHTS_OWNED) land_ownership = STR_CONSTRUCTION_RIGHTS_OWNED; + else if (mapElement->properties.surface.ownership & OWNERSHIP_CONSTRUCTION_RIGHTS_AVAILABLE) land_ownership = STR_CONSTRUCTION_RIGHTS_SALE; + else land_ownership = STR_LAND_NOT_OWNED_AND_NOT_AVAILABLE; int water_level = mapElement->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK; gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_TERAIN, &terrain_name_id, 12, x, y); gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_EDGE, &terrain_edge_name_id, 12, x, y + 11); - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_WATER_LEVEL, &water_level, 12, x, y + 22); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_OWNERSHIP, &land_ownership, 12, x, y + 22); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_WATER_LEVEL, &water_level, 12, x, y + 33); break; }