mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge pull request #3041 from Gymnasiast/colour
Consistently use 'colour' rather than 'color'
This commit is contained in:
Ted John
commit
ab47aced0e
|
|
@ -133,7 +133,7 @@ void update_palette_effects()
|
|||
rct_water_type* water_type = (rct_water_type*)object_entry_groups[OBJECT_TYPE_WATER].chunks[0];
|
||||
|
||||
if (RCT2_GLOBAL(RCT2_ADDRESS_LIGHTNING_ACTIVE, uint8) == 1) {
|
||||
// change palette to lighter color during lightning
|
||||
// change palette to lighter colour during lightning
|
||||
int palette = 1532;
|
||||
|
||||
if ((sint32)water_type != -1) {
|
||||
|
|
|
|||
|
|
@ -46,15 +46,15 @@ bool image_io_png_read(uint8 **pixels, uint32 *width, uint32 *height, const utf8
|
|||
|
||||
// Read header
|
||||
png_uint_32 pngWidth, pngHeight;
|
||||
int bit_depth, color_type, interlace_type;
|
||||
png_get_IHDR(png_ptr, info_ptr, &pngWidth, &pngHeight, &bit_depth, &color_type, &interlace_type, NULL, NULL);
|
||||
int bit_depth, colour_type, interlace_type;
|
||||
png_get_IHDR(png_ptr, info_ptr, &pngWidth, &pngHeight, &bit_depth, &colour_type, &interlace_type, NULL, NULL);
|
||||
|
||||
// Read pixels as 32bpp RGBA data
|
||||
png_size_t rowBytes = png_get_rowbytes(png_ptr, info_ptr);
|
||||
png_bytepp rowPointers = png_get_rows(png_ptr, info_ptr);
|
||||
uint8 *pngPixels = (uint8*)malloc(pngWidth * pngHeight * 4);
|
||||
uint8 *dst = pngPixels;
|
||||
if (color_type == PNG_COLOR_TYPE_RGB) {
|
||||
if (colour_type == PNG_COLOR_TYPE_RGB) {
|
||||
// 24-bit PNG (no alpha)
|
||||
assert(rowBytes == pngWidth * 3);
|
||||
for (png_uint_32 i = 0; i < pngHeight; i++) {
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
|
|||
widget_button_draw(dpi, w, widgetIndex);
|
||||
break;
|
||||
case WWT_5:
|
||||
case WWT_COLORBTN:
|
||||
case WWT_COLOURBTN:
|
||||
case WWT_TRNBTN:
|
||||
case WWT_TAB:
|
||||
widget_tab_draw(dpi, w, widgetIndex);
|
||||
|
|
@ -418,7 +418,7 @@ static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, int widge
|
|||
|
||||
// Get the colour
|
||||
colour = w->colours[widget->colour];
|
||||
// do not use widget color as this is already used as background for the text_button
|
||||
// do not use widget colour as this is already used as background for the text_button
|
||||
// colour = 2;
|
||||
|
||||
// Resolve the absolute ltrb
|
||||
|
|
@ -927,7 +927,7 @@ static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, int widgetI
|
|||
// Get the colour
|
||||
colour = w->colours[widget->colour] & 0x7F;
|
||||
|
||||
if (widget->type == WWT_4 || widget->type == WWT_COLORBTN || widget->type == WWT_TRNBTN || widget->type == WWT_TAB)
|
||||
if (widget->type == WWT_4 || widget->type == WWT_COLOURBTN || widget->type == WWT_TRNBTN || widget->type == WWT_TAB)
|
||||
if (widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex))
|
||||
image++;
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ typedef enum {
|
|||
WWT_IMGBTN = 3,
|
||||
WWT_4 = 4,
|
||||
WWT_5 = 5,
|
||||
WWT_COLORBTN = 6,
|
||||
WWT_COLOURBTN = 6,
|
||||
WWT_TRNBTN = 7,
|
||||
WWT_TAB = 8,
|
||||
WWT_FLATBTN = 9,
|
||||
|
|
|
|||
|
|
@ -1554,8 +1554,8 @@ enum {
|
|||
STR_CHANGE_BANNER_TEXT_TIP = 2986,
|
||||
STR_SET_AS_NO_ENTRY_BANNER_TIP = 2987,
|
||||
STR_DEMOLISH_BANNER_TIP = 2988,
|
||||
STR_SELECT_MAIN_COLOR_TIP = 2989,
|
||||
STR_SELECT_TEXT_COLOR_TIP = 2990,
|
||||
STR_SELECT_MAIN_SIGN_COLOUR_TIP = 2989,
|
||||
STR_SELECT_TEXT_COLOUR_TIP = 2990,
|
||||
STR_SIGN = 2991,
|
||||
|
||||
STR_CHANGE_SIGN_TEXT_TIP = 2994,
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ void game_command_set_staff_patrol(int *eax, int *ebx, int *ecx, int *edx, int *
|
|||
void game_command_fire_staff_member(int *eax, int *ebx, int *ecx, int *edx, int *esi, int *edi, int *ebp);
|
||||
|
||||
void staff_reset_modes();
|
||||
void update_staff_colour(uint8 staffType, uint16 color);
|
||||
void update_staff_colour(uint8 staffType, uint16 colour);
|
||||
uint16 hire_new_staff_member(uint8 staffType);
|
||||
void staff_update_greyed_patrol_areas();
|
||||
int staff_is_location_in_patrol(rct_peep *mechanic, int x, int y);
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@ enum WINDOW_BANNER_WIDGET_IDX {
|
|||
WIDX_BANNER_TEXT,
|
||||
WIDX_BANNER_NO_ENTRY,
|
||||
WIDX_BANNER_DEMOLISH,
|
||||
WIDX_MAIN_COLOR,
|
||||
WIDX_TEXT_COLOR_DROPDOWN,
|
||||
WIDX_TEXT_COLOR_DROPDOWN_BUTTON
|
||||
WIDX_MAIN_COLOUR,
|
||||
WIDX_TEXT_COLOUR_DROPDOWN,
|
||||
WIDX_TEXT_COLOUR_DROPDOWN_BUTTON
|
||||
};
|
||||
|
||||
rct_widget window_banner_widgets[] = {
|
||||
|
|
@ -57,9 +57,9 @@ rct_widget window_banner_widgets[] = {
|
|||
{ WWT_FLATBTN, 1, WW - 25, WW - 2, 19, 42, 0x1430, STR_CHANGE_BANNER_TEXT_TIP}, // change banner button
|
||||
{ WWT_FLATBTN, 1, WW - 25, WW - 2, 43, 66, 0x143A, STR_SET_AS_NO_ENTRY_BANNER_TIP}, // no entry button
|
||||
{ WWT_FLATBTN, 1, WW - 25, WW - 2, 67, 90, 0x142D, STR_DEMOLISH_BANNER_TIP}, // demolish button
|
||||
{ WWT_COLORBTN, 1, 5, 16, WH - 16,WH - 5, 0x0FFFFFFFF, STR_SELECT_MAIN_COLOR_TIP}, // high money
|
||||
{ WWT_COLOURBTN, 1, 5, 16, WH - 16,WH - 5, 0x0FFFFFFFF, STR_SELECT_MAIN_SIGN_COLOUR_TIP}, // high money
|
||||
{ WWT_DROPDOWN, 1, 43, 81, WH - 16,WH - 5, 0x0FFFFFFFF, 65535}, // high money
|
||||
{ WWT_DROPDOWN_BUTTON, 1, 70, 80, WH - 15,WH - 6, 0x36C, STR_SELECT_TEXT_COLOR_TIP}, // high money
|
||||
{ WWT_DROPDOWN_BUTTON, 1, 70, 80, WH - 15,WH - 6, 0x36C, STR_SELECT_TEXT_COLOUR_TIP}, // high money
|
||||
{ WIDGETS_END },
|
||||
};
|
||||
|
||||
|
|
@ -124,9 +124,9 @@ void window_banner_open(rct_windownumber number)
|
|||
(1 << WIDX_BANNER_TEXT) |
|
||||
(1 << WIDX_BANNER_NO_ENTRY) |
|
||||
(1 << WIDX_BANNER_DEMOLISH) |
|
||||
(1 << WIDX_MAIN_COLOR) |
|
||||
(1 << WIDX_TEXT_COLOR_DROPDOWN) |
|
||||
(1 << WIDX_TEXT_COLOR_DROPDOWN_BUTTON);
|
||||
(1 << WIDX_MAIN_COLOUR) |
|
||||
(1 << WIDX_TEXT_COLOUR_DROPDOWN) |
|
||||
(1 << WIDX_TEXT_COLOUR_DROPDOWN_BUTTON);
|
||||
|
||||
w->number = number;
|
||||
window_init_scroll_widgets(w);
|
||||
|
|
@ -216,10 +216,10 @@ static void window_banner_mousedown(int widgetIndex, rct_window*w, rct_widget* w
|
|||
rct_banner* banner = &gBanners[w->number];
|
||||
|
||||
switch (widgetIndex) {
|
||||
case WIDX_MAIN_COLOR:
|
||||
case WIDX_MAIN_COLOUR:
|
||||
window_dropdown_show_colour(w, widget, w->colours[1] | 0x80, banner->colour);
|
||||
break;
|
||||
case WIDX_TEXT_COLOR_DROPDOWN_BUTTON:
|
||||
case WIDX_TEXT_COLOUR_DROPDOWN_BUTTON:
|
||||
|
||||
for( int i = 0; i < 13; ++i){
|
||||
gDropdownItemsFormat[i] = 1142;
|
||||
|
|
@ -253,13 +253,13 @@ static void window_banner_dropdown(rct_window *w, int widgetIndex, int dropdownI
|
|||
rct_banner* banner = &gBanners[w->number];
|
||||
|
||||
switch(widgetIndex){
|
||||
case WIDX_MAIN_COLOR:
|
||||
case WIDX_MAIN_COLOUR:
|
||||
if (dropdownIndex == -1)
|
||||
break;
|
||||
|
||||
game_do_command(1, GAME_COMMAND_FLAG_APPLY, w->number, dropdownIndex, GAME_COMMAND_SET_BANNER_STYLE, banner->text_colour, banner->flags);
|
||||
break;
|
||||
case WIDX_TEXT_COLOR_DROPDOWN_BUTTON:
|
||||
case WIDX_TEXT_COLOUR_DROPDOWN_BUTTON:
|
||||
if (dropdownIndex == -1)
|
||||
break;
|
||||
|
||||
|
|
@ -290,31 +290,31 @@ static void window_banner_invalidate(rct_window *w)
|
|||
colour_scheme_update(w);
|
||||
|
||||
rct_banner* banner = &gBanners[w->number];
|
||||
rct_widget* colour_btn = &window_banner_widgets[WIDX_MAIN_COLOR];
|
||||
rct_widget* colour_btn = &window_banner_widgets[WIDX_MAIN_COLOUR];
|
||||
colour_btn->type = WWT_EMPTY;
|
||||
|
||||
//sceneray item not sure why we use this instead of banner?
|
||||
rct_scenery_entry* sceneryEntry = g_bannerSceneryEntries[banner->type];
|
||||
|
||||
if (sceneryEntry->banner.flags & 1) colour_btn->type = WWT_COLORBTN;
|
||||
if (sceneryEntry->banner.flags & 1) colour_btn->type = WWT_COLOURBTN;
|
||||
|
||||
w->pressed_widgets &= ~(1ULL<<WIDX_BANNER_NO_ENTRY);
|
||||
w->disabled_widgets &= ~(
|
||||
(1ULL<<WIDX_BANNER_TEXT)|
|
||||
(1ULL<<WIDX_TEXT_COLOR_DROPDOWN)|
|
||||
(1ULL<<WIDX_TEXT_COLOR_DROPDOWN_BUTTON));
|
||||
(1ULL<<WIDX_TEXT_COLOUR_DROPDOWN)|
|
||||
(1ULL<<WIDX_TEXT_COLOUR_DROPDOWN_BUTTON));
|
||||
|
||||
if (banner->flags & BANNER_FLAG_NO_ENTRY){
|
||||
w->pressed_widgets |= (1ULL<<WIDX_BANNER_NO_ENTRY);
|
||||
w->disabled_widgets |=
|
||||
(1ULL<<WIDX_BANNER_TEXT)|
|
||||
(1ULL<<WIDX_TEXT_COLOR_DROPDOWN)|
|
||||
(1ULL<<WIDX_TEXT_COLOR_DROPDOWN_BUTTON);
|
||||
(1ULL<<WIDX_TEXT_COLOUR_DROPDOWN)|
|
||||
(1ULL<<WIDX_TEXT_COLOUR_DROPDOWN_BUTTON);
|
||||
}
|
||||
|
||||
colour_btn->image = (banner->colour << 19) + 0x600013C3;
|
||||
|
||||
rct_widget* drop_down_widget = &window_banner_widgets[WIDX_TEXT_COLOR_DROPDOWN];
|
||||
rct_widget* drop_down_widget = &window_banner_widgets[WIDX_TEXT_COLOUR_DROPDOWN];
|
||||
drop_down_widget->image = banner->text_colour + 2996;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -75,8 +75,8 @@ static rct_widget window_map_widgets[] = {
|
|||
{ WWT_CAPTION, 0, 1, 243, 1, 14, STR_MAP, STR_WINDOW_TITLE_TIP },
|
||||
{ WWT_CLOSEBOX, 0, 232, 242, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP },
|
||||
{ WWT_RESIZE, 1, 0, 244, 43, 257, STR_NONE, STR_NONE },
|
||||
{ WWT_COLORBTN, 1, 3, 33, 17, 43, 0x02000144E, STR_SHOW_PEOPLE_ON_MAP_TIP },
|
||||
{ WWT_COLORBTN, 1, 34, 64, 17, 43, 0x02000144E, STR_SHOW_RIDES_STALLS_ON_MAP_TIP },
|
||||
{ WWT_COLOURBTN, 1, 3, 33, 17, 43, 0x02000144E, STR_SHOW_PEOPLE_ON_MAP_TIP },
|
||||
{ WWT_COLOURBTN, 1, 34, 64, 17, 43, 0x02000144E, STR_SHOW_RIDES_STALLS_ON_MAP_TIP },
|
||||
{ WWT_SCROLL, 1, 3, 241, 46, 225, 0x3, STR_NONE },
|
||||
{ WWT_SPINNER, 1, 104, 198, 229, 240, 0xC8C, STR_NONE },
|
||||
{ WWT_DROPDOWN_BUTTON, 1, 187, 197, 230, 234, STR_NUMERIC_UP, STR_NONE },
|
||||
|
|
@ -1012,7 +1012,7 @@ static void window_map_paint_peep_overlay(rct_drawpixelinfo *dpi)
|
|||
uint16 spriteIndex;
|
||||
|
||||
sint16 left, right, bottom, top;
|
||||
sint16 color;
|
||||
sint16 colour;
|
||||
|
||||
FOR_ALL_PEEPS(spriteIndex, peep) {
|
||||
left = peep->x;
|
||||
|
|
@ -1026,26 +1026,26 @@ static void window_map_paint_peep_overlay(rct_drawpixelinfo *dpi)
|
|||
right = left;
|
||||
bottom = top;
|
||||
|
||||
color = 0x14;
|
||||
colour = 0x14;
|
||||
|
||||
if ((peep->flags & SPRITE_FLAGS_PEEP_FLASHING) != 0) {
|
||||
if (peep->type == PEEP_TYPE_STAFF) {
|
||||
if ((RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_MAP_FLASHING_FLAGS, uint16) & (1 << 3)) != 0) {
|
||||
color = 0x8A;
|
||||
colour = 0x8A;
|
||||
left--;
|
||||
if ((RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_MAP_FLASHING_FLAGS, uint16) & (1 << 15)) == 0)
|
||||
color = 0xA;
|
||||
colour = 0xA;
|
||||
}
|
||||
} else {
|
||||
if ((RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_MAP_FLASHING_FLAGS, uint16) & (1 << 1)) != 0) {
|
||||
color = 0xAC;
|
||||
colour = 0xAC;
|
||||
left--;
|
||||
if ((RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_MAP_FLASHING_FLAGS, uint16) & (1 << 15)) == 0)
|
||||
color = 0x15;
|
||||
colour = 0x15;
|
||||
}
|
||||
}
|
||||
}
|
||||
gfx_fill_rect(dpi, left, top, right, bottom, color);
|
||||
gfx_fill_rect(dpi, left, top, right, bottom, colour);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -333,9 +333,9 @@ static rct_widget window_ride_colour_widgets[] = {
|
|||
{ WWT_SPINNER, 1, 3, 70, 47, 93, 0xFFFFFFFF, STR_NONE },
|
||||
{ WWT_DROPDOWN, 1, 74, 312, 49, 60, 872, STR_NONE },
|
||||
{ WWT_DROPDOWN_BUTTON, 1, 301, 311, 50, 59, 876, STR_COLOUR_SCHEME_TO_CHANGE_TIP },
|
||||
{ WWT_COLORBTN, 1, 79, 90, 74, 85, 0xFFFFFFFF, STR_SELECT_MAIN_COLOUR_TIP },
|
||||
{ WWT_COLORBTN, 1, 99, 110, 74, 85, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_1_TIP },
|
||||
{ WWT_COLORBTN, 1, 119, 130, 74, 85, 0xFFFFFFFF, STR_SELECT_SUPPORT_STRUCTURE_COLOUR_TIP },
|
||||
{ WWT_COLOURBTN, 1, 79, 90, 74, 85, 0xFFFFFFFF, STR_SELECT_MAIN_COLOUR_TIP },
|
||||
{ WWT_COLOURBTN, 1, 99, 110, 74, 85, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_1_TIP },
|
||||
{ WWT_COLOURBTN, 1, 119, 130, 74, 85, 0xFFFFFFFF, STR_SELECT_SUPPORT_STRUCTURE_COLOUR_TIP },
|
||||
{ WWT_DROPDOWN, 1, 74, 312, 49, 60, 0xFFFFFFFF, STR_NONE },
|
||||
{ WWT_DROPDOWN_BUTTON, 1, 301, 311, 50, 59, 876, STR_NONE },
|
||||
{ WWT_FLATBTN, 1, 289, 312, 68, 91, 5173, STR_PAINT_INDIVIDUAL_AREA_TIP },
|
||||
|
|
@ -347,9 +347,9 @@ static rct_widget window_ride_colour_widgets[] = {
|
|||
{ WWT_DROPDOWN_BUTTON, 1, 301, 311, 158, 167, 876, STR_SELECT_VEHICLE_COLOUR_SCHEME_TIP },
|
||||
{ WWT_DROPDOWN, 1, 74, 312, 173, 184, 0xFFFFFFFF, STR_NONE },
|
||||
{ WWT_DROPDOWN_BUTTON, 1, 301, 311, 174, 183, 876, STR_SELECT_VEHICLE_TO_MODIFY_TIP },
|
||||
{ WWT_COLORBTN, 1, 79, 90, 190, 201, 0xFFFFFFFF, STR_SELECT_MAIN_COLOUR_TIP },
|
||||
{ WWT_COLORBTN, 1, 99, 110, 190, 201, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_1_TIP },
|
||||
{ WWT_COLORBTN, 1, 119, 130, 190, 201, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_2_TIP },
|
||||
{ WWT_COLOURBTN, 1, 79, 90, 190, 201, 0xFFFFFFFF, STR_SELECT_MAIN_COLOUR_TIP },
|
||||
{ WWT_COLOURBTN, 1, 99, 110, 190, 201, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_1_TIP },
|
||||
{ WWT_COLOURBTN, 1, 119, 130, 190, 201, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_2_TIP },
|
||||
{ WIDGETS_END },
|
||||
};
|
||||
|
||||
|
|
@ -4154,7 +4154,7 @@ static void window_ride_colour_invalidate(rct_window *w)
|
|||
|
||||
// Track main colour
|
||||
if (window_ride_has_track_colour(ride, 0)) {
|
||||
window_ride_colour_widgets[WIDX_TRACK_MAIN_COLOUR].type = WWT_COLORBTN;
|
||||
window_ride_colour_widgets[WIDX_TRACK_MAIN_COLOUR].type = WWT_COLOURBTN;
|
||||
window_ride_colour_widgets[WIDX_TRACK_MAIN_COLOUR].image = window_ride_get_colour_button_image(trackColour.main);
|
||||
} else {
|
||||
window_ride_colour_widgets[WIDX_TRACK_MAIN_COLOUR].type = WWT_EMPTY;
|
||||
|
|
@ -4162,7 +4162,7 @@ static void window_ride_colour_invalidate(rct_window *w)
|
|||
|
||||
// Track additional colour
|
||||
if (window_ride_has_track_colour(ride, 1)) {
|
||||
window_ride_colour_widgets[WIDX_TRACK_ADDITIONAL_COLOUR].type = WWT_COLORBTN;
|
||||
window_ride_colour_widgets[WIDX_TRACK_ADDITIONAL_COLOUR].type = WWT_COLOURBTN;
|
||||
window_ride_colour_widgets[WIDX_TRACK_ADDITIONAL_COLOUR].image = window_ride_get_colour_button_image(trackColour.additional);
|
||||
} else {
|
||||
window_ride_colour_widgets[WIDX_TRACK_ADDITIONAL_COLOUR].type = WWT_EMPTY;
|
||||
|
|
@ -4170,7 +4170,7 @@ static void window_ride_colour_invalidate(rct_window *w)
|
|||
|
||||
// Track supports colour
|
||||
if (window_ride_has_track_colour(ride, 2) && ride->type != RIDE_TYPE_MAZE) {
|
||||
window_ride_colour_widgets[WIDX_TRACK_SUPPORT_COLOUR].type = WWT_COLORBTN;
|
||||
window_ride_colour_widgets[WIDX_TRACK_SUPPORT_COLOUR].type = WWT_COLOURBTN;
|
||||
window_ride_colour_widgets[WIDX_TRACK_SUPPORT_COLOUR].image = window_ride_get_colour_button_image(trackColour.supports);
|
||||
} else {
|
||||
window_ride_colour_widgets[WIDX_TRACK_SUPPORT_COLOUR].type = WWT_EMPTY;
|
||||
|
|
@ -4204,7 +4204,7 @@ static void window_ride_colour_invalidate(rct_window *w)
|
|||
vehicleColour = ride_get_vehicle_colour(ride, w->var_48C);
|
||||
|
||||
window_ride_colour_widgets[WIDX_VEHICLE_PREVIEW].type = WWT_SCROLL;
|
||||
window_ride_colour_widgets[WIDX_VEHICLE_MAIN_COLOUR].type = WWT_COLORBTN;
|
||||
window_ride_colour_widgets[WIDX_VEHICLE_MAIN_COLOUR].type = WWT_COLOURBTN;
|
||||
window_ride_colour_widgets[WIDX_VEHICLE_MAIN_COLOUR].image = window_ride_get_colour_button_image(vehicleColour.main);
|
||||
|
||||
uint8 trainLayout[16];
|
||||
|
|
@ -4222,10 +4222,10 @@ static void window_ride_colour_invalidate(rct_window *w)
|
|||
|
||||
// Additional colours
|
||||
if (colourFlags & 1) {
|
||||
window_ride_colour_widgets[WIDX_VEHICLE_ADDITIONAL_COLOUR_1].type = WWT_COLORBTN;
|
||||
window_ride_colour_widgets[WIDX_VEHICLE_ADDITIONAL_COLOUR_1].type = WWT_COLOURBTN;
|
||||
window_ride_colour_widgets[WIDX_VEHICLE_ADDITIONAL_COLOUR_1].image = window_ride_get_colour_button_image(vehicleColour.additional_1);
|
||||
if (colourFlags & 0x2000000) {
|
||||
window_ride_colour_widgets[WIDX_VEHICLE_ADDITIONAL_COLOUR_2].type = WWT_COLORBTN;
|
||||
window_ride_colour_widgets[WIDX_VEHICLE_ADDITIONAL_COLOUR_2].type = WWT_COLOURBTN;
|
||||
window_ride_colour_widgets[WIDX_VEHICLE_ADDITIONAL_COLOUR_2].image = window_ride_get_colour_button_image(vehicleColour.additional_2);
|
||||
} else {
|
||||
window_ride_colour_widgets[WIDX_VEHICLE_ADDITIONAL_COLOUR_2].type = WWT_EMPTY;
|
||||
|
|
|
|||
|
|
@ -171,9 +171,9 @@ static rct_widget window_scenery_widgets[] = {
|
|||
{ WWT_SCROLL, 1, 2, 608, 47, 126, 2, STR_NONE }, // 1000000 0x009DE418
|
||||
{ WWT_FLATBTN, 1, 609, 632, 44, 67, 5169, STR_ROTATE_OBJECTS_90 }, // 2000000 0x009DE428
|
||||
{ WWT_FLATBTN, 1, 609, 632, 68, 91, 5173, 3102 }, // 4000000 0x009DE438
|
||||
{ WWT_COLORBTN, 1, 615, 626, 93, 104, 0xFFFFFFFF, STR_SELECT_COLOUR }, // 8000000 0x009DE448
|
||||
{ WWT_COLORBTN, 1, 615, 626, 105, 116, 0xFFFFFFFF, STR_SELECT_SECONDARY_COLOUR }, // 10000000 0x009DE458
|
||||
{ WWT_COLORBTN, 1, 615, 626, 117, 128, 0xFFFFFFFF, STR_SELECT_TERNARY_COLOUR }, // 20000000 0x009DE468
|
||||
{ WWT_COLOURBTN, 1, 615, 626, 93, 104, 0xFFFFFFFF, STR_SELECT_COLOUR }, // 8000000 0x009DE448
|
||||
{ WWT_COLOURBTN, 1, 615, 626, 105, 116, 0xFFFFFFFF, STR_SELECT_SECONDARY_COLOUR }, // 10000000 0x009DE458
|
||||
{ WWT_COLOURBTN, 1, 615, 626, 117, 128, 0xFFFFFFFF, STR_SELECT_TERNARY_COLOUR }, // 20000000 0x009DE468
|
||||
{ WWT_FLATBTN, 1, 609, 632, 117, 140, 5172, 3225 }, // 40000000 0x009DE478
|
||||
{ WIDGETS_END },
|
||||
};
|
||||
|
|
@ -473,7 +473,7 @@ void window_scenery_open()
|
|||
RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_TYPE, uint8) = 0;
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_COST, uint32) = MONEY32_UNDEFINED;
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_ROTATION, uint16) = 0;
|
||||
window_scenery_is_repaint_scenery_tool_on = 0; // repaint colored scenery tool state
|
||||
window_scenery_is_repaint_scenery_tool_on = 0; // repaint coloured scenery tool state
|
||||
window_scenery_is_build_cluster_tool_on = 0; // build cluster tool state
|
||||
|
||||
window->min_width = WINDOW_SCENERY_WIDTH;
|
||||
|
|
@ -904,10 +904,10 @@ void window_scenery_invalidate(rct_window *w)
|
|||
window_scenery_widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WWT_EMPTY;
|
||||
window_scenery_widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].type = WWT_EMPTY;
|
||||
|
||||
if (window_scenery_is_repaint_scenery_tool_on & 1) { // repaint colored scenery tool is on
|
||||
window_scenery_widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WWT_COLORBTN;
|
||||
window_scenery_widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WWT_COLORBTN;
|
||||
window_scenery_widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].type = WWT_COLORBTN;
|
||||
if (window_scenery_is_repaint_scenery_tool_on & 1) { // repaint coloured scenery tool is on
|
||||
window_scenery_widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WWT_COLOURBTN;
|
||||
window_scenery_widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WWT_COLOURBTN;
|
||||
window_scenery_widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].type = WWT_COLOURBTN;
|
||||
window_scenery_widgets[WIDX_SCENERY_ROTATE_OBJECTS_BUTTON].type = WWT_EMPTY;
|
||||
} else if (tabSelectedSceneryId != -1) {
|
||||
rct_scenery_entry* sceneryEntry = NULL;
|
||||
|
|
@ -916,36 +916,36 @@ void window_scenery_invalidate(rct_window *w)
|
|||
sceneryEntry = g_bannerSceneryEntries[tabSelectedSceneryId - 0x400];
|
||||
|
||||
if (sceneryEntry->banner.flags & 1)
|
||||
window_scenery_widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WWT_COLORBTN;
|
||||
window_scenery_widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WWT_COLOURBTN;
|
||||
} else if (tabSelectedSceneryId >= 0x300) {
|
||||
sceneryEntry = g_largeSceneryEntries[tabSelectedSceneryId - 0x300];
|
||||
|
||||
if (sceneryEntry->large_scenery.flags & 1)
|
||||
window_scenery_widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WWT_COLORBTN;
|
||||
window_scenery_widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WWT_COLOURBTN;
|
||||
if (sceneryEntry->large_scenery.flags & 2)
|
||||
window_scenery_widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WWT_COLORBTN;
|
||||
window_scenery_widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WWT_COLOURBTN;
|
||||
} else if (tabSelectedSceneryId >= 0x200) {
|
||||
sceneryEntry = g_wallSceneryEntries[tabSelectedSceneryId - 0x200];
|
||||
if (sceneryEntry->wall.flags & (WALL_SCENERY_FLAG1 | WALL_SCENERY_FLAG2)) {
|
||||
window_scenery_widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WWT_COLORBTN;
|
||||
window_scenery_widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WWT_COLOURBTN;
|
||||
|
||||
if (sceneryEntry->wall.flags & WALL_SCENERY_HAS_SECONDARY_COLOUR) {
|
||||
window_scenery_widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WWT_COLORBTN;
|
||||
window_scenery_widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WWT_COLOURBTN;
|
||||
|
||||
if (sceneryEntry->wall.flags2 & WALL_SCENERY_FLAG1)
|
||||
window_scenery_widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WWT_EMPTY;
|
||||
if (sceneryEntry->wall.flags & WALL_SCENERY_HAS_TERNARY_COLOUR)
|
||||
window_scenery_widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].type = WWT_COLORBTN;
|
||||
window_scenery_widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].type = WWT_COLOURBTN;
|
||||
}
|
||||
}
|
||||
} else if (tabSelectedSceneryId < 0x100) {
|
||||
sceneryEntry = g_smallSceneryEntries[tabSelectedSceneryId];
|
||||
|
||||
if (sceneryEntry->small_scenery.flags & (SMALL_SCENERY_FLAG_HAS_PRIMARY_COLOUR | SMALL_SCENERY_FLAG10)) {
|
||||
window_scenery_widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WWT_COLORBTN;
|
||||
window_scenery_widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WWT_COLOURBTN;
|
||||
|
||||
if (sceneryEntry->small_scenery.flags & SMALL_SCENERY_FLAG_HAS_SECONDARY_COLOUR)
|
||||
window_scenery_widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WWT_COLORBTN;
|
||||
window_scenery_widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WWT_COLOURBTN;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -994,7 +994,7 @@ void window_scenery_paint(rct_window *w, rct_drawpixelinfo *dpi)
|
|||
|
||||
sint16 selectedSceneryEntryId = w->scenery.selected_scenery_id;
|
||||
if (selectedSceneryEntryId == -1) {
|
||||
if (window_scenery_is_repaint_scenery_tool_on & 1) // repaint colored scenery tool is on
|
||||
if (window_scenery_is_repaint_scenery_tool_on & 1) // repaint coloured scenery tool is on
|
||||
return;
|
||||
|
||||
selectedSceneryEntryId = window_scenery_selected_scenery_by_tab[tabIndex];
|
||||
|
|
|
|||
|
|
@ -44,20 +44,20 @@ enum WINDOW_SIGN_WIDGET_IDX {
|
|||
WIDX_VIEWPORT,
|
||||
WIDX_SIGN_TEXT,
|
||||
WIDX_SIGN_DEMOLISH,
|
||||
WIDX_MAIN_COLOR,
|
||||
WIDX_TEXT_COLOR
|
||||
WIDX_MAIN_COLOUR,
|
||||
WIDX_TEXT_COLOUR
|
||||
};
|
||||
|
||||
// 0x9AEE00
|
||||
rct_widget window_sign_widgets[] = {
|
||||
{ WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, 0x0FFFFFFFF, 65535 }, // panel / background
|
||||
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_SIGN, STR_WINDOW_TITLE_TIP }, // title bar
|
||||
{ WWT_CLOSEBOX, 0, WW - 13, WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button
|
||||
{ WWT_VIEWPORT, 1, 3, WW - 26, 17, WH - 20, 0x0FFFFFFFE, 65535 }, // Viewport
|
||||
{ WWT_FLATBTN, 1, WW - 25, WW - 2, 19, 42, 5168, STR_CHANGE_SIGN_TEXT_TIP }, // change sign button
|
||||
{ WWT_FLATBTN, 1, WW - 25, WW - 2, 67, 90, 5165, STR_DEMOLISH_SIGN_TIP }, // demolish button
|
||||
{ WWT_COLORBTN, 1, 5, 16, WH - 16, WH - 5, 0x0FFFFFFFF, STR_SELECT_MAIN_COLOR_TIP },// Main colour
|
||||
{ WWT_COLORBTN, 1, 17, 28, WH - 16, WH - 5, 0x0FFFFFFFF, STR_SELECT_TEXT_COLOR_TIP },// Text colour
|
||||
{ WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, 0x0FFFFFFFF, 65535 }, // panel / background
|
||||
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_SIGN, STR_WINDOW_TITLE_TIP }, // title bar
|
||||
{ WWT_CLOSEBOX, 0, WW - 13, WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button
|
||||
{ WWT_VIEWPORT, 1, 3, WW - 26, 17, WH - 20, 0x0FFFFFFFE, 65535 }, // Viewport
|
||||
{ WWT_FLATBTN, 1, WW - 25, WW - 2, 19, 42, 5168, STR_CHANGE_SIGN_TEXT_TIP }, // change sign button
|
||||
{ WWT_FLATBTN, 1, WW - 25, WW - 2, 67, 90, 5165, STR_DEMOLISH_SIGN_TIP }, // demolish button
|
||||
{ WWT_COLOURBTN, 1, 5, 16, WH - 16, WH - 5, 0x0FFFFFFFF, STR_SELECT_MAIN_SIGN_COLOUR_TIP }, // Main colour
|
||||
{ WWT_COLOURBTN, 1, 17, 28, WH - 16, WH - 5, 0x0FFFFFFFF, STR_SELECT_TEXT_COLOUR_TIP }, // Text colour
|
||||
{ WIDGETS_END },
|
||||
};
|
||||
|
||||
|
|
@ -159,8 +159,8 @@ void window_sign_open(rct_windownumber number)
|
|||
(1 << WIDX_CLOSE) |
|
||||
(1 << WIDX_SIGN_TEXT) |
|
||||
(1 << WIDX_SIGN_DEMOLISH) |
|
||||
(1 << WIDX_MAIN_COLOR) |
|
||||
(1 << WIDX_TEXT_COLOR);
|
||||
(1 << WIDX_MAIN_COLOUR) |
|
||||
(1 << WIDX_TEXT_COLOUR);
|
||||
|
||||
w->number = number;
|
||||
window_init_scroll_widgets(w);
|
||||
|
|
@ -277,10 +277,10 @@ static void window_sign_mouseup(rct_window *w, int widgetIndex)
|
|||
static void window_sign_mousedown(int widgetIndex, rct_window*w, rct_widget* widget)
|
||||
{
|
||||
switch (widgetIndex) {
|
||||
case WIDX_MAIN_COLOR:
|
||||
case WIDX_MAIN_COLOUR:
|
||||
window_dropdown_show_colour(w, widget, w->colours[1] | 0x80, (uint8)w->list_information_type);
|
||||
break;
|
||||
case WIDX_TEXT_COLOR:
|
||||
case WIDX_TEXT_COLOUR:
|
||||
window_dropdown_show_colour(w, widget, w->colours[1] | 0x80, (uint8)w->var_492);
|
||||
break;
|
||||
}
|
||||
|
|
@ -293,12 +293,12 @@ static void window_sign_mousedown(int widgetIndex, rct_window*w, rct_widget* wid
|
|||
static void window_sign_dropdown(rct_window *w, int widgetIndex, int dropdownIndex)
|
||||
{
|
||||
switch (widgetIndex){
|
||||
case WIDX_MAIN_COLOR:
|
||||
case WIDX_MAIN_COLOUR:
|
||||
if (dropdownIndex == -1) return;
|
||||
w->list_information_type = dropdownIndex;
|
||||
game_do_command(1, GAME_COMMAND_FLAG_APPLY, w->number, dropdownIndex, GAME_COMMAND_SET_SIGN_STYLE, w->var_492, 1);
|
||||
break;
|
||||
case WIDX_TEXT_COLOR:
|
||||
case WIDX_TEXT_COLOUR:
|
||||
if (dropdownIndex == -1) return;
|
||||
w->var_492 = dropdownIndex;
|
||||
game_do_command(1, GAME_COMMAND_FLAG_APPLY, w->number, w->list_information_type, GAME_COMMAND_SET_SIGN_STYLE, dropdownIndex, 1);
|
||||
|
|
@ -331,8 +331,8 @@ static void window_sign_invalidate(rct_window *w)
|
|||
{
|
||||
colour_scheme_update(w);
|
||||
|
||||
rct_widget* main_colour_btn = &window_sign_widgets[WIDX_MAIN_COLOR];
|
||||
rct_widget* text_colour_btn = &window_sign_widgets[WIDX_TEXT_COLOR];
|
||||
rct_widget* main_colour_btn = &window_sign_widgets[WIDX_MAIN_COLOUR];
|
||||
rct_widget* text_colour_btn = &window_sign_widgets[WIDX_TEXT_COLOUR];
|
||||
|
||||
rct_scenery_entry* scenery_entry = g_largeSceneryEntries[w->var_48C];
|
||||
|
||||
|
|
@ -340,10 +340,10 @@ static void window_sign_invalidate(rct_window *w)
|
|||
text_colour_btn->type = WWT_EMPTY;
|
||||
|
||||
if (scenery_entry->large_scenery.flags&(1 << 0)){
|
||||
main_colour_btn->type = WWT_COLORBTN;
|
||||
main_colour_btn->type = WWT_COLOURBTN;
|
||||
}
|
||||
if (scenery_entry->large_scenery.flags&(1 << 1)) {
|
||||
text_colour_btn->type = WWT_COLORBTN;
|
||||
text_colour_btn->type = WWT_COLOURBTN;
|
||||
}
|
||||
|
||||
main_colour_btn->image = (w->list_information_type << 19) | 0x600013C3;
|
||||
|
|
@ -423,8 +423,8 @@ void window_sign_small_open(rct_windownumber number){
|
|||
(1 << WIDX_CLOSE) |
|
||||
(1 << WIDX_SIGN_TEXT) |
|
||||
(1 << WIDX_SIGN_DEMOLISH) |
|
||||
(1 << WIDX_MAIN_COLOR) |
|
||||
(1 << WIDX_TEXT_COLOR);
|
||||
(1 << WIDX_MAIN_COLOUR) |
|
||||
(1 << WIDX_TEXT_COLOUR);
|
||||
|
||||
w->number = number;
|
||||
window_init_scroll_widgets(w);
|
||||
|
|
@ -543,12 +543,12 @@ static void window_sign_small_dropdown(rct_window *w, int widgetIndex, int dropd
|
|||
rct_banner* banner = &gBanners[w->number];
|
||||
|
||||
switch (widgetIndex){
|
||||
case WIDX_MAIN_COLOR:
|
||||
case WIDX_MAIN_COLOUR:
|
||||
if (dropdownIndex == -1) return;
|
||||
w->list_information_type = dropdownIndex;
|
||||
game_do_command(1, GAME_COMMAND_FLAG_APPLY, w->number, dropdownIndex, GAME_COMMAND_SET_SIGN_STYLE, w->var_492, 0);
|
||||
break;
|
||||
case WIDX_TEXT_COLOR:
|
||||
case WIDX_TEXT_COLOUR:
|
||||
if (dropdownIndex == -1) return;
|
||||
w->var_492 = dropdownIndex;
|
||||
game_do_command(1, GAME_COMMAND_FLAG_APPLY, w->number, w->list_information_type, GAME_COMMAND_SET_SIGN_STYLE, dropdownIndex, 0);
|
||||
|
|
@ -568,8 +568,8 @@ static void window_sign_small_invalidate(rct_window *w)
|
|||
{
|
||||
colour_scheme_update(w);
|
||||
|
||||
rct_widget* main_colour_btn = &window_sign_widgets[WIDX_MAIN_COLOR];
|
||||
rct_widget* text_colour_btn = &window_sign_widgets[WIDX_TEXT_COLOR];
|
||||
rct_widget* main_colour_btn = &window_sign_widgets[WIDX_MAIN_COLOUR];
|
||||
rct_widget* text_colour_btn = &window_sign_widgets[WIDX_TEXT_COLOUR];
|
||||
|
||||
rct_scenery_entry* scenery_entry = g_wallSceneryEntries[w->var_48C];
|
||||
|
||||
|
|
@ -577,10 +577,10 @@ static void window_sign_small_invalidate(rct_window *w)
|
|||
text_colour_btn->type = WWT_EMPTY;
|
||||
|
||||
if (scenery_entry->wall.flags&(1 << 0)){
|
||||
main_colour_btn->type = WWT_COLORBTN;
|
||||
main_colour_btn->type = WWT_COLOURBTN;
|
||||
}
|
||||
if (scenery_entry->wall.flags&(1 << 6)) {
|
||||
text_colour_btn->type = WWT_COLORBTN;
|
||||
text_colour_btn->type = WWT_COLOURBTN;
|
||||
}
|
||||
|
||||
main_colour_btn->image = (w->list_information_type << 19) | 0x600013C3;
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ enum WINDOW_STAFF_LIST_WIDGET_IDX {
|
|||
WIDX_STAFF_LIST_SECURITY_TAB,
|
||||
WIDX_STAFF_LIST_ENTERTAINERS_TAB,
|
||||
WIDX_STAFF_LIST_LIST,
|
||||
WIDX_STAFF_LIST_UNIFORM_COLOR_PICKER,
|
||||
WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER,
|
||||
WIDX_STAFF_LIST_HIRE_BUTTON,
|
||||
WIDX_STAFF_LIST_QUICK_FIRE,
|
||||
WIDX_STAFF_LIST_SHOW_PATROL_AREA_BUTTON,
|
||||
|
|
@ -124,7 +124,7 @@ static rct_widget window_staff_list_widgets[] = {
|
|||
{ WWT_TAB, 1, 65, 95, 17, 43, 0x02000144E, STR_STAFF_SECURITY_TAB_TIP }, // security guards tab
|
||||
{ WWT_TAB, 1, 96, 126, 17, 43, 0x02000144E, STR_STAFF_ENTERTAINERS_TAB_TIP }, // entertainers tab
|
||||
{ WWT_SCROLL, 1, 3, 316, 72, 266, 3, STR_NONE }, // staff list
|
||||
{ WWT_COLORBTN, 1, 130, 141, 58, 69, STR_NONE, STR_UNIFORM_COLOUR_TIP }, // uniform color picker
|
||||
{ WWT_COLOURBTN, 1, 130, 141, 58, 69, STR_NONE, STR_UNIFORM_COLOUR_TIP }, // uniform colour picker
|
||||
{ WWT_DROPDOWN_BUTTON, 0, WW - 155, WW - 11, 17, 29, STR_NONE, STR_HIRE_STAFF_TIP }, // hire button
|
||||
{ WWT_FLATBTN, 1, WW - 77, WW - 54, 46, 69, SPR_DEMOLISH, 5300 }, // quick fire staff
|
||||
{ WWT_FLATBTN, 1, WW - 53, WW - 30, 46, 69, 5175, STR_SHOW_PATROL_AREA_TIP }, // show staff patrol area tool
|
||||
|
|
@ -166,7 +166,7 @@ void window_staff_list_open()
|
|||
(1 << WIDX_STAFF_LIST_SECURITY_TAB) |
|
||||
(1 << WIDX_STAFF_LIST_ENTERTAINERS_TAB) |
|
||||
(1 << WIDX_STAFF_LIST_HIRE_BUTTON) |
|
||||
(1 << WIDX_STAFF_LIST_UNIFORM_COLOR_PICKER) |
|
||||
(1 << WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER) |
|
||||
(1 << WIDX_STAFF_LIST_SHOW_PATROL_AREA_BUTTON) |
|
||||
(1 << WIDX_STAFF_LIST_MAP) |
|
||||
(1 << WIDX_STAFF_LIST_QUICK_FIRE);
|
||||
|
|
@ -175,7 +175,7 @@ void window_staff_list_open()
|
|||
RCT2_GLOBAL(RCT2_ADDRESS_STAFF_HIGHLIGHTED_INDEX, short) = -1;
|
||||
window->list_information_type = 0;
|
||||
|
||||
window_staff_list_widgets[WIDX_STAFF_LIST_UNIFORM_COLOR_PICKER].type = WWT_EMPTY;
|
||||
window_staff_list_widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].type = WWT_EMPTY;
|
||||
window->min_width = WW;
|
||||
window->min_height = WH;
|
||||
window->max_width = MAX_WW;
|
||||
|
|
@ -279,7 +279,7 @@ static void window_staff_list_mousedown(int widgetIndex, rct_window* w, rct_widg
|
|||
w->scrolls[0].v_top = 0;
|
||||
window_staff_list_cancel_tools(w);
|
||||
break;
|
||||
case WIDX_STAFF_LIST_UNIFORM_COLOR_PICKER:
|
||||
case WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER:
|
||||
window_dropdown_show_colour(w, widget, w->colours[1], RCT2_ADDRESS(RCT2_ADDRESS_HANDYMAN_COLOUR, uint8)[RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_STAFF_LIST_SELECTED_TAB, uint8)]);
|
||||
break;
|
||||
}
|
||||
|
|
@ -293,7 +293,7 @@ static void window_staff_list_mousedown(int widgetIndex, rct_window* w, rct_widg
|
|||
*/
|
||||
static void window_staff_list_dropdown(rct_window *w, int widgetIndex, int dropdownIndex)
|
||||
{
|
||||
if (widgetIndex == WIDX_STAFF_LIST_UNIFORM_COLOR_PICKER && dropdownIndex != -1) {
|
||||
if (widgetIndex == WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER && dropdownIndex != -1) {
|
||||
update_staff_colour(RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_STAFF_LIST_SELECTED_TAB, uint8), dropdownIndex);
|
||||
}
|
||||
}
|
||||
|
|
@ -492,11 +492,11 @@ void window_staff_list_invalidate(rct_window *w)
|
|||
|
||||
w->pressed_widgets = pressed_widgets | (1ULL << widgetIndex);
|
||||
window_staff_list_widgets[WIDX_STAFF_LIST_HIRE_BUTTON].image = STR_HIRE_HANDYMAN + tabIndex;
|
||||
window_staff_list_widgets[WIDX_STAFF_LIST_UNIFORM_COLOR_PICKER].type = WWT_EMPTY;
|
||||
window_staff_list_widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].type = WWT_EMPTY;
|
||||
|
||||
if (tabIndex < 3) {
|
||||
window_staff_list_widgets[WIDX_STAFF_LIST_UNIFORM_COLOR_PICKER].type = WWT_COLORBTN;
|
||||
window_staff_list_widgets[WIDX_STAFF_LIST_UNIFORM_COLOR_PICKER].image =
|
||||
window_staff_list_widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].type = WWT_COLOURBTN;
|
||||
window_staff_list_widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].image =
|
||||
((uint32)RCT2_ADDRESS(RCT2_ADDRESS_HANDYMAN_COLOUR, uint8)[tabIndex] << 19) +
|
||||
0x600013C3;
|
||||
}
|
||||
|
|
@ -595,7 +595,7 @@ void window_staff_list_paint(rct_window *w, rct_drawpixelinfo *dpi)
|
|||
}
|
||||
|
||||
if (selectedTab < 3) {
|
||||
gfx_draw_string_left(dpi, STR_UNIFORM_COLOUR, w, 0, w->x + 6, window_staff_list_widgets[WIDX_STAFF_LIST_UNIFORM_COLOR_PICKER].top + w->y + 1);
|
||||
gfx_draw_string_left(dpi, STR_UNIFORM_COLOUR, w, 0, w->x + 6, window_staff_list_widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].top + w->y + 1);
|
||||
}
|
||||
|
||||
int staffTypeStringId = 1859 + selectedTab;
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ enum WINDOW_STAFF_LIST_WIDGET_IDX {
|
|||
WIDX_THEMES_DUPLICATE_BUTTON,
|
||||
WIDX_THEMES_DELETE_BUTTON,
|
||||
WIDX_THEMES_RENAME_BUTTON,
|
||||
WIDX_THEMES_COLORBTN_MASK,
|
||||
WIDX_THEMES_COLOURBTN_MASK,
|
||||
WIDX_THEMES_LIST,
|
||||
WIDX_THEMES_RCT1_RIDE_LIGHTS,
|
||||
WIDX_THEMES_RCT1_PARK_LIGHTS,
|
||||
|
|
@ -140,7 +140,7 @@ static rct_widget window_themes_widgets[] = {
|
|||
{ WWT_DROPDOWN_BUTTON, 1, 10, 100, 82, 93, 5239, 5257 }, // Duplicate button
|
||||
{ WWT_DROPDOWN_BUTTON, 1, 110, 200, 82, 93, 3349, 5258 }, // Delete button
|
||||
{ WWT_DROPDOWN_BUTTON, 1, 210, 300, 82, 93, 3348, 5259 }, // Rename button
|
||||
{ WWT_COLORBTN, 1, 0, 0, 0, 0, STR_NONE, STR_NONE }, // color button mask
|
||||
{ WWT_COLOURBTN, 1, 0, 0, 0, 0, STR_NONE, STR_NONE }, // colour button mask
|
||||
{ WWT_SCROLL, 1, 3, 316, 60, 103, 2, STR_NONE }, // staff list
|
||||
{ WWT_CHECKBOX, 1, 10, 299, 54, 65, 5282, STR_NONE }, // rct1 ride lights
|
||||
{ WWT_CHECKBOX, 1, 10, 299, 69, 80, 5283, STR_NONE }, // rct1 park lights
|
||||
|
|
@ -272,8 +272,8 @@ static rct_windowclass *window_themes_tab_classes[] = {
|
|||
};
|
||||
|
||||
static uint8 _selected_tab = 0;
|
||||
static sint16 _color_index_1 = -1;
|
||||
static sint8 _color_index_2 = -1;
|
||||
static sint16 _colour_index_1 = -1;
|
||||
static sint8 _colour_index_2 = -1;
|
||||
static const uint8 _row_height = 32;
|
||||
static const uint8 _button_offset_x = 220;
|
||||
static const uint8 _button_offset_y = 3;
|
||||
|
|
@ -338,7 +338,7 @@ void window_themes_open()
|
|||
(1 << WIDX_THEMES_MISC_TAB) |
|
||||
(1 << WIDX_THEMES_PROMPTS_TAB) |
|
||||
(1 << WIDX_THEMES_FEATURES_TAB) |
|
||||
(1 << WIDX_THEMES_COLORBTN_MASK) |
|
||||
(1 << WIDX_THEMES_COLOURBTN_MASK) |
|
||||
(1 << WIDX_THEMES_PRESETS) |
|
||||
(1 << WIDX_THEMES_PRESETS_DROPDOWN) |
|
||||
(1 << WIDX_THEMES_DUPLICATE_BUTTON) |
|
||||
|
|
@ -352,8 +352,8 @@ void window_themes_open()
|
|||
|
||||
window_init_scroll_widgets(window);
|
||||
window->list_information_type = 0;
|
||||
_color_index_1 = -1;
|
||||
_color_index_2 = -1;
|
||||
_colour_index_1 = -1;
|
||||
_colour_index_2 = -1;
|
||||
window->min_width = 320;
|
||||
window->min_height = 107;
|
||||
window->max_width = 320;
|
||||
|
|
@ -547,13 +547,13 @@ static void window_themes_dropdown(rct_window *w, int widgetIndex, int dropdownI
|
|||
switch (widgetIndex) {
|
||||
case WIDX_THEMES_LIST:
|
||||
if (dropdownIndex != -1) {
|
||||
rct_windowclass wc = get_window_class_tab_index(_color_index_1);
|
||||
uint8 colour = theme_get_colour(wc, _color_index_2);
|
||||
rct_windowclass wc = get_window_class_tab_index(_colour_index_1);
|
||||
uint8 colour = theme_get_colour(wc, _colour_index_2);
|
||||
colour = (colour & COLOUR_FLAG_TRANSLUCENT) | dropdownIndex;
|
||||
theme_set_colour(wc, _color_index_2, colour);
|
||||
theme_set_colour(wc, _colour_index_2, colour);
|
||||
window_invalidate_all();
|
||||
_color_index_1 = -1;
|
||||
_color_index_2 = -1;
|
||||
_colour_index_1 = -1;
|
||||
_colour_index_2 = -1;
|
||||
|
||||
// if (gCurrentTheme >= 2)
|
||||
// themes_save_preset(gCurrentTheme);
|
||||
|
|
@ -600,23 +600,23 @@ void window_themes_scrollmousedown(rct_window *w, int scrollIndex, int x, int y)
|
|||
{
|
||||
if (y / _row_height < get_colour_scheme_tab_count()) {
|
||||
int y2 = y % _row_height;
|
||||
_color_index_1 = y / _row_height;
|
||||
_color_index_2 = ((x - _button_offset_x) / 12);
|
||||
_colour_index_1 = y / _row_height;
|
||||
_colour_index_2 = ((x - _button_offset_x) / 12);
|
||||
|
||||
rct_windowclass wc = get_window_class_tab_index(_color_index_1);
|
||||
rct_windowclass wc = get_window_class_tab_index(_colour_index_1);
|
||||
int numColours = theme_desc_get_num_colours(wc);
|
||||
if (_color_index_2 < numColours) {
|
||||
if (_colour_index_2 < numColours) {
|
||||
if (x >= _button_offset_x && x < _button_offset_x + 12 * 6 && y2 >= _button_offset_y && y2 < _button_offset_y + 11) {
|
||||
if (theme_get_flags() & UITHEME_FLAG_PREDEFINED) {
|
||||
window_error_open(5241, 5256);
|
||||
} else {
|
||||
window_themes_widgets[WIDX_THEMES_COLORBTN_MASK].left = _button_offset_x + _color_index_2 * 12 + window_themes_widgets[WIDX_THEMES_LIST].left;
|
||||
window_themes_widgets[WIDX_THEMES_COLORBTN_MASK].top = _color_index_1 * _row_height + _button_offset_y - w->scrolls[0].v_top + window_themes_widgets[WIDX_THEMES_LIST].top;
|
||||
window_themes_widgets[WIDX_THEMES_COLORBTN_MASK].right = window_themes_widgets[WIDX_THEMES_COLORBTN_MASK].left + 12;
|
||||
window_themes_widgets[WIDX_THEMES_COLORBTN_MASK].bottom = window_themes_widgets[WIDX_THEMES_COLORBTN_MASK].top + 12;
|
||||
window_themes_widgets[WIDX_THEMES_COLOURBTN_MASK].left = _button_offset_x + _colour_index_2 * 12 + window_themes_widgets[WIDX_THEMES_LIST].left;
|
||||
window_themes_widgets[WIDX_THEMES_COLOURBTN_MASK].top = _colour_index_1 * _row_height + _button_offset_y - w->scrolls[0].v_top + window_themes_widgets[WIDX_THEMES_LIST].top;
|
||||
window_themes_widgets[WIDX_THEMES_COLOURBTN_MASK].right = window_themes_widgets[WIDX_THEMES_COLOURBTN_MASK].left + 12;
|
||||
window_themes_widgets[WIDX_THEMES_COLOURBTN_MASK].bottom = window_themes_widgets[WIDX_THEMES_COLOURBTN_MASK].top + 12;
|
||||
|
||||
uint8 colour = theme_get_colour(wc, _color_index_2);
|
||||
window_dropdown_show_colour(w, &(window_themes_widgets[WIDX_THEMES_COLORBTN_MASK]), w->colours[1], colour);
|
||||
uint8 colour = theme_get_colour(wc, _colour_index_2);
|
||||
window_dropdown_show_colour(w, &(window_themes_widgets[WIDX_THEMES_COLOURBTN_MASK]), w->colours[1], colour);
|
||||
widget_invalidate(w, WIDX_THEMES_LIST);
|
||||
}
|
||||
}
|
||||
|
|
@ -624,13 +624,13 @@ void window_themes_scrollmousedown(rct_window *w, int scrollIndex, int x, int y)
|
|||
if (theme_get_flags() & UITHEME_FLAG_PREDEFINED) {
|
||||
window_error_open(5241, 5256);
|
||||
} else {
|
||||
uint8 colour = theme_get_colour(wc, _color_index_2);
|
||||
uint8 colour = theme_get_colour(wc, _colour_index_2);
|
||||
if (colour & COLOUR_FLAG_TRANSLUCENT) {
|
||||
colour &= ~COLOUR_FLAG_TRANSLUCENT;
|
||||
} else {
|
||||
colour |= COLOUR_FLAG_TRANSLUCENT;
|
||||
}
|
||||
theme_set_colour(wc, _color_index_2, colour);
|
||||
theme_set_colour(wc, _colour_index_2, colour);
|
||||
window_invalidate_all();
|
||||
}
|
||||
}
|
||||
|
|
@ -695,8 +695,8 @@ void window_themes_invalidate(rct_window *w)
|
|||
w->pressed_widgets = pressed_widgets | (1 << widgetIndex);
|
||||
|
||||
if (window_find_by_class(WC_DROPDOWN) == NULL) {
|
||||
_color_index_1 = -1;
|
||||
_color_index_2 = -1;
|
||||
_colour_index_1 = -1;
|
||||
_colour_index_2 = -1;
|
||||
}
|
||||
|
||||
window_themes_widgets[WIDX_THEMES_BACKGROUND].right = w->width - 1;
|
||||
|
|
@ -833,7 +833,7 @@ void window_themes_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scroll
|
|||
|
||||
uint8 colour = theme_get_colour(wc, j);
|
||||
uint32 image = ((colour & ~COLOUR_FLAG_TRANSLUCENT) << 19) + 0x600013C3;
|
||||
if (i == _color_index_1 && j == _color_index_2) {
|
||||
if (i == _colour_index_1 && j == _colour_index_2) {
|
||||
image = ((colour & ~COLOUR_FLAG_TRANSLUCENT) << 19) + 0x600013C4;
|
||||
}
|
||||
gfx_draw_sprite(dpi, image, _button_offset_x + 12 * j, y + _button_offset_y, 0);
|
||||
|
|
|
|||
|
|
@ -1007,8 +1007,8 @@ void game_command_set_scenery_colour(int* eax, int* ebx, int* ecx, int* edx, int
|
|||
int y = *ecx;
|
||||
uint8 base_height = *edx;
|
||||
uint8 scenery_type = *edx >> 8;
|
||||
uint8 color1 = *ebp;
|
||||
uint8 color2 = *ebp >> 8;
|
||||
uint8 colour1 = *ebp;
|
||||
uint8 colour2 = *ebp >> 8;
|
||||
uint8 flags = *ebx & 0xFF;
|
||||
// Note this function is passed type.
|
||||
uint8 quadrant = ((*ebx >> 8) & 0xFF) >> 6;
|
||||
|
|
@ -1039,9 +1039,9 @@ void game_command_set_scenery_colour(int* eax, int* ebx, int* ecx, int* edx, int
|
|||
|
||||
if(flags & GAME_COMMAND_FLAG_APPLY){
|
||||
map_element->properties.scenery.colour_1 &= 0xE0;
|
||||
map_element->properties.scenery.colour_1 |= color1;
|
||||
map_element->properties.scenery.colour_1 |= colour1;
|
||||
map_element->properties.scenery.colour_2 &= 0xE0;
|
||||
map_element->properties.scenery.colour_2 |= color2;
|
||||
map_element->properties.scenery.colour_2 |= colour2;
|
||||
map_invalidate_tile_full(x, y);
|
||||
}
|
||||
|
||||
|
|
@ -1059,9 +1059,9 @@ void game_command_set_fence_colour(int* eax, int* ebx, int* ecx, int* edx, int*
|
|||
int y = *ecx;
|
||||
uint8 map_element_direction = *edx;
|
||||
uint8 base_height = *edx >> 8;
|
||||
uint8 color1 = *ebx >> 8;
|
||||
uint8 color2 = *ebp;
|
||||
uint8 color3 = *ebp >> 8;
|
||||
uint8 colour1 = *ebx >> 8;
|
||||
uint8 colour2 = *ebp;
|
||||
uint8 colour3 = *ebp >> 8;
|
||||
uint8 flags = *ebx & 0xFF;
|
||||
int z = base_height * 8;
|
||||
|
||||
|
|
@ -1093,14 +1093,14 @@ void game_command_set_fence_colour(int* eax, int* ebx, int* ecx, int* edx, int*
|
|||
if(flags & GAME_COMMAND_FLAG_APPLY){
|
||||
rct_scenery_entry* scenery_entry = g_wallSceneryEntries[map_element->properties.fence.type];
|
||||
map_element->properties.fence.item[1] &= 0xE0;
|
||||
map_element->properties.fence.item[1] |= color1;
|
||||
map_element->properties.fence.item[1] |= colour1;
|
||||
map_element->properties.fence.item[1] &= 0x1F;
|
||||
map_element->flags &= 0x9F;
|
||||
map_element->properties.fence.item[1] |= (color2 & 0x7) * 32;
|
||||
map_element->flags |= (color2 & 0x18) * 4;
|
||||
map_element->properties.fence.item[1] |= (colour2 & 0x7) * 32;
|
||||
map_element->flags |= (colour2 & 0x18) * 4;
|
||||
|
||||
if(scenery_entry->wall.flags & 0x80){
|
||||
map_element->properties.fence.item[0] = color3;
|
||||
map_element->properties.fence.item[0] = colour3;
|
||||
}
|
||||
map_invalidate_tile_zoom1(x, y, z, z + 72);
|
||||
}
|
||||
|
|
@ -1121,8 +1121,8 @@ void game_command_set_large_scenery_colour(int* eax, int* ebx, int* ecx, int* ed
|
|||
uint8 flags = *ebx & 0xFF;
|
||||
uint8 base_height = *edx;
|
||||
uint8 tileIndex = *edx >> 8;
|
||||
uint8 color1 = *ebp;
|
||||
uint8 color2 = *ebp >> 8;
|
||||
uint8 colour1 = *ebp;
|
||||
uint8 colour2 = *ebp >> 8;
|
||||
int z = map_element_height(x, y);
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_COMMAND_MAP_X, uint16) = x + 16;
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_COMMAND_MAP_Y, uint16) = y + 16;
|
||||
|
|
@ -1182,9 +1182,9 @@ void game_command_set_large_scenery_colour(int* eax, int* ebx, int* ecx, int* ed
|
|||
i);
|
||||
|
||||
mapElement->properties.scenerymultiple.colour[0] &= 0xE0;
|
||||
mapElement->properties.scenerymultiple.colour[0] |= color1;
|
||||
mapElement->properties.scenerymultiple.colour[0] |= colour1;
|
||||
mapElement->properties.scenerymultiple.colour[1] &= 0xE0;
|
||||
mapElement->properties.scenerymultiple.colour[1] |= color2;
|
||||
mapElement->properties.scenerymultiple.colour[1] |= colour2;
|
||||
|
||||
map_invalidate_tile_full(currentTile.x, currentTile.y);
|
||||
}
|
||||
|
|
@ -1203,7 +1203,7 @@ void game_command_set_banner_colour(int* eax, int* ebx, int* ecx, int* edx, int*
|
|||
int y = *ecx;
|
||||
uint8 base_height = *edx;
|
||||
uint8 banner_position = *edx >> 8;
|
||||
uint8 color = *ebp;
|
||||
uint8 colour = *ebp;
|
||||
int z = (base_height * 8);
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_COMMAND_MAP_X, uint16) = x + 16;
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_COMMAND_MAP_Y, uint16) = y + 16;
|
||||
|
|
@ -1240,7 +1240,7 @@ void game_command_set_banner_colour(int* eax, int* ebx, int* ecx, int* edx, int*
|
|||
if(window){
|
||||
window_invalidate(window);
|
||||
}
|
||||
gBanners[map_element->properties.banner.index].colour = color;
|
||||
gBanners[map_element->properties.banner.index].colour = colour;
|
||||
map_invalidate_tile_zoom1(x, y, z, z + 32);
|
||||
}
|
||||
|
||||
|
|
@ -2849,13 +2849,13 @@ void game_command_place_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi
|
|||
RCT2_GLOBAL(RCT2_ADDRESS_NEXT_EXPENDITURE_TYPE, uint8) = RCT_EXPENDITURE_TYPE_LANDSCAPING * 4;
|
||||
int x = (uint16)*eax;
|
||||
int y = (uint16)*ecx;
|
||||
uint8 color2 = *edi >> 16;
|
||||
uint8 colour2 = *edi >> 16;
|
||||
uint8 rotation = *edi;
|
||||
int z = *ebp;
|
||||
uint8 scenery_type = *ebx >> 8;
|
||||
uint8 flags = *ebx & 0xFF;
|
||||
uint8 quadrant = *edx;
|
||||
uint8 color1 = *edx >> 8;
|
||||
uint8 colour1 = *edx >> 8;
|
||||
RCT2_GLOBAL(0x00F64F26, money32) = 0;
|
||||
int F64F1D = 0;
|
||||
int F64EC8 = z;
|
||||
|
|
@ -2996,8 +2996,8 @@ void game_command_place_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi
|
|||
new_map_element->type = type;
|
||||
new_map_element->properties.scenery.type = scenery_type;
|
||||
new_map_element->properties.scenery.age = 0;
|
||||
new_map_element->properties.scenery.colour_1 = color1;
|
||||
new_map_element->properties.scenery.colour_2 = color2;
|
||||
new_map_element->properties.scenery.colour_1 = colour1;
|
||||
new_map_element->properties.scenery.colour_2 = colour2;
|
||||
new_map_element->clearance_height = new_map_element->base_height + ((scenery_entry->small_scenery.height + 7) / 8);
|
||||
if(z != 0){
|
||||
new_map_element->properties.scenery.colour_1 |= 0x20;
|
||||
|
|
@ -3491,8 +3491,8 @@ void game_command_place_large_scenery(int* eax, int* ebx, int* ecx, int* edx, in
|
|||
int x = (sint16)*eax;
|
||||
int y = (sint16)*ecx;
|
||||
int z = (sint16)*ebp;
|
||||
uint8 color1 = *edx;
|
||||
uint8 color2 = *edx >> 8;
|
||||
uint8 colour1 = *edx;
|
||||
uint8 colour2 = *edx >> 8;
|
||||
uint8 flags = *ebx;
|
||||
uint8 rotation = *ebx >> 8;
|
||||
uint8 entry_index = *edi;
|
||||
|
|
@ -3684,8 +3684,8 @@ void game_command_place_large_scenery(int* eax, int* ebx, int* ecx, int* edx, in
|
|||
(tile_num << 10) |
|
||||
entry_index;
|
||||
|
||||
new_map_element->properties.scenerymultiple.colour[0] = color1;
|
||||
new_map_element->properties.scenerymultiple.colour[1] = color2;
|
||||
new_map_element->properties.scenerymultiple.colour[0] = colour1;
|
||||
new_map_element->properties.scenerymultiple.colour[1] = colour2;
|
||||
|
||||
if (banner_id != 0xFF) {
|
||||
new_map_element->type |= banner_id & 0xC0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue