Merge branch 'coveritymovesme' into 'master'

Address more simple Coverity defects

See merge request OpenMW/openmw!4851

.clang-tidy

@@ -1,6 +1,7 @@
 Checks: >
   -*,
   portability-*,
+  -portability-template-virtual-member-function,
   clang-analyzer-*,
   -clang-analyzer-optin.*,
   -clang-analyzer-cplusplus.NewDeleteLeaks,
@@ -13,3 +14,9 @@ HeaderFilterRegex: '(apps|components)/'
 CheckOptions:
 - key: readability-identifier-naming.ConceptCase
   value: CamelCase
+- key: readability-identifier-naming.NamespaceCase
+  value: CamelCase
+- key: readability-identifier-naming.NamespaceIgnoredRegexp
+  value: 'bpo|osg(DB|FX|Particle|Shadow|Viewer|Util)?'
+- key: readability-identifier-naming.LocalVariableCase
+  value: camelBack

.github/workflows/push.yml

@@ -73,7 +73,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Install Building Dependencies
-      run: CI/before_install.osx.sh
+      run: CI/before_install.macos.sh
 
     - name: Prime ccache
       uses: hendrikmuhs/ccache-action@v1
@@ -82,11 +82,9 @@ jobs:
         max-size: 1000M
 
     - name: Configure
-      run: CI/before_script.osx.sh
+      run: CI/before_script.macos.sh
     - name: Build
-      run: |
-        cd build
-        make -j $(sysctl -n hw.logicalcpu) package
+      run: CI/macos/build.sh
 
   Output-Envs:
     name: Read .env file and expose it as output
@@ -106,7 +104,6 @@ jobs:
       fail-fast: true
       matrix:
         image:
-        - "2019"
         - "2022"
 
     uses: ./.github/workflows/windows.yml

.github/workflows/windows.yml

@@ -4,9 +4,13 @@ on:
   workflow_call:
     inputs:
       image:
-        description: MSVC image (2019/2022)
+        description: Window Server image
         required: true
         type: string
+      msvc:
+        description: MSVC version (2019/2022)
+        default: "2022"
+        type: string
       vcpkg-deps-tag:
         description: Git tag of our deps
         required: true
@@ -45,7 +49,7 @@ jobs:
     - name: Download prebuilt vcpkg packages
       working-directory: ${{ github.workspace }}/deps
       run: |
-        $MANIFEST = "vcpkg-x64-${{ inputs.image }}-${{ inputs.vcpkg-deps-tag }}.txt"
+        $MANIFEST = "vcpkg-x64-${{ inputs.msvc }}-${{ inputs.vcpkg-deps-tag }}.txt"
         curl --fail --retry 3 -L -o "$MANIFEST" "https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/$MANIFEST"
         $lines = Get-Content "$MANIFEST"
         $URL = $lines[0]
@@ -61,7 +65,7 @@ jobs:
 
     - name: Extract archived prebuilt vcpkg packages
       working-directory: ${{ github.workspace }}/deps
-      run: 7z x -y -ovcpkg-x64-${{ inputs.image }}-${{ inputs.vcpkg-deps-tag }} $env:archive
+      run: 7z x -y -ovcpkg-x64-${{ inputs.msvc }}-${{ inputs.vcpkg-deps-tag }} $env:archive
 
     - name: Cache Qt
       id: qt-cache
@@ -94,12 +98,12 @@ jobs:
         -B ${{ github.workspace }}/build
         -G Ninja
         -D CMAKE_BUILD_TYPE=${{ inputs.build-type }}
-        -D CMAKE_TOOLCHAIN_FILE='${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.image }}-${{ inputs.vcpkg-deps-tag }}/scripts/buildsystems/vcpkg.cmake'
+        -D CMAKE_TOOLCHAIN_FILE='${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.msvc }}-${{ inputs.vcpkg-deps-tag }}/scripts/buildsystems/vcpkg.cmake'
         -D CMAKE_PREFIX_PATH='${{ github.workspace }}/deps/Qt/6.6.3/msvc2019_64'
         ${{ inputs.package && '-D CMAKE_CXX_FLAGS_RELEASE="/O2 /Ob2 /DNDEBUG /Zi"' || '' }}
         ${{ inputs.package && '-D "CMAKE_EXE_LINKER_FLAGS_RELEASE=/DEBUG /INCREMENTAL:NO"' || '' }}
-        -D LuaJit_INCLUDE_DIR='${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.image }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/include/luajit'
-        -D LuaJit_LIBRARY='${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.image }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/lib/lua51.lib'
+        -D LuaJit_INCLUDE_DIR='${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.msvc }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/include/luajit'
+        -D LuaJit_LIBRARY='${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.msvc }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/lib/lua51.lib'
         -D BUILD_BENCHMARKS=${{ ! inputs.package }}
         -D BUILD_COMPONENTS_TESTS=${{ ! inputs.package }}
         -D BUILD_OPENMW_TESTS=${{ ! inputs.package }}
@@ -114,9 +118,9 @@ jobs:
 
     - name: Copy missing DLLs
       run: |
-        cp ${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.image }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/bin/Release/MyGUIEngine.dll ${{ github.workspace }}/build
-        cp -Filter *.dll -Recurse ${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.image }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/bin/osgPlugins-3.6.5 ${{ github.workspace }}/build
-        cp ${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.image }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/bin/*.dll ${{ github.workspace }}/build
+        cp ${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.msvc }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/bin/Release/MyGUIEngine.dll ${{ github.workspace }}/build
+        cp -Filter *.dll -Recurse ${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.msvc }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/bin/osgPlugins-3.6.5 ${{ github.workspace }}/build
+        cp ${{ github.workspace }}/deps/vcpkg-x64-${{ inputs.msvc }}-${{ inputs.vcpkg-deps-tag }}/installed/x64-windows/bin/*.dll ${{ github.workspace }}/build
 
     - name: Copy Qt DLLs
       working-directory: ${{ github.workspace }}/deps/Qt/6.6.3/msvc2019_64
@@ -172,7 +176,7 @@ jobs:
       env:
         GH_TOKEN: ${{ github.token }}
       run: |
-        job_url=$(gh run --repo ${{ github.repository }} view ${{ github.run_id }} --json jobs --jq '.jobs[] | select(.name == "windows-${{ inputs.image }}") | .url')
+        job_url=$(gh run --repo ${{ github.repository }} view ${{ github.run_id }} --json jobs --jq '.jobs[] | select(.name == "windows-${{ inputs.msvc }}") | .url')
         printf "Ref ${{ github.ref }}\nJob ${job_url}\nCommit ${{ github.sha }}\n" > install/CI-ID.txt
         cp install/CI-ID.txt pdb/CI-ID.txt
         cp install/CI-ID.txt SymStore/CI-ID.txt
@@ -180,19 +184,19 @@ jobs:
     - name: Store OpenMW archived pdb files
       uses: actions/upload-artifact@v4
       with:
-        name: openmw-windows-${{ inputs.image }}-pdb-${{ github.sha }}
+        name: openmw-windows-${{ inputs.msvc }}-pdb-${{ github.sha }}
         path: ${{ github.workspace }}/pdb/*
 
     - name: Store OpenMW build artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: openmw-windows-${{ inputs.image }}-${{ github.sha }}
+        name: openmw-windows-${{ inputs.msvc }}-${{ github.sha }}
         path: ${{ github.workspace }}/install/*
 
     - name: Store symbol server artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: openmw-windows-${{ inputs.image }}-sym-store-${{ github.sha }}
+        name: openmw-windows-${{ inputs.msvc }}-sym-store-${{ github.sha }}
         path: ${{ github.workspace }}/SymStore/*
 
     - name: Upload to symbol server

.gitlab-ci.yml

@@ -9,6 +9,8 @@ stages:
   - test
 
 workflow:
+  auto_cancel:
+    on_new_commit: interruptible
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
     - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
@@ -27,14 +29,14 @@ variables:
 .Ubuntu_Image:
   tags:
     - saas-linux-medium-amd64
-  image: ubuntu:22.04
+  image: ubuntu:24.04
   rules:
     - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event"
 
 Ubuntu_GCC_preprocess:
   extends: .Ubuntu_Image
   cache:
-    key: Ubuntu_GCC_preprocess.ubuntu_22.04.v1
+    key: Ubuntu_GCC_preprocess.ubuntu_24.04.v1
     paths:
       - apt-cache/
       - .cache/pip/
@@ -43,9 +45,12 @@ Ubuntu_GCC_preprocess:
     PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
   before_script:
     - CI/install_debian_deps.sh openmw-deps openmw-deps-dynamic gcc_preprocess
-    - pip3 install --user click termtables
+    - pip3 install --user --break-system-packages click termtables
   script:
     - CI/ubuntu_gcc_preprocess.sh
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_ID != "7107382"
 
 .Ubuntu:
   extends: .Ubuntu_Image
@@ -77,9 +82,9 @@ Ubuntu_GCC_preprocess:
     - if [[ "${BUILD_TESTS_ONLY}" && ! "${BUILD_WITH_CODE_COVERAGE}" ]]; then ./openmw_detournavigator_navmeshtilescache_benchmark; fi
     - if [[ "${BUILD_TESTS_ONLY}" && ! "${BUILD_WITH_CODE_COVERAGE}" ]]; then ./openmw_esm_refid_benchmark; fi
     - if [[ "${BUILD_TESTS_ONLY}" && ! "${BUILD_WITH_CODE_COVERAGE}" ]]; then ./openmw_settings_access_benchmark; fi
-    - ccache -s
+    - ccache -svv
     - df -h
-    - if [[ "${BUILD_WITH_CODE_COVERAGE}" ]]; then gcovr --xml-pretty --exclude-unreachable-branches --print-summary --root "${CI_PROJECT_DIR}" -j $(nproc) -o ../coverage.xml; fi
+    - if [[ "${BUILD_WITH_CODE_COVERAGE}" ]]; then ~/.local/bin/gcovr --xml-pretty --exclude-unreachable-branches --gcov-ignore-parse-errors=negative_hits.warn_once_per_file --print-summary --root "${CI_PROJECT_DIR}" -j $(nproc) -o ../coverage.xml; fi
     - ls | grep -v -e '^extern$' -e '^install$' -e '^components-tests.xml$' -e '^openmw-tests.xml$' -e '^openmw-cs-tests.xml$' | xargs -I '{}' rm -rf './{}'
     - cd ..
     - df -h
@@ -94,19 +99,20 @@ Ubuntu_GCC_preprocess:
 Coverity:
   tags:
     - saas-linux-medium-amd64
-  image: ubuntu:22.04
+  image: ubuntu:24.04
   stage: build
+  interruptible: false
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"
   cache:
-    key: Coverity.ubuntu_22.04.v1
+    key: Coverity.ubuntu_24.04.v1
     paths:
     - apt-cache/
     - ccache/
   variables:
     CCACHE_SIZE: 2G
-    CC: clang-12
-    CXX: clang++-12
+    CC: clang
+    CXX: clang++
     CMAKE_BUILD_TYPE: Debug
     CMAKE_CXX_FLAGS_DEBUG: -O0
   before_script:
@@ -122,23 +128,40 @@ Coverity:
     - ccache -z -M "${CCACHE_SIZE}"
     - CI/before_script.linux.sh
     - cov-analysis-linux64-*/bin/cov-configure --template --comptype prefix --compiler ccache
-    # Remove the specific targets and build everything once we can do it under 3h
     - cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build build -- -j $(nproc)
-    - ccache -s
-  after_script:
+    - ccache -svv
     - tar cfz cov-int.tar.gz cov-int
-    - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME
-      --form token=$COVERITY_SCAN_TOKEN --form email=$GITLAB_USER_EMAIL
-      --form file=@cov-int.tar.gz --form version="$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA"
-      --form description="CI_COMMIT_SHORT_SHA / $CI_COMMIT_TITLE / $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID"
+    - echo "OPENMW_JOB_ID=$CI_JOB_ID" >> build.env
   artifacts:
+    expire_in: 1 day
     paths:
       - /builds/OpenMW/openmw/cov-int/build-log.txt
+      - /builds/OpenMW/openmw/cov-int.tar.gz
+    reports:
+      dotenv: build.env
+
+Coverity_Upload:
+  image: ubuntu:24.04
+  stage: build
+  interruptible: false
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+  before_script:
+    - CI/install_debian_deps.sh coverity_upload
+  script:
+    - echo "$CI_API_V4_URL/projects/$CI_PROJECT_ID/jobs/$OPENMW_JOB_ID/artifacts/cov-int.tar.gz"
+    - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME
+      --form token=$COVERITY_SCAN_TOKEN --form email=$GITLAB_USER_EMAIL
+      --form version="$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA"
+      --form description="CI_COMMIT_SHORT_SHA / $CI_COMMIT_TITLE / $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID"
+      --form url="$CI_API_V4_URL/projects/$CI_PROJECT_ID/jobs/$OPENMW_JOB_ID/artifacts/cov-int.tar.gz"
+  needs:
+    - Coverity
 
 Ubuntu_GCC:
   extends: .Ubuntu
   cache:
-    key: Ubuntu_GCC.ubuntu_22.04.v1
+    key: Ubuntu_GCC.ubuntu_24.04.v1
   before_script:
     - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
   variables:
@@ -151,7 +174,7 @@ Ubuntu_GCC:
 Ubuntu_GCC_asan:
   extends: Ubuntu_GCC
   cache:
-    key: Ubuntu_GCC_asan.ubuntu_22.04.v1
+    key: Ubuntu_GCC_asan.ubuntu_24.04.v1
   variables:
     CMAKE_BUILD_TYPE: Debug
     CMAKE_CXX_FLAGS_DEBUG: -g -O1 -fno-omit-frame-pointer -fsanitize=address -fsanitize=pointer-subtract -fsanitize=leak
@@ -164,7 +187,7 @@ Clang_Format:
   extends: .Ubuntu_Image
   stage: checks
   cache:
-    key: Ubuntu_Clang_Format.ubuntu_22.04.v1
+    key: Ubuntu_Clang_Format.ubuntu_24.04.v1
     paths:
       - apt-cache/
   variables:
@@ -180,11 +203,11 @@ Lupdate:
   extends: .Ubuntu_Image
   stage: checks
   cache:
-    key: Ubuntu_lupdate.ubuntu_22.04.v1
+    key: Ubuntu_lupdate.ubuntu_24.04.v1
     paths:
       - apt-cache/
   variables:
-    LUPDATE: lupdate
+    LUPDATE: /usr/lib/qt6/bin/lupdate
   before_script:
     - CI/install_debian_deps.sh openmw-qt-translations
   script:
@@ -206,7 +229,7 @@ Teal:
 Ubuntu_GCC_Debug:
   extends: .Ubuntu
   cache:
-    key: Ubuntu_GCC_Debug.ubuntu_22.04.v2
+    key: Ubuntu_GCC_Debug.ubuntu_24.04.v2
   before_script:
     - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
   variables:
@@ -222,7 +245,7 @@ Ubuntu_GCC_Debug:
 Ubuntu_GCC_tests:
   extends: Ubuntu_GCC
   cache:
-    key: Ubuntu_GCC_tests.ubuntu_22.04.v1
+    key: Ubuntu_GCC_tests.ubuntu_24.04.v1
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -236,7 +259,7 @@ Ubuntu_GCC_tests:
 .Ubuntu_GCC_tests_Debug:
   extends: Ubuntu_GCC
   cache:
-    key: Ubuntu_GCC_tests_Debug.ubuntu_22.04.v1
+    key: Ubuntu_GCC_tests_Debug.ubuntu_24.04.v1
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -252,7 +275,7 @@ Ubuntu_GCC_tests:
 Ubuntu_GCC_tests_asan:
   extends: Ubuntu_GCC
   cache:
-    key: Ubuntu_GCC_tests_asan.ubuntu_22.04.v1
+    key: Ubuntu_GCC_tests_asan.ubuntu_24.04.v1
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -268,11 +291,14 @@ Ubuntu_GCC_tests_asan:
     when: always
     reports:
       junit: build/*-tests.xml
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_ID != "7107382"
 
 Ubuntu_GCC_tests_ubsan:
   extends: Ubuntu_GCC
   cache:
-    key: Ubuntu_GCC_tests_ubsan.ubuntu_22.04.v1
+    key: Ubuntu_GCC_tests_ubsan.ubuntu_24.04.v1
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -285,11 +311,14 @@ Ubuntu_GCC_tests_ubsan:
     when: always
     reports:
       junit: build/*-tests.xml
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_ID != "7107382"
 
 .Ubuntu_GCC_tests_tsan:
   extends: Ubuntu_GCC
   cache:
-    key: Ubuntu_GCC_tests_tsan.ubuntu_22.04.v1
+    key: Ubuntu_GCC_tests_tsan.ubuntu_24.04.v1
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -307,11 +336,15 @@ Ubuntu_GCC_tests_ubsan:
 Ubuntu_GCC_tests_coverage:
   extends: .Ubuntu_GCC_tests_Debug
   cache:
-    key: Ubuntu_GCC_tests_coverage.ubuntu_22.04.v1
+    key: Ubuntu_GCC_tests_coverage.ubuntu_24.04.v1
+    paths:
+      - .cache/pip
   variables:
     BUILD_WITH_CODE_COVERAGE: 1
+    PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
   before_script:
     - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic openmw-coverage
+    - pipx install gcovr
   coverage: /^\s*lines:\s*\d+.\d+\%/
   artifacts:
     paths: []
@@ -322,6 +355,9 @@ Ubuntu_GCC_tests_coverage:
         coverage_format: cobertura
         path: coverage.xml
       junit: build/*-tests.xml
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_ID != "7107382"
 
 .Ubuntu_Static_Deps:
   extends: Ubuntu_Clang
@@ -333,7 +369,7 @@ Ubuntu_GCC_tests_coverage:
         - "CI/**/*"
         - ".gitlab-ci.yml"
   cache:
-    key: Ubuntu_Static_Deps.ubuntu_22.04.v1
+    key: Ubuntu_Static_Deps.ubuntu_24.04.v1
     paths:
       - apt-cache/
       - ccache/
@@ -350,7 +386,7 @@ Ubuntu_GCC_tests_coverage:
 .Ubuntu_Static_Deps_tests:
   extends: .Ubuntu_Static_Deps
   cache:
-    key: Ubuntu_Static_Deps_tests.ubuntu_22.04.v1
+    key: Ubuntu_Static_Deps_tests.ubuntu_24.04.v1
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -369,7 +405,7 @@ Ubuntu_Clang:
   before_script:
     - CI/install_debian_deps.sh clang openmw-deps openmw-deps-dynamic
   cache:
-    key: Ubuntu_Clang.ubuntu_22.04.v2
+    key: Ubuntu_Clang.ubuntu_24.04.v2
   variables:
     CC: clang
     CXX: clang++
@@ -382,7 +418,7 @@ Ubuntu_Clang:
   before_script:
     - CI/install_debian_deps.sh clang clang-tidy openmw-deps openmw-deps-dynamic
   cache:
-    key: Ubuntu_Clang_Tidy.ubuntu_22.04.v1
+    key: Ubuntu_Clang_Tidy.ubuntu_24.04.v1
   variables:
     CMAKE_BUILD_TYPE: Debug
     CMAKE_CXX_FLAGS_DEBUG: -O0
@@ -393,15 +429,19 @@ Ubuntu_Clang:
     - mkdir -pv "${CCACHE_DIR}"
     - ccache -z -M "${CCACHE_SIZE}"
     - CI/before_script.linux.sh
+    - cp extern/.clang-tidy build/.clang-tidy
     - cd build
     - find . -name *.o -exec touch {} \;
     - cmake --build . -- -j $(nproc) ${BUILD_TARGETS}
-    - ccache -s
+    - ccache -svv
   artifacts:
     paths:
       - build/
     expire_in: 12h
   timeout: 3h
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_ID != "7107382"
 
 Ubuntu_Clang_Tidy_components:
   extends: .Ubuntu_Clang_Tidy_Base
@@ -414,7 +454,7 @@ Ubuntu_Clang_Tidy_openmw:
   needs:
     - Ubuntu_Clang_Tidy_components
   variables:
-    BUILD_TARGETS: openmw
+    BUILD_TARGETS: openmw openmw-tests
   timeout: 3h
 
 Ubuntu_Clang_Tidy_openmw-cs:
@@ -430,13 +470,13 @@ Ubuntu_Clang_Tidy_other:
   needs:
     - Ubuntu_Clang_Tidy_components
   variables:
-    BUILD_TARGETS: bsatool esmtool openmw-launcher openmw-iniimporter openmw-essimporter openmw-wizard niftest components-tests openmw-tests openmw-cs-tests openmw-navmeshtool openmw-bulletobjecttool
+    BUILD_TARGETS: components-tests bsatool esmtool openmw-launcher openmw-iniimporter openmw-essimporter openmw-wizard niftest openmw-navmeshtool openmw-bulletobjecttool
   timeout: 3h
 
 .Ubuntu_Clang_tests:
   extends: Ubuntu_Clang
   cache:
-    key: Ubuntu_Clang_tests.ubuntu_22.04.v1
+    key: Ubuntu_Clang_tests.ubuntu_24.04.v1
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -450,7 +490,7 @@ Ubuntu_Clang_Tidy_other:
 Ubuntu_Clang_tests_Debug:
   extends: Ubuntu_Clang
   cache:
-    key: Ubuntu_Clang_tests_Debug.ubuntu_22.04.v1
+    key: Ubuntu_Clang_tests_Debug.ubuntu_24.04.v1
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -467,14 +507,14 @@ Ubuntu_Clang_tests_Debug:
   stage: test
   variables:
     PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
-    EXAMPLE_SUITE_REVISION: f51b832e033429a7cdc520e0e48d7dfdb9141caa
+    EXAMPLE_SUITE_REVISION: 3e01d10e073474a886a9efe3658088db14869627
   cache:
     paths:
       - .cache/pip
       - apt-cache/
   before_script:
     - CI/install_debian_deps.sh $OPENMW_DEPS
-    - pip3 install --user numpy matplotlib termtables click
+    - pip3 install --user --break-system-packages numpy matplotlib termtables click
   script:
     - CI/run_integration_tests.sh
   after_script:
@@ -485,7 +525,7 @@ Ubuntu_Clang_integration_tests:
   needs:
     - Ubuntu_Clang
   cache:
-    key: Ubuntu_Clang_integration_tests.ubuntu_22.04.v2
+    key: Ubuntu_Clang_integration_tests.ubuntu_24.04.v2
   variables:
     OPENMW_DEPS: openmw-integration-tests
 
@@ -494,27 +534,35 @@ Ubuntu_GCC_integration_tests_asan:
   needs:
     - Ubuntu_GCC_asan
   cache:
-    key: Ubuntu_GCC_integration_tests_asan.ubuntu_22.04.v1
+    key: Ubuntu_GCC_integration_tests_asan.ubuntu_24.04.v1
   variables:
-    OPENMW_DEPS: openmw-integration-tests libasan6
+    OPENMW_DEPS: openmw-integration-tests libasan
     ASAN_OPTIONS: halt_on_error=1:strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:detect_leaks=0
 
 .MacOS:
   stage: build
   rules:
-    - if: $CI_PROJECT_ID == "7107382"
+    - if: $CI_PROJECT_ID != "7107382"
+      when: never
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      when: manual
+    - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule"
+  image: macos-15-xcode-16
+  tags:
+    - saas-macos-medium-m1
   cache:
     paths:
     - ccache/
   script:
-    - CI/before_install.osx.sh
+    - CI/before_install.macos.sh
     - export CCACHE_BASEDIR="$(pwd)"
     - export CCACHE_DIR="$(pwd)/ccache"
     - mkdir -pv "${CCACHE_DIR}"
-    - ccache -z -M "${CCACHE_SIZE}"
-    - CI/before_script.osx.sh
-    - cd build; make -j $(sysctl -n hw.logicalcpu) package
-    - for dmg in *.dmg; do mv "$dmg" "${dmg%.dmg}_${CI_COMMIT_REF_NAME##*/}.dmg"; done
+    - CI/macos/ccache_prep.sh
+    - CI/before_script.macos.sh
+    - CI/macos/build.sh
+    - cd build
+    - for dmg in *.dmg; do mv "$dmg" "${dmg%.dmg}_${DMG_IDENTIFIER}_${CI_COMMIT_REF_NAME##*/}.dmg"; done
     - |
       if [[ -n "${AWS_ACCESS_KEY_ID}" ]]; then
         echo "[default]" > ~/.s3cfg
@@ -529,20 +577,33 @@ Ubuntu_GCC_integration_tests_asan:
           s3cmd put "${dmg}" s3://openmw-artifacts/${artifactDirectory}
         done
       fi
-    - ccache -s
+    - ../CI/macos/ccache_save.sh
   artifacts:
     paths:
       - build/OpenMW-*.dmg
 
-macOS14_Xcode15_arm64:
+macOS15_Xcode16_amd64:
   extends: .MacOS
-  image: macos-14-xcode-15
-  tags:
-    - saas-macos-medium-m1
   cache:
-    key: macOS14_Xcode15_arm64.v1
+    key: macOS15_Xcode16_amd64.v1
   variables:
     CCACHE_SIZE: 3G
+    DMG_IDENTIFIER: amd64
+    MACOS_AMD64: true
+    HOMEBREW_NO_AUTO_UPDATE: 1
+    HOMEBREW_NO_EMOJI: true
+    HOMEBREW_NO_INSTALL_CLEANUP: true
+
+macOS15_Xcode16_arm64:
+  extends: .MacOS
+  cache:
+    key: macOS15_Xcode16_arm64.v1
+  variables:
+    DMG_IDENTIFIER: arm64
+    CCACHE_SIZE: 3G
+    HOMEBREW_NO_AUTO_UPDATE: 1
+    HOMEBREW_NO_EMOJI: true
+    HOMEBREW_NO_INSTALL_CLEANUP: true
 
 .Compress_And_Upload_Symbols_Base:
   extends: .Ubuntu_Image
@@ -667,7 +728,7 @@ macOS14_Xcode15_arm64:
     - Get-Volume
     - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
   cache:
-    key: ninja-2022-v12
+    key: ninja-2022-v13
     paths:
     - ccache
     - deps
@@ -825,7 +886,7 @@ macOS14_Xcode15_arm64:
     - Get-Volume
     - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log
   cache:
-    key: msbuild-2022-v12
+    key: msbuild-2022-v13
     paths:
     - deps
     - MSVC2022_64/deps/Qt
@@ -926,7 +987,7 @@ Windows_MSBuild_CacheInit:
     - cd build
     - cmake --build . -- -j $(nproc)
     # - cmake --install .  # no one uses builds anyway, disable until 'no space left' is resolved
-    - ccache -s
+    - ccache -svv
     - df -h
     - ls | grep -v -e '^extern$' -e '^install$' | xargs -I '{}' rm -rf './{}'
     - cd ..
@@ -954,7 +1015,7 @@ Windows_MSBuild_CacheInit:
     paths:
       - .cache/pip
   before_script:
-    - pip3 install --user requests click discord_webhook
+    - pip3 install --user --break-system-packages requests click discord_webhook
   script:
     - scripts/find_missing_merge_requests.py --project_id=$CI_PROJECT_ID --ignored_mrs_path=$CI_PROJECT_DIR/.resubmitted_merge_requests.txt
 

.readthedocs.yaml

@@ -10,4 +10,4 @@ python:
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.8"
+    python: "3.9"

AUTHORS.md

@@ -10,7 +10,8 @@ If you feel your name is missing from this list, please add it to `AUTHORS.md`.
 Programmers
 -----------
 
-    Bret Curtis (psi29a) - Project leader 2019-present
+    Alexey Dobrokhotov (Capo) - Project leader 2025-present
+    Bret Curtis (psi29a) - Project leader 2019-2025
     Marc Zinnschlag (Zini) - Project leader 2010-2018
     Nicolay Korslund - Project leader 2008-2010
     scrawl - Top contributor
@@ -49,10 +50,10 @@ Programmers
     Berulacks
     Bo Svensson
     Britt Mathis (galdor557)
-    Capostrophic
     Carl Maxwell
     cc9cii
     Cédric Mocquillon
+    Charles Horn
     Chris Boyce (slothlife)
     Chris Robinson (KittyCat)
     Chris Vigil
@@ -196,7 +197,7 @@ Programmers
     Qlonever
     Radu-Marius Popovici (rpopovici)
     Rafael Moura (dhustkoder)
-    Randy Davin (Kindi)
+    Randy Davin (Kuyondo)
     rdimesio
     rexelion
     riothamus

CHANGELOG.md

@@ -1,3 +1,97 @@
+0.50.0
+------
+
+    Bug #2967: Inventory windows don't update when changing items by script
+    Bug #4437: Transformations for NiSkinInstance are ignored
+    Bug #4885: Disable in dialogue result script causes a crash
+    Bug #5331: Pathfinding works incorrectly when actor is moved from one interior cell to another
+    Bug #6029: Hostile NPCs are perfectly aware of a player character with a 75% Chameleon effect
+    Bug #6039: Next Spell keybind fails while selected enchanted item has multiple copies
+    Bug #6573: Editor: Selection behaves incorrectly on high-DPI displays
+    Bug #6792: Birth sign info box has no line breaks
+    Bug #7371: Equipping item from inventory does not play a Down sound when equipping fails
+    Bug #7622: Player's marksman weapons don't work on close actors underwater
+    Bug #7649: The sound and vfx of resisted enchanted items' magic still play
+    Bug #7693: I.ItemUsage should return an item to the selected stack if equipping/consumption is denied
+    Bug #7740: Magic items in the HUD aren't composited correctly
+    Bug #7799: Picking up ingredients while object paging active grid is on may cause a hiccup
+    Bug #7871: Kwama Queen doesn't start combat with player
+    Bug #7979: Paralyzed NPCs battlecry
+    Bug #8012: Startcombat and Stopcombat do not affect music in the menu mode
+    Bug #8245: The console command ShowVars does not list global mwscripts
+    Bug #8265: Topics are linked incorrectly
+    Bug #8303: On target spells cast by non-actors should fire underwater
+    Bug #8309: RemoveSpell should instantly remove the spell's effects
+    Bug #8318: Missing global variables are not handled gracefully in dialogue conditions
+    Bug #8333: Quest status subrecords should not actually cause parsing to skip remaining data
+    Bug #8340: Multi-effect enchantments are too expensive
+    Bug #8341: Repeat shader visitor passes discard parallax
+    Bug #8349: Travel to non-existent cell causes persistent black screen
+    Bug #8359: Some quick keys menu related issues
+    Bug #8371: Silence affects powers
+    Bug #8375: Moon phase cycle doesn't match Morrowind
+    Bug #8383: Casting bound helm or boots on beast races doesn't cleanup properly
+    Bug #8385: Russian encoding broken with locale parameters and calendar
+    Bug #8399: Jail skill increases don't count as progress towards the next level
+    Bug #8404: Prevent merchant equipping breaks on lights
+    Bug #8408: OpenMW doesn't report all the potential resting hindrances
+    Bug #8414: Waterwalking works when collision is disabled
+    Bug #8431: Behaviour of removed items from a container is buggy
+    Bug #8432: Changing to and from an interior cell doesn't update collision
+    Bug #8433: Wandering NPCs are not capable of avoiding easy obstacles
+    Bug #8436: Spell selection in a pinned spellbook window doesn't update
+    Bug #8437: Pinned inventory window's pin button doesn't look pressed
+    Bug #8446: Travel prices are strangely inconsistent
+    Bug #8447: Werewolf swimming animation breaks in third person perspective
+    Bug #8459: Changing magic effect base cost doesn't change spell price
+    Bug #8466: Showmap "" reveals nameless cells
+    Bug #8485: Witchwither disease and probably other common diseases don't work correctly
+    Bug #8490: Normals on Water disappear when Water Shader is Enabled but Refraction is Disabled
+    Bug #8500: OpenMW Alarm behaviour doesn't match morrowind.exe
+    Bug #8519: Multiple bounty is sometimes assigned to player when detected during a pickpocketing action
+    Bug #8540: Magic resistance is applied to effects without a magnitude
+    Bug #8557: Charm's disposition changes capped on 100, uncapped below 0
+    Bug #8582: addScript-attached local scripts start out inactive
+    Bug #8584: Spacing of service menu list entries is inconsistent
+    Bug #8585: Dialogue topic list doesn't have enough padding
+    Bug #8587: Minor INI importer problems
+    Bug #8593: Render targets do not generate mipmaps
+    Bug #8598: Post processing shaders don't interact with the vfs correctly
+    Bug #8599: Non-ASCII paths in BSA files don't work
+    Bug #8606: Floating point imprecision can mess with container capacity
+    Bug #8609: The crosshair is too large
+    Bug #8610: Terrain normal maps using NormalGL format instead of NormalDX
+    Bug #8612: Using aiactivate on an ingredient when graphical herbalism is enabled triggers non-stop pickup sounds
+    Bug #8614: Lua garbage collection fails to remove unused data
+    Bug #8615: Rest/wait time progress speed is different from vanilla
+    Bug #8620: Create/CloneCommand can reuse refNums, causing severe issues in-game
+    Bug #8650: Some plants turn invisible when being called types.Container.inventory(cont):isResolved()
+    Feature #2522: Support quick item transfer
+    Feature #3740: Gamepad GUI Mode
+    Feature #3769: Allow GetSpellEffects on enchantments
+    Feature #6000: Oblivion terrain rendering
+    Feature #6976: [Lua] Weather API
+    Feature #7813: Add audio doppler for 3d sounds
+    Feature #7966: Add Lua read access to TES3 player's journal records
+    Feature #8077: Save settings changes when clicking "ok"/closing the window
+    Feature #8112: Expose landscape record data to Lua
+    Feature #8113: Support extended selection in autodetected subdirectory dialog
+    Feature #8139: Editor: Redesign the selection markers
+    Feature #8285: Expose list of active shaders in postprocessing API
+    Feature #8290: Show player gold in Spellmaking
+    Feature #8313: Show the character name in the savegame details
+    Feature #8320: Add access mwscript source text to lua api
+    Feature #8334: Lua: AddTopic equivalent
+    Feature #8355: Lua: Window visibility checking in interfaces.UI
+    Feature #8509: FillJournal script instruction
+    Feature #8579: Bulk (un)indentation in mwscript editor
+    Feature #8580: Sort characters in the save loading menu
+    Feature #8597: Lua: Add more built-in event handlers
+    Feature #8629: Expose path grid data to Lua
+    Feature #8642: Partially dehardcode on-hit mechanics
+    Feature #8654: Allow lua world.createRecord to create NPC records
+    Task #8578: Drop support for Qt5
+
 0.49.0
 ------
 
@@ -236,6 +330,8 @@
     Bug #8465: Blue screen w/ antialiasing and post-processing on macOS
     Bug #8503: Camera does not handle NaN gracefully
     Bug #8541: Lua: util.color:asHex produces wrong output for some colors
+    Bug #8567: Token replacement does not work via CLI and relative paths passed via the command line are not relative to the CWD
+    Bug #8576: Crash on exit when unresolving containers with scripted items
     Feature #1415: Infinite fall failsafe
     Feature #2566: Handle NAM9 records for manual cell references
     Feature #3501: OpenMW-CS: Instance Editing - Shortcuts for axial locking

CI/before_install.macos.sh

@@ -0,0 +1,7 @@
+#!/bin/sh -ex
+
+if [[ "${MACOS_AMD64}" ]]; then
+    ./CI/macos/before_install.amd64.sh
+else
+    ./CI/macos/before_install.arm64.sh
+fi

CI/before_install.osx.sh

@@ -1,30 +0,0 @@
-#!/bin/sh -ex
-
-export HOMEBREW_NO_EMOJI=1
-export HOMEBREW_NO_INSTALL_CLEANUP=1
-export HOMEBREW_AUTOREMOVE=1
-
-brew tap --repair
-brew update --quiet
-
-brew install curl xquartz gd fontconfig freetype harfbuzz brotli s3cmd
-
-command -v ccache >/dev/null 2>&1 || brew install ccache
-command -v cmake >/dev/null 2>&1 || brew install cmake
-command -v qmake >/dev/null 2>&1 || brew install qt@5
-export PATH="/opt/homebrew/opt/qt@5/bin:$PATH"
-
-# Install deps
-brew install openal-soft icu4c yaml-cpp sqlite
-
-ccache --version
-cmake --version
-qmake --version
-
-if [[ "${MACOS_AMD64}" ]]; then
-    curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20240802.zip -o ~/openmw-deps.zip
-    unzip -o ~/openmw-deps.zip -d /tmp > /dev/null
-else
-    curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20240818-arm64.tar.xz -o ~/openmw-deps.tar.xz
-    tar xf ~/openmw-deps.tar.xz -C /tmp > /dev/null
-fi

CI/before_script.macos.sh

@@ -0,0 +1,77 @@
+#!/bin/sh -e
+
+# Silence a git warning
+git config --global advice.detachedHead false
+
+rm -fr build
+mkdir build
+cd build
+
+DEPENDENCIES_ROOT="/tmp/openmw-deps"
+
+if [[ "${MACOS_AMD64}" ]]; then
+    QT_PATH=$(arch -x86_64 /usr/local/bin/brew --prefix qt@6)
+    ICU_PATH=$(arch -x86_64 /usr/local/bin/brew --prefix icu4c)
+    OPENAL_PATH=$(arch -x86_64 /usr/local/bin/brew --prefix openal-soft)
+    CCACHE_EXECUTABLE=$(arch -x86_64 /usr/local/bin/brew --prefix ccache)/bin/ccache
+else
+    QT_PATH=$(brew --prefix qt@6)
+    ICU_PATH=$(brew --prefix icu4c)
+    OPENAL_PATH=$(brew --prefix openal-soft)
+    CCACHE_EXECUTABLE=$(brew --prefix ccache)/bin/ccache
+fi
+
+declare -a CMAKE_CONF_OPTS=(
+-D CMAKE_PREFIX_PATH="$DEPENDENCIES_ROOT;$QT_PATH;$OPENAL_PATH"
+-D CMAKE_C_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE"
+-D CMAKE_CXX_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE"
+-D CMAKE_CXX_FLAGS="-stdlib=libc++"
+-D CMAKE_C_COMPILER="clang"
+-D CMAKE_CXX_COMPILER="clang++"
+-D CMAKE_OSX_DEPLOYMENT_TARGET="13.6"
+-D OPENMW_USE_SYSTEM_RECASTNAVIGATION=TRUE
+-D Boost_INCLUDE_DIR="$DEPENDENCIES_ROOT/include"
+-D OSGPlugins_LIB_DIR="$DEPENDENCIES_ROOT/lib/osgPlugins-3.6.5"
+-D ICU_ROOT="$ICU_PATH"
+-D OPENMW_OSX_DEPLOYMENT=TRUE
+)
+
+declare -a BUILD_OPTS=(
+-D BUILD_OPENMW=TRUE
+-D BUILD_OPENCS=TRUE
+-D BUILD_ESMTOOL=TRUE
+-D BUILD_BSATOOL=TRUE
+-D BUILD_ESSIMPORTER=TRUE
+-D BUILD_NIFTEST=TRUE
+-D BUILD_NAVMESHTOOL=TRUE
+-D BUILD_BULLETOBJECTTOOL=TRUE
+-G"Unix Makefiles"
+)
+
+if [[ "${MACOS_AMD64}" ]]; then
+    CMAKE_CONF_OPTS+=(
+        -D CMAKE_OSX_ARCHITECTURES="x86_64"
+    )
+fi
+
+if [[ "${CMAKE_BUILD_TYPE}" ]]; then
+    CMAKE_CONF_OPTS+=(
+        -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    )
+else
+    CMAKE_CONF_OPTS+=(
+        -D CMAKE_BUILD_TYPE=RelWithDebInfo
+    )
+fi
+
+if [[ "${MACOS_AMD64}" ]]; then
+    arch -x86_64 cmake \
+        "${CMAKE_CONF_OPTS[@]}" \
+        "${BUILD_OPTS[@]}" \
+        ..
+else
+    cmake \
+        "${CMAKE_CONF_OPTS[@]}" \
+        "${BUILD_OPTS[@]}" \
+        ..
+fi

CI/before_script.msvc.sh

@@ -377,6 +377,8 @@ case $VS_VERSION in
 		MSVC_DISPLAY_YEAR="2022"
 
 		QT_MSVC_YEAR="2019"
+
+		VCPKG_TRIPLET="x64-windows"
 		;;
 
 	16|16.0|2019 )
@@ -386,6 +388,8 @@ case $VS_VERSION in
 		MSVC_DISPLAY_YEAR="2019"
 
 		QT_MSVC_YEAR="2019"
+
+		VCPKG_TRIPLET="x64-windows-2019"
 		;;
 
 	15|15.0|2017 )
@@ -546,7 +550,7 @@ fi
 QT_VER='6.6.3'
 AQT_VERSION='v3.1.15'
 
-VCPKG_TAG="2024-11-10"
+VCPKG_TAG="2025-07-23"
 VCPKG_PATH="vcpkg-x64-${VS_VERSION:?}-${VCPKG_TAG:?}"
 VCPKG_PDB_PATH="vcpkg-x64-${VS_VERSION:?}-pdb-${VCPKG_TAG:?}"
 VCPKG_MANIFEST="${VCPKG_PATH:?}.txt"
@@ -633,16 +637,16 @@ printf "vcpkg packages ${VCPKG_TAG:?}... "
 	fi
 
 	add_cmake_opts -DCMAKE_TOOLCHAIN_FILE="$(real_pwd)/${VCPKG_PATH:?}/scripts/buildsystems/vcpkg.cmake"
-	add_cmake_opts -DLuaJit_INCLUDE_DIR="$(real_pwd)/${VCPKG_PATH:?}/installed/x64-windows/include/luajit"
-	add_cmake_opts -DLuaJit_LIBRARY="$(real_pwd)/${VCPKG_PATH:?}/installed/x64-windows/lib/lua51.lib"
+	add_cmake_opts -DLuaJit_INCLUDE_DIR="$(real_pwd)/${VCPKG_PATH:?}/installed/${VCPKG_TRIPLET}/include/luajit"
+	add_cmake_opts -DLuaJit_LIBRARY="$(real_pwd)/${VCPKG_PATH:?}/installed/${VCPKG_TRIPLET}/lib/lua51.lib"
 
 	for CONFIGURATION in ${CONFIGURATIONS[@]}; do
 		if [[ ${CONFIGURATION:?} == "Debug" ]]; then
-			VCPKG_DLL_BIN="$(pwd)/${VCPKG_PATH:?}/installed/x64-windows/debug/bin"
+			VCPKG_DLL_BIN="$(pwd)/${VCPKG_PATH:?}/installed/${VCPKG_TRIPLET}/debug/bin"
 
 			add_runtime_dlls ${CONFIGURATION:?} "${VCPKG_DLL_BIN:?}/Debug/MyGUIEngine_d.dll"
 		else
-			VCPKG_DLL_BIN="$(pwd)/${VCPKG_PATH:?}/installed/x64-windows/bin"
+			VCPKG_DLL_BIN="$(pwd)/${VCPKG_PATH:?}/installed/${VCPKG_TRIPLET}/bin"
 
 			add_runtime_dlls ${CONFIGURATION:?} "${VCPKG_DLL_BIN:?}/Release/MyGUIEngine.dll"
 		fi
@@ -704,7 +708,6 @@ printf "Qt ${QT_VER}... "
 			DLLSUFFIX=""
 		fi
 
-		if [ "${QT_MAJOR_VER}" -eq 6 ]; then
 		add_runtime_dlls $CONFIGURATION "$(pwd)/bin/Qt${QT_MAJOR_VER}"{Core,Gui,Network,OpenGL,OpenGLWidgets,Widgets,Svg}${DLLSUFFIX}.dll
 
 		# Since Qt 6.7.0 plugin is called "qmodernwindowsstyle"
@@ -713,10 +716,6 @@ printf "Qt ${QT_VER}... "
 		else
 			add_qt_style_dlls $CONFIGURATION "$(pwd)/plugins/styles/qwindowsvistastyle${DLLSUFFIX}.dll"
 		fi
-		else
-			add_runtime_dlls $CONFIGURATION "$(pwd)/bin/Qt${QT_MAJOR_VER}"{Core,Gui,Network,OpenGL,Widgets,Svg}${DLLSUFFIX}.dll
-			add_qt_style_dlls $CONFIGURATION "$(pwd)/plugins/styles/qwindowsvistastyle${DLLSUFFIX}.dll"
-		fi
 
 		add_qt_platform_dlls $CONFIGURATION "$(pwd)/plugins/platforms/qwindows${DLLSUFFIX}.dll"
 		add_qt_image_dlls $CONFIGURATION "$(pwd)/plugins/imageformats/qsvg${DLLSUFFIX}.dll"

CI/before_script.osx.sh

@@ -1,53 +0,0 @@
-#!/bin/sh -e
-
-# Silence a git warning
-git config --global advice.detachedHead false
-
-rm -fr build
-mkdir build
-cd build
-
-DEPENDENCIES_ROOT="/tmp/openmw-deps"
-
-QT_PATH=$(brew --prefix qt@5)
-ICU_PATH=$(brew --prefix icu4c)
-OPENAL_PATH=$(brew --prefix openal-soft)
-CCACHE_EXECUTABLE=$(brew --prefix ccache)/bin/ccache
-
-declare -a CMAKE_CONF_OPTS=(
--D CMAKE_PREFIX_PATH="$DEPENDENCIES_ROOT;$QT_PATH;$OPENAL_PATH"
--D CMAKE_C_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE"
--D CMAKE_CXX_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE"
--D CMAKE_CXX_FLAGS="-stdlib=libc++"
--D CMAKE_C_COMPILER="clang"
--D CMAKE_CXX_COMPILER="clang++"
--D CMAKE_OSX_DEPLOYMENT_TARGET="13.6"
--D OPENMW_USE_SYSTEM_RECASTNAVIGATION=TRUE
--D Boost_INCLUDE_DIR="$DEPENDENCIES_ROOT/include"
--D OSGPlugins_LIB_DIR="$DEPENDENCIES_ROOT/lib/osgPlugins-3.6.5"
--D ICU_ROOT="$ICU_PATH"
--D OPENMW_OSX_DEPLOYMENT=TRUE
-)
-
-if [[ "${CMAKE_BUILD_TYPE}" ]]; then
-    CMAKE_CONF_OPTS+=(
-        -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-    )
-else
-    CMAKE_CONF_OPTS+=(
-        -D CMAKE_BUILD_TYPE=RelWithDebInfo
-    )
-fi
-
-cmake \
-"${CMAKE_CONF_OPTS[@]}" \
--D BUILD_OPENMW=TRUE \
--D BUILD_OPENCS=TRUE \
--D BUILD_ESMTOOL=TRUE \
--D BUILD_BSATOOL=TRUE \
--D BUILD_ESSIMPORTER=TRUE \
--D BUILD_NIFTEST=TRUE \
--D BUILD_NAVMESHTOOL=TRUE \
--D BUILD_BULLETOBJECTTOOL=TRUE \
--G"Unix Makefiles" \
-..

