mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Code Issues Releases Wiki Activity

Fix system file browser not populating properly (#7916)

Browse Source
This commit is contained in:
Hielke Morsink
2018-08-21 23:19:32 +02:00
committed by Aaron van Geffen
parent 28c5221f6d
commit e7af3290c0
2 changed files with 41 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/openrct2-ui/windows/LoadSave.cpp
View File

@@ -216,19 +216,19 @@ static const char* getFilterPatternByType(const int32_t type, const bool isSave)
switch (type & 0x0E)
{
case LOADSAVETYPE_GAME:
return isSave ? ".sv6" : ".sv6;.sc6;.sc4;.sv4;.sv7";
return isSave ? "*.sv6" : "*.sv6;*.sc6;*.sc4;*.sv4;*.sv7";
case LOADSAVETYPE_LANDSCAPE:
return isSave ? ".sc6" : ".sc6;.sv6;.sc4;.sv4;.sv7";
return isSave ? "*.sc6" : "*.sc6;*.sv6;*.sc4;*.sv4;*.sv7";
case LOADSAVETYPE_SCENARIO:
return ".sc6";
return "*.sc6";
case LOADSAVETYPE_TRACK:
return isSave ? ".td6" : ".td6;.td4";
return isSave ? "*.td6" : "*.td6;*.td4";
case LOADSAVETYPE_HEIGHTMAP:
return ".bmp;.png";
return "*.bmp;*.png";
default:
openrct2_assert(true, "Unsupported load/save directory type.");
@@ -297,7 +297,8 @@ rct_window* window_loadsave_open(int32_t type, const char* defaultName, loadsave
w->max_height = WH * 2;
}
window_loadsave_populate_list(w, false, path, getFilterPatternByType(type, isSave));
const char* pattern = getFilterPatternByType(type, isSave);
window_loadsave_populate_list(w, false, path, pattern);
w->no_list_items = static_cast<uint16_t>(_listItems.size());
w->selected_list_item = -1;
@@ -1138,34 +1139,36 @@ static rct_widget window_overwrite_prompt_widgets[] = {
static void window_overwrite_prompt_mouseup(rct_window* w, rct_widgetindex widgetIndex);
static void window_overwrite_prompt_paint(rct_window* w, rct_drawpixelinfo* dpi);
static rct_window_event_list window_overwrite_prompt_events = { nullptr,
window_overwrite_prompt_mouseup,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
window_overwrite_prompt_paint,
nullptr };
static rct_window_event_list window_overwrite_prompt_events = {
nullptr,
window_overwrite_prompt_mouseup,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
window_overwrite_prompt_paint,
nullptr,
};
static char _window_overwrite_prompt_name[256];
static char _window_overwrite_prompt_path[MAX_PATH];

4
src/openrct2/util/Util.cpp
View File

@@ -127,6 +127,10 @@ void path_set_extension(utf8* path, const utf8* newExtension, size_t size)
void path_append_extension(utf8* path, const utf8* newExtension, size_t size)
{
// Skip to the dot if the extension starts with a pattern (starts with "*.")
if (newExtension[0] == '*')
newExtension++;
// Append a dot to the filename if the new extension doesn't start with it
if (newExtension[0] != '.')
safe_strcat(path, ".", size);