From 870fb1cc255d46c217c806a614f3373e11af7635 Mon Sep 17 00:00:00 2001
From: ray <1041137+ray@users.noreply.github.com>
Date: Sun, 29 Mar 2026 01:25:46 -0400
Subject: [PATCH] Windows x86 build is failing

We need to add our strategy matrix to the PR checks, since there are
apparently some edge cases where x86 can fail :(

Signed-off-by: ray <1041137+ray@users.noreply.github.com>
---
 .github/workflows/pull-request.yml        | 18 ++++++++++++++----
 src/game/client/jbmod/c_jbmod_player.cpp  |  2 --
 src/game/server/physics_impact_damage.cpp |  4 ++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 3af6dfee96d..0a39cdede3b 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -7,6 +7,9 @@ on:
 
 jobs:
   windows:
+    strategy:
+      matrix:
+        arch: ['x64', 'x86']
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v6
@@ -19,13 +22,16 @@ jobs:
 
     - name: Create project files
       working-directory: ${{ github.workspace }}/src
-      run: devtools\bin\vpc.exe /win64 /jbmod /define:SOURCESDK +everything /mksln x64.sln
+      run: devtools\bin\vpc.exe /${{ matrix.arch == 'x86' && 'win32' || 'win64' }} /jbmod /define:SOURCESDK +everything /mksln ${{ matrix.arch }}.sln
 
     - name: Build
       working-directory: ${{ github.workspace }}/src
-      run: msbuild /m /p:Configuration=Release x64.sln
+      run: msbuild /m /p:Configuration=Release ${{ matrix.arch }}.sln
 
   linux:
+    strategy:
+      matrix:
+        arch: ['x64', 'x86']
     runs-on: ubuntu-latest
     container: registry.gitlab.steamos.cloud/steamrt/sniper/sdk:latest
     steps:
@@ -33,8 +39,12 @@ jobs:
 
     - name: Create project files
       working-directory: ${{ github.workspace }}/src
-      run: VPC_NINJA_BUILD_MODE=Release devtools/bin/vpc /linux64 /jbmod /ninja /define:SOURCESDK +everything /mksln _vpc_/ninja/x64
+      run: |
+        VPC_NINJA_BUILD_MODE=Release devtools/bin/vpc /${{ matrix.arch == 'x86' && 'linux32' || 'linux64' }} /jbmod /ninja /define:SOURCESDK +everything /mksln _vpc_/ninja/${{ matrix.arch }}
+        if [ "${{ matrix.arch }}" = "x86" ]; then
+          sed -i 's/i386-linux/i686-linux/g' _vpc_/ninja/${{ matrix.arch }}.ninja
+        fi
 
     - name: Build
       working-directory: ${{ github.workspace }}/src
-      run: ninja -f "_vpc_/ninja/x64.ninja" -j$(nproc)
+      run: ninja -f "_vpc_/ninja/${{ matrix.arch }}.ninja" -j$(nproc)
diff --git a/src/game/client/jbmod/c_jbmod_player.cpp b/src/game/client/jbmod/c_jbmod_player.cpp
index e411a14afd5..b499ca3eec0 100644
--- a/src/game/client/jbmod/c_jbmod_player.cpp
+++ b/src/game/client/jbmod/c_jbmod_player.cpp
@@ -791,8 +791,6 @@ void C_JBMod_Player::HandleSpeedChanges( CMoveData *mv )
 {
 	int nChangedButtons = mv->m_nButtons ^ mv->m_nOldButtons;
 
-	bool bJustPressedSpeed = !!( nChangedButtons & IN_SPEED );
-
 	const bool bWantSprint = ( CanSprint() && IsSuitEquipped() && ( mv->m_nButtons & IN_SPEED ) );
 	const bool bWantsToChangeSprinting = ( m_HL2Local.m_bNewSprinting != bWantSprint ) && ( nChangedButtons & IN_SPEED ) != 0;
 
diff --git a/src/game/server/physics_impact_damage.cpp b/src/game/server/physics_impact_damage.cpp
index 12bb5d65085..7844b44f216 100644
--- a/src/game/server/physics_impact_damage.cpp
+++ b/src/game/server/physics_impact_damage.cpp
@@ -339,7 +339,7 @@ float CalculatePhysicsImpactDamage( int index, gamevcollisionevent_t *pEvent, co
 		CBasePlayer* pPlayer = NULL;
 		if ( gpGlobals->maxClients == 1 )
 		{
-			CBasePlayer *pPlayer = UTIL_GetLocalPlayer();
+			pPlayer = UTIL_GetLocalPlayer();
 		}
 		else {
 			for ( int i = 1; i <= gpGlobals->maxClients; i++ )
@@ -455,7 +455,7 @@ float CalculatePhysicsImpactDamage( int index, gamevcollisionevent_t *pEvent, co
 		CBasePlayer *pPlayer = NULL;
 		if ( gpGlobals->maxClients == 1 )
 		{
-			CBasePlayer *pPlayer = UTIL_GetLocalPlayer();
+			pPlayer = UTIL_GetLocalPlayer();
 		} else {
 			for (int i = 1; i <= gpGlobals->maxClients; i++)
 			{