CI/check_file_names.sh

@@ -1,7 +1,6 @@
 #!/bin/bash -ex
 
 git ls-files -- ':(exclude)extern/' '*.cpp' '*.hpp' '*.h' |
-    grep -vP '/[a-z0-9]+\.(cpp|hpp|h)$' |
-    grep -vFf CI/file_name_exceptions.txt &&
+    grep -vP '/[a-z0-9]+\.(cpp|hpp|h)$' &&
     ( echo 'File names do not follow the naming convention, see https://wiki.openmw.org/index.php?title=Naming_Conventions#Files'; exit -1 )
 exit 0

CI/file_name_exceptions.txt

@@ -1,48 +0,0 @@
-apps/openmw/android_main.cpp
-apps/openmw/mwsound/efx-presets.h
-apps/openmw/mwsound/ffmpeg_decoder.cpp
-apps/openmw/mwsound/ffmpeg_decoder.hpp
-apps/openmw/mwsound/openal_output.cpp
-apps/openmw/mwsound/openal_output.hpp
-apps/openmw/mwsound/sound_buffer.cpp
-apps/openmw/mwsound/sound_buffer.hpp
-apps/openmw/mwsound/sound_decoder.hpp
-apps/openmw/mwsound/sound_output.hpp
-apps/components_tests/esm/test_fixed_string.cpp
-apps/components_tests/files/conversion_tests.cpp
-apps/components_tests/lua/test_async.cpp
-apps/components_tests/lua/test_configuration.cpp
-apps/components_tests/lua/test_l10n.cpp
-apps/components_tests/lua/test_lua.cpp
-apps/components_tests/lua/test_scriptscontainer.cpp
-apps/components_tests/lua/test_serialization.cpp
-apps/components_tests/lua/test_storage.cpp
-apps/components_tests/lua/test_ui_content.cpp
-apps/components_tests/lua/test_utilpackage.cpp
-apps/components_tests/lua/test_inputactions.cpp
-apps/components_tests/lua/test_yaml.cpp
-apps/components_tests/misc/test_endianness.cpp
-apps/components_tests/misc/test_resourcehelpers.cpp
-apps/components_tests/misc/test_stringops.cpp
-apps/openmw_tests/mwdialogue/test_keywordsearch.cpp
-apps/openmw_tests/mwscript/test_scripts.cpp
-apps/openmw_tests/mwscript/test_utils.hpp
-apps/openmw_tests/mwworld/test_store.cpp
-components/bsa/bsa_file.cpp
-components/bsa/bsa_file.hpp
-components/crashcatcher/windows_crashcatcher.cpp
-components/crashcatcher/windows_crashcatcher.hpp
-components/crashcatcher/windows_crashmonitor.cpp
-components/crashcatcher/windows_crashmonitor.hpp
-components/crashcatcher/windows_crashshm.hpp
-components/fx/lexer_types.hpp
-components/fx/parse_constants.hpp
-components/platform/file.posix.cpp
-components/platform/file.stdio.cpp
-components/platform/file.win32.cpp
-components/sdlutil/gl4es_init.cpp
-components/sdlutil/gl4es_init.h
-components/to_utf8/gen_iconv.cpp
-components/to_utf8/tables_gen.hpp
-components/to_utf8/to_utf8.cpp
-components/to_utf8/to_utf8.hpp

CI/github.env

@@ -1 +1 @@
-VCPKG_DEPS_TAG=2024-11-10
+VCPKG_DEPS_TAG=2025-07-23

CI/install_debian_deps.sh

@@ -11,7 +11,8 @@ print_help() {
 declare -rA GROUPED_DEPS=(
   [gcc]="binutils gcc build-essential cmake ccache curl unzip git pkg-config mold"
   [clang]="binutils clang make cmake ccache curl unzip git pkg-config mold"
-  [coverity]="binutils clang-12 make cmake ccache curl unzip git pkg-config"
+  [coverity]="binutils clang make cmake ccache curl unzip git pkg-config file"
+  [coverity_upload]="curl"
   [gcc_preprocess]="
     binutils
     build-essential
@@ -33,10 +34,10 @@ declare -rA GROUPED_DEPS=(
     libboost-system-dev libboost-iostreams-dev
 
     libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev
-    libsdl2-dev libqt5opengl5-dev qttools5-dev qttools5-dev-tools libopenal-dev
+    libsdl2-dev libqt6opengl6-dev qt6-tools-dev qt6-tools-dev-tools libopenal-dev
     libunshield-dev libtinyxml-dev libbullet-dev liblz4-dev libpng-dev libjpeg-dev
     libluajit-5.1-dev librecast-dev libsqlite3-dev ca-certificates libicu-dev
-    libyaml-cpp-dev libqt5svg5 libqt5svg5-dev
+    libyaml-cpp-dev libqt6svg6 libqt6svg6-dev
   "
 
   # These dependencies can alternatively be built and linked statically.
@@ -57,22 +58,22 @@ declare -rA GROUPED_DEPS=(
     libsdl2-dev libboost-system-dev libboost-filesystem-dev libgl-dev
   "
 
-  [openmw-coverage]="gcovr"
+  [openmw-coverage]="pipx"
 
   [openmw-integration-tests]="
     ca-certificates
     gdb
     git
     git-lfs
-    libavcodec58
-    libavformat58
-    libavutil56
-    libboost-iostreams1.74.0
-    libboost-program-options1.74.0
-    libboost-system1.74.0
+    libavcodec60
+    libavformat60
+    libavutil58
+    libboost-iostreams1.83.0
+    libboost-program-options1.83.0
+    libboost-system1.83.0
     libbullet3.24
     libcollada-dom2.5-dp0
-    libicu70
+    libicu74
     libjpeg8
     libluajit-5.1-2
     liblz4-1
@@ -80,19 +81,19 @@ declare -rA GROUPED_DEPS=(
     libopenal1
     libopenscenegraph161
     libpng16-16
-    libqt5opengl5
+    libqt6opengl6
     librecast1
     libsdl2-2.0-0
     libsqlite3-0
-    libswresample3
-    libswscale5
+    libswresample4
+    libswscale7
     libtinyxml2.6.2v5
     libyaml-cpp0.8
     python3-pip
     xvfb
   "
 
-  [libasan6]="libasan6"
+  [libasan]="libasan8"
 
   [android]="binutils build-essential cmake ccache curl unzip git pkg-config"
 
@@ -102,8 +103,8 @@ declare -rA GROUPED_DEPS=(
   "
 
   [openmw-qt-translations]="
-    qttools5-dev
-    qttools5-dev-tools
+    qt6-tools-dev
+    qt6-tools-dev-tools
     git-core
   "
 )

CI/macos/before_install.amd64.sh

@@ -0,0 +1,8 @@
+#!/bin/sh -ex
+
+arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+
+arch -x86_64 /usr/local/bin/brew install curl xquartz gd fontconfig freetype harfbuzz brotli s3cmd ccache cmake qt@6 openal-soft icu4c yaml-cpp sqlite
+
+curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20240802.zip -o ~/openmw-deps.zip
+unzip -o ~/openmw-deps.zip -d /tmp > /dev/null

CI/macos/before_install.arm64.sh

@@ -0,0 +1,9 @@
+#!/bin/sh -ex
+
+brew tap --repair
+brew update --quiet
+
+brew install curl xquartz gd fontconfig freetype harfbuzz brotli s3cmd ccache cmake qt@6 openal-soft icu4c yaml-cpp sqlite
+
+curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20240818-arm64.tar.xz -o ~/openmw-deps.tar.xz
+tar xf ~/openmw-deps.tar.xz -C /tmp > /dev/null

CI/macos/build.sh

@@ -0,0 +1,9 @@
+#!/bin/sh -ex
+
+cd build
+
+if [[ "${MACOS_AMD64}" ]]; then
+    arch -x86_64 make -j $(sysctl -n hw.logicalcpu) package
+else
+    make -j $(sysctl -n hw.logicalcpu) package
+fi

CI/macos/ccache_prep.sh

@@ -0,0 +1,7 @@
+#!/bin/sh -ex
+
+if [[ "${MACOS_AMD64}" ]]; then
+    arch -x86_64 ccache -z -M "${CCACHE_SIZE}"
+else
+    ccache -z -M "${CCACHE_SIZE}"
+fi

CI/macos/ccache_save.sh

@@ -0,0 +1,7 @@
+#!/bin/sh -ex
+
+if [[ "${MACOS_AMD64}" ]]; then
+    arch -x86_64 ccache -svv
+else
+    ccache -svv
+fi

CMakeLists.txt

@@ -80,10 +80,10 @@ endif()
 message(STATUS "Configuring OpenMW...")
 
 set(OPENMW_VERSION_MAJOR 0)
-set(OPENMW_VERSION_MINOR 49)
+set(OPENMW_VERSION_MINOR 50)
 set(OPENMW_VERSION_RELEASE 0)
-set(OPENMW_LUA_API_REVISION 75)
-set(OPENMW_POSTPROCESSING_API_REVISION 2)
+set(OPENMW_LUA_API_REVISION 92)
+set(OPENMW_POSTPROCESSING_API_REVISION 3)
 
 set(OPENMW_VERSION_COMMITHASH "")
 set(OPENMW_VERSION_TAGHASH "")
@@ -249,12 +249,8 @@ endif()
 find_package(LZ4 REQUIRED)
 
 if (USE_QT)
-    find_package(QT REQUIRED COMPONENTS Core NAMES Qt6 Qt5)
-    if (QT_VERSION_MAJOR VERSION_EQUAL 5)
-        find_package(Qt5 5.15 COMPONENTS Core Widgets Network OpenGL LinguistTools Svg REQUIRED)
-    else()
+    find_package(QT REQUIRED COMPONENTS Core NAMES Qt6)
     find_package(Qt6 COMPONENTS Core Widgets Network OpenGL OpenGLWidgets LinguistTools Svg REQUIRED)
-    endif()
     message(STATUS "Using Qt${QT_VERSION}")
 endif()
 
@@ -466,7 +462,7 @@ find_package(Boost 1.70.0 CONFIG REQUIRED COMPONENTS ${BOOST_COMPONENTS} OPTIONA
 if(OPENMW_USE_SYSTEM_MYGUI)
     find_package(MyGUI 3.4.3 REQUIRED)
 endif()
-find_package(SDL2 2.0.10 REQUIRED)
+find_package(SDL2 2.0.20 REQUIRED)
 find_package(OpenAL REQUIRED)
 find_package(ZLIB REQUIRED)
 
@@ -590,30 +586,10 @@ if(OPENMW_LTO_BUILD)
     endif()
 endif()
 
-
-if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-    set(OPENMW_CXX_FLAGS "-Wall -Wextra -Wundef -Wextra-semi -Wno-unused-parameter -pedantic -Wno-long-long -Wnon-virtual-dtor -Wunused ${OPENMW_CXX_FLAGS}")
-
-    if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
-        # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105438
-        set(OPENMW_CXX_FLAGS "-Wno-array-bounds ${OPENMW_CXX_FLAGS}")
-    endif()
-
-    if (APPLE)
+if (APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
-    endif()
-
-    if (CMAKE_CXX_COMPILER_ID STREQUAL Clang AND NOT APPLE)
-        if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.6 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 3.6)
-            set(OPENMW_CXX_FLAGS "${OPENMW_CXX_FLAGS} -Wno-potentially-evaluated-expression")
-        endif ()
-    endif()
-
-    if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
-        set(OPENMW_CXX_FLAGS "${OPENMW_CXX_FLAGS} -Wno-unused-but-set-parameter -Wduplicated-branches -Wduplicated-cond -Wlogical-op")
-    endif()
-endif (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+endif()
 
 # Extern
 
@@ -624,8 +600,42 @@ if (BUILD_OPENCS OR BUILD_OPENCS_TESTS)
     add_subdirectory (extern/osgQt)
 endif()
 
+if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
+    add_compile_options("/W4")
+
+    set(WARNINGS_DISABLE
+        4100 # Unreferenced formal parameter (-Wunused-parameter)
+        4127 # Conditional expression is constant
+        4996 # Function was declared deprecated
+        5054 # Deprecated operations between enumerations of different types caused by Qt headers
+        )
+
+    foreach(d ${WARNINGS_DISABLE})
+        add_compile_options("/wd${d}")
+    endforeach(d)
+
+    if(OPENMW_MSVC_WERROR)
+        add_compile_options("/WX")
+    endif()
+else ()
+    add_compile_options("-Wall" "-Wextra" "-Wundef" "-Wextra-semi" "-Wno-unused-parameter" "-pedantic" "-Wno-long-long" "-Wnon-virtual-dtor" "-Wunused")
+
+    if (CMAKE_CXX_COMPILER_ID STREQUAL Clang AND NOT APPLE)
+        if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.6 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 3.6)
+            add_compile_options("-Wno-potentially-evaluated-expression")
+        endif ()
+    endif()
+
+    if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
+        add_compile_options("-Wno-unused-but-set-parameter" "-Wduplicated-branches" "-Wduplicated-cond" "-Wlogical-op")
+        # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105438
+        add_compile_options("-Wno-array-bounds")
+    endif()
+endif ()
+
 if (OPENMW_CXX_FLAGS)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENMW_CXX_FLAGS}")
+    separate_arguments(OPENMW_CXX_FLAGS NATIVE_COMMAND "${OPENMW_CXX_FLAGS}")
+    add_compile_options(${OPENMW_CXX_FLAGS})
 endif()
 
 # Components
@@ -715,87 +725,9 @@ if (WIN32)
             set_target_properties(openmw PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS")
         endif()
 
-        # Play a bit with the warning levels
-
-        set(WARNINGS "/W4")
-
-        set(WARNINGS_DISABLE
-            4100 # Unreferenced formal parameter (-Wunused-parameter)
-            4127 # Conditional expression is constant
-            4996 # Function was declared deprecated
-            5054 # Deprecated operations between enumerations of different types caused by Qt headers
-            )
-
-        foreach(d ${WARNINGS_DISABLE})
-            list(APPEND WARNINGS "/wd${d}")
-        endforeach(d)
-
-        if(OPENMW_MSVC_WERROR)
-            list(APPEND WARNINGS "/WX")
-        endif()
-
-        target_compile_options(components PRIVATE ${WARNINGS})
-        target_compile_options(osg-ffmpeg-videoplayer PRIVATE ${WARNINGS})
-
         if (MSVC_VERSION GREATER_EQUAL 1915 AND MSVC_VERSION LESS 1920)
             target_compile_definitions(components INTERFACE _ENABLE_EXTENDED_ALIGNED_STORAGE)
         endif()
-
-        if (BUILD_BSATOOL)
-            target_compile_options(bsatool PRIVATE ${WARNINGS})
-        endif()
-
-        if (BUILD_ESMTOOL)
-            target_compile_options(esmtool PRIVATE ${WARNINGS})
-        endif()
-
-        if (BUILD_ESSIMPORTER)
-            target_compile_options(openmw-essimporter PRIVATE ${WARNINGS})
-        endif()
-
-        if (BUILD_LAUNCHER)
-            target_compile_options(openmw-launcher PRIVATE ${WARNINGS})
-        endif()
-
-        if (BUILD_MWINIIMPORTER)
-            target_compile_options(openmw-iniimporter PRIVATE ${WARNINGS})
-        endif()
-
-        if (BUILD_OPENCS)
-            target_compile_options(openmw-cs PRIVATE ${WARNINGS})
-        endif()
-
-        if (BUILD_OPENMW)
-            target_compile_options(openmw PRIVATE ${WARNINGS})
-        endif()
-
-        if (BUILD_WIZARD)
-            target_compile_options(openmw-wizard PRIVATE ${WARNINGS})
-        endif()
-
-        if (BUILD_COMPONENTS_TESTS)
-            target_compile_options(components-tests PRIVATE ${WARNINGS})
-        endif()
-
-        if (BUILD_BENCHMARKS)
-            target_compile_options(openmw_detournavigator_navmeshtilescache_benchmark PRIVATE ${WARNINGS})
-        endif()
-
-        if (BUILD_NAVMESHTOOL)
-            target_compile_options(openmw-navmeshtool PRIVATE ${WARNINGS})
-        endif()
-
-        if (BUILD_BULLETOBJECTTOOL)
-            target_compile_options(openmw-bulletobjecttool PRIVATE ${WARNINGS} ${MT_BUILD})
-        endif()
-
-        if (BUILD_OPENCS_TESTS)
-            target_compile_options(openmw-cs-tests PRIVATE ${WARNINGS})
-        endif()
-
-        if (BUILD_OPENMW_TESTS)
-            target_compile_options(openmw-tests PRIVATE ${WARNINGS})
-        endif()
     endif(MSVC)
 
     # TODO: At some point release builds should not use the console but rather write to a log file

README.md

@@ -5,7 +5,7 @@ OpenMW is an open-source open-world RPG game engine that supports playing Morrow
 
 OpenMW also comes with OpenMW-CS, a replacement for Bethesda's Construction Set.
 
-* Version: 0.49.0
+* Version: 0.50.0
 * License: GPLv3 (see [LICENSE](https://gitlab.com/OpenMW/openmw/-/raw/master/LICENSE) for more information)
 * Website: https://www.openmw.org
 * IRC: #openmw on irc.libera.chat

apps/bsatool/bsatool.cpp

@@ -75,8 +75,8 @@ Allowed options)");
     bpo::variables_map variables;
     try
     {
-        bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv).options(all).positional(p).run();
-        bpo::store(valid_opts, variables);
+        bpo::parsed_options validOpts = bpo::command_line_parser(argc, argv).options(all).positional(p).run();
+        bpo::store(validOpts, variables);
     }
     catch (std::exception& e)
     {

apps/bulletobjecttool/main.cpp

@@ -20,7 +20,7 @@
 #include <components/resource/niffilemanager.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/settings/settings.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>
 #include <components/version/version.hpp>
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>
@@ -125,6 +125,7 @@ namespace
         }
 
         Files::ConfigurationManager config;
+        config.processPaths(variables, std::filesystem::current_path());
         config.readConfiguration(variables, desc);
 
         Debug::setupLogging(config.getLogPath(), applicationName);
@@ -154,7 +155,7 @@ namespace
 
         VFS::Manager vfs;
 
-        VFS::registerArchives(&vfs, fileCollections, archives, true);
+        VFS::registerArchives(&vfs, fileCollections, archives, true, &encoder.getStatelessEncoder());
 
         Settings::Manager::load(config);
 

apps/components_tests/CMakeLists.txt

@@ -4,29 +4,28 @@ include_directories(SYSTEM ${GMOCK_INCLUDE_DIRS})
 file(GLOB UNITTEST_SRC_FILES
     main.cpp
 
-    esm/test_fixed_string.cpp
-    esm/variant.cpp
+    esm/testfixedstring.cpp
     esm/testrefid.cpp
+    esm/variant.cpp
 
-    lua/test_lua.cpp
-    lua/test_scriptscontainer.cpp
-    lua/test_utilpackage.cpp
-    lua/test_serialization.cpp
-    lua/test_configuration.cpp
-    lua/test_l10n.cpp
-    lua/test_storage.cpp
-    lua/test_async.cpp
-    lua/test_inputactions.cpp
-    lua/test_yaml.cpp
-
-    lua/test_ui_content.cpp
+    lua/testasync.cpp
+    lua/testconfiguration.cpp
+    lua/testinputactions.cpp
+    lua/testl10n.cpp
+    lua/testlua.cpp
+    lua/testscriptscontainer.cpp
+    lua/testserialization.cpp
+    lua/teststorage.cpp
+    lua/testuicontent.cpp
+    lua/testutilpackage.cpp
+    lua/testyaml.cpp
 
     misc/compression.cpp
     misc/progressreporter.cpp
-    misc/test_endianness.cpp
-    misc/test_resourcehelpers.cpp
-    misc/test_stringops.cpp
+    misc/testendianness.cpp
     misc/testmathutil.cpp
+    misc/testresourcehelpers.cpp
+    misc/teststringops.cpp
 
     nifloader/testbulletnifloader.cpp
 
@@ -64,8 +63,8 @@ file(GLOB UNITTEST_SRC_FILES
     esmloader/esmdata.cpp
     esmloader/record.cpp
 
+    files/conversiontests.cpp
     files/hash.cpp
-    files/conversion_tests.cpp
 
     toutf8/toutf8.cpp
 

apps/components_tests/detournavigator/navigator.cpp

@@ -139,7 +139,7 @@ namespace
 
     TEST_F(DetourNavigatorNavigatorTest, find_path_for_empty_should_return_empty)
     {
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
             Status::NavMeshNotFound);
         EXPECT_EQ(mPath, std::deque<osg::Vec3f>());
     }
@@ -147,7 +147,7 @@ namespace
     TEST_F(DetourNavigatorNavigatorTest, find_path_for_existing_agent_with_no_navmesh_should_throw_exception)
     {
         ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
             Status::StartPolygonNotFound);
     }
 
@@ -156,7 +156,7 @@ namespace
         ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
         ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
         mNavigator->removeAgent(mAgentBounds);
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
             Status::StartPolygonNotFound);
     }
 
@@ -172,7 +172,7 @@ namespace
         updateGuard.reset();
         mNavigator->wait(WaitConditionType::requiredTilesPresent, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
             Status::Success);
 
         EXPECT_THAT(mPath,
@@ -194,7 +194,7 @@ namespace
         updateGuard.reset();
         mNavigator->wait(WaitConditionType::requiredTilesPresent, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mStart, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mStart, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
             Status::Success);
 
         EXPECT_THAT(mPath, ElementsAre(Vec3fEq(56.66666412353515625, 460, 1.99998295307159423828125))) << mPath;
@@ -218,7 +218,7 @@ namespace
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
             Status::Success);
 
         EXPECT_THAT(mPath,
@@ -237,7 +237,7 @@ namespace
 
         mPath.clear();
         mOut = std::back_inserter(mPath);
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
             Status::Success);
 
         EXPECT_THAT(mPath,
@@ -265,7 +265,7 @@ namespace
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
             Status::Success);
 
         EXPECT_THAT(mPath,
@@ -285,7 +285,7 @@ namespace
 
         mPath.clear();
         mOut = std::back_inserter(mPath);
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
             Status::Success);
 
         EXPECT_THAT(mPath,
@@ -318,7 +318,7 @@ namespace
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
             Status::Success);
 
         EXPECT_THAT(mPath,
@@ -386,7 +386,7 @@ namespace
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
             Status::Success);
 
         EXPECT_THAT(mPath,
@@ -421,7 +421,7 @@ namespace
         mEnd.x() = 256;
         mEnd.z() = 300;
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_swim, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_swim, mAreaCosts, mEndTolerance, {}, mOut),
             Status::Success);
 
         EXPECT_THAT(mPath,
@@ -453,8 +453,8 @@ namespace
         mStart.x() = 256;
         mEnd.x() = 256;
 
-        EXPECT_EQ(
-            findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance,
+                      {}, mOut),
             Status::Success);
 
         EXPECT_THAT(mPath,
@@ -487,8 +487,8 @@ namespace
         mStart.x() = 256;
         mEnd.x() = 256;
 
-        EXPECT_EQ(
-            findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mEndTolerance,
+                      {}, mOut),
             Status::Success);
 
         EXPECT_THAT(mPath,
@@ -520,7 +520,7 @@ namespace
         mStart.x() = 256;
         mEnd.x() = 256;
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
             Status::Success);
 
         EXPECT_THAT(mPath,
@@ -549,7 +549,7 @@ namespace
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
             Status::Success);
 
         EXPECT_THAT(mPath,
@@ -577,7 +577,7 @@ namespace
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
             Status::Success);
 
         EXPECT_THAT(mPath,
@@ -658,7 +658,7 @@ namespace
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
             Status::Success);
 
         EXPECT_THAT(mPath,
@@ -781,7 +781,7 @@ namespace
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::requiredTilesPresent, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
             Status::Success);
 
         EXPECT_THAT(mPath,
@@ -806,7 +806,7 @@ namespace
         mNavigator->update(mPlayerPosition, nullptr);
         mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
             Status::PartialPath);
 
         EXPECT_THAT(mPath,
@@ -834,7 +834,7 @@ namespace
 
         const float endTolerance = 1000.0f;
 
-        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, endTolerance, mOut),
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, mStart, mEnd, Flag_walk, mAreaCosts, endTolerance, {}, mOut),
             Status::Success);
 
         EXPECT_THAT(mPath,
@@ -979,6 +979,146 @@ namespace
         EXPECT_EQ(usedNavMeshTiles, 854);
     }
 
+    TEST_F(DetourNavigatorNavigatorTest, find_path_should_return_path_around_steep_mountains)
+    {
+        const std::array<float, 5 * 5> heightfieldData{ {
+            0, 0, 0, 0, 0, // row 0
+            0, 0, 0, 0, 0, // row 1
+            0, 0, 1000, 0, 0, // row 2
+            0, 0, 1000, 0, 0, // row 3
+            0, 0, 0, 0, 0, // row 4
+        } };
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
+
+        ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface, nullptr);
+        mNavigator->update(mPlayerPosition, nullptr);
+        mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
+
+        const osg::Vec3f start(56, 56, 12);
+        const osg::Vec3f end(464, 464, 12);
+
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, start, end, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre( //
+                Vec3fEq(56.66664886474609375, 56.66664886474609375, 11.33333301544189453125),
+                Vec3fEq(396.666656494140625, 79.33331298828125, 11.33333301544189453125),
+                Vec3fEq(430.666656494140625, 113.33331298828125, 11.33333301544189453125),
+                Vec3fEq(463.999969482421875, 463.999969482421875, 11.33333301544189453125)))
+            << mPath;
+    }
+
+    TEST_F(DetourNavigatorNavigatorTest, find_path_should_return_path_around_steep_cliffs)
+    {
+        const std::array<float, 5 * 5> heightfieldData{ {
+            0, 0, 0, 0, 0, // row 0
+            0, 0, 0, 0, 0, // row 1
+            0, 0, -1000, 0, 0, // row 2
+            0, 0, -1000, 0, 0, // row 3
+            0, 0, 0, 0, 0, // row 4
+        } };
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
+
+        ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface, nullptr);
+        mNavigator->update(mPlayerPosition, nullptr);
+        mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
+
+        const osg::Vec3f start(56, 56, 12);
+        const osg::Vec3f end(464, 464, 12);
+
+        EXPECT_EQ(findPath(*mNavigator, mAgentBounds, start, end, Flag_walk, mAreaCosts, mEndTolerance, {}, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre( //
+                Vec3fEq(56.66664886474609375, 56.66664886474609375, 8.66659259796142578125),
+                Vec3fEq(385.33331298828125, 79.33331298828125, 8.66659259796142578125),
+                Vec3fEq(430.666656494140625, 124.66664886474609375, 8.66659259796142578125),
+                Vec3fEq(463.999969482421875, 463.999969482421875, 8.66659259796142578125)))
+            << mPath;
+    }
+
+    TEST_F(DetourNavigatorNavigatorTest, find_path_should_return_path_with_checkpoints)
+    {
+        const std::array<float, 5 * 5> heightfieldData{ {
+            0, 0, 0, 0, 0, // row 0
+            0, 0, 0, 0, 0, // row 1
+            0, 0, 1000, 0, 0, // row 2
+            0, 0, 1000, 0, 0, // row 3
+            0, 0, 0, 0, 0, // row 4
+        } };
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
+
+        ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface, nullptr);
+        mNavigator->update(mPlayerPosition, nullptr);
+        mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
+
+        const std::vector<osg::Vec3f> checkpoints = {
+            osg::Vec3f(400, 70, 12),
+        };
+
+        const osg::Vec3f start(56, 56, 12);
+        const osg::Vec3f end(464, 464, 12);
+
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, start, end, Flag_walk, mAreaCosts, mEndTolerance, checkpoints, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre( //
+                Vec3fEq(56.66664886474609375, 56.66664886474609375, 11.33333301544189453125),
+                Vec3fEq(400, 70, 11.33333301544189453125),
+                Vec3fEq(430.666656494140625, 113.33331298828125, 11.33333301544189453125),
+                Vec3fEq(463.999969482421875, 463.999969482421875, 11.33333301544189453125)))
+            << mPath;
+    }
+
+    TEST_F(DetourNavigatorNavigatorTest, find_path_should_skip_unreachable_checkpoints)
+    {
+        const std::array<float, 5 * 5> heightfieldData{ {
+            0, 0, 0, 0, 0, // row 0
+            0, 0, 0, 0, 0, // row 1
+            0, 0, 1000, 0, 0, // row 2
+            0, 0, 1000, 0, 0, // row 3
+            0, 0, 0, 0, 0, // row 4
+        } };
+        const HeightfieldSurface surface = makeSquareHeightfieldSurface(heightfieldData);
+        const int cellSize = heightfieldTileSize * static_cast<int>(surface.mSize - 1);
+
+        ASSERT_TRUE(mNavigator->addAgent(mAgentBounds));
+        mNavigator->addHeightfield(mCellPosition, cellSize, surface, nullptr);
+        mNavigator->update(mPlayerPosition, nullptr);
+        mNavigator->wait(WaitConditionType::allJobsDone, &mListener);
+
+        const std::vector<osg::Vec3f> checkpoints = {
+            osg::Vec3f(400, 70, 10000),
+            osg::Vec3f(256, 256, 1000),
+            osg::Vec3f(-1000, -1000, 0),
+        };
+
+        const osg::Vec3f start(56, 56, 12);
+        const osg::Vec3f end(464, 464, 12);
+
+        EXPECT_EQ(
+            findPath(*mNavigator, mAgentBounds, start, end, Flag_walk, mAreaCosts, mEndTolerance, checkpoints, mOut),
+            Status::Success);
+
+        EXPECT_THAT(mPath,
+            ElementsAre( //
+                Vec3fEq(56.66664886474609375, 56.66664886474609375, 11.33333301544189453125),
+                Vec3fEq(396.666656494140625, 79.33331298828125, 11.33333301544189453125),
+                Vec3fEq(430.666656494140625, 113.33331298828125, 11.33333301544189453125),
+                Vec3fEq(463.999969482421875, 463.999969482421875, 11.33333301544189453125)))
+            << mPath;
+    }
+
     struct DetourNavigatorNavigatorNotSupportedAgentBoundsTest : TestWithParam<AgentBounds>
     {
     };

