From c8e4e6dae14af14005963511a1c0f12931cd2557 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sun, 11 Jun 2017 15:41:09 +0100 Subject: [PATCH] Remove usages of MAX_PATH --- src/openrct2/interface/window.h | 2 +- src/openrct2/paint/map_element/entrance.c | 12 ++++++------ src/openrct2/paint/map_element/fence.c | 6 +++--- src/openrct2/paint/map_element/scenery_multiple.c | 10 +++++----- src/openrct2/ride/track_design_save.c | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/openrct2/interface/window.h b/src/openrct2/interface/window.h index 88150bec61..adfc81acae 100644 --- a/src/openrct2/interface/window.h +++ b/src/openrct2/interface/window.h @@ -25,7 +25,6 @@ #include "../ride/track_design.h" #include "../ride/vehicle.h" #include "../scenario/scenario.h" -#include "../scenario/ScenarioRepository.h" #include "../world/park.h" #include "colour.h" @@ -34,6 +33,7 @@ union rct_window_event; struct track_design_file_ref; struct TitleSequence; struct TextInputSession; +typedef struct scenario_index_entry scenario_index_entry; #define TEXT_INPUT_SIZE 1024 #define TOP_TOOLBAR_HEIGHT 27 diff --git a/src/openrct2/paint/map_element/entrance.c b/src/openrct2/paint/map_element/entrance.c index 3f7ba3aeac..ea9edbd551 100644 --- a/src/openrct2/paint/map_element/entrance.c +++ b/src/openrct2/paint/map_element/entrance.c @@ -154,11 +154,11 @@ static void ride_entrance_exit_paint(uint8 direction, sint32 height, rct_map_ele string_id = STR_RIDE_ENTRANCE_NAME; } - utf8 entrance_string[MAX_PATH]; + utf8 entrance_string[256]; if (gConfigGeneral.upper_case_banners) { - format_string_to_upper(entrance_string, MAX_PATH, string_id, gCommonFormatArgs); + format_string_to_upper(entrance_string, sizeof(entrance_string), string_id, gCommonFormatArgs); } else { - format_string(entrance_string, MAX_PATH, string_id, gCommonFormatArgs); + format_string(entrance_string, sizeof(entrance_string), string_id, gCommonFormatArgs); } gCurrentFontSpriteBase = FONT_SPRITE_BASE_TINY; @@ -237,11 +237,11 @@ static void park_entrance_paint(uint8 direction, sint32 height, rct_map_element* park_text_id = STR_BANNER_TEXT_FORMAT; } - utf8 park_name[MAX_PATH]; + utf8 park_name[256]; if (gConfigGeneral.upper_case_banners) { - format_string_to_upper(park_name, MAX_PATH, park_text_id, gCommonFormatArgs); + format_string_to_upper(park_name, sizeof(park_name), park_text_id, gCommonFormatArgs); } else { - format_string(park_name, MAX_PATH, park_text_id, gCommonFormatArgs); + format_string(park_name, sizeof(park_name), park_text_id, gCommonFormatArgs); } gCurrentFontSpriteBase = FONT_SPRITE_BASE_TINY; diff --git a/src/openrct2/paint/map_element/fence.c b/src/openrct2/paint/map_element/fence.c index 0efa160dea..76b06b8fdc 100644 --- a/src/openrct2/paint/map_element/fence.c +++ b/src/openrct2/paint/map_element/fence.c @@ -369,12 +369,12 @@ void fence_paint(uint8 direction, sint32 height, rct_map_element * map_element) set_format_arg(2, uint32, ride->name_arguments); } - utf8 signString[MAX_PATH]; + utf8 signString[256]; rct_string_id stringId = STR_SCROLLING_SIGN_TEXT; if (gConfigGeneral.upper_case_banners) { - format_string_to_upper(signString, MAX_PATH, stringId, gCommonFormatArgs); + format_string_to_upper(signString, sizeof(signString), stringId, gCommonFormatArgs); } else { - format_string(signString, MAX_PATH, stringId, gCommonFormatArgs); + format_string(signString, sizeof(signString), stringId, gCommonFormatArgs); } gCurrentFontSpriteBase = FONT_SPRITE_BASE_TINY; diff --git a/src/openrct2/paint/map_element/scenery_multiple.c b/src/openrct2/paint/map_element/scenery_multiple.c index 6752283d71..ed4c41ca83 100644 --- a/src/openrct2/paint/map_element/scenery_multiple.c +++ b/src/openrct2/paint/map_element/scenery_multiple.c @@ -262,8 +262,8 @@ void scenery_multiple_paint(uint8 direction, uint16 height, rct_map_element *map stringId = ride->name; set_format_arg(0, uint32, ride->name_arguments); } - utf8 signString[MAX_PATH]; - format_string(signString, MAX_PATH, stringId, gCommonFormatArgs); + utf8 signString[256]; + format_string(signString, sizeof(signString), stringId, gCommonFormatArgs); rct_large_scenery_text *text = entry->large_scenery.text; sint32 y_offset = (text->offset[(direction & 1)].y * 2); if (text->flags & LARGE_SCENERY_TEXT_FLAG_VERTICAL) { @@ -352,12 +352,12 @@ void scenery_multiple_paint(uint8 direction, uint16 height, rct_map_element *map set_format_arg(0, rct_string_id, ride->name); set_format_arg(2, uint32, ride->name_arguments); } - utf8 signString[MAX_PATH]; + utf8 signString[256]; rct_string_id stringId = STR_SCROLLING_SIGN_TEXT; if (gConfigGeneral.upper_case_banners) { - format_string_to_upper(signString, MAX_PATH, stringId, gCommonFormatArgs); + format_string_to_upper(signString, sizeof(signString), stringId, gCommonFormatArgs); } else { - format_string(signString, MAX_PATH, stringId, gCommonFormatArgs); + format_string(signString, sizeof(signString), stringId, gCommonFormatArgs); } gCurrentFontSpriteBase = FONT_SPRITE_BASE_TINY; diff --git a/src/openrct2/ride/track_design_save.c b/src/openrct2/ride/track_design_save.c index 6c9ff939c2..783ca88afe 100644 --- a/src/openrct2/ride/track_design_save.c +++ b/src/openrct2/ride/track_design_save.c @@ -177,8 +177,8 @@ bool track_design_save(uint8 rideIndex) } } - utf8 track_name[MAX_PATH]; - format_string(track_name, MAX_PATH, ride->name, &ride->name_arguments); + utf8 track_name[256]; + format_string(track_name, sizeof(track_name), ride->name, &ride->name_arguments); window_loadsave_open(LOADSAVETYPE_TRACK | LOADSAVETYPE_SAVE, track_name); window_loadsave_set_loadsave_callback(track_design_save_callback);