games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

avoid destroing utf-8; no extra Autosave text

Browse Source
This commit is contained in:
Michael 2023-08-23 23:25:48 +02:00 committed by GitHub
parent 485af4b4b5
commit 9f68a0bf49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Global.h
View File

@ -108,6 +108,7 @@ static_assert(sizeof(bool) == 1, "Bool needs to be 1 byte in size.");
#include <cassert>
#include <climits>
#include <cmath>
#include <codecvt>
#include <cstdlib>
#include <cstdio>
#include <fstream>

10
client/CPlayerInterface.cpp
View File

@ -212,7 +212,11 @@ void CPlayerInterface::performAutosave()
prefix = settings["general"]["savePrefix"].String();
if(prefix.empty())
{
std::string name = cb->getMapHeader()->name.substr(0, 15);
std::string name = cb->getMapHeader()->name;
std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> conv;
int txtlen = conv.from_bytes(name).size();
TextOperations::trimRightUnicode(name, std::max(0, txtlen - 15));
std::string forbiddenChars("\\/:?\"<>| ");
std::replace_if(name.begin(), name.end(), [&](char c) { return std::string::npos != forbiddenChars.find(c); }, '_' );
@ -225,7 +229,7 @@ void CPlayerInterface::performAutosave()
int autosaveCountLimit = settings["general"]["autosaveCountLimit"].Integer();
if(autosaveCountLimit > 0)
{
cb->save("Saves/Autosave/" + prefix + "Autosave_" + std::to_string(autosaveCount));
cb->save("Saves/Autosave/" + prefix + std::to_string(autosaveCount));
autosaveCount %= autosaveCountLimit;
}
else
@ -234,7 +238,7 @@ void CPlayerInterface::performAutosave()
+ std::to_string(cb->getDate(Date::WEEK))
+ std::to_string(cb->getDate(Date::DAY_OF_WEEK));
cb->save("Saves/Autosave/" + prefix + "Autosave_" + stringifiedDate);
cb->save("Saves/Autosave/" + prefix + stringifiedDate);
}
}
}