apps/components_tests/esm3/testsaveload.cpp

@@ -723,7 +723,7 @@ namespace ESM
         TEST_P(Esm3SaveLoadRecordTest, landShouldNotChange)
         {
             LandRecordData data;
-            std::iota(data.mHeights.begin(), data.mHeights.end(), 1);
+            std::iota(data.mHeights.begin(), data.mHeights.end(), 1.0f);
             std::for_each(data.mHeights.begin(), data.mHeights.end(), [](float& v) { v *= Land::sHeightScale; });
             data.mMinHeight = *std::min_element(data.mHeights.begin(), data.mHeights.end());
             data.mMaxHeight = *std::max_element(data.mHeights.begin(), data.mHeights.end());

apps/components_tests/esmloader/load.cpp

@@ -10,7 +10,7 @@
 #include <components/esmloader/load.hpp>
 #include <components/files/collections.hpp>
 #include <components/files/multidircollection.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>
 
 #include <gtest/gtest.h>
 

apps/components_tests/fx/lexer.cpp

@@ -5,7 +5,7 @@
 namespace
 {
     using namespace testing;
-    using namespace fx::Lexer;
+    using namespace Fx::Lexer;
 
     struct LexerTest : Test
     {

apps/components_tests/fx/technique.cpp

@@ -91,7 +91,7 @@ namespace
 )" };
 
     using namespace testing;
-    using namespace fx;
+    using namespace Fx;
 
     struct TechniqueTest : Test
     {
@@ -113,7 +113,8 @@ namespace
 
         void compile(const std::string& name)
         {
-            mTechnique = std::make_unique<Technique>(*mVFS.get(), mImageManager, name, 1, 1, true, true);
+            mTechnique = std::make_unique<Technique>(
+                *mVFS.get(), mImageManager, Technique::makeFileName(name), name, 1, 1, true, true);
             mTechnique->compile();
         }
     };

apps/components_tests/lua/testl10n.cpp

@@ -24,6 +24,8 @@ namespace
     constexpr VFS::Path::NormalizedView test2EnPath("l10n/test2/en.yaml");
     constexpr VFS::Path::NormalizedView test3EnPath("l10n/test3/en.yaml");
     constexpr VFS::Path::NormalizedView test3DePath("l10n/test3/de.yaml");
+    constexpr VFS::Path::NormalizedView test4RuPath("l10n/test4/ru.yaml");
+    constexpr VFS::Path::NormalizedView test4EnPath("l10n/test4/en.yaml");
 
     VFSTestFile invalidScript("not a script");
     VFSTestFile incorrectScript(
@@ -69,6 +71,16 @@ currency: "You have {money, number, currency}"
     VFSTestFile test2En(R"X(
 good_morning: "Morning!"
 you_have_arrows: "Arrows count: {count}"
+)X");
+
+    VFSTestFile test4Ru(R"X(
+skill_increase: "Ваш навык {навык} увеличился до {value}"
+acrobatics: "Акробатика"
+)X");
+
+    VFSTestFile test4En(R"X(
+stat_increase: "Your {stat} has increased to {value}"
+speed: "Speed"
 )X");
 
     struct LuaL10nTest : Test
@@ -80,6 +92,8 @@ you_have_arrows: "Arrows count: {count}"
             { test2EnPath, &test2En },
             { test3EnPath, &test1En },
             { test3DePath, &test1De },
+            { test4RuPath, &test4Ru },
+            { test4EnPath, &test4En },
         });
 
         LuaUtil::ScriptsConfiguration mCfg;
@@ -91,7 +105,7 @@ you_have_arrows: "Arrows count: {count}"
         lua.protectedCall([&](LuaUtil::LuaView& view) {
             sol::state_view& l = view.sol();
             internal::CaptureStdout();
-            l10n::Manager l10nManager(mVFS.get());
+            L10n::Manager l10nManager(mVFS.get());
             l10nManager.setPreferredLocales({ "de", "en" });
             EXPECT_THAT(internal::GetCapturedStdout(), "Preferred locales: gmst de en\n");
 
@@ -169,6 +183,18 @@ you_have_arrows: "Arrows count: {count}"
             l.safe_script("t3 = l10n('Test3', 'de')");
             l10nManager.setPreferredLocales({ "en" });
             EXPECT_EQ(get<std::string>(l, "t3('Hello {name}!', {name='World'})"), "Hallo World!");
+
+            // Test that formatting arguments use a correct encoding
+            l.safe_script("t4 = l10n('Test4', 'ru')");
+            l10nManager.setPreferredLocales({ "ru", "en" });
+            EXPECT_EQ(get<std::string>(l, "t4('skill_increase', {навык='Акробатика', value=100})"),
+                "Ваш навык Акробатика увеличился до 100");
+            EXPECT_EQ(get<std::string>(l, "t4('skill_increase', {навык=t4('acrobatics'), value=100})"),
+                "Ваш навык Акробатика увеличился до 100");
+            EXPECT_EQ(get<std::string>(l, "t4('stat_increase', {stat='Speed', value=100})"),
+                "Your Speed has increased to 100");
+            EXPECT_EQ(get<std::string>(l, "t4('stat_increase', {stat=t4('speed'), value=100})"),
+                "Your Speed has increased to 100");
         });
     }
 }

apps/components_tests/lua/testscriptscontainer.cpp

@@ -285,17 +285,17 @@ CUSTOM: customdata.lua
         EXPECT_TRUE(scripts.addCustomScript(getId(test2Path)));
 
         sol::state_view sol = mLua.unsafeState();
-        std::string X0 = LuaUtil::serialize(sol.create_table_with("x", 0.5));
-        std::string X1 = LuaUtil::serialize(sol.create_table_with("x", 1.5));
+        std::string x0 = LuaUtil::serialize(sol.create_table_with("x", 0.5));
+        std::string x1 = LuaUtil::serialize(sol.create_table_with("x", 1.5));
 
         {
             testing::internal::CaptureStdout();
-            scripts.receiveEvent("SomeEvent", X1);
+            scripts.receiveEvent("SomeEvent", x1);
             EXPECT_EQ(internal::GetCapturedStdout(), "");
         }
         {
             testing::internal::CaptureStdout();
-            scripts.receiveEvent("Event1", X1);
+            scripts.receiveEvent("Event1", x1);
             EXPECT_EQ(internal::GetCapturedStdout(),
                 "Test[test2.lua]:\t event1 1.5\n"
                 "Test[stopevent.lua]:\t event1 1.5\n"
@@ -303,21 +303,21 @@ CUSTOM: customdata.lua
         }
         {
             testing::internal::CaptureStdout();
-            scripts.receiveEvent("Event2", X1);
+            scripts.receiveEvent("Event2", x1);
             EXPECT_EQ(internal::GetCapturedStdout(),
                 "Test[test2.lua]:\t event2 1.5\n"
                 "Test[test1.lua]:\t event2 1.5\n");
         }
         {
             testing::internal::CaptureStdout();
-            scripts.receiveEvent("Event1", X0);
+            scripts.receiveEvent("Event1", x0);
             EXPECT_EQ(internal::GetCapturedStdout(),
                 "Test[test2.lua]:\t event1 0.5\n"
                 "Test[stopevent.lua]:\t event1 0.5\n");
         }
         {
             testing::internal::CaptureStdout();
-            scripts.receiveEvent("Event2", X0);
+            scripts.receiveEvent("Event2", x0);
             EXPECT_EQ(internal::GetCapturedStdout(),
                 "Test[test2.lua]:\t event2 0.5\n"
                 "Test[test1.lua]:\t event2 0.5\n");
@@ -333,12 +333,12 @@ CUSTOM: customdata.lua
         EXPECT_TRUE(scripts.addCustomScript(getId(test2Path)));
 
         sol::state_view sol = mLua.unsafeState();
-        std::string X = LuaUtil::serialize(sol.create_table_with("x", 0.5));
+        std::string x = LuaUtil::serialize(sol.create_table_with("x", 0.5));
 
         {
             testing::internal::CaptureStdout();
             scripts.update(1.5f);
-            scripts.receiveEvent("Event1", X);
+            scripts.receiveEvent("Event1", x);
             EXPECT_EQ(internal::GetCapturedStdout(),
                 "Test[test1.lua]:\t update 1.5\n"
                 "Test[test2.lua]:\t update 1.5\n"
@@ -352,7 +352,7 @@ CUSTOM: customdata.lua
             scripts.removeScript(stopEventScriptId);
             EXPECT_FALSE(scripts.hasScript(stopEventScriptId));
             scripts.update(1.5f);
-            scripts.receiveEvent("Event1", X);
+            scripts.receiveEvent("Event1", x);
             EXPECT_EQ(internal::GetCapturedStdout(),
                 "Test[test1.lua]:\t update 1.5\n"
                 "Test[test2.lua]:\t update 1.5\n"
@@ -363,7 +363,7 @@ CUSTOM: customdata.lua
             testing::internal::CaptureStdout();
             scripts.removeScript(getId(test1Path));
             scripts.update(1.5f);
-            scripts.receiveEvent("Event1", X);
+            scripts.receiveEvent("Event1", x);
             EXPECT_EQ(internal::GetCapturedStdout(),
                 "Test[test2.lua]:\t update 1.5\n"
                 "Test[test2.lua]:\t event1 0.5\n");
@@ -638,8 +638,9 @@ CUSTOM: customdata.lua
             sol::object deserialized = LuaUtil::deserialize(lua.sol(), data2.mScripts[0].mData, &serializer1);
             EXPECT_TRUE(deserialized.is<sol::table>());
             sol::table table = deserialized;
-            for (const auto& [key, value] : table)
+            if (!table.empty())
             {
+                const auto [key, value] = *table.cbegin();
                 EXPECT_TRUE(key.is<ESM::RefNum>());
                 EXPECT_TRUE(value.is<ESM::RefNum>());
                 EXPECT_EQ(key.as<ESM::RefNum>(), (ESM::RefNum{ 42, 34 }));

apps/components_tests/lua/testserialization.cpp

@@ -171,10 +171,10 @@ namespace
 
         std::string serialized = LuaUtil::serialize(table);
         EXPECT_EQ(serialized.size(), 139);
-        sol::table res_table = LuaUtil::deserialize(lua, serialized);
-        sol::table res_readonly_table = LuaUtil::deserialize(lua, serialized, nullptr, true);
+        sol::table resTable = LuaUtil::deserialize(lua, serialized);
+        sol::table resReadonlyTable = LuaUtil::deserialize(lua, serialized, nullptr, true);
 
-        for (auto t : { res_table, res_readonly_table })
+        for (auto t : { resTable, resReadonlyTable })
         {
             EXPECT_EQ(t.get<int>("aa"), 1);
             EXPECT_EQ(t.get<bool>("ab"), true);
@@ -185,8 +185,8 @@ namespace
             EXPECT_EQ(t.get<osg::Vec2f>(2), osg::Vec2f(2, 1));
         }
 
-        lua["t"] = res_table;
-        lua["ro_t"] = res_readonly_table;
+        lua["t"] = resTable;
+        lua["ro_t"] = resReadonlyTable;
         EXPECT_NO_THROW(lua.safe_script("t.x = 5"));
         EXPECT_NO_THROW(lua.safe_script("t.nested.x = 5"));
         EXPECT_ERROR(lua.safe_script("ro_t.x = 5"), "userdata value");

apps/components_tests/lua/testutilpackage.cpp

@@ -9,22 +9,33 @@ namespace
 {
     using namespace testing;
 
+    struct LuaUtilPackageTest : Test
+    {
+        LuaUtil::LuaState mLuaState{ nullptr, nullptr };
+
+        LuaUtilPackageTest()
+        {
+            mLuaState.addInternalLibSearchPath(
+                std::filesystem::path{ OPENMW_PROJECT_SOURCE_DIR } / "components" / "lua");
+            sol::state_view sol = mLuaState.unsafeState();
+            sol["util"] = LuaUtil::initUtilPackage(sol);
+        }
+    };
+
     template <typename T>
-    T get(sol::state& lua, const std::string& luaCode)
+    T get(sol::state_view& lua, const std::string& luaCode)
     {
         return lua.safe_script("return " + luaCode).get<T>();
     }
 
-    std::string getAsString(sol::state& lua, std::string luaCode)
+    std::string getAsString(sol::state_view& lua, std::string luaCode)
     {
         return LuaUtil::toString(lua.safe_script("return " + luaCode));
     }
 
-    TEST(LuaUtilPackageTest, Vector2)
+    TEST_F(LuaUtilPackageTest, Vector2)
     {
-        sol::state lua;
-        lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
-        lua["util"] = LuaUtil::initUtilPackage(lua);
+        sol::state_view lua = mLuaState.unsafeState();
         lua.safe_script("v = util.vector2(3, 4)");
         EXPECT_FLOAT_EQ(get<float>(lua, "v.x"), 3);
         EXPECT_FLOAT_EQ(get<float>(lua, "v.y"), 4);
@@ -55,11 +66,9 @@ namespace
         EXPECT_TRUE(get<bool>(lua, "swizzle['01'] == util.vector2(0, 1) and swizzle['0y'] == util.vector2(0, 2)"));
     }
 
-    TEST(LuaUtilPackageTest, Vector3)
+    TEST_F(LuaUtilPackageTest, Vector3)
     {
-        sol::state lua;
-        lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
-        lua["util"] = LuaUtil::initUtilPackage(lua);
+        sol::state_view lua = mLuaState.unsafeState();
         lua.safe_script("v = util.vector3(5, 12, 13)");
         EXPECT_FLOAT_EQ(get<float>(lua, "v.x"), 5);
         EXPECT_FLOAT_EQ(get<float>(lua, "v.y"), 12);
@@ -94,11 +103,9 @@ namespace
             get<bool>(lua, "swizzle['001'] == util.vector3(0, 0, 1) and swizzle['0yx'] == util.vector3(0, 2, 1)"));
     }
 
-    TEST(LuaUtilPackageTest, Vector4)
+    TEST_F(LuaUtilPackageTest, Vector4)
     {
-        sol::state lua;
-        lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
-        lua["util"] = LuaUtil::initUtilPackage(lua);
+        sol::state_view lua = mLuaState.unsafeState();
         lua.safe_script("v = util.vector4(5, 12, 13, 15)");
         EXPECT_FLOAT_EQ(get<float>(lua, "v.x"), 5);
         EXPECT_FLOAT_EQ(get<float>(lua, "v.y"), 12);
@@ -136,11 +143,9 @@ namespace
             lua, "swizzle['0001'] == util.vector4(0, 0, 0, 1) and swizzle['0yx1'] == util.vector4(0, 2, 1, 1)"));
     }
 
-    TEST(LuaUtilPackageTest, Color)
+    TEST_F(LuaUtilPackageTest, Color)
     {
-        sol::state lua;
-        lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
-        lua["util"] = LuaUtil::initUtilPackage(lua);
+        sol::state_view lua = mLuaState.unsafeState();
         lua.safe_script("brown = util.color.rgba(0.75, 0.25, 0, 1)");
         EXPECT_EQ(get<std::string>(lua, "tostring(brown)"), "(0.75, 0.25, 0, 1)");
         lua.safe_script("blue = util.color.rgb(0, 1, 0, 1)");
@@ -155,11 +160,9 @@ namespace
         EXPECT_TRUE(get<bool>(lua, "red:asRgb() == util.vector3(1, 0, 0)"));
     }
 
-    TEST(LuaUtilPackageTest, Transform)
+    TEST_F(LuaUtilPackageTest, Transform)
     {
-        sol::state lua;
-        lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
-        lua["util"] = LuaUtil::initUtilPackage(lua);
+        sol::state_view lua = mLuaState.unsafeState();
         lua["T"] = lua["util"]["transform"];
         lua["v"] = lua["util"]["vector3"];
         EXPECT_ERROR(lua.safe_script("T.identity = nil"), "attempt to index");
@@ -191,11 +194,9 @@ namespace
         EXPECT_LT(get<float>(lua, "(rz_move_rx:inverse() * v(0, 1, 2) - v(1, 2, 3)):length()"), 1e-6);
     }
 
-    TEST(LuaUtilPackageTest, UtilityFunctions)
+    TEST_F(LuaUtilPackageTest, UtilityFunctions)
     {
-        sol::state lua;
-        lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
-        lua["util"] = LuaUtil::initUtilPackage(lua);
+        sol::state_view lua = mLuaState.unsafeState();
         lua.safe_script("v = util.vector2(1, 0):rotate(math.rad(120))");
         EXPECT_FLOAT_EQ(get<float>(lua, "v.x"), -0.5f);
         EXPECT_FLOAT_EQ(get<float>(lua, "v.y"), 0.86602539f);
@@ -203,6 +204,10 @@ namespace
         EXPECT_FLOAT_EQ(get<float>(lua, "util.clamp(0.1, 0, 1.5)"), 0.1f);
         EXPECT_FLOAT_EQ(get<float>(lua, "util.clamp(-0.1, 0, 1.5)"), 0);
         EXPECT_FLOAT_EQ(get<float>(lua, "util.clamp(2.1, 0, 1.5)"), 1.5f);
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.round(2.1)"), 2.0f);
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.round(-2.1)"), -2.0f);
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.remap(5, 0, 10, 0, 100)"), 50.0f);
+        EXPECT_FLOAT_EQ(get<float>(lua, "util.remap(-5, 0, 10, 0, 100)"), -50.0f);
         lua.safe_script("t = util.makeReadOnly({x = 1})");
         EXPECT_FLOAT_EQ(get<float>(lua, "t.x"), 1);
         EXPECT_ERROR(lua.safe_script("t.y = 2"), "userdata value");

apps/components_tests/misc/testresourcehelpers.cpp

@@ -26,6 +26,15 @@ namespace
         std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({});
         constexpr VFS::Path::NormalizedView path("sound/foo.wav");
         EXPECT_EQ(correctSoundPath(path, *mVFS), "sound/foo.mp3");
+
+        auto correctESM4SoundPath = [](auto path, auto* vfs) {
+            return Misc::ResourceHelpers::correctResourcePath({ { "sound" } }, path, vfs, ".mp3");
+        };
+
+        EXPECT_EQ(correctESM4SoundPath("foo.WAV", mVFS.get()), "sound\\foo.mp3");
+        EXPECT_EQ(correctESM4SoundPath("SOUND/foo.WAV", mVFS.get()), "sound\\foo.mp3");
+        EXPECT_EQ(correctESM4SoundPath("DATA\\SOUND\\foo.WAV", mVFS.get()), "sound\\foo.mp3");
+        EXPECT_EQ(correctESM4SoundPath("\\Data/Sound\\foo.WAV", mVFS.get()), "sound\\foo.mp3");
     }
 
     namespace

apps/components_tests/toutf8/toutf8.cpp

@@ -1,5 +1,5 @@
 #include <components/misc/strings/conversion.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>
 
 #include <gtest/gtest.h>
 

apps/esmtool/esmtool.cpp

@@ -101,9 +101,9 @@ Allowed options)");
 
         try
         {
-            bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv).options(all).positional(p).run();
+            bpo::parsed_options validOpts = bpo::command_line_parser(argc, argv).options(all).positional(p).run();
 
-            bpo::store(valid_opts, variables);
+            bpo::store(validOpts, variables);
         }
         catch (std::exception& e)
         {
@@ -215,8 +215,6 @@ int main(int argc, char** argv)
         std::cerr << "ERROR: " << e.what() << std::endl;
         return 1;
     }
-
-    return 0;
 }
 
 namespace

apps/esmtool/labels.cpp

@@ -1,5 +1,7 @@
 #include "labels.hpp"
 
+#include <format>
+
 #include <components/esm3/dialoguecondition.hpp>
 #include <components/esm3/loadalch.hpp>
 #include <components/esm3/loadbody.hpp>
@@ -16,8 +18,6 @@
 #include <components/esm3/loadspel.hpp>
 #include <components/esm3/loadweap.hpp>
 
-#include <components/misc/strings/format.hpp>
-
 std::string_view bodyPartLabel(int idx)
 {
     if (idx >= 0 && idx <= 26)
@@ -675,7 +675,7 @@ std::string bodyPartFlags(int flags)
     int unused = (0xFFFFFFFF ^ (ESM::BodyPart::BPF_Female | ESM::BodyPart::BPF_NotPlayable));
     if (flags & unused)
         properties += "Invalid ";
-    properties += Misc::StringUtils::format("(0x%08X)", flags);
+    properties += std::format("(0x{:08X})", flags);
     return properties;
 }
 
@@ -699,7 +699,7 @@ std::string cellFlags(int flags)
         ^ (ESM::Cell::HasWater | ESM::Cell::Interior | ESM::Cell::NoSleep | ESM::Cell::QuasiEx | 0x00000040));
     if (flags & unused)
         properties += "Invalid ";
