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

Merge pull request #18359

Browse Source
This commit is contained in:
Hielke Morsink
2022-10-18 23:39:49 +02:00
committed by GitHub
parent 7c38740119 5fa53ad528
commit f91df4138c
97 changed files with 1237 additions and 1240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,16 +153,16 @@ static u8string GetLastDirectoryByType(int32_t type)
switch (type & 0x0E)
{
case LOADSAVETYPE_GAME:
return gConfigGeneral.last_save_game_directory;
return gConfigGeneral.LastSaveGameDirectory;
case LOADSAVETYPE_LANDSCAPE:
return gConfigGeneral.last_save_landscape_directory;
return gConfigGeneral.LastSaveLandscapeDirectory;
case LOADSAVETYPE_SCENARIO:
return gConfigGeneral.last_save_scenario_directory;
return gConfigGeneral.LastSaveScenarioDirectory;
case LOADSAVETYPE_TRACK:
return gConfigGeneral.last_save_track_directory;
return gConfigGeneral.LastSaveTrackDirectory;
default:
return u8string();
@@ -262,7 +262,7 @@ rct_window* WindowLoadsaveOpen(
// Bypass the lot?
auto hasFilePicker = OpenRCT2::GetContext()->GetUiContext()->HasFilePicker();
if (gConfigGeneral.use_native_browse_dialog && hasFilePicker)
if (gConfigGeneral.UseNativeBrowseDialog && hasFilePicker)
{
const u8string path = Browse(isSave);
if (!path.empty())
@@ -479,29 +479,29 @@ static void WindowLoadsaveMouseup(rct_window* w, WidgetIndex widgetIndex)
break;
case WIDX_SORT_NAME:
if (gConfigGeneral.load_save_sort == Sort::NameAscending)
if (gConfigGeneral.LoadSaveSort == Sort::NameAscending)
{
gConfigGeneral.load_save_sort = Sort::NameDescending;
gConfigGeneral.LoadSaveSort = Sort::NameDescending;
}
else
{
gConfigGeneral.load_save_sort = Sort::NameAscending;
gConfigGeneral.LoadSaveSort = Sort::NameAscending;
}
config_save_default();
ConfigSaveDefault();
WindowLoadsaveSortList();
w->Invalidate();
break;
case WIDX_SORT_DATE:
if (gConfigGeneral.load_save_sort == Sort::DateDescending)
if (gConfigGeneral.LoadSaveSort == Sort::DateDescending)
{
gConfigGeneral.load_save_sort = Sort::DateAscending;
gConfigGeneral.LoadSaveSort = Sort::DateAscending;
}
else
{
gConfigGeneral.load_save_sort = Sort::DateDescending;
gConfigGeneral.LoadSaveSort = Sort::DateDescending;
}
config_save_default();
ConfigSaveDefault();
WindowLoadsaveSortList();
w->Invalidate();
break;
@@ -713,9 +713,9 @@ static void WindowLoadsavePaint(rct_window* w, rct_drawpixelinfo* dpi)
// Name button text
StringId id = STR_NONE;
if (gConfigGeneral.load_save_sort == Sort::NameAscending)
if (gConfigGeneral.LoadSaveSort == Sort::NameAscending)
id = STR_UP;
else if (gConfigGeneral.load_save_sort == Sort::NameDescending)
else if (gConfigGeneral.LoadSaveSort == Sort::NameDescending)
id = STR_DOWN;
// Draw name button indicator.
@@ -727,9 +727,9 @@ static void WindowLoadsavePaint(rct_window* w, rct_drawpixelinfo* dpi)
{ COLOUR_GREY });
// Date button text
if (gConfigGeneral.load_save_sort == Sort::DateAscending)
if (gConfigGeneral.LoadSaveSort == Sort::DateAscending)
id = STR_UP;
else if (gConfigGeneral.load_save_sort == Sort::DateDescending)
else if (gConfigGeneral.LoadSaveSort == Sort::DateDescending)
id = STR_DOWN;
else
id = STR_NONE;
@@ -803,7 +803,7 @@ static bool ListItemSort(LoadSaveListItem& a, LoadSaveListItem& b)
if (a.type != b.type)
return a.type - b.type < 0;
switch (gConfigGeneral.load_save_sort)
switch (gConfigGeneral.LoadSaveSort)
{
case Sort::NameAscending:
return strlogicalcmp(a.name.c_str(), b.name.c_str()) < 0;
@@ -962,7 +962,7 @@ static void WindowLoadsaveInvokeCallback(int32_t result, const utf8* path)
static void SetAndSaveConfigPath(u8string& config_str, u8string_view path)
{
config_str = Path::GetDirectory(path);
config_save_default();
ConfigSaveDefault();
}
static bool IsValidPath(const char* path)
@@ -989,15 +989,15 @@ static void WindowLoadsaveSelect(rct_window* w, const char* path)
switch (_type & 0x0F)
{
case (LOADSAVETYPE_LOAD | LOADSAVETYPE_GAME):
SetAndSaveConfigPath(gConfigGeneral.last_save_game_directory, pathBuffer);
SetAndSaveConfigPath(gConfigGeneral.LastSaveGameDirectory, pathBuffer);
WindowLoadsaveInvokeCallback(MODAL_RESULT_OK, pathBuffer);
window_close_by_class(WindowClass::Loadsave);
gfx_invalidate_screen();
break;
case (LOADSAVETYPE_SAVE | LOADSAVETYPE_GAME):
SetAndSaveConfigPath(gConfigGeneral.last_save_game_directory, pathBuffer);
if (scenario_save(pathBuffer, gConfigGeneral.save_plugin_data ? 1 : 0))
SetAndSaveConfigPath(gConfigGeneral.LastSaveGameDirectory, pathBuffer);
if (scenario_save(pathBuffer, gConfigGeneral.SavePluginData ? 1 : 0))
{
gScenarioSavePath = pathBuffer;
gCurrentLoadedPath = pathBuffer;
@@ -1017,7 +1017,7 @@ static void WindowLoadsaveSelect(rct_window* w, const char* path)
break;
case (LOADSAVETYPE_LOAD | LOADSAVETYPE_LANDSCAPE):
SetAndSaveConfigPath(gConfigGeneral.last_save_landscape_directory, pathBuffer);
SetAndSaveConfigPath(gConfigGeneral.LastSaveLandscapeDirectory, pathBuffer);
if (Editor::LoadLandscape(pathBuffer))
{
gCurrentLoadedPath = pathBuffer;
@@ -1033,9 +1033,9 @@ static void WindowLoadsaveSelect(rct_window* w, const char* path)
break;
case (LOADSAVETYPE_SAVE | LOADSAVETYPE_LANDSCAPE):
SetAndSaveConfigPath(gConfigGeneral.last_save_landscape_directory, pathBuffer);
SetAndSaveConfigPath(gConfigGeneral.LastSaveLandscapeDirectory, pathBuffer);
gScenarioFileName = std::string(String::ToStringView(pathBuffer, std::size(pathBuffer)));
if (scenario_save(pathBuffer, gConfigGeneral.save_plugin_data ? 3 : 2))
if (scenario_save(pathBuffer, gConfigGeneral.SavePluginData ? 3 : 2))
{
gCurrentLoadedPath = pathBuffer;
window_close_by_class(WindowClass::Loadsave);
@@ -1051,12 +1051,12 @@ static void WindowLoadsaveSelect(rct_window* w, const char* path)
case (LOADSAVETYPE_SAVE | LOADSAVETYPE_SCENARIO):
{
SetAndSaveConfigPath(gConfigGeneral.last_save_scenario_directory, pathBuffer);
SetAndSaveConfigPath(gConfigGeneral.LastSaveScenarioDirectory, pathBuffer);
int32_t parkFlagsBackup = gParkFlags;
gParkFlags &= ~PARK_FLAGS_SPRITES_INITIALISED;
gEditorStep = EditorStep::Invalid;
gScenarioFileName = std::string(String::ToStringView(pathBuffer, std::size(pathBuffer)));
int32_t success = scenario_save(pathBuffer, gConfigGeneral.save_plugin_data ? 3 : 2);
int32_t success = scenario_save(pathBuffer, gConfigGeneral.SavePluginData ? 3 : 2);
gParkFlags = parkFlagsBackup;
if (success)
@@ -1076,7 +1076,7 @@ static void WindowLoadsaveSelect(rct_window* w, const char* path)
case (LOADSAVETYPE_LOAD | LOADSAVETYPE_TRACK):
{
SetAndSaveConfigPath(gConfigGeneral.last_save_track_directory, pathBuffer);
SetAndSaveConfigPath(gConfigGeneral.LastSaveTrackDirectory, pathBuffer);
auto intent = Intent(WindowClass::InstallTrack);
intent.putExtra(INTENT_EXTRA_PATH, std::string{ pathBuffer });
context_open_intent(&intent);
@@ -1087,7 +1087,7 @@ static void WindowLoadsaveSelect(rct_window* w, const char* path)
case (LOADSAVETYPE_SAVE | LOADSAVETYPE_TRACK):
{
SetAndSaveConfigPath(gConfigGeneral.last_save_track_directory, pathBuffer);
SetAndSaveConfigPath(gConfigGeneral.LastSaveTrackDirectory, pathBuffer);
const auto withExtension = Path::WithExtension(pathBuffer, "td6");
String::Set(pathBuffer, sizeof(pathBuffer), withExtension.c_str());