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

Rename heightmap load/save type; add heightmap dir.

Browse Source
This commit is contained in:
Aaron van Geffen
2018-08-15 22:23:33 +02:00
parent 4b4510b347
commit c4f93e24b5
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,6 +202,10 @@ static void getInitialDirectoryByType(const int32_t type, char* path, size_t pat
case LOADSAVETYPE_TRACK:
subdir = "track";
break;
case LOADSAVETYPE_HEIGHTMAP:
subdir = "heightmap";
break;
}
platform_get_user_directory(path, subdir, pathSize);
@@ -223,8 +227,8 @@ static const char* getFilterPatternByType(const int32_t type, const bool isSave)
case LOADSAVETYPE_TRACK:
return isSave ? "*.td6" : "*.td6;*.td4";
case LOADSAVETYPE_IMAGE:
return "*.bmp;*.jpg;*.png";
case LOADSAVETYPE_HEIGHTMAP:
return "*.bmp;*.png";
default:
openrct2_assert(true, "Unsupported load/save directory type.");
@@ -316,7 +320,7 @@ rct_window* window_loadsave_open(int32_t type, const char* defaultName, loadsave
: STR_FILE_DIALOG_TITLE_INSTALL_NEW_TRACK_DESIGN;
break;
case LOADSAVETYPE_IMAGE:
case LOADSAVETYPE_HEIGHTMAP:
openrct2_assert(!isSave, "Cannot save images through loadsave window");
w->widgets[WIDX_TITLE].text = STR_FILE_DIALOG_TITLE_LOAD_HEIGHTMAP;
break;
@@ -391,7 +395,7 @@ static bool browse(bool isSave, char* path, size_t pathSize)
desc.filters[0].pattern = getFilterPatternByType(_type, isSave);
break;
case LOADSAVETYPE_IMAGE:
case LOADSAVETYPE_HEIGHTMAP:
title = STR_FILE_DIALOG_TITLE_LOAD_HEIGHTMAP;
desc.filters[0].name = language_get_string(STR_OPENRCT2_HEIGHTMAP_FILE);
desc.filters[0].pattern = getFilterPatternByType(_type, isSave);
@@ -1099,7 +1103,7 @@ static void window_loadsave_select(rct_window* w, const char* path)
break;
}
case (LOADSAVETYPE_LOAD | LOADSAVETYPE_IMAGE):
case (LOADSAVETYPE_LOAD | LOADSAVETYPE_HEIGHTMAP):
window_close_by_class(WC_LOADSAVE);
window_loadsave_invoke_callback(MODAL_RESULT_OK, pathBuffer);
break;

2
src/openrct2-ui/windows/MapGen.cpp
View File

@@ -1183,7 +1183,7 @@ static void window_mapgen_heightmap_mouseup(rct_window* w, rct_widgetindex widge
case WIDX_HEIGHTMAP_SELECT:
{
auto intent = Intent(WC_LOADSAVE);
intent.putExtra(INTENT_EXTRA_LOADSAVE_TYPE, LOADSAVETYPE_LOAD | LOADSAVETYPE_IMAGE);
intent.putExtra(INTENT_EXTRA_LOADSAVE_TYPE, LOADSAVETYPE_LOAD | LOADSAVETYPE_HEIGHTMAP);
intent.putExtra(INTENT_EXTRA_CALLBACK, (void*)window_mapgen_heightmap_loadsave_callback);
context_open_intent(&intent);
return;

2
src/openrct2/interface/Window.h
View File

@@ -511,7 +511,7 @@ enum
LOADSAVETYPE_LANDSCAPE = 1 << 1,
LOADSAVETYPE_SCENARIO = 2 << 1,
LOADSAVETYPE_TRACK = 3 << 1,
LOADSAVETYPE_IMAGE = 4 << 1,
LOADSAVETYPE_HEIGHTMAP = 4 << 1,
};
enum