-    properties += Misc::StringUtils::format("(0x%08X)", flags);
+    properties += std::format("(0x{:08X})", flags);
     return properties;
 }
 
@@ -717,7 +717,7 @@ std::string containerFlags(int flags)
     int unused = (0xFFFFFFFF ^ (ESM::Container::Unknown | ESM::Container::Organic | ESM::Container::Respawn));
     if (flags & unused)
         properties += "Invalid ";
-    properties += Misc::StringUtils::format("(0x%08X)", flags);
+    properties += std::format("(0x{:08X})", flags);
     return properties;
 }
 
@@ -747,7 +747,7 @@ std::string creatureFlags(int flags)
             | ESM::Creature::Bipedal | ESM::Creature::Respawn | ESM::Creature::Weapon | ESM::Creature::Essential));
     if (flags & unused)
         properties += "Invalid ";
-    properties += Misc::StringUtils::format("(0x%02X)", flags);
+    properties += std::format("(0x{:02X})", flags);
     return properties;
 }
 
@@ -760,7 +760,7 @@ std::string enchantmentFlags(int flags)
         properties += "Autocalc ";
     if (flags & (0xFFFFFFFF ^ ESM::Enchantment::Autocalc))
         properties += "Invalid ";
-    properties += Misc::StringUtils::format("(0x%08X)", flags);
+    properties += std::format("(0x{:08X})", flags);
     return properties;
 }
 
@@ -778,7 +778,7 @@ std::string landFlags(std::uint32_t flags)
     int unused = 0xFFFFFFFF ^ (ESM::Land::Flag_HeightsNormals | ESM::Land::Flag_Colors | ESM::Land::Flag_Textures);
     if (flags & unused)
         properties += "Invalid ";
-    properties += Misc::StringUtils::format("(0x%08X)", flags);
+    properties += std::format("(0x{:08X})", flags);
     return properties;
 }
 
@@ -794,7 +794,7 @@ std::string itemListFlags(int flags)
     int unused = (0xFFFFFFFF ^ (ESM::ItemLevList::AllLevels | ESM::ItemLevList::Each));
     if (flags & unused)
         properties += "Invalid ";
-    properties += Misc::StringUtils::format("(0x%08X)", flags);
+    properties += std::format("(0x{:08X})", flags);
     return properties;
 }
 
@@ -808,7 +808,7 @@ std::string creatureListFlags(int flags)
     int unused = (0xFFFFFFFF ^ ESM::CreatureLevList::AllLevels);
     if (flags & unused)
         properties += "Invalid ";
-    properties += Misc::StringUtils::format("(0x%08X)", flags);
+    properties += std::format("(0x{:08X})", flags);
     return properties;
 }
 
@@ -840,7 +840,7 @@ std::string lightFlags(int flags)
             | ESM::Light::Pulse | ESM::Light::PulseSlow | ESM::Light::Negative | ESM::Light::OffDefault));
     if (flags & unused)
         properties += "Invalid ";
-    properties += Misc::StringUtils::format("(0x%08X)", flags);
+    properties += std::format("(0x{:08X})", flags);
     return properties;
 }
 
@@ -888,7 +888,7 @@ std::string magicEffectFlags(int flags)
 
     if (flags & 0xFFFC0000)
         properties += "Invalid ";
-    properties += Misc::StringUtils::format("(0x%08X)", flags);
+    properties += std::format("(0x{:08X})", flags);
     return properties;
 }
 
@@ -913,7 +913,7 @@ std::string npcFlags(int flags)
         = (0xFF ^ (ESM::NPC::Base | ESM::NPC::Autocalc | ESM::NPC::Female | ESM::NPC::Respawn | ESM::NPC::Essential));
     if (flags & unused)
         properties += "Invalid ";
-    properties += Misc::StringUtils::format("(0x%02X)", flags);
+    properties += std::format("(0x{:02X})", flags);
     return properties;
 }
 
@@ -930,7 +930,7 @@ std::string raceFlags(int flags)
     int unused = (0xFFFFFFFF ^ (ESM::Race::Playable | ESM::Race::Beast));
     if (flags & unused)
         properties += "Invalid ";
-    properties += Misc::StringUtils::format("(0x%08X)", flags);
+    properties += std::format("(0x{:08X})", flags);
     return properties;
 }
 
@@ -948,7 +948,7 @@ std::string spellFlags(int flags)
     int unused = (0xFFFFFFFF ^ (ESM::Spell::F_Autocalc | ESM::Spell::F_PCStart | ESM::Spell::F_Always));
     if (flags & unused)
         properties += "Invalid ";
-    properties += Misc::StringUtils::format("(0x%08X)", flags);
+    properties += std::format("(0x{:08X})", flags);
     return properties;
 }
 
@@ -967,7 +967,7 @@ std::string weaponFlags(int flags)
     int unused = (0xFFFFFFFF ^ (ESM::Weapon::Magical | ESM::Weapon::Silver));
     if (flags & unused)
         properties += "Invalid ";
-    properties += Misc::StringUtils::format("(0x%08X)", flags);
+    properties += std::format("(0x{:08X})", flags);
     return properties;
 }
 
@@ -987,7 +987,7 @@ std::string recordFlags(uint32_t flags)
     int unused = ~(ESM::FLAG_Deleted | ESM::FLAG_Persistent | ESM::FLAG_Ignored | ESM::FLAG_Blocked);
     if (flags & unused)
         properties += "Invalid ";
-    properties += Misc::StringUtils::format("(0x%08X)", flags);
+    properties += std::format("(0x{:08X})", flags);
     return properties;
 }
 
@@ -1000,6 +1000,6 @@ std::string potionFlags(int flags)
         properties += "Autocalc ";
     if (flags & (0xFFFFFFFF ^ ESM::Enchantment::Autocalc))
         properties += "Invalid ";
-    properties += Misc::StringUtils::format("(0x%08X)", flags);
+    properties += std::format("(0x{:08X})", flags);
     return properties;
 }

apps/esmtool/record.cpp

@@ -1,6 +1,7 @@
 #include "record.hpp"
 #include "labels.hpp"
 
+#include <format>
 #include <iostream>
 #include <numeric>
 #include <sstream>
@@ -8,15 +9,13 @@
 #include <components/esm3/cellstate.hpp>
 #include <components/esm3/esmreader.hpp>
 #include <components/misc/strings/conversion.hpp>
-#include <components/misc/strings/format.hpp>
 
 namespace
 {
 
     void printAIPackage(const ESM::AIPackage& p)
     {
-        std::cout << "  AI Type: " << aiTypeLabel(p.mType) << " (" << Misc::StringUtils::format("0x%08X", p.mType)
-                  << ")" << std::endl;
+        std::cout << std::format("  AI Type: {} (0x{:08X})\n", aiTypeLabel(p.mType), std::uint32_t(p.mType));
         if (p.mType == ESM::AI_Wander)
         {
             std::cout << "    Distance: " << p.mWander.mDistance << std::endl;
@@ -51,7 +50,7 @@ namespace
         }
         else
         {
-            std::cout << "    BadPackage: " << Misc::StringUtils::format("0x%08X", p.mType) << std::endl;
+            std::cout << std::format("    BadPackage: 0x{:08X}\n", std::uint32_t(p.mType));
         }
 
         if (!p.mCellName.empty())
@@ -60,81 +59,81 @@ namespace
 
     std::string ruleString(const ESM::DialogueCondition& ss)
     {
-        std::string_view type_str = "INVALID";
-        std::string_view func_str;
+        std::string_view typeStr = "INVALID";
+        std::string_view funcStr;
 
         switch (ss.mFunction)
         {
             case ESM::DialogueCondition::Function_Global:
-                type_str = "Global";
-                func_str = ss.mVariable;
+                typeStr = "Global";
+                funcStr = ss.mVariable;
                 break;
             case ESM::DialogueCondition::Function_Local:
-                type_str = "Local";
-                func_str = ss.mVariable;
+                typeStr = "Local";
+                funcStr = ss.mVariable;
                 break;
             case ESM::DialogueCondition::Function_Journal:
-                type_str = "Journal";
-                func_str = ss.mVariable;
+                typeStr = "Journal";
+                funcStr = ss.mVariable;
                 break;
             case ESM::DialogueCondition::Function_Item:
-                type_str = "Item count";
-                func_str = ss.mVariable;
+                typeStr = "Item count";
+                funcStr = ss.mVariable;
                 break;
             case ESM::DialogueCondition::Function_Dead:
-                type_str = "Dead";
-                func_str = ss.mVariable;
+                typeStr = "Dead";
+                funcStr = ss.mVariable;
                 break;
             case ESM::DialogueCondition::Function_NotId:
-                type_str = "Not ID";
-                func_str = ss.mVariable;
+                typeStr = "Not ID";
+                funcStr = ss.mVariable;
                 break;
             case ESM::DialogueCondition::Function_NotFaction:
-                type_str = "Not Faction";
-                func_str = ss.mVariable;
+                typeStr = "Not Faction";
+                funcStr = ss.mVariable;
                 break;
             case ESM::DialogueCondition::Function_NotClass:
-                type_str = "Not Class";
-                func_str = ss.mVariable;
+                typeStr = "Not Class";
+                funcStr = ss.mVariable;
                 break;
             case ESM::DialogueCondition::Function_NotRace:
-                type_str = "Not Race";
-                func_str = ss.mVariable;
+                typeStr = "Not Race";
+                funcStr = ss.mVariable;
                 break;
             case ESM::DialogueCondition::Function_NotCell:
-                type_str = "Not Cell";
-                func_str = ss.mVariable;
+                typeStr = "Not Cell";
+                funcStr = ss.mVariable;
                 break;
             case ESM::DialogueCondition::Function_NotLocal:
-                type_str = "Not Local";
-                func_str = ss.mVariable;
+                typeStr = "Not Local";
+                funcStr = ss.mVariable;
                 break;
             default:
-                type_str = "Function";
-                func_str = ruleFunction(ss.mFunction);
+                typeStr = "Function";
+                funcStr = ruleFunction(ss.mFunction);
                 break;
         }
 
-        std::string_view oper_str = "??";
+        std::string_view operStr = "??";
         switch (ss.mComparison)
         {
             case ESM::DialogueCondition::Comp_Eq:
-                oper_str = "==";
+                operStr = "==";
                 break;
             case ESM::DialogueCondition::Comp_Ne:
-                oper_str = "!=";
+                operStr = "!=";
                 break;
             case ESM::DialogueCondition::Comp_Gt:
-                oper_str = "> ";
+                operStr = "> ";
                 break;
             case ESM::DialogueCondition::Comp_Ge:
-                oper_str = ">=";
+                operStr = ">=";
                 break;
             case ESM::DialogueCondition::Comp_Ls:
-                oper_str = "< ";
+                operStr = "< ";
                 break;
             case ESM::DialogueCondition::Comp_Le:
-                oper_str = "<=";
+                operStr = "<=";
                 break;
             default:
                 break;
@@ -143,8 +142,7 @@ namespace
         std::ostringstream stream;
         std::visit([&](auto value) { stream << value; }, ss.mValue);
 
-        std::string result
-            = Misc::StringUtils::format("%-12s %-32s %2s %s", type_str, func_str, oper_str, stream.str());
+        std::string result = std::format("{:<12} {:<32} {:2} {}", typeStr, funcStr, operStr, stream.str());
         return result;
     }
 
@@ -176,12 +174,10 @@ namespace
     {
         for (const ESM::Transport::Dest& dest : transport)
         {
-            std::cout << "  Destination Position: " << Misc::StringUtils::format("%12.3f", dest.mPos.pos[0]) << ","
-                      << Misc::StringUtils::format("%12.3f", dest.mPos.pos[1]) << ","
-                      << Misc::StringUtils::format("%12.3f", dest.mPos.pos[2]) << ")" << std::endl;
-            std::cout << "  Destination Rotation: " << Misc::StringUtils::format("%9.6f", dest.mPos.rot[0]) << ","
-                      << Misc::StringUtils::format("%9.6f", dest.mPos.rot[1]) << ","
-                      << Misc::StringUtils::format("%9.6f", dest.mPos.rot[2]) << ")" << std::endl;
+            std::cout << std::format("  Destination Position: ({:12.3f},{:12.3f},{:12.3f})\n", dest.mPos.pos[0],
+                dest.mPos.pos[1], dest.mPos.pos[2]);
+            std::cout << std::format("  Destination Rotation: ({:9.6f},{:9.6f},{:9.6f})\n", dest.mPos.rot[0],
+                dest.mPos.rot[1], dest.mPos.rot[2]);
             if (!dest.mCellName.empty())
                 std::cout << "  Destination Cell: " << dest.mCellName << std::endl;
         }
@@ -583,7 +579,7 @@ namespace EsmTool
             std::cout << "  Water Level: " << mData.mWater << std::endl;
         }
         else
-            std::cout << "  Map Color: " << Misc::StringUtils::format("0x%08X", mData.mMapColor) << std::endl;
+            std::cout << std::format("  Map Color: 0x{:08X}\n", mData.mMapColor);
         std::cout << "  RefId counter: " << mData.mRefNumCounter << std::endl;
         std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
@@ -594,7 +590,7 @@ namespace EsmTool
         std::cout << "  Name: " << mData.mName << std::endl;
         std::cout << "  Description: " << mData.mDescription << std::endl;
         std::cout << "  Playable: " << mData.mData.mIsPlayable << std::endl;
-        std::cout << "  AI Services: " << Misc::StringUtils::format("0x%08X", mData.mData.mServices) << std::endl;
+        std::cout << std::format("  AI Services: 0x{:08X}\n", mData.mData.mServices);
         for (size_t i = 0; i < mData.mData.mAttribute.size(); ++i)
             std::cout << "  Attribute" << (i + 1) << ": " << attributeLabel(mData.mData.mAttribute[i]) << " ("
                       << mData.mData.mAttribute[i] << ")" << std::endl;
@@ -642,8 +638,7 @@ namespace EsmTool
         std::cout << "  Flags: " << containerFlags(mData.mFlags) << std::endl;
         std::cout << "  Weight: " << mData.mWeight << std::endl;
         for (const ESM::ContItem& item : mData.mInventory.mList)
-            std::cout << "  Inventory: Count: " << Misc::StringUtils::format("%4d", item.mCount)
-                      << " Item: " << item.mItem << std::endl;
+            std::cout << std::format("  Inventory: Count: {:4d} Item: ", item.mCount) << item.mItem << std::endl;
         std::cout << "  Deleted: " << mIsDeleted << std::endl;
     }
 
@@ -680,8 +675,7 @@ namespace EsmTool
         std::cout << "  Gold: " << mData.mData.mGold << std::endl;
 
         for (const ESM::ContItem& item : mData.mInventory.mList)
-            std::cout << "  Inventory: Count: " << Misc::StringUtils::format("%4d", item.mCount)
-                      << " Item: " << item.mItem << std::endl;
+            std::cout << std::format("  Inventory: Count: {:4d} Item: ", item.mCount) << item.mItem << std::endl;
 
         for (const auto& spell : mData.mSpells.mList)
             std::cout << "  Spell: " << spell << std::endl;
@@ -693,7 +687,7 @@ namespace EsmTool
         std::cout << "    AI Fight:" << (int)mData.mAiData.mFight << std::endl;
         std::cout << "    AI Flee:" << (int)mData.mAiData.mFlee << std::endl;
         std::cout << "    AI Alarm:" << (int)mData.mAiData.mAlarm << std::endl;
-        std::cout << "    AI Services:" << Misc::StringUtils::format("0x%08X", mData.mAiData.mServices) << std::endl;
+        std::cout << std::format("    AI Services:0x{:08X}\n", mData.mAiData.mServices);
 
         for (const ESM::AIPackage& package : mData.mAiPackage.mList)
             printAIPackage(package);
@@ -1068,8 +1062,7 @@ namespace EsmTool
         }
 
         for (const ESM::ContItem& item : mData.mInventory.mList)
-            std::cout << "  Inventory: Count: " << Misc::StringUtils::format("%4d", item.mCount)
-                      << " Item: " << item.mItem << std::endl;
+            std::cout << std::format("  Inventory: Count: {:4d} Item: ", item.mCount) << item.mItem << std::endl;
 
         for (const auto& spell : mData.mSpells.mList)
             std::cout << "  Spell: " << spell << std::endl;
@@ -1081,7 +1074,7 @@ namespace EsmTool
         std::cout << "    AI Fight:" << (int)mData.mAiData.mFight << std::endl;
         std::cout << "    AI Flee:" << (int)mData.mAiData.mFlee << std::endl;
         std::cout << "    AI Alarm:" << (int)mData.mAiData.mAlarm << std::endl;
-        std::cout << "    AI Services:" << Misc::StringUtils::format("0x%08X", mData.mAiData.mServices) << std::endl;
+        std::cout << std::format("    AI Services:0x{:08X}\n", mData.mAiData.mServices);
 
         for (const ESM::AIPackage& package : mData.mAiPackage.mList)
             printAIPackage(package);
@@ -1192,8 +1185,8 @@ namespace EsmTool
             std::cout << "  Variable: " << variable << std::endl;
 
         std::cout << "  ByteCode: ";
-        for (const unsigned char& byte : mData.mScriptData)
-            std::cout << Misc::StringUtils::format("%02X", (int)(byte));
+        for (unsigned char byte : mData.mScriptData)
+            std::cout << std::format("{:02X}", byte);
         std::cout << std::endl;
 
         if (mPrintPlain)

apps/esmtool/tes4.cpp

@@ -15,7 +15,7 @@
 #include <components/esm4/readerutils.hpp>
 #include <components/esm4/records.hpp>
 #include <components/esm4/typetraits.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>
 
 namespace EsmTool
 {

apps/essimporter/convertacdt.cpp

@@ -90,7 +90,7 @@ namespace ESSImport
             scriptedAnim.mAbsolute = true;
             // Neither loop count nor queueing seems to be supported by the ess format.
             scriptedAnim.mLoopCount = std::numeric_limits<size_t>::max();
-            state.mScriptedAnims.push_back(scriptedAnim);
+            state.mScriptedAnims.push_back(std::move(scriptedAnim));
         }
         else
             // TODO: Handle 0xFF index, which seems to be used for finished animations.

apps/essimporter/converter.cpp

@@ -303,7 +303,7 @@ namespace ESSImport
             marker.mWorldY = notepos[1];
             marker.mNote = std::move(note);
             marker.mCell = cell.mId;
-            mMarkers.push_back(marker);
+            mMarkers.push_back(std::move(marker));
         }
 
         newcell.mRefs = std::move(cellrefs);

