diff --git a/src/config.c b/src/config.c index 09a67742ab..0d7eb2a073 100644 --- a/src/config.c +++ b/src/config.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include "addresses.h" #include "config.h" diff --git a/src/gfx.c b/src/gfx.c index 30e781f5e3..fd0fdaa575 100644 --- a/src/gfx.c +++ b/src/gfx.c @@ -20,6 +20,8 @@ #include #include +#include +#include #include #include "addresses.h" #include "gfx.h" diff --git a/src/news_item.c b/src/news_item.c index 083ef02f58..5cc8083781 100644 --- a/src/news_item.c +++ b/src/news_item.c @@ -18,6 +18,7 @@ * along with this program. If not, see . *****************************************************************************/ +#include #include "addresses.h" #include "audio.h" #include "date.h" diff --git a/src/sawyercoding.c b/src/sawyercoding.c index 7e7a59928b..f62483f5c2 100644 --- a/src/sawyercoding.c +++ b/src/sawyercoding.c @@ -19,6 +19,7 @@ *****************************************************************************/ #include +#include #include "addresses.h" #include "rct2.h" #include "sawyercoding.h" diff --git a/src/scenario.c b/src/scenario.c index 51f8710294..2cd9b9b2b8 100644 --- a/src/scenario.c +++ b/src/scenario.c @@ -19,6 +19,7 @@ *****************************************************************************/ #include +#include #include "addresses.h" #include "date.h" #include "finance.h" diff --git a/src/tutorial.c b/src/tutorial.c index ff898e6a39..b6cb100493 100644 --- a/src/tutorial.c +++ b/src/tutorial.c @@ -18,6 +18,7 @@ * along with this program. If not, see . *****************************************************************************/ +#include #include "addresses.h" #include "tutorial.h" #include "window_error.h" diff --git a/src/window.c b/src/window.c index 2a79a9d76f..82483ecdd1 100644 --- a/src/window.c +++ b/src/window.c @@ -18,6 +18,7 @@ * along with this program. If not, see . *****************************************************************************/ +#include #include "addresses.h" #include "audio.h" #include "gfx.h" diff --git a/src/window_about.c b/src/window_about.c index 50c6d126d6..a6d3848103 100644 --- a/src/window_about.c +++ b/src/window_about.c @@ -25,7 +25,7 @@ #include "widget.h" #include "window.h" -static enum WINDOW_ABOUT_WIDGET_IDX { +enum WINDOW_ABOUT_WIDGET_IDX { WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE, @@ -33,7 +33,7 @@ static enum WINDOW_ABOUT_WIDGET_IDX { WIDX_PUBLISHER_CREDITS }; -static rct_widget window_about_widgets[] = { +rct_widget window_about_widgets[] = { { WWT_FRAME, 0, 0, 399, 0, 329, 0x0FFFFFFFF, STR_NONE }, // panel / background { WWT_CAPTION, 0, 1, 398, 1, 14, STR_ROLLERCOASTER_TYCOON_2, STR_WINDOW_TITLE_TIP }, // title bar { WWT_CLOSEBOX, 0, 387, 397, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button diff --git a/src/window_banner.c b/src/window_banner.c index 67c115c045..990c4bfe43 100644 --- a/src/window_banner.c +++ b/src/window_banner.c @@ -26,7 +26,7 @@ #include "widget.h" #include "window.h" -static enum WINDOW_BANNER_WIDGET_IDX { +enum WINDOW_BANNER_WIDGET_IDX { WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE, @@ -39,7 +39,7 @@ static enum WINDOW_BANNER_WIDGET_IDX { WIDX_TEXT_COLOR_DROPDOWN_BUTTON }; -static rct_widget window_banner_widgets[] = { +rct_widget window_banner_widgets[] = { { WWT_FRAME, 0, 0, 112, 0, 95, 0x0FFFFFFFF, 65535}, // panel / background { WWT_CAPTION, 0, 1, 111, 1, 14, 0xBA9, STR_WINDOW_TITLE_TIP}, // title bar { WWT_CLOSEBOX, 0, 100, 110, 2, 13, 0x338, STR_CLOSE_WINDOW_TIP}, // close x button diff --git a/src/window_cheats.c b/src/window_cheats.c index f504a3ef76..52c3d7c74f 100644 --- a/src/window_cheats.c +++ b/src/window_cheats.c @@ -38,7 +38,7 @@ enum { WINDOW_CHEATS_PAGE_GUESTS }; -static enum WINDOW_CHEATS_WIDGET_IDX { +enum WINDOW_CHEATS_WIDGET_IDX { WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE, diff --git a/src/window_clear_scenery.c b/src/window_clear_scenery.c index 13560367ab..f4674fefa4 100644 --- a/src/window_clear_scenery.c +++ b/src/window_clear_scenery.c @@ -25,7 +25,7 @@ #include "widget.h" #include "window.h" -static enum WINDOW_CLEAR_SCENERY_WIDGET_IDX { +enum WINDOW_CLEAR_SCENERY_WIDGET_IDX { WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE, @@ -34,7 +34,7 @@ static enum WINDOW_CLEAR_SCENERY_WIDGET_IDX { WIDX_INCREMENT }; -static rct_widget window_clear_scenery_widgets[] = { +rct_widget window_clear_scenery_widgets[] = { { WWT_FRAME, 0, 0, 97, 0, 66, -1, 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 diff --git a/src/window_footpath.c b/src/window_footpath.c index 94345d9e3f..f68e44c6c3 100644 --- a/src/window_footpath.c +++ b/src/window_footpath.c @@ -49,7 +49,7 @@ typedef struct { uint8 flags; // 0x0B } rct_path_type; -static enum WINDOW_FOOTPATH_WIDGET_IDX { +enum WINDOW_FOOTPATH_WIDGET_IDX { WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE, diff --git a/src/window_game_bottom_toolbar.c b/src/window_game_bottom_toolbar.c index 86fa308a9e..0a38aa0b56 100644 --- a/src/window_game_bottom_toolbar.c +++ b/src/window_game_bottom_toolbar.c @@ -18,6 +18,7 @@ * along with this program. If not, see . *****************************************************************************/ +#include #include "addresses.h" #include "climate.h" #include "date.h" @@ -30,7 +31,7 @@ #include "widget.h" #include "window.h" -static enum WINDOW_GAME_BOTTOM_TOOLBAR_WIDGET_IDX { +enum WINDOW_GAME_BOTTOM_TOOLBAR_WIDGET_IDX { WIDX_LEFT_OUTSET, WIDX_LEFT_INSET, WIDX_MONEY, diff --git a/src/window_game_top_toolbar.c b/src/window_game_top_toolbar.c index c68df5182f..616e1a525e 100644 --- a/src/window_game_top_toolbar.c +++ b/src/window_game_top_toolbar.c @@ -18,6 +18,7 @@ * along with this program. If not, see . *****************************************************************************/ +#include #include "addresses.h" #include "game.h" #include "sprites.h" @@ -361,7 +362,7 @@ static void window_game_top_toolbar_dropdown() src++; } while (*src != '.' && *src != '\0'); strcpy(src, ".SV6"); - strcpy(RCT2_ADDRESS_SAVED_GAMES_PATH_2, 0x0141EF68); + strcpy((char*) RCT2_ADDRESS_SAVED_GAMES_PATH_2, (char*) 0x0141EF68); eax = 0; if (RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) & 8) diff --git a/src/window_land.c b/src/window_land.c index acefd10fc7..0dd6493ff4 100644 --- a/src/window_land.c +++ b/src/window_land.c @@ -26,7 +26,7 @@ #include "window.h" #include "window_dropdown.h" -static enum WINDOW_LAND_WIDGET_IDX { +enum WINDOW_LAND_WIDGET_IDX { WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE, diff --git a/src/window_map.c b/src/window_map.c index fe8f814910..4c1a5f00d2 100644 --- a/src/window_map.c +++ b/src/window_map.c @@ -24,7 +24,7 @@ #include "widget.h" #include "window.h" -static enum WINDOW_MAP_WIDGET_IDX { +enum WINDOW_MAP_WIDGET_IDX { WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE, diff --git a/src/window_news.c b/src/window_news.c index c4b1c562a5..580d76e322 100644 --- a/src/window_news.c +++ b/src/window_news.c @@ -28,7 +28,7 @@ #include "widget.h" #include "window.h" -static enum WINDOW_NEWS_WIDGET_IDX { +enum WINDOW_NEWS_WIDGET_IDX { WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE, diff --git a/src/window_options.c b/src/window_options.c index ea999dd409..fae7561050 100644 --- a/src/window_options.c +++ b/src/window_options.c @@ -28,7 +28,7 @@ #include "window.h" #include "window_dropdown.h" -static enum WINDOW_OPTIONS_WIDGET_IDX { +enum WINDOW_OPTIONS_WIDGET_IDX { WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE, @@ -107,7 +107,7 @@ static void window_options_mousedown(); static void window_options_dropdown(); static void window_options_update(rct_window *w); static void window_options_paint(); -static void window_options_draw_dropdown_box(w, widget, num_items); +static void window_options_draw_dropdown_box(rct_window *w, rct_widget *widget, int num_items); static void window_options_update_height_markers(); static void* window_options_events[] = { diff --git a/src/window_park.c b/src/window_park.c index e9635e70d6..c3b4ffb4ab 100644 --- a/src/window_park.c +++ b/src/window_park.c @@ -18,6 +18,7 @@ * along with this program. If not, see . *****************************************************************************/ +#include #include "addresses.h" #include "config.h" #include "date.h" diff --git a/src/window_ride_list.c b/src/window_ride_list.c index 4e7bb35115..0b65bf1bd9 100644 --- a/src/window_ride_list.c +++ b/src/window_ride_list.c @@ -34,7 +34,7 @@ enum { PAGE_KIOSKS_AND_FACILITIES }; -static enum WINDOW_RIDE_LIST_WIDGET_IDX { +enum WINDOW_RIDE_LIST_WIDGET_IDX { WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE, diff --git a/src/window_save_prompt.c b/src/window_save_prompt.c index 40ba01f982..db3ea4edfd 100644 --- a/src/window_save_prompt.c +++ b/src/window_save_prompt.c @@ -28,7 +28,7 @@ #include "window.h" #include "audio.h" -static enum WINDOW_SAVE_PROMPT_WIDGET_IDX { +enum WINDOW_SAVE_PROMPT_WIDGET_IDX { WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE, diff --git a/src/window_title_scenarioselect.c b/src/window_title_scenarioselect.c index c0e22f6287..b85b39da99 100644 --- a/src/window_title_scenarioselect.c +++ b/src/window_title_scenarioselect.c @@ -18,6 +18,7 @@ * along with this program. If not, see . *****************************************************************************/ +#include #include "addresses.h" #include "audio.h" #include "date.h" diff --git a/src/window_water.c b/src/window_water.c index d22819a56b..55f9493438 100644 --- a/src/window_water.c +++ b/src/window_water.c @@ -25,7 +25,7 @@ #include "widget.h" #include "window.h" -static enum WINDOW_WATER_WIDGET_IDX { +enum WINDOW_WATER_WIDGET_IDX { WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE,