From 901d1947fba561dba7555b02997c843c59914e2b Mon Sep 17 00:00:00 2001 From: Roman Chistokhodov Date: Mon, 26 Sep 2022 17:55:19 +0300 Subject: [PATCH 1/2] Fix tripmines blowing up after loading save game in c1a3d with TRIPMINE_BEAM_DUPLICATION_FIX enabled (#332) --- dlls/tripmine.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/tripmine.cpp b/dlls/tripmine.cpp index 859e3548..90379807 100644 --- a/dlls/tripmine.cpp +++ b/dlls/tripmine.cpp @@ -282,9 +282,23 @@ void CTripmineGrenade::BeamBreakThink( void ) // respawn detect. if( !m_pBeam ) { +#if TRIPMINE_BEAM_DUPLICATION_FIX + // Use the same trace parameters as the original trace above so the right entity is hit. + TraceResult tr2; + UTIL_TraceLine( pev->origin + m_vecDir * 8.0f, pev->origin - m_vecDir * 32.0f, dont_ignore_monsters, ENT( pev ), &tr2 ); +#endif MakeBeam(); +#if TRIPMINE_BEAM_DUPLICATION_FIX + if( tr2.pHit ) + { + // reset owner too + pev->owner = tr2.pHit; + m_hOwner = CBaseEntity::Instance( tr2.pHit ); + } +#else if( tr.pHit ) m_hOwner = CBaseEntity::Instance( tr.pHit ); // reset owner too +#endif } if( fabs( m_flBeamLength - tr.flFraction ) > 0.001f ) From 06521e89500b277a04fe9c101eb97929203c8b1e Mon Sep 17 00:00:00 2001 From: Roman Chistokhodov Date: Sun, 23 Oct 2022 16:38:28 +0300 Subject: [PATCH 2/2] Update github actions (#341) --- .github/workflows/build.yml | 20 ++++++++++---------- .github/workflows/manual.yml | 16 ++++++++-------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 29c3bdaa..3b5ae35c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,20 +22,20 @@ jobs: CXX: ${{ matrix.cxx }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: recursive - name: Checkout steam-runtime if: startsWith(matrix.os, 'ubuntu') - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: ValveSoftware/steam-runtime path: steam-runtime - name: Cache steam-runtime if: startsWith(matrix.os, 'ubuntu') id: cache-steam-runtime - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: com.valvesoftware.SteamRuntime.Sdk-i386-scout-sysroot.tar.gz key: ${{ runner.os }}-steam-runtime @@ -65,7 +65,7 @@ jobs: - name: Add msbuild to PATH if: startsWith(matrix.os, 'windows') - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v1.1 - name: Build on Windows if: startsWith(matrix.os, 'windows') run: | @@ -79,33 +79,33 @@ jobs: - name: Extract branch name shell: bash - run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/} | tr '/' '_')" + run: echo "branch=$(echo ${GITHUB_REF#refs/heads/} | tr '/' '_')" >> $GITHUB_OUTPUT id: extract_branch - name: Extract gamedir shell: bash - run: echo "##[set-output name=gamedir;]$(grep build/CMakeCache.txt -Ee 'GAMEDIR:STRING=[a-z]+' | cut -d '=' -f 2)" + run: echo "gamedir=$(grep build/CMakeCache.txt -Ee 'GAMEDIR:STRING=[a-z]+' | cut -d '=' -f 2)" >> $GITHUB_OUTPUT id: extract_gamedir - name: Upload linux artifact if: startsWith(matrix.os, 'ubuntu') && matrix.cc == 'gcc' - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: hlsdk-${{ steps.extract_branch.outputs.branch }}-linux path: dist/${{ steps.extract_gamedir.outputs.gamedir }} - name: Upload linux artifact with vgui if: startsWith(matrix.os, 'ubuntu') && matrix.cc == 'gcc' - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: hlsdk-${{ steps.extract_branch.outputs.branch }}-linux-vgui path: dist-vgui/${{ steps.extract_gamedir.outputs.gamedir }} - name: Upload windows artifact if: startsWith(matrix.os, 'windows') - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: hlsdk-${{ steps.extract_branch.outputs.branch }}-windows path: dist/${{ steps.extract_gamedir.outputs.gamedir }} - name: Upload windows artifact with vgui if: startsWith(matrix.os, 'windows') - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: hlsdk-${{ steps.extract_branch.outputs.branch }}-windows-vgui path: dist-vgui/${{ steps.extract_gamedir.outputs.gamedir }} diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index 19cf0201..9f03d110 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -32,20 +32,20 @@ jobs: CXX: ${{ matrix.cxx }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: recursive - name: Checkout steam-runtime if: startsWith(matrix.os, 'ubuntu') - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: ValveSoftware/steam-runtime path: steam-runtime - name: Cache steam-runtime if: startsWith(matrix.os, 'ubuntu') id: cache-steam-runtime - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: com.valvesoftware.SteamRuntime.Sdk-i386-scout-sysroot.tar.gz key: ${{ runner.os }}-steam-runtime @@ -73,7 +73,7 @@ jobs: - name: Add msbuild to PATH if: startsWith(matrix.os, 'windows') - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v1.1 - name: Build on Windows if: startsWith(matrix.os, 'windows') run: | @@ -82,11 +82,11 @@ jobs: - name: Extract branch name shell: bash - run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/} | tr '/' '_')" + run: echo "branch=$(echo ${GITHUB_REF#refs/heads/} | tr '/' '_')" >> $GITHUB_OUTPUT id: extract_branch - name: Extract gamedir shell: bash - run: echo "##[set-output name=gamedir;]$(grep build/CMakeCache.txt -Ee 'GAMEDIR:STRING=[a-z]+' | cut -d '=' -f 2)" + run: echo "gamedir=$(grep build/CMakeCache.txt -Ee 'GAMEDIR:STRING=[a-z]+' | cut -d '=' -f 2)" >> $GITHUB_OUTPUT id: extract_gamedir - name: Copy pdbs to dist dir if: ${{ startsWith(matrix.os, 'windows') && github.event.inputs.buildtype == 'Debug' }} @@ -100,13 +100,13 @@ jobs: Remove-Item -Force -Path dist/${{ steps.extract_gamedir.outputs.gamedir }}/dlls/hl.lib - name: Upload linux artifact if: startsWith(matrix.os, 'ubuntu') - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: hlsdk-${{ steps.extract_branch.outputs.branch }}-linux path: dist/${{ steps.extract_gamedir.outputs.gamedir }} - name: Upload windows artifact if: startsWith(matrix.os, 'windows') - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: hlsdk-${{ steps.extract_branch.outputs.branch }}-windows path: dist/${{ steps.extract_gamedir.outputs.gamedir }}