apps/essimporter/converter.hpp

@@ -181,14 +181,14 @@ namespace ESSImport
     public:
         void read(ESM::ESMReader& esm) override
         {
-            ESM::Class class_;
+            ESM::Class classRecord;
             bool isDeleted = false;
 
-            class_.load(esm, isDeleted);
-            if (class_.mId == "NEWCLASSID_CHARGEN")
-                mContext->mCustomPlayerClassName = class_.mName;
+            classRecord.load(esm, isDeleted);
+            if (classRecord.mId == "NEWCLASSID_CHARGEN")
+                mContext->mCustomPlayerClassName = classRecord.mName;
 
-            mRecords[class_.mId] = class_;
+            mRecords[classRecord.mId] = classRecord;
         }
     };
 
@@ -249,10 +249,10 @@ namespace ESSImport
             {
                 ESM::InventoryState& invState = mContext->mPlayer.mObject.mInventory;
 
-                for (size_t i = 0; i < invState.mItems.size(); ++i)
+                for (uint32_t i = 0; i < static_cast<uint32_t>(invState.mItems.size()); ++i)
                 {
                     // FIXME: in case of conflict (multiple items with this refID) use the already equipped one?
-                    if (invState.mItems[i].mRef.mRefID == ESM::RefId::stringRefId(refr.mActorData.mSelectedEnchantItem))
+                    if (invState.mItems[i].mRef.mRefID == refr.mActorData.mSelectedEnchantItem)
                         invState.mSelectedEnchantItem = i;
                 }
             }
@@ -260,12 +260,12 @@ namespace ESSImport
         void write(ESM::ESMWriter& esm) override
         {
             esm.startRecord(ESM::REC_ASPL);
-            esm.writeHNString("ID__", mSelectedSpell);
+            esm.writeHNRefId("ID__", mSelectedSpell);
             esm.endRecord(ESM::REC_ASPL);
         }
 
     private:
-        std::string mSelectedSpell;
+        ESM::RefId mSelectedSpell;
     };
 
     class ConvertPCDT : public Converter
@@ -374,16 +374,16 @@ namespace ESSImport
         void write(ESM::ESMWriter& esm) override
         {
             esm.startRecord(ESM::REC_DCOU);
-            for (auto it = mKillCounter.begin(); it != mKillCounter.end(); ++it)
+            for (const auto& [id, count] : mKillCounter)
             {
-                esm.writeHNString("ID__", it->first);
-                esm.writeHNT("COUN", it->second);
+                esm.writeHNRefId("ID__", id);
+                esm.writeHNT("COUN", count);
             }
             esm.endRecord(ESM::REC_DCOU);
         }
 
     private:
-        std::map<std::string, int> mKillCounter;
+        std::map<ESM::RefId, int> mKillCounter;
     };
 
     class ConvertFACT : public Converter
@@ -584,7 +584,7 @@ namespace ESSImport
             script.load(esm);
             ESM::GlobalScript out;
             convertSCPT(script, out);
-            mScripts.push_back(out);
+            mScripts.push_back(std::move(out));
         }
         void write(ESM::ESMWriter& esm) override
         {

apps/essimporter/importacdt.hpp

@@ -75,8 +75,8 @@ namespace ESSImport
         // to change them ingame
         int mCombatStats[3][2];
 
-        std::string mSelectedSpell;
-        std::string mSelectedEnchantItem;
+        ESM::RefId mSelectedSpell;
+        ESM::RefId mSelectedEnchantItem;
 
         SCRI mSCRI;
 

apps/essimporter/importcellref.cpp

@@ -107,12 +107,12 @@ namespace ESSImport
 
         if (esm.isNextSub("WNAM"))
         {
-            std::string id = esm.getHString();
+            ESM::RefId spellRefId = esm.getRefId();
 
             if (esm.isNextSub("XNAM"))
-                mActorData.mSelectedEnchantItem = esm.getHString();
+                mActorData.mSelectedEnchantItem = esm.getRefId();
             else
-                mActorData.mSelectedSpell = std::move(id);
+                mActorData.mSelectedSpell = std::move(spellRefId);
 
             if (esm.isNextSub("YNAM"))
                 esm.skipHSub(); // 4 byte, 0

apps/essimporter/importer.cpp

@@ -25,7 +25,7 @@
 
 #include <components/misc/constants.hpp>
 
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>
 
 #include "importercontext.hpp"
 
@@ -136,9 +136,9 @@ namespace ESSImport
                 sub.mName = esm.retSubName().toString();
                 sub.mData.resize(esm.getSubSize());
                 esm.getExact(sub.mData.data(), sub.mData.size());
-                rec.mSubrecords.push_back(sub);
+                rec.mSubrecords.push_back(std::move(sub));
             }
-            file.mRecords.push_back(rec);
+            file.mRecords.push_back(std::move(rec));
         }
     }
 

apps/essimporter/importinfo.cpp

@@ -7,7 +7,19 @@ namespace ESSImport
 
     void INFO::load(ESM::ESMReader& esm)
     {
-        mInfo = esm.getHNString("INAM");
+        if (esm.peekNextSub("XNAM"))
+        {
+            // TODO: Support older saves by turning XNAM into a RefId.
+            // XNAM is probably the number of the topic response within the topic record's linked list.
+            // Resolving this value will likely require loading Morrowind.esm.
+
+            esm.getSubName();
+            esm.skipHSub();
+            mInfo = ESM::RefId();
+        }
+        else
+            mInfo = esm.getHNRefId("INAM");
+
         mActorRefId = esm.getHNString("ACDT");
     }
 

apps/essimporter/importinfo.hpp

@@ -3,6 +3,8 @@
 
 #include <string>
 
+#include <components/esm/refid.hpp>
+
 namespace ESM
 {
     class ESMReader;
@@ -13,7 +15,7 @@ namespace ESSImport
 
     struct INFO
     {
-        std::string mInfo;
+        ESM::RefId mInfo;
         std::string mActorRefId;
 
         void load(ESM::ESMReader& esm);

apps/essimporter/importinventory.cpp

@@ -49,7 +49,7 @@ namespace ESSImport
             }
 
             if (!separateStacks)
-                mItems.push_back(item);
+                mItems.push_back(std::move(item));
         }
 
         // equipped items

apps/essimporter/importklst.cpp

@@ -9,7 +9,7 @@ namespace ESSImport
     {
         while (esm.isNextSub("KNAM"))
         {
-            std::string refId = esm.getHString();
+            ESM::RefId refId = esm.getRefId();
             int32_t count;
             esm.getHNT(count, "CNAM");
             mKillCounter[refId] = count;

apps/essimporter/importklst.hpp

@@ -3,7 +3,8 @@
 
 #include <cstdint>
 #include <map>
-#include <string>
+
+#include <components/esm/refid.hpp>
 
 namespace ESM
 {
@@ -18,8 +19,7 @@ namespace ESSImport
     {
         void load(ESM::ESMReader& esm);
 
-        /// RefId, kill count
-        std::map<std::string, int32_t> mKillCounter;
+        std::map<ESM::RefId, int32_t> mKillCounter;
 
         int32_t mWerewolfKills;
     };

apps/essimporter/importsplm.cpp

@@ -38,7 +38,7 @@ namespace ESSImport
             unsigned char xnam; // sentinel
             esm.getHNT(xnam, "XNAM");
 
-            mActiveSpells.push_back(spell);
+            mActiveSpells.push_back(std::move(spell));
         }
     }
 

apps/essimporter/main.cpp

@@ -15,7 +15,7 @@ int main(int argc, char** argv)
     {
         bpo::options_description desc(R"(Syntax: openmw-essimporter <options> infile.ess outfile.omwsave
 Allowed options)");
-        bpo::positional_options_description p_desc;
+        bpo::positional_options_description positionalDesc;
         auto addOption = desc.add_options();
         addOption("help,h", "produce help message");
         addOption("mwsave,m", bpo::value<Files::MaybeQuotedPath>(), "morrowind .ess save file");
@@ -23,12 +23,13 @@ Allowed options)");
         addOption("compare,c", "compare two .ess files");
         addOption("encoding", boost::program_options::value<std::string>()->default_value("win1252"),
             "encoding of the save file");
-        p_desc.add("mwsave", 1).add("output", 1);
+        positionalDesc.add("mwsave", 1).add("output", 1);
         Files::ConfigurationManager::addCommonOptions(desc);
 
         bpo::variables_map variables;
 
-        bpo::parsed_options parsed = bpo::command_line_parser(argc, argv).options(desc).positional(p_desc).run();
+        bpo::parsed_options parsed
+            = bpo::command_line_parser(argc, argv).options(desc).positional(positionalDesc).run();
         bpo::store(parsed, variables);
 
         if (variables.count("help") || !variables.count("mwsave") || !variables.count("output"))
@@ -40,6 +41,7 @@ Allowed options)");
         bpo::notify(variables);
 
         Files::ConfigurationManager cfgManager(true);
+        cfgManager.processPaths(variables, std::filesystem::current_path());
         cfgManager.readConfiguration(variables, desc);
 
         const auto& essFile = variables["mwsave"].as<Files::MaybeQuotedPath>();

apps/launcher/datafilespage.cpp

@@ -39,8 +39,6 @@
 #include "utils/profilescombobox.hpp"
 #include "utils/textinputdialog.hpp"
 
-#include "ui_directorypicker.h"
-
 const char* Launcher::DataFilesPage::mDefaultContentListName = "Default";
 
 namespace
@@ -155,6 +153,7 @@ namespace Launcher
 Launcher::DataFilesPage::DataFilesPage(const Files::ConfigurationManager& cfg, Config::GameSettings& gameSettings,
     Config::LauncherSettings& launcherSettings, MainDialog* parent)
     : QWidget(parent)
+    , mDirectoryPickerDialog(new QDialog(this))
     , mMainDialog(parent)
     , mCfgMgr(cfg)
     , mGameSettings(gameSettings)
@@ -163,6 +162,7 @@ Launcher::DataFilesPage::DataFilesPage(const Files::ConfigurationManager& cfg, C
     , mReloadCellsThread(&DataFilesPage::reloadCells, this)
 {
     ui.setupUi(this);
+    mDirectoryPicker.setupUi(mDirectoryPickerDialog);
     setObjectName("DataFilesPage");
     mSelector = new ContentSelectorView::ContentSelector(ui.contentSelectorWidget, /*showOMWScripts=*/true);
     const QString encoding = mGameSettings.value("encoding", { "win1252" }).value;
@@ -266,6 +266,7 @@ void Launcher::DataFilesPage::buildView()
 
     buildArchiveContextMenu();
     buildDataFilesContextMenu();
+    buildDirectoryPickerContextMenu();
 }
 
 void Launcher::DataFilesPage::slotCopySelectedItemsPaths()
@@ -298,8 +299,10 @@ void Launcher::DataFilesPage::buildArchiveContextMenu()
         &DataFilesPage::slotShowArchiveContextMenu);
 
     mArchiveContextMenu = new QMenu(ui.archiveListWidget);
-    mArchiveContextMenu->addAction(tr("&Check Selected"), this, SLOT(slotCheckMultiSelectedItems()));
-    mArchiveContextMenu->addAction(tr("&Uncheck Selected"), this, SLOT(slotUncheckMultiSelectedItems()));
+    mArchiveContextMenu->addAction(tr("&Check Selected"), this,
+        [this]() { setCheckStateForMultiSelectedItems(ui.archiveListWidget, Qt::Checked); });
+    mArchiveContextMenu->addAction(tr("&Uncheck Selected"), this,
+        [this]() { setCheckStateForMultiSelectedItems(ui.archiveListWidget, Qt::Unchecked); });
 }
 
 void Launcher::DataFilesPage::buildDataFilesContextMenu()
@@ -314,6 +317,18 @@ void Launcher::DataFilesPage::buildDataFilesContextMenu()
         tr("&Open Path in File Explorer"), this, &Launcher::DataFilesPage::slotOpenSelectedItemsPaths);
 }
 
+void Launcher::DataFilesPage::buildDirectoryPickerContextMenu()
+{
+    connect(mDirectoryPicker.dirListWidget, &QListWidget::customContextMenuRequested, this,
+        &DataFilesPage::slotShowDirectoryPickerContextMenu);
+
+    mDirectoryPickerMenu = new QMenu(mDirectoryPicker.dirListWidget);
+    mDirectoryPickerMenu->addAction(tr("&Check Selected"), this,
+        [this]() { setCheckStateForMultiSelectedItems(mDirectoryPicker.dirListWidget, Qt::Checked); });
+    mDirectoryPickerMenu->addAction(tr("&Uncheck Selected"), this,
+        [this]() { setCheckStateForMultiSelectedItems(mDirectoryPicker.dirListWidget, Qt::Unchecked); });
+}
+
 bool Launcher::DataFilesPage::loadSettings()
 {
     ui.navMeshMaxSizeSpinBox->setValue(getMaxNavMeshDbFileSizeMiB());
@@ -821,28 +836,22 @@ void Launcher::DataFilesPage::addSubdirectories(bool append)
         return;
     }
 
-    QDialog dialog;
-    Ui::SelectSubdirs select;
-
-    select.setupUi(&dialog);
+    mDirectoryPicker.dirListWidget->clear();
 
     for (const auto& dir : subdirs)
     {
         if (!ui.directoryListWidget->findItems(dir, Qt::MatchFixedString).isEmpty())
             continue;
-        const auto lastRow = select.dirListWidget->count();
-        select.dirListWidget->addItem(dir);
-        select.dirListWidget->item(lastRow)->setCheckState(Qt::Unchecked);
+        QListWidgetItem* newDir = new QListWidgetItem(dir, mDirectoryPicker.dirListWidget);
+        newDir->setCheckState(Qt::Unchecked);
     }
 
-    dialog.show();
-
-    if (dialog.exec() == QDialog::Rejected)
+    if (mDirectoryPickerDialog->exec() == QDialog::Rejected)
         return;
 
-    for (int i = 0; i < select.dirListWidget->count(); ++i)
+    for (int i = 0; i < mDirectoryPicker.dirListWidget->count(); ++i)
     {
-        const auto* dir = select.dirListWidget->item(i);
+        const auto* dir = mDirectoryPicker.dirListWidget->item(i);
         if (dir->checkState() == Qt::Checked)
         {
             ui.directoryListWidget->insertItem(selectedRow, dir->text());
@@ -893,38 +902,35 @@ void Launcher::DataFilesPage::removeDirectory()
     refreshDataFilesView();
 }
 
+void Launcher::DataFilesPage::showContextMenu(QMenu* menu, QListWidget* list, const QPoint& pos)
+{
+    QPoint globalPos = list->viewport()->mapToGlobal(pos);
+    menu->exec(globalPos);
+}
+
 void Launcher::DataFilesPage::slotShowArchiveContextMenu(const QPoint& pos)
 {
-    QPoint globalPos = ui.archiveListWidget->viewport()->mapToGlobal(pos);
-    mArchiveContextMenu->exec(globalPos);
+    showContextMenu(mArchiveContextMenu, ui.archiveListWidget, pos);
 }
 
 void Launcher::DataFilesPage::slotShowDataFilesContextMenu(const QPoint& pos)
 {
-    QPoint globalPos = ui.directoryListWidget->viewport()->mapToGlobal(pos);
-    mDataFilesContextMenu->exec(globalPos);
+    showContextMenu(mDataFilesContextMenu, ui.directoryListWidget, pos);
 }
 
-void Launcher::DataFilesPage::setCheckStateForMultiSelectedItems(bool checked)
+void Launcher::DataFilesPage::slotShowDirectoryPickerContextMenu(const QPoint& pos)
 {
-    Qt::CheckState checkState = checked ? Qt::Checked : Qt::Unchecked;
+    showContextMenu(mDirectoryPickerMenu, mDirectoryPicker.dirListWidget, pos);
+}
 
-    for (QListWidgetItem* selectedItem : ui.archiveListWidget->selectedItems())
+void Launcher::DataFilesPage::setCheckStateForMultiSelectedItems(QListWidget* list, Qt::CheckState checkState)
+{
+    for (QListWidgetItem* selectedItem : list->selectedItems())
     {
         selectedItem->setCheckState(checkState);
     }
 }
 
-void Launcher::DataFilesPage::slotUncheckMultiSelectedItems()
-{
-    setCheckStateForMultiSelectedItems(false);
-}
-
-void Launcher::DataFilesPage::slotCheckMultiSelectedItems()
-{
-    setCheckStateForMultiSelectedItems(true);
-}
-
 void Launcher::DataFilesPage::moveSources(QListWidget* sourceList, int step)
 {
     const QList<QPair<int, QListWidgetItem*>> sortedItems = sortedSelectedItems(sourceList, step > 0);

apps/launcher/datafilespage.hpp

@@ -2,6 +2,7 @@
 #define DATAFILESPAGE_H
 
 #include "ui_datafilespage.h"
+#include "ui_directorypicker.h"
 
 #include <components/process/processinvoker.hpp>
 
@@ -46,8 +47,11 @@ namespace Launcher
 
         ContentSelectorView::ContentSelector* mSelector;
         Ui::DataFilesPage ui;
+        QDialog* mDirectoryPickerDialog;
+        Ui::SelectSubdirs mDirectoryPicker;
         QMenu* mArchiveContextMenu;
         QMenu* mDataFilesContextMenu;
+        QMenu* mDirectoryPickerMenu;
 
     public:
         explicit DataFilesPage(const Files::ConfigurationManager& cfg, Config::GameSettings& gameSettings,
@@ -87,8 +91,7 @@ namespace Launcher
 
         void slotShowArchiveContextMenu(const QPoint& pos);
         void slotShowDataFilesContextMenu(const QPoint& pos);
-        void slotCheckMultiSelectedItems();
-        void slotUncheckMultiSelectedItems();
+        void slotShowDirectoryPickerContextMenu(const QPoint& pos);
 
         void on_newProfileAction_triggered();
         void on_cloneProfileAction_triggered();
@@ -145,7 +148,9 @@ namespace Launcher
         void buildView();
         void buildArchiveContextMenu();
         void buildDataFilesContextMenu();
-        void setCheckStateForMultiSelectedItems(bool checked);
+        void buildDirectoryPickerContextMenu();
+        void showContextMenu(QMenu* menu, QListWidget* list, const QPoint& pos);
+        void setCheckStateForMultiSelectedItems(QListWidget* list, Qt::CheckState checkState);
         void setProfile(int index, bool savePrevious);
         void setProfile(const QString& previous, const QString& current, bool savePrevious);
         void removeProfile(const QString& profile);

apps/launcher/graphicspage.cpp

@@ -242,11 +242,36 @@ void Launcher::GraphicsPage::handleWindowModeChange(Settings::WindowMode mode)
 {
     if (mode == Settings::WindowMode::Fullscreen || mode == Settings::WindowMode::WindowedFullscreen)
     {
+        QString customSizeMessage = tr("Custom window size is available only in Windowed mode.");
+        QString windowBorderMessage = tr("Window border is available only in Windowed mode.");
+
         standardRadioButton->toggle();
         customRadioButton->setEnabled(false);
         customWidthSpinBox->setEnabled(false);
         customHeightSpinBox->setEnabled(false);
         windowBorderCheckBox->setEnabled(false);
+        windowBorderCheckBox->setToolTip(windowBorderMessage);
+        customWidthSpinBox->setToolTip(customSizeMessage);
+        customHeightSpinBox->setToolTip(customSizeMessage);
+        customRadioButton->setToolTip(customSizeMessage);
+    }
+
+    if (mode == Settings::WindowMode::Fullscreen)
+    {
+        resolutionComboBox->setEnabled(true);
+        resolutionComboBox->setToolTip("");
+        standardRadioButton->setToolTip("");
+    }
+    else if (mode == Settings::WindowMode::WindowedFullscreen)
+    {
+        QString fullScreenMessage = tr("Windowed Fullscreen mode always uses the native display resolution.");
+
+        resolutionComboBox->setEnabled(false);
+        resolutionComboBox->setToolTip(fullScreenMessage);
+        standardRadioButton->setToolTip(fullScreenMessage);
+
+        // Assume that a first item is a native screen resolution
+        resolutionComboBox->setCurrentIndex(0);
     }
     else
     {
@@ -254,6 +279,13 @@ void Launcher::GraphicsPage::handleWindowModeChange(Settings::WindowMode mode)
         customWidthSpinBox->setEnabled(true);
         customHeightSpinBox->setEnabled(true);
         windowBorderCheckBox->setEnabled(true);
+        resolutionComboBox->setEnabled(true);
+        resolutionComboBox->setToolTip("");
+        standardRadioButton->setToolTip("");
+        windowBorderCheckBox->setToolTip("");
+        customWidthSpinBox->setToolTip("");
+        customHeightSpinBox->setToolTip("");
+        customRadioButton->setToolTip("");
     }
 }
 

apps/launcher/importpage.cpp

@@ -88,11 +88,7 @@ void Launcher::ImportPage::on_importerButton_clicked()
     // Create the file if it doesn't already exist, else the importer will fail
     auto path = mCfgMgr.getUserConfigPath();
     path /= "openmw.cfg";
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     QFile file(path);
-#else
-    QFile file(Files::pathToQString(path));
-#endif
 
     if (!file.exists())
     {

apps/launcher/main.cpp

@@ -42,7 +42,7 @@ int runLauncher(int argc, char* argv[])
             resourcesPath = Files::pathToQString(variables["resources"].as<Files::MaybeQuotedPath>().u8string());
         }
 
-        l10n::installQtTranslations(app, "launcher", resourcesPath);
+        L10n::installQtTranslations(app, "launcher", resourcesPath);
 
         Launcher::MainDialog mainWin(configurationManager);
 

apps/launcher/maindialog.cpp

@@ -497,11 +497,7 @@ bool Launcher::MainDialog::writeSettings()
     }
 
     // Game settings
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     QFile file(userPath / Files::openmwCfgFile);
-#else
-    QFile file(Files::getUserConfigPathQString(mCfgMgr));
-#endif
 
     if (!file.open(QIODevice::ReadWrite | QIODevice::Text))
     {

apps/launcher/settingspage.cpp

@@ -163,8 +163,6 @@ bool Launcher::SettingsPage::loadSettings()
         loadSettingInt(Settings::physics().mAsyncNumThreads, *physicsThreadsSpinBox);
         loadSettingBool(
             Settings::game().mAllowActorsToFollowOverWaterSurface, *allowNPCToFollowOverWaterSurfaceCheckBox);
-        loadSettingBool(
-            Settings::game().mUnarmedCreatureAttacksDamageArmor, *unarmedCreatureAttacksDamageArmorCheckBox);
         loadSettingInt(Settings::game().mActorCollisionShapeType, *actorCollisonShapeTypeComboBox);
     }
 
@@ -293,6 +291,7 @@ bool Launcher::SettingsPage::loadSettings()
             }
         }
         loadSettingBool(Settings::sound().mCameraListener, *cameraListenerCheckBox);
