Merge branch 'master' into textdraw-limits

Author: itsneufox

.github/workflows/build.yml

@@ -33,7 +33,7 @@ on:
 jobs:
   build-windows:
     name: Windows build
-    runs-on: windows-latest
+    runs-on: windows-2022
 
     strategy:
       matrix:
@@ -58,7 +58,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: "3.10"
 
       - name: Install CMake
         uses: lukka/get-cmake@latest
@@ -68,15 +68,15 @@ jobs:
       - name: Install latest conan
         run: |
           python -m pip install --upgrade pip
-          pip install -v "conan==1.57.0"
+          pip install conan
 
       - name: Try to restore conan cache
         id: conan-cache-restore
         uses: actions/cache/restore@v3
         env:
           cache-name: cache-conan-modules
         with:
-          path: ~/.conan/data
+          path: ~/.conan2/p
           key: conan-windows-${{ matrix.arch }}-${{ hashFiles('CMakeLists.txt', 'lib/CMakeLists.txt', 'SDK/CMakeLists.txt', 'SDK/lib/cmake-conan/conan.cmake', 'SDK/lib/cmake-conan/conan-omp.cmake') }}
 
       - name: Generate build files
@@ -85,15 +85,15 @@ jobs:
           $env:OMP_BUILD_COMMIT=$(git rev-parse HEAD)
           mkdir build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=${{ steps.vars.outputs.build_config }} .. -A ${{ matrix.arch }} -T "ClangCL"
+          cmake -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=${{ steps.vars.outputs.build_config }} .. -A ${{ matrix.arch }} -T "ClangCL"
 
       - name: Try to save conan cache
         if: steps.conan-cache-restore.outputs.cache-hit != 'true'
         uses: actions/cache/save@v3
         env:
           cache-name: cache-conan-modules
         with:
-          path: ~/.conan/data
+          path: ~/.conan2/p
           key: ${{ steps.conan-cache-restore.outputs.cache-primary-key }}
 
       - name: Build
@@ -161,7 +161,7 @@ jobs:
         env:
           cache-name: cache-conan-modules
         with:
-          path: docker/conan/data
+          path: docker/conan2/p
           key: conan-linux-${{ matrix.arch }}-${{ matrix.ssl }}-${{ hashFiles('CMakeLists.txt', 'lib/CMakeLists.txt', 'SDK/CMakeLists.txt', 'SDK/lib/cmake-conan/conan.cmake', 'SDK/lib/cmake-conan/conan-omp.cmake') }}
 
       - name: Build
@@ -175,7 +175,7 @@ jobs:
         env:
           cache-name: cache-conan-modules
         with:
-          path: docker/conan/data
+          path: docker/conan2/p
           key: ${{ steps.conan-cache-restore.outputs.cache-primary-key }}
 
       - name: Create a build archive
@@ -241,64 +241,176 @@ jobs:
         ssl: [dynamic, static]
 
     steps:
