mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Add banner text info. Fix rotating banners (they are never rotated, but have a position)

Browse Source
This commit is contained in:
Broxzier
2016-10-05 00:01:09 +02:00
parent 5ee1fc294d
commit e078c032dd
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/language/en-GB.txt
View File

@@ -4292,6 +4292,7 @@ STR_5980 :{WINDOW_COLOUR_2}Banner text: {BLACK}{STRINGID}
STR_5981 :{WINDOW_COLOUR_2}Not a banner STR_5981 :{WINDOW_COLOUR_2}Not a banner
STR_5982 :{WINDOW_COLOUR_2}Large scenery type: {BLACK}{COMMA16} STR_5982 :{WINDOW_COLOUR_2}Large scenery type: {BLACK}{COMMA16}
STR_5983 :{WINDOW_COLOUR_2}Large scenery piece ID: {BLACK}{COMMA16} STR_5983 :{WINDOW_COLOUR_2}Large scenery piece ID: {BLACK}{COMMA16}
STR_5984 :Blocked paths:
############# #############
# Scenarios # # Scenarios #

1
src/localisation/string_ids.h
View File

@@ -3632,6 +3632,7 @@ enum {
STR_TILE_INSPECTOR_ENTRY_BANNER_NONE = 5981, STR_TILE_INSPECTOR_ENTRY_BANNER_NONE = 5981,
STR_TILE_INSPECTOR_LARGE_SCENERY_TYPE = 5982, STR_TILE_INSPECTOR_LARGE_SCENERY_TYPE = 5982,
STR_TILE_INSPECTOR_LARGE_SCENERY_PIECE_ID = 5983, STR_TILE_INSPECTOR_LARGE_SCENERY_PIECE_ID = 5983,
STR_TILE_INSPECTOR_BANNER_BLOCKED_PATHS = 5984,
// Have to include resource strings (from scenarios and objects) for the time being now that language is partially working // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working
STR_COUNT = 32768 STR_COUNT = 32768

25
src/windows/tile_inspector.c
View File

@@ -384,7 +384,7 @@ static rct_widget windowTileInspectorWidgetsLargeScenery[] = {
#define BAN_GBPB PADDING_BOTTOM // Banner group box properties bottom #define BAN_GBPB PADDING_BOTTOM // Banner group box properties bottom
#define BAN_GBPT (BAN_GBPB + 16 + 1 * 21) // Banner group box properties top #define BAN_GBPT (BAN_GBPB + 16 + 1 * 21) // Banner group box properties top
#define BAN_GBDB (BAN_GBPT + GROUPBOX_PADDING) // Banner group box info bottom #define BAN_GBDB (BAN_GBPT + GROUPBOX_PADDING) // Banner group box info bottom
#define BAN_GBDT (BAN_GBDB + 20 + 0 * 11) // Banner group box info top #define BAN_GBDT (BAN_GBDB + 20 + 1 * 11) // Banner group box info top
static rct_widget windowTileInspectorWidgetsBanner[] = { static rct_widget windowTileInspectorWidgetsBanner[] = {
MAIN_TILE_INSPECTOR_WIDGETS, MAIN_TILE_INSPECTOR_WIDGETS,
{ WWT_SPINNER, 1, GBS(WH - BAN_GBPT, 1, 0), STR_NONE, STR_NONE }, // WIDX_BANNER_SPINNER_HEIGHT { WWT_SPINNER, 1, GBS(WH - BAN_GBPT, 1, 0), STR_NONE, STR_NONE }, // WIDX_BANNER_SPINNER_HEIGHT
@@ -635,11 +635,16 @@ static void window_tile_inspector_rotate_element(int index) {
case MAP_ELEMENT_TYPE_SCENERY: case MAP_ELEMENT_TYPE_SCENERY:
case MAP_ELEMENT_TYPE_ENTRANCE: case MAP_ELEMENT_TYPE_ENTRANCE:
case MAP_ELEMENT_TYPE_FENCE: case MAP_ELEMENT_TYPE_FENCE:
case MAP_ELEMENT_TYPE_BANNER:
newRotation = (mapElement->type + 1) & MAP_ELEMENT_DIRECTION_MASK; newRotation = (mapElement->type + 1) & MAP_ELEMENT_DIRECTION_MASK;
mapElement->type &= ~MAP_ELEMENT_DIRECTION_MASK; mapElement->type &= ~MAP_ELEMENT_DIRECTION_MASK;
mapElement->type |= newRotation; mapElement->type |= newRotation;
break; break;
case MAP_ELEMENT_TYPE_BANNER:
mapElement->properties.banner.flags ^= mapElement->properties.banner.position;
mapElement->properties.banner.position++;
mapElement->properties.banner.position &= 3;
mapElement->properties.banner.flags ^= mapElement->properties.banner.position;
break;
} }
map_invalidate_tile_full(windowTileInspectorTileX << 5, windowTileInspectorTileY << 5); map_invalidate_tile_full(windowTileInspectorTileX << 5, windowTileInspectorTileY << 5);
@@ -1965,6 +1970,17 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) {
case PAGE_BANNER: case PAGE_BANNER:
{ {
// Details
// Banner info
const uint8 bannerIndex = mapElement->properties.banner.index;
if (gBanners[bannerIndex].flags & BANNER_FLAG_NO_ENTRY) {
rct_string_id noEntryStringIdx = STR_NO_ENTRY;
gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRY_BANNER_TEXT, &noEntryStringIdx, 12, x, y);
}
else {
gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRY_BANNER_TEXT, &gBanners[bannerIndex].string_idx, 12, x, y);
}
// Properties // Properties
// Raise / lower label // Raise / lower label
y = w->y + w->widgets[WIDX_BANNER_SPINNER_HEIGHT].top; y = w->y + w->widgets[WIDX_BANNER_SPINNER_HEIGHT].top;
@@ -1974,6 +1990,11 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) {
x = w->x + w->widgets[WIDX_BANNER_SPINNER_HEIGHT].left + 3; x = w->x + w->widgets[WIDX_BANNER_SPINNER_HEIGHT].left + 3;
int baseHeight = mapElement->base_height; int baseHeight = mapElement->base_height;
gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, 12, x, y); gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, 12, x, y);
// Blocked paths
y += 28;
x = w->x + w->widgets[WIDX_GROUPBOX_DETAILS].left + 7;
gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BANNER_BLOCKED_PATHS, NULL, 12, x, y);
break; break;
} }