mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 09:32:29 +01:00
Code Issues Releases Wiki Activity

Fix saving in editor mode

Browse Source 
Fixes #4572: Don't create .sv6 autosaves in track designs manager, roller coaster designer and scenario editor
Fixes #4573: "Save this before quitting?" in scenario editor saves to .sv6, not .sc6
This commit is contained in:
Ted John
2016-10-23 17:42:11 +01:00
parent 9ee865a8da
commit 94a9c94c1f
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/game.c
View File

@@ -311,7 +311,12 @@ void game_update()
} }
// Always perform autosave check, even when paused // Always perform autosave check, even when paused
scenario_autosave_check(); if (!(gScreenFlags & SCREEN_FLAGS_TITLE_DEMO) &&
!(gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER) &&
!(gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER)
) {
scenario_autosave_check();
}
window_dispatch_update_all(); window_dispatch_update_all();
@@ -1009,9 +1014,14 @@ static void limit_autosave_count(const size_t numberOfFilesToKeep)
void game_autosave() void game_autosave()
{ {
utf8 path[MAX_PATH]; const char * subDirectory = "save";
utf8 backupPath[MAX_PATH]; const char * fileExtension = ".sv6";
utf8 timeName[34]; uint32 saveFlags = 0x80000000;
if (gScreenFlags & SCREEN_FLAGS_EDITOR) {
subDirectory = "landscape";
fileExtension = ".sc6";
saveFlags |= 2;
}
// retrieve current time // retrieve current time
rct2_date currentDate; rct2_date currentDate;
@@ -1019,15 +1029,21 @@ void game_autosave()
rct2_time currentTime; rct2_time currentTime;
platform_get_time_local(&currentTime); platform_get_time_local(&currentTime);
snprintf(timeName, 34, "autosave_%d-%02d-%02d_%02d-%02d-%02d.sv6", currentDate.year, currentDate.month, currentDate.day, currentTime.hour, currentTime.minute,currentTime.second); utf8 timeName[34];
snprintf(timeName, 34, "autosave_%d-%02d-%02d_%02d-%02d-%02d%s",
currentDate.year, currentDate.month, currentDate.day, currentTime.hour, currentTime.minute,currentTime.second,
fileExtension);
limit_autosave_count(NUMBER_OF_AUTOSAVES_TO_KEEP); limit_autosave_count(NUMBER_OF_AUTOSAVES_TO_KEEP);
platform_get_user_directory(path, "save", sizeof(path)); utf8 path[MAX_PATH];
utf8 backupPath[MAX_PATH];
platform_get_user_directory(path, subDirectory, sizeof(path));
safe_strcpy(backupPath, path, sizeof(backupPath)); safe_strcpy(backupPath, path, sizeof(backupPath));
safe_strcat_path(path, timeName, sizeof(path)); safe_strcat_path(path, timeName, sizeof(path));
safe_strcat_path(backupPath, "autosave.sv6.bak", sizeof(backupPath)); safe_strcat_path(backupPath, "autosave", sizeof(backupPath));
safe_strcat(backupPath, fileExtension, sizeof(backupPath));
safe_strcat(backupPath, ".bak", sizeof(backupPath));
if (platform_file_exists(path)) { if (platform_file_exists(path)) {
platform_file_copy(path, backupPath, true); platform_file_copy(path, backupPath, true);
@@ -1035,7 +1051,7 @@ void game_autosave()
SDL_RWops* rw = SDL_RWFromFile(path, "wb+"); SDL_RWops* rw = SDL_RWFromFile(path, "wb+");
if (rw != NULL) { if (rw != NULL) {
scenario_save(rw, 0x80000000); scenario_save(rw, saveFlags);
SDL_RWclose(rw); SDL_RWclose(rw);
} }
} }

6
src/windows/save_prompt.c
View File

@@ -229,7 +229,11 @@ static void window_save_prompt_mouseup(rct_window *w, int widgetIndex)
} else { } else {
switch (widgetIndex) { switch (widgetIndex) {
case WIDX_SAVE: case WIDX_SAVE:
save_game_as(); if (gScreenFlags & (SCREEN_FLAGS_EDITOR)) {
window_loadsave_open(LOADSAVETYPE_SAVE | LOADSAVETYPE_LANDSCAPE, gS6Info.name);
} else {
save_game_as();
}
window_close(w); window_close(w);
gLoadSaveCallback = window_save_prompt_callback; gLoadSaveCallback = window_save_prompt_callback;
break; break;