+        dopplerSpinBox->setValue(Settings::sound().mDopplerFactor);
     }
 
     // Interface Changes
@@ -304,6 +303,9 @@ bool Launcher::SettingsPage::loadSettings()
         loadSettingBool(Settings::gui().mColorTopicEnable, *changeDialogTopicsCheckBox);
         showOwnedComboBox->setCurrentIndex(Settings::game().mShowOwned);
         loadSettingBool(Settings::gui().mStretchMenuBackground, *stretchBackgroundCheckBox);
+        connect(controllerMenusCheckBox, &QCheckBox::toggled, this, &SettingsPage::slotControllerMenusToggled);
+        loadSettingBool(Settings::gui().mControllerMenus, *controllerMenusCheckBox);
+        loadSettingBool(Settings::gui().mControllerTooltips, *controllerMenuTooltipsCheckBox);
         loadSettingBool(Settings::map().mAllowZooming, *useZoomOnMapCheckBox);
         loadSettingBool(Settings::game().mGraphicHerbalism, *graphicHerbalismCheckBox);
         scalingSpinBox->setValue(Settings::gui().mScalingFactor);
@@ -373,8 +375,6 @@ void Launcher::SettingsPage::saveSettings()
         saveSettingInt(*physicsThreadsSpinBox, Settings::physics().mAsyncNumThreads);
         saveSettingBool(
             *allowNPCToFollowOverWaterSurfaceCheckBox, Settings::game().mAllowActorsToFollowOverWaterSurface);
-        saveSettingBool(
-            *unarmedCreatureAttacksDamageArmorCheckBox, Settings::game().mUnarmedCreatureAttacksDamageArmor);
         saveSettingInt(*actorCollisonShapeTypeComboBox, Settings::game().mActorCollisionShapeType);
     }
 
@@ -486,6 +486,8 @@ void Launcher::SettingsPage::saveSettings()
 
         const bool cCameraListener = cameraListenerCheckBox->checkState() != Qt::Unchecked;
         Settings::sound().mCameraListener.set(cCameraListener);
+
+        Settings::sound().mDopplerFactor.set(dopplerSpinBox->value());
     }
 
     // Interface Changes
@@ -497,6 +499,8 @@ void Launcher::SettingsPage::saveSettings()
         saveSettingBool(*changeDialogTopicsCheckBox, Settings::gui().mColorTopicEnable);
         saveSettingInt(*showOwnedComboBox, Settings::game().mShowOwned);
         saveSettingBool(*stretchBackgroundCheckBox, Settings::gui().mStretchMenuBackground);
+        saveSettingBool(*controllerMenusCheckBox, Settings::gui().mControllerMenus);
+        saveSettingBool(*controllerMenuTooltipsCheckBox, Settings::gui().mControllerTooltips);
         saveSettingBool(*useZoomOnMapCheckBox, Settings::map().mAllowZooming);
         saveSettingBool(*graphicHerbalismCheckBox, Settings::game().mGraphicHerbalism);
         Settings::gui().mScalingFactor.set(scalingSpinBox->value());
@@ -555,6 +559,11 @@ void Launcher::SettingsPage::slotAnimSourcesToggled(bool checked)
     }
 }
 
