Compare commits

..

No commits in common. "4b4f52c89c4f756835464911f6e04920321b2119" and "205c502c548559912ce3aacd82caea5e52c51d4f" have entirely different histories.

3 changed files with 6 additions and 5 deletions

View file

@ -18,7 +18,7 @@ set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
set(SAVETOOL_PROJECT_VERSION 1.5.1) set(SAVETOOL_PROJECT_VERSION 1.5.0)
find_package(Corrade REQUIRED Containers Utility) find_package(Corrade REQUIRED Containers Utility)
if(CORRADE_TARGET_WINDOWS) if(CORRADE_TARGET_WINDOWS)
@ -235,9 +235,9 @@ target_compile_definitions(MassBuilderSaveTool PRIVATE
SAVETOOL_VERSION_STRING="${SAVETOOL_PROJECT_VERSION}" SAVETOOL_VERSION_STRING="${SAVETOOL_PROJECT_VERSION}"
SAVETOOL_VERSION_MAJOR=1 SAVETOOL_VERSION_MAJOR=1
SAVETOOL_VERSION_MINOR=5 SAVETOOL_VERSION_MINOR=5
SAVETOOL_VERSION_PATCH=1 SAVETOOL_VERSION_PATCH=0
SAVETOOL_VERSION_PRERELEASE=false SAVETOOL_VERSION_PRERELEASE=false
SAVETOOL_CODENAME="Friendly Valkyrie" SAVETOOL_CODENAME="Fuckin' UE5..."
SAVETOOL_SUPPORTED_GAME_VERSION="0.11.x" SAVETOOL_SUPPORTED_GAME_VERSION="0.11.x"
) )

View file

@ -52,7 +52,8 @@ MassManager::hangar(std::int32_t hangar) {
void void
MassManager::refreshHangar(std::int32_t hangar) { MassManager::refreshHangar(std::int32_t hangar) {
if(hangar < 0 || hangar >= 32) { if(hangar < 0 || hangar >= 32) {
LOG_ERROR(_lastError = Utility::format("Hangar index {} out of range.", hangar)); _lastError = "Hangar index out of range.";
LOG_ERROR(_lastError);
return; return;
} }

View file

@ -131,7 +131,7 @@ StagedMassManager::import(Containers::StringView filename, int index, Containers
} }
auto dest = Utility::Path::join(conf().directories().gameSaves, auto dest = Utility::Path::join(conf().directories().gameSaves,
Utility::format("{}Unit{:.2d}{}.sav", demo ? "Demo" : "", index, new_account)); Utility::format("{}Unit{}{}.sav", demo ? "Demo" : "", index, new_account));
if(Utility::Path::exists(dest)) { if(Utility::Path::exists(dest)) {
Utility::Path::remove(dest); Utility::Path::remove(dest);