fix: first corrections for the pull request

Author: tzobler

CMakeLists.txt

@@ -32,8 +32,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/out/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/out/lib)
 
 # Build related options
-option(SWIFT_BUILD_SAMPLES "Build samples" OFF)
-option(SWIFT_BUILD_UNIT_TESTS "Build unit tests" OFF)
+option(SWIFT_BUILD_SAMPLES "Build samples" ON)
+option(SWIFT_BUILD_UNIT_TESTS "Build unit tests" ON)
 option(SWIFT_BUILD_DOCUMENTATION "Build documentation" ON)
 
 cmake_dependent_option(SWIFT_BUILD_FS9_PLUGIN "Build FS9 plugin" ON SWIFT_WIN32 OFF)

cmake/tools.cmake

@@ -29,11 +29,11 @@ macro(load_vatsim_key)
     set(SWIFT_VATSIM_ID "0")
     set(SWIFT_VATSIM_KEY "00000000000000000000000000000000")
 
-#    if(VATSIM_KEY_JSON)
-#        file(READ ${PROJECT_SOURCE_DIR}/${VATSIM_KEY_JSON} KEY_FILE)
-#        string(JSON SWIFT_VATSIM_ID GET ${KEY_FILE} vatsim id)
-#        string(JSON SWIFT_VATSIM_KEY GET ${KEY_FILE} vatsim key)
-#    endif()
+    if(VATSIM_KEY_JSON)
+        file(READ ${PROJECT_SOURCE_DIR}/${VATSIM_KEY_JSON} KEY_FILE)
+        string(JSON SWIFT_VATSIM_ID GET ${KEY_FILE} vatsim id)
+        string(JSON SWIFT_VATSIM_KEY GET ${KEY_FILE} vatsim key)
+    endif()
 endmacro()
 
 function(configure_target_platform)

src/gui/components/dbownmodelscomponent.cpp

@@ -404,7 +404,7 @@ namespace swift::gui::components
                         ownModelsComp->setSimulator(CSimulatorInfo::msfs2024(), true);
                     });
                 }
-                menuActions.addAction(m_loadActions[5], CMenuAction::pathSimulator());
+                menuActions.addAction(m_loadActions[6], CMenuAction::pathSimulator());
             }
 
             // with models loaded I allow a refresh reload

src/misc/simulation/fscommon/fsdirectories.cpp

@@ -339,25 +339,6 @@ namespace swift::misc::simulation::fscommon
     const QStringList &CFsDirectories::msfs2024SimObjectsExcludeDirectoryPatterns()
     {
         static const QStringList exclude {
-            /*
-            "OneStore/asobo-discovery",
-            "OneStore/asobo-flight",
-            "OneStore/asobo-landingchallenge",
-            "OneStore/asobo-mission",
-            "OneStore/asobo-tutorials",
-            "OneStore/asobo-vcockpits",
-            "OneStore/asobo-simobjects",
-            "OneStore/asobo-services",
-            "OneStore/asobo-vcockpits",
-            "OneStore/asobo-l",
-            "OneStore/asobo-m",
-            "OneStore/asobo-vfx",
-            "OneStore/fs",
-            "OneStore/esd",
-            "OneStore/microsoft-airport",
-            "OneStore/microsoft-bushtrip",
-            "OneStore/microsoft-discovery",
-            */
             "landingchallenge",
             "tutorials",
 

src/plugins/simulator/CMakeLists.txt

@@ -46,4 +46,4 @@ endif()
 if(SWIFT_BUILD_FSX_PLUGIN)
     add_subdirectory(fsx)
     add_subdirectory(fsxconfig)
-endif()
+endif()

src/plugins/simulator/fscommon/fsuipcimpl.cpp

@@ -296,7 +296,6 @@ namespace swift::simplugin::fscommon
                 pitchRaw = qRound(std::floor(pitchRaw * angleCorrectionFactor));
                 bankRaw = qRound(std::floor(bankRaw * angleCorrectionFactor));
 
-                // TODO TZ: should MSFS2024 use FSUIPC?
                 // MSFS has inverted pitch and bank angles
                 pitchRaw = ~pitchRaw;
                 bankRaw = ~bankRaw;

src/plugins/simulator/fsxcommon/simconnectdatadefinition.cpp

@@ -425,7 +425,6 @@ namespace swift::simplugin::fsxcommon
         return hr;
     }
 
-    // TODO TZ: are there any changes in MSFS2024 ?
     HRESULT CSimConnectDefinitions::initMSFS2024Transponder(const HANDLE hSimConnect)
     {
         HRESULT hr = s_ok();