CMakeLists.txt

@@ -21,16 +21,14 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/modules/" ${CMAKE_MODULE_PATH})
 
 SET(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
 
-set(CORRADE_BUILD_DEPRECATED OFF CACHE BOOL "" FORCE)
-set(CORRADE_BUILD_STATIC ON CACHE BOOL "" FORCE)
-set(CORRADE_BUILD_STATIC_PIC ON CACHE BOOL "" FORCE)
-set(CORRADE_BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE)
-set(CORRADE_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-set(CORRADE_WITH_INTERCONNECT ON CACHE BOOL "" FORCE)
-set(CORRADE_WITH_PLUGINMANAGER OFF CACHE BOOL "" FORCE)
-set(CORRADE_WITH_TESTSUITE OFF CACHE BOOL "" FORCE)
-set(CORRADE_WITH_MAIN ON CACHE BOOL "" FORCE)
-set(CORRADE_UTILITY_USE_ANSI_COLORS ON CACHE BOOL "" FORCE)
+set(BUILD_STATIC ON CACHE BOOL "" FORCE)
+set(BUILD_STATIC_PIC ON CACHE BOOL "" FORCE)
+set(BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE)
+
+set(WITH_INTERCONNECT ON CACHE BOOL "" FORCE)
+set(WITH_PLUGINMANAGER ON CACHE BOOL "" FORCE)
+set(WITH_TESTSUITE OFF CACHE BOOL "" FORCE)
+set(WITH_MAIN ON CACHE BOOL "" FORCE)
 add_subdirectory(third-party/corrade EXCLUDE_FROM_ALL)
 
 set(DIRECTX OFF CACHE BOOL "" FORCE) # We use OpenGL.
@@ -49,33 +47,26 @@ set(SDL_TIMERS ON CACHE BOOL "" FORCE)
 set(SDL_SHARED OFF CACHE BOOL "" FORCE)
 add_subdirectory(third-party/SDL EXCLUDE_FROM_ALL)
 
-set(MAGNUM_BUILD_STATIC ON CACHE BOOL "" FORCE)
-set(MAGNUM_BUILD_STATIC_PIC ON CACHE BOOL "" FORCE)
-set(MAGNUM_BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE)
-set(MAGNUM_BUILD_DEPRECATED OFF CACHE BOOL "" FORCE)
-set(MAGNUM_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-
-set(MAGNUM_TARGET_GL ON CACHE BOOL "" FORCE)
-set(MAGNUM_TARGET_GLES OFF CACHE BOOL "" FORCE)
-set(MAGNUM_TARGET_VK OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_AUDIO OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_DEBUGTOOLS OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_GL ON CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_MESHTOOLS OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_PRIMITIVES OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_SCENEGRAPH OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_SCENETOOLS OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_SHADERS ON CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_SHADERTOOLS OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_TEXT OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_TEXTURETOOLS OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_TRADE OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_VK OFF CACHE BOOL "" FORCE)
-set(MAGNUM_WITH_SDL2APPLICATION ON CACHE BOOL "" FORCE)
+set(TARGET_GL ON CACHE BOOL "" FORCE)
+set(TARGET_GLES OFF CACHE BOOL "" FORCE)
+set(TARGET_VK OFF CACHE BOOL "" FORCE)
+set(WITH_AUDIO OFF CACHE BOOL "" FORCE)
+set(WITH_DEBUGTOOLS OFF CACHE BOOL "" FORCE)
+set(WITH_GL ON CACHE BOOL "" FORCE)
+set(WITH_MESHTOOLS OFF CACHE BOOL "" FORCE)
+set(WITH_PRIMITIVES OFF CACHE BOOL "" FORCE)
+set(WITH_SCENEGRAPH OFF CACHE BOOL "" FORCE)
+set(WITH_SHADERS ON CACHE BOOL "" FORCE)
+set(WITH_SHADERTOOLS OFF CACHE BOOL "" FORCE)
+set(WITH_TEXT OFF CACHE BOOL "" FORCE)
+set(WITH_TEXTURETOOLS OFF CACHE BOOL "" FORCE)
+set(WITH_TRADE OFF CACHE BOOL "" FORCE)
+set(WITH_VK OFF CACHE BOOL "" FORCE)
+set(WITH_SDL2APPLICATION ON CACHE BOOL "" FORCE)
 add_subdirectory(third-party/magnum EXCLUDE_FROM_ALL)
 
 set(IMGUI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third-party/imgui)
-set(MAGNUM_WITH_IMGUI ON CACHE BOOL "" FORCE)
+set(WITH_IMGUI ON CACHE BOOL "" FORCE)
 add_subdirectory(third-party/magnum-integration EXCLUDE_FROM_ALL)
 
 set(ENABLE_COMMONCRYPTO OFF CACHE BOOL "" FORCE)

src/CMakeLists.txt

@@ -18,7 +18,7 @@ set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-set(SAVETOOL_PROJECT_VERSION 1.3.5)
+set(SAVETOOL_PROJECT_VERSION 1.3.4)
 
 find_package(Corrade REQUIRED Main Containers Utility Interconnect)
 find_package(Magnum REQUIRED GL Sdl2Application)

src/MassManager/MassManager.cpp

@@ -184,7 +184,7 @@ void MassManager::refreshStagedMasses() {
         return !file.hasSuffix(".sav"_s);
     });
 
-    auto list_view = file_list->exceptSuffix(file_list->end() - iter);
+    auto list_view = file_list->except(file_list->end() - iter);
 
     Utility::Debug{} << "Scanning for staged M.A.S.S.es...";
     for(Containers::StringView file : list_view) {

src/ProfileManager/ProfileManager.cpp

@@ -71,7 +71,7 @@ auto ProfileManager::refreshProfiles() -> bool {
         return !std::regex_match(file.data(), m, legacy_regex) && !std::regex_match(file.data(), m, new_regex);
     };
 
-    auto files_view = files->exceptSuffix(files->end() - std::remove_if(files->begin(), files->end(), predicate));
+    auto files_view = files->except(files->end() - std::remove_if(files->begin(), files->end(), predicate));
 
     for(const auto& file : files_view) {
         Profile profile{Utility::Path::join(_saveDirectory, file)};
@@ -84,7 +84,7 @@ auto ProfileManager::refreshProfiles() -> bool {
         arrayAppend(_profiles, std::move(profile));
     }
 
-    if(_profiles.isEmpty()) {
+    if(_profiles.empty()) {
         _lastError = "No valid profiles were found."_s;
         return false;
     }
@@ -217,7 +217,7 @@ void ProfileManager::refreshBackups() {
         return !file.hasSuffix(".mbprofbackup"_s);
     };
 
-    auto files_view = files->exceptSuffix(files->end() - std::remove_if(files->begin(), files->end(), predicate));
+    auto files_view = files->except(files->end() - std::remove_if(files->begin(), files->end(), predicate));
 
     int error_code = 0;
     zip_t* zip = nullptr;

src/SaveTool/SaveTool_MassViewer_Armour.cpp

@@ -310,7 +310,7 @@ void SaveTool::drawCustomArmourStyles() {
                 break;
             case DCS_Save:
                 _modifiedBySaveTool = true;
-                if(!_currentMass->writeArmourCustomStyle(i)) {
+                if(_currentMass->writeArmourCustomStyle(i)) {
                     _modifiedBySaveTool = false;
                     _queue.addToast(Toast::Type::Error, _currentMass->lastError());
                 }

src/SaveTool/SaveTool_ProfileManager.cpp

@@ -230,7 +230,7 @@ auto SaveTool::drawBackupListPopup() -> ImGuiID {
         ImGui::EndTable();
     }
 
-    if(_profileManager->backups().isEmpty()) {
+    if(_profileManager->backups().empty()) {
         ImGui::TextDisabled("No backups were found.");
     }
     else if(ImGui::BeginTable("##Backups", 4,

third-party/corrade

@@ -1 +1 @@
-Subproject commit cbcadb5758da89762b6f661b2ed56cb94e62e33b
+Subproject commit dc4f2eac6814b37b5257d295c2838bcde95272aa

third-party/magnum

@@ -1 +1 @@
-Subproject commit 67d37c9ed54b1e44105536c2aa3e60c723e27f59
+Subproject commit 3fc9028b5451aa95973f104d1ef2a1c0df589e64

third-party/magnum-integration

@@ -1 +1 @@
-Subproject commit 012d62b7480ed67b692d90155f25260a59d12042
+Subproject commit 323c23f4e8e7cda9a7848c03401a3ba0a1de0bd4