+void Launcher::SettingsPage::slotControllerMenusToggled(bool checked)
+{
+    controllerMenuTooltipsCheckBox->setEnabled(checked);
+}
+
 void Launcher::SettingsPage::slotPostProcessToggled(bool checked)
 {
     postprocessTransparentPostpassCheckBox->setEnabled(checked);

apps/launcher/settingspage.hpp

@@ -34,6 +34,7 @@ namespace Launcher
         void slotSkyBlendingToggled(bool checked);
         void slotShadowDistLimitToggled(bool checked);
         void slotDistantLandToggled(bool checked);
+        void slotControllerMenusToggled(bool checked);
 
     private:
         Config::GameSettings& mGameSettings;

apps/launcher/ui/directorypicker.ui

@@ -25,7 +25,14 @@
     </widget>
    </item>
    <item row="0" column="0">
-    <widget class="QListWidget" name="dirListWidget"/>
+    <widget class="QListWidget" name="dirListWidget">
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+     <property name="contextMenuPolicy">
+      <enum>Qt::CustomContextMenu</enum>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>

apps/launcher/ui/settingspage.ui

@@ -53,7 +53,7 @@
            </property>
           </widget>
          </item>
-         <item row="10" column="1">
+         <item row="9" column="1">
           <widget class="QCheckBox" name="normaliseRaceSpeedCheckBox">
            <property name="toolTip">
             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Don't use race weight in NPC movement speed calculations.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -63,7 +63,7 @@
            </property>
           </widget>
          </item>
-         <item row="9" column="1">
+         <item row="8" column="1">
           <widget class="QCheckBox" name="classicCalmSpellsCheckBox">
            <property name="toolTip">
             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Stops combat with NPCs affected by Calm spells every frame -- like in Morrowind without the MCP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -73,7 +73,7 @@
            </property>
           </widget>
          </item>
-         <item row="12" column="1">
+         <item row="11" column="1">
           <widget class="QCheckBox" name="avoidCollisionsCheckBox">
            <property name="toolTip">
             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled NPCs apply evasion maneuver to avoid collisions with others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -123,7 +123,7 @@
            </property>
           </widget>
          </item>
-         <item row="6" column="1">
+         <item row="5" column="1">
           <widget class="QCheckBox" name="requireAppropriateAmmunitionCheckBox">
            <property name="toolTip">
             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled, a magical ammunition is required to bypass normal weapon resistance or weakness. If disabled, a magical ranged weapon or a magical ammunition is required.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -133,7 +133,7 @@
            </property>
           </widget>
          </item>
-         <item row="13" column="1">
+         <item row="12" column="1">
           <widget class="QCheckBox" name="graphicHerbalismCheckBox">
            <property name="toolTip">
             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, containers supporting graphic herbalism will do so instead of opening the menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -143,7 +143,7 @@
            </property>
           </widget>
          </item>
-         <item row="11" column="1">
+         <item row="10" column="1">
           <widget class="QCheckBox" name="swimUpwardCorrectionCheckBox">
            <property name="toolTip">
             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes player swim a bit upward from the line of sight. Applies only in third person mode. Intended to make simpler swimming without diving.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -153,7 +153,7 @@
            </property>
           </widget>
          </item>
-         <item row="8" column="1">
+         <item row="7" column="1">
           <widget class="QCheckBox" name="enchantedWeaponsMagicalCheckBox">
            <property name="toolTip">
             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make enchanted weapons without Magical flag bypass normal weapons resistance, like in Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -183,7 +183,7 @@
            </property>
           </widget>
          </item>
-         <item row="7" column="1">
+         <item row="6" column="1">
           <widget class="QCheckBox" name="canLootDuringDeathAnimationCheckBox">
            <property name="toolTip">
             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, the player is allowed to loot actors (e.g. summoned creatures) during death animation, if they are not in combat. In this case we have to increment death counter and run disposed actor's script instantly.&lt;/p&gt;&lt;p&gt;If this setting is false, player has to wait until end of death animation in all cases. Makes using of summoned creatures exploit (looting summoned Dremoras and Golden Saints for expensive weapons) a lot harder. Conflicts with mannequin mods, which use SkipAnim to prevent end of death animation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -203,7 +203,7 @@
            </property>
           </widget>
          </item>
-         <item row="5" column="1">
+         <item row="4" column="1">
           <widget class="QCheckBox" name="classicReflectedAbsorbSpellsCheckBox">
            <property name="toolTip">
             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Effects of reflected Absorb spells are not mirrored - like in Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -213,16 +213,6 @@
            </property>
           </widget>
          </item>
-         <item row="4" column="1">
-          <widget class="QCheckBox" name="unarmedCreatureAttacksDamageArmorCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Makes unarmed creature attacks able to reduce armor condition, just as attacks from NPCs and armed creatures.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Unarmed Creature Attacks Damage Armor</string>
-           </property>
-          </widget>
-         </item>
         </layout>
        </item>
        <item>
@@ -1099,68 +1089,20 @@
       <attribute name="title">
        <string>Audio</string>
       </attribute>
-      <layout class="QVBoxLayout">
-       <item>
-        <layout class="QHBoxLayout">
-         <item>
-          <widget class="QLabel" name="audioDeviceSelectorLabel">
-           <property name="toolTip">
-            <string>Select your preferred audio device.</string>
-           </property>
-           <property name="text">
-            <string>Audio Device</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="audioDeviceSelectorComboBox">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>283</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="currentIndex">
-            <number>0</number>
-           </property>
-           <item>
-            <property name="text">
-             <string>Default</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QHBoxLayout">
-         <item>
-          <widget class="QLabel" name="enableHRTFLabel">
-           <property name="toolTip">
-            <string>This setting controls HRTF, which simulates 3D sound on stereo systems.</string>
-           </property>
-           <property name="text">
-            <string>HRTF</string>
-           </property>
-          </widget>
-         </item>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
+        <layout class="QGridLayout" name="audioLayout">
+         <item row="1" column="1">
           <widget class="QComboBox" name="enableHRTFComboBox">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="minimumSize">
             <size>
-             <width>283</width>
+             <width>0</width>
              <height>0</height>
             </size>
            </property>
@@ -1184,11 +1126,74 @@
            </item>
           </widget>
          </item>
-        </layout>
+         <item row="1" column="0">
+          <widget class="QLabel" name="enableHRTFLabel">
+           <property name="toolTip">
+            <string>This setting controls HRTF, which simulates 3D sound on stereo systems.</string>
+           </property>
+           <property name="text">
+            <string>HRTF</string>
+           </property>
+          </widget>
          </item>
+         <item row="4" column="0">
+          <widget class="QCheckBox" name="cameraListenerCheckBox">
+           <property name="toolTip">
+            <string>In third-person view, use the camera as the sound listener instead of the player character.</string>
+           </property>
+           <property name="text">
+            <string>Use the Camera as the Sound Listener</string>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="0">
+          <widget class="QLabel" name="dopplerLabel">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls the strength of the Doppler effect. Zero means it is completely disabled.&lt;/p&gt;&lt;p&gt;The Doppler effect increases or decreases the pitch of sounds relative to the velocity of the sound source and the listener.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Doppler Factor</string>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="1">
+          <widget class="QDoubleSpinBox" name="dopplerSpinBox">
+           <property name="maximum">
+            <double>1.000000000000000</double>
+           </property>
+           <property name="singleStep">
+            <double>0.010000000000000</double>
+           </property>
+           <property name="value">
+            <double>0.250000000000000</double>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <widget class="QComboBox" name="hrtfProfileSelectorComboBox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="currentIndex">
+            <number>0</number>
+           </property>
            <item>
-        <layout class="QHBoxLayout">
-         <item>
+            <property name="text">
+             <string>Default</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item row="2" column="0">
           <widget class="QLabel" name="hrtfProfileSelectorLabel">
            <property name="toolTip">
             <string>Select your preferred HRTF profile.</string>
@@ -1198,17 +1203,27 @@
            </property>
           </widget>
          </item>
-         <item>
-          <widget class="QComboBox" name="hrtfProfileSelectorComboBox">
+         <item row="0" column="0">
+          <widget class="QLabel" name="audioDeviceSelectorLabel">
+           <property name="toolTip">
+            <string>Select your preferred audio device.</string>
+           </property>
+           <property name="text">
+            <string>Audio Device</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QComboBox" name="audioDeviceSelectorComboBox">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="minimumSize">
             <size>
-             <width>283</width>
+             <width>0</width>
              <height>0</height>
             </size>
            </property>
@@ -1224,16 +1239,6 @@
          </item>
         </layout>
        </item>
-       <item>
-        <widget class="QCheckBox" name="cameraListenerCheckBox">
-         <property name="toolTip">
-          <string>In third-person view, use the camera as the sound listener instead of the player character.</string>
-         </property>
-         <property name="text">
-          <string>Use the Camera as the Sound Listener</string>
-         </property>
-        </widget>
-       </item>
        <item>
         <spacer>
          <property name="orientation">
@@ -1241,8 +1246,8 @@
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>0</width>
-           <height>0</height>
+           <width>20</width>
+           <height>40</height>
           </size>
          </property>
         </spacer>
@@ -1398,6 +1403,29 @@
            </property>
           </widget>
          </item>
+         <item row="7" column="1">
+          <widget class="QCheckBox" name="controllerMenusCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make it easier to use game menus with a controller.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Enable Controller Menus</string>
+           </property>
+          </widget>
+         </item>
+         <item row="8" column="1">
+          <widget class="QCheckBox" name="controllerMenuTooltipsCheckBox">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When using controller menus, make tooltips visible by default.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Show Controller Tooltips By Default</string>
+           </property>
+          </widget>
+         </item>
          <item row="0" column="0">
           <widget class="QLabel" name="showOwnedLabel">
            <property name="text">

apps/launcher/utils/openalutil.cpp

@@ -43,10 +43,10 @@ std::vector<std::string> Launcher::enumerateOpenALDevicesHrtf()
             LPALCGETSTRINGISOFT alcGetStringiSOFT = nullptr;
             void* funcPtr = alcGetProcAddress(device, "alcGetStringiSOFT");
             memcpy(&alcGetStringiSOFT, &funcPtr, sizeof(funcPtr));
-            ALCint num_hrtf;
-            alcGetIntegerv(device, ALC_NUM_HRTF_SPECIFIERS_SOFT, 1, &num_hrtf);
-            ret.reserve(num_hrtf);
-            for (ALCint i = 0; i < num_hrtf; ++i)
+            ALCint numHrtf;
+            alcGetIntegerv(device, ALC_NUM_HRTF_SPECIFIERS_SOFT, 1, &numHrtf);
+            ret.reserve(numHrtf);
+            for (ALCint i = 0; i < numHrtf; ++i)
             {
                 const ALCchar* entry = alcGetStringiSOFT(device, ALC_HRTF_SPECIFIER_SOFT, i);
                 if (strcmp(entry, "") == 0)

apps/mwiniimporter/importer.cpp

@@ -9,7 +9,22 @@
 #include <fstream>
 #include <iostream>
 
-namespace sfs = std::filesystem;
+namespace
+{
+    // from configfileparser.cpp
+    std::string trim_ws(const std::string& s)
+    {
+        std::string::size_type n, n2;
+        n = s.find_first_not_of(" \t\r\n");
+        if (n == std::string::npos)
+            return std::string();
+        else
+        {
+            n2 = s.find_last_not_of(" \t\r\n");
+            return s.substr(n, n2 - n + 1);
+        }
+    }
+}
 
 MwIniImporter::MwIniImporter()
     : mVerbose(false)
@@ -311,10 +326,10 @@ MwIniImporter::multistrmap MwIniImporter::loadIniFile(const std::filesystem::pat
             continue;
         }
 
-        int comment_pos = static_cast<int>(utf8.find(';'));
-        if (comment_pos > 0)
+        const std::string::size_type commentPos = utf8.find(';');
+        if (commentPos != std::string::npos)
         {
-            utf8 = utf8.substr(0, comment_pos);
+            utf8 = utf8.substr(0, commentPos);
         }
 
         int pos = static_cast<int>(utf8.find('='));
@@ -336,7 +351,7 @@ MwIniImporter::multistrmap MwIniImporter::loadIniFile(const std::filesystem::pat
         if (it == map.end())
             it = map.emplace_hint(it, std::move(key), std::vector<std::string>());
 
-        it->second.push_back(std::string(value));
+        it->second.emplace_back(value);
     }
 
     return map;
@@ -352,12 +367,10 @@ MwIniImporter::multistrmap MwIniImporter::loadCfgFile(const std::filesystem::pat
     std::string line;
     while (std::getline(file, line))
     {
-
-        // we cant say comment by only looking at first char anymore
-        int comment_pos = static_cast<int>(line.find('#'));
-        if (comment_pos > 0)
+        // ignore comments - keep in sync with configfileparser.cpp
+        if (line.find('#') == line.find_first_not_of(" \t\r\n"))
         {
-            line = line.substr(0, comment_pos);
+            continue;
         }
 
         if (line.empty())
@@ -373,12 +386,14 @@ MwIniImporter::multistrmap MwIniImporter::loadCfgFile(const std::filesystem::pat
 
         std::string key(line.substr(0, pos));
         std::string value(line.substr(pos + 1));
+        key = trim_ws(key);
+        value = trim_ws(value);
 
         if (map.find(key) == map.end())
         {
             map.insert(std::make_pair(key, std::vector<std::string>()));
         }
-        map[key].push_back(value);
+        map[key].push_back(std::move(value));
     }
 
     return map;

apps/mwiniimporter/importer.hpp

@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>
 
 class MwIniImporter
 {

apps/mwiniimporter/main.cpp

@@ -10,7 +10,6 @@
 #include <components/files/conversion.hpp>
 
 namespace bpo = boost::program_options;
-namespace sfs = std::filesystem;
 
 #ifndef _WIN32
 int main(int argc, char* argv[])
@@ -63,7 +62,7 @@ int wmain(int argc, wchar_t* wargv[])
     try
     {
         bpo::options_description desc("Syntax: openmw-iniimporter <options> inifile configfile\nAllowed options");
-        bpo::positional_options_description p_desc;
+        bpo::positional_options_description positionalDesc;
         auto addOption = desc.add_options();
         addOption("help,h", "produce help message");
         addOption("verbose,v", "verbose output");
@@ -80,11 +79,12 @@ int wmain(int argc, wchar_t* wargv[])
             "\n\twin1251 - Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages\n"
             "\n\twin1252 - Western European (Latin) alphabet, used by default");
         ;
-        p_desc.add("ini", 1).add("cfg", 1);
+        positionalDesc.add("ini", 1).add("cfg", 1);
 
         bpo::variables_map vm;
 
-        bpo::parsed_options parsed = bpo::command_line_parser(argc, argv).options(desc).positional(p_desc).run();
+        bpo::parsed_options parsed
+            = bpo::command_line_parser(argc, argv).options(desc).positional(positionalDesc).run();
         bpo::store(parsed, vm);
 
         if (vm.count("help") || !vm.count("ini") || !vm.count("cfg"))
@@ -126,12 +126,20 @@ int wmain(int argc, wchar_t* wargv[])
         MwIniImporter importer;
         importer.setVerbose(vm.count("verbose") != 0);
 
+        MwIniImporter::multistrmap cfg = importer.loadCfgFile(cfgFile);
+
         // Font encoding settings
-        std::string encoding(vm["encoding"].as<std::string>());
+        std::string encoding;
+        if (vm["encoding"].defaulted() && cfg.contains("encoding") && !cfg["encoding"].empty())
+            encoding = cfg["encoding"].back();
+        else
+        {
+            encoding = vm["encoding"].as<std::string>();
+            cfg["encoding"] = { encoding };
+        }
         importer.setInputEncoding(ToUTF8::calculateEncoding(encoding));
 
         MwIniImporter::multistrmap ini = importer.loadIniFile(iniFile);
-        MwIniImporter::multistrmap cfg = importer.loadCfgFile(cfgFile);
 
         if (!vm.count("fonts"))
         {

apps/navmeshtool/main.cpp

@@ -25,7 +25,7 @@
 #include <components/resource/niffilemanager.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/settings/values.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>
 #include <components/version/version.hpp>
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>
@@ -143,6 +143,7 @@ namespace NavMeshTool
             }
 
             Files::ConfigurationManager config;
+            config.processPaths(variables, std::filesystem::current_path());
             config.readConfiguration(variables, desc);
 
             Debug::setupLogging(config.getLogPath(), applicationName);
@@ -188,7 +189,7 @@ namespace NavMeshTool
 
             VFS::Manager vfs;
 
-            VFS::registerArchives(&vfs, fileCollections, archives, true);
+            VFS::registerArchives(&vfs, fileCollections, archives, true, &encoder.getStatelessEncoder());
 
             Settings::Manager::load(config);
 

apps/navmeshtool/worldspacedata.cpp

@@ -201,8 +201,8 @@ namespace NavMeshTool
         {
             if (!land.has_value() || osg::Vec2i(land->mX, land->mY) != cellPosition
                 || (land->mDataTypes & ESM::Land::DATA_VHGT) == 0)
-                return { HeightfieldPlane{ ESM::Land::DEFAULT_HEIGHT }, ESM::Land::DEFAULT_HEIGHT,
-                    ESM::Land::DEFAULT_HEIGHT };
+                return { HeightfieldPlane{ static_cast<float>(ESM::Land::DEFAULT_HEIGHT) },
+                    static_cast<float>(ESM::Land::DEFAULT_HEIGHT), static_cast<float>(ESM::Land::DEFAULT_HEIGHT) };
 
             ESM::Land::LandData& landData = *landDatas.emplace_back(std::make_unique<ESM::Land::LandData>());
             land->loadData(ESM::Land::DATA_VHGT, landData);

apps/niftest/niftest.cpp

@@ -113,7 +113,7 @@ bool isBSA(const std::filesystem::path& path)
 std::unique_ptr<VFS::Archive> makeArchive(const std::filesystem::path& path)
 {
     if (isBSA(path))
-        return VFS::makeBsaArchive(path);
+        return VFS::makeBsaArchive(path, nullptr);
     if (std::filesystem::is_directory(path))
         return std::make_unique<VFS::FileSystemArchive>(path);
     return nullptr;
@@ -198,7 +198,7 @@ void readVFS(std::unique_ptr<VFS::Archive>&& archive, const std::filesystem::pat
             {
                 try
                 {
-                    readVFS(VFS::makeBsaArchive(file.second), file.second, quiet);
+                    readVFS(VFS::makeBsaArchive(file.second, nullptr), file.second, quiet);
                 }
                 catch (const std::exception& e)
                 {
@@ -235,8 +235,8 @@ Allowed options)");
     bpo::variables_map variables;
     try
     {
-        bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv).options(desc).positional(p).run();
-        bpo::store(valid_opts, variables);
+        bpo::parsed_options validOpts = bpo::command_line_parser(argc, argv).options(desc).positional(p).run();
+        bpo::store(validOpts, variables);
         bpo::notify(variables);
         if (variables.count("help"))
         {

apps/opencs/CMakeLists.txt

@@ -88,7 +88,7 @@ opencs_units (view/render
     scenewidget worldspacewidget pagedworldspacewidget unpagedworldspacewidget
     previewwidget editmode instancemode instanceselectionmode instancemovemode
     orbitcameramode pathgridmode selectionmode pathgridselectionmode cameracontroller
-    cellwater terraintexturemode actor terrainselection terrainshapemode brushdraw commands
+    cellwater terraintexturemode actor terrainselection terrainshapemode brushdraw commands objectmarker
     )
 
 opencs_units (view/render
@@ -240,11 +240,7 @@ target_link_libraries(openmw-cs-lib
     components_qt
 )
 
-if (QT_VERSION_MAJOR VERSION_EQUAL 6)
-    target_link_libraries(openmw-cs-lib Qt::Widgets Qt::Core Qt::Network Qt::OpenGL Qt::OpenGLWidgets Qt::Svg)
-else()
-    target_link_libraries(openmw-cs-lib Qt::Widgets Qt::Core Qt::Network Qt::OpenGL Qt::Svg)
-endif()
+target_link_libraries(openmw-cs-lib Qt::Widgets Qt::Core Qt::Network Qt::OpenGL Qt::OpenGLWidgets Qt::Svg)
 
 if (WIN32)
     target_sources(openmw-cs PRIVATE ${CMAKE_SOURCE_DIR}/files/windows/openmw-cs.exe.manifest)

apps/opencs/editor.cpp

@@ -34,7 +34,7 @@
 #include <components/misc/rng.hpp>
 #include <components/nifosg/nifloader.hpp>
 #include <components/settings/settings.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>
 
 #include "view/doc/viewmanager.hpp"
 
@@ -166,7 +166,7 @@ std::pair<Files::PathContainer, std::vector<std::string>> CS::Editor::readConfig
     if (!local.empty())
     {
         std::filesystem::create_directories(local);
-        dataLocal.push_back(local);
+        dataLocal.push_back(std::move(local));
     }
     mCfgMgr.filterOutNonExistingPaths(dataDirs);
     mCfgMgr.filterOutNonExistingPaths(dataLocal);

apps/opencs/model/doc/document.hpp

@@ -12,7 +12,7 @@
 #include <apps/opencs/model/world/universalid.hpp>
 
 #include <components/files/multidircollection.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>
 
 #include "../world/data.hpp"
 #include "../world/idcompletionmanager.hpp"

apps/opencs/model/doc/documentmanager.hpp

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include <components/files/multidircollection.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>
 
 #include "loader.hpp"
 

apps/opencs/model/doc/runner.cpp

@@ -2,11 +2,8 @@
 
 #include <utility>
 
-#if defined(Q_OS_MAC)
 #include <QCoreApplication>
 #include <QDir>
-#endif
-
 #include <QProcess>
 #include <QString>
 #include <QStringList>
@@ -55,16 +52,17 @@ void CSMDoc::Runner::start(bool delayed)
 
         QString path = "openmw";
 #ifdef Q_OS_WIN
-        path.append(QString(".exe"));
-#elif defined(Q_OS_MAC)
-        QDir dir(QCoreApplication::applicationDirPath());
-        dir.cdUp();
-        dir.cdUp();
-        dir.cdUp();
-        path = dir.absoluteFilePath(path.prepend("OpenMW.app/Contents/MacOS/"));
-#else
-        path.prepend(QString("./"));
+        path.append(QLatin1String(".exe"));
 #endif
+        QDir dir(QCoreApplication::applicationDirPath());
+#ifdef Q_OS_MAC
+        // the CS and engine are in separate .app directories
+        dir.cdUp();
+        dir.cdUp();
+        dir.cdUp();
+        path.prepend("OpenMW.app/Contents/MacOS/");
+#endif
+        path = dir.absoluteFilePath(path);
 
         mStartup = new QTemporaryFile(this);
         mStartup->open();

apps/opencs/model/doc/saving.hpp

@@ -3,7 +3,7 @@
 
 #include <QObject>
 
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>
 
 #include "operation.hpp"
 #include "savingstate.hpp"

apps/opencs/model/doc/savingstages.cpp

@@ -291,8 +291,7 @@ int CSMDoc::WriteCellCollectionStage::setup()
     return mDocument.getData().getCells().getSize();
 }
 
-void CSMDoc::WriteCellCollectionStage::writeReferences(
-    const std::deque<int>& references, bool interior, unsigned int& newRefNum)
+void CSMDoc::WriteCellCollectionStage::writeReferences(const std::deque<int>& references, bool interior)
 {
     ESM::ESMWriter& writer = mState.getWriter();
 
@@ -304,6 +303,8 @@ void CSMDoc::WriteCellCollectionStage::writeReferences(
         {
             CSMWorld::CellRef refRecord = ref.get();
 
+            const bool isLocal = refRecord.mRefNum.mContentFile == -1;
+
             // -1 is the current file, saved indices are 1-based
             refRecord.mRefNum.mContentFile++;
 
@@ -316,12 +317,7 @@ void CSMDoc::WriteCellCollectionStage::writeReferences(
             }
 
             ESM::RefId streamId = ESM::RefId::stringRefId(stream.str());
-            if (refRecord.mNew || refRecord.mRefNum.mIndex == 0
-                || (!interior && ref.mState == CSMWorld::RecordBase::State_ModifiedOnly && refRecord.mCell != streamId))
-            {
-                refRecord.mRefNum.mIndex = newRefNum++;
-            }
-            else if ((refRecord.mOriginalCell.empty() ? refRecord.mCell : refRecord.mOriginalCell) != streamId
+            if (!isLocal && (refRecord.mOriginalCell.empty() ? refRecord.mCell : refRecord.mOriginalCell) != streamId
                 && !interior)
             {
                 // An empty mOriginalCell is meant to indicate that it is the same as
@@ -362,9 +358,6 @@ void CSMDoc::WriteCellCollectionStage::perform(int stage, Messages& messages)
         CSMWorld::Cell cellRecord = cell.get();
         const bool interior = !cellRecord.mId.startsWith("#");
 
-        // count new references and adjust RefNumCount accordingsly
-        unsigned int newRefNum = cellRecord.mRefNumCounter;
-
         if (references != nullptr)
         {
             for (std::deque<int>::const_iterator iter(references->begin()); iter != references->end(); ++iter)
@@ -390,9 +383,6 @@ void CSMDoc::WriteCellCollectionStage::perform(int stage, Messages& messages)
                         ESM::RefId::stringRefId(CSMWorld::CellCoordinates(refRecord.getCellIndex()).getId(""))
                             != refRecord.mCell))
                     ++cellRecord.mRefNumCounter;
-
-                if (refRecord.mRefNum.mIndex >= newRefNum)
-                    newRefNum = refRecord.mRefNum.mIndex + 1;
             }
         }
 
@@ -415,9 +405,9 @@ void CSMDoc::WriteCellCollectionStage::perform(int stage, Messages& messages)
         // write references
         if (references != nullptr)
         {
-            writeReferences(persistentRefs, interior, newRefNum);
+            writeReferences(persistentRefs, interior);
             cellRecord.saveTempMarker(writer, static_cast<int>(references->size()) - persistentRefs.size());
-            writeReferences(tempRefs, interior, newRefNum);
+            writeReferences(tempRefs, interior);
         }
 
         writer.endRecord(cellRecord.sRecordId);

apps/opencs/model/doc/savingstages.hpp

@@ -167,7 +167,7 @@ namespace CSMDoc
         Document& mDocument;
         SavingState& mState;
 
-        void writeReferences(const std::deque<int>& references, bool interior, unsigned int& newRefNum);
+        void writeReferences(const std::deque<int>& references, bool interior);
 
     public:
         WriteCellCollectionStage(Document& document, SavingState& state);

apps/opencs/model/doc/savingstate.hpp

@@ -9,7 +9,7 @@
 
 #include <components/esm3/esmwriter.hpp>
 #include <components/misc/algorithm.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>
 
 namespace CSMDoc
 {

apps/opencs/model/filter/parser.cpp

@@ -365,7 +365,7 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseNAry(const Token& keywo
         if (mError)
             return std::shared_ptr<Node>();
 
-        nodes.push_back(node);
+        nodes.push_back(std::move(node));
 
         token = getNextToken();
 

apps/opencs/model/filter/textnode.cpp

@@ -34,11 +34,11 @@ bool CSMFilter::TextNode::test(const CSMWorld::IdTableBase& table, int row, cons
 
     QString string;
 
-    if (data.type() == QVariant::String)
+    if (data.typeId() == QMetaType::QString)
     {
         string = data.toString();
     }
-    else if ((data.type() == QVariant::Int || data.type() == QVariant::UInt)
+    else if ((data.typeId() == QMetaType::Int || data.typeId() == QMetaType::UInt)
         && CSMWorld::Columns::hasEnums(static_cast<CSMWorld::Columns::ColumnId>(mColumnId)))
     {
         int value = data.toInt();
@@ -49,7 +49,7 @@ bool CSMFilter::TextNode::test(const CSMWorld::IdTableBase& table, int row, cons
         if (value >= 0 && value < static_cast<int>(enums.size()))
             string = QString::fromUtf8(enums[value].second.c_str());
     }
-    else if (data.type() == QVariant::Bool)
+    else if (data.typeId() == QMetaType::Bool)
     {
         string = data.toBool() ? "true" : "false";
     }

apps/opencs/model/filter/valuenode.cpp

@@ -29,8 +29,8 @@ bool CSMFilter::ValueNode::test(const CSMWorld::IdTableBase& table, int row, con
 
     QVariant data = table.data(index);
 
-    if (data.type() != QVariant::Double && data.type() != QVariant::Bool && data.type() != QVariant::Int
-        && data.type() != QVariant::UInt && data.type() != static_cast<QVariant::Type>(QMetaType::Float))
+    if (data.typeId() != QMetaType::Double && data.typeId() != QMetaType::Bool && data.typeId() != QMetaType::Int
+        && data.typeId() != QMetaType::UInt && data.typeId() != QMetaType::Float)
         return false;
 
     double value = data.toDouble();

apps/opencs/model/prefs/modifiersetting.cpp

@@ -95,9 +95,9 @@ namespace CSMPrefs
     bool ModifierSetting::handleEvent(QObject* target, int mod, int value)
     {
         // For potential future exceptions
-        const int Blacklist[] = { 0 };
+        const int blacklist[] = { 0 };
 
-        const size_t BlacklistSize = sizeof(Blacklist) / sizeof(int);
+        const size_t blacklistSize = std::size(blacklist);
 
         if (!mEditorActive)
         {
@@ -114,9 +114,9 @@ namespace CSMPrefs
         }
 
         // Handle blacklist
-        for (size_t i = 0; i < BlacklistSize; ++i)
+        for (size_t i = 0; i < blacklistSize; ++i)
         {
-            if (value == Blacklist[i])
+            if (value == blacklist[i])
                 return true;
         }
 

apps/opencs/model/prefs/shortcuteventhandler.cpp

@@ -62,39 +62,31 @@ namespace CSMPrefs
         {
             QWidget* widget = static_cast<QWidget*>(watched);
             QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
-            unsigned int mod = (unsigned int)keyEvent->modifiers();
-            unsigned int key = (unsigned int)keyEvent->key();
 
             if (!keyEvent->isAutoRepeat())
-                return activate(widget, mod, key);
+                return activate(widget, keyEvent->keyCombination());
         }
         else if (event->type() == QEvent::KeyRelease)
         {
             QWidget* widget = static_cast<QWidget*>(watched);
             QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
-            unsigned int mod = (unsigned int)keyEvent->modifiers();
-            unsigned int key = (unsigned int)keyEvent->key();
 
             if (!keyEvent->isAutoRepeat())
-                return deactivate(widget, mod, key);
+                return deactivate(widget, keyEvent->keyCombination());
         }
         else if (event->type() == QEvent::MouseButtonPress)
         {
             QWidget* widget = static_cast<QWidget*>(watched);
             QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
-            unsigned int mod = (unsigned int)mouseEvent->modifiers();
-            unsigned int button = (unsigned int)mouseEvent->button();
 
-            return activate(widget, mod, button);
+            return activate(widget, QKeyCombination(mouseEvent->modifiers(), Qt::Key(mouseEvent->button())));
         }
         else if (event->type() == QEvent::MouseButtonRelease)
         {
             QWidget* widget = static_cast<QWidget*>(watched);
             QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
-            unsigned int mod = (unsigned int)mouseEvent->modifiers();
-            unsigned int button = (unsigned int)mouseEvent->button();
 
-            return deactivate(widget, mod, button);
+            return deactivate(widget, QKeyCombination(mouseEvent->modifiers(), Qt::Key(mouseEvent->button())));
         }
         else if (event->type() == QEvent::FocusOut)
         {
@@ -149,7 +141,7 @@ namespace CSMPrefs
         }
     }
 
-    bool ShortcutEventHandler::activate(QWidget* widget, unsigned int mod, unsigned int button)
+    bool ShortcutEventHandler::activate(QWidget* widget, QKeyCombination keyCombination)
     {
         std::vector<std::pair<MatchResult, Shortcut*>> potentials;
         bool used = false;
@@ -167,7 +159,7 @@ namespace CSMPrefs
                 if (!shortcut->isEnabled())
                     continue;
 
-                if (checkModifier(mod, button, shortcut, true))
+                if (checkModifier(keyCombination, shortcut, true))
                     used = true;
 
                 if (shortcut->getActivationStatus() != Shortcut::AS_Inactive)
@@ -175,7 +167,8 @@ namespace CSMPrefs
 
                 int pos = shortcut->getPosition();
                 int lastPos = shortcut->getLastPosition();
-                MatchResult result = match(mod, button, shortcut->getSequence()[pos]);
+                MatchResult result = match(keyCombination.keyboardModifiers(), keyCombination.key(),
+                    shortcut->getSequence()[pos].toCombined());
 
                 if (result == Matches_WithMod || result == Matches_NoMod)
                 {
@@ -220,10 +213,8 @@ namespace CSMPrefs
         return used;
     }
 
-    bool ShortcutEventHandler::deactivate(QWidget* widget, unsigned int mod, unsigned int button)
+    bool ShortcutEventHandler::deactivate(QWidget* widget, QKeyCombination keyCombination)
     {
-        const int KeyMask = 0x01FFFFFF;
-
         bool used = false;
 
         while (widget)
@@ -235,11 +226,11 @@ namespace CSMPrefs
             {
                 Shortcut* shortcut = *it;
 
-                if (checkModifier(mod, button, shortcut, false))
+                if (checkModifier(keyCombination, shortcut, false))
                     used = true;
 
                 int pos = shortcut->getPosition();
-                MatchResult result = match(0, button, shortcut->getSequence()[pos] & KeyMask);
+                MatchResult result = match(0, keyCombination.key(), shortcut->getSequence()[pos].key());
 
                 if (result != Matches_Not)
                 {
@@ -268,13 +259,13 @@ namespace CSMPrefs
         return used;
     }
 
-    bool ShortcutEventHandler::checkModifier(unsigned int mod, unsigned int button, Shortcut* shortcut, bool activate)
+    bool ShortcutEventHandler::checkModifier(QKeyCombination keyCombination, Shortcut* shortcut, bool activate)
     {
         if (!shortcut->isEnabled() || !shortcut->getModifier() || shortcut->getSecondaryMode() == Shortcut::SM_Ignore
             || shortcut->getModifierStatus() == activate)
             return false;
 
-        MatchResult result = match(mod, button, shortcut->getModifier());
+        MatchResult result = match(keyCombination.keyboardModifiers(), keyCombination.key(), shortcut->getModifier());
         bool used = false;
 
         if (result != Matches_Not)

apps/opencs/model/prefs/shortcuteventhandler.hpp

@@ -42,11 +42,11 @@ namespace CSMPrefs
 
         void updateParent(QWidget* widget);
 
-        bool activate(QWidget* widget, unsigned int mod, unsigned int button);
+        bool activate(QWidget* widget, QKeyCombination keyCombination);
 
-        bool deactivate(QWidget* widget, unsigned int mod, unsigned int button);
+        bool deactivate(QWidget* widget, QKeyCombination keyCombination);
 
-        bool checkModifier(unsigned int mod, unsigned int button, Shortcut* shortcut, bool activate);
+        bool checkModifier(QKeyCombination keyCombination, Shortcut* shortcut, bool activate);
 
         MatchResult match(unsigned int mod, unsigned int button, unsigned int value);
 

apps/opencs/model/prefs/shortcutmanager.cpp

@@ -78,7 +78,7 @@ namespace CSMPrefs
         }
     }
 
-    bool ShortcutManager::getModifier(const std::string& name, int& modifier) const
+    bool ShortcutManager::getModifier(std::string_view name, int& modifier) const
     {
         ModifierMap::const_iterator item = mModifiers.find(name);
         if (item != mModifiers.end())
@@ -115,15 +115,12 @@ namespace CSMPrefs
 
     std::string ShortcutManager::convertToString(const QKeySequence& sequence) const
     {
-        const int MouseKeyMask = 0x01FFFFFF;
-        const int ModMask = 0x7E000000;
-
         std::string result;
 
-        for (int i = 0; i < (int)sequence.count(); ++i)
+        for (int i = 0; i < sequence.count(); ++i)
         {
-            int mods = sequence[i] & ModMask;
-            int key = sequence[i] & MouseKeyMask;
+            int mods = sequence[i].keyboardModifiers();
+            int key = sequence[i].key();
 
             if (key)
             {
@@ -175,27 +172,27 @@ namespace CSMPrefs
         return concat;
     }
 
-    void ShortcutManager::convertFromString(const std::string& data, QKeySequence& sequence) const
+    void ShortcutManager::convertFromString(std::string_view data, QKeySequence& sequence) const
     {
-        const int MaxKeys = 4; // A limitation of QKeySequence
+        const int maxKeys = 4; // A limitation of QKeySequence
 
         size_t end = data.find(';');
         size_t size = std::min(end, data.size());
 
-        std::string value = data.substr(0, size);
+        std::string_view value = data.substr(0, size);
         size_t start = 0;
 
         int keyPos = 0;
         int mods = 0;
 
-        int keys[MaxKeys] = {};
+        int keys[maxKeys] = {};
 
         while (start < value.size())
         {
             end = data.find('+', start);
             end = std::min(end, value.size());
 
-            std::string name = value.substr(start, end - start);
+            std::string_view name = value.substr(start, end - start);
 
             if (name == "Ctrl")
             {
@@ -231,7 +228,7 @@ namespace CSMPrefs
                     mods = 0;
                     keyPos += 1;
 
-                    if (keyPos >= MaxKeys)
+                    if (keyPos >= maxKeys)
                         break;
                 }
             }
@@ -242,12 +239,12 @@ namespace CSMPrefs
         sequence = QKeySequence(keys[0], keys[1], keys[2], keys[3]);
     }
 
-    void ShortcutManager::convertFromString(const std::string& data, int& modifier) const
+    void ShortcutManager::convertFromString(std::string_view data, int& modifier) const
     {
         size_t start = data.find(';') + 1;
         start = std::min(start, data.size());
 
-        std::string name = data.substr(start);
+        std::string_view name = data.substr(start);
         KeyMap::const_iterator searchResult = mKeys.find(name);
         if (searchResult != mKeys.end())
         {
@@ -259,7 +256,7 @@ namespace CSMPrefs
         }
     }
 
-    void ShortcutManager::convertFromString(const std::string& data, QKeySequence& sequence, int& modifier) const
+    void ShortcutManager::convertFromString(std::string_view data, QKeySequence& sequence, int& modifier) const
     {
         convertFromString(data, sequence);
         convertFromString(data, modifier);
@@ -289,14 +286,14 @@ namespace CSMPrefs
 
     QString ShortcutManager::processToolTip(const QString& toolTip) const
     {
-        const QChar SequenceStart = '{';
-        const QChar SequenceEnd = '}';
+        const QChar sequenceStart = '{';
+        const QChar sequenceEnd = '}';
 
         QStringList substrings;
 
         int prevIndex = 0;
-        int startIndex = toolTip.indexOf(SequenceStart);
-        int endIndex = (startIndex != -1) ? toolTip.indexOf(SequenceEnd, startIndex) : -1;
+        int startIndex = toolTip.indexOf(sequenceStart);
+        int endIndex = (startIndex != -1) ? toolTip.indexOf(sequenceEnd, startIndex) : -1;
 
         // Process every valid shortcut escape sequence
         while (startIndex != -1 && endIndex != -1)
@@ -331,8 +328,8 @@ namespace CSMPrefs
                 prevIndex = endIndex + 1; // '}' character
             }
 
-            startIndex = toolTip.indexOf(SequenceStart, endIndex);
-            endIndex = (startIndex != -1) ? toolTip.indexOf(SequenceEnd, startIndex) : -1;
+            startIndex = toolTip.indexOf(sequenceStart, endIndex);
+            endIndex = (startIndex != -1) ? toolTip.indexOf(sequenceEnd, startIndex) : -1;
         }
 
         if (prevIndex < toolTip.size())

apps/opencs/model/prefs/shortcutmanager.hpp

@@ -31,7 +31,7 @@ namespace CSMPrefs
         bool getSequence(std::string_view name, QKeySequence& sequence) const;
         void setSequence(std::string_view name, const QKeySequence& sequence);
 
-        bool getModifier(const std::string& name, int& modifier) const;
+        bool getModifier(std::string_view name, int& modifier) const;
         void setModifier(std::string_view name, int modifier);
 
         std::string convertToString(const QKeySequence& sequence) const;
@@ -39,10 +39,10 @@ namespace CSMPrefs
 
         std::string convertToString(const QKeySequence& sequence, int modifier) const;
 
-        void convertFromString(const std::string& data, QKeySequence& sequence) const;
-        void convertFromString(const std::string& data, int& modifier) const;
+        void convertFromString(std::string_view data, QKeySequence& sequence) const;
+        void convertFromString(std::string_view data, int& modifier) const;
 
-        void convertFromString(const std::string& data, QKeySequence& sequence, int& modifier) const;
+        void convertFromString(std::string_view data, QKeySequence& sequence, int& modifier) const;
 
         /// Replaces "{sequence-name}" or "{modifier-name}" with the appropriate text
         QString processToolTip(const QString& toolTip) const;
@@ -53,7 +53,7 @@ namespace CSMPrefs
         typedef std::map<std::string, QKeySequence, std::less<>> SequenceMap;
         typedef std::map<std::string, int, std::less<>> ModifierMap;
         typedef std::map<int, std::string> NameMap;
-        typedef std::map<std::string, int> KeyMap;
+        typedef std::map<std::string, int, std::less<>> KeyMap;
 
         ShortcutMap mShortcuts;
         SequenceMap mSequences;

apps/opencs/model/prefs/shortcutsetting.cpp

@@ -118,9 +118,9 @@ namespace CSMPrefs
     bool ShortcutSetting::handleEvent(QObject* target, int mod, int value, bool active)
     {
         // Modifiers are handled differently
-        const int Blacklist[] = { Qt::Key_Shift, Qt::Key_Control, Qt::Key_Meta, Qt::Key_Alt, Qt::Key_AltGr };
+        const int blacklist[] = { Qt::Key_Shift, Qt::Key_Control, Qt::Key_Meta, Qt::Key_Alt, Qt::Key_AltGr };
 
-        const size_t BlacklistSize = sizeof(Blacklist) / sizeof(int);
+        const size_t blacklistSize = std::size(blacklist);
 
         if (!mEditorActive)
         {
@@ -137,9 +137,9 @@ namespace CSMPrefs
         }
 
         // Handle blacklist
-        for (size_t i = 0; i < BlacklistSize; ++i)
+        for (size_t i = 0; i < blacklistSize; ++i)
         {
-            if (value == Blacklist[i])
+            if (value == blacklist[i])
                 return true;
         }