mirror of https://github.com/OpenRCT2/OpenRCT2.git
Make more window variables and functions static
This commit is contained in:
Marijn van der Werf
Michał Janiszewski
parent
4d90940d21
commit
28c78faa57
|
|
@ -760,7 +760,6 @@ void window_editor_scenario_options_open();
|
|||
void window_editor_objective_options_open();
|
||||
|
||||
void window_view_clipping_open();
|
||||
void window_view_clipping_close();
|
||||
|
||||
void window_guest_list_init_vars_a();
|
||||
void window_guest_list_init_vars_b();
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ static const rct_string_id BannerColouredTextFormats[] = {
|
|||
STR_TEXT_COLOR_PALESILVER,
|
||||
};
|
||||
|
||||
rct_widget window_banner_widgets[] = {
|
||||
static rct_widget window_banner_widgets[] = {
|
||||
{ WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, 0xFFFFFFFF, STR_NONE}, // panel / background
|
||||
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_BANNER_WINDOW_TITLE, 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
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ enum WINDOW_CLEAR_SCENERY_WIDGET_IDX {
|
|||
|
||||
validate_global_widx(WC_CLEAR_SCENERY, WIDX_PREVIEW);
|
||||
|
||||
rct_widget window_clear_scenery_widgets[] = {
|
||||
static rct_widget window_clear_scenery_widgets[] = {
|
||||
{ WWT_FRAME, 0, 0, 97, 0, 93, 0xFFFFFFFF, STR_NONE }, // panel / background
|
||||
{ WWT_CAPTION, 0, 1, 96, 1, 14, STR_CLEAR_SCENERY, STR_WINDOW_TITLE_TIP }, // title bar
|
||||
{ WWT_CLOSEBOX, 0, 85, 95, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button
|
||||
|
|
|
|||
|
|
@ -46,11 +46,11 @@ static rct_widget window_dropdown_widgets[] = {
|
|||
{ WIDGETS_END },
|
||||
};
|
||||
|
||||
sint32 _dropdown_num_columns;
|
||||
sint32 _dropdown_num_rows;
|
||||
sint32 _dropdown_item_width;
|
||||
sint32 _dropdown_item_height;
|
||||
bool _dropdown_list_vertically;
|
||||
static sint32 _dropdown_num_columns;
|
||||
static sint32 _dropdown_num_rows;
|
||||
static sint32 _dropdown_item_width;
|
||||
static sint32 _dropdown_item_height;
|
||||
static bool _dropdown_list_vertically;
|
||||
|
||||
sint32 gDropdownNumItems;
|
||||
rct_string_id gDropdownItemsFormat[DROPDOWN_ITEMS_MAX_SIZE];
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ static rct_window_event_list window_editor_inventions_list_drag_events = {
|
|||
|
||||
#pragma endregion
|
||||
|
||||
rct_research_item *_editorInventionsListDraggedItem;
|
||||
static rct_research_item *_editorInventionsListDraggedItem;
|
||||
|
||||
static const rct_string_id EditorInventionsResearchCategories[] = {
|
||||
STR_RESEARCH_NEW_TRANSPORT_RIDES,
|
||||
|
|
|
|||
|
|
@ -60,11 +60,10 @@ enum {
|
|||
FILTER_ALL = FILTER_RIDES | FILTER_RCT2 | FILTER_WW | FILTER_TT | FILTER_CUSTOM | FILTER_SELECTED | FILTER_NONSELECTED,
|
||||
};
|
||||
|
||||
uint32 _filter_flags;
|
||||
uint16 _filter_object_counts[11];
|
||||
uint8 _filter_ride_tab;
|
||||
static uint32 _filter_flags;
|
||||
static uint16 _filter_object_counts[11];
|
||||
|
||||
char _filter_string[41];
|
||||
static char _filter_string[41];
|
||||
|
||||
#define _FILTER_ALL ((_filter_flags & FILTER_ALL) == FILTER_ALL)
|
||||
#define _FILTER_RCT2 (_filter_flags & FILTER_RCT2)
|
||||
|
|
|
|||
|
|
@ -191,7 +191,7 @@ const uint8 default_path_slope[] = {
|
|||
};
|
||||
|
||||
/** rct2: 0x0098D7E0 */
|
||||
uint8 footpath_construction_preview_images[][4] = {
|
||||
static uint8 footpath_construction_preview_images[][4] = {
|
||||
{5, 10, 5, 10}, // Flat
|
||||
{16, 17, 18, 19}, // Upwards
|
||||
{18, 19, 16, 17}, // Downwards
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ enum WINDOW_GAME_BOTTOM_TOOLBAR_WIDGET_IDX {
|
|||
// Left panel size was also increased for symmetry.
|
||||
#define WIDTH_MOD 22
|
||||
|
||||
rct_widget window_game_bottom_toolbar_widgets[] = {
|
||||
static rct_widget window_game_bottom_toolbar_widgets[] = {
|
||||
{ WWT_IMGBTN, 0, 0x0000, 0x0077+WIDTH_MOD, 0, 33, 0xFFFFFFFF, STR_NONE }, // Left outset panel
|
||||
{ WWT_IMGBTN, 0, 0x0002, 0x0075+WIDTH_MOD, 2, 31, 0xFFFFFFFF, STR_NONE }, // Left inset panel
|
||||
{ WWT_FLATBTN, 0, 0x0002, 0x0075+WIDTH_MOD, 1, 12, 0xFFFFFFFF, STR_PROFIT_PER_WEEK_AND_PARK_VALUE_TIP }, // Money window
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ enum WINDOW_GUEST_WIDGET_IDX {
|
|||
|
||||
validate_global_widx(WC_PEEP, WIDX_ACTION_LBL);
|
||||
|
||||
rct_widget window_guest_overview_widgets[] = {
|
||||
static rct_widget window_guest_overview_widgets[] = {
|
||||
{WWT_FRAME, 0, 0, 191, 0, 156, 0xFFFFFFFF, STR_NONE}, // Panel / Background
|
||||
{WWT_CAPTION, 0, 1, 190, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP}, // Title
|
||||
{WWT_CLOSEBOX, 0, 179, 189, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP}, // Close x button
|
||||
|
|
@ -87,7 +87,7 @@ rct_widget window_guest_overview_widgets[] = {
|
|||
{ WIDGETS_END },
|
||||
};
|
||||
|
||||
rct_widget window_guest_stats_widgets[] = {
|
||||
static rct_widget window_guest_stats_widgets[] = {
|
||||
{WWT_FRAME, 0, 0, 191, 0, 156, STR_NONE, STR_NONE},
|
||||
{WWT_CAPTION, 0, 1, 190, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP},
|
||||
{WWT_CLOSEBOX, 0, 179, 189, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP},
|
||||
|
|
@ -101,7 +101,7 @@ rct_widget window_guest_stats_widgets[] = {
|
|||
{WIDGETS_END},
|
||||
};
|
||||
|
||||
rct_widget window_guest_rides_widgets[] = {
|
||||
static rct_widget window_guest_rides_widgets[] = {
|
||||
{WWT_FRAME, 0, 0, 191, 0, 156, STR_NONE, STR_NONE},
|
||||
{WWT_CAPTION, 0, 1, 190, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP},
|
||||
{WWT_CLOSEBOX, 0, 179, 189, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP},
|
||||
|
|
@ -116,7 +116,7 @@ rct_widget window_guest_rides_widgets[] = {
|
|||
{WIDGETS_END},
|
||||
};
|
||||
|
||||
rct_widget window_guest_finance_widgets[] = {
|
||||
static rct_widget window_guest_finance_widgets[] = {
|
||||
{WWT_FRAME, 0, 0, 191, 0, 156, STR_NONE, STR_NONE},
|
||||
{WWT_CAPTION, 0, 1, 190, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP},
|
||||
{WWT_CLOSEBOX, 0, 179, 189, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP},
|
||||
|
|
@ -130,7 +130,7 @@ rct_widget window_guest_finance_widgets[] = {
|
|||
{WIDGETS_END},
|
||||
};
|
||||
|
||||
rct_widget window_guest_thoughts_widgets[] = {
|
||||
static rct_widget window_guest_thoughts_widgets[] = {
|
||||
{WWT_FRAME, 0, 0, 191, 0, 156, STR_NONE, STR_NONE},
|
||||
{WWT_CAPTION, 0, 1, 190, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP},
|
||||
{WWT_CLOSEBOX, 0, 179, 189, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP},
|
||||
|
|
@ -144,7 +144,7 @@ rct_widget window_guest_thoughts_widgets[] = {
|
|||
{WIDGETS_END},
|
||||
};
|
||||
|
||||
rct_widget window_guest_inventory_widgets[] = {
|
||||
static rct_widget window_guest_inventory_widgets[] = {
|
||||
{WWT_FRAME, 0, 0, 191, 0, 156, STR_NONE, STR_NONE},
|
||||
{WWT_CAPTION, 0, 1, 190, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP},
|
||||
{WWT_CLOSEBOX, 0, 179, 189, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP},
|
||||
|
|
@ -159,7 +159,7 @@ rct_widget window_guest_inventory_widgets[] = {
|
|||
};
|
||||
|
||||
// 0x981D0C
|
||||
rct_widget *window_guest_page_widgets[] = {
|
||||
static rct_widget *window_guest_page_widgets[] = {
|
||||
window_guest_overview_widgets,
|
||||
window_guest_stats_widgets,
|
||||
window_guest_rides_widgets,
|
||||
|
|
@ -168,54 +168,54 @@ rct_widget *window_guest_page_widgets[] = {
|
|||
window_guest_inventory_widgets
|
||||
};
|
||||
|
||||
void window_guest_set_page(rct_window* w, sint32 page);
|
||||
void window_guest_disable_widgets(rct_window* w);
|
||||
void window_guest_viewport_init(rct_window* w);
|
||||
static void window_guest_set_page(rct_window* w, sint32 page);
|
||||
static void window_guest_disable_widgets(rct_window* w);
|
||||
static void window_guest_viewport_init(rct_window* w);
|
||||
|
||||
void window_guest_overview_close(rct_window *w);
|
||||
void window_guest_overview_resize(rct_window *w);
|
||||
void window_guest_overview_mouse_up(rct_window *w, rct_widgetindex widgetIndex);
|
||||
void window_guest_overview_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
void window_guest_overview_invalidate(rct_window *w);
|
||||
void window_guest_overview_viewport_rotate(rct_window *w);
|
||||
void window_guest_overview_update(rct_window* w);
|
||||
void window_guest_overview_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text);
|
||||
void window_guest_overview_tool_update(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
|
||||
void window_guest_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
|
||||
void window_guest_overview_tool_abort(rct_window *w, rct_widgetindex widgetIndex);
|
||||
static void window_guest_overview_close(rct_window *w);
|
||||
static void window_guest_overview_resize(rct_window *w);
|
||||
static void window_guest_overview_mouse_up(rct_window *w, rct_widgetindex widgetIndex);
|
||||
static void window_guest_overview_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
static void window_guest_overview_invalidate(rct_window *w);
|
||||
static void window_guest_overview_viewport_rotate(rct_window *w);
|
||||
static void window_guest_overview_update(rct_window* w);
|
||||
static void window_guest_overview_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text);
|
||||
static void window_guest_overview_tool_update(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
|
||||
static void window_guest_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
|
||||
static void window_guest_overview_tool_abort(rct_window *w, rct_widgetindex widgetIndex);
|
||||
|
||||
void window_guest_mouse_up(rct_window *w, rct_widgetindex widgetIndex);
|
||||
void window_guest_unknown_05(rct_window *w);
|
||||
static void window_guest_mouse_up(rct_window *w, rct_widgetindex widgetIndex);
|
||||
static void window_guest_unknown_05(rct_window *w);
|
||||
|
||||
void window_guest_stats_resize(rct_window *w);
|
||||
void window_guest_stats_update(rct_window *w);
|
||||
void window_guest_stats_invalidate(rct_window *w);
|
||||
void window_guest_stats_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
static void window_guest_stats_resize(rct_window *w);
|
||||
static void window_guest_stats_update(rct_window *w);
|
||||
static void window_guest_stats_invalidate(rct_window *w);
|
||||
static void window_guest_stats_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
|
||||
void window_guest_rides_resize(rct_window *w);
|
||||
void window_guest_rides_update(rct_window *w);
|
||||
void window_guest_rides_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
|
||||
void window_guest_rides_scroll_get_size(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
|
||||
void window_guest_rides_scroll_mouse_down(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
|
||||
void window_guest_rides_scroll_mouse_over(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
|
||||
void window_guest_rides_invalidate(rct_window *w);
|
||||
void window_guest_rides_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
void window_guest_rides_scroll_paint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
|
||||
static void window_guest_rides_resize(rct_window *w);
|
||||
static void window_guest_rides_update(rct_window *w);
|
||||
static void window_guest_rides_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
|
||||
static void window_guest_rides_scroll_get_size(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height);
|
||||
static void window_guest_rides_scroll_mouse_down(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
|
||||
static void window_guest_rides_scroll_mouse_over(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y);
|
||||
static void window_guest_rides_invalidate(rct_window *w);
|
||||
static void window_guest_rides_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
static void window_guest_rides_scroll_paint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex);
|
||||
|
||||
void window_guest_finance_resize(rct_window *w);
|
||||
void window_guest_finance_update(rct_window *w);
|
||||
void window_guest_finance_invalidate(rct_window *w);
|
||||
void window_guest_finance_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
static void window_guest_finance_resize(rct_window *w);
|
||||
static void window_guest_finance_update(rct_window *w);
|
||||
static void window_guest_finance_invalidate(rct_window *w);
|
||||
static void window_guest_finance_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
|
||||
void window_guest_thoughts_resize(rct_window *w);
|
||||
void window_guest_thoughts_update(rct_window *w);
|
||||
void window_guest_thoughts_invalidate(rct_window *w);
|
||||
void window_guest_thoughts_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
static void window_guest_thoughts_resize(rct_window *w);
|
||||
static void window_guest_thoughts_update(rct_window *w);
|
||||
static void window_guest_thoughts_invalidate(rct_window *w);
|
||||
static void window_guest_thoughts_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
|
||||
void window_guest_inventory_resize(rct_window *w);
|
||||
void window_guest_inventory_update(rct_window *w);
|
||||
void window_guest_inventory_invalidate(rct_window *w);
|
||||
void window_guest_inventory_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
static void window_guest_inventory_resize(rct_window *w);
|
||||
static void window_guest_inventory_update(rct_window *w);
|
||||
static void window_guest_inventory_invalidate(rct_window *w);
|
||||
static void window_guest_inventory_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
|
||||
static rct_window_event_list window_guest_overview_events = {
|
||||
window_guest_overview_close,
|
||||
|
|
|
|||
|
|
@ -98,8 +98,8 @@ static rct_window_event_list window_land_events = {
|
|||
NULL
|
||||
};
|
||||
|
||||
sint32 _selectedFloorTexture;
|
||||
sint32 _selectedWallTexture;
|
||||
static sint32 _selectedFloorTexture;
|
||||
static sint32 _selectedWallTexture;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
|
|||
|
|
@ -128,14 +128,14 @@ typedef struct loadsave_list_item {
|
|||
|
||||
static loadsave_callback _loadSaveCallback;
|
||||
|
||||
sint32 _listItemsCount = 0;
|
||||
loadsave_list_item *_listItems = NULL;
|
||||
char _directory[MAX_PATH];
|
||||
char _shortenedDirectory[MAX_PATH];
|
||||
static sint32 _listItemsCount = 0;
|
||||
static loadsave_list_item *_listItems = NULL;
|
||||
static char _directory[MAX_PATH];
|
||||
static char _shortenedDirectory[MAX_PATH];
|
||||
static char _parentDirectory[MAX_PATH];
|
||||
char _extension[32];
|
||||
char _defaultName[MAX_PATH];
|
||||
sint32 _type;
|
||||
static char _extension[32];
|
||||
static char _defaultName[MAX_PATH];
|
||||
static sint32 _type;
|
||||
|
||||
static void window_loadsave_populate_list(rct_window *w, sint32 includeNewItem, const char *directory, const char *extension);
|
||||
static void window_loadsave_select(rct_window *w, const char *path);
|
||||
|
|
|
|||
|
|
@ -83,14 +83,14 @@ rct_widget *window_player_page_widgets[] = {
|
|||
|
||||
#pragma region Events
|
||||
|
||||
void window_player_overview_close(rct_window *w);
|
||||
void window_player_overview_mouse_up(rct_window *w, rct_widgetindex widgetIndex);
|
||||
void window_player_overview_resize(rct_window *w);
|
||||
void window_player_overview_mouse_down(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
|
||||
void window_player_overview_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
|
||||
void window_player_overview_update(rct_window* w);
|
||||
void window_player_overview_invalidate(rct_window *w);
|
||||
void window_player_overview_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
static void window_player_overview_close(rct_window *w);
|
||||
static void window_player_overview_mouse_up(rct_window *w, rct_widgetindex widgetIndex);
|
||||
static void window_player_overview_resize(rct_window *w);
|
||||
static void window_player_overview_mouse_down(rct_window *w, rct_widgetindex widgetIndex, rct_widget *widget);
|
||||
static void window_player_overview_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
|
||||
static void window_player_overview_update(rct_window* w);
|
||||
static void window_player_overview_invalidate(rct_window *w);
|
||||
static void window_player_overview_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
|
||||
static rct_window_event_list window_player_overview_events = {
|
||||
window_player_overview_close,
|
||||
|
|
@ -123,12 +123,12 @@ static rct_window_event_list window_player_overview_events = {
|
|||
NULL
|
||||
};
|
||||
|
||||
void window_player_statistics_close(rct_window *w);
|
||||
void window_player_statistics_mouse_up(rct_window *w, rct_widgetindex widgetIndex);
|
||||
void window_player_statistics_resize(rct_window *w);
|
||||
void window_player_statistics_update(rct_window* w);
|
||||
void window_player_statistics_invalidate(rct_window *w);
|
||||
void window_player_statistics_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
static void window_player_statistics_close(rct_window *w);
|
||||
static void window_player_statistics_mouse_up(rct_window *w, rct_widgetindex widgetIndex);
|
||||
static void window_player_statistics_resize(rct_window *w);
|
||||
static void window_player_statistics_update(rct_window* w);
|
||||
static void window_player_statistics_invalidate(rct_window *w);
|
||||
static void window_player_statistics_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
|
||||
static rct_window_event_list window_player_statistics_events = {
|
||||
window_player_statistics_close,
|
||||
|
|
|
|||
|
|
@ -2959,7 +2959,7 @@ typedef struct rct_vehichle_paintinfo {
|
|||
sint32 tertiary_colour;
|
||||
} rct_vehichle_paintinfo;
|
||||
|
||||
rct_vehichle_paintinfo _sprites_to_draw[144];
|
||||
static rct_vehichle_paintinfo _sprites_to_draw[144];
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ enum WINDOW_STAFF_WIDGET_IDX {
|
|||
|
||||
validate_global_widx(WC_PEEP, WIDX_PATROL);
|
||||
|
||||
rct_widget window_staff_overview_widgets[] = {
|
||||
static rct_widget window_staff_overview_widgets[] = {
|
||||
{ WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, 0xFFFFFFFF, STR_NONE }, // Panel / Background
|
||||
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP }, // Title
|
||||
{ WWT_CLOSEBOX, 0, WW - 13, WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // Close x button
|
||||
|
|
@ -86,7 +86,7 @@ rct_widget window_staff_overview_widgets[] = {
|
|||
};
|
||||
|
||||
//0x9AF910
|
||||
rct_widget window_staff_options_widgets[] = {
|
||||
static rct_widget window_staff_options_widgets[] = {
|
||||
{ WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, 0xFFFFFFFF, STR_NONE }, // Panel / Background
|
||||
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP }, // Title
|
||||
{ WWT_CLOSEBOX, 0, WW - 13, WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // Close x button
|
||||
|
|
@ -105,7 +105,7 @@ rct_widget window_staff_options_widgets[] = {
|
|||
};
|
||||
|
||||
//0x9AF9F4
|
||||
rct_widget window_staff_stats_widgets[] = {
|
||||
static rct_widget window_staff_stats_widgets[] = {
|
||||
{ WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, 0xFFFFFFFF, STR_NONE }, // Panel / Background
|
||||
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP }, // Title
|
||||
{ WWT_CLOSEBOX, 0, WW - 13, WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // Close x button
|
||||
|
|
@ -117,46 +117,46 @@ rct_widget window_staff_stats_widgets[] = {
|
|||
{ WIDGETS_END },
|
||||
};
|
||||
|
||||
rct_widget *window_staff_page_widgets[] = {
|
||||
static rct_widget *window_staff_page_widgets[] = {
|
||||
window_staff_overview_widgets,
|
||||
window_staff_options_widgets,
|
||||
window_staff_stats_widgets
|
||||
};
|
||||
|
||||
void window_staff_set_page(rct_window* w, sint32 page);
|
||||
void window_staff_disable_widgets(rct_window* w);
|
||||
void window_staff_unknown_05(rct_window *w);
|
||||
void window_staff_viewport_init(rct_window* w);
|
||||
static void window_staff_set_page(rct_window* w, sint32 page);
|
||||
static void window_staff_disable_widgets(rct_window* w);
|
||||
static void window_staff_unknown_05(rct_window *w);
|
||||
static void window_staff_viewport_init(rct_window* w);
|
||||
|
||||
void window_staff_overview_close(rct_window *w);
|
||||
void window_staff_overview_mouseup(rct_window *w, rct_widgetindex widgetIndex);
|
||||
void window_staff_overview_resize(rct_window *w);
|
||||
void window_staff_overview_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
|
||||
void window_staff_overview_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
|
||||
void window_staff_overview_update(rct_window* w);
|
||||
void window_staff_overview_invalidate(rct_window *w);
|
||||
void window_staff_overview_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
void window_staff_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi);
|
||||
void window_staff_overview_tool_update(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
|
||||
void window_staff_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
|
||||
void window_staff_overview_tool_abort(rct_window *w, rct_widgetindex widgetIndex);
|
||||
void window_staff_overview_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text);
|
||||
void window_staff_overview_viewport_rotate(rct_window *w);
|
||||
static void window_staff_overview_close(rct_window *w);
|
||||
static void window_staff_overview_mouseup(rct_window *w, rct_widgetindex widgetIndex);
|
||||
static void window_staff_overview_resize(rct_window *w);
|
||||
static void window_staff_overview_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
|
||||
static void window_staff_overview_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
|
||||
static void window_staff_overview_update(rct_window* w);
|
||||
static void window_staff_overview_invalidate(rct_window *w);
|
||||
static void window_staff_overview_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
static void window_staff_overview_tab_paint(rct_window* w, rct_drawpixelinfo* dpi);
|
||||
static void window_staff_overview_tool_update(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
|
||||
static void window_staff_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y);
|
||||
static void window_staff_overview_tool_abort(rct_window *w, rct_widgetindex widgetIndex);
|
||||
static void window_staff_overview_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text);
|
||||
static void window_staff_overview_viewport_rotate(rct_window *w);
|
||||
|
||||
void window_staff_options_mouseup(rct_window *w, rct_widgetindex widgetIndex);
|
||||
void window_staff_options_update(rct_window* w);
|
||||
void window_staff_options_invalidate(rct_window *w);
|
||||
void window_staff_options_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
void window_staff_options_tab_paint(rct_window* w, rct_drawpixelinfo* dpi);
|
||||
void window_staff_options_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
|
||||
void window_staff_options_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
|
||||
static void window_staff_options_mouseup(rct_window *w, rct_widgetindex widgetIndex);
|
||||
static void window_staff_options_update(rct_window* w);
|
||||
static void window_staff_options_invalidate(rct_window *w);
|
||||
static void window_staff_options_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
static void window_staff_options_tab_paint(rct_window* w, rct_drawpixelinfo* dpi);
|
||||
static void window_staff_options_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget);
|
||||
static void window_staff_options_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex);
|
||||
|
||||
void window_staff_stats_mouseup(rct_window *w, rct_widgetindex widgetIndex);
|
||||
void window_staff_stats_resize(rct_window *w);
|
||||
void window_staff_stats_update(rct_window* w);
|
||||
void window_staff_stats_invalidate(rct_window *w);
|
||||
void window_staff_stats_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
void window_staff_stats_tab_paint(rct_window* w, rct_drawpixelinfo* dpi);
|
||||
static void window_staff_stats_mouseup(rct_window *w, rct_widgetindex widgetIndex);
|
||||
static void window_staff_stats_resize(rct_window *w);
|
||||
static void window_staff_stats_update(rct_window* w);
|
||||
static void window_staff_stats_invalidate(rct_window *w);
|
||||
static void window_staff_stats_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
static void window_staff_stats_tab_paint(rct_window* w, rct_drawpixelinfo* dpi);
|
||||
|
||||
void window_staff_set_colours();
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ enum {
|
|||
WINDOW_STAFF_LIST_TAB_ENTERTAINERS
|
||||
};
|
||||
|
||||
bool _quick_fire_mode = false;
|
||||
static bool _quick_fire_mode = false;
|
||||
|
||||
static void window_staff_list_close(rct_window *w);
|
||||
static void window_staff_list_mouseup(rct_window *w, rct_widgetindex widgetIndex);
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ char text_input[TEXT_INPUT_SIZE] = { 0 };
|
|||
rct_windowclass calling_class = 0;
|
||||
rct_windownumber calling_number = 0;
|
||||
sint32 calling_widget = 0;
|
||||
sint32 _maxInputLength;
|
||||
static sint32 _maxInputLength;
|
||||
|
||||
void window_text_input_open(rct_window* call_w, rct_widgetindex call_widget, rct_string_id title, rct_string_id description, rct_string_id existing_text, uintptr_t existing_args, sint32 maxLength)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -263,21 +263,21 @@ static rct_window_event_list window_top_toolbar_events = {
|
|||
NULL
|
||||
};
|
||||
|
||||
void top_toolbar_init_view_menu(rct_window *window, rct_widget *widget);
|
||||
void top_toolbar_view_menu_dropdown(sint16 dropdownIndex);
|
||||
void top_toolbar_init_fastforward_menu(rct_window *window, rct_widget *widget);
|
||||
void top_toolbar_fastforward_menu_dropdown(sint16 dropdownIndex);
|
||||
void top_toolbar_init_rotate_menu(rct_window *window, rct_widget *widget);
|
||||
void top_toolbar_rotate_menu_dropdown(sint16 dropdownIndex);
|
||||
void top_toolbar_init_debug_menu(rct_window *window, rct_widget *widget);
|
||||
void top_toolbar_debug_menu_dropdown(sint16 dropdownIndex);
|
||||
void top_toolbar_init_network_menu(rct_window *window, rct_widget *widget);
|
||||
void top_toolbar_network_menu_dropdown(sint16 dropdownIndex);
|
||||
static void top_toolbar_init_view_menu(rct_window *window, rct_widget *widget);
|
||||
static void top_toolbar_view_menu_dropdown(sint16 dropdownIndex);
|
||||
static void top_toolbar_init_fastforward_menu(rct_window *window, rct_widget *widget);
|
||||
static void top_toolbar_fastforward_menu_dropdown(sint16 dropdownIndex);
|
||||
static void top_toolbar_init_rotate_menu(rct_window *window, rct_widget *widget);
|
||||
static void top_toolbar_rotate_menu_dropdown(sint16 dropdownIndex);
|
||||
static void top_toolbar_init_debug_menu(rct_window *window, rct_widget *widget);
|
||||
static void top_toolbar_debug_menu_dropdown(sint16 dropdownIndex);
|
||||
static void top_toolbar_init_network_menu(rct_window *window, rct_widget *widget);
|
||||
static void top_toolbar_network_menu_dropdown(sint16 dropdownIndex);
|
||||
|
||||
void toggle_footpath_window();
|
||||
void toggle_land_window(rct_window *topToolbar, rct_widgetindex widgetIndex);
|
||||
void toggle_clear_scenery_window(rct_window *topToolbar, rct_widgetindex widgetIndex);
|
||||
void toggle_water_window(rct_window *topToolbar, rct_widgetindex widgetIndex);
|
||||
static void toggle_footpath_window();
|
||||
static void toggle_land_window(rct_window *topToolbar, rct_widgetindex widgetIndex);
|
||||
static void toggle_clear_scenery_window(rct_window *topToolbar, rct_widgetindex widgetIndex);
|
||||
static void toggle_water_window(rct_window *topToolbar, rct_widgetindex widgetIndex);
|
||||
|
||||
money32 selection_lower_land(uint8 flags);
|
||||
money32 selection_raise_land(uint8 flags);
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ DISPLAY_TYPE gClipHeightDisplayType = DISPLAY_TYPE::DISPLAY_UNITS;
|
|||
#define WW 160
|
||||
#define WH 70
|
||||
|
||||
rct_widget window_view_clipping_widgets[] = {
|
||||
static rct_widget window_view_clipping_widgets[] = {
|
||||
{ WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, STR_NONE, STR_NONE }, // panel / background
|
||||
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_VIEW_CLIPPING_TITLE, 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
|
||||
|
|
@ -68,6 +68,7 @@ static void window_view_clipping_update(rct_window *w);
|
|||
static void window_view_clipping_invalidate(rct_window *w);
|
||||
static void window_view_clipping_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
static void window_view_clipping_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height);
|
||||
static void window_view_clipping_close();
|
||||
|
||||
static rct_window_event_list window_view_clipping_events = {
|
||||
window_view_clipping_close_button,
|
||||
|
|
@ -154,7 +155,7 @@ static void _window_view_clipping_open()
|
|||
window_invalidate(window);
|
||||
}
|
||||
|
||||
void window_view_clipping_close()
|
||||
static void window_view_clipping_close()
|
||||
{
|
||||
// Turn off view clipping when the window is closed.
|
||||
rct_window *mainWindow = window_get_main();
|
||||
|
|
|
|||
Loading…
Reference in New Issue