dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature: Persistant rotation of numbered auto/netsave after restart (#9397)

Browse Source 
It was always starting from 0 on openttd restart.
Now the most recent auto/netsave number will be used as a base to generate the next filename.
This commit is contained in:
Loïc Guilloux
2021-07-17 12:48:35 +02:00
committed by GitHub
parent 16abdd5254
commit 460991ecf4
6 changed files with 77 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/saveload/saveload.cpp
View File

@@ -3328,26 +3328,15 @@ SaveOrLoadResult SaveOrLoad(const std::string &filename, SaveLoadOperation fop,
* @param counter A reference to the counter variable to be used for rotating the file name.
* @param netsave Indicates if this is a regular autosave or a netsave.
*/
void DoAutoOrNetsave(int &counter, bool netsave)
void DoAutoOrNetsave(FiosNumberedSaveName &counter)
{
char buf[MAX_PATH];
if (_settings_client.gui.keep_all_autosave) {
GenerateDefaultSaveName(buf, lastof(buf));
if (!netsave) {
strecat(buf, ".sav", lastof(buf));
} else {
strecat(buf, "-netsave.sav", lastof(buf));
}
strecat(buf, counter.Extension().c_str(), lastof(buf));
} else {
/* Generate a savegame name and number according to _settings_client.gui.max_num_autosaves. */
if (!netsave) {
seprintf(buf, lastof(buf), "autosave%d.sav", counter);
} else {
seprintf(buf, lastof(buf), "netsave%d.sav", counter);
}
if (++counter >= _settings_client.gui.max_num_autosaves) counter = 0;
strecpy(buf, counter.Filename().c_str(), lastof(buf));
}
Debug(sl, 2, "Autosaving to '{}'", buf);

3
src/saveload/saveload.h
View File

@@ -11,6 +11,7 @@
#define SAVELOAD_H
#include "../fileio_type.h"
#include "../fios.h"
#include "../strings_type.h"
#include "../core/span_type.hpp"
#include <optional>
@@ -381,7 +382,7 @@ void WaitTillSaved();
void ProcessAsyncSaveFinish();
void DoExitSave();
void DoAutoOrNetsave(int &counter, bool netsave = false);
void DoAutoOrNetsave(FiosNumberedSaveName &counter);
SaveOrLoadResult SaveWithFilter(struct SaveFilter *writer, bool threaded);
SaveOrLoadResult LoadWithFilter(struct LoadFilter *reader);