-    - uses: actions/checkout@v4
-      with:
-        clean: true
-        submodules: recursive
-        fetch-depth: 0
-
-    - name: Declare build output variables
-      id: vars
-      shell: bash
-      env:
-        HEAD_REF: ${{ github.head_ref || github.ref_name }}
-      run: |
-        echo "build_version=$(git describe --always --tags "refs/remotes/origin/${HEAD_REF}")" >> $GITHUB_OUTPUT
-        echo "build_config=RelWithDebInfo" >> $GITHUB_OUTPUT
-
-    - name: Try to restore conan cache
-      id: conan-cache-restore
-      uses: actions/cache/restore@v3
-      env:
-        cache-name: cache-conan-modules
-      with:
-        path: docker/conan/data
-        key: conan-linux-${{ matrix.arch }}-${{ matrix.ssl }}-${{ hashFiles('CMakeLists.txt', 'lib/CMakeLists.txt', 'SDK/CMakeLists.txt', 'SDK/lib/cmake-conan/conan.cmake', 'SDK/lib/cmake-conan/conan-omp.cmake') }}
-
-    - name: Run ARM build
-      uses: pguyot/arm-runner-action@v2.5.2
-      with:
-        base_image: ${{ matrix.arch == 'arm32' && 'raspios_lite' || 'raspios_lite_arm64' }}:2022-04-04
-        image_additional_mb: 10000
-        bind_mount_repository: true
-        cpu: cortex-a7
-        commands: |
+      - uses: actions/checkout@v4
+        with:
+          clean: true
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: Declare build output variables
+        id: vars
+        shell: bash
+        env:
+          HEAD_REF: ${{ github.head_ref || github.ref_name }}
+        run: |
+          echo "build_version=$(git describe --always --tags "refs/remotes/origin/${HEAD_REF}")" >> $GITHUB_OUTPUT
+          echo "build_config=RelWithDebInfo" >> $GITHUB_OUTPUT
+
+      - name: Try to restore conan cache
+        id: conan-cache-restore
+        uses: actions/cache/restore@v3
+        env:
+          cache-name: cache-conan-modules
+        with:
+          path: docker/conan2/p
+          key: conan-linux-${{ matrix.arch }}-${{ matrix.ssl }}-${{ hashFiles('CMakeLists.txt', 'lib/CMakeLists.txt', 'SDK/CMakeLists.txt', 'SDK/lib/cmake-conan/conan.cmake', 'SDK/lib/cmake-conan/conan-omp.cmake') }}
+
+      - name: Run ARM build
+        uses: pguyot/arm-runner-action@v2.5.2
+        with:
+          base_image: ${{ matrix.arch == 'arm32' && 'raspios_lite' || 'raspios_lite_arm64' }}:2022-04-04
+          image_additional_mb: 10000
+          bind_mount_repository: true
+          cpu: cortex-a7
+          commands: |
             apt update && apt install -y ninja-build clang-11 python3-pip libstdc++6 libc6
             pip install --upgrade pip setuptools wheel
-            pip3 install --user -v "conan==1.59.0"
+            pip3 install --user conan
             pip3 install --user -v "cmake==3.23.3"
             export CC=/usr/bin/clang-11
             export CXX=/usr/bin/clang++-11
             export PATH=~/.local/bin:${PATH}
-            mkdir -p docker/conan/data
-            mkdir ~/.conan
-            mv docker/conan/data ~/.conan
+            mkdir -p docker/conan2/p
+            mkdir -p ~/.conan2
+            mv docker/conan2/p ~/.conan2
             cmake -S . -B build -G Ninja -DTARGET_BUILD_ARCH=${{ matrix.arch == 'arm32' && 'armv7' || 'armv8' }} -DCMAKE_BUILD_TYPE=${{ steps.vars.outputs.build_config }} -DSHARED_OPENSSL=${{ matrix.ssl == 'dynamic' }} -DSTATIC_STDCXX=true -DBUILD_SERVER=1 -DBUILD_ABI_CHECK_TOOL=0
             cmake --build build --config ${{ steps.vars.outputs.build_config }} --parallel $(nproc)
-            mv ~/.conan/data docker/conan
-
-    - name: Upload build artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: open.mp-linux-${{ matrix.arch }}${{ matrix.ssl == 'dynamic' && '-dynssl' || '' }}-${{ steps.vars.outputs.build_version }}
-        path: build/Output/${{ steps.vars.outputs.build_config }}/Server
-        if-no-files-found: error
-
-    - name: Try to save conan cache
-      if: steps.conan-cache-restore.outputs.cache-hit != 'true'
-      uses: actions/cache/save@v3
-      env:
-        cache-name: cache-conan-modules
-      with:
-        path: docker/conan/data
-        key: ${{ steps.conan-cache-restore.outputs.cache-primary-key }}
+            mv ~/.conan2/p docker/conan2
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: open.mp-linux-${{ matrix.arch }}${{ matrix.ssl == 'dynamic' && '-dynssl' || '' }}-${{ steps.vars.outputs.build_version }}
+          path: build/Output/${{ steps.vars.outputs.build_config }}/Server
+          if-no-files-found: error
+
+      - name: Try to save conan cache
+        if: steps.conan-cache-restore.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v3
+        env:
+          cache-name: cache-conan-modules
+        with:
+          path: docker/conan2/p
+          key: ${{ steps.conan-cache-restore.outputs.cache-primary-key }}
+
+  build-macos-arm:
+    name: macOS ARM build
+    runs-on: macos-latest
+
+    strategy:
+      matrix:
+        ssl: [dynamic, static]
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          clean: true
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: Declare build output variables
+        id: vars
+        shell: bash
+        env:
+          HEAD_REF: ${{ github.head_ref || github.ref_name }}
+        run: |
+          echo "build_version=$(git describe --always --tags "refs/remotes/origin/${HEAD_REF}")" >> "$GITHUB_OUTPUT"
+          echo "build_config=RelWithDebInfo" >> "$GITHUB_OUTPUT"
+          echo "build_shared=${{ matrix.ssl == 'dynamic' }}" >> $GITHUB_OUTPUT
+          echo "build_server=1" >> "$GITHUB_OUTPUT"
+          echo "build_tools=0" >> "$GITHUB_OUTPUT"
+          echo "build_target_arch=arm64" >> "$GITHUB_OUTPUT"
+
+      - name: Install CMake
+        uses: lukka/get-cmake@latest
+        with:
+          cmakeVersion: "3.31.8"
+
+      - name: Install build dependencies
+        shell: bash
+        run: |
+          brew update
+          brew install ninja
+
+          python3 -m venv "$RUNNER_TEMP/conan-venv"
+          source "$RUNNER_TEMP/conan-venv/bin/activate"
+
+          python -m pip install --upgrade pip
+          python -m pip install conan
+
+          echo "$RUNNER_TEMP/conan-venv/bin" >> "$GITHUB_PATH"
+
+          conan --version
+          cmake --version
+          ninja --version
+          clang --version
+
+      - name: Restore Conan cache
+        id: conan-cache-restore
+        uses: actions/cache/restore@v4
+        with:
+          path: ~/.conan2/p
+          key: conan-macos-arm64-${{ hashFiles('CMakeLists.txt', 'lib/CMakeLists.txt', 'SDK/CMakeLists.txt', 'SDK/lib/cmake-conan/conan.cmake', 'SDK/lib/cmake-conan/conan-omp.cmake') }}
+
+      - name: Configure
+        shell: bash
+        run: |
+          export SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"
+          export MACOSX_DEPLOYMENT_TARGET="11.0"
+          export CFLAGS="-isysroot ${SDKROOT}"
+          export CXXFLAGS="-isysroot ${SDKROOT}"
+          export LDFLAGS="-isysroot ${SDKROOT}"
+
+          cmake -S . -B build \
+            -G Ninja \
+            -DCMAKE_OSX_SYSROOT="${SDKROOT}" \
+            -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
+            -DTARGET_BUILD_ARCH=${{ steps.vars.outputs.build_target_arch }} \
+            -DCMAKE_BUILD_TYPE=${{ steps.vars.outputs.build_config }} \
+            -DSHARED_OPENSSL=${{ steps.vars.outputs.build_shared }} \
+            -DSTATIC_STDCXX=false \
+            -DBUILD_SERVER=${{ steps.vars.outputs.build_server }} \
+            -DBUILD_ABI_CHECK_TOOL=${{ steps.vars.outputs.build_tools }}
+
+      - name: Build
+        shell: bash
+        run: |
+          cmake --build build \
+            --config ${{ steps.vars.outputs.build_config }} \
+            --parallel "$(sysctl -n hw.logicalcpu)"
+
+      - name: Save Conan cache
+        if: steps.conan-cache-restore.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v4
+        with:
+          path: ~/.conan2/p
+          key: ${{ steps.conan-cache-restore.outputs.cache-primary-key }}
+
+      - name: Create build archive
+        id: build
+        shell: bash
+        run: |
+          version="${{ steps.vars.outputs.build_version }}"
+          artifact_name="open.mp-macos-arm${{ matrix.ssl == 'dynamic' && '-dynssl' || '' }}-${version}"
+
+          echo "artifact_name=${artifact_name}" >> "$GITHUB_OUTPUT"
+
+          cd "build/Output/${{ steps.vars.outputs.build_config }}"
+          tar -cJvf "${artifact_name}.tar.xz" "Server"
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.build.outputs.artifact_name }}
+          path: build/Output/${{ steps.vars.outputs.build_config }}/${{ steps.build.outputs.artifact_name }}.tar.xz
+          if-no-files-found: error

.gitignore

@@ -296,6 +296,7 @@ __pycache__/
 *.i
 .vscode/
 /docker/conan/
+/docker/conan2/
 /docker/data/
 /buildlinux/*
 **/CMakeFiles/*

CMakeLists.txt

@@ -19,6 +19,7 @@ if(MSVC)
 	add_link_options("/LARGEADDRESSAWARE")
 	# Use strict intermediate floating-point precision
 	add_compile_options("/fp:strict")
+	add_compile_options("/MP")
 	if(CMAKE_SIZEOF_VOID_P EQUAL 4)
 		add_compile_options("/arch:SSE2")
 	endif()

README.md

@@ -27,7 +27,7 @@
 ## Tools
 
 * [CMake 3.19+](https://cmake.org/)
-* [Conan 1.57+](https://conan.io/) (You can't use conan v2.x, so may need to [download directly from github releases](https://github.com/conan-io/conan/releases) or install it using `pip3 install conan==1.57.0`)
+* [Conan 2.x](https://conan.io/) (Install it using `pip install conan` or `pip3 install conan`)
 
 ## Tools on Windows
 
@@ -58,11 +58,11 @@ cmake --build . --config RelWithDebInfo
 
 ## Building on Mac
 
-If you install conan via brew you must ensure you get the correct version; however, the cmake-conan script will not detect it from the default install location.  You must therefore also alias it elsewhere:
+If you install conan via brew the cmake-conan script will not detect it from the default install location.  You must therefore also alias it elsewhere:
 
 ```bash
-brew install conan@1
-sudo ln -s /usr/local/opt/conan@1/bin/conan /usr/local/bin/conan
+brew install conan
+sudo ln -s /usr/local/opt/conan/bin/conan /usr/local/bin/conan
 cd open.mp
 mkdir build
 cd build

Server/Components/CAPI/Impl/GangZones/APIs.cpp

@@ -46,8 +46,9 @@ OMP_CAPI(GangZone_Create, objectPtr(float minx, float miny, float maxx, float ma
 OMP_CAPI(GangZone_Destroy, bool(objectPtr gangzone))
 {
 	POOL_ENTITY_RET(gangzones, IGangZone, gangzone, gz, false);
+	int legacyID = gangzones->toLegacyID(gz->getID());
 	gangzones->release(gz->getID());
-	gangzones->releaseLegacyID(gangzones->toLegacyID(gz->getID()));
+	gangzones->releaseLegacyID(legacyID);
 	return true;
 }
 

Server/Components/CAPI/Impl/Pickups/APIs.cpp

@@ -62,8 +62,9 @@ OMP_CAPI(Pickup_AddStatic, bool(int model, int type, float x, float y, float z,
 OMP_CAPI(Pickup_Destroy, bool(objectPtr pickup))
 {
 	POOL_ENTITY_RET(pickups, IPickup, pickup, p, false);
+	int legacyID = pickups->toLegacyID(p->getID());
 	pickups->release(p->getID());
-	pickups->releaseLegacyID(pickups->toLegacyID(p->getID()));
+	pickups->releaseLegacyID(legacyID);
 